fix: the lost logo in MainWindow

BetterGenshinImpact/BetterGenshinImpact.csproj

@@ -12,14 +12,13 @@
 	</PropertyGroup>
 
 	<ItemGroup>
-	  <None Remove="Assets\drag.png" />
+      <None Remove="Assets\*.png" />
-	  <None Remove="Assets\logo.png" />
+      <None Remove="Assets\*.ico" />
 	</ItemGroup>
 
 	<ItemGroup>
-	  <Resource Include="Assets\drag.png" />
+	  <Resource Include="Assets\*.png" />
-	  <Resource Include="Assets\logo.png" />
+	  <Content Include="Assets\*.ico" />
-	  <Content Include="Assets\logo.ico" />
 	</ItemGroup>
 
 	<ItemGroup>

BetterGenshinImpact/View/MainWindow.xaml

@@ -1,28 +1,26 @@
 <ui:FluentWindow x:Class="BetterGenshinImpact.View.MainWindow"
                  xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
                  xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+                 xmlns:b="http://schemas.microsoft.com/xaml/behaviors"
                  xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
                  xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-                 xmlns:b="http://schemas.microsoft.com/xaml/behaviors"
-                 xmlns:viewModel="clr-namespace:BetterGenshinImpact.ViewModel"
-                 xmlns:ui="http://schemas.lepo.co/wpfui/2022/xaml"
                  xmlns:pages="clr-namespace:BetterGenshinImpact.View.Pages"
-                 mc:Ignorable="d"
+                 xmlns:ui="http://schemas.lepo.co/wpfui/2022/xaml"
+                 xmlns:viewModel="clr-namespace:BetterGenshinImpact.ViewModel"
+                 Title="更好的原神"
+                 Width="900"
+                 Height="600"
+                 d:DataContext="{d:DesignInstance Type=viewModel:MainWindowViewModel}"
                  ui:Design.Background="{DynamicResource ApplicationBackgroundBrush}"
                  ui:Design.Foreground="{DynamicResource TextFillColorPrimaryBrush}"
-                 d:DataContext="{d:DesignInstance Type=viewModel:MainWindowViewModel}"
                  ExtendsContentIntoTitleBar="True"
-                 Title="更好的原神" Height="600" Width="900">
+                 mc:Ignorable="d">
     <b:Interaction.Triggers>
         <b:EventTrigger EventName="Loaded">
-            <b:InvokeCommandAction
+            <b:InvokeCommandAction Command="{Binding LoadedCommand}" CommandParameter="{Binding}" />
-                CommandParameter="{Binding}"
-                Command="{Binding LoadedCommand}" />
         </b:EventTrigger>
         <b:EventTrigger EventName="Closed">
-            <b:InvokeCommandAction
+            <b:InvokeCommandAction Command="{Binding ClosedCommand}" CommandParameter="{Binding}" />
-                CommandParameter="{Binding}"
-                Command="{Binding ClosedCommand}" />
         </b:EventTrigger>
     </b:Interaction.Triggers>
 
@@ -32,11 +30,11 @@
             <RowDefinition Height="*" />
         </Grid.RowDefinitions>
 
-        <ui:NavigationView
+        <ui:NavigationView x:Name="RootNavigation"
-            x:Name="RootNavigation" Grid.Row="1"
+                           Grid.Row="1"
-            OpenPaneLength="150"
+                           IsBackButtonVisible="Collapsed"
-            IsBackButtonVisible="Collapsed"
+                           IsPaneToggleVisible="True"
-            IsPaneToggleVisible="True">
+                           OpenPaneLength="150">
             <!--<ui:NavigationView.AutoSuggestBox>
                 <ui:AutoSuggestBox x:Name="AutoSuggestBox" PlaceholderText="Search">
                     <ui:AutoSuggestBox.Icon>
@@ -53,52 +51,46 @@
                     FontWeight="DemiBold" />
             </ui:NavigationView.Header>-->
             <ui:NavigationView.MenuItems>
-                <ui:NavigationViewItem
+                <ui:NavigationViewItem Content="启动"
-                    Content="启动"
+                                       NavigationCacheMode="Enabled"
-                    NavigationCacheMode="Enabled"
+                                       TargetPageType="{x:Type pages:HomePage}">
-                    TargetPageType="{x:Type pages:HomePage}">
                     <ui:NavigationViewItem.Icon>
                         <ui:SymbolIcon Symbol="Play24" />
                     </ui:NavigationViewItem.Icon>
                 </ui:NavigationViewItem>
-                <ui:NavigationViewItem
+                <ui:NavigationViewItem Content="实时触发"
-                    Content="实时触发"
+                                       NavigationCacheMode="Enabled"
-                    NavigationCacheMode="Enabled"
+                                       TargetPageType="{x:Type pages:TriggerSettingsPage}">
-                    TargetPageType="{x:Type pages:TriggerSettingsPage}">
                     <ui:NavigationViewItem.Icon>
                         <ui:SymbolIcon Symbol="Timer24" />
                     </ui:NavigationViewItem.Icon>
                 </ui:NavigationViewItem>
-                <ui:NavigationViewItem
+                <ui:NavigationViewItem Content="独立任务"
-                    Content="独立任务"
+                                       NavigationCacheMode="Enabled"
-                    NavigationCacheMode="Enabled"
+                                       TargetPageType="{x:Type pages:TaskSettingsPage}">
-                    TargetPageType="{x:Type pages:TaskSettingsPage}">
                     <ui:NavigationViewItem.Icon>
                         <ui:SymbolIcon Symbol="TaskListSquareLtr24" />
                     </ui:NavigationViewItem.Icon>
                 </ui:NavigationViewItem>
-                <ui:NavigationViewItem
+                <ui:NavigationViewItem Content="辅助操控"
-                    Content="辅助操控"
+                                       NavigationCacheMode="Enabled"
-                    NavigationCacheMode="Enabled"
+                                       TargetPageType="{x:Type pages:MacroSettingsPage}">
-                    TargetPageType="{x:Type pages:MacroSettingsPage}">
                     <ui:NavigationViewItem.Icon>
                         <ui:SymbolIcon Symbol="XboxController24" />
                     </ui:NavigationViewItem.Icon>
                 </ui:NavigationViewItem>
-                <ui:NavigationViewItem
+                <ui:NavigationViewItem Content="快捷键"
-                    Content="快捷键"
+                                       NavigationCacheMode="Enabled"
-                    NavigationCacheMode="Enabled"
+                                       TargetPageType="{x:Type pages:HotKeyPage}">
-                    TargetPageType="{x:Type pages:HotKeyPage}">
                     <ui:NavigationViewItem.Icon>
                         <ui:SymbolIcon Symbol="Flash24" />
                     </ui:NavigationViewItem.Icon>
                 </ui:NavigationViewItem>
             </ui:NavigationView.MenuItems>
             <ui:NavigationView.FooterMenuItems>
-                <ui:NavigationViewItem
+                <ui:NavigationViewItem Content="设置"
-                    Content="设置"
+                                       NavigationCacheMode="Enabled"
-                    NavigationCacheMode="Enabled"
+                                       TargetPageType="{x:Type pages:CommonSettingsPage}">
-                    TargetPageType="{x:Type pages:CommonSettingsPage}">
                     <ui:NavigationViewItem.Icon>
                         <ui:SymbolIcon Symbol="Settings24" />
                     </ui:NavigationViewItem.Icon>
@@ -106,10 +98,11 @@
             </ui:NavigationView.FooterMenuItems>
         </ui:NavigationView>
 
-        <ui:TitleBar
+        <ui:TitleBar Title="{Binding Title, Mode=OneWay}" Grid.Row="0">
-            Title="{Binding Title, Mode=OneWay}"
+            <ui:TitleBar.Icon>
-            Grid.Row="0"
+                <ui:ImageIcon Source="pack://application:,,,/Assets/logo.png" />
-            Icon="pack://application:,,,/Assets/logo.png" />
+            </ui:TitleBar.Icon>
+        </ui:TitleBar>
 
     </Grid>
 </ui:FluentWindow>

CodeMaid.config

@@ -0,0 +1,90 @@
+<?xml version="1.0" encoding="utf-8"?>
+<configuration>
+    <configSections>
+        <sectionGroup name="userSettings" type="System.Configuration.UserSettingsGroup, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" >
+            <section name="SteveCadwallader.CodeMaid.Properties.Settings" type="System.Configuration.ClientSettingsSection, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
+        </sectionGroup>
+    </configSections>
+    <userSettings>
+        <SteveCadwallader.CodeMaid.Properties.Settings>
+            <setting name="General_Theme" serializeAs="String">
+                <value>1</value>
+            </setting>
+            <setting name="Cleaning_AutoCleanupOnFileSave" serializeAs="String">
+                <value>True</value>
+            </setting>
+            <setting name="ThirdParty_UseXAMLStylerCleanup" serializeAs="String">
+                <value>False</value>
+            </setting>
+            <setting name="Cleaning_RemoveEndOfFileTrailingNewLine" serializeAs="String">
+                <value>True</value>
+            </setting>
+            <setting name="Cleaning_IncludeCPlusPlus" serializeAs="String">
+                <value>False</value>
+            </setting>
+            <setting name="Cleaning_IncludeXAML" serializeAs="String">
+                <value>False</value>
+            </setting>
+            <setting name="Cleaning_IncludeXML" serializeAs="String">
+                <value>False</value>
+            </setting>
+            <setting name="Cleaning_IncludePHP" serializeAs="String">
+                <value>False</value>
+            </setting>
+            <setting name="Cleaning_IncludeCSS" serializeAs="String">
+                <value>False</value>
+            </setting>
+            <setting name="Cleaning_IncludeHTML" serializeAs="String">
+                <value>False</value>
+            </setting>
+            <setting name="Cleaning_IncludeTypeScript" serializeAs="String">
+                <value>False</value>
+            </setting>
+            <setting name="Cleaning_IncludeJSON" serializeAs="String">
+                <value>False</value>
+            </setting>
+            <setting name="Cleaning_IncludeJavaScript" serializeAs="String">
+                <value>False</value>
+            </setting>
+            <setting name="Cleaning_IncludeSCSS" serializeAs="String">
+                <value>False</value>
+            </setting>
+            <setting name="Cleaning_IncludeLESS" serializeAs="String">
+                <value>False</value>
+            </setting>
+            <setting name="Cleaning_IncludeR" serializeAs="String">
+                <value>False</value>
+            </setting>
+            <setting name="Cleaning_IncludePowerShell" serializeAs="String">
+                <value>False</value>
+            </setting>
+            <setting name="Cleaning_InsertEndOfFileTrailingNewLine" serializeAs="String">
+                <value>True</value>
+            </setting>
+            <setting name="Cleaning_InsertExplicitAccessModifiersOnClasses"
+                serializeAs="String">
+                <value>False</value>
+            </setting>
+            <setting name="Cleaning_InsertExplicitAccessModifiersOnDelegates"
+                serializeAs="String">
+                <value>False</value>
+            </setting>
+            <setting name="Cleaning_InsertExplicitAccessModifiersOnEnumerations"
+                serializeAs="String">
+                <value>False</value>
+            </setting>
+            <setting name="Cleaning_InsertExplicitAccessModifiersOnInterfaces"
+                serializeAs="String">
+                <value>False</value>
+            </setting>
+            <setting name="Cleaning_InsertExplicitAccessModifiersOnStructs"
+                serializeAs="String">
+                <value>False</value>
+            </setting>
+            <setting name="Cleaning_InsertExplicitAccessModifiersOnMethods"
+                serializeAs="String">
+                <value>False</value>
+            </setting>
+        </SteveCadwallader.CodeMaid.Properties.Settings>
+    </userSettings>
+</configuration>

Settings.XamlStyler

@@ -0,0 +1,42 @@
+{
+    "AttributesTolerance": 2,
+    "KeepFirstAttributeOnSameLine": true,
+    "MaxAttributeCharactersPerLine": 0,
+    "MaxAttributesPerLine": 1,
+    "NewlineExemptionElements": "RadialGradientBrush, GradientStop, LinearGradientBrush, ScaleTransform, SkewTransform, RotateTransform, TranslateTransform, Trigger, Condition, Setter",
+    "SeparateByGroups": false,
+    "AttributeIndentation": 0,
+    "AttributeIndentationStyle": 1,
+    "RemoveDesignTimeReferences":  false,
+    "IgnoreDesignTimeReferencePrefix": false,
+    "EnableAttributeReordering": true,
+    "AttributeOrderingRuleGroups": [
+        "x:Class",
+        "xmlns, xmlns:x",
+        "xmlns:*",
+        "x:Key, Key, x:Name, Name, x:Uid, Uid, Title",
+        "Grid.Row, Grid.RowSpan, Grid.Column, Grid.ColumnSpan, Canvas.Left, Canvas.Top, Canvas.Right, Canvas.Bottom",
+        "Width, Height, MinWidth, MinHeight, MaxWidth, MaxHeight",
+        "Margin, Padding, HorizontalAlignment, VerticalAlignment, HorizontalContentAlignment, VerticalContentAlignment, Panel.ZIndex",
+        "*:*, *",
+        "PageSource, PageIndex, Offset, Color, TargetName, Property, Value, StartPoint, EndPoint",
+        "mc:Ignorable, d:IsDataSource, d:LayoutOverrides, d:IsStaticText",
+        "Storyboard.*, From, To, Duration"
+    ],
+    "FirstLineAttributes": "",
+    "OrderAttributesByName": true,
+    "PutEndingBracketOnNewLine": false,
+    "RemoveEndingTagOfEmptyElement": true,
+    "SpaceBeforeClosingSlash": true,
+    "RootElementLineBreakRule": 0,
+    "ReorderVSM": 2,
+    "ReorderGridChildren": false,
+    "ReorderCanvasChildren": false,
+    "ReorderSetters": 0,
+    "FormatMarkupExtension": true,
+    "NoNewLineMarkupExtensions": "x:Bind, Binding",
+    "ThicknessSeparator": 2,
+    "ThicknessAttributes": "Margin, Padding, BorderThickness, ThumbnailClipMargin",
+    "FormatOnSave": true,
+    "CommentPadding": 2
+}