bottom left items
MODIFY
WalletWasabi.Fluent/ViewModels/Login/FullScreenLoginViewModel.cs
WalletWasabi.Fluent/ViewModels/Login/FullScreenLoginViewModel.cs
@@ -4,7 +4,9 @@ using System.Linq;
using System.Reactive.Disposables;
using System.Reactive.Linq;
using ReactiveUI;
+using WalletWasabi.Fluent.ViewModels.AddWallet;
using WalletWasabi.Fluent.ViewModels.NavBar;
+using WalletWasabi.Fluent.ViewModels.Search;
using WalletWasabi.Fluent.ViewModels.Wallets;
using WalletWasabi.Tor.Socks5.Models.Fields.OctetFields;
using WalletWasabi.Wallets;
@@ -18,22 +20,18 @@ namespace WalletWasabi.Fluent.ViewModels.Login
public FullScreenLoginViewModel(
WalletManager walletManager,
ObservableCollection<WalletViewModelBase> wallets,
- ObservableCollection<NavBarItemViewModel> bottomItems)
+ SearchPageViewModel actionCenter,
+ AddWalletPageViewModel addWallet)
: base(walletManager)
{
Wallets = wallets;
- BottomItems = bottomItems;
-
- this.WhenAnyValue(x => x.SelectedBottomItem)
- .ObserveOn(RxApp.MainThreadScheduler)
- .Subscribe(x =>
- {
- x?.OpenCommand.Execute(null);
- });
+ ActionCenter = actionCenter;
+ AddWallet = addWallet;
}
public ObservableCollection<WalletViewModelBase> Wallets { get; }
- public ObservableCollection<NavBarItemViewModel> BottomItems { get; }
+ public SearchPageViewModel ActionCenter { get; }
+ public AddWalletPageViewModel AddWallet { get; }
protected override void OnNavigatedTo(bool inStack, CompositeDisposable disposable)
{

MODIFY
WalletWasabi.Fluent/ViewModels/MainViewModel.cs
WalletWasabi.Fluent/ViewModels/MainViewModel.cs
@@ -115,7 +115,7 @@ namespace WalletWasabi.Fluent.ViewModels
}
else
{
- FullScreen.To(new FullScreenLoginViewModel(global.WalletManager, _walletManager.Items, _navBar.BottomItems));
+ FullScreen.To(new FullScreenLoginViewModel(global.WalletManager, _walletManager.Items, _searchPage, _addWalletPage));
}
}

MODIFY
WalletWasabi.Fluent/Views/Login/FullScreenLoginView.axaml
WalletWasabi.Fluent/Views/Login/FullScreenLoginView.axaml
</ComboBox.ItemTemplate>
</ComboBox>
- <ListBox Items="{Binding BottomItems}"
- SelectedItem="{Binding SelectedBottomItem}"
+ <StackPanel Orientation="Horizontal"
HorizontalAlignment="Left"
- VerticalAlignment="Bottom"
- Background="Transparent">
- <ListBox.ItemsPanel>
- <ItemsPanelTemplate>
- <StackPanel Orientation="Horizontal"/>
- </ItemsPanelTemplate>
- </ListBox.ItemsPanel>
- <ListBox.ItemTemplate>
- <DataTemplate x:DataType="navBar:NavBarItemViewModel">
+ VerticalAlignment="Bottom">
+ <StackPanel.Styles>
+ <Style Selector="Button.bottom"
+ x:DataType="navBar:NavBarItemViewModel">
+ <Setter Property="Command" Value="{Binding OpenCommand}"/>
+ <Setter Property="Padding" Value="10"/>
+ <Setter Property="Content">
+ <Setter.Value>
+ <Template>
<PathIcon Data="{Binding IconName, Converter={x:Static conv:NavBarIconConverter.Instance}}"
ToolTip.Tip="{Binding Title}"
- Background="Transparent"/>
- </DataTemplate>
- </ListBox.ItemTemplate>
- </ListBox>
+ Width="25"
+ Height="25"/>
+ </Template>
+ </Setter.Value>
+ </Setter>
+ </Style>
+ </StackPanel.Styles>
+
+ <Button DataContext="{Binding ActionCenter}" Classes="invisible bottom"/>
+ <Button DataContext="{Binding AddWallet}" Classes="invisible bottom"/>
+ </StackPanel>
</Panel>
</c:ContentArea>
</UserControl>

bottom left items