fix: PlatformSetStyle invalid on Windows

Author: Yu-Core

README.md

@@ -78,8 +78,6 @@ using MauiBlazorToolKit.Platform
 #endif
 ```
 
-> TitleBar.SetStyle() temporarily invalid, cannot change the text color of the button
-
 ## AppStoreLauncher (opens the default app store)
 `AppStoreLauncher` allows you to open the default app store
 

README.zh-CN.md

@@ -78,8 +78,6 @@ using MauiBlazorToolKit.Platform
 #endif
 ```
 
-> TitleBar.SetStyle() 暂时无效，不能改变按钮的文本颜色
-
 ## AppStoreLauncher(打开默认应用商店)
 `AppStoreLauncher` 允许你打开默认的应用商店
 

src/MauiBlazorToolkit/MauiBlazorToolkit.Sample/MainPage.xaml

@@ -6,7 +6,7 @@
              xmlns:mauiBlazorToolkit="clr-namespace:MauiBlazorToolkit.Behaviors;assembly=MauiBlazorToolkit"
              BackgroundColor="{DynamicResource PageBackgroundColor}">
     <ContentPage.Behaviors>
-        <mauiBlazorToolkit:TitleBarBehavior TitleBarColor="#fff" TitleBarStyle="LightContent"></mauiBlazorToolkit:TitleBarBehavior>
+        <mauiBlazorToolkit:TitleBarBehavior TitleBarColor="#fff" TitleBarStyle="DarkContent"></mauiBlazorToolkit:TitleBarBehavior>
     </ContentPage.Behaviors>
     <BlazorWebView x:Name="blazorWebView" HostPage="wwwroot/index.html">
         <BlazorWebView.RootComponents>

src/MauiBlazorToolkit/MauiBlazorToolkit/Extensions/AppBuilderExtensions/AppBuilderExtensions.shared.cs

@@ -15,28 +15,28 @@ public static MauiAppBuilder UseMauiBlazorToolkit(this MauiAppBuilder builder, A
             builder.ConfigureLifecycleEvents(events =>
             {
 #if WINDOWS
-                events
-                    .AddWindows(windows =>
+                events.AddWindows(windows =>
+                {
+                    windows.OnWindowCreated((window) =>
                     {
-                        windows.OnWindowCreated((window) =>
+                        if (Options.InternalTitleBar)
                         {
-                            if (Options.InternalTitleBar)
-                            {
-                                TitleBar.Initialize();
-                            }
-                        });
+                            TitleBar.Initialize();
+                        }
                     });
+                });
 #elif MACCATALYST
-                events.AddiOS(ios => ios
-                     .FinishedLaunching((window, args) =>
-                     {
-                         if (Options.InternalTitleBar)
-                         {
-                             TitleBar.Initialize();
-                         }
-                         return true;
-                     })
-                );
+                events.AddiOS(ios =>
+                {
+                    ios.FinishedLaunching((window, args) =>
+                    {
+                        if (Options.InternalTitleBar)
+                        {
+                            TitleBar.Initialize();
+                        }
+                        return true;
+                    });
+                });
 #endif
             });
 

src/MauiBlazorToolkit/MauiBlazorToolkit/Platform/TitleBar/TitleBar.macos.cs

@@ -2,37 +2,38 @@
 
 namespace MauiBlazorToolkit.Platform;
 
-[SupportedOSPlatform("MacCatalyst10.0"), UnsupportedOSPlatform("MacOS")]
+[SupportedOSPlatform("MacCatalyst11.0"), UnsupportedOSPlatform("MacOS")]
 static partial class TitleBar
 {
     static UIKit.UIWindow? NativeWindow =>
         (UIKit.UIWindow?)Application.Current?.Windows.FirstOrDefault()?.Handler?.PlatformView;
 
     static ResourceDictionary? Resources => Application.Current?.Resources;
+
 	static void PlatformSetColor(Color color)
 	{
-		if (Resources == null) return;
+		if (Resources is null) return;
 		Resources["PageBackgroundColor"] = color;
     }
 
 	static void PlatformSetStyle(TitleBarStyle style)
 	{
-        if (Resources == null) return;
+        if (Resources is null) return;
         var color = style switch
         {
             TitleBarStyle.Default => Colors.Black,
             TitleBarStyle.LightContent => Colors.White,
             TitleBarStyle.DarkContent => Colors.Black,
-            _ => throw new NotSupportedException($"{nameof(TitleBarStyle)} {style} is not yet supported on iOS")
+            _ => throw new NotSupportedException($"{nameof(TitleBarStyle)} {style} is not yet supported on MacCatalyst")
         };
         Resources["PrimaryTextColor"] = color;
     }
 
     public static void Initialize()
     {
-        if (NativeWindow == null) return;
+        if (NativeWindow is null) return;
         var titleBar = NativeWindow.WindowScene?.Titlebar;
-        if (titleBar == null) return;
+        if (titleBar is null) return;
         titleBar.TitleVisibility = UIKit.UITitlebarTitleVisibility.Hidden;
     }
 }

src/MauiBlazorToolkit/MauiBlazorToolkit/Platform/TitleBar/TitleBar.windows.cs

@@ -7,13 +7,14 @@ namespace MauiBlazorToolkit.Platform;
 [SupportedOSPlatform("Windows")]
 static partial class TitleBar
 {
-	static Microsoft.UI.Xaml.Window? NativeWindow =>
+    static Microsoft.UI.Xaml.Window? NativeWindow =>
         (Microsoft.UI.Xaml.Window?)Application.Current?.Windows.FirstOrDefault()?.Handler?.PlatformView;
+
     static Microsoft.UI.Xaml.ResourceDictionary Resources =>
         Microsoft.UI.Xaml.Application.Current.Resources;
 
     static void PlatformSetColor(Color color)
-	{
+    {
         Resources["TitleBarBackground"] = color.ToWindowsColor();
         if (NativeWindow is not null && NativeWindow.Content is Microsoft.UI.Xaml.FrameworkElement fe)
         {
@@ -24,9 +25,20 @@ static void PlatformSetColor(Color color)
         }
     }
 
-	static void PlatformSetStyle(TitleBarStyle style)
-	{
-        //图标颜色暂时无法更改
+    static void PlatformSetStyle(TitleBarStyle style)
+    {
+        if (NativeWindow is not null)
+        {
+            var color = style switch
+            {
+                TitleBarStyle.Default => Colors.Black,
+                TitleBarStyle.LightContent => Colors.White,
+                TitleBarStyle.DarkContent => Colors.Black,
+                _ => throw new NotSupportedException($"{nameof(TitleBarStyle)} {style} is not yet supported on Windows")
+            };
+            var titleBar = NativeWindow.AppWindow.TitleBar;
+            titleBar.ButtonForegroundColor = color.ToWindowsColor();
+        }
     }
 
     public static void Initialize()