在 OOBE 和关于页面中标明发行通道

Xcube-Studio · Dec 27, 2024 · f1b0708 · f1b0708
1 parent 98a5e42
commit f1b0708
Show file tree

Hide file tree

Showing 7 changed files with 68 additions and 13 deletions.
diff --git a/Natsurainko.FluentLauncher/App.xaml.cs b/Natsurainko.FluentLauncher/App.xaml.cs
@@ -27,6 +27,14 @@ public partial class App : Application
 
     public static Windows.ApplicationModel.PackageVersion Version => Windows.ApplicationModel.Package.Current.Id.Version;
 
+#if FLUENT_LAUNCHER_DEV_CHANNEL
+    public static string AppChannel => "Dev";
+#elif FLUENT_LAUNCHER_PREVIEW_CHANNEL
+    public static string AppChannel => "Preview";
+#elif FLUENT_LAUNCHER_STABLE_CHANNEL
+    public static string AppChannel => "Stable";
+#endif
+
     public App()
     {
         InitializeComponent();

diff --git a/Natsurainko.FluentLauncher/ViewModels/OOBE/OOBEViewModel.cs b/Natsurainko.FluentLauncher/ViewModels/OOBE/OOBEViewModel.cs
@@ -155,6 +155,8 @@ public void NavigateTo(int pageIndex)
 
     public string Version => App.Version.GetVersionString();
 
+    public string Channel => App.AppChannel.ToUpper();
+
 #if DEBUG 
     public string Edition { get; } = ResourceUtils.GetValue("Settings", "AboutPage", "_Debug");
 #else 

diff --git a/Natsurainko.FluentLauncher/ViewModels/Settings/AboutViewModel.cs b/Natsurainko.FluentLauncher/ViewModels/Settings/AboutViewModel.cs
@@ -20,6 +20,8 @@ internal partial class AboutViewModel : ObservableObject
     private string edition = ResourceUtils.GetValue("Settings", "AboutPage", "_Release");
 #endif
 
+    public string Channel => App.AppChannel.ToUpper();
+
     [RelayCommand]
     public async Task CheckUpdate()
         => await Launcher.LaunchUriAsync(new Uri("ms-windows-store://pdp/?productid=9P4NQQXQ942P"));

diff --git a/Natsurainko.FluentLauncher/ViewModels/Settings/DefaultViewModel.cs b/Natsurainko.FluentLauncher/ViewModels/Settings/DefaultViewModel.cs
@@ -41,6 +41,8 @@ public DefaultViewModel(SettingsService settingsService, INavigationService navi
     private string edition = ResourceUtils.GetValue("Settings", "AboutPage", "_Release");
 #endif
 
+    public string Channel => App.AppChannel.ToUpper();
+
     partial void OnCurrentLanguageChanged(string oldValue, string newValue)
     {
         if (Languages.Contains(CurrentLanguage) && oldValue is not null) // oldValue is null at startup

diff --git a/Natsurainko.FluentLauncher/Views/OOBE/LanguagePage.xaml b/Natsurainko.FluentLauncher/Views/OOBE/LanguagePage.xaml
@@ -39,10 +39,25 @@
                 Grid.Column="1"
                 Margin="16,0,0,0"
                 VerticalAlignment="Center">
-                <TextBlock FontSize="18" Foreground="{ThemeResource ApplicationSecondaryForegroundThemeBrush}">
-                    <Run Text="{Binding Edition}" />
-                    <Run Text="{Binding Version}" />
-                </TextBlock>
+                <StackPanel
+                    Margin="2,0,0,0"
+                    Orientation="Horizontal"
+                    Spacing="5">
+                    <TextBlock VerticalAlignment="Center" Foreground="{ThemeResource ApplicationSecondaryForegroundThemeBrush}">
+                        <Run Text="{Binding Edition}" />
+                        <Run Text="{Binding Version}" />
+                    </TextBlock>
+                    <Border
+                        Padding="5,0"
+                        VerticalAlignment="Center"
+                        Background="{ThemeResource SystemAccentColor}"
+                        CornerRadius="4">
+                        <TextBlock
+                            FontWeight="SemiBold"
+                            Foreground="White"
+                            Text="{Binding Channel}" />
+                    </Border>
+                </StackPanel>
                 <TextBlock
                     Margin="0,-7.5,0,0"
                     FontSize="36"
@@ -57,7 +72,7 @@
             <Grid.RowDefinitions>
                 <RowDefinition Height="Auto" />
                 <RowDefinition Height="Auto" />
-                <RowDefinition Height="50" />
+                <RowDefinition Height="25" />
                 <RowDefinition Height="1*" />
             </Grid.RowDefinitions>
             <TextBlock

diff --git a/Natsurainko.FluentLauncher/Views/Settings/AboutPage.xaml b/Natsurainko.FluentLauncher/Views/Settings/AboutPage.xaml
@@ -45,10 +45,23 @@
                             IsClickEnabled="True" />
                     </controls:SettingsExpander.Items>
 
-                    <TextBlock Foreground="{ThemeResource ApplicationSecondaryForegroundThemeBrush}" Style="{ThemeResource CaptionTextBlockStyle}">
-                        <Run Text="{Binding Edition}" />
-                        <Run Text="{Binding Version}" />
-                    </TextBlock>
+                    <StackPanel>
+                        <Border
+                            Padding="5,0"
+                            HorizontalAlignment="Right"
+                            Background="{ThemeResource SystemAccentColor}"
+                            CornerRadius="2">
+                            <TextBlock
+                                FontWeight="SemiBold"
+                                Foreground="White"
+                                Style="{ThemeResource CaptionTextBlockStyle}"
+                                Text="{Binding Channel}" />
+                        </Border>
+                        <TextBlock Foreground="{ThemeResource ApplicationSecondaryForegroundThemeBrush}" Style="{ThemeResource CaptionTextBlockStyle}">
+                            <Run Text="{Binding Edition}" />
+                            <Run Text="{Binding Version}" />
+                        </TextBlock>
+                    </StackPanel>
                 </controls:SettingsExpander>
 
                 <controls:SettingsCard

diff --git a/Natsurainko.FluentLauncher/Views/Settings/DefaultPage.xaml b/Natsurainko.FluentLauncher/Views/Settings/DefaultPage.xaml
@@ -91,10 +91,23 @@
                         <ImageIcon Source="ms-appx:///Assets/AppIcon.png" />
                     </controls:SettingsCard.HeaderIcon>
 
-                    <TextBlock Foreground="{ThemeResource ApplicationSecondaryForegroundThemeBrush}" Style="{ThemeResource CaptionTextBlockStyle}">
-                        <Run Text="{Binding Edition}" />
-                        <Run Text="{Binding Version}" />
-                    </TextBlock>
+                    <StackPanel>
+                        <Border
+                            Padding="5,0"
+                            HorizontalAlignment="Right"
+                            Background="{ThemeResource SystemAccentColor}"
+                            CornerRadius="2">
+                            <TextBlock
+                                FontWeight="SemiBold"
+                                Foreground="White"
+                                Style="{ThemeResource CaptionTextBlockStyle}"
+                                Text="{Binding Channel}" />
+                        </Border>
+                        <TextBlock Foreground="{ThemeResource ApplicationSecondaryForegroundThemeBrush}" Style="{ThemeResource CaptionTextBlockStyle}">
+                            <Run Text="{Binding Edition}" />
+                            <Run Text="{Binding Version}" />
+                        </TextBlock>
+                    </StackPanel>
                 </controls:SettingsCard>
             </StackPanel>
         </Border>