adjust ui

GZStudio/Views/SettingsPage.xaml

@@ -19,7 +19,7 @@
 
             <controls:SettingsCard Description="选择应用展示的主题"
                                        Header="应用主题"
-                                       HeaderIcon="{ui:FontIcon Glyph=&#xE799;}">
+                                       HeaderIcon="{ui:FontIcon Glyph=&#xE790;}">
                 <ComboBox SelectedIndex="0">
                     <ComboBoxItem>默认</ComboBoxItem>
                     <ComboBoxItem>暗色</ComboBoxItem>
@@ -27,17 +27,15 @@
                 </ComboBox>
             </controls:SettingsCard>
 
-
-
             <TextBlock  Style="{ThemeResource SubtitleTextBlockStyle}" x:Uid="Settings_About" />
 
-            <controls:SettingsExpander Description="© 2024. All rights reserved." Header="GZStudio">
+            <controls:SettingsExpander Description="© 2024. All rights reserved." Header="GZStudio"
+                                       HeaderIcon="{ui:FontIcon Glyph=&#xE946;}">
                 <TextBlock IsTextSelectionEnabled="True" Text="Version 0.0.1" />
                 <controls:SettingsExpander.Items>
                     <controls:SettingsCard HorizontalContentAlignment="Left" ContentAlignment="Left">
                         <StackPanel Margin="-12,0,0,0" Orientation="Vertical">
                             <TextBlock x:Uid="Settings_Theme" />
-
                             <StackPanel Margin="{StaticResource XSmallTopMargin}">
                                 <RadioButton
                                         x:Uid="Settings_Theme_Light"

GZStudio/Views/ShellPage.xaml

@@ -15,23 +15,14 @@
             <RowDefinition Height="Auto" />
             <RowDefinition Height="*" />
         </Grid.RowDefinitions>
-        <Grid>
+        <TitleBar x:Name="AppTitleBar"
-                    <Grid.ColumnDefinitions>
-                        <ColumnDefinition Width="*" />
-                        <ColumnDefinition Width="Auto" />
-                    </Grid.ColumnDefinitions>
-                    <TitleBar
-                x:Name="AppTitleBar"
             Title="GZStudio"
             Subtitle="preview"
             IsBackButtonVisible="True"
             IsPaneToggleButtonVisible="True"
             BorderThickness="2"
             BorderBrush="{ThemeResource SurfaceStrokeColorDefaultBrush}"
-                CornerRadius="{StaticResource OverlayCornerRadius}"
+            CornerRadius="{StaticResource OverlayCornerRadius}" />
-            ></TitleBar>
-        
-        </Grid>
 
         <NavigationView
             Grid.Row="1"
@@ -56,7 +47,7 @@
             -->
                 <NavigationViewItem x:Uid="Shell_AppList" helpers:NavigationHelper.NavigateTo="GZStudio.ViewModels.AppListViewModel">
                     <NavigationViewItem.Icon>
-                        <FontIcon FontFamily="{StaticResource SymbolThemeFontFamily}" Glyph="&#xe7c3;"/>
+                        <FontIcon FontFamily="{StaticResource SymbolThemeFontFamily}" Glyph="&#xEA37;"/>
                     </NavigationViewItem.Icon>
                 </NavigationViewItem>
                 <NavigationViewItem x:Uid="Shell_Configuration" helpers:NavigationHelper.NavigateTo="GZStudio.ViewModels.ConfigurationViewModel">