Tags Page

Author: yaira2

src/Files.App/Views/Settings/TagsPage.xaml

@@ -8,9 +8,9 @@
 	xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
 	xmlns:datamodels="using:Files.App.Data.Models"
 	xmlns:helpers="using:Files.App.Helpers"
-	xmlns:local="using:Files.App.UserControls.Settings"
 	xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
 	xmlns:vm="using:Files.App.ViewModels.Settings"
+	xmlns:wctcontrols="using:CommunityToolkit.WinUI.Controls"
 	xmlns:wctconverters="using:CommunityToolkit.WinUI.Converters"
 	mc:Ignorable="d">
 
@@ -47,16 +47,16 @@
 				Text="{helpers:ResourceString Name=FileTags}" />
 
 			<!--  Edit Tags  -->
-			<local:SettingsBlockControl
-				Title="{helpers:ResourceString Name=FileTags}"
+			<wctcontrols:SettingsExpander
 				HorizontalAlignment="Stretch"
+				Header="{helpers:ResourceString Name=FileTags}"
 				IsExpanded="True">
-				<local:SettingsBlockControl.Icon>
+				<wctcontrols:SettingsExpander.HeaderIcon>
 					<FontIcon Glyph="&#xE8EC;" />
-				</local:SettingsBlockControl.Icon>
+				</wctcontrols:SettingsExpander.HeaderIcon>
 
 				<Button Command="{x:Bind ViewModel.AddTagCommand, Mode=OneWay}" Content="{helpers:ResourceString Name=NewTag}" />
-				<local:SettingsBlockControl.ExpandableContent>
+				<wctcontrols:SettingsExpander.Items>
 					<StackPanel>
 						<!--  Create new tag  -->
 						<Grid
@@ -343,8 +343,8 @@
 							</ListView.ItemTemplate>
 						</ListView>
 					</StackPanel>
-				</local:SettingsBlockControl.ExpandableContent>
-			</local:SettingsBlockControl>
+				</wctcontrols:SettingsExpander.Items>
+			</wctcontrols:SettingsExpander>
 		</StackPanel>
 	</Grid>
 </Page>