Update resources

Maxhy · Maxhy · commit 3880bca0c0c4 · 2025-02-20T10:00:25.000+01:00
diff --git a/WpfApp/AboutWindow.xaml b/WpfApp/AboutWindow.xaml
@@ -9,14 +9,22 @@
         xmlns:properties="clr-namespace:Leosac.WpfApp.Properties"
         mc:Ignorable="d"
         d:DataContext="{d:DesignInstance domain:AboutWindowViewModel}"
-        TextElement.Foreground="{DynamicResource MaterialDesignBody}"
+        TextElement.Foreground="{DynamicResource MaterialDesign.Brush.Foreground}"
         TextElement.FontWeight="Regular"
         TextElement.FontSize="11"
         TextOptions.TextFormattingMode="Ideal" 
         TextOptions.TextRenderingMode="Auto"        
-        Background="{DynamicResource MaterialDesignPaper}"
+        Background="{DynamicResource MaterialDesign.Brush.Background}"
         FontFamily="{DynamicResource MaterialDesignFont}"
         Title="{x:Static properties:Resources.About}" Height="500" Width="580" Loaded="Window_Loaded">
+    <Window.Resources>
+        <ResourceDictionary>
+            <materialDesign:NullableToVisibilityConverter x:Key="NullableToVisibilityConverter" />
+            <materialDesign:BooleanToVisibilityConverter x:Key="BooleanToVisibilityConverter" />
+            <materialDesign:BooleanToVisibilityConverter x:Key="InverseBooleanToVisibilityConverter" FalseValue="Visible" TrueValue="Hidden" />
+            <materialDesign:InvertBooleanConverter x:Key="InvertBooleanConverter" />
+        </ResourceDictionary>
+    </Window.Resources>
     <DockPanel LastChildFill="True">
         <materialDesign:ColorZone DockPanel.Dock="Top" Padding="15" Height="110" materialDesign:ElevationAssist.Elevation="Dp4" ClipToBounds="False" Mode="PrimaryMid">
             <StackPanel Orientation="Horizontal" HorizontalAlignment="Center">
@@ -48,16 +56,16 @@
                         </Grid.RowDefinitions>
                         <TextBlock Grid.Row="0" Margin="15,15,15,5" Style="{StaticResource MaterialDesignHeadline5TextBlock}" Text="{x:Static properties:Resources.MaintenancePlan}" />
                         <WrapPanel Grid.Row="1" HorizontalAlignment="Center" VerticalAlignment="Center" Visibility="{Binding IsActivePlan,Converter={StaticResource InverseBooleanToVisibilityConverter}}">
-                            <materialDesign:PackIcon Kind="SecurityOff" Margin="2" Foreground="{StaticResource SecondaryHueMidBrush}" />
-                            <TextBlock Text="{x:Static properties:Resources.InvalidPlan}" Margin="2" Foreground="{StaticResource SecondaryHueMidBrush}" FontWeight="Bold" />
+                            <materialDesign:PackIcon Kind="SecurityOff" Margin="2" Foreground="{StaticResource MaterialDesign.Brush.Secondary}" />
+                            <TextBlock Text="{x:Static properties:Resources.InvalidPlan}" Margin="2" Foreground="{StaticResource MaterialDesign.Brush.Secondary}" FontWeight="Bold" />
                         </WrapPanel>
                         <WrapPanel Grid.Row="1" HorizontalAlignment="Center" VerticalAlignment="Center" Visibility="{Binding IsActivePlan,Converter={StaticResource BooleanToVisibilityConverter}}">
                             <materialDesign:PackIcon Kind="Security" Margin="2" />
                             <TextBlock Text="{x:Static properties:Resources.ValidPlan}" FontWeight="Bold" Margin="2" />
                         </WrapPanel>
                         <WrapPanel Grid.Row="2" HorizontalAlignment="Center" Visibility="{Binding ExpirationDate, Converter={StaticResource NullableToVisibilityConverter}}">
                             <TextBlock Text="{x:Static properties:Resources.PlanExpiration}" Margin="2" />
-                            <TextBlock Text="{Binding ExpirationDate}" Margin="2" Foreground="{StaticResource SecondaryHueMidBrush}" FontWeight="Bold" />
+                            <TextBlock Text="{Binding ExpirationDate}" Margin="2" Foreground="{StaticResource MaterialDesign.Brush.Secondary}" FontWeight="Bold" />
                         </WrapPanel>
                         <Expander HorizontalAlignment="Stretch" Header="{x:Static properties:Resources.Actions}" Grid.Row="3" IsExpanded="{Binding IsActivePlan, Mode=OneTime, Converter={StaticResource InvertBooleanConverter}}">
                             <WrapPanel Orientation="Vertical" HorizontalAlignment="Center">
diff --git a/WpfApp/Domain/MainWindowViewModel.cs b/WpfApp/Domain/MainWindowViewModel.cs
@@ -122,11 +122,11 @@ private static void ModifyTheme(bool isDarkTheme)
 
             if (isDarkTheme)
             {
-                theme.SetLightTheme();
+                theme.SetDarkTheme();
             }
             else
             {
-                theme.SetDarkTheme();
+                theme.SetLightTheme();
             }
             paletteHelper.SetTheme(theme);
         }
diff --git a/WpfApp/LogConsoleWindow.xaml b/WpfApp/LogConsoleWindow.xaml
@@ -9,12 +9,12 @@
         xmlns:properties="clr-namespace:Leosac.WpfApp.Properties"
         mc:Ignorable="d"
         d:DataContext="{d:DesignInstance domain:LogConsoleWindowViewModel}"
-        TextElement.Foreground="{DynamicResource MaterialDesignBody}"
+        TextElement.Foreground="{DynamicResource MaterialDesign.Brush.Foreground}"
         TextElement.FontWeight="Regular"
         TextElement.FontSize="13"
         TextOptions.TextFormattingMode="Ideal" 
         TextOptions.TextRenderingMode="Auto"        
-        Background="{DynamicResource MaterialDesignPaper}"
+        Background="{DynamicResource MaterialDesign.Brush.Background}"
         FontFamily="{DynamicResource MaterialDesignFont}"
         Title="{x:Static properties:Resources.LogConsole}" Height="350" Width="800"
         Topmost="True">
diff --git a/WpfApp/MainWindow.xaml b/WpfApp/MainWindow.xaml
@@ -12,19 +12,20 @@
         Height="600" Width="800" MinHeight="400" MinWidth="600"
         Icon="{Binding Source={x:Static local:LeosacWinAppInfo.WinInstance}, Path=ApplicationLogo}"
         d:DataContext="{d:DesignInstance domain:MainWindowViewModel}"
-        TextElement.Foreground="{DynamicResource MaterialDesignBody}"
+        TextElement.Foreground="{DynamicResource MaterialDesign.Brush.Foreground}"
         TextElement.FontWeight="Regular"
         TextElement.FontSize="13"
         TextOptions.TextFormattingMode="Ideal" 
         TextOptions.TextRenderingMode="Auto"        
-        Background="{DynamicResource MaterialDesignPaper}"
+        Background="{DynamicResource MaterialDesign.Brush.Background}"
         FontFamily="{DynamicResource MaterialDesignFont}" Loaded="Window_Loaded">
     <Window.Resources>
         <ResourceDictionary>
             <ResourceDictionary.MergedDictionaries>
                 <ResourceDictionary Source="pack://application:,,,/MaterialDesignThemes.Wpf;component/Themes/MaterialDesignTheme.Snackbar.xaml" />
             </ResourceDictionary.MergedDictionaries>
             <materialDesign:NullableToVisibilityConverter x:Key="NullableToVisibilityConverter" />
+            <materialDesign:BooleanToVisibilityConverter x:Key="BooleanToVisibilityConverter" />
         </ResourceDictionary>
     </Window.Resources>
     <materialDesign:DialogHost DialogTheme="Inherit"
@@ -142,7 +143,7 @@
                             <ColumnDefinition />
                             <ColumnDefinition Width="150" />
                         </Grid.ColumnDefinitions>
-                        <materialDesign:PackIcon Grid.Column="0" Width="48" Height="48" Kind="SecurityOff" Margin="15,5,15,5" Foreground="{StaticResource SecondaryHueMidBrush}" />
+                        <materialDesign:PackIcon Grid.Column="0" Width="48" Height="48" Kind="SecurityOff" Margin="15,5,15,5" Foreground="{StaticResource MaterialDesign.Brush.Secondary}" />
                         <StackPanel Grid.Column="1" Orientation="Vertical" VerticalAlignment="Center" Margin="5">
                             <TextBlock Text="{x:Static properties:Resources.MaintenancePlanAdvert1}" TextWrapping="Wrap" FontWeight="ExtraBold" HorizontalAlignment="Center" Margin="2" />
                             <TextBlock Text="{x:Static properties:Resources.MaintenancePlanAdvert2}" TextWrapping="Wrap" HorizontalAlignment="Center" Margin="2" />
diff --git a/WpfApp/PlanRegistrationWindow.xaml b/WpfApp/PlanRegistrationWindow.xaml
@@ -9,12 +9,12 @@
         xmlns:properties="clr-namespace:Leosac.WpfApp.Properties"
         mc:Ignorable="d"
         d:DataContext="{d:DesignInstance domain:PlanRegistrationWindowViewModel}"
-        TextElement.Foreground="{DynamicResource MaterialDesignBody}"
+        TextElement.Foreground="{DynamicResource MaterialDesign.Brush.Foreground}"
         TextElement.FontWeight="Regular"
         TextElement.FontSize="11"
         TextOptions.TextFormattingMode="Ideal" 
         TextOptions.TextRenderingMode="Auto"        
-        Background="{DynamicResource MaterialDesignPaper}"
+        Background="{DynamicResource MaterialDesign.Brush.Background}"
         FontFamily="{DynamicResource MaterialDesignFont}"
         Title="Plan Registration" Height="600" Width="600">
     <Window.Resources>
@@ -32,7 +32,7 @@
         <WrapPanel DockPanel.Dock="Bottom" HorizontalAlignment="Right" VerticalAlignment="Center" Margin="5">
             <Button x:Name="btnClose" IsDefault="True" Width="100" IsCancel="True" Content="{x:Static properties:Resources.Close}" Margin="10" Click="btnClose_Click"/>
         </WrapPanel>
-        <TextBlock DockPanel.Dock="Bottom" Text="{Binding LastError}" Style="{StaticResource MaterialDesignSubtitle1TextBlock}" Foreground="{StaticResource SecondaryHueMidBrush}" HorizontalAlignment="Center" Margin="5" />
+        <TextBlock DockPanel.Dock="Bottom" Text="{Binding LastError}" Style="{StaticResource MaterialDesignSubtitle1TextBlock}" Foreground="{StaticResource MaterialDesign.Brush.Secondary}" HorizontalAlignment="Center" Margin="5" />
         <TabControl TabStripPlacement="Left" Margin="5,20,5,5">
             <TabItem Header="{x:Static properties:Resources.Online}">
                 <StackPanel>
@@ -54,7 +54,7 @@
                                         materialDesign:HintAssist.HelperText="{x:Static properties:Resources.UUIDHelper}"
                                         materialDesign:HintAssist.Hint="{x:Static properties:Resources.UUID}" Margin="10" IsReadOnly="True" />
                     <WrapPanel Orientation="Horizontal" HorizontalAlignment="Center" Margin="10">
-                        <materialDesign:Flipper Style="{StaticResource MaterialDesignCardFlipper}" Margin="3" Height="180">
+                        <materialDesign:Flipper Margin="3" Height="180">
                             <materialDesign:Flipper.FrontContent>
                                 <Button Width="200" MinHeight="100" Margin="8" Command="{x:Static materialDesign:Flipper.FlipCommand}" Style="{StaticResource MaterialDesignFlatButton}">
                                     <StackPanel Orientation="Vertical" VerticalAlignment="Center">
@@ -77,7 +77,7 @@
                                 </DockPanel>
                             </materialDesign:Flipper.BackContent>
                         </materialDesign:Flipper>
-                        <materialDesign:Flipper Style="{StaticResource MaterialDesignCardFlipper}" Margin="3">
+                        <materialDesign:Flipper Margin="3">
                             <materialDesign:Flipper.FrontContent>
                                 <Button Width="200" MinHeight="100" Margin="8" Command="{x:Static materialDesign:Flipper.FlipCommand}" Style="{StaticResource MaterialDesignFlatButton}">
                                     <StackPanel Orientation="Vertical" VerticalAlignment="Center">
@@ -91,7 +91,7 @@
                                     <Button DockPanel.Dock="Bottom" Width="184" Margin="5" Command="{x:Static materialDesign:Flipper.FlipCommand}" Content="{x:Static properties:Resources.Back}" Style="{StaticResource MaterialDesignFlatButton}" />
                                     <StackPanel Orientation="Vertical">
                                         <TextBlock Text="{x:Static properties:Resources.Call}" Style="{StaticResource MaterialDesignHeadline5TextBlock}" Margin="3" HorizontalAlignment="Center" />
-                                        <TextBlock Text="+33 3 67 37 02 45" Style="{StaticResource MaterialDesignHeadline5TextBlock}" Margin="3" HorizontalAlignment="Center" Foreground="{StaticResource SecondaryHueMidBrush}" />
+                                        <TextBlock Text="+33 3 67 37 02 45" Style="{StaticResource MaterialDesignHeadline5TextBlock}" Margin="3" HorizontalAlignment="Center" Foreground="{StaticResource MaterialDesign.Brush.Secondary}" />
                                     </StackPanel>
                                 </DockPanel>
                             </materialDesign:Flipper.BackContent>
diff --git a/WpfApp/Themes/Generic.xaml b/WpfApp/Themes/Generic.xaml
@@ -5,6 +5,6 @@
     xmlns:materialDesign="http://materialdesigninxaml.net/winfx/xaml/themes">
     <ResourceDictionary.MergedDictionaries>
         <materialDesign:BundledTheme BaseTheme="Light" PrimaryColor="Orange" SecondaryColor="Pink" />
-        <ResourceDictionary Source="pack://application:,,,/MaterialDesignThemes.Wpf;component/Themes/MaterialDesign3.Defaults.xaml" />
+        <ResourceDictionary Source="pack://application:,,,/MaterialDesignThemes.Wpf;component/Themes/MaterialDesign2.Defaults.xaml" />
     </ResourceDictionary.MergedDictionaries>
 </ResourceDictionary>
diff --git a/WpfAppDemo/App.xaml b/WpfAppDemo/App.xaml
@@ -8,7 +8,7 @@
         <ResourceDictionary>
             <ResourceDictionary.MergedDictionaries>
                 <materialDesign:BundledTheme BaseTheme="Light" PrimaryColor="Orange" SecondaryColor="Pink" />
-                <ResourceDictionary Source="pack://application:,,,/MaterialDesignThemes.Wpf;component/Themes/MaterialDesign3.Defaults.xaml" />
+                <ResourceDictionary Source="pack://application:,,,/MaterialDesignThemes.Wpf;component/Themes/MaterialDesign2.Defaults.xaml" />
             </ResourceDictionary.MergedDictionaries>
         </ResourceDictionary>
     </Application.Resources>

Original file line number	Diff line number	Diff line change
`@@ -122,11 +122,11 @@ private static void ModifyTheme(bool isDarkTheme)`
`122`	`122`
`123`	`123`	`if (isDarkTheme)`
`124`	`124`	`{`
`125`		`- theme.SetLightTheme();`
	`125`	`+ theme.SetDarkTheme();`
`126`	`126`	`}`
`127`	`127`	`else`
`128`	`128`	`{`
`129`		`- theme.SetDarkTheme();`
	`129`	`+ theme.SetLightTheme();`
`130`	`130`	`}`
`131`	`131`	`paletteHelper.SetTheme(theme);`
`132`	`132`	`}`