Skip to content

Commit 3fef5a5

Browse files
yaira2yaira2
committed
Advanced page
1 parent 4dd6547 commit 3fef5a5

File tree

2 files changed

+60
-65
lines changed

2 files changed

+60
-65
lines changed

‎src/Files.App/Views/Settings/AboutPage.xaml‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@
77
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
88
xmlns:dataitems="using:Files.App.Data.Items"
99
xmlns:helpers="using:Files.App.Helpers"
10-
xmlns:local="using:Files.App.UserControls.Settings"
1110
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
1211
xmlns:vm="using:Files.App.ViewModels.Settings"
1312
xmlns:wctcontrols="using:CommunityToolkit.WinUI.Controls"

‎src/Files.App/Views/Settings/AdvancedPage.xaml‎

Lines changed: 60 additions & 64 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,9 @@
77
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
88
xmlns:helpers="using:Files.App.Helpers"
99
xmlns:i="using:Microsoft.Xaml.Interactivity"
10-
xmlns:local="using:Files.App.UserControls.Settings"
1110
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
1211
xmlns:vm="using:Files.App.ViewModels.Settings"
12+
xmlns:wctcontrols="using:CommunityToolkit.WinUI.Controls"
1313
mc:Ignorable="d">
1414

1515
<Page.Resources>
@@ -40,46 +40,43 @@
4040
Text="{helpers:ResourceString Name=Advanced}" />
4141

4242
<!-- Export -->
43-
<local:SettingsBlockControl
44-
Title="{helpers:ResourceString Name=ExportSettings}"
45-
ButtonCommand="{x:Bind ViewModel.ExportSettingsCommand}"
46-
IsClickable="True">
47-
<local:SettingsBlockControl.Icon>
43+
<wctcontrols:SettingsCard
44+
Command="{x:Bind ViewModel.ExportSettingsCommand}"
45+
Header="{helpers:ResourceString Name=ExportSettings}"
46+
IsClickEnabled="True">
47+
<wctcontrols:SettingsCard.HeaderIcon>
4848
<FontIcon Glyph="&#xEDE1;" />
49-
</local:SettingsBlockControl.Icon>
50-
<FontIcon
51-
FontSize="14"
52-
Foreground="{ThemeResource TextFillColorPrimaryBrush}"
53-
Glyph="&#xE8A7;" />
54-
</local:SettingsBlockControl>
49+
</wctcontrols:SettingsCard.HeaderIcon>
50+
<wctcontrols:SettingsCard.ActionIcon>
51+
<FontIcon Glyph="&#xE8A7;" />
52+
</wctcontrols:SettingsCard.ActionIcon>
53+
</wctcontrols:SettingsCard>
5554

5655
<!-- Import -->
57-
<local:SettingsBlockControl
58-
Title="{helpers:ResourceString Name=ImportSettings}"
59-
ButtonCommand="{x:Bind ViewModel.ImportSettingsCommand}"
60-
IsClickable="True">
61-
<local:SettingsBlockControl.Icon>
56+
<wctcontrols:SettingsCard
57+
Command="{x:Bind ViewModel.ImportSettingsCommand}"
58+
Header="{helpers:ResourceString Name=ImportSettings}"
59+
IsClickEnabled="True">
60+
<wctcontrols:SettingsCard.HeaderIcon>
6261
<FontIcon Glyph="&#xEDE2;" />
63-
</local:SettingsBlockControl.Icon>
64-
<FontIcon
65-
FontSize="14"
66-
Foreground="{ThemeResource TextFillColorPrimaryBrush}"
67-
Glyph="&#xE8A7;" />
68-
</local:SettingsBlockControl>
62+
</wctcontrols:SettingsCard.HeaderIcon>
63+
<wctcontrols:SettingsCard.ActionIcon>
64+
<FontIcon Glyph="&#xE8A7;" />
65+
</wctcontrols:SettingsCard.ActionIcon>
66+
</wctcontrols:SettingsCard>
6967

7068
<!-- Edit Settings File -->
71-
<local:SettingsBlockControl
72-
Title="{helpers:ResourceString Name=EditSettingsFile}"
73-
ButtonCommand="{x:Bind ViewModel.OpenSettingsJsonCommand}"
74-
IsClickable="True">
75-
<local:SettingsBlockControl.Icon>
69+
<wctcontrols:SettingsCard
70+
Command="{x:Bind ViewModel.OpenSettingsJsonCommand}"
71+
Header="{helpers:ResourceString Name=EditSettingsFile}"
72+
IsClickEnabled="True">
73+
<wctcontrols:SettingsCard.HeaderIcon>
7674
<FontIcon Glyph="&#xE8DA;" />
77-
</local:SettingsBlockControl.Icon>
78-
<FontIcon
79-
FontSize="14"
80-
Foreground="{ThemeResource TextFillColorPrimaryBrush}"
81-
Glyph="&#xE8A7;" />
82-
</local:SettingsBlockControl>
75+
</wctcontrols:SettingsCard.HeaderIcon>
76+
<wctcontrols:SettingsCard.ActionIcon>
77+
<FontIcon Glyph="&#xE8A7;" />
78+
</wctcontrols:SettingsCard.ActionIcon>
79+
</wctcontrols:SettingsCard>
8380

8481
<!-- Open on Windows startup -->
8582
<StackPanel>
@@ -94,10 +91,10 @@
9491
Severity="Warning" />
9592

9693
<!-- Setting block -->
97-
<local:SettingsBlockControl Title="{helpers:ResourceString Name=SettingsOpenInLogin}" HorizontalAlignment="Stretch">
98-
<local:SettingsBlockControl.Icon>
94+
<wctcontrols:SettingsCard HorizontalAlignment="Stretch" Header="{helpers:ResourceString Name=SettingsOpenInLogin}">
95+
<wctcontrols:SettingsCard.HeaderIcon>
9996
<FontIcon Glyph="&#xE7E8;" />
100-
</local:SettingsBlockControl.Icon>
97+
</wctcontrols:SettingsCard.HeaderIcon>
10198
<ToggleSwitch
10299
AutomationProperties.Name="{helpers:ResourceString Name=SettingsOpenInLogin}"
103100
IsEnabled="{x:Bind ViewModel.CanOpenOnWindowsStartup, Mode=OneWay}"
@@ -109,30 +106,30 @@
109106
</i:EventTriggerBehavior>
110107
</i:Interaction.Behaviors>
111108
</ToggleSwitch>
112-
</local:SettingsBlockControl>
109+
</wctcontrols:SettingsCard>
113110
</StackPanel>
114111

115112
<!-- Leave App Running -->
116-
<local:SettingsBlockControl Title="{helpers:ResourceString Name=SettingsLeaveAppRunning}" HorizontalAlignment="Stretch">
117-
<local:SettingsBlockControl.Icon>
113+
<wctcontrols:SettingsCard HorizontalAlignment="Stretch" Header="{helpers:ResourceString Name=SettingsLeaveAppRunning}">
114+
<wctcontrols:SettingsCard.HeaderIcon>
118115
<FontIcon Glyph="&#xE8E6;" />
119-
</local:SettingsBlockControl.Icon>
116+
</wctcontrols:SettingsCard.HeaderIcon>
120117
<ToggleSwitch
121118
AutomationProperties.Name="{helpers:ResourceString Name=SettingsLeaveAppRunning}"
122119
IsOn="{x:Bind ViewModel.LeaveAppRunning, Mode=TwoWay}"
123120
Style="{StaticResource RightAlignedToggleSwitchStyle}" />
124-
</local:SettingsBlockControl>
121+
</wctcontrols:SettingsCard>
125122

126123
<!-- System Tray Icon -->
127-
<local:SettingsBlockControl Title="{helpers:ResourceString Name=ShowSystemTrayIcon}" HorizontalAlignment="Stretch">
128-
<local:SettingsBlockControl.Icon>
124+
<wctcontrols:SettingsCard HorizontalAlignment="Stretch" Header="{helpers:ResourceString Name=ShowSystemTrayIcon}">
125+
<wctcontrols:SettingsCard.HeaderIcon>
129126
<FontIcon Glyph="&#xE75B;" />
130-
</local:SettingsBlockControl.Icon>
127+
</wctcontrols:SettingsCard.HeaderIcon>
131128
<ToggleSwitch
132129
AutomationProperties.Name="{helpers:ResourceString Name=ShowSystemTrayIcon}"
133130
IsOn="{x:Bind ViewModel.ShowSystemTrayIcon, Mode=TwoWay}"
134131
Style="{StaticResource RightAlignedToggleSwitchStyle}" />
135-
</local:SettingsBlockControl>
132+
</wctcontrols:SettingsCard>
136133

137134
<!-- Experimental Settings -->
138135
<TextBlock
@@ -142,15 +139,14 @@
142139
Text="{helpers:ResourceString Name=ExperimentalFeatureFlags}" />
143140

144141
<!-- Replace File Explorer -->
145-
<local:SettingsBlockControl
142+
<wctcontrols:SettingsCard
146143
x:Name="SetAsDefaultSettingsBlockControl"
147-
Title="{helpers:ResourceString Name=SettingsSetAsDefaultFileManager}"
148144
HorizontalAlignment="Stretch"
149145
Description="{helpers:ResourceString Name=SettingsSetAsDefaultFileManagerDescription}"
150-
IsExpanded="True">
151-
<local:SettingsBlockControl.Icon>
146+
Header="{helpers:ResourceString Name=SettingsSetAsDefaultFileManager}">
147+
<wctcontrols:SettingsCard.HeaderIcon>
152148
<FontIcon Glyph="&#xEC50;" />
153-
</local:SettingsBlockControl.Icon>
149+
</wctcontrols:SettingsCard.HeaderIcon>
154150
<ToggleSwitch
155151
AutomationProperties.Name="{helpers:ResourceString Name=SettingsSetAsDefaultFileManager}"
156152
IsOn="{x:Bind ViewModel.IsSetAsDefaultFileManager, Mode=TwoWay}"
@@ -161,17 +157,17 @@
161157
</i:EventTriggerBehavior>
162158
</i:Interaction.Behaviors>
163159
</ToggleSwitch>
164-
</local:SettingsBlockControl>
160+
</wctcontrols:SettingsCard>
165161

166162
<!-- Replace Open File Dialog -->
167-
<local:SettingsBlockControl
163+
<wctcontrols:SettingsCard
168164
x:Name="ReplaceOpenFileDialogSetting"
169-
Title="{helpers:ResourceString Name=SettingsSetAsOpenDialog}"
170165
HorizontalAlignment="Stretch"
171-
x:Load="{x:Bind ViewModel.IsAppEnvironmentDev}">
172-
<local:SettingsBlockControl.Icon>
166+
x:Load="{x:Bind ViewModel.IsAppEnvironmentDev}"
167+
Header="{helpers:ResourceString Name=SettingsSetAsOpenDialog}">
168+
<wctcontrols:SettingsCard.HeaderIcon>
173169
<FontIcon Glyph="&#xE8E5;" />
174-
</local:SettingsBlockControl.Icon>
170+
</wctcontrols:SettingsCard.HeaderIcon>
175171
<ToggleSwitch
176172
IsEnabled="{x:Bind ViewModel.IsSetAsDefaultFileManager, Mode=OneWay}"
177173
IsOn="{x:Bind ViewModel.IsSetAsOpenFileDialog, Mode=TwoWay}"
@@ -182,21 +178,21 @@
182178
</i:EventTriggerBehavior>
183179
</i:Interaction.Behaviors>
184180
</ToggleSwitch>
185-
</local:SettingsBlockControl>
181+
</wctcontrols:SettingsCard>
186182

187183
<!-- Flatten options -->
188-
<local:SettingsBlockControl
189-
Title="{helpers:ResourceString Name=ShowFlattenOptions}"
184+
<wctcontrols:SettingsCard
190185
HorizontalAlignment="Stretch"
191-
Description="{helpers:ResourceString Name=ShowFlattenOptionsDescription}">
192-
<local:SettingsBlockControl.Icon>
186+
Description="{helpers:ResourceString Name=ShowFlattenOptionsDescription}"
187+
Header="{helpers:ResourceString Name=ShowFlattenOptions}">
188+
<wctcontrols:SettingsCard.HeaderIcon>
193189
<FontIcon Glyph="&#xE8B7;" />
194-
</local:SettingsBlockControl.Icon>
190+
</wctcontrols:SettingsCard.HeaderIcon>
195191
<ToggleSwitch
196192
AutomationProperties.Name="{helpers:ResourceString Name=ShowFlattenOptions}"
197193
IsOn="{x:Bind ViewModel.ShowFlattenOptions, Mode=TwoWay}"
198194
Style="{StaticResource RightAlignedToggleSwitchStyle}" />
199-
</local:SettingsBlockControl>
195+
</wctcontrols:SettingsCard>
200196
</StackPanel>
201197
</Grid>
202198
</Page>

0 commit comments

Comments
 (0)