placeholder round status and btc price tiles.
MODIFY
WalletWasabi.Fluent/Icons/Icons.axaml
WalletWasabi.Fluent/Icons/Icons.axaml
<StreamGeometry x:Key="status_regular">M12,3 C13.1134665,3 14.1797059,3.20220299 15.1640018,3.57189248 L13.9807882,4.76434158 C13.3497959,4.59200466 12.6856424,4.5 12,4.5 C7.85786438,4.5 4.5,7.85786438 4.5,12 C4.5,13.4248663 4.89726709,14.7892778 5.63582603,15.9703766 C5.93763522,16.4530279 6.2936779,16.9002326 6.69638725,17.3029889 C7.09848441,17.7051331 7.54490219,18.0607594 8.02668093,18.362333 C9.20843557,19.1020627 10.5739361,19.5 12,19.5 C16.1421356,19.5 19.5,16.1421356 19.5,12 C19.5,11.3433642 19.4156153,10.7064375 19.2570987,10.0994726 L20.4504717,8.89619917 C20.805944,9.8637155 21,10.9091957 21,12 C21,16.9705627 16.9705627,21 12,21 C10.2903875,21 8.64944804,20.5217936 7.23080614,19.6337823 C6.65294072,19.2720624 6.11769706,18.8456754 5.63566512,18.3635872 C5.15289898,17.8807646 4.72601217,17.3445768 4.36400875,16.7656632 C3.47740079,15.3478054 3,13.7081751 3,12 C3,7.02943725 7.02943725,3 12,3 Z M21.0602355,2.67194792 L21.2062344,2.80790979 L21.2062344,2.80790979 C22.2817408,3.88405333 22.284968,5.62715342 21.2134536,6.70727188 L14.9096358,13.0617083 C14.7290905,13.2437034 14.5049144,13.3763896 14.2585034,13.4471032 L10.0460648,14.6559639 C9.78063576,14.7321352 9.50371405,14.5787115 9.4275428,14.3132825 C9.4016852,14.2231782 9.40167829,14.1276195 9.42752286,14.0375115 L10.6377831,9.81789452 C10.7073572,9.57532191 10.8370057,9.35422271 11.0147264,9.17506527 L17.323637,2.81515051 C18.3447664,1.78576584 19.9803222,1.73646142 21.0602355,2.67194792 L21.0602355,2.67194792 Z M18.3885587,3.87153195 L12.0796481,10.2314467 L11.3669295,12.7163662 L13.8447427,12.005298 L20.1485605,5.65086159 C20.6057503,5.19000065 20.6349445,4.46511973 20.2370582,3.97053354 L20.1414651,3.86447482 C19.6554646,3.38237186 18.8706616,3.38553144 18.3885587,3.87153195 Z</StreamGeometry>
<StreamGeometry x:Key="block_height">M 15.75 -2 C 16.9926 -2 18 -3.0074 18 -4.25 L 18 -19.75 C 18 -20.9926 16.9926 -22 15.75 -22 L 8.25 -22 C 7.0074 -22 6 -20.9926 6 -19.75 L 6 -4.25 C 6 -3.0074 7.0074 -2 8.25 -2 L 15.75 -2 Z M 15.75 -3.5 L 8.25 -3.5 C 7.8358 -3.5 7.5 -3.8358 7.5 -4.25 L 7.5 -19.75 C 7.5 -20.1642 7.8358 -20.5 8.25 -20.5 L 15.75 -20.5 C 16.1642 -20.5 16.5 -20.1642 16.5 -19.75 L 16.5 -4.25 C 16.5 -3.8358 16.1642 -3.5 15.75 -3.5 Z M 12 -7.0309 C 12.3797 -7.0309 12.6935 -7.3131 12.7432 -7.6791 L 12.75 -7.7809 L 12.7493 -14.4919 L 13.7113 -13.5308 C 13.9776 -13.2645 14.3943 -13.2403 14.6879 -13.4582 L 14.772 -13.5308 C 15.0383 -13.7971 15.0625 -14.2137 14.8446 -14.5073 L 14.772 -14.5915 L 12.5303 -16.8331 L 12.4921 -16.8688 L 12.4296 -16.9177 L 12.3631 -16.9592 L 12.3026 -16.9893 L 12.2019 -17.0253 L 12.1393 -17.0398 L 12.0468 -17.0514 L 11.9532 -17.0514 L 11.8615 -17.04 L 11.7651 -17.0153 L 11.6535 -16.9682 L 11.5767 -16.922 L 11.4697 -16.8331 L 11.4697 -16.8331 L 9.228 -14.5915 C 8.9351 -14.2986 8.9351 -13.8237 9.228 -13.5308 C 9.4943 -13.2645 9.9109 -13.2403 10.2045 -13.4582 L 10.2887 -13.5308 L 11.2493 -14.4919 L 11.25 -7.7809 C 11.25 -7.4357 11.4832 -7.145 11.8006 -7.0577 L 11.8982 -7.0378 L 12 -7.0309 Z</StreamGeometry>
<StreamGeometry x:Key="transaction_id">M7 10H17C17.5523 10 18 10.3358 18 10.75C18 11.1297 17.6238 11.4435 17.1357 11.4932L17 11.5H7C6.44772 11.5 6 11.1642 6 10.75C6 10.3703 6.37621 10.0565 6.86431 10.0068L7 10Z M17 13H7L6.86431 13.0068C6.37621 13.0565 6 13.3703 6 13.75C6 14.1642 6.44772 14.5 7 14.5H17L17.1357 14.4932C17.6238 14.4435 18 14.1297 18 13.75C18 13.3358 17.5523 13 17 13Z M21 5.75C21 4.23122 19.7688 3 18.25 3H5.75C4.23122 3 3 4.23122 3 5.75V18.25C3 19.7688 4.23122 21 5.75 21H18.25C19.7688 21 21 19.7688 21 18.25V5.75ZM5.75 4.5H18.25C18.9404 4.5 19.5 5.05964 19.5 5.75V18.25C19.5 18.9404 18.9404 19.5 18.25 19.5H5.75C5.05964 19.5 4.5 18.9404 4.5 18.25V5.75C4.5 5.05964 5.05964 4.5 5.75 4.5Z</StreamGeometry>
+ <StreamGeometry x:Key="people_regular">M4,16 L15,16.001 C16.0538182,16.001 16.9181157,16.8164855 16.9945109,17.8516842 L17,18.001 L17,20.5 C16.999,24.7 12.713,26 9.5,26 C6.35126,26 2.1710504,24.75148 2.00510151,20.7485328 L2,20.5 L2,18 C2,16.9461818 2.81639669,16.0818843 3.85080841,16.0054891 L4,16 Z M24,16 L24.1491916,16.0054891 C25.1318827,16.0780645 25.9178153,16.8617218 25.9939518,17.8434235 L26,18 L26,20 C25.999,23.759 22.57,25 20,25 C18.942,25 17.741,24.785 16.691,24.275 C17.009,23.897 17.278,23.477 17.488,23.007 C18.4456,23.427 19.4789867,23.4924578 19.9157784,23.4993188 L20.2043433,23.4963225 C21.2400556,23.4606629 24.334766,23.1116572 24.4936471,20.2325914 L24.5,20 L24.5,18 C24.5,17.7546667 24.3222222,17.5504198 24.0895748,17.5080604 L24,17.5 L17.949,17.501 C17.865,16.999625 17.6554375,16.5434219 17.3544785,16.1605273 L17.22,16.001 L24,16 Z M4,17.5 L3.899344,17.51 C3.77496,17.53528 3.69,17.6028 3.646,17.646 C3.6028,17.69 3.53528,17.77432 3.51,17.89896 L3.5,18 L3.5,20.5 C3.5,21.839 4.087,22.829 5.295,23.525 C6.29135714,24.1007143 7.68434694,24.4479337 9.15851093,24.4945991 L9.5,24.5 L9.93487113,24.4897846 C11.4554554,24.4219073 15.3140372,23.9331951 15.4935181,20.7322803 L15.5,20.499 L15.5,18.001 C15.5,17.7565556 15.3222222,17.5516173 15.0895748,17.5090933 L15,17.501 L4,17.5 Z M9.5,3 C12.538,3 15,5.463 15,8.5 C15,11.537 12.538,14 9.5,14 C6.462,14 4,11.537 4,8.5 C4,5.463 6.462,3 9.5,3 Z M20.5,5 C22.985,5 25,7.015 25,9.5 C25,11.985 22.985,14 20.5,14 C18.015,14 16,11.985 16,9.5 C16,7.015 18.015,5 20.5,5 Z M9.5,4.5 C7.294,4.5 5.5,6.294 5.5,8.5 C5.5,10.706 7.294,12.5 9.5,12.5 C11.706,12.5 13.5,10.706 13.5,8.5 C13.5,6.294 11.706,4.5 9.5,4.5 Z M20.5,6.5 C18.846,6.5 17.5,7.846 17.5,9.5 C17.5,11.154 18.846,12.5 20.5,12.5 C22.154,12.5 23.5,11.154 23.5,9.5 C23.5,7.846 22.154,6.5 20.5,6.5 Z</StreamGeometry>
<DrawingGroup x:Key="placeholder_graphics_legal">
<GeometryDrawing Brush="#FFEF261A"

MODIFY
WalletWasabi.Fluent/ViewModels/Wallets/Home/Tiles/RoundStatusTileViewModel.cs
WalletWasabi.Fluent/ViewModels/Wallets/Home/Tiles/RoundStatusTileViewModel.cs
@@ -15,12 +15,14 @@ namespace WalletWasabi.Fluent.ViewModels.Wallets.Home.Tiles
[AutoNotify] private long _roundId;
[AutoNotify] private RoundPhaseState _roundPhaseState;
[AutoNotify] private DateTimeOffset _roundTimesout;
- [AutoNotify] private TimeSpan _timeLeftTillRoundTimeout;
+ [AutoNotify] private string _timeLeftTillRoundTimeout;
private Money _requiredBTC;
private string _coordinatorFeePercent;
[AutoNotify] private int _peersRegistered;
[AutoNotify] private int _peersNeeded;
+ [AutoNotify] private int _selectedIndex;
+
public RoundStatusTileViewModel(Wallet wallet)
{
_wallet = wallet;
@@ -60,8 +62,24 @@ namespace WalletWasabi.Fluent.ViewModels.Wallets.Home.Tiles
{
TimeSpan left = RoundTimesout - DateTimeOffset.UtcNow;
TimeLeftTillRoundTimeout =
- left > TimeSpan.Zero ? left : TimeSpan.Zero; // Make sure cannot be less than zero.
+ (left > TimeSpan.Zero ? left : TimeSpan.Zero).ToString("hh\\:mm\\:ss"); // Make sure cannot be less than zero.
}); //.DisposeWith(disposables);
+
+ Observable.Interval(TimeSpan.FromSeconds(8))
+ .ObserveOn(RxApp.MainThreadScheduler)
+ .Subscribe(_ =>
+ {
+ var index = SelectedIndex;
+
+ index++;
+
+ if (index > 3)
+ {
+ index = 0;
+ }
+
+ SelectedIndex = index;
+ });
}
private void UpdateStates()

MODIFY
WalletWasabi.Fluent/Views/Wallets/Home/Tiles/BtcPriceTileView.axaml
WalletWasabi.Fluent/Views/Wallets/Home/Tiles/BtcPriceTileView.axaml
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:vm="using:WalletWasabi.Fluent.ViewModels.Wallets.Home.Tiles"
- mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450"
+ mc:Ignorable="d" d:DesignWidth="310" d:DesignHeight="150"
x:CompileBindings="True" x:DataType="vm:BtcPriceTileViewModel"
x:Class="WalletWasabi.Fluent.Views.Wallets.Home.Tiles.BtcPriceTileView">
<Border ClipToBounds="False" CornerRadius="5" Background="{DynamicResource TileRegionColor}" Margin="6" Padding="16" BoxShadow="{DynamicResource InfoBoxShadow}">
<DockPanel>
<TextBlock Text="BTC Price" DockPanel.Dock="Top" />
- <TextBlock Text="{Binding BtcPrice}" />
+ <StackPanel DockPanel.Dock="Left" Orientation="Horizontal" Spacing="5" VerticalAlignment="Center">
+ <PathIcon Data="{StaticResource paper_cash_regular}" Height="30" Width="35" Margin="0 0 20 0" Foreground="{DynamicResource SystemAccentColor}" />
+ <TextBlock Text="{Binding BtcPrice, FallbackValue='53 540.00'}" FontSize="24" />
+ <TextBlock Text="USD" FontSize="24" />
+ </StackPanel>
</DockPanel>
</Border>
</UserControl>

MODIFY
WalletWasabi.Fluent/Views/Wallets/Home/Tiles/RoundStatusTileView.axaml
WalletWasabi.Fluent/Views/Wallets/Home/Tiles/RoundStatusTileView.axaml
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:vm="using:WalletWasabi.Fluent.ViewModels.Wallets.Home.Tiles"
- mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450"
+ mc:Ignorable="d" d:DesignWidth="310" d:DesignHeight="150"
x:CompileBindings="True" x:DataType="vm:RoundStatusTileViewModel"
x:Class="WalletWasabi.Fluent.Views.Wallets.Home.Tiles.RoundStatusTileView">
<Border ClipToBounds="False" CornerRadius="5" Background="{DynamicResource TileRegionColor}" Margin="6" Padding="16" BoxShadow="{DynamicResource InfoBoxShadow}">
- <StackPanel>
- <StackPanel Orientation="Horizontal">
- <TextBlock Text="{Binding PeersRegistered}" />
- <TextBlock Text="/" />
- <TextBlock Text="{Binding PeersNeeded}" />
+ <DockPanel>
+ <TextBlock Text="Mixing Status" DockPanel.Dock="Top" />
+ <Carousel Margin="0 10" VerticalAlignment="Center" SelectedIndex="{Binding SelectedIndex}">
+ <Carousel.PageTransition>
+ <PageSlide Duration="0.25" Orientation="Vertical">
+ <PageSlide.SlideInEasing>
+ <Easing>0.4,0,0.6,1</Easing>
+ </PageSlide.SlideInEasing>
+ <PageSlide.SlideOutEasing>
+ <Easing>0.4,0,0.6,1</Easing>
+ </PageSlide.SlideOutEasing>
+ </PageSlide>
+ </Carousel.PageTransition>
+
+ <StackPanel DockPanel.Dock="Left" Orientation="Horizontal" Spacing="16">
+ <PathIcon Data="{StaticResource people_regular}" Height="50" Width="50" Foreground="{DynamicResource SystemAccentColor}" />
+ <StackPanel VerticalAlignment="Center">
+ <TextBlock Text="{Binding PeersRegistered}" FontSize="24" />
+ <TextBlock Text="Peers waiting to mix" Opacity="0.8" FontSize="12" />
+ </StackPanel>
</StackPanel>
- <TextBlock Text="Peers Registered" />
- <TextBlock Text="{Binding TimeLeftTillRoundTimeout}" />
+ <StackPanel DockPanel.Dock="Left" Orientation="Horizontal" Spacing="16">
+ <PathIcon Data="{StaticResource btc_logo}" Height="50" Width="50" Foreground="{DynamicResource SystemAccentColor}" />
+ <StackPanel VerticalAlignment="Center">
+ <TextBlock Text="4328 BTC" FontSize="24" />
+ <TextBlock Text="Waiting to be mixed" Opacity="0.8" FontSize="12" />
+ </StackPanel>
+ </StackPanel>
- <TextBlock Text="{Binding RoundPhaseState}" />
+ <StackPanel DockPanel.Dock="Left" Orientation="Horizontal" Spacing="16">
+ <PathIcon Data="{StaticResource timer_regular}" Height="50" Width="50" Foreground="{DynamicResource SystemAccentColor}" />
+ <StackPanel VerticalAlignment="Center">
+ <TextBlock Text="{Binding TimeLeftTillRoundTimeout}" FontSize="24" />
+ <TextBlock Text="Until next round" Opacity="0.8" FontSize="12" />
+ </StackPanel>
</StackPanel>
+ </Carousel>
+ </DockPanel>
</Border>
</UserControl>

placeholder round status and btc price tiles.