github/msft-calculator
1
0
Fork 0
mirror of https://github.com/Microsoft/calculator.git synced 2025-08-20 05:13:11 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Update Settings Page (#2094)

Browse source 
* Fix monochrome image of About expander in Settings page

* Update style

* Remove resource

* Remove unused style
This commit is contained in:
hanzhang54 2023-12-05 20:20:21 +08:00 • committed by GitHub
commit 48b8dc141e
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 12 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/Calculator/Resources/en-US/Resources.resw
View file

@ -4750,8 +4750,4 @@
<value>Settings page</value> <value>Settings page</value>
<comment>Announcement used when Settings page is opened</comment> <comment>Announcement used when Settings page is opened</comment>
</data> </data>
<data name="AppThemeExpander.[using:Windows.UI.Xaml.Automation]AutomationProperties.Name" xml:space="preserve">
<value>App theme setting</value>
<comment>Screen reader prompt for the App theme Setting radio buttons group</comment>
</data>
</root> </root>

26
src/Calculator/Views/Settings.xaml
View file

@ -3,9 +3,9 @@
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:automation="using:CalculatorApp.ViewModel.Common.Automation" xmlns:automation="using:CalculatorApp.ViewModel.Common.Automation"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008" xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:toolkit="using:CommunityToolkit.WinUI.Controls"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:muxc="using:Microsoft.UI.Xaml.Controls" xmlns:muxc="using:Microsoft.UI.Xaml.Controls"
xmlns:toolkit="using:CommunityToolkit.WinUI.Controls"
xmlns:utils="using:CalculatorApp.Utils" xmlns:utils="using:CalculatorApp.Utils"
Loaded="OnLoaded" Loaded="OnLoaded"
Unloaded="OnUnloaded" Unloaded="OnUnloaded"
@ -32,12 +32,6 @@
<Setter Property="TextWrapping" Value="Wrap"/> <Setter Property="TextWrapping" Value="Wrap"/>
</Style> </Style>
<Style x:Key="SettingsCategoryTitleTextBlockStyle"
BasedOn="{StaticResource BodyStrongTextBlockStyle}"
TargetType="TextBlock">
<Setter Property="Margin" Value="0,30,0,4"/>
</Style>
<automation:NarratorNotifier x:Name="NarratorNotifier"/> <automation:NarratorNotifier x:Name="NarratorNotifier"/>
<!-- Override default hyperlink button background color --> <!-- Override default hyperlink button background color -->
@ -51,6 +45,7 @@
<Grid> <Grid>
<Grid.RowDefinitions> <Grid.RowDefinitions>
<RowDefinition Height="{x:Bind TitleBarHeight, Mode=OneWay}"/> <RowDefinition Height="{x:Bind TitleBarHeight, Mode=OneWay}"/>
<RowDefinition Height="Auto"/>
<RowDefinition Height="*"/> <RowDefinition Height="*"/>
</Grid.RowDefinitions> </Grid.RowDefinitions>
@ -76,8 +71,7 @@
Text="{utils:ResourceString Name=SettingsHeader/Text}"/> Text="{utils:ResourceString Name=SettingsHeader/Text}"/>
</Grid> </Grid>
<ScrollViewer Grid.Row="1" <ScrollViewer Grid.Row="2"
Margin="0,30,0,0"
Padding="24,0,24,16" Padding="24,0,24,16"
Style="{StaticResource SettingsContentScrollViewStyle}"> Style="{StaticResource SettingsContentScrollViewStyle}">
@ -86,12 +80,13 @@
<EntranceThemeTransition FromVerticalOffset="50" IsStaggeringEnabled="True"/> <EntranceThemeTransition FromVerticalOffset="50" IsStaggeringEnabled="True"/>
<RepositionThemeTransition IsStaggeringEnabled="False"/> <RepositionThemeTransition IsStaggeringEnabled="False"/>
</StackPanel.ChildrenTransitions> </StackPanel.ChildrenTransitions>
<TextBlock Style="{StaticResource SettingsCategoryTitleTextBlockStyle}" <TextBlock Margin="0,12,0,4"
Style="{StaticResource BodyStrongTextBlockStyle}"
AutomationProperties.HeadingLevel="Level1" AutomationProperties.HeadingLevel="Level1"
Text="{utils:ResourceString Name=SettingsAppearance/Text}"/> Text="{utils:ResourceString Name=SettingsAppearance/Text}"/>
<toolkit:SettingsExpander x:Name="AppThemeExpander" <toolkit:SettingsExpander x:Name="AppThemeExpander"
Description="{utils:ResourceString Name=AppThemeExpander/Description}" Description="{utils:ResourceString Name=AppThemeExpander/Description}"
Header="{utils:ResourceString Name=AppThemeExpander/Header}"> Header="{utils:ResourceString Name=AppThemeExpander/Header}">
<toolkit:SettingsExpander.HeaderIcon> <toolkit:SettingsExpander.HeaderIcon>
<FontIcon Glyph="&#xE790;"/> <FontIcon Glyph="&#xE790;"/>
</toolkit:SettingsExpander.HeaderIcon> </toolkit:SettingsExpander.HeaderIcon>
@ -115,12 +110,15 @@
</toolkit:SettingsExpander> </toolkit:SettingsExpander>
<TextBlock x:Name="AboutGroupTitle" <TextBlock x:Name="AboutGroupTitle"
Style="{ThemeResource SettingsCategoryTitleTextBlockStyle}" Margin="0,30,0,4"
Style="{StaticResource BodyStrongTextBlockStyle}"
AutomationProperties.HeadingLevel="Level1" AutomationProperties.HeadingLevel="Level1"
Text="{utils:ResourceString Name=AboutGroupTitle/Text}"/> Text="{utils:ResourceString Name=AboutGroupTitle/Text}"/>
<toolkit:SettingsExpander x:Name="AboutExpander"> <toolkit:SettingsExpander x:Name="AboutExpander">
<toolkit:SettingsExpander.HeaderIcon> <toolkit:SettingsExpander.HeaderIcon>
<BitmapIcon AutomationProperties.AccessibilityView="Raw" UriSource="ms-appx:///Assets/CalculatorAppList.png"/> <BitmapIcon AutomationProperties.AccessibilityView="Raw"
ShowAsMonochrome="False"
UriSource="ms-appx:///Assets/CalculatorAppList.png"/>
</toolkit:SettingsExpander.HeaderIcon> </toolkit:SettingsExpander.HeaderIcon>
<TextBlock x:Name="AboutBuildVersion" <TextBlock x:Name="AboutBuildVersion"
Foreground="{ThemeResource TextFillColorSecondaryBrush}" Foreground="{ThemeResource TextFillColorSecondaryBrush}"