update version and add logo

babalae · Oct 28, 2023 · d57e67c · d57e67c
1 parent 8ca4baa
commit d57e67c
Show file tree

Hide file tree

Showing 6 changed files with 15 additions and 7 deletions.
diff --git a/BetterGenshinImpact/Assets/logo.ico b/BetterGenshinImpact/Assets/logo.ico
diff --git a/BetterGenshinImpact/Assets/logo.png b/BetterGenshinImpact/Assets/logo.png
diff --git a/BetterGenshinImpact/BetterGenshinImpact.csproj b/BetterGenshinImpact/BetterGenshinImpact.csproj
@@ -8,14 +8,18 @@
 		<UseWindowsForms>True</UseWindowsForms>
 		<LangVersion>11.0</LangVersion>
 		<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
+		<ApplicationIcon>Assets\logo.ico</ApplicationIcon>
 	</PropertyGroup>
 
 	<ItemGroup>
 	  <None Remove="Assets\drag.png" />
+	  <None Remove="Assets\logo.png" />
 	</ItemGroup>
 
 	<ItemGroup>
 	  <Resource Include="Assets\drag.png" />
+	  <Resource Include="Assets\logo.png" />
+	  <Content Include="Assets\logo.ico" />
 	</ItemGroup>
 
 	<ItemGroup>

diff --git a/BetterGenshinImpact/Core/Config/Global.cs b/BetterGenshinImpact/Core/Config/Global.cs
@@ -5,6 +5,8 @@ namespace BetterGenshinImpact.Core.Config;
 
 public class Global
 {
+    public static string Version = "0.12.0";
+
     public static string StartUpPath { get; private set; } = AppContext.BaseDirectory;
 
     public static string AppPath { get; private set; } = Absolute("BetterGenshinImpact.exe");

diff --git a/BetterGenshinImpact/View/MainWindow.xaml b/BetterGenshinImpact/View/MainWindow.xaml
@@ -36,8 +36,7 @@
             x:Name="RootNavigation" Grid.Row="1"
             OpenPaneLength="150"
             IsBackButtonVisible="Collapsed"
-            IsPaneToggleVisible="True"
-            >
+            IsPaneToggleVisible="True">
             <!--<ui:NavigationView.AutoSuggestBox>
                 <ui:AutoSuggestBox x:Name="AutoSuggestBox" PlaceholderText="Search">
                     <ui:AutoSuggestBox.Icon>
@@ -99,7 +98,7 @@
                 <ui:NavigationViewItem
                     Content="设置"
                     NavigationCacheMode="Enabled"
-                    TargetPageType="{x:Type pages:CommonSettingsPage}" >
+                    TargetPageType="{x:Type pages:CommonSettingsPage}">
                     <ui:NavigationViewItem.Icon>
                         <ui:SymbolIcon Symbol="Settings24" />
                     </ui:NavigationViewItem.Icon>
@@ -108,8 +107,9 @@
         </ui:NavigationView>
 
         <ui:TitleBar
-            Title="BetterGI · 更好的原神 · 0.11"
-            Grid.Row="0" />
+            Title="{Binding Title, Mode=OneWay}"
+            Grid.Row="0"
+            Icon="pack://application:,,,/Assets/logo.png" />
 
     </Grid>
 </ui:FluentWindow>
diff --git a/BetterGenshinImpact/ViewModel/MainWindowViewModel.cs b/BetterGenshinImpact/ViewModel/MainWindowViewModel.cs
@@ -1,4 +1,5 @@
-using BetterGenshinImpact.Service.Interface;
+using BetterGenshinImpact.Core.Config;
+using BetterGenshinImpact.Service.Interface;
 using CommunityToolkit.Mvvm.ComponentModel;
 using CommunityToolkit.Mvvm.Input;
 using CommunityToolkit.Mvvm.Messaging;
@@ -14,6 +15,7 @@ public partial class MainWindowViewModel : ObservableObject
     {
         private readonly ILogger<MainWindowViewModel> _logger;
         private readonly IConfigService _configService;
+        public string Title => $"BetterGI · 更好的原神 · {Global.Version}";
 
         public MainWindowViewModel(INavigationService navigationService, IConfigService configService)
         {
@@ -25,7 +27,7 @@ public MainWindowViewModel(INavigationService navigationService, IConfigService
         [RelayCommand]
         private void OnLoaded()
         {
-            _logger.LogInformation("更好的原神({Text}) Alpha {Ver}","内测版", 2.2);
+            _logger.LogInformation("更好的原神 {Version}", Global.Version);
         }
 
         [RelayCommand]