From 21c7f200d6727047ed44f4d9213498afc03746ec Mon Sep 17 00:00:00 2001
From: Niels Laute <niels.laute@live.nl>
Date: Mon, 28 Aug 2023 16:32:56 +0200
Subject: [PATCH] Updating namespaces

---
 nuget.config                       |  1 -
 src/Calculator/Calculator.csproj   |  4 ++--
 src/Calculator/Views/Settings.xaml | 34 +++++++++++++++---------------
 3 files changed, 19 insertions(+), 20 deletions(-)

diff --git a/nuget.config b/nuget.config
index 0b8604f4..ca8e03c6 100644
--- a/nuget.config
+++ b/nuget.config
@@ -3,7 +3,6 @@
   <packageSources>
     <clear />
     <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>
   <disabledPackageSources>
     <clear />
diff --git a/src/Calculator/Calculator.csproj b/src/Calculator/Calculator.csproj
index 4f5693fb..21217f6c 100644
--- a/src/Calculator/Calculator.csproj
+++ b/src/Calculator/Calculator.csproj
@@ -793,8 +793,8 @@
     </Page>
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="CommunityToolkit.Labs.Uwp.SettingsControls">
-      <Version>0.0.16</Version>
+    <PackageReference Include="CommunityToolkit.WinUI.Controls.SettingsControls">
+      <Version>8.0.230823-rc</Version>
     </PackageReference>
     <PackageReference Include="Microsoft.NETCore.UniversalWindowsPlatform">
       <Version>6.2.14</Version>
diff --git a/src/Calculator/Views/Settings.xaml b/src/Calculator/Views/Settings.xaml
index 78308de4..9a170111 100644
--- a/src/Calculator/Views/Settings.xaml
+++ b/src/Calculator/Views/Settings.xaml
@@ -3,7 +3,7 @@
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
              xmlns:automation="using:CalculatorApp.ViewModel.Common.Automation"
              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:muxc="using:Microsoft.UI.Xaml.Controls"
              xmlns:utils="using:CalculatorApp.Utils"
@@ -89,14 +89,14 @@
                 <TextBlock Style="{StaticResource SettingsCategoryTitleTextBlockStyle}"
                            AutomationProperties.HeadingLevel="Level1"
                            Text="{utils:ResourceString Name=SettingsAppearance/Text}"/>
-                <labs:SettingsExpander x:Name="AppThemeExpander"
+                <toolkit:SettingsExpander x:Name="AppThemeExpander"
                                        Description="Select which app theme to display"
                                        Header="App theme">
-                    <labs:SettingsExpander.HeaderIcon>
+                    <toolkit:SettingsExpander.HeaderIcon>
                         <FontIcon Glyph="&#xE790;"/>
-                    </labs:SettingsExpander.HeaderIcon>
-                    <labs:SettingsExpander.Items>
-                        <labs:SettingsCard ContentAlignment="Left">
+                    </toolkit:SettingsExpander.HeaderIcon>
+                    <toolkit:SettingsExpander.Items>
+                        <toolkit:SettingsCard ContentAlignment="Left">
                             <muxc:RadioButtons x:Name="ThemeRadioButtons"
                                                Margin="0,-8,0,0"
                                                SelectionChanged="OnThemeSelectionChanged">
@@ -110,23 +110,23 @@
                                              Content="{utils:ResourceString Name=SystemThemeRadioButton/Content}"
                                              Tag="Default"/>
                             </muxc:RadioButtons>
-                        </labs:SettingsCard>
-                    </labs:SettingsExpander.Items>
-                </labs:SettingsExpander>
+                        </toolkit:SettingsCard>
+                    </toolkit:SettingsExpander.Items>
+                </toolkit:SettingsExpander>
 
                 <TextBlock x:Name="AboutGroupTitle"
                            Style="{ThemeResource SettingsCategoryTitleTextBlockStyle}"
                            AutomationProperties.HeadingLevel="Level1"
                            Text="{utils:ResourceString Name=AboutGroupTitle/Text}"/>
-                <labs:SettingsExpander x:Name="AboutExpander">
-                    <labs:SettingsExpander.HeaderIcon>
+                <toolkit:SettingsExpander x:Name="AboutExpander">
+                    <toolkit:SettingsExpander.HeaderIcon>
                         <BitmapIcon AutomationProperties.AccessibilityView="Raw" UriSource="ms-appx:///Assets/CalculatorAppList.png"/>
-                    </labs:SettingsExpander.HeaderIcon>
+                    </toolkit:SettingsExpander.HeaderIcon>
                     <TextBlock x:Name="AboutBuildVersion"
                                Foreground="{ThemeResource TextFillColorSecondaryBrush}"
                                IsTextSelectionEnabled="True"/>
-                    <labs:SettingsExpander.Items>
-                        <labs:SettingsCard ContentAlignment="Left">
+                    <toolkit:SettingsExpander.Items>
+                        <toolkit:SettingsCard ContentAlignment="Left">
                             <StackPanel Margin="0,4,0,6"
                                         Orientation="Vertical"
                                         Spacing="12">
@@ -158,9 +158,9 @@
                                                TextWrapping="Wrap"/>
                                 </HyperlinkButton>
                             </StackPanel>
-                        </labs:SettingsCard>
-                    </labs:SettingsExpander.Items>
-                </labs:SettingsExpander>
+                        </toolkit:SettingsCard>
+                    </toolkit:SettingsExpander.Items>
+                </toolkit:SettingsExpander>
 
                 <HyperlinkButton x:Name="FeedbackButton"
                                  MinWidth="120"