(chocolateyGH-685) Add ThemeMode and own ToggleSwitch with icons for …

…dark and light mode
punker76 · Mar 2, 2021 · c0c69f2 · c0c69f2
1 parent 779519b
commit c0c69f2
Show file tree

Hide file tree

Showing 7 changed files with 581 additions and 51 deletions.
diff --git a/Source/ChocolateyGui.Common.Windows/Resources/ControlStyles/ToggleSwitch.xaml b/Source/ChocolateyGui.Common.Windows/Resources/ControlStyles/ToggleSwitch.xaml
diff --git a/Source/ChocolateyGui.Common.Windows/Services/BundledThemeService.cs b/Source/ChocolateyGui.Common.Windows/Services/BundledThemeService.cs
@@ -9,6 +9,7 @@
 using System.Windows.Input;
 using System.Windows.Media;
 using ChocolateyGui.Common.Base;
+using ChocolateyGui.Common.Enums;
 using ChocolateyGui.Common.Windows.Commands;
 using ChocolateyGui.Common.Windows.Theming;
 using ControlzEx.Theming;
@@ -17,6 +18,7 @@ namespace ChocolateyGui.Common.Windows.Services
 {
     public class BundledThemeService : ObservableBase, IBundledThemeService
     {
+        private ThemeMode _themeMode;
         private bool _isLightTheme;
         private Theme _light;
         private Theme _dark;
@@ -46,24 +48,43 @@ public Theme Dark
             private set => SetPropertyValue(ref _dark, value);
         }
 
+        /// <inheritdoc />
+        public ThemeMode ThemeMode
+        {
+            get => _themeMode;
+            private set => SetPropertyValue(ref _themeMode, value);
+        }
+
         /// <inheritdoc />
         public bool IsLightTheme
         {
             get => _isLightTheme;
-            set => SetPropertyValue(ref _isLightTheme, value);
+            set
+            {
+                if (SetPropertyValue(ref _isLightTheme, value))
+                {
+                    ThemeMode = value ? ThemeMode.Light : ThemeMode.Dark;
+                }
+            }
         }
 
         /// <inheritdoc />
-        public void SyncTheme()
+        public void SyncTheme(ThemeMode mode)
         {
-            ThemeManager.Current.ThemeSyncMode = ThemeSyncMode.SyncWithAppMode;
-            ThemeManager.Current.SyncTheme();
+            if (mode == ThemeMode.WindowsDefault)
+            {
+                ThemeManager.Current.ThemeSyncMode = ThemeSyncMode.SyncWithAppMode;
+                ThemeManager.Current.SyncTheme();
 
-            var theme = ThemeManager.Current.DetectTheme();
-            if (theme != null)
+                var theme = ThemeManager.Current.DetectTheme();
+                IsLightTheme = theme is null || theme.BaseColorScheme == ThemeManager.BaseColorLight;
+            }
+            else
             {
-                IsLightTheme = theme.BaseColorScheme == ThemeManager.BaseColorLight;
+                IsLightTheme = mode == ThemeMode.Light;
             }
+
+            ThemeMode = mode;
         }
 
         /// <inheritdoc />

diff --git a/Source/ChocolateyGui.Common.Windows/Services/IBundledThemeService.cs b/Source/ChocolateyGui.Common.Windows/Services/IBundledThemeService.cs
@@ -6,6 +6,7 @@
 // --------------------------------------------------------------------------------------------------------------------
 
 using System.Windows.Input;
+using ChocolateyGui.Common.Enums;
 using ControlzEx.Theming;
 
 namespace ChocolateyGui.Common.Windows.Services
@@ -27,6 +28,11 @@ public interface IBundledThemeService
         /// </summary>
         Theme Dark { get; }
 
+        /// <summary>
+        /// Gets or sets a value indicating whether the current selected theme.
+        /// </summary>
+        ThemeMode ThemeMode { get; }
+
         /// <summary>
         /// Gets or sets a value indicating whether the current selected theme is the light theme.
         /// </summary>
@@ -35,7 +41,8 @@ public interface IBundledThemeService
         /// <summary>
         /// Syncs the application with the "app mode" setting from windows which should be detected at runtime and the current <see cref="T:ControlzEx.Theming.Theme" /> be changed accordingly.
         /// </summary>
-        void SyncTheme();
+        /// <param name="mode">The sync mode for this application.</param>
+        void SyncTheme(ThemeMode mode);
 
         /// <summary>
         /// Generates the themes for this application.

diff --git a/Source/ChocolateyGui.Common.Windows/Views/ShellView.xaml b/Source/ChocolateyGui.Common.Windows/Views/ShellView.xaml
@@ -1,25 +1,24 @@
-<metro:MetroWindow x:Class="ChocolateyGui.Common.Windows.Views.ShellView"
-                   xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-                   xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-                   xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
-                   xmlns:metro="clr-namespace:MahApps.Metro.Controls;assembly=MahApps.Metro"
-                   xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-                   xmlns:cal="http://www.caliburnproject.org"
-                   xmlns:properties="clr-namespace:ChocolateyGui.Common.Properties;assembly=ChocolateyGui.Common"
-                   xmlns:system="clr-namespace:System;assembly=mscorlib"
-                   xmlns:viewModels="clr-namespace:ChocolateyGui.Common.Windows.ViewModels;assembly=ChocolateyGui.Common.Windows"
-                   xmlns:theming="clr-namespace:ChocolateyGui.Common.Windows.Theming"
-                   xmlns:iconPacks="http://metro.mahapps.com/winfx/xaml/iconpacks"
-                   mc:Ignorable="d"
-                   Height="768" Width="1366"
-                   GlowBrush="{StaticResource MahApps.Brushes.Highlight}"
-                   d:DataContext="{d:DesignInstance Type=viewModels:ShellViewModel}"
-                   SaveWindowPosition="True"
-                   TitleForeground="Transparent"
-                   ShowDialogsOverTitleBar="False"
-                   ShowIconOnTitleBar="False"
-                   OverlayOpacity="0.3">
-  <Window.CommandBindings>
+<mah:MetroWindow x:Class="ChocolateyGui.Common.Windows.Views.ShellView"
+                 xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+                 xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+                 xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+                 xmlns:mah="clr-namespace:MahApps.Metro.Controls;assembly=MahApps.Metro"
+                 xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+                 xmlns:cal="http://www.caliburnproject.org"
+                 xmlns:properties="clr-namespace:ChocolateyGui.Common.Properties;assembly=ChocolateyGui.Common"
+                 xmlns:system="clr-namespace:System;assembly=mscorlib"
+                 xmlns:viewModels="clr-namespace:ChocolateyGui.Common.Windows.ViewModels;assembly=ChocolateyGui.Common.Windows"
+                 xmlns:theming="clr-namespace:ChocolateyGui.Common.Windows.Theming"
+                 mc:Ignorable="d"
+                 Height="768" Width="1366"
+                 GlowBrush="{DynamicResource MahApps.Brushes.Highlight}"
+                 d:DataContext="{d:DesignInstance Type=viewModels:ShellViewModel}"
+                 SaveWindowPosition="True"
+                 TitleForeground="Transparent"
+                 ShowDialogsOverTitleBar="False"
+                 ShowIconOnTitleBar="False"
+                 OverlayOpacity="0.3">
+    <Window.CommandBindings>
         <CommandBinding
             Command="NavigationCommands.GoToPage"
             Executed="PerformGoToPage"
@@ -75,33 +74,38 @@
     </Window.InputBindings>
     <Window.Title>
         <PriorityBinding>
-            <Binding Path="ActiveItem.DisplayName"></Binding>
-            <Binding Path="DisplayName"></Binding>
+            <Binding Path="ActiveItem.DisplayName" />
+            <Binding Path="DisplayName" />
         </PriorityBinding>
     </Window.Title>
 
-    <metro:MetroWindow.RightWindowCommands>
-        <metro:WindowCommands>
-            <metro:ToggleSwitch Margin="4 0"
-                                Foreground="{DynamicResource MahApps.Brushes.IdealForeground}"
-                                OnContent="{iconPacks:FontAwesome SunSolid}"
-                                OffContent="{iconPacks:FontAwesome MoonSolid}"
-                                IsOn="{Binding Source={x:Static theming:ThemeAssist.BundledTheme}, Path=IsLightTheme}"
-                                OnCommand="{Binding Source={x:Static theming:ThemeAssist.BundledTheme}, Path=ToggleTheme}"
-                                OffCommand="{Binding Source={x:Static theming:ThemeAssist.BundledTheme}, Path=ToggleTheme}" />
+    <mah:MetroWindow.RightWindowCommands>
+        <mah:WindowCommands>
+            <mah:WindowCommands.Resources>
+                <GridLength x:Key="ToggleSwitchPreContentMargin">0</GridLength>
+                <GridLength x:Key="ToggleSwitchPostContentMargin">0</GridLength>
+                <system:Double x:Key="ToggleSwitchOffStrokeThickness">1</system:Double>
+                <GridLength x:Key="ToggleSwitchContentSpaceMargin">0</GridLength>
+            </mah:WindowCommands.Resources>
+            <mah:ToggleSwitch Style="{StaticResource Chocolatey.Styles.ToggleSwitch.Theme}"
+                              IsOn="{Binding Source={x:Static theming:ThemeAssist.BundledTheme}, Path=IsLightTheme}"
+                              OnCommand="{Binding Source={x:Static theming:ThemeAssist.BundledTheme}, Path=ToggleTheme}"
+                              OffCommand="{Binding Source={x:Static theming:ThemeAssist.BundledTheme}, Path=ToggleTheme}" />
             <Button x:Name="ShowSettings"
                     Visibility="{Binding Path=CanShowSettings, Converter={StaticResource BooleanToVisibility}, ConverterParameter=False}"
-                    IsEnabled="{Binding RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type metro:MetroWindow}}, Path=IsAnyDialogOpen, Converter={StaticResource BooleanInverter}}"
-                    Content="{x:Static properties:Resources.ShellView_ButtonSettings}" ClickMode="Release" cal:Message.Attach="ShowSettings()"/>
+                    IsEnabled="{Binding RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type mah:MetroWindow}}, Path=IsAnyDialogOpen, Converter={StaticResource BooleanInverter}}"
+                    Content="{x:Static properties:Resources.ShellView_ButtonSettings}" ClickMode="Release"
+                    cal:Message.Attach="ShowSettings()" />
             <Button x:Name="ShowAbout"
-                    IsEnabled="{Binding RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type metro:MetroWindow}}, Path=IsAnyDialogOpen, Converter={StaticResource BooleanInverter}}"
-                    Content="{x:Static properties:Resources.ShellView_ButtonAbout}" ClickMode="Release" cal:Message.Attach="ShowAbout()"/>
-        </metro:WindowCommands>
-    </metro:MetroWindow.RightWindowCommands>
+                    IsEnabled="{Binding RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type mah:MetroWindow}}, Path=IsAnyDialogOpen, Converter={StaticResource BooleanInverter}}"
+                    Content="{x:Static properties:Resources.ShellView_ButtonAbout}" ClickMode="Release"
+                    cal:Message.Attach="ShowAbout()" />
+        </mah:WindowCommands>
+    </mah:MetroWindow.RightWindowCommands>
 
     <Border Background="{DynamicResource {x:Static theming:ChocolateyBrushes.BackgroundKey}}">
         <Grid>
             <ContentControl x:Name="ActiveItem" />
         </Grid>
     </Border>
-</metro:MetroWindow>
+</mah:MetroWindow>
diff --git a/Source/ChocolateyGui.Common/ChocolateyGui.Common.csproj b/Source/ChocolateyGui.Common/ChocolateyGui.Common.csproj
@@ -124,6 +124,7 @@
     <Compile Include="Controls\ObservableRingBufferCollection.cs" />
     <Compile Include="Enums\ListViewMode.cs" />
     <Compile Include="Enums\PackagesChangedEventType.cs" />
+    <Compile Include="Enums\ThemeMode.cs" />
     <Compile Include="Hacks.cs" />
     <Compile Include="Models\AppConfiguration.cs" />
     <Compile Include="Models\ChocolateyAggregatedSources.cs" />
@@ -217,7 +218,7 @@
     <Analyzer Include="..\packages\StyleCop.Analyzers.1.0.2\analyzers\dotnet\cs\StyleCop.Analyzers.dll" />
   </ItemGroup>
   <ItemGroup>
-    <SourceRoot Include="$(MSBuildThisFileDirectory)/../"/>
+    <SourceRoot Include="$(MSBuildThisFileDirectory)/../" />
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
 </Project>
diff --git a/Source/ChocolateyGui.Common/Enums/ThemeMode.cs b/Source/ChocolateyGui.Common/Enums/ThemeMode.cs
@@ -0,0 +1,16 @@
+// --------------------------------------------------------------------------------------------------------------------
+// <copyright company="Chocolatey" file="ThemeMode.cs">
+//   Copyright 2017 - Present Chocolatey Software, LLC
+//   Copyright 2014 - 2017 Rob Reynolds, the maintainers of Chocolatey, and RealDimensions Software, LLC
+// </copyright>
+// --------------------------------------------------------------------------------------------------------------------
+
+namespace ChocolateyGui.Common.Enums
+{
+    public enum ThemeMode
+    {
+        WindowsDefault,
+        Dark,
+        Light
+    }
+}
diff --git a/Source/ChocolateyGui/App.xaml.cs b/Source/ChocolateyGui/App.xaml.cs
@@ -11,6 +11,7 @@
 using Autofac;
 using chocolatey;
 using chocolatey.infrastructure.registration;
+using ChocolateyGui.Common.Enums;
 using ChocolateyGui.Common.Services;
 using ChocolateyGui.Common.Windows;
 using ChocolateyGui.Common.Windows.Theming;
@@ -103,7 +104,7 @@ protected override void OnStartup(StartupEventArgs e)
             base.OnStartup(e);
 
             ThemeAssist.BundledTheme.Generate("ChocolateyGui");
-            ThemeAssist.BundledTheme.SyncTheme();
+            ThemeAssist.BundledTheme.SyncTheme(ThemeMode.WindowsDefault); // todo Use the saved mode
         }
     }
 }