From 58e7d8f2a39834878f914259084ce3ae64fde0d6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=A9r=C3=B4me=20Saliba?= <wokhan@outlook.com>
Date: Tue, 3 Jan 2023 07:16:21 +0100
Subject: [PATCH] Fixed #147 (also impacting #141). Also improved the themes
 selection visual feedback, and removed useless style (corner radius) on all
 textboxes.

---
 Common/App.config                  |  2 +-
 Common/Config/Settings.Designer.cs |  2 +-
 Common/Config/Settings.settings    |  2 +-
 Common/UI/Theme.xaml               |  2 --
 Common/UI/Themes/ThemeHelper.cs    | 16 ++++++----
 Console/App.xaml                   |  5 +---
 Console/App.xaml.cs                |  4 ++-
 Console/UI/Pages/Status.xaml       |  2 +-
 Console/UI/Windows/Options.xaml    | 48 ++++++++++++++++++------------
 Console/UI/Windows/Options.xaml.cs |  5 ++++
 10 files changed, 52 insertions(+), 36 deletions(-)

diff --git a/Common/App.config b/Common/App.config
index b7bab7f..681ffbc 100644
--- a/Common/App.config
+++ b/Common/App.config
@@ -80,7 +80,7 @@
                 <value>True</value>
             </setting>
             <setting name="Theme" serializeAs="String">
-                <value />
+                <value>Automatic</value>
             </setting>
         </Wokhan.WindowsFirewallNotifier.Common.Config.Settings>
     </userSettings>
diff --git a/Common/Config/Settings.Designer.cs b/Common/Config/Settings.Designer.cs
index e9b4df9..904af0e 100644
--- a/Common/Config/Settings.Designer.cs
+++ b/Common/Config/Settings.Designer.cs
@@ -356,7 +356,7 @@ public bool ShowConnections {
         
         [global::System.Configuration.UserScopedSettingAttribute()]
         [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [global::System.Configuration.DefaultSettingValueAttribute("")]
+        [global::System.Configuration.DefaultSettingValueAttribute("Automatic")]
         public string Theme {
             get {
                 return ((string)(this["Theme"]));
diff --git a/Common/Config/Settings.settings b/Common/Config/Settings.settings
index dace1c6..f3995d4 100644
--- a/Common/Config/Settings.settings
+++ b/Common/Config/Settings.settings
@@ -87,7 +87,7 @@
       <Value Profile="(Default)">True</Value>
     </Setting>
     <Setting Name="Theme" Type="System.String" Scope="User">
-      <Value Profile="(Default)" />
+      <Value Profile="(Default)">Automatic</Value>
     </Setting>
   </Settings>
 </SettingsFile>
\ No newline at end of file
diff --git a/Common/UI/Theme.xaml b/Common/UI/Theme.xaml
index 3ba8c8c..1553582 100644
--- a/Common/UI/Theme.xaml
+++ b/Common/UI/Theme.xaml
@@ -2,8 +2,6 @@
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
              xmlns:ext="clr-namespace:Wokhan.UI.Xaml.Extensibility;assembly=Wokhan.UI">
 
-    <SolidColorBrush x:Key="AccentColorBrush" Color="{DynamicResource SystemParameters.WindowGlassColor}" />
-
     <Style TargetType="CheckBox">
         <Setter Property="OverridesDefaultStyle" Value="True"/>
         <Setter Property="Background" Value="{DynamicResource ButtonBackground}"/>
diff --git a/Common/UI/Themes/ThemeHelper.cs b/Common/UI/Themes/ThemeHelper.cs
index de31b1e..7e811d4 100644
--- a/Common/UI/Themes/ThemeHelper.cs
+++ b/Common/UI/Themes/ThemeHelper.cs
@@ -3,26 +3,30 @@
 using System;
 using System.Linq;
 using System.Windows;
-using System.Windows.Controls.Primitives;
 
 using Wokhan.WindowsFirewallNotifier.Common.Config;
 
 namespace Wokhan.WindowsFirewallNotifier.Common.UI.Themes
 {
-    public static partial class ThemeHelper
+    public static class ThemeHelper
     {
+        public const string THEME_LIGHT = "Light";
+        public const string THEME_DARK = "Dark";
+        public const string THEME_SYSTEM = "System";
+        public const string THEME_AUTO = "Automatic";
+
         public static string GetActiveTheme()
         {
-            if (Settings.Default.Theme is null or "Automatic")
+            if (Settings.Default.Theme is null or "" or THEME_AUTO)
             {
                 if (SystemParameters.HighContrast)
                 {
-                    return "System";
+                    return THEME_SYSTEM;
                 }
 
                 using (RegistryKey? key = Registry.CurrentUser.OpenSubKey("Software\\Microsoft\\Windows\\CurrentVersion\\Themes\\Personalize"))
                 {
-                    return (int?)key?.GetValue("AppsUseLightTheme") == 0 ? "Dark" : "Light";
+                    return (int?)key?.GetValue("AppsUseLightTheme") == 0 ? THEME_DARK : THEME_LIGHT;
                 }
             }
             else
@@ -38,7 +42,7 @@ public static string GetURIForCurrentTheme()
 
         public static string GetURIForTheme(string themeName)
         {
-            if (themeName == "Automatic")
+            if (themeName == THEME_AUTO)
             {
                 return GetURIForCurrentTheme();
             }
diff --git a/Console/App.xaml b/Console/App.xaml
index db1298c..744dd0e 100644
--- a/Console/App.xaml
+++ b/Console/App.xaml
@@ -17,6 +17,7 @@
             <BindingConverters:ObjectToBoolConverter x:Key="objectToBool" />
             <BindingConverters:ValueToVisibilityConverter x:Key="valueToVisibility" />
             <BindingConverters:ValueToVisibilityNegateConverter x:Key="valueToVisibilityNegate" />
+            <BindingConverters:ValueChecker x:Key="valueChecker" />
             
             <system:Double x:Key="ConsoleSizeHeight">600</system:Double>
             <system:Double x:Key="ConsoleSizeWidth">900</system:Double>
@@ -184,10 +185,6 @@
                 </Style.Triggers>
             </Style>
 
-            <Style TargetType="TextBox">
-                <Setter Property="ext:CustomAdorner.CornerRadius" Value="20" />
-            </Style>
-
             <Style x:Key="FilterComboStyle" TargetType="ComboBox">
                 <Setter Property="IsEditable" Value="False" />
                 <Setter Property="Template">
diff --git a/Console/App.xaml.cs b/Console/App.xaml.cs
index 2bdc4f3..6537bd8 100644
--- a/Console/App.xaml.cs
+++ b/Console/App.xaml.cs
@@ -30,10 +30,12 @@ public App() : base()
             Settings.Default.PropertyChanged += SettingsChanged;
         }
 
+        private string currentTheme = "Automatic";
         private void SettingsChanged(object sender, PropertyChangedEventArgs e)
         {
-            if (e.PropertyName == nameof(Settings.Theme))
+            if (e.PropertyName == nameof(Settings.Theme) && currentTheme != Settings.Default.Theme)
             {
+                currentTheme = Settings.Default.Theme;
                 Resources.MergedDictionaries[0].Source = new Uri(ThemeHelper.GetURIForCurrentTheme());
             }
         }
diff --git a/Console/UI/Pages/Status.xaml b/Console/UI/Pages/Status.xaml
index 224e070..a2f7752 100644
--- a/Console/UI/Pages/Status.xaml
+++ b/Console/UI/Pages/Status.xaml
@@ -156,7 +156,7 @@
                     <RadioButton GroupName="rdbOutAll" Padding="0,0,0,10" IsChecked="{Binding AllIsOutAllowed}" Content="Allow" />
                     <RadioButton GroupName="rdbOutAll" IsChecked="{Binding AllIsOutBlocked}" Style="{StaticResource BlockPromptContentStyle}" />
                 </StackPanel>
-                <Rectangle Height="35" Fill="LightGray" Opacity="0.6" Grid.Column="1" Grid.ColumnSpan="4" Grid.Row="7" />
+                <Rectangle Height="35" Fill="{DynamicResource {x:Static SystemColors.ControlBrushKey}}" Opacity="0.6" Grid.Column="1" Grid.ColumnSpan="4" Grid.Row="7" />
                 <CheckBox x:Name="tgStartNotifier" IsEnabled="{Binding OneIsOutBlocked}" Grid.Column="1" Grid.ColumnSpan="4" Grid.Row="7" HorizontalAlignment="Center" Content="Enable notifications (applies for all profiles)*">
                     <CheckBox.Style>
                         <Style TargetType="CheckBox" BasedOn="{StaticResource {x:Type CheckBox}}">
diff --git a/Console/UI/Windows/Options.xaml b/Console/UI/Windows/Options.xaml
index cd76c86..514f3a1 100644
--- a/Console/UI/Windows/Options.xaml
+++ b/Console/UI/Windows/Options.xaml
@@ -8,6 +8,7 @@
       xmlns:controls="clr-namespace:Wokhan.WindowsFirewallNotifier.Console.UI.Controls"
       xmlns:ext="clr-namespace:Wokhan.UI.Xaml.Extensibility;assembly=Wokhan.UI"
       xmlns:uicontrols="clr-namespace:Wokhan.UI.Xaml.Controls;assembly=Wokhan.UI"
+      xmlns:themes="clr-namespace:Wokhan.WindowsFirewallNotifier.Common.UI.Themes;assembly=Wokhan.WindowsFirewallNotifier.Common"
       mc:Ignorable="d" 
       x:Name="me"
       ShowInTaskbar="False"
@@ -17,21 +18,41 @@
       Title="Settings" Margin="10" DataContext="{Binding Path=(settings:Settings.Default)}">
     <Window.Resources>
         <Style x:Key="ThemeBoxStyle" TargetType="ToggleButton">
-            <Setter Property="BorderBrush" Value="Gray" />
+            <!--<Setter Property="BorderBrush" Value="Gray" />
             <Setter Property="BorderThickness" Value="4" />
             <Setter Property="BorderBrush" Value="Gray" />
             <Setter Property="Margin" Value="10" />
-            <Setter Property="Padding" Value="0" />
+            <Setter Property="Padding" Value="0" />-->
+            <Setter Property="Template">
+                <Setter.Value>
+                    <ControlTemplate TargetType="ToggleButton">
+                        <Border BorderBrush="Gray" BorderThickness="4" CornerRadius="5" Padding="0" Margin="10" Name="Border" Background="{TemplateBinding Background}">
+                            <ContentPresenter />
+                        </Border>
+                        <ControlTemplate.Triggers>
+                            <Trigger Property="IsKeyboardFocused" Value="True">
+                                <Setter TargetName="Border" Property="BorderBrush" Value="Gray" />
+                            </Trigger>
+                            <Trigger Property="IsMouseOver" Value="True">
+                                <Setter TargetName="Border" Property="BorderBrush" Value="DarkGray" />
+                            </Trigger>
+                            <Trigger Property="IsChecked" Value="True">
+                                <Setter TargetName="Border" Property="BorderBrush" Value="{DynamicResource AccentColorBrush}" />
+                            </Trigger>
+                        </ControlTemplate.Triggers>
+                    </ControlTemplate>
+                </Setter.Value>
+            </Setter>
             <Setter Property="ContentTemplate">
                 <Setter.Value>
                     <DataTemplate>
-                        <Grid Background="{DynamicResource {x:Static SystemColors.WindowBrushKey}}">
+                        <Grid Background="{DynamicResource {x:Static SystemColors.WindowBrushKey}}" IsHitTestVisible="False" Focusable="False">
                             <Grid.RowDefinitions>
                                 <RowDefinition Height="Auto" />
                                 <RowDefinition Height="Auto" />
                             </Grid.RowDefinitions>
                             <TextBlock Text="{Binding CommandParameter,RelativeSource={RelativeSource Mode=FindAncestor,AncestorType=ToggleButton}}" FontWeight="Bold" Padding="5" VerticalAlignment="Center" Background="{DynamicResource {x:Static SystemColors.ActiveCaptionBrushKey}}" />
-                            <UniformGrid Columns="2" Margin="10" Grid.Row="1" IsHitTestVisible="False">
+                            <UniformGrid Columns="2" Margin="10" Grid.Row="1">
                                 <UniformGrid.LayoutTransform>
                                     <ScaleTransform ScaleX="0.7" ScaleY="0.7" />
                                 </UniformGrid.LayoutTransform>
@@ -50,17 +71,6 @@
                     </DataTemplate>
                 </Setter.Value>
             </Setter>
-            <Style.Triggers>
-                <Trigger Property="IsMouseOver" Value="True">
-                    <Setter Property="BorderBrush" Value="DarkGray" />
-                </Trigger>
-                <Trigger Property="IsChecked" Value="True">
-                    <Setter Property="BorderBrush" Value="{DynamicResource AccentColorBrush}" />
-                </Trigger>
-                <DataTrigger Binding="{Binding Theme,Source=(settings:Settings.Default)}" Value="System">
-                    <Setter Property="IsChecked" Value="True" />
-                </DataTrigger>
-            </Style.Triggers>
         </Style>
     </Window.Resources>
     <DockPanel>
@@ -90,10 +100,10 @@
                 </StackPanel>
                 <TextBlock Text="Theme" Style="{StaticResource SectionHeader}" />
                 <WrapPanel>
-                    <ToggleButton CommandParameter="Dark" Click="SelectTheme" Style="{StaticResource ThemeBoxStyle}" Loaded="ApplyButtonTheme" />
-                    <ToggleButton CommandParameter="Light" Click="SelectTheme" Style="{StaticResource ThemeBoxStyle}" Loaded="ApplyButtonTheme" />
-                    <ToggleButton CommandParameter="Automatic" Click="SelectTheme" Style="{StaticResource ThemeBoxStyle}" Loaded="ApplyButtonTheme" />
-                    <ToggleButton CommandParameter="System" Click="SelectTheme" Style="{StaticResource ThemeBoxStyle}" Loaded="ApplyButtonTheme" />
+                    <ToggleButton CommandParameter="{x:Static themes:ThemeHelper.THEME_DARK}" Click="SelectTheme" Style="{StaticResource ThemeBoxStyle}" Loaded="ApplyButtonTheme" IsChecked="{Binding Theme,Converter={StaticResource valueChecker},ConverterParameter={x:Static themes:ThemeHelper.THEME_DARK},Mode=OneWay}" />
+                    <ToggleButton CommandParameter="{x:Static themes:ThemeHelper.THEME_LIGHT}" Click="SelectTheme" Style="{StaticResource ThemeBoxStyle}" Loaded="ApplyButtonTheme"  IsChecked="{Binding Theme,Converter={StaticResource valueChecker},ConverterParameter={x:Static themes:ThemeHelper.THEME_LIGHT},Mode=OneWay}" />
+                    <ToggleButton CommandParameter="{x:Static themes:ThemeHelper.THEME_AUTO}" Click="SelectTheme" Style="{StaticResource ThemeBoxStyle}" Loaded="ApplyButtonTheme" IsChecked="{Binding Theme,Converter={StaticResource valueChecker},ConverterParameter={x:Static themes:ThemeHelper.THEME_AUTO},Mode=OneWay}" />
+                    <ToggleButton CommandParameter="{x:Static themes:ThemeHelper.THEME_SYSTEM}" Click="SelectTheme" Style="{StaticResource ThemeBoxStyle}" Loaded="ApplyButtonTheme" IsChecked="{Binding Theme,Converter={StaticResource valueChecker},ConverterParameter={x:Static themes:ThemeHelper.THEME_SYSTEM},Mode=OneWay}" />
                 </WrapPanel>
 
                 <!--<StackPanel Margin="10">
diff --git a/Console/UI/Windows/Options.xaml.cs b/Console/UI/Windows/Options.xaml.cs
index 578a055..2bdcc52 100644
--- a/Console/UI/Windows/Options.xaml.cs
+++ b/Console/UI/Windows/Options.xaml.cs
@@ -80,5 +80,10 @@ private void ApplyButtonTheme(object sender, RoutedEventArgs e)
 
             button.Resources.MergedDictionaries.Add(new ResourceDictionary() { Source = new Uri(ThemeHelper.GetURIForTheme(theme)) });
         }
+
+        private void SelectTheme(object sender, System.Windows.Input.MouseButtonEventArgs e)
+        {
+
+        }
     }
 }