Merge pull request #61 from Milkitic/develop

better support for navbar
Milkitic · Nov 15, 2020 · e630bc9 · e630bc9
2 parents 4547fb5 + 44f8ee0
commit e630bc9
Show file tree

Hide file tree

Showing 8 changed files with 96 additions and 3 deletions.
diff --git a/OsuPlayer.Common/Configuration/GeneralSection.cs b/OsuPlayer.Common/Configuration/GeneralSection.cs
@@ -13,6 +13,7 @@ public class GeneralSection
         public string CustomSongsPath { get; set; } = Path.Combine(Domain.CurrentPath, "Songs");
         public bool? ExitWhenClosed { get; set; } = null;
         public bool FirstOpen { get; set; } = true;
+        public bool IsNavigationCollapsed { get; set; }
         public Point? MiniLastPosition { get; set; }
         public Rectangle? MiniWorkingArea { get; set; }
     }

diff --git a/OsuPlayer.Wpf/Converters/GetOutlinedTextConverter.cs b/OsuPlayer.Wpf/Converters/GetOutlinedTextConverter.cs
@@ -0,0 +1,49 @@
+using System;
+using System.Globalization;
+using System.Linq;
+using System.Windows.Data;
+
+namespace Milky.OsuPlayer.Converters
+{
+    class GetOutlinedTextConverter : IValueConverter
+    {
+        public object Convert(object value, Type targetType, object parameter, CultureInfo culture)
+        {
+            if (value is string s)
+            {
+                string result = null;
+                var split = s.Split(' ');
+                if (split.Length > 1)
+                {
+                    result = (split[0].Substring(0, 1) + split[1].Substring(0, 1)).ToUpper();
+                }
+                else if (split.Length > 0)
+                {
+                    if (split[0].Length > 1)
+                    {
+                        result = split[0].Substring(0, 2);
+                    }
+                    else
+                        result = split[0].Substring(0, 1);
+                }
+
+                if (result == null) return null;
+                if (result.All(k => k >= 32 && k <= 255))
+                {
+                    return result;
+                }
+                else
+                {
+                    return result.Substring(0, 1);
+                }
+            }
+
+            return null;
+        }
+
+        public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture)
+        {
+            throw new NotImplementedException();
+        }
+    }
+}
diff --git a/OsuPlayer.Wpf/OsuPlayer.Wpf.csproj b/OsuPlayer.Wpf/OsuPlayer.Wpf.csproj
@@ -172,6 +172,7 @@
     <Reference Include="PresentationFramework" />
   </ItemGroup>
   <ItemGroup>
+    <Compile Include="Converters\GetOutlinedTextConverter.cs" />
     <Compile Include="Converters\LocalizedFontFamilyConverter.cs" />
     <Compile Include="Converters\RoundedNumberConverter.cs" />
     <Compile Include="Utils\CompoundUtil.cs" />

diff --git a/OsuPlayer.Wpf/Styles/ConverterDictionary.xaml b/OsuPlayer.Wpf/Styles/ConverterDictionary.xaml
@@ -22,4 +22,5 @@
     <converters:Multi_ListViewSelectAndScrollConverter x:Key="Multi_ListViewSelectAndScrollConverter" />
     <converters:LocalizedFontFamilyConverter x:Key="LocalizedFontFamilyConverter" />
     <converters:RoundedNumberConverter x:Key="RoundedNumberConverter" />
+    <converters:GetOutlinedTextConverter x:Key="GetOutlinedTextConverter" />
 </ResourceDictionary>
diff --git a/OsuPlayer.Wpf/UiComponents/RadioButtonComponent/SwitchRadio.xaml b/OsuPlayer.Wpf/UiComponents/RadioButtonComponent/SwitchRadio.xaml
@@ -140,6 +140,8 @@
         <Setter Property="MouseOverIconColor" Value="#DC498D" />
         <Setter Property="TargetPageSingleton" Value="True" />
         <Setter Property="Scope" Value="Nav" />
+        <!--<Setter Property="UseLayoutRounding" Value="True" />-->
+        <Setter Property="SnapsToDevicePixels" Value="True" />
     </Style>
     <Style
         x:Key="ConfigSwitchRadio"

diff --git a/OsuPlayer.Wpf/ViewModels/MainWindowViewModel.cs b/OsuPlayer.Wpf/ViewModels/MainWindowViewModel.cs
@@ -2,6 +2,7 @@
 using Milky.OsuPlayer.Presentation.Interaction;
 using System.Collections.ObjectModel;
 using System.Windows.Input;
+using Milky.OsuPlayer.Common.Configuration;
 
 namespace Milky.OsuPlayer.ViewModels
 {
@@ -34,6 +35,7 @@ public bool IsNavigationCollapsed
             get => _isNavigationCollapsed;
             set
             {
+                if (_isNavigationCollapsed == value) return;
                 _isNavigationCollapsed = value;
                 OnPropertyChanged();
             }
@@ -68,6 +70,8 @@ public ICommand CollapseCommand
                     Execute.OnUiThread(() =>
                     {
                         IsNavigationCollapsed = !IsNavigationCollapsed;
+                        AppSettings.Default.General.IsNavigationCollapsed = IsNavigationCollapsed;
+                        AppSettings.SaveDefault();
                     });
                 });
             }

diff --git a/OsuPlayer.Wpf/Windows/MainWindow.xaml b/OsuPlayer.Wpf/Windows/MainWindow.xaml
@@ -238,9 +238,6 @@
                                         VerticalAlignment="Center"
                                         CheckedIconColor="#4090A0"
                                         Content="{Binding Name}"
-                                        IconSize="18"
-                                        IconTemplate="{StaticResource CollectionTempl}"
-                                        Style="{StaticResource OsuSwitchRadio}"
                                         TargetFrameControl="MainFrame"
                                         TargetPageData="{Binding Id}"
                                         TargetPageSingleton="False"
@@ -251,6 +248,43 @@
                                                 <Binding RelativeSource="{RelativeSource Self}" />
                                             </MultiBinding>
                                         </radioButtonComponent:SwitchRadio.Tag>
+                                        <radioButtonComponent:SwitchRadio.Style>
+                                            <Style BasedOn="{StaticResource OsuSwitchRadio}" TargetType="radioButtonComponent:SwitchRadio">
+                                                <Style.Triggers>
+                                                    <DataTrigger Binding="{Binding Path=DataContext.IsNavigationCollapsed, RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type local:MainWindow}}}" Value="False">
+                                                        <Setter Property="IconTemplate" Value="{StaticResource CollectionTempl}" />
+                                                        <Setter Property="IconSize" Value="18" />
+                                                    </DataTrigger>
+                                                    <!--<Setter Property="MouseOverBackground" Value="White" />
+                                                    <Setter Property="MouseOverForeground" Value="#303030" />
+                                                    <Setter Property="MouseOverIconColor" Value="#DC498D" />-->
+                                                    <DataTrigger Binding="{Binding Path=DataContext.IsNavigationCollapsed, RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type local:MainWindow}}}" Value="True">
+                                                        <Setter Property="IconTemplate">
+                                                            <Setter.Value>
+                                                                <ControlTemplate>
+                                                                    <Border
+                                                                        Width="40"
+                                                                        Height="40"
+                                                                        Background="{TemplateBinding Foreground}"
+                                                                        CornerRadius="20">
+                                                                        <Label
+                                                                            Margin="1,0.5,0,0"
+                                                                            HorizontalAlignment="Center"
+                                                                            VerticalAlignment="Center"
+                                                                            Content="{Binding Name, Converter={StaticResource GetOutlinedTextConverter}}"
+                                                                            FontSize="22"
+                                                                            FontWeight="Bold"
+                                                                            Foreground="#303030" />
+                                                                    </Border>
+                                                                </ControlTemplate>
+                                                            </Setter.Value>
+                                                        </Setter>
+                                                        <Setter Property="Margin" Value="-2,0,0,1" />
+                                                        <Setter Property="IconSize" Value="20" />
+                                                    </DataTrigger>
+                                                </Style.Triggers>
+                                            </Style>
+                                        </radioButtonComponent:SwitchRadio.Style>
                                     </radioButtonComponent:SwitchRadio>
                                 </ControlTemplate>
                                 <Style TargetType="{x:Type ListViewItem}">

diff --git a/OsuPlayer.Wpf/Windows/MainWindow.xaml.cs b/OsuPlayer.Wpf/Windows/MainWindow.xaml.cs
@@ -53,6 +53,7 @@ public MainWindow()
         {
             InitializeComponent();
             ViewModel = (MainWindowViewModel)DataContext;
+            ViewModel.IsNavigationCollapsed = AppSettings.Default.General.IsNavigationCollapsed;
             LyricWindow = new LyricWindow(this);
             if (AppSettings.Default.Lyric.EnableLyric)
                 LyricWindow.Show();