From 93a6a9b244685ae9947a4c56a8017f0f5125ae15 Mon Sep 17 00:00:00 2001
From: natsurainko <a-275@qq.com>
Date: Sat, 20 Jul 2024 17:29:54 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AE=BE=E7=BD=AEUI=E7=BB=86=E8=8A=82=E6=9B=B4?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Natsurainko.FluentCore                        |  2 +-
 .../Views/Settings/DownloadPage.xaml          | 31 +++++++++--------
 .../Views/Settings/LaunchPage.xaml            | 34 +++++++++++++++++--
 .../Views/Settings/LaunchPage.xaml.cs         |  9 +++--
 .../Views/Settings/NavigationPage.xaml        |  1 +
 5 files changed, 54 insertions(+), 23 deletions(-)

diff --git a/Natsurainko.FluentCore b/Natsurainko.FluentCore
index 0a54922c..221a8bd1 160000
--- a/Natsurainko.FluentCore
+++ b/Natsurainko.FluentCore
@@ -1 +1 @@
-Subproject commit 0a54922c24d63380600933f6232d672e4e95fe9f
+Subproject commit 221a8bd1f3ef8a0f1ae57f1137fef47590849b0f
diff --git a/Natsurainko.FluentLauncher/Views/Settings/DownloadPage.xaml b/Natsurainko.FluentLauncher/Views/Settings/DownloadPage.xaml
index c083d816..0cec780c 100644
--- a/Natsurainko.FluentLauncher/Views/Settings/DownloadPage.xaml
+++ b/Natsurainko.FluentLauncher/Views/Settings/DownloadPage.xaml
@@ -44,21 +44,22 @@
                     Description="Please optimize and adjust according to the actual network environment"
                     Header="Maximum number of download threads"
                     HeaderIcon="{xh:FontIcon Glyph=&#xE713;}">
-                    <Slider
-                        Width="128"
-                        Maximum="256"
-                        Minimum="32"
-                        Value="{Binding MaxDownloadThreads, Mode=TwoWay}">
-                        <Slider.Header>
-                            <TextBlock
-                                VerticalAlignment="Center"
-                                Style="{ThemeResource BaseTextBlockStyle}"
-                                Text="{Binding MaxDownloadThreads}" />
-                        </Slider.Header>
-                        <i:Interaction.Behaviors>
-                            <behaviors:SettingsCardContentMaxWidthBehavior AscendentType="Grid" AutoMaxWidth="True" />
-                        </i:Interaction.Behaviors>
-                    </Slider>
+                    <StackPanel Orientation="Horizontal" Spacing="10">
+                        <TextBlock
+                            VerticalAlignment="Center"
+                            Style="{ThemeResource BaseTextBlockStyle}"
+                            Text="{Binding MaxDownloadThreads}" />
+
+                        <Slider
+                            Width="128"
+                            Maximum="256"
+                            Minimum="32"
+                            Value="{Binding MaxDownloadThreads, Mode=TwoWay}">
+                            <i:Interaction.Behaviors>
+                                <behaviors:SettingsCardContentMaxWidthBehavior AscendentType="Grid" AutoMaxWidth="True" />
+                            </i:Interaction.Behaviors>
+                        </Slider>
+                    </StackPanel>
                 </controls:SettingsCard>
 
                 <controls:SettingsCard
diff --git a/Natsurainko.FluentLauncher/Views/Settings/LaunchPage.xaml b/Natsurainko.FluentLauncher/Views/Settings/LaunchPage.xaml
index e3b546b2..fded15b0 100644
--- a/Natsurainko.FluentLauncher/Views/Settings/LaunchPage.xaml
+++ b/Natsurainko.FluentLauncher/Views/Settings/LaunchPage.xaml
@@ -68,7 +68,21 @@
                                 Loaded="Card_Loaded"
                                 Tag="ActiveMinecraftFolder">
                                 <controls:SettingsCard.Header>
-                                    <TextBlock x:Uid="Settings_LaunchPage_Text1" Text="Minecraft Folder" />
+                                    <StackPanel Orientation="Horizontal" Spacing="10">
+                                        <TextBlock x:Uid="Settings_LaunchPage_Text1" Text="Minecraft Folder" />
+                                        <Border
+                                            Name="EnableText"
+                                            Padding="5,0"
+                                            CornerRadius="4">
+                                            <Border.Background>
+                                                <SolidColorBrush Opacity="0.15" Color="{ThemeResource SystemAccentColor}" />
+                                            </Border.Background>
+                                            <TextBlock
+                                                Foreground="{ThemeResource SystemAccentColor}"
+                                                Style="{ThemeResource BaseTextBlockStyle}"
+                                                Text="Enabled" />
+                                        </Border>
+                                    </StackPanel>
                                 </controls:SettingsCard.Header>
                                 <StackPanel
                                     Name="Operations"
@@ -150,10 +164,26 @@
                                 ActionIcon="{xh:FontIcon Glyph=&#xED43;}"
                                 CommandParameter="{Binding}"
                                 Description="{Binding}"
-                                Header="{Binding Converter={ThemeResource JavaInfoConverter}}"
                                 IsClickEnabled="True"
                                 Loaded="Card_Loaded"
                                 Tag="ActiveJava">
+                                <controls:SettingsCard.Header>
+                                    <StackPanel Orientation="Horizontal" Spacing="10">
+                                        <TextBlock Text="{Binding Converter={ThemeResource JavaInfoConverter}}" />
+                                        <Border
+                                            Name="EnableText"
+                                            Padding="5,0"
+                                            CornerRadius="4">
+                                            <Border.Background>
+                                                <SolidColorBrush Opacity="0.25" Color="{ThemeResource SystemAccentColor}" />
+                                            </Border.Background>
+                                            <TextBlock
+                                                Foreground="{ThemeResource SystemAccentColor}"
+                                                Style="{ThemeResource BaseTextBlockStyle}"
+                                                Text="Enabled" />
+                                        </Border>
+                                    </StackPanel>
+                                </controls:SettingsCard.Header>
                                 <controls:SettingsCard.HeaderIcon>
                                     <ImageIcon Source="{Binding Converter={ThemeResource JavaIconConverter}}" />
                                 </controls:SettingsCard.HeaderIcon>
diff --git a/Natsurainko.FluentLauncher/Views/Settings/LaunchPage.xaml.cs b/Natsurainko.FluentLauncher/Views/Settings/LaunchPage.xaml.cs
index 25004649..1f2aac50 100644
--- a/Natsurainko.FluentLauncher/Views/Settings/LaunchPage.xaml.cs
+++ b/Natsurainko.FluentLauncher/Views/Settings/LaunchPage.xaml.cs
@@ -3,7 +3,6 @@
 using FluentLauncher.Infra.UI.Navigation;
 using Microsoft.UI.Xaml;
 using Microsoft.UI.Xaml.Controls;
-using Microsoft.UI.Xaml.Media;
 using Natsurainko.FluentLauncher.Services.Settings;
 using Natsurainko.FluentLauncher.Services.UI.Messaging;
 
@@ -36,12 +35,12 @@ private void Card_Loaded(object sender, RoutedEventArgs e)
             if (m.PropertyName != tag)
                 return;
 
-            card.Background = path == m.Value ? (Brush)this.Resources["AccentButtonBackground"] : defaultBackground;
-            card.RequestedTheme = path == m.Value ? ElementTheme.Light : defaultTheme;
+            var enableText = card.FindName("EnableText") as Border;
+            enableText!.Visibility = path == m.Value ? Visibility.Visible : Visibility.Collapsed;
         });
 
-        card.Background = path == current ? (Brush)this.Resources["AccentButtonBackground"] : defaultBackground;
-        card.RequestedTheme = path == current ? ElementTheme.Light : defaultTheme;
+        var enableText = card.FindName("EnableText") as Border;
+        enableText!.Visibility = path == current ? Visibility.Visible : Visibility.Collapsed;
 
         card.Unloaded += (s, e) => WeakReferenceMessenger.Default.Unregister<SettingsStringValueChangedMessage>(sender);
     }
diff --git a/Natsurainko.FluentLauncher/Views/Settings/NavigationPage.xaml b/Natsurainko.FluentLauncher/Views/Settings/NavigationPage.xaml
index 1eb4218e..a1641bac 100644
--- a/Natsurainko.FluentLauncher/Views/Settings/NavigationPage.xaml
+++ b/Natsurainko.FluentLauncher/Views/Settings/NavigationPage.xaml
@@ -19,6 +19,7 @@
 
         <BreadcrumbBar
             Grid.Row="0"
+            MaxWidth="1020"
             Margin="30,15"
             ItemsSource="{Binding Routes}">
             <i:Interaction.Behaviors>