General Properties

Author: yaira2

src/Files.App/Views/Properties/GeneralPage.xaml

@@ -3,14 +3,14 @@
 	x:Class="Files.App.Views.Properties.GeneralPage"
 	xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
 	xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-	xmlns:controls="using:Files.App.UserControls.Settings"
 	xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
 	xmlns:helpers="using:Files.App.Helpers"
 	xmlns:i="using:Microsoft.Xaml.Interactivity"
 	xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
 	xmlns:toolkitconverters="using:CommunityToolkit.WinUI.Converters"
 	xmlns:uc="using:Files.App.UserControls"
 	xmlns:vm="using:Files.App.ViewModels.Properties"
+	xmlns:wctcontrols="using:CommunityToolkit.WinUI.Controls"
 	Loaded="Properties_Loaded"
 	Tag="General"
 	mc:Ignorable="d">
@@ -592,34 +592,28 @@
 			</Grid>
 
 			<!--  Disk Cleanup  -->
-			<controls:SettingsBlockControl
+			<wctcontrols:SettingsCard
 				x:Name="CleanupDriveBlockControl"
-				Title="{helpers:ResourceString Name=CleanupDrive}"
 				x:Load="{x:Bind ViewModel.CleanupVisibility, Mode=OneWay}"
-				ButtonCommand="{x:Bind ViewModel.CleanupDriveCommand}"
-				IsClickable="True">
-
-				<FontIcon
-					FontSize="14"
-					Foreground="{ThemeResource TextFillColorPrimaryBrush}"
-					Glyph="&#xE8A7;" />
-
-			</controls:SettingsBlockControl>
+				Command="{x:Bind ViewModel.CleanupDriveCommand}"
+				Header="{helpers:ResourceString Name=CleanupDrive}"
+				IsClickEnabled="True">
+				<wctcontrols:SettingsCard.ActionIcon>
+					<FontIcon Glyph="&#xE8A7;" />
+				</wctcontrols:SettingsCard.ActionIcon>
+			</wctcontrols:SettingsCard>
 
 			<!--  Format Disk  -->
-			<controls:SettingsBlockControl
+			<wctcontrols:SettingsCard
 				x:Name="FormatDriveBlockControl"
-				Title="{helpers:ResourceString Name=FormatDrive}"
 				x:Load="{x:Bind ViewModel.FormatVisibility, Mode=OneWay}"
-				ButtonCommand="{x:Bind ViewModel.FormatDriveCommand}"
-				IsClickable="True">
-
-				<FontIcon
-					FontSize="14"
-					Foreground="{ThemeResource TextFillColorPrimaryBrush}"
-					Glyph="&#xE8A7;" />
-
-			</controls:SettingsBlockControl>
+				Command="{x:Bind ViewModel.FormatDriveCommand}"
+				Header="{helpers:ResourceString Name=FormatDrive}"
+				IsClickEnabled="True">
+				<wctcontrols:SettingsCard.ActionIcon>
+					<FontIcon Glyph="&#xE8A7;" />
+				</wctcontrols:SettingsCard.ActionIcon>
+			</wctcontrols:SettingsCard>
 
 			<!--  Security  -->
 			<Expander