unify navbar with osx and windows.
MODIFY
WalletWasabi.Fluent.Desktop/WalletWasabi.Fluent.Desktop.csproj
WalletWasabi.Fluent.Desktop/WalletWasabi.Fluent.Desktop.csproj
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<OutputType>WinExe</OutputType>
- <TargetFramework>net5</TargetFramework>
+ <TargetFramework>net5.0</TargetFramework>
<Nullable>enable</Nullable>
<LangVersion>latest</LangVersion>
<NoWarn>1701;1702;1705;1591;1573;CA1031</NoWarn>

MODIFY
WalletWasabi.Fluent/Views/MainView.axaml
WalletWasabi.Fluent/Views/MainView.axaml
xmlns:i="using:Avalonia.Xaml.Interactivity"
xmlns:behaviors="using:WalletWasabi.Fluent.Behaviors"
xmlns:vm="using:WalletWasabi.Fluent.ViewModels"
- xmlns:ex="using:WalletWasabi.Fluent.Helpers"
mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450"
x:DataType="vm:MainViewModel"
x:CompileBindings="True"
x:Class="WalletWasabi.Fluent.Views.MainView">
<Panel>
<SplitView
- IsEnabled="{Binding IsMainContentEnabled}"
+ IsEnabled="{Binding IsMainContentEnabled}" CompactPaneLength="68" OpenPaneLength="280"
IsPaneOpen="{Binding NavBar.IsOpen, Mode=TwoWay}">
- <SplitView.CompactPaneLength>
- <ex:Platform>
- <ex:Platform.Default>
- <sys:Double>48</sys:Double>
- </ex:Platform.Default>
- <ex:Platform.Osx>
- <sys:Double>68</sys:Double>
- </ex:Platform.Osx>
- </ex:Platform>
- </SplitView.CompactPaneLength>
<i:Interaction.Behaviors>
<behaviors:SplitViewAutoBehavior ToggleAction="{Binding NavBar.ToggleAction, Mode=OneWayToSource}"
CollapseOnClickAction="{Binding NavBar.CollapseOnClickAction, Mode=OneWayToSource}"

MODIFY
WalletWasabi.Fluent/Views/NavBar/NavBar.axaml
WalletWasabi.Fluent/Views/NavBar/NavBar.axaml
</UserControl.Styles>
<DockPanel Margin="0 0 0 4">
<StackPanel DockPanel.Dock="Top" Spacing="5">
- <Panel Height="30" IsVisible="{h:Platform {x:Static h:Const.False}, Osx={x:Static h:Const.True}}" />
- <Button Classes="NavButton" Command="{Binding DoToggleAction}" IsVisible="{h:Platform {x:Static h:Const.False}, Osx={x:Static h:Const.False}}">
- <PathIcon Data="{StaticResource navigation_regular}" Width="16" />
- </Button>
+ <Panel Height="30" />
+ <Border Padding="12" Margin="0 -10 0 0">
+ <Panel>
+ <Panel Width="45" HorizontalAlignment="Left">
+ <PathIcon Data="{StaticResource wasabi_logo}" HorizontalAlignment="Left" Height="20" Width="20" />
+ </Panel>
+ <TextBlock Text="Wasabi Wallet" Classes="h6" VerticalAlignment="Center" FontWeight="SemiBold" Margin="65 0 0 0" />
+ </Panel>
+ </Border>
<c:NavBarListBox Items="{Binding TopItems}" SelectedItem="{Binding SelectedItem}" />
<Separator />
</StackPanel>

MODIFY
WalletWasabi.Fluent/WalletWasabi.Fluent.csproj
WalletWasabi.Fluent/WalletWasabi.Fluent.csproj
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
- <TargetFramework>net5</TargetFramework>
+ <TargetFramework>net5.0</TargetFramework>
<Nullable>enable</Nullable>
<LangVersion>latest</LangVersion>
<NoWarn>1701;1702;1705;1591;1573;CA1031</NoWarn>

unify navbar with osx and windows.