From 2899a2792e46080880876251d683053ea28bdc34 Mon Sep 17 00:00:00 2001
From: Niels Laute <niels.laute@live.nl>
Date: Mon, 28 Aug 2023 16:44:42 +0200
Subject: [PATCH] Using Uwp package and loc fix

---
 src/Calculator/Calculator.csproj   | 2 +-
 src/Calculator/Views/Settings.xaml | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/Calculator/Calculator.csproj b/src/Calculator/Calculator.csproj
index 21217f6c..e9f71be3 100644
--- a/src/Calculator/Calculator.csproj
+++ b/src/Calculator/Calculator.csproj
@@ -793,7 +793,7 @@
     </Page>
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="CommunityToolkit.WinUI.Controls.SettingsControls">
+    <PackageReference Include="CommunityToolkit.Uwp.Controls.SettingsControls">
       <Version>8.0.230823-rc</Version>
     </PackageReference>
     <PackageReference Include="Microsoft.NETCore.UniversalWindowsPlatform">
diff --git a/src/Calculator/Views/Settings.xaml b/src/Calculator/Views/Settings.xaml
index 9a170111..e1eaf0ce 100644
--- a/src/Calculator/Views/Settings.xaml
+++ b/src/Calculator/Views/Settings.xaml
@@ -35,7 +35,7 @@
             <Style x:Key="SettingsCategoryTitleTextBlockStyle"
                    BasedOn="{StaticResource BodyStrongTextBlockStyle}"
                    TargetType="TextBlock">
-                <Setter Property="Margin" Value="0,29,0,5"/>
+                <Setter Property="Margin" Value="0,30,0,4"/>
             </Style>
 
             <automation:NarratorNotifier x:Name="NarratorNotifier"/>
@@ -44,7 +44,7 @@
             <StaticResource x:Key="HyperlinkButtonBackgroundPointerOver" ResourceKey="SubtleFillColorTransparentBrush"/>
             <StaticResource x:Key="HyperlinkButtonBackgroundPressed" ResourceKey="SubtleFillColorTransparentBrush"/>
 
-            <x:Double x:Key="SettingsCardSpacing">3</x:Double>
+            <x:Double x:Key="SettingsCardSpacing">4</x:Double>
         </ResourceDictionary>
     </UserControl.Resources>
 
@@ -90,8 +90,8 @@
                            AutomationProperties.HeadingLevel="Level1"
                            Text="{utils:ResourceString Name=SettingsAppearance/Text}"/>
                 <toolkit:SettingsExpander x:Name="AppThemeExpander"
-                                       Description="Select which app theme to display"
-                                       Header="App theme">
+                                       Description="{utils:ResourceString Name=AppThemeExpander/Description}"
+                                       Header="{utils:ResourceString Name=AppThemeExpander/Header}">
                     <toolkit:SettingsExpander.HeaderIcon>
                         <FontIcon Glyph="&#xE790;"/>
                     </toolkit:SettingsExpander.HeaderIcon>