fix

bitfoundation · Aug 12, 2024 · 2f4cd2e · 2f4cd2e
1 parent cbe1bf1
commit 2f4cd2e
Show file tree

Hide file tree

Showing 8 changed files with 12 additions and 12 deletions.
diff --git a/...ates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Core/Styles/ThemeColors.cs b/...ates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Core/Styles/ThemeColors.cs
@@ -2,7 +2,7 @@
 
 public class ThemeColors
 {
-    public static readonly string BackgroundColorPrimaryDark = "#000000";
-    public static readonly string BackgroundColorPrimaryLight = "#FFFFFF";
+    public static readonly string PrimaryDarkBgColor = "#000000";
+    public static readonly string PrimaryLightBgColor = "#FFFFFF";
     // In case you need to change the background color, make sure to also update app.scss's --bit-clr-bg-pri accordingly.
 }
diff --git a/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Core/Styles/app.scss b/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Core/Styles/app.scss
@@ -4,7 +4,7 @@
 
 :root[bit-theme="dark"] {
     --bit-clr-bg-pri: #000000;
-    // In case you need to change the background color, make sure to also update ThemeColors.cs's BackgroundColorPrimaryDark accordingly.
+    // In case you need to change the background color, make sure to also update ThemeColors.cs's PrimaryDarkBgColor accordingly.
 }
 
 * {

diff --git a/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Maui/MainPage.xaml b/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Maui/MainPage.xaml
@@ -5,12 +5,12 @@
     xmlns:b="clr-namespace:Microsoft.AspNetCore.Components.WebView.Maui;assembly=Microsoft.AspNetCore.Components.WebView.Maui"
     xmlns:core="clr-namespace:Boilerplate.Client.Core;assembly=Boilerplate.Client.Core"
     xmlns:themeColors="clr-namespace:Boilerplate.Client.Core.Styles;assembly=Boilerplate.Client.Core"
-    BackgroundColor="{AppThemeBinding Light={x:Static themeColors:ThemeColors.BackgroundColorPrimaryLight},
-                                      Dark={x:Static themeColors:ThemeColors.BackgroundColorPrimaryDark}}">
+    BackgroundColor="{AppThemeBinding Light={x:Static themeColors:ThemeColors.PrimaryLightBgColor},
+                                      Dark={x:Static themeColors:ThemeColors.PrimaryBgColorDark}}">
     <b:BlazorWebView
         x:Name="AppWebView"
-        BackgroundColor="{AppThemeBinding Light={x:Static themeColors:ThemeColors.BackgroundColorPrimaryLight},
-                                          Dark={x:Static themeColors:ThemeColors.BackgroundColorPrimaryDark}}"
+        BackgroundColor="{AppThemeBinding Light={x:Static themeColors:ThemeColors.PrimaryLightBgColor},
+                                          Dark={x:Static themeColors:ThemeColors.PrimaryBgColorDark}}"
         HostPage="wwwroot/index.html">
         <b:BlazorWebView.RootComponents>
             <b:RootComponent ComponentType="{x:Type core:Routes}" Selector="#app-container" />

diff --git a/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Maui/MauiProgram.cs b/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Maui/MauiProgram.cs
@@ -97,7 +97,7 @@ private static void SetupBlazorWebView()
         {
             var webView = handler.PlatformView;
             var webViewBackgroundColor = AppInfo.Current.RequestedTheme == AppTheme.Dark ?
-                ThemeColors.BackgroundColorPrimaryDark : ThemeColors.BackgroundColorPrimaryLight;
+                ThemeColors.PrimaryDarkBgColor : ThemeColors.PrimaryLightBgColor;
 #if Windows
             webView.DefaultBackgroundColor = Color.FromArgb(webViewBackgroundColor).ToWindowsColor();
 

diff --git a/...late/Bit.Boilerplate/src/Client/Boilerplate.Client.Maui/Services/MauiDeviceCoordinator.cs b/...late/Bit.Boilerplate/src/Client/Boilerplate.Client.Maui/Services/MauiDeviceCoordinator.cs
@@ -38,7 +38,7 @@ public async Task ApplyTheme(bool isDark)
             window!.DecorView!.SystemUiFlags &= ~Android.Views.SystemUiFlags.LightStatusBar;
         }
 
-        window.SetStatusBarColor(Android.Graphics.Color.ParseColor(isDark ? ThemeColors.BackgroundColorPrimaryDark : ThemeColors.BackgroundColorPrimaryLight));
+        window.SetStatusBarColor(Android.Graphics.Color.ParseColor(isDark ? ThemeColors.PrimaryDarkBgColor : ThemeColors.PrimaryLightBgColor));
 #elif IOS
         var statusBarStyle = isDark ? UIKit.UIStatusBarStyle.LightContent : UIKit.UIStatusBarStyle.DarkContent;
         await Device.InvokeOnMainThreadAsync(() =>

diff --git a/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Windows/App.xaml b/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Windows/App.xaml
@@ -8,7 +8,7 @@
     StartupUri="MainWindow.xaml">
     <Application.Resources>
         <ResourceDictionary>
-            <SolidColorBrush x:Key="BackgroundColorPrimary">#0D2960</SolidColorBrush>
+            <SolidColorBrush x:Key="PrimaryBgColor">#0D2960</SolidColorBrush>
         </ResourceDictionary>
     </Application.Resources>
 </Application>
diff --git a/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Windows/App.xaml.cs b/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Windows/App.xaml.cs
@@ -18,7 +18,7 @@ public App()
         var splash = new SplashScreen(typeof(App).Assembly, @"Resources\SplashScreen.png");
         splash.Show(autoClose: true, topMost: true);
 
-        Resources["BackgroundColorPrimary"] = new BrushConverter().ConvertFrom(IsDarkTheme() ? ThemeColors.BackgroundColorPrimaryDark : ThemeColors.BackgroundColorPrimaryLight);
+        Resources["PrimaryBgColor"] = new BrushConverter().ConvertFrom(IsDarkTheme() ? ThemeColors.PrimaryDarkBgColor : ThemeColors.PrimaryLightBgColor);
     }
 
     private static bool IsDarkTheme()

diff --git a/...mplates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Windows/MainWindow.xaml b/...mplates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Windows/MainWindow.xaml
@@ -7,7 +7,7 @@
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
     Title="Boilerplate"
-    Background="{DynamicResource BackgroundColorPrimary}"
+    Background="{DynamicResource PrimaryBgColor}"
     WindowState="Maximized"
     mc:Ignorable="d">
     <Grid>