Feature: Improve light theme readability

BornToBeRoot · BornToBeRoot · commit 102083ef1884 · 2025-10-17T19:00:21.000+02:00
diff --git a/Source/NETworkManager.Localization/Resources/Strings.Designer.cs b/Source/NETworkManager.Localization/Resources/Strings.Designer.cs
diff --git a/Source/NETworkManager.Localization/Resources/Strings.resx b/Source/NETworkManager.Localization/Resources/Strings.resx
@@ -3993,4 +3993,7 @@ Right-click for more options.</value>
   <data name="CollapseAll" xml:space="preserve">
     <value>Collapse all</value>
   </data>
+  <data name="HelpMessage_UseCustomThemes" xml:space="preserve">
+    <value>Use custom themes to personalize the appearance of the application. You can edit or add theme in the "Program Folder &gt; Themes" directory. For more details, refer to the documentation.</value>
+  </data>
 </root>
diff --git a/Source/NETworkManager/Resources/Styles/TextBlockStyles.xaml b/Source/NETworkManager/Resources/Styles/TextBlockStyles.xaml
@@ -7,7 +7,7 @@
 
     <Style x:Key="HeaderTextBlock" TargetType="{x:Type TextBlock}" BasedOn="{StaticResource DefaultTextBlock}">
         <Setter Property="FontFamily" Value="{StaticResource MahApps.Fonts.Family.Header}" />
-        <Setter Property="Foreground" Value="{StaticResource MahApps.Brushes.Gray5}" />
+        <Setter Property="Foreground" Value="{DynamicResource MahApps.Brushes.Gray5}" />
         <Setter Property="FontSize" Value="18" />
         <Setter Property="Margin" Value="0,0,0,10" />
     </Style>
diff --git a/Source/NETworkManager/ViewModels/SettingsAppearanceViewModel.cs b/Source/NETworkManager/ViewModels/SettingsAppearanceViewModel.cs
@@ -1,8 +1,8 @@
-﻿using System.ComponentModel;
+﻿using NETworkManager.Models.Appearance;
+using NETworkManager.Settings;
+using System.ComponentModel;
 using System.Linq;
 using System.Windows.Data;
-using NETworkManager.Models.Appearance;
-using NETworkManager.Settings;
 
 namespace NETworkManager.ViewModels;
 
@@ -26,7 +26,7 @@ public ThemeColorInfo SelectedTheme
 
             if (!_isLoading && !UseCustomTheme)
             {
-                AppearanceManager.ChangeTheme(value.Name);
+                AppearanceManager.ChangeTheme(value.Name, SelectedAccent.Name);
                 SettingsManager.Current.Appearance_Theme = value.Name;
             }
 
@@ -35,7 +35,6 @@ public ThemeColorInfo SelectedTheme
         }
     }
 
-
     public ICollectionView Accents { get; }
 
     private AccentColorInfo _selectedAccent;
@@ -50,7 +49,7 @@ public AccentColorInfo SelectedAccent
 
             if (!_isLoading && !UseCustomTheme)
             {
-                AppearanceManager.ChangeAccent(value.Name);
+                AppearanceManager.ChangeTheme(SelectedTheme.Name, value.Name);
                 SettingsManager.Current.Appearance_Accent = value.Name;
             }
 
@@ -95,7 +94,7 @@ public ThemeInfo SelectedCustomTheme
 
             if (!_isLoading && UseCustomTheme)
             {
-                AppearanceManager.ChangeTheme(value);
+                AppearanceManager.ChangeTheme(value.Name);
                 SettingsManager.Current.Appearance_CustomThemeName = value.Name;
             }
 
diff --git a/Source/NETworkManager/Views/SettingsAppearanceView.xaml b/Source/NETworkManager/Views/SettingsAppearanceView.xaml
@@ -15,15 +15,15 @@
         <converters:BooleanReverseConverter x:Key="BooleanReverseConverter" />
     </UserControl.Resources>
     <StackPanel>
-        <TextBlock Text="{x:Static localization:Strings.Theme}" Style="{StaticResource HeaderTextBlock}" />
-        <ListView ScrollViewer.HorizontalScrollBarVisibility="Disabled" ItemsSource="{Binding Themes}"
-                  SelectedItem="{Binding SelectedTheme}"
-                  IsEnabled="{Binding UseCustomTheme, Converter={StaticResource BooleanReverseConverter}}"
+        <TextBlock Text="{x:Static Member=localization:Strings.Theme}" Style="{StaticResource ResourceKey=HeaderTextBlock}" />
+        <ListView ScrollViewer.HorizontalScrollBarVisibility="Disabled" ItemsSource="{Binding Path=Themes}"
+                  SelectedItem="{Binding Path=SelectedTheme}"
+                  IsEnabled="{Binding Path=UseCustomTheme, Converter={StaticResource ResourceKey=BooleanReverseConverter}}"
                   VerticalAlignment="Top" BorderThickness="0" SelectionMode="Single" Margin="0,0,0,20">
             <ListView.ItemTemplate>
                 <DataTemplate>
                     <Rectangle Width="48" Height="48" Margin="-1,2" Fill="{Binding Color}"
-                               ToolTip="{Binding Name, Converter={StaticResource ThemeToStringConverter}}" />
+                               ToolTip="{Binding Name, Converter={StaticResource ResourceKey=ThemeToStringConverter}}" />
                 </DataTemplate>
             </ListView.ItemTemplate>
             <ListView.ItemsPanel>
@@ -39,15 +39,15 @@
             </ListBox.Template>
             <!-- /BUGFIX-->
         </ListView>
-        <TextBlock Text="{x:Static localization:Strings.Accent}" Style="{StaticResource HeaderTextBlock}" />
-        <ListView ScrollViewer.HorizontalScrollBarVisibility="Disabled" ItemsSource="{Binding Accents}"
-                  SelectedItem="{Binding SelectedAccent}"
-                  IsEnabled="{Binding UseCustomTheme, Converter={StaticResource BooleanReverseConverter}}"
+        <TextBlock Text="{x:Static localization:Strings.Accent}" Style="{StaticResource ResourceKey=HeaderTextBlock}" />
+        <ListView ScrollViewer.HorizontalScrollBarVisibility="Disabled" ItemsSource="{Binding Path=Accents}"
+                  SelectedItem="{Binding Path=SelectedAccent}"
+                  IsEnabled="{Binding Path=UseCustomTheme, Converter={StaticResource ResourceKey=BooleanReverseConverter}}"
                   VerticalAlignment="Top" BorderThickness="0" SelectionMode="Single" Margin="0,0,0,20">
             <ListView.ItemTemplate>
                 <DataTemplate>
-                    <Rectangle Width="48" Height="48" Margin="-1,2" Fill="{Binding Color}"
-                               ToolTip="{Binding Name,Converter={StaticResource AccentToStringConverter}}" />
+                    <Rectangle Width="48" Height="48" Margin="-1,2" Fill="{Binding Path=Color}"
+                               ToolTip="{Binding Path=Name,Converter={StaticResource ResourceKey=AccentToStringConverter}}" />
                 </DataTemplate>
             </ListView.ItemTemplate>
             <ListView.ItemsPanel>
@@ -63,26 +63,34 @@
             </ListBox.Template>
             <!-- /BUGFIX-->
         </ListView>
-        <TextBlock Style="{StaticResource HeaderTextBlock}" Text="{x:Static localization:Strings.CustomThemes}" />
-        <mah:ToggleSwitch Header="{x:Static localization:Strings.UseCustomThemes}" IsOn="{Binding UseCustomTheme}"
-                          Margin="0,0,0,10" />
-        <ComboBox ItemsSource="{Binding CustomThemes}" SelectedItem="{Binding SelectedCustomTheme}"
-                  IsEnabled="{Binding UseCustomTheme}" Width="250" HorizontalAlignment="Left" Margin="0,0,0,20">
+        <TextBlock Style="{StaticResource ResourceKey=HeaderTextBlock}" Text="{x:Static Member=localization:Strings.CustomThemes}" />
+        <StackPanel Orientation="Horizontal" Margin="0,0,0,10">
+            <mah:ToggleSwitch Header="{x:Static Member=localization:Strings.UseCustomThemes}" IsOn="{Binding Path=UseCustomTheme}" />
+            <Rectangle Width="24" Height="24"
+                       ToolTip="{x:Static Member=localization:Strings.HelpMessage_UseCustomThemes}"
+                       Style="{StaticResource ResourceKey=HelpImageRectangle}" VerticalAlignment="Top" Margin="10,0,0,0">
+                <Rectangle.Resources>
+                    <Style TargetType="{x:Type TypeName=ToolTip}" BasedOn="{StaticResource ResourceKey=HelpToolTip}" />
+                </Rectangle.Resources>
+            </Rectangle>
+        </StackPanel>
+        <ComboBox ItemsSource="{Binding Path=CustomThemes}" SelectedItem="{Binding Path=SelectedCustomTheme}"
+                  IsEnabled="{Binding Path=UseCustomTheme}" Width="250" HorizontalAlignment="Left" Margin="0,0,0,20">
             <ComboBox.ItemTemplate>
                 <DataTemplate>
-                    <TextBlock Text="{Binding DisplayName}" d:DataContext="{d:DesignInstance appearance:ThemeInfo}" />
+                    <TextBlock Text="{Binding Path=DisplayName}" d:DataContext="{d:DesignInstance appearance:ThemeInfo}" />
                 </DataTemplate>
             </ComboBox.ItemTemplate>
         </ComboBox>
-        <TextBlock Style="{StaticResource HeaderTextBlock}" Text="{x:Static localization:Strings.PowerShell}" />
+        <TextBlock Style="{StaticResource ResourceKey=HeaderTextBlock}" Text="{x:Static Member=localization:Strings.PowerShell}" />
         <StackPanel Orientation="Horizontal">
-            <mah:ToggleSwitch Header="{x:Static localization:Strings.ApplyThemeToPowerShellConsole}"
-                              IsOn="{Binding PowerShellModifyGlobalProfile}" />
+            <mah:ToggleSwitch Header="{x:Static Member=localization:Strings.ApplyThemeToPowerShellConsole}"
+                              IsOn="{Binding Path=PowerShellModifyGlobalProfile}" />
             <Rectangle Width="24" Height="24"
-                       ToolTip="{x:Static localization:Strings.HelpMessage_ApplyThemeToPowerShellConsole}"
-                       Style="{StaticResource HelpImageRectangle}" VerticalAlignment="Top" Margin="10,0,0,0">
+                       ToolTip="{x:Static Member=localization:Strings.HelpMessage_ApplyThemeToPowerShellConsole}"
+                       Style="{StaticResource ResourceKey=HelpImageRectangle}" VerticalAlignment="Top" Margin="10,0,0,0">
                 <Rectangle.Resources>
-                    <Style TargetType="{x:Type ToolTip}" BasedOn="{StaticResource HelpToolTip}" />
+                    <Style TargetType="{x:Type TypeName=ToolTip}" BasedOn="{StaticResource ResourceKey=HelpToolTip}" />
                 </Rectangle.Resources>
             </Rectangle>
         </StackPanel>

Original file line number	Diff line number	Diff line change
`@@ -1,8 +1,8 @@`
`1`		`-using System.ComponentModel;`
	`1`	`+using NETworkManager.Models.Appearance;`
	`2`	`+using NETworkManager.Settings;`
	`3`	`+using System.ComponentModel;`
`2`	`4`	`using System.Linq;`
`3`	`5`	`using System.Windows.Data;`
`4`		`-using NETworkManager.Models.Appearance;`
`5`		`-using NETworkManager.Settings;`
`6`	`6`
`7`	`7`	`namespace NETworkManager.ViewModels;`
`8`	`8`
`@@ -26,7 +26,7 @@ public ThemeColorInfo SelectedTheme`
`26`	`26`
`27`	`27`	`if (!_isLoading && !UseCustomTheme)`
`28`	`28`	`{`
`29`		`- AppearanceManager.ChangeTheme(value.Name);`
	`29`	`+ AppearanceManager.ChangeTheme(value.Name, SelectedAccent.Name);`
`30`	`30`	`SettingsManager.Current.Appearance_Theme = value.Name;`
`31`	`31`	`}`
`32`	`32`
`@@ -35,7 +35,6 @@ public ThemeColorInfo SelectedTheme`
`35`	`35`	`}`
`36`	`36`	`}`
`37`	`37`
`38`		`-`
`39`	`38`	`public ICollectionView Accents { get; }`
`40`	`39`
`41`	`40`	`private AccentColorInfo _selectedAccent;`
`@@ -50,7 +49,7 @@ public AccentColorInfo SelectedAccent`
`50`	`49`
`51`	`50`	`if (!_isLoading && !UseCustomTheme)`
`52`	`51`	`{`
`53`		`- AppearanceManager.ChangeAccent(value.Name);`
	`52`	`+ AppearanceManager.ChangeTheme(SelectedTheme.Name, value.Name);`
`54`	`53`	`SettingsManager.Current.Appearance_Accent = value.Name;`
`55`	`54`	`}`
`56`	`55`
`@@ -95,7 +94,7 @@ public ThemeInfo SelectedCustomTheme`
`95`	`94`
`96`	`95`	`if (!_isLoading && UseCustomTheme)`
`97`	`96`	`{`
`98`		`- AppearanceManager.ChangeTheme(value);`
	`97`	`+ AppearanceManager.ChangeTheme(value.Name);`
`99`	`98`	`SettingsManager.Current.Appearance_CustomThemeName = value.Name;`
`100`	`99`	`}`
`101`	`100`