From 2976560e2cd09b531689b6186bf58a8dbcc19555 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=81d=C3=A1m=20Kov=C3=A1cs?= <kovacsadam07@outlook.hu>
Date: Wed, 30 Aug 2023 16:00:36 +0200
Subject: [PATCH] Settings button style

---
 .../Assets/material/settings2.svg             |  1 +
 .../Resources/Styles.axaml                    | 27 ++++++++++++++-----
 .../Settings/SettingsPane.cs                  |  2 +-
 .../Settings/SettingsViewModel.cs             |  2 +-
 .../Views/MainWindow.axaml                    | 19 ++++++++++---
 .../Views/MainWindow.axaml.cs                 |  2 +-
 6 files changed, 39 insertions(+), 14 deletions(-)
 create mode 100644 src/GuiApp/Avalonia/FileTime.GuiApp.App/Assets/material/settings2.svg

diff --git a/src/GuiApp/Avalonia/FileTime.GuiApp.App/Assets/material/settings2.svg b/src/GuiApp/Avalonia/FileTime.GuiApp.App/Assets/material/settings2.svg
new file mode 100644
index 0000000..3db1464
--- /dev/null
+++ b/src/GuiApp/Avalonia/FileTime.GuiApp.App/Assets/material/settings2.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24"><path d="M12,15.5A3.5,3.5 0 0,1 8.5,12A3.5,3.5 0 0,1 12,8.5A3.5,3.5 0 0,1 15.5,12A3.5,3.5 0 0,1 12,15.5M19.43,12.97C19.47,12.65 19.5,12.33 19.5,12C19.5,11.67 19.47,11.34 19.43,11L21.54,9.37C21.73,9.22 21.78,8.95 21.66,8.73L19.66,5.27C19.54,5.05 19.27,4.96 19.05,5.05L16.56,6.05C16.04,5.66 15.5,5.32 14.87,5.07L14.5,2.42C14.46,2.18 14.25,2 14,2H10C9.75,2 9.54,2.18 9.5,2.42L9.13,5.07C8.5,5.32 7.96,5.66 7.44,6.05L4.95,5.05C4.73,4.96 4.46,5.05 4.34,5.27L2.34,8.73C2.21,8.95 2.27,9.22 2.46,9.37L4.57,11C4.53,11.34 4.5,11.67 4.5,12C4.5,12.33 4.53,12.65 4.57,12.97L2.46,14.63C2.27,14.78 2.21,15.05 2.34,15.27L4.34,18.73C4.46,18.95 4.73,19.03 4.95,18.95L7.44,17.94C7.96,18.34 8.5,18.68 9.13,18.93L9.5,21.58C9.54,21.82 9.75,22 10,22H14C14.25,22 14.46,21.82 14.5,21.58L14.87,18.93C15.5,18.67 16.04,18.34 16.56,17.94L19.05,18.95C19.27,19.03 19.54,18.95 19.66,18.73L21.66,15.27C21.78,15.05 21.73,14.78 21.54,14.63L19.43,12.97Z" /></svg>
\ No newline at end of file
diff --git a/src/GuiApp/Avalonia/FileTime.GuiApp.App/Resources/Styles.axaml b/src/GuiApp/Avalonia/FileTime.GuiApp.App/Resources/Styles.axaml
index 2ac2dfa..a5d3900 100644
--- a/src/GuiApp/Avalonia/FileTime.GuiApp.App/Resources/Styles.axaml
+++ b/src/GuiApp/Avalonia/FileTime.GuiApp.App/Resources/Styles.axaml
@@ -1,7 +1,7 @@
 <Styles
     xmlns="https://github.com/avaloniaui"
-    xmlns:interactions="clr-namespace:FileTime.Core.Interactions;assembly=FileTime.Core.Abstraction"
-    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:interactions="clr-namespace:FileTime.Core.Interactions;assembly=FileTime.Core.Abstraction">
     <Styles.Resources>
         <ResourceDictionary>
             <ResourceDictionary.MergedDictionaries>
@@ -60,6 +60,7 @@
     </Style>
 
     <Style Selector="Grid.SidebarContainerPresenter">
+        <Setter Property="Cursor" Value="Hand" />
         <Setter Property="Background" Value="#01000000" />
     </Style>
 
@@ -67,6 +68,16 @@
         <Setter Property="Background" Value="{DynamicResource AppBackgroundColor}" />
     </Style>
 
+    <Style Selector="Grid.IconButton">
+        <Setter Property="Background" Value="#01000000" />
+        <Setter Property="Width" Value="36" />
+        <Setter Property="Height" Value="36" />
+        <Setter Property="Cursor" Value="Hand" />
+    </Style>
+    <Style Selector="Grid.IconButton:pointerover">
+        <Setter Property="Background" Value="{DynamicResource AppBackgroundColor}" />
+    </Style>
+
     <Style Selector="TextBlock.PathPresenterItem:pointerover">
         <Setter Property="TextDecorations" Value="Underline" />
         <Setter Property="Cursor" Value="Hand" />
@@ -86,10 +97,12 @@
                 <ControlTemplate>
                     <Border>
                         <RadioButton
+                            VerticalAlignment="Center"
                             Foreground="{DynamicResource ForegroundBrush}"
-                            IsChecked="{Binding Path=IsSelected, RelativeSource={RelativeSource TemplatedParent}, Mode=TwoWay}"
-                            VerticalAlignment="Center">
-                            <TextBlock Text="{Binding Text}" x:DataType="interactions:IOptionElement" />
+                            IsChecked="{Binding Path=IsSelected, RelativeSource={RelativeSource TemplatedParent}, Mode=TwoWay}">
+                            <TextBlock
+                                x:DataType="interactions:IOptionElement"
+                                Text="{Binding Text}" />
                         </RadioButton>
                     </Border>
                 </ControlTemplate>
@@ -100,9 +113,9 @@
     <Style Selector="Image.LoadingAnimation">
         <Style.Animations>
             <Animation
-                Duration="0:0:2"
                 Easing="QuadraticEaseInOut"
-                IterationCount="INFINITE">
+                IterationCount="INFINITE"
+                Duration="0:0:2">
                 <KeyFrame Cue="0%">
                     <Setter Property="RotateTransform.Angle" Value="45" />
                 </KeyFrame>
diff --git a/src/GuiApp/Avalonia/FileTime.GuiApp.App/Settings/SettingsPane.cs b/src/GuiApp/Avalonia/FileTime.GuiApp.App/Settings/SettingsPane.cs
index 5f1973f..e89f950 100644
--- a/src/GuiApp/Avalonia/FileTime.GuiApp.App/Settings/SettingsPane.cs
+++ b/src/GuiApp/Avalonia/FileTime.GuiApp.App/Settings/SettingsPane.cs
@@ -2,6 +2,6 @@
 
 public enum SettingsPane
 {
-    Home,
+    General,
     Advanced
 }
\ No newline at end of file
diff --git a/src/GuiApp/Avalonia/FileTime.GuiApp.App/Settings/SettingsViewModel.cs b/src/GuiApp/Avalonia/FileTime.GuiApp.App/Settings/SettingsViewModel.cs
index 8933a26..f954f13 100644
--- a/src/GuiApp/Avalonia/FileTime.GuiApp.App/Settings/SettingsViewModel.cs
+++ b/src/GuiApp/Avalonia/FileTime.GuiApp.App/Settings/SettingsViewModel.cs
@@ -18,7 +18,7 @@ public partial class SettingsViewModel : ISettingsViewModel
 
     public List<SettingsPaneItem> PaneItems { get; } = new()
     {
-        new("Home", SettingsPane.Home),
+        new("General", SettingsPane.General),
         new("Advanced", SettingsPane.Advanced)
     };
 
diff --git a/src/GuiApp/Avalonia/FileTime.GuiApp.App/Views/MainWindow.axaml b/src/GuiApp/Avalonia/FileTime.GuiApp.App/Views/MainWindow.axaml
index 00beeb8..f9c0364 100644
--- a/src/GuiApp/Avalonia/FileTime.GuiApp.App/Views/MainWindow.axaml
+++ b/src/GuiApp/Avalonia/FileTime.GuiApp.App/Views/MainWindow.axaml
@@ -133,7 +133,6 @@
                                     <DataTemplate x:DataType="local1:RootDriveInfo">
                                         <Grid
                                             Classes="SidebarContainerPresenter"
-                                            Cursor="Hand"
                                             PointerPressed="OnHasContainerPointerPressed">
                                             <Grid
                                                 Margin="10,5"
@@ -225,7 +224,6 @@
                                     <DataTemplate x:DataType="vm:PlaceInfo">
                                         <Grid
                                             Classes="SidebarContainerPresenter"
-                                            Cursor="Hand"
                                             PointerPressed="OnHasContainerPointerPressed">
                                             <StackPanel
                                                 Margin="10,5"
@@ -270,7 +268,6 @@
                                     <DataTemplate x:DataType="cloudDrives:CloudDrive">
                                         <Grid
                                             Classes="SidebarContainerPresenter"
-                                            Cursor="Hand"
                                             PointerPressed="OnHasContainerPointerPressed">
                                             <StackPanel
                                                 Margin="10,5"
@@ -302,7 +299,21 @@
                         VerticalAlignment="Bottom"
                         Background="{DynamicResource ContainerBackgroundBrush}"
                         CornerRadius="10">
-                        <Button Click="SettingsButton_OnClick">Settings</Button>
+                        <StackPanel>
+                            <TextBlock Margin="0,0,0,10">Actions</TextBlock>
+                            <StackPanel Orientation="Horizontal">
+                                <Grid
+                                    Classes="IconButton"
+                                    Cursor="Hand"
+                                    PointerPressed="SettingsButtonClicked">
+                                    <Image
+                                        Margin="5"
+                                        HorizontalAlignment="Center"
+                                        VerticalAlignment="Center"
+                                        Source="{SvgImage /Assets/material/settings.svg}" />
+                                </Grid>
+                            </StackPanel>
+                        </StackPanel>
                     </Border>
 
                 </Grid>
diff --git a/src/GuiApp/Avalonia/FileTime.GuiApp.App/Views/MainWindow.axaml.cs b/src/GuiApp/Avalonia/FileTime.GuiApp.App/Views/MainWindow.axaml.cs
index 1e5978b..6c3f887 100644
--- a/src/GuiApp/Avalonia/FileTime.GuiApp.App/Views/MainWindow.axaml.cs
+++ b/src/GuiApp/Avalonia/FileTime.GuiApp.App/Views/MainWindow.axaml.cs
@@ -260,7 +260,7 @@ public partial class MainWindow : Window, IUiAccessor
         }
     }
 
-    private void SettingsButton_OnClick(object? sender, RoutedEventArgs e)
+    private void SettingsButtonClicked(object? sender, PointerPressedEventArgs e)
     {
         var settingsWindow = new SettingsWindow
         {