#63 Refactor and update UI

src/PicView/Styles/Text.xaml

@@ -6,7 +6,7 @@
     </Style>
     <Style Selector="TextBlock">
         <Setter Property="FontSize" Value="12" />
-        <Setter Property="Foreground" Value="{StaticResource MainColorBrush}" />
+        <Setter Property="Foreground" Value="{StaticResource MainColor}" />
         <Setter Property="FontFamily" Value="avares://PicView/Assets/Fonts#Roboto" />
     </Style>
 </Styles>

src/PicView/Styles/Themes/Dark/FluentDark.axaml

@@ -7,39 +7,29 @@
 
         <!--  Accent Color  -->
         <Color x:Key="AccentColor">#D8FF5A12</Color>
-        <SolidColorBrush Color="{DynamicResource AccentColor}" x:Key="AccentColorBrush" />
 
         <!--  Main Color  -->
         <Color x:Key="MainColor">#FFf6f4f4</Color>
-        <SolidColorBrush Color="{StaticResource MainColor}" x:Key="MainColorBrush" />
 
         <!--  Icon Color  -->
         <Color x:Key="IconColor">#eeebebeb</Color>
-        <SolidColorBrush Color="{StaticResource IconColor}" x:Key="IconColorBrush" />
 
         <!--  Border Brush  -->
         <Color x:Key="BorderColor">#FF3A3A3A</Color>
-        <SolidColorBrush Color="{StaticResource BorderColor}" x:Key="BorderBrush" />
-
         <!--  Background Color Fade  -->
         <Color x:Key="BackgroundColorFade">#2D171717</Color>
-        <SolidColorBrush Color="{StaticResource BackgroundColorFade}" x:Key="BackgroundColorBrushFade" />
 
         <!--  Background Subtle Highlight  -->
         <Color x:Key="BackgroundSubtleHighlight">#691F1C1C</Color>
-        <SolidColorBrush Color="{StaticResource BackgroundSubtleHighlight}" x:Key="BackgroundSubtleHighlightBrush" />
 
         <!--  Background Color Fade  Subtle  -->
         <Color x:Key="BackgroundColorFadeSubtle">#BE222222</Color>
-        <SolidColorBrush Color="{StaticResource BackgroundColorFadeSubtle}" x:Key="BackgroundColorBrushFadeSubtle" />
 
         <!--  Window Background Color  -->
         <Color x:Key="WindowBackgroundColor">#CC161413</Color>
-        <SolidColorBrush Color="{StaticResource WindowBackgroundColor}" x:Key="WindowBackgroundColorBrush" />
 
         <!--  Background Hover Highlight  -->
         <Color x:Key="BackgroundHoverHighlight">#644B4B4B</Color>
-        <SolidColorBrush Color="{StaticResource BackgroundHoverHighlight}" x:Key="BackgroundHoverHighlightBrush" />
 
 
         <ImageBrush

src/PicView/ViewModels/ViewModelBase.cs

@@ -7,5 +7,6 @@ namespace PicView.ViewModels
 {
     public class ViewModelBase : ReactiveObject
     {
+        
     }
 }

src/PicView/Views/CustomTitleBars/WinTitleBar.axaml

@@ -11,8 +11,8 @@
     <DockPanel LastChildFill="True">
 
         <Border
-            Background="{StaticResource BackgroundSubtleHighlightBrush}"
-            BorderBrush="{StaticResource BorderBrush}"
+            Background="{StaticResource BackgroundSubtleHighlight}"
+            BorderBrush="{StaticResource BorderColor}"
             BorderThickness="0,0,1,0"
             Height="30">
             <Image
@@ -24,8 +24,8 @@
         </Border>
 
         <Button
-            Background="{StaticResource BackgroundSubtleHighlightBrush}"
-            BorderBrush="{StaticResource BorderBrush}"
+            Background="{StaticResource BackgroundSubtleHighlight}"
+            BorderBrush="{StaticResource BorderColor}"
             BorderThickness="0,0,1,0"
             DockPanel.Dock="Left"
             Height="30"
@@ -41,8 +41,8 @@
         </Button>
 
         <Button
-            Background="{StaticResource BackgroundSubtleHighlightBrush}"
-            BorderBrush="{StaticResource BorderBrush}"
+            Background="{StaticResource BackgroundSubtleHighlight}"
+            BorderBrush="{StaticResource BorderColor}"
             BorderThickness="0,0,1,0"
             DockPanel.Dock="Left"
             Height="30"
@@ -58,7 +58,7 @@
         </Button>
 
         <Button
-            Background="{StaticResource BackgroundSubtleHighlightBrush}"
+            Background="{StaticResource BackgroundSubtleHighlight}"
             Command="{Binding ExitCommand}"
             DockPanel.Dock="Right"
             Height="30"
@@ -72,8 +72,8 @@
         </Button>
 
         <Button
-            Background="{StaticResource BackgroundSubtleHighlightBrush}"
-            BorderBrush="{StaticResource BorderBrush}"
+            Background="{StaticResource BackgroundSubtleHighlight}"
+            BorderBrush="{StaticResource BorderColor}"
             BorderThickness="0,0,1,0"
             DockPanel.Dock="Right"
             Height="30"
@@ -88,8 +88,8 @@
         </Button>
 
         <Button
-            Background="{StaticResource BackgroundSubtleHighlightBrush}"
-            BorderBrush="{StaticResource BorderBrush}"
+            Background="{StaticResource BackgroundSubtleHighlight}"
+            BorderBrush="{StaticResource BorderColor}"
             BorderThickness="1,0,1,0"
             Command="{Binding MinimizeCommand}"
             DockPanel.Dock="Right"
@@ -104,7 +104,7 @@
         </Button>
 
         <TextBlock
-            Background="{StaticResource BackgroundSubtleHighlightBrush}"
+            Background="{StaticResource BackgroundSubtleHighlight}"
             FontSize="12"
             FontWeight="Bold"
             Height="30"

src/PicView/Views/MainWindow.axaml

@@ -23,19 +23,19 @@
     </Design.DataContext>
 
     <Border
-        BorderBrush="{StaticResource BorderBrush}"
+        BorderBrush="{StaticResource BorderColor}"
         BorderThickness="1"
         CornerRadius="2">
         <DockPanel>
             <customTitleBars:WinTitleBar DockPanel.Dock="Top" />
             <Rectangle
                 DockPanel.Dock="Top"
-                Fill="{StaticResource BorderBrush}"
+                Fill="{StaticResource BorderColor}"
                 Height="1" />
 
             <Border
                 Background="Transparent"
-                BorderBrush="{StaticResource BorderBrush}"
+                BorderBrush="{StaticResource BorderColor}"
                 BorderThickness="0,1,0,0"
                 DockPanel.Dock="Bottom"
                 Height="25">
@@ -47,8 +47,8 @@
                         Width="397">
 
                         <Button
-                            Background="{StaticResource BackgroundSubtleHighlightBrush}"
-                            BorderBrush="{StaticResource BorderBrush}"
+                            Background="{StaticResource BackgroundSubtleHighlight}"
+                            BorderBrush="{StaticResource BorderColor}"
                             BorderThickness="1,0,1,1"
                             Focusable="False"
                             Height="25"
@@ -63,8 +63,8 @@
                         </Button>
 
                         <Button
-                            Background="{StaticResource BackgroundSubtleHighlightBrush}"
-                            BorderBrush="{StaticResource BorderBrush}"
+                            Background="{StaticResource BackgroundSubtleHighlight}"
+                            BorderBrush="{StaticResource BorderColor}"
                             BorderThickness="0,0,1,1"
                             Canvas.Left="55"
                             Focusable="False"
@@ -102,14 +102,14 @@
                         </Button>
 
                         <Canvas
-                            Background="{StaticResource BackgroundColorBrushFadeSubtle}"
+                            Background="{StaticResource BackgroundColorFadeSubtle}"
                             Canvas.Left="109.5"
                             Height="25"
                             Width="180">
 
                             <Button
                                 Background="Transparent"
-                                BorderBrush="{StaticResource BorderBrush}"
+                                BorderBrush="{StaticResource BorderColor}"
                                 BorderThickness="0,0,1,1"
                                 Focusable="False"
                                 Height="25"
@@ -124,7 +124,7 @@
 
                             <Button
                                 Background="Transparent"
-                                BorderBrush="{StaticResource BorderBrush}"
+                                BorderBrush="{StaticResource BorderColor}"
                                 BorderThickness="0,0,1,1"
                                 Canvas.Left="90"
                                 Focusable="False"
@@ -140,8 +140,8 @@
                         </Canvas>
 
                         <Button
-                            Background="{StaticResource BackgroundSubtleHighlightBrush}"
-                            BorderBrush="{StaticResource BorderBrush}"
+                            Background="{StaticResource BackgroundSubtleHighlight}"
+                            BorderBrush="{StaticResource BorderColor}"
                             BorderThickness="0,0,1,1"
                             Canvas.Left="289"
                             Focusable="False"
@@ -156,8 +156,8 @@
                         </Button>
 
                         <Button
-                            Background="{StaticResource BackgroundSubtleHighlightBrush}"
-                            BorderBrush="{StaticResource BorderBrush}"
+                            Background="{StaticResource BackgroundSubtleHighlight}"
+                            BorderBrush="{StaticResource BorderColor}"
                             BorderThickness="0,0,1,1"
                             Canvas.Left="343"
                             Focusable="False"