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

Updating namespaces

Browse source
This commit is contained in:
Niels Laute 2023-08-28 16:32:56 +02:00
commit 21c7f200d6
3 changed files with 19 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

1
nuget.config
View file

@ -3,7 +3,6 @@
<packageSources> <packageSources>
<clear /> <clear />
<add key="nuget.org" value="https://api.nuget.org/v3/index.json" /> <add key="nuget.org" value="https://api.nuget.org/v3/index.json" />
<add key="Toolkit Labs" value="https://pkgs.dev.azure.com/dotnet/CommunityToolkit/_packaging/CommunityToolkit-Labs/nuget/v3/index.json" />
</packageSources> </packageSources>
<disabledPackageSources> <disabledPackageSources>
<clear /> <clear />

4
src/Calculator/Calculator.csproj
View file

@ -793,8 +793,8 @@
</Page> </Page>
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="CommunityToolkit.Labs.Uwp.SettingsControls"> <PackageReference Include="CommunityToolkit.WinUI.Controls.SettingsControls">
<Version>0.0.16</Version> <Version>8.0.230823-rc</Version>
</PackageReference> </PackageReference>
<PackageReference Include="Microsoft.NETCore.UniversalWindowsPlatform"> <PackageReference Include="Microsoft.NETCore.UniversalWindowsPlatform">
<Version>6.2.14</Version> <Version>6.2.14</Version>

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

@ -3,7 +3,7 @@
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:labs="using:CommunityToolkit.Labs.WinUI" 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:utils="using:CalculatorApp.Utils" xmlns:utils="using:CalculatorApp.Utils"
@ -89,14 +89,14 @@
<TextBlock Style="{StaticResource SettingsCategoryTitleTextBlockStyle}" <TextBlock Style="{StaticResource SettingsCategoryTitleTextBlockStyle}"
AutomationProperties.HeadingLevel="Level1" AutomationProperties.HeadingLevel="Level1"
Text="{utils:ResourceString Name=SettingsAppearance/Text}"/> Text="{utils:ResourceString Name=SettingsAppearance/Text}"/>
<labs:SettingsExpander x:Name="AppThemeExpander" <toolkit:SettingsExpander x:Name="AppThemeExpander"
Description="Select which app theme to display" Description="Select which app theme to display"
Header="App theme"> Header="App theme">
<labs:SettingsExpander.HeaderIcon> <toolkit:SettingsExpander.HeaderIcon>
<FontIcon Glyph="&#xE790;"/> <FontIcon Glyph="&#xE790;"/>
</labs:SettingsExpander.HeaderIcon> </toolkit:SettingsExpander.HeaderIcon>
<labs:SettingsExpander.Items> <toolkit:SettingsExpander.Items>
<labs:SettingsCard ContentAlignment="Left"> <toolkit:SettingsCard ContentAlignment="Left">
<muxc:RadioButtons x:Name="ThemeRadioButtons" <muxc:RadioButtons x:Name="ThemeRadioButtons"
Margin="0,-8,0,0" Margin="0,-8,0,0"
SelectionChanged="OnThemeSelectionChanged"> SelectionChanged="OnThemeSelectionChanged">
@ -110,23 +110,23 @@
Content="{utils:ResourceString Name=SystemThemeRadioButton/Content}" Content="{utils:ResourceString Name=SystemThemeRadioButton/Content}"
Tag="Default"/> Tag="Default"/>
</muxc:RadioButtons> </muxc:RadioButtons>
</labs:SettingsCard> </toolkit:SettingsCard>
</labs:SettingsExpander.Items> </toolkit:SettingsExpander.Items>
</labs:SettingsExpander> </toolkit:SettingsExpander>
<TextBlock x:Name="AboutGroupTitle" <TextBlock x:Name="AboutGroupTitle"
Style="{ThemeResource SettingsCategoryTitleTextBlockStyle}" Style="{ThemeResource SettingsCategoryTitleTextBlockStyle}"
AutomationProperties.HeadingLevel="Level1" AutomationProperties.HeadingLevel="Level1"
Text="{utils:ResourceString Name=AboutGroupTitle/Text}"/> Text="{utils:ResourceString Name=AboutGroupTitle/Text}"/>
<labs:SettingsExpander x:Name="AboutExpander"> <toolkit:SettingsExpander x:Name="AboutExpander">
<labs:SettingsExpander.HeaderIcon> <toolkit:SettingsExpander.HeaderIcon>
<BitmapIcon AutomationProperties.AccessibilityView="Raw" UriSource="ms-appx:///Assets/CalculatorAppList.png"/> <BitmapIcon AutomationProperties.AccessibilityView="Raw" UriSource="ms-appx:///Assets/CalculatorAppList.png"/>
</labs:SettingsExpander.HeaderIcon> </toolkit:SettingsExpander.HeaderIcon>
<TextBlock x:Name="AboutBuildVersion" <TextBlock x:Name="AboutBuildVersion"
Foreground="{ThemeResource TextFillColorSecondaryBrush}" Foreground="{ThemeResource TextFillColorSecondaryBrush}"
IsTextSelectionEnabled="True"/> IsTextSelectionEnabled="True"/>
<labs:SettingsExpander.Items> <toolkit:SettingsExpander.Items>
<labs:SettingsCard ContentAlignment="Left"> <toolkit:SettingsCard ContentAlignment="Left">
<StackPanel Margin="0,4,0,6" <StackPanel Margin="0,4,0,6"
Orientation="Vertical" Orientation="Vertical"
Spacing="12"> Spacing="12">
@ -158,9 +158,9 @@
TextWrapping="Wrap"/> TextWrapping="Wrap"/>
</HyperlinkButton> </HyperlinkButton>
</StackPanel> </StackPanel>
</labs:SettingsCard> </toolkit:SettingsCard>
</labs:SettingsExpander.Items> </toolkit:SettingsExpander.Items>
</labs:SettingsExpander> </toolkit:SettingsExpander>
<HyperlinkButton x:Name="FeedbackButton" <HyperlinkButton x:Name="FeedbackButton"
MinWidth="120" MinWidth="120"