Remove HomePage, Add Login Screen, remove bottom icons.
MODIFY
WalletWasabi.Fluent/Icons/Icons.xaml
WalletWasabi.Fluent/Icons/Icons.xaml
<Styles xmlns="https://github.com/avaloniaui"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
<Design.PreviewWith>
- <StackPanel Spacing="10" Margin="10">
+ <WrapPanel Margin="10" Orientation="Vertical" ItemHeight="30" ItemWidth="30" MaxHeight="200">
+ <PathIcon Data="{StaticResource wasabi_logo}" />
<PathIcon Data="{StaticResource settings_regular}" />
<PathIcon Data="{StaticResource settings_general_regular}" />
<PathIcon Data="{StaticResource settings_privacy_regular}" />
<PathIcon Data="{StaticResource import_regular}" />
<PathIcon Data="{StaticResource open_regular}" />
<PathIcon Data="{StaticResource search_regular}" />
- </StackPanel>
+ <PathIcon Data="{StaticResource cast_regular}" />
+ <PathIcon Data="{StaticResource dialpad_regular}" />
+ <PathIcon Data="{StaticResource grid_regular}" />
+ <PathIcon Data="{StaticResource board_regular}" />
+ <PathIcon Data="{StaticResource glance_regular}" />
+ <PathIcon Data="{StaticResource officeapps_regular}" />
+ </WrapPanel>
</Design.PreviewWith>
<Style>
<Style.Resources>
<StreamGeometry x:Key="privacy_strong">m 46.044922 21.5 a 1.5 1.5 0 0 0 -1.105469 0.439453 L 27.492188 39.386719 19.060547 30.957031 a 1.5 1.5 0 0 0 -2.121094 0 1.5 1.5 0 0 0 0 2.121094 l 8.785156 8.783203 c 0.963791 0.963791 2.571366 0.963791 3.535157 0 L 47.060547 24.060547 a 1.5 1.5 0 0 0 0 -2.121094 A 1.5 1.5 0 0 0 46.044922 21.5 Z M 32 0 C 14.350614 0 0 14.350614 0 32 0 49.649386 14.350614 64 32 64 49.649386 64 64 49.649386 64 32 64 14.350614 49.649386 0 32 0 Z m 0 4 C 47.487614 4 60 16.512386 60 32 60 47.487614 47.487614 60 32 60 16.512386 60 4 47.487614 4 32 4 16.512386 16.512386 4 32 4 Z</StreamGeometry>
<StreamGeometry x:Key="privacy_extreme">m 17 22 c 0 -0.6627 0.5618 -1.2 1.2549 -1.2 4.4564 0 8.7976 -1.5096 13.051 -4.56 0.4462 -0.32 1.0597 -0.32 1.5059 0 4.2533 3.0504 8.5945 4.56 13.0509 4.56 0.6931 0 1.2549 0.5373 1.2549 1.2 v 8.4 c 0 8.0019 -4.9486 13.8812 -14.5988 17.5165 -0.2956 0.1113 -0.6243 0.1113 -0.9199 0 C 21.9486 44.2812 17 38.4019 17 30.4 Z m 2.5098 1.1647 V 30.4 c 0 6.8089 4.105 11.8063 12.549 15.107 8.4441 -3.3007 12.549 -8.2981 12.549 -15.107 v -7.2353 c -4.3124 -0.2433 -8.5012 -1.7434 -12.549 -4.4802 -4.0477 2.7368 -8.2366 4.2369 -12.549 4.4802 z M 32 0 C 14.350614 0 0 14.350614 0 32 0 49.649386 14.350614 64 32 64 49.649386 64 64 49.649386 64 32 64 14.350614 49.649386 0 32 0 Z m 0 4 C 47.487614 4 60 16.512386 60 32 60 47.487614 47.487614 60 32 60 16.512386 60 4 47.487614 4 32 4 16.512386 16.512386 4 32 4 Z</StreamGeometry>
+ <StreamGeometry x:Key="board_regular">M18.2513521,2.49820514 C19.9843968,2.49820514 21.4006513,3.85452629 21.4962634,5.56367469 L21.5014083,5.74810161 L21.5008077,17.7519229 C21.5005988,19.5467519 20.0455893,21.0018356 18.2507042,21.0018356 L6.25005624,21.0018356 C4.51701151,21.0018356 3.10075697,19.6455145 3.00514494,17.9363661 L3,17.7519391 L3.00060063,5.74811784 C3.00080955,3.9532889 4.45581897,2.49820514 6.25064792,2.49820514 L18.2513521,2.49820514 Z M11.5,9.49820514 L4.5,9.49920514 L4.50010353,17.7518667 L4.50727563,17.9125936 C4.58838653,18.803788 5.33765319,19.5018356 6.25,19.5018356 L11.5,19.5012051 L11.5,9.49820514 Z M20,15.4982051 L13,15.4992051 L13,19.5012051 L18.2506479,19.5018356 C19.2171619,19.5018356 20.0006952,18.7182622 20.0008077,17.7518046 L20,15.4982051 Z M18.2514083,3.99820514 L13,3.99720514 L13,13.9992051 L20,13.9982051 L20.0013048,5.74817408 L19.9941327,5.58744715 C19.9130218,4.69625278 19.1637551,3.99820514 18.2514083,3.99820514 Z M11.5,3.99720514 L6.25073228,3.99820514 L6.10723072,4.00401666 C5.20785168,4.0770851 4.5007075,4.83010139 4.50060063,5.7482362 L4.5,7.99920514 L11.5,7.99820514 L11.5,3.99720514 Z</StreamGeometry>
+ <StreamGeometry x:Key="cast_regular">M6.25 13.9989C5.83579 13.9989 5.5 14.3347 5.5 14.7489C5.5 15.1631 5.83579 15.4989 6.25 15.4989C8.32036 15.4989 9.99872 17.1773 9.99872 19.2476C9.99872 19.6618 10.3345 19.9976 10.7487 19.9976C11.1629 19.9976 11.4987 19.6618 11.4987 19.2476C11.4987 16.3488 9.14879 13.9989 6.25 13.9989Z M5.5 11.25C5.5 10.8358 5.83579 10.5 6.25 10.5C11.0843 10.5 15.005 14.4115 15.005 19.2476C15.005 19.6618 14.6692 19.9976 14.255 19.9976C13.8408 19.9976 13.505 19.6618 13.505 19.2476C13.505 15.2417 10.2577 12 6.25 12C5.83579 12 5.5 11.6642 5.5 11.25Z M6.75 19.9991C7.44036 19.9991 8 19.4394 8 18.7491C8 18.0587 7.44036 17.4991 6.75 17.4991C6.05964 17.4991 5.5 18.0587 5.5 18.7491C5.5 19.4394 6.05964 19.9991 6.75 19.9991Z M4.25 4.5C3.00736 4.5 2 5.50736 2 6.75V21.25C2 22.4926 3.00736 23.5 4.25 23.5H23.75C24.9926 23.5 26 22.4926 26 21.25V6.75C26 5.50736 24.9926 4.5 23.75 4.5H4.25ZM3.5 6.75C3.5 6.33579 3.83579 6 4.25 6H23.75C24.1642 6 24.5 6.33579 24.5 6.75V21.25C24.5 21.6642 24.1642 22 23.75 22H4.25C3.83579 22 3.5 21.6642 3.5 21.25V6.75Z</StreamGeometry>
+ <StreamGeometry x:Key="dialpad_regular">M12,17.75 C12.6903559,17.75 13.25,18.3096441 13.25,19 C13.25,19.6903559 12.6903559,20.25 12,20.25 C11.3096441,20.25 10.75,19.6903559 10.75,19 C10.75,18.3096441 11.3096441,17.75 12,17.75 Z M12,12.75 C12.6903559,12.75 13.25,13.3096441 13.25,14 C13.25,14.6903559 12.6903559,15.25 12,15.25 C11.3096441,15.25 10.75,14.6903559 10.75,14 C10.75,13.3096441 11.3096441,12.75 12,12.75 Z M16.9959653,12.75 C17.6863212,12.75 18.2459653,13.3096441 18.2459653,14 C18.2459653,14.6903559 17.6863212,15.25 16.9959653,15.25 C16.3056094,15.25 15.7459653,14.6903559 15.7459653,14 C15.7459653,13.3096441 16.3056094,12.75 16.9959653,12.75 Z M7.00403471,12.75 C7.69439065,12.75 8.25403471,13.3096441 8.25403471,14 C8.25403471,14.6903559 7.69439065,15.25 7.00403471,15.25 C6.31367878,15.25 5.75403471,14.6903559 5.75403471,14 C5.75403471,13.3096441 6.31367878,12.75 7.00403471,12.75 Z M12,7.75 C12.6903559,7.75 13.25,8.30964406 13.25,9 C13.25,9.69035594 12.6903559,10.25 12,10.25 C11.3096441,10.25 10.75,9.69035594 10.75,9 C10.75,8.30964406 11.3096441,7.75 12,7.75 Z M16.9959653,7.75 C17.6863212,7.75 18.2459653,8.30964406 18.2459653,9 C18.2459653,9.69035594 17.6863212,10.25 16.9959653,10.25 C16.3056094,10.25 15.7459653,9.69035594 15.7459653,9 C15.7459653,8.30964406 16.3056094,7.75 16.9959653,7.75 Z M7.00403471,7.75 C7.69439065,7.75 8.25403471,8.30964406 8.25403471,9 C8.25403471,9.69035594 7.69439065,10.25 7.00403471,10.25 C6.31367878,10.25 5.75403471,9.69035594 5.75403471,9 C5.75403471,8.30964406 6.31367878,7.75 7.00403471,7.75 Z M12,2.75 C12.6903559,2.75 13.25,3.30964406 13.25,4 C13.25,4.69035594 12.6903559,5.25 12,5.25 C11.3096441,5.25 10.75,4.69035594 10.75,4 C10.75,3.30964406 11.3096441,2.75 12,2.75 Z M16.9959653,2.75 C17.6863212,2.75 18.2459653,3.30964406 18.2459653,4 C18.2459653,4.69035594 17.6863212,5.25 16.9959653,5.25 C16.3056094,5.25 15.7459653,4.69035594 15.7459653,4 C15.7459653,3.30964406 16.3056094,2.75 16.9959653,2.75 Z M7.00403471,2.75 C7.69439065,2.75 8.25403471,3.30964406 8.25403471,4 C8.25403471,4.69035594 7.69439065,5.25 7.00403471,5.25 C6.31367878,5.25 5.75403471,4.69035594 5.75403471,4 C5.75403471,3.30964406 6.31367878,2.75 7.00403471,2.75 Z</StreamGeometry>
+ <StreamGeometry x:Key="glance_regular">M19.25,11.0016855 C20.2164983,11.0016855 21,11.7851872 21,12.7516855 L21,19.2516855 C21,20.2181839 20.2164983,21.0016855 19.25,21.0016855 L14.75,21.0016855 C13.7835017,21.0016855 13,20.2181839 13,19.2516855 L13,12.7516855 C13,11.7851872 13.7835017,11.0016855 14.75,11.0016855 L19.25,11.0016855 Z M9.26819698,15.0141011 C10.2346953,15.0141011 11.018197,15.7976028 11.018197,16.7641011 L11.018197,19.2516855 C11.018197,20.2181839 10.2346953,21.0016855 9.26819698,21.0016855 L4.75378933,21.0016855 C3.78729102,21.0016855 3.00378933,20.2181839 3.00378933,19.2516855 L3.00378933,16.7641011 C3.00378933,15.7976028 3.78729102,15.0141011 4.75378933,15.0141011 L9.26819698,15.0141011 Z M19.25,12.5016855 L14.75,12.5016855 C14.6119288,12.5016855 14.5,12.6136144 14.5,12.7516855 L14.5,19.2516855 C14.5,19.3897567 14.6119288,19.5016855 14.75,19.5016855 L19.25,19.5016855 C19.3880712,19.5016855 19.5,19.3897567 19.5,19.2516855 L19.5,12.7516855 C19.5,12.6136144 19.3880712,12.5016855 19.25,12.5016855 Z M9.26819698,16.5141011 L4.75378933,16.5141011 C4.61571814,16.5141011 4.50378933,16.6260299 4.50378933,16.7641011 L4.50378933,19.2516855 C4.50378933,19.3897567 4.61571814,19.5016855 4.75378933,19.5016855 L9.26819698,19.5016855 C9.40626816,19.5016855 9.51819698,19.3897567 9.51819698,19.2516855 L9.51819698,16.7641011 C9.51819698,16.6260299 9.40626816,16.5141011 9.26819698,16.5141011 Z M9.25378933,3 C10.2202876,3 11.0037893,3.78350169 11.0037893,4.75 L11.0037893,11.25 C11.0037893,12.1681734 10.2966791,12.9211923 9.39731654,12.9941988 L9.25378933,13 L4.75378933,13 C3.78729102,13 3.00378933,12.2164983 3.00378933,11.25 L3.00378933,4.75 C3.00378933,3.78350169 3.78729102,3 4.75378933,3 L9.25378933,3 Z M9.25378933,4.5 L4.75378933,4.5 C4.61571814,4.5 4.50378933,4.61192881 4.50378933,4.75 L4.50378933,11.25 C4.50378933,11.3880712 4.61571814,11.5 4.75378933,11.5 L9.25378933,11.5 L9.31111204,11.4933973 C9.42155592,11.4674868 9.50378933,11.3683467 9.50378933,11.25 L9.50378933,4.75 C9.50378933,4.61192881 9.39186052,4.5 9.25378933,4.5 Z M19.25,3 C20.2164983,3 21,3.78350169 21,4.75 L21,7.25 C21,8.21649831 20.2164983,9 19.25,9 L14.75,9 C13.7835017,9 13,8.21649831 13,7.25 L13,4.75 C13,3.78350169 13.7835017,3 14.75,3 L19.25,3 Z M14.75,4.5 C14.6119288,4.5 14.5,4.61192881 14.5,4.75 L14.5,7.25 C14.5,7.38807119 14.6119288,7.5 14.75,7.5 L19.25,7.5 C19.3880712,7.5 19.5,7.38807119 19.5,7.25 L19.5,4.75 C19.5,4.61192881 19.3880712,4.5 19.25,4.5 L14.75,4.5 Z</StreamGeometry>
+ <StreamGeometry x:Key="grid_regular">M10.75,15 C11.9926407,15 13,16.0073593 13,17.25 L13,22.75 C13,23.9926407 11.9926407,25 10.75,25 L5.25,25 C4.00735931,25 3,23.9926407 3,22.75 L3,17.25 C3,16.0073593 4.00735931,15 5.25,15 L10.75,15 Z M22.75,15 C23.9926407,15 25,16.0073593 25,17.25 L25,22.75 C25,23.9926407 23.9926407,25 22.75,25 L17.25,25 C16.0073593,25 15,23.9926407 15,22.75 L15,17.25 C15,16.0073593 16.0073593,15 17.25,15 L22.75,15 Z M10.75,16.5 L5.25,16.5 C4.83578644,16.5 4.5,16.8357864 4.5,17.25 L4.5,22.75 C4.5,23.1642136 4.83578644,23.5 5.25,23.5 L10.75,23.5 C11.1642136,23.5 11.5,23.1642136 11.5,22.75 L11.5,17.25 C11.5,16.8357864 11.1642136,16.5 10.75,16.5 Z M22.75,16.5 L17.25,16.5 C16.8357864,16.5 16.5,16.8357864 16.5,17.25 L16.5,22.75 C16.5,23.1642136 16.8357864,23.5 17.25,23.5 L22.75,23.5 C23.1642136,23.5 23.5,23.1642136 23.5,22.75 L23.5,17.25 C23.5,16.8357864 23.1642136,16.5 22.75,16.5 Z M10.75,3 C11.9926407,3 13,4.00735931 13,5.25 L13,10.75 C13,11.9926407 11.9926407,13 10.75,13 L5.25,13 C4.00735931,13 3,11.9926407 3,10.75 L3,5.25 C3,4.00735931 4.00735931,3 5.25,3 L10.75,3 Z M22.75,3 C23.9926407,3 25,4.00735931 25,5.25 L25,10.75 C25,11.9926407 23.9926407,13 22.75,13 L17.25,13 C16.0073593,13 15,11.9926407 15,10.75 L15,5.25 C15,4.00735931 16.0073593,3 17.25,3 L22.75,3 Z M10.75,4.5 L5.25,4.5 C4.83578644,4.5 4.5,4.83578644 4.5,5.25 L4.5,10.75 C4.5,11.1642136 4.83578644,11.5 5.25,11.5 L10.75,11.5 C11.1642136,11.5 11.5,11.1642136 11.5,10.75 L11.5,5.25 C11.5,4.83578644 11.1642136,4.5 10.75,4.5 Z M22.75,4.5 L17.25,4.5 C16.8357864,4.5 16.5,4.83578644 16.5,5.25 L16.5,10.75 C16.5,11.1642136 16.8357864,11.5 17.25,11.5 L22.75,11.5 C23.1642136,11.5 23.5,11.1642136 23.5,10.75 L23.5,5.25 C23.5,4.83578644 23.1642136,4.5 22.75,4.5 Z</StreamGeometry>
+ <StreamGeometry x:Key="officeapps_regular">M14,21 C15.1045695,21 16,21.8954305 16,23 C16,24.1045695 15.1045695,25 14,25 C12.8954305,25 12,24.1045695 12,23 C12,21.8954305 12.8954305,21 14,21 Z M23,21 C24.1045695,21 25,21.8954305 25,23 C25,24.1045695 24.1045695,25 23,25 C21.8954305,25 21,24.1045695 21,23 C21,21.8954305 21.8954305,21 23,21 Z M5,21 C6.1045695,21 7,21.8954305 7,23 C7,24.1045695 6.1045695,25 5,25 C3.8954305,25 3,24.1045695 3,23 C3,21.8954305 3.8954305,21 5,21 Z M14,12 C15.1045695,12 16,12.8954305 16,14 C16,15.1045695 15.1045695,16 14,16 C12.8954305,16 12,15.1045695 12,14 C12,12.8954305 12.8954305,12 14,12 Z M23,12 C24.1045695,12 25,12.8954305 25,14 C25,15.1045695 24.1045695,16 23,16 C21.8954305,16 21,15.1045695 21,14 C21,12.8954305 21.8954305,12 23,12 Z M5,12 C6.1045695,12 7,12.8954305 7,14 C7,15.1045695 6.1045695,16 5,16 C3.8954305,16 3,15.1045695 3,14 C3,12.8954305 3.8954305,12 5,12 Z M14,3 C15.1045695,3 16,3.8954305 16,5 C16,6.1045695 15.1045695,7 14,7 C12.8954305,7 12,6.1045695 12,5 C12,3.8954305 12.8954305,3 14,3 Z M23,3 C24.1045695,3 25,3.8954305 25,5 C25,6.1045695 24.1045695,7 23,7 C21.8954305,7 21,6.1045695 21,5 C21,3.8954305 21.8954305,3 23,3 Z M5,3 C6.1045695,3 7,3.8954305 7,5 C7,6.1045695 6.1045695,7 5,7 C3.8954305,7 3,6.1045695 3,5 C3,3.8954305 3.8954305,3 5,3 Z</StreamGeometry>
+ <StreamGeometry x:Key="ledger_regular">M5 16.6494C4.17157 16.6494 3.5 15.9778 3.5 15.1494V11.1494C3.5 10.3209 4.17157 9.64941 5 9.64941H6.90876C7.28869 9.64941 7.65448 9.79351 7.93223 10.0528L14.6345 16.3082C14.8694 16.5274 15.1787 16.6494 15.5 16.6494H15.25H5Z M0.600098 15.05V11.25H3.4001V15.05H0.600098Z M7.15471 1.06111L4.32629 3.88954C3.7405 4.47532 3.7405 5.42507 4.32629 6.01086L14.5208 16.2054C15.1066 16.7911 16.0563 16.7911 16.6421 16.2054L19.4705 13.3769C20.0563 12.7911 20.0563 11.8414 19.4705 11.2556L9.27603 1.06111C8.69025 0.475322 7.7405 0.475322 7.15471 1.06111Z M15.5 13.6494C16.0523 13.6494 16.5 13.2017 16.5 12.6494C16.5 12.0971 16.0523 11.6494 15.5 11.6494C14.9477 11.6494 14.5 12.0971 14.5 12.6494C14.5 13.2017 14.9477 13.6494 15.5 13.6494Z M6.85348 5.2718C6.65822 5.07654 6.65822 4.75996 6.85348 4.56469L7.04806 4.37012L7.59619 4.91825L7.04806 5.46638L6.85348 5.2718Z M7.73319 5.05538L7.18506 5.60352L7.73319 6.15165L8.28132 5.60351L7.73319 5.05538Z M7.87036 6.28836L8.4185 5.74023L8.9666 6.28836L8.772 6.48294C8.5768 6.6782 8.2602 6.6782 8.0649 6.48294L7.87036 6.28836Z M9.10355 5.05538L8.55542 5.60352L9.10355 6.15165L9.65168 5.60351L9.10355 5.05538Z M9.24072 4.91825L9.78892 4.37012L9.98342 4.56469C10.1787 4.75996 10.1787 5.07654 9.98342 5.2718L9.78892 5.46638L9.24072 4.91825Z M7.18506 4.23322L8.06478 3.35348C8.26008 3.15822 8.57668 3.15822 8.77188 3.35348L9.65168 4.23322L8.41838 5.46652L7.18506 4.23322Z</StreamGeometry>
+
<DrawingGroup x:Key="placeholder_graphics_legal">
<GeometryDrawing Brush="#FFEF261A"
Geometry="F1 M500,500z M0,0z M241.3,440.1C239.7,440.1,238.1,440.1,236.5,440L236.5,438.3C238.1,438.3,239.7,438.4,241.3,438.4L241.7,438.4 241.7,440.1z M246.8,440L246.8,438.3C248.5,438.3,250.2,438.2,251.9,438.1L252,439.8C250.3,439.9,248.6,440,246.8,440z M231.4,439.8L226.3,439.5 226.4,437.8 231.5,438.1z M257.1,439.4L257,437.7C258.7,437.6,260.4,437.4,262.1,437.2L262.3,438.9C260.6,439.1,258.8,439.3,257.1,439.4z M221.1,439C219.4,438.8,217.7,438.6,216,438.4L216.2,436.7C217.9,436.9,219.6,437.1,221.3,437.3z M267.4,438.3L267.2,436.6C268.9,436.4,270.6,436.1,272.2,435.8L272.5,437.5C270.8,437.8,269.1,438.1,267.4,438.3z M210.9,437.7C209.2,437.4,207.5,437.1,205.8,436.8L206.1,435.1C207.8,435.4,209.4,435.7,211.1,436z M277.5,436.6L277.2,434.9C278.9,434.6,280.5,434.2,282.2,433.9L282.6,435.6C280.9,436,279.2,436.3,277.5,436.6z M200.8,435.8C199.1,435.4,197.4,435,195.8,434.6L196.2,432.9C197.8,433.3,199.5,433.7,201.2,434z M287.6,434.4L287.2,432.7C288.9,432.3,290.5,431.9,292.1,431.4L292.6,433C290.9,433.6,289.3,434,287.6,434.4z M190.8,433.3C189.1,432.8,187.5,432.4,185.9,431.9L186.4,430.3C188,430.8,189.7,431.3,191.3,431.7z M297.5,431.7L297,430C298.6,429.5,300.2,429,301.9,428.4L302.4,430C300.8,430.6,299.2,431.2,297.5,431.7z M180.9,430.3C179.3,429.8,177.6,429.2,176,428.6L176.6,427C178.2,427.6,179.8,428.1,181.4,428.7z M307.3,428.4L306.7,426.8 311.5,425 312.1,426.6C310.5,427.1,308.9,427.8,307.3,428.4z M171.2,426.8C169.6,426.2,168,425.5,166.4,424.8L167.1,423.2C168.7,423.9,170.2,424.5,171.8,425.2z M316.8,424.5L316.1,422.9C317.7,422.2,319.2,421.5,320.7,420.8L321.4,422.4C320,423.2,318.4,423.9,316.8,424.5z M161.7,422.7C160.1,422,158.6,421.2,157,420.5L157.8,419C159.3,419.8,160.9,420.5,162.4,421.2z M326.1,420.2L325.3,418.7C326.8,417.9,328.3,417.2,329.8,416.4L330.6,417.9C329.2,418.7,327.7,419.4,326.1,420.2z M152.4,418.1C150.9,417.3,149.4,416.5,147.9,415.6L148.7,414.1C150.2,414.9,151.7,415.8,153.2,416.6z M335.2,415.4L334.4,413.9C335.9,413.1,337.3,412.2,338.8,411.3L339.7,412.8C338.2,413.7,336.7,414.5,335.2,415.4z M143.4,413C141.9,412.1,140.5,411.2,139,410.3L139.9,408.9C141.3,409.8,142.8,410.7,144.2,411.6z M344,410.1L343.1,408.7C344.5,407.8,345.9,406.8,347.4,405.9L348.4,407.3C346.9,408.2,345.5,409.1,344,410.1z M134.7,407.5C133.3,406.5,131.9,405.6,130.5,404.6L131.5,403.2C132.9,404.2,134.3,405.2,135.7,406.1z M352.5,404.3L351.5,402.9C352.9,401.9,354.2,400.9,355.6,399.9L356.6,401.3C355.3,402.2,353.9,403.3,352.5,404.3z M126.4,401.5C125,400.5,123.7,399.4,122.3,398.3L123.4,397C124.7,398.1,126.1,399.1,127.4,400.1z M360.7,398L359.6,396.7 363.5,393.4 364.6,394.7C363.4,395.9,362.1,397,360.7,398z M118.3,395C117,393.9,115.7,392.8,114.4,391.6L115.5,390.3C116.8,391.4,118.1,392.6,119.4,393.7z M368.6,391.4L367.5,390.1C368.8,389,370,387.8,371.3,386.6L372.5,387.8C371.1,389,369.8,390.2,368.6,391.4z M110.6,388.2C109.4,387,108.1,385.8,106.9,384.6L108.1,383.4C109.3,384.6,110.5,385.8,111.8,387z M376,384.3L374.8,383.1C376,381.9,377.2,380.7,378.4,379.4L379.6,380.6C378.4,381.8,377.2,383.1,376,384.3z M103.3,380.9C102.1,379.7,101,378.4,99.8,377.1L101.1,376C102.2,377.3,103.4,378.5,104.6,379.7z M383.1,376.8L381.8,375.7C382.9,374.4,384.1,373.2,385.2,371.9L386.5,373C385.4,374.2,384.3,375.5,383.1,376.8z M96.4,373.2C95.3,371.9,94.2,370.6,93.1,369.2L94.4,368.1 97.7,372z M389.8,368.9L388.5,367.8C389.6,366.5,390.6,365.1,391.6,363.8L393,364.8C391.9,366.2,390.9,367.6,389.8,368.9z M90,365.2C89,363.8,87.9,362.5,86.9,361.1L88.3,360.1C89.3,361.5,90.3,362.8,91.3,364.2z M396,360.7L394.6,359.7C395.6,358.3,396.6,356.9,397.5,355.5L398.9,356.5C398,357.9,397,359.3,396,360.7z M83.9,356.9C82.9,355.5,82,354.1,81.1,352.6L82.5,351.7C83.4,353.1,84.4,354.5,85.3,355.9z M401.8,352.2L400.4,351.3C401.3,349.9,402.2,348.4,403.1,347L404.6,347.9C403.7,349.3,402.8,350.8,401.8,352.2z M78.4,348.3C77.5,346.8,76.6,345.4,75.8,343.9L77.3,343.1C78.1,344.6,79,346,79.9,347.5z M407.2,343.4L405.7,342.6C406.5,341.1,407.4,339.6,408.2,338.1L409.7,338.9C408.8,340.4,408,341.9,407.2,343.4z M73.3,339.3C72.5,337.8,71.7,336.3,70.9,334.7L72.4,333.9C73.2,335.4,73.9,336.9,74.7,338.4z M412,334.2L410.5,333.4C411.3,331.9,412,330.3,412.7,328.8L414.3,329.5C413.5,331.2,412.8,332.7,412,334.2z M68.7,330.1C68,328.6,67.3,327,66.6,325.4L68.2,324.7C68.9,326.3,69.6,327.8,70.3,329.3z M416.3,324.9L414.7,324.2C415.4,322.6,416,321.1,416.7,319.5L418.3,320.1C417.7,321.7,417,323.3,416.3,324.9z M64.6,320.7C64,319.1,63.3,317.5,62.7,315.9L64.3,315.3 66.1,320.1z M420.2,315.3L418.6,314.7C419.2,313.1,419.8,311.5,420.3,309.9L421.9,310.4C421.3,312,420.8,313.7,420.2,315.3z M61.0000000000001,311.1C60.4000000000001,309.5,59.9000000000001,307.8,59.4000000000001,306.2L61.0000000000001,305.7C61.5000000000001,307.3,62.0000000000001,308.9,62.6000000000001,310.6z M423.5,305.5L421.9,305C422.4,303.4,422.9,301.7,423.3,300.1L424.9,300.6C424.5,302.2,424,303.8,423.5,305.5z M57.9,301.2C57.4,299.5,57,297.9,56.6,296.2L58.3,295.8C58.7,297.5,59.2,299.1,59.6,300.7z M426.2,295.5L424.5,295.1C424.9,293.5,425.3,291.8,425.7,290.1L427.4,290.5C427,292.2,426.6,293.9,426.2,295.5z M55.4,291.2C55,289.5,54.7,287.8,54.3,286.2L56,285.9C56.3,287.6,56.7,289.2,57,290.9z M428.4,285.5L426.7,285.2C427,283.5,427.3,281.9,427.6,280.2L429.3,280.5C429,282.1,428.7,283.8,428.4,285.5z M53.5000000000001,281.1C53.2000000000001,279.4,53.0000000000001,277.7,52.7000000000001,276L54.4000000000001,275.8C54.6000000000001,277.5,54.9000000000001,279.2,55.2000000000001,280.8z M430.1,275.3L428.4,275.1 429,270 430.7,270.2 430.1,275.3z M52.1000000000001,270.9C51.9000000000001,269.2,51.7000000000001,267.5,51.6000000000001,265.8L53.3000000000001,265.7C53.4000000000001,267.4,53.6000000000001,269.1,53.8000000000001,270.8z M431.2,265.1L429.5,265C429.6,263.3,429.8,261.6,429.8,259.9L431.5,260C431.4,261.6,431.3,263.4,431.2,265.1z M51.2000000000001,260.6C51.1000000000001,258.9,51.0000000000001,257.2,51.0000000000001,255.5L52.7000000000001,255.4C52.8000000000001,257.1,52.8000000000001,258.8,52.9000000000001,260.5z M431.7,254.8L430,254.8C430,253.1,430.1,251.4,430.1,249.7L430.1,248.3 431.8,248.3 431.8,249.7C431.8,251.4,431.8,253.1,431.7,254.8z M50.9000000000001,250.3L50.9000000000001,249.6C50.9000000000001,248.1,50.9000000000001,246.6,51.0000000000001,245.2L52.7000000000001,245.2C52.7000000000001,246.7,52.6000000000001,248.1,52.6000000000001,249.6L52.6000000000001,250.3z M430,243.1C429.9,241.4,429.9,239.7,429.8,238L431.5,237.9C431.6,239.6,431.7,241.3,431.7,243z M52.8000000000001,240.1L51.1000000000001,240 51.4000000000001,234.9 53.1000000000001,235 52.8000000000001,240.1z M429.4,232.9C429.3,231.2,429.1,229.5,428.9,227.8L430.6,227.6C430.8,229.3,431,231,431.1,232.7z M53.6000000000001,229.9L51.9000000000001,229.7 52.5000000000001,224.6 54.2000000000001,224.8C54.0000000000001,226.6,53.8000000000001,228.2,53.6000000000001,229.9z M428.2,222.8C428,221.1,427.7,219.4,427.4,217.8L429.1,217.5C429.4,219.2,429.7,220.9,429.9,222.6z M54.9000000000001,219.8L53.2000000000001,219.5 54.1000000000001,214.4 55.8000000000001,214.7C55.5000000000001,216.5,55.2000000000001,218.1,54.9000000000001,219.8z M426.5,212.7C426.2,211,425.8,209.4,425.4,207.7L427.1,207.3C427.5,209,427.8,210.7,428.2,212.3z M56.8000000000002,209.8L55.1000000000002,209.4C55.5000000000002,207.7,55.8000000000002,206,56.3000000000002,204.4L58.0000000000002,204.8C57.5000000000002,206.5,57.2000000000002,208.1,56.8000000000002,209.8z M424.2,202.8C423.8,201.1,423.3,199.5,422.9,197.9L424.5,197.4C425,199,425.4,200.7,425.8,202.4z M59.2000000000002,199.9L57.6000000000002,199.5C58.1000000000002,197.8,58.5000000000002,196.2,59.0000000000002,194.5L60.6000000000002,195C60.1000000000002,196.6,59.7000000000002,198.2,59.2000000000002,199.9z M421.4,192.9C420.9,191.3,420.4,189.7,419.8,188.1L421.4,187.5C422,189.1,422.5,190.8,423,192.4z M62.2000000000002,190.1L60.6000000000002,189.6C61.1000000000002,188,61.7000000000002,186.3,62.3000000000002,184.7L63.9000000000002,185.3C63.3000000000002,186.8,62.7000000000002,188.4,62.2000000000002,190.1z M418.1,183.3C417.5,181.7,416.9,180.1,416.2,178.5L417.8,177.9C418.4,179.5,419.1,181.1,419.7,182.7z M65.7000000000002,180.4L64.1000000000002,179.8C64.7000000000002,178.2,65.4000000000002,176.6,66.1000000000002,175L67.7000000000002,175.7C66.9000000000002,177.3,66.3000000000002,178.9,65.7000000000002,180.4z M414.3,173.9C413.6,172.3,412.9,170.8,412.2,169.3L413.7,168.6C414.4,170.1,415.1,171.7,415.8,173.3z M69.7000000000002,171L68.1000000000002,170.3C68.8000000000002,168.7,69.6000000000002,167.2,70.3000000000002,165.6L71.8000000000002,166.4C71.1000000000002,167.9,70.4000000000002,169.5,69.7000000000002,171z M409.9,164.6L407.5,160.1 409,159.3C409.8,160.8,410.6,162.3,411.4,163.9z M74.2000000000002,161.8L72.7000000000002,161C73.5000000000002,159.5,74.3000000000002,158,75.2000000000002,156.5L76.7000000000002,157.3C75.8000000000002,158.8,75.0000000000002,160.3,74.2000000000002,161.8z M405.1,155.7C404.3,154.2,403.4,152.8,402.5,151.3L404,150.4C404.9,151.9,405.8,153.3,406.6,154.8z M79.2000000000002,152.9L77.7000000000002,152C78.6000000000002,150.5,79.5000000000002,149.1,80.4000000000002,147.6L81.8000000000002,148.5C81.0000000000002,150,80.1000000000002,151.5,79.2000000000002,152.9z M399.8,147C398.9,145.6,397.9,144.2,397,142.8L398.4,141.8C399.4,143.2,400.3,144.6,401.3,146.1z M84.7000000000002,144.3L83.3000000000002,143.3C84.3000000000002,141.9,85.2000000000002,140.5,86.2000000000002,139.1L87.6000000000002,140.1C86.6000000000002,141.5,85.6000000000002,142.9,84.7000000000002,144.3z M394,138.6C393,137.2,392,135.9,390.9,134.5L392.3,133.5C393.3,134.9,394.4,136.2,395.4,137.6z M90.6000000000002,136L89.2000000000002,135C90.2000000000002,133.6,91.3000000000002,132.3,92.4000000000002,130.9L93.7000000000002,132C92.7000000000002,133.3,91.7000000000002,134.6,90.6000000000002,136z M387.7,130.5L384.4,126.6 385.7,125.5 389,129.4z M97.0000000000002,128L95.7000000000002,126.9C96.8000000000002,125.6,97.9000000000002,124.3,99.1000000000002,123L100.4,124.1C99.2000000000002,125.4,98.1000000000002,126.7,97.0000000000002,128z M381.1,122.8C380,121.5,378.8,120.3,377.6,119.1L378.8,117.9C380,119.1,381.2,120.4,382.3,121.7z M103.8,120.4L102.6,119.2C103.8,117.9,105,116.7,106.2,115.5L107.4,116.7C106.2,117.9,105,119.1,103.8,120.4z M374,115.4C372.8,114.2,371.6,113,370.3,111.9L371.5,110.7C372.8,111.9,374,113.1,375.2,114.3z M111,113.1L109.8,111.9C111,110.7,112.3,109.5,113.6,108.4L114.7,109.7C113.5,110.8,112.2,111.9,111,113.1z M366.6,108.4L362.7,105.1 363.8,103.8C365.1,104.9,366.4,106,367.7,107.2z M118.6,106.3L117.5,105C118.8,103.9,120.1,102.8,121.5,101.7L122.6,103C121.2,104.1,119.9,105.2,118.6,106.3z M358.8,101.8C357.5,100.7,356.1,99.7,354.8,98.7L355.8,97.3C357.2,98.3,358.5,99.4,359.9,100.5z M126.5,99.8L125.5,98.4C126.9,97.4,128.2,96.3,129.6,95.3L130.6,96.7C129.2,97.8,127.8,98.8,126.5,99.8z M350.6,95.7C349.2,94.7,347.8,93.7,346.4,92.8L347.4,91.4C348.8,92.4,350.2,93.3,351.6,94.3z M134.7,93.8L133.7,92.4C135.1,91.4,136.5,90.5,138,89.5L139,91C137.6,91.9,136.1,92.9,134.7,93.8z M342.1,90C340.7,89.1,339.2,88.2,337.7,87.3L338.6,85.8C340.1,86.7,341.5,87.6,343,88.5z M143.3,88.3L142.4,86.8C143.9,85.9,145.3,85,146.8,84.2L147.6,85.7C146.2,86.6,144.7,87.4,143.3,88.3z M333.3,84.8L328.8,82.4 329.6,80.9C331.1,81.7,332.6,82.5,334.1,83.4z M152.1,83.2L151.3,81.7C152.8,80.9,154.3,80.1,155.9,79.3L156.7,80.8C155.1,81.7,153.6,82.4,152.1,83.2z M324.2,80C322.7,79.3,321.1,78.5,319.6,77.8L320.3,76.2C321.9,76.9,323.4,77.7,325,78.4z M161.2,78.7L160.5,77.2C162,76.5,163.6,75.8,165.2,75.1L165.9,76.7C164.3,77.3,162.8,78,161.2,78.7z M314.9,75.8C313.3,75.1,311.8,74.5,310.2,73.9L310.8,72.3C312.4,72.9,314,73.6,315.6,74.3z M170.6,74.6L170,73C171.6,72.4,173.2,71.7,174.8,71.1L175.4,72.7C173.7,73.3,172.1,74,170.6,74.6z M305.4,72C303.8,71.4,302.2,70.9,300.6,70.3L301.1,68.7C302.7,69.2,304.4,69.8,306,70.4z M180.1,71L179.5,69.4C181.1,68.8,182.8,68.3,184.4,67.8L184.9,69.4C183.4,69.9,181.7,70.5,180.1,71z M295.7,68.8C294.1,68.3,292.4,67.8,290.8,67.4L291.2,65.7C292.9,66.1,294.5,66.6,296.2,67.1z M189.9,68L189.4,66.4C191.1,65.9,192.7,65.5,194.4,65.1L194.8,66.8C193.2,67.1,191.5,67.5,189.9,68z M285.8,66.2C284.1,65.8,282.5,65.4,280.8,65.1L281.2,63.4C282.9,63.8,284.6,64.1,286.2,64.5z M199.8,65.5L199.4,63.8C201.1,63.4,202.8,63.1,204.4,62.7L204.7,64.4C203.1,64.8,201.4,65.1,199.8,65.5z M275.8,64C274.1,63.7,272.5,63.4,270.8,63.1L271.1,61.4C272.8,61.7,274.5,62,276.2,62.3z M209.8,63.5L209.5,61.8C211.2,61.5,212.9,61.3,214.6,61L214.8,62.7C213.2,63,211.5,63.2,209.8,63.5z M265.7,62.4C264,62.2,262.3,62,260.6,61.8L260.8,60.1C262.5,60.3,264.2,60.5,265.9,60.7z M219.9,62.1L219.7,60.4C221.4,60.2,223.1,60,224.8,59.9L224.9,61.6C223.3,61.7,221.6,61.9,219.9,62.1z M255.6,61.4L250.5,61.1 250.6,59.4 255.7,59.7z M230.1,61.2L230,59.5C231.7,59.4,233.4,59.3,235.1,59.3L235.2,61C233.5,61,231.8,61.1,230.1,61.2z M245.4,60.9L241.3,60.9 240.2,60.9 240.2,59.2 241.3,59.2 245.4,59.2z" />

MODIFY
WalletWasabi.Fluent/ViewModels/AddWallet/AddWalletPageViewModel.cs
WalletWasabi.Fluent/ViewModels/AddWallet/AddWalletPageViewModel.cs
@@ -27,7 +27,6 @@ namespace WalletWasabi.Fluent.ViewModels.AddWallet
Category = "General",
Keywords = new[] { "Wallet", "Add", "Create", "Recover", "Import", "Connect", "Hardware", "ColdCard", "Trezor", "Ledger" },
IconName = "add_circle_regular",
- NavBarPosition = NavBarPosition.Bottom,
NavigationTarget = NavigationTarget.DialogScreen)]
public partial class AddWalletPageViewModel : NavBarItemViewModel
{

DELETE
WalletWasabi.Fluent/ViewModels/HomePageViewModel.cs
-using ReactiveUI;
-using System.Collections.ObjectModel;
-using System.Reactive.Linq;
-using DynamicData;
-using DynamicData.Binding;
-using System.Reactive;
-using System.IO;
-using System.Reactive.Disposables;
-using WalletWasabi.Fluent.ViewModels.AddWallet;
-using WalletWasabi.Fluent.ViewModels.NavBar;
-using WalletWasabi.Fluent.ViewModels.Navigation;
-
-namespace WalletWasabi.Fluent.ViewModels
-{
- [NavigationMetaData(
- Title = "Home",
- Caption = "Manage existing wallets",
- Order = 0,
- Category = "General",
- NavBarPosition = NavBarPosition.Top,
- IconName = "home_regular",
- Keywords = new[] { "Home" })]
- public partial class HomePageViewModel : NavBarItemViewModel
- {
- private readonly ReadOnlyObservableCollection<NavBarItemViewModel> _items;
- private readonly WalletManagerViewModel _walletManager;
- private readonly AddWalletPageViewModel _addWalletPage;
-
- public HomePageViewModel(WalletManagerViewModel walletManager, AddWalletPageViewModel addWalletPage)
- {
- Title = "Home";
- _walletManager = walletManager;
- _addWalletPage = addWalletPage;
-
- var list = new SourceList<NavBarItemViewModel>();
- list.Add(addWalletPage);
-
- walletManager.Items.ToObservableChangeSet()
- .Cast(x => x as NavBarItemViewModel)
- .Sort(SortExpressionComparer<NavBarItemViewModel>.Ascending(i => i.Title))
- .Merge(list.Connect())
- .ObserveOn(RxApp.MainThreadScheduler)
- .Bind(out _items)
- .AsObservableList();
-
- OpenWalletsFolderCommand = ReactiveCommand.Create(
- () => IoHelpers.OpenFolderInFileExplorer(walletManager.Model.WalletDirectories.WalletsDir));
- }
-
- public ReadOnlyObservableCollection<NavBarItemViewModel> Items => _items;
-
- public ReactiveCommand<Unit, Unit> OpenWalletsFolderCommand { get; }
-
- protected override void OnNavigatedTo(bool inStack, CompositeDisposable disposable)
- {
- base.OnNavigatedTo(inStack, disposable);
-
- if (!_walletManager.Model.AnyWallet(_ => true))
- {
- Navigate(NavigationTarget.HomeScreen).To(_addWalletPage);
- }
- }
- }
-}
\ No newline at end of file

MODIFY
WalletWasabi.Fluent/ViewModels/MainViewModel.cs
WalletWasabi.Fluent/ViewModels/MainViewModel.cs
@@ -27,7 +27,6 @@ namespace WalletWasabi.Fluent.ViewModels
[AutoNotify] private NavBarViewModel _navBar;
[AutoNotify] private StatusBarViewModel _statusBar;
[AutoNotify] private string _title = "Wasabi Wallet";
- private readonly HomePageViewModel _homePage;
private readonly SettingsPageViewModel _settingsPage;
private readonly SearchPageViewModel _searchPage;
private readonly PrivacyModeViewModel _privacyMode;
@@ -69,7 +68,6 @@ namespace WalletWasabi.Fluent.ViewModels
_settingsPage = new SettingsPageViewModel(global.Config, global.UiConfig);
_privacyMode = new PrivacyModeViewModel(global.UiConfig);
- _homePage = new HomePageViewModel(walletManager, _addWalletPage);
_searchPage = new SearchPageViewModel();
_navBar = new NavBarViewModel(MainScreen, walletManager);
@@ -81,8 +79,6 @@ namespace WalletWasabi.Fluent.ViewModels
_searchPage.Initialise();
- MainScreen.To(_homePage);
-
this.WhenAnyValue(x => x.DialogScreen!.IsDialogOpen)
.ObserveOn(RxApp.MainThreadScheduler)
.Subscribe(x => IsMainContentEnabled = !x);
@@ -93,6 +89,11 @@ namespace WalletWasabi.Fluent.ViewModels
walletManager.WhenAnyValue(x => x.Items.Count)
.Subscribe(x => _navBar.IsHidden = x == 0);
+
+ if (!walletManager.Model.AnyWallet(_ => true))
+ {
+ MainScreen.To(_addWalletPage);
+ }
}
public TargettedNavigationStack MainScreen { get; }
@@ -122,8 +123,6 @@ namespace WalletWasabi.Fluent.ViewModels
private void RegisterViewModels()
{
- HomePageViewModel.Register(_homePage);
-
SearchPageViewModel.Register(_searchPage);
PrivacyModeViewModel.Register(_privacyMode);
AddWalletPageViewModel.Register(_addWalletPage);

MODIFY
WalletWasabi.Fluent/ViewModels/NavBar/NavBarViewModel.cs
WalletWasabi.Fluent/ViewModels/NavBar/NavBarViewModel.cs
@@ -45,6 +45,15 @@ namespace WalletWasabi.Fluent.ViewModels.NavBar
.OfType<NavBarItemViewModel>()
.Subscribe(NavigateItem);
+ this.WhenAnyValue(x => x.Items.Count)
+ .Subscribe(x =>
+ {
+ if (x > 0 && SelectedItem is null)
+ {
+ SelectedItem = Items.FirstOrDefault();
+ }
+ });
+
this.WhenAnyValue(x => x.IsOpen)
.Subscribe(x =>
{

MODIFY
WalletWasabi.Fluent/ViewModels/Settings/SettingsPageViewModel.cs
WalletWasabi.Fluent/ViewModels/Settings/SettingsPageViewModel.cs
@@ -12,8 +12,7 @@ namespace WalletWasabi.Fluent.ViewModels.Settings
Order = 1,
Category = "General",
Keywords = new[] { "Settings", "General", "User", "Interface", "Privacy", "Advanced" },
- IconName = "settings_regular",
- NavBarPosition = NavBarPosition.Bottom)]
+ IconName = "settings_regular")]
public partial class SettingsPageViewModel : NavBarItemViewModel
{
[AutoNotify] private bool _isModified;

MODIFY
WalletWasabi.Fluent/Views/AddWallet/HardwareWallet/DetectedHardwareWalletView.axaml
WalletWasabi.Fluent/Views/AddWallet/HardwareWallet/DetectedHardwareWalletView.axaml
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:c="clr-namespace:WalletWasabi.Fluent.Controls"
xmlns:conv="using:WalletWasabi.Fluent.Converters"
+ xmlns:behaviors="using:WalletWasabi.Fluent.Behaviors"
+ xmlns:i="using:Avalonia.Xaml.Interactivity"
xmlns:hardwareWallet="clr-namespace:WalletWasabi.Fluent.ViewModels.AddWallet.HardwareWallet"
mc:Ignorable="d"
d:DesignWidth="600" d:DesignHeight="500"

DELETE
WalletWasabi.Fluent/Views/HomePageView.axaml
-<UserControl xmlns="https://github.com/avaloniaui"
- xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
- xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
- xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
- xmlns:vm="using:WalletWasabi.Fluent.ViewModels"
- xmlns:c="using:WalletWasabi.Fluent.Controls"
- xmlns:conv="using:WalletWasabi.Fluent.Converters"
- mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450"
- x:DataType="vm:HomePageViewModel"
- x:CompileBindings="True"
- x:Class="WalletWasabi.Fluent.Views.HomePageView">
- <c:ContentArea Title="Home">
- <c:ContentArea.Caption>
- <DockPanel>
- <Button VerticalAlignment="Top" Padding="0" Classes="plain" DockPanel.Dock="Right" Command="{Binding OpenWalletsFolderCommand}" Margin="40 0 0 0">
- <StackPanel Orientation="Horizontal" Spacing="20">
- <PathIcon Data="{StaticResource open_regular}" />
- <TextBlock Text="Open Wallets folder" />
- </StackPanel>
- </Button>
- <TextBlock Text="Select a wallet below to continue or create a new one:" />
- </DockPanel>
- </c:ContentArea.Caption>
- <ScrollViewer HorizontalScrollBarVisibility="Disabled">
- <ItemsControl HorizontalAlignment="Left" Items="{Binding Items}">
- <ItemsControl.ItemsPanel>
- <ItemsPanelTemplate>
- <WrapPanel Orientation="Horizontal" Margin="-8 0" />
- </ItemsPanelTemplate>
- </ItemsControl.ItemsPanel>
- <ItemsControl.ItemTemplate>
- <DataTemplate>
- <Button Classes="option" Command="{Binding OpenCommand}" Height="150" Width="150" Margin="8">
- <Panel>
- <TextBlock Text="{Binding Title}" VerticalAlignment="Bottom" HorizontalAlignment="Center" Margin="0 0 0 15" />
- <PathIcon Width="28" Height="28" Opacity="0.8">
- <PathIcon.Data>
- <Binding Path="IconName" Converter="{x:Static conv:NavBarIconConverter.Instance}" />
- </PathIcon.Data>
- </PathIcon>
- </Panel>
- </Button>
- </DataTemplate>
- </ItemsControl.ItemTemplate>
- </ItemsControl>
- </ScrollViewer>
- </c:ContentArea>
-</UserControl>

ADD
WalletWasabi.Fluent/Views/Wallets/ClosedHardwareWalletView.axaml
+<UserControl xmlns="https://github.com/avaloniaui"
+ xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+ xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+ xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+ xmlns:vm="using:WalletWasabi.Fluent.ViewModels"
+ xmlns:c="using:WalletWasabi.Fluent.Controls"
+ xmlns:local="using:WalletWasabi.Fluent.Views.Wallets"
+ xmlns:i="using:Avalonia.Xaml.Interactivity"
+ xmlns:behaviors="using:WalletWasabi.Fluent.Behaviors"
+ mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450"
+ x:Class="WalletWasabi.Fluent.Views.Wallets.ClosedHardwareWalletView">
+ <c:ContentArea Title="Login" Caption="Enter your password to access your wallet">
+ <StackPanel Spacing="40" Margin="0 20 0 0" VerticalAlignment="Center">
+ <Image Height="200" Source="/Assets/HardwareIcons/ledger.png" />
+ <local:LoginView />
+ </StackPanel>
+ </c:ContentArea>
+</UserControl>

ADD
WalletWasabi.Fluent/Views/Wallets/ClosedHardwareWalletView.axaml.cs
+using Avalonia.Controls;
+using Avalonia.Markup.Xaml;
+
+namespace WalletWasabi.Fluent.Views.Wallets
+{
+ public class ClosedHardwareWalletView : UserControl
+ {
+ public ClosedHardwareWalletView()
+ {
+ InitializeComponent();
+ }
+
+ private void InitializeComponent()
+ {
+ AvaloniaXamlLoader.Load(this);
+ }
+ }
+}

ADD
WalletWasabi.Fluent/Views/Wallets/ClosedWalletView.axaml
+<UserControl xmlns="https://github.com/avaloniaui"
+ xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+ xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+ xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+ xmlns:vm="using:WalletWasabi.Fluent.ViewModels"
+ xmlns:c="using:WalletWasabi.Fluent.Controls"
+ xmlns:local="using:WalletWasabi.Fluent.Views.Wallets"
+ xmlns:i="using:Avalonia.Xaml.Interactivity"
+ xmlns:behaviors="using:WalletWasabi.Fluent.Behaviors"
+ mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450"
+ x:Class="WalletWasabi.Fluent.Views.Wallets.ClosedWalletView">
+ <c:ContentArea Title="Login" Caption="Enter your password to access your wallet">
+ <StackPanel Spacing="40" Margin="0 20 0 0" VerticalAlignment="Center">
+ <Image Height="200" Source="/Assets/HardwareIcons/normal.png" />
+ <local:LoginView />
+ </StackPanel>
+ </c:ContentArea>
+</UserControl>

ADD
WalletWasabi.Fluent/Views/Wallets/ClosedWalletView.xaml.cs
+using Avalonia.Controls;
+using Avalonia.Markup.Xaml;
+
+namespace WalletWasabi.Fluent.Views.Wallets
+{
+ public class ClosedWalletView : UserControl
+ {
+ public ClosedWalletView()
+ {
+ InitializeComponent();
+ }
+
+ private void InitializeComponent()
+ {
+ AvaloniaXamlLoader.Load(this);
+ }
+ }
+}

RENAME
WalletWasabi.Fluent/Views/HomePageView.axaml.cs
WalletWasabi.Fluent/Views/Wallets/LoginView.xaml.cs
using Avalonia.Controls;
using Avalonia.Markup.Xaml;
-namespace WalletWasabi.Fluent.Views
+namespace WalletWasabi.Fluent.Views.Wallets
{
- public class HomePageView : UserControl
+ public class LoginView : UserControl
{
- public HomePageView()
+ public LoginView()
{
InitializeComponent();
}

Remove HomePage, Add Login Screen, remove bottom icons.