Skip to content

Commit cc243ef

Browse files
yaira2yaira2
authored
Feature: Settings dialog update (#12112)
1 parent a708242 commit cc243ef

File tree

10 files changed

+100
-84
lines changed

10 files changed

+100
-84
lines changed

‎src/Files.App/Dialogs/SettingsDialog.xaml

Lines changed: 11 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,8 @@
1919

2020
<x:Double x:Key="ContentDialogMaxWidth">1100</x:Double>
2121
<Thickness x:Key="ContentDialogPadding">0</Thickness>
22+
<SolidColorBrush x:Key="NavigationViewContentGridBorderBrush" Color="Transparent" />
23+
<SolidColorBrush x:Key="NavigationViewContentBackground" Color="Transparent" />
2224
</ResourceDictionary>
2325
</ContentDialog.Resources>
2426

@@ -31,6 +33,14 @@
3133
<RowDefinition Height="*" />
3234
</Grid.RowDefinitions>
3335

36+
<!-- Smokescreen for displaying a semi transparent background -->
37+
<Border
38+
Grid.RowSpan="2"
39+
HorizontalAlignment="Stretch"
40+
VerticalAlignment="Stretch"
41+
Background="{ThemeResource App.Theme.BackgroundBrush}"
42+
Opacity=".4" />
43+
3444
<!-- Titlebar -->
3545
<Grid Grid.Row="0" Padding="8,0">
3646
<TextBlock
@@ -130,10 +140,7 @@
130140

131141
<!-- Content Frame -->
132142
<ScrollViewer x:Name="SettingsContentScrollViewer">
133-
<Frame
134-
x:Name="SettingsContentFrame"
135-
Padding="12"
136-
Background="{ThemeResource SolidBackgroundFillColorTertiary}" />
143+
<Frame x:Name="SettingsContentFrame" Padding="4,0,24,24" />
137144
</ScrollViewer>
138145

139146
</NavigationView>

‎src/Files.App/Strings/en-US/Resources.resw

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -564,9 +564,6 @@
564564
<data name="InvalidItemDialogTitle" xml:space="preserve">
565565
<value>Invalid item</value>
566566
</data>
567-
<data name="Version" xml:space="preserve">
568-
<value>Version</value>
569-
</data>
570567
<data name="SettingsAboutVersionTitle" xml:space="preserve">
571568
<value>Version:</value>
572569
</data>
@@ -612,12 +609,6 @@
612609
<data name="SponsorUsOnGitHub" xml:space="preserve">
613610
<value>Sponsor us on GitHub</value>
614611
</data>
615-
<data name="Personalization" xml:space="preserve">
616-
<value>Personalization</value>
617-
</data>
618-
<data name="LayoutAndSorting" xml:space="preserve">
619-
<value>Layout and sorting</value>
620-
</data>
621612
<data name="AccessDeniedCreateDialog.Text" xml:space="preserve">
622613
<value>We weren't able to create this item</value>
623614
</data>
@@ -1983,9 +1974,6 @@
19831974
<data name="ImportSettings" xml:space="preserve">
19841975
<value>Import Settings</value>
19851976
</data>
1986-
<data name="ManageSettings" xml:space="preserve">
1987-
<value>Manage settings</value>
1988-
</data>
19891977
<data name="SettingsImportErrorDescription" xml:space="preserve">
19901978
<value>Couldn't import settings. The settings file is corrupted.</value>
19911979
</data>

‎src/Files.App/Views/LayoutModes/ColumnViewBase.xaml

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -133,7 +133,7 @@
133133
Canvas.ZIndex="0"
134134
EmptyTextType="{x:Bind ParentShellPageInstance.FilesystemViewModel.EmptyTextType, Mode=OneWay}" />
135135

136-
<!-- Invalid Item Name Tip -->
136+
<!-- Invalid Item Name Tip -->
137137
<TeachingTip
138138
x:Name="FileNameTeachingTip"
139139
Grid.RowSpan="2"
@@ -149,7 +149,7 @@
149149
ViewChangeStarted="SemanticZoom_ViewChangeStarted"
150150
Visibility="{x:Bind FolderSettings.IsLayoutModeChanging, Mode=OneWay, Converter={StaticResource NegatedBoolToVisibilityConverter}}">
151151

152-
<!-- Main View -->
152+
<!-- Main View -->
153153
<SemanticZoom.ZoomedInView>
154154
<ListView
155155
x:Name="FileList"
@@ -199,7 +199,7 @@
199199
<ColumnDefinition Width="Auto" />
200200
</Grid.ColumnDefinitions>
201201

202-
<!-- Thumbnail -->
202+
<!-- Thumbnail -->
203203
<Grid
204204
Grid.Column="0"
205205
Width="24"
@@ -274,7 +274,7 @@
274274
Stretch="Uniform" />
275275
</Grid>
276276

277-
<!-- Item Name -->
277+
<!-- Item Name -->
278278
<TextBlock
279279
x:Name="ItemName"
280280
Grid.Column="1"
@@ -301,7 +301,7 @@
301301
<Grid Grid.Column="2">
302302
<StackPanel Orientation="Horizontal" Spacing="4">
303303

304-
<!-- Cloud Status -->
304+
<!-- Cloud Status -->
305305
<FontIcon
306306
x:Name="CloudDriveSyncStatusGlyph"
307307
HorizontalAlignment="Center"
@@ -402,7 +402,7 @@
402402
</ListView>
403403
</SemanticZoom.ZoomedInView>
404404

405-
<!-- Grouped View -->
405+
<!-- Grouped View -->
406406
<SemanticZoom.ZoomedOutView>
407407
<ListView
408408
HorizontalAlignment="Stretch"
@@ -438,7 +438,7 @@
438438
Style="{StaticResource SubtitleTextBlockStyle}"
439439
Text="{x:Bind ((helpers:IGroupedCollectionHeader)Group).Model.Text, Mode=OneWay}" />
440440

441-
<!-- Count -->
441+
<!-- Count -->
442442
<TextBlock
443443
Margin="4,0,0,0"
444444
VerticalAlignment="Center"
@@ -447,7 +447,7 @@
447447
Text="{x:Bind ((helpers:IGroupedCollectionHeader)Group).Model.CountText, Mode=OneWay}"
448448
Visibility="{x:Bind ((helpers:IGroupedCollectionHeader)Group).Model.ShowCountTextBelow, Mode=OneWay, Converter={StaticResource NegatedBoolToVisibilityConverter}}" />
449449

450-
<!-- Subheader -->
450+
<!-- Subheader -->
451451
<TextBlock
452452
VerticalAlignment="Center"
453453
FontSize="14"
@@ -474,7 +474,7 @@
474474

475475
</SemanticZoom>
476476

477-
<!-- Selector -->
477+
<!-- Selector -->
478478
<Canvas>
479479
<Rectangle
480480
Name="SelectionRectangle"

‎src/Files.App/Views/Properties/HashesPage.xaml

Lines changed: 37 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -75,36 +75,42 @@
7575
<FontIcon FontSize="14" Glyph="&#xE7B3;" />
7676
<Button.Flyout>
7777
<MenuFlyout x:Name="SelectAlgorithmsMenuFlyout" Closing="MenuFlyout_Closing">
78-
<ToggleMenuFlyoutItem Text="CRC32"
79-
IsChecked="{x:Bind HashesViewModel.ShowHashes['CRC32']}"
80-
Click="ToggleMenuFlyoutItem_Click"
81-
Command="{x:Bind HashesViewModel.ToggleIsEnabledCommand}"
82-
CommandParameter="CRC32" />
83-
<ToggleMenuFlyoutItem Text="MD5"
84-
IsChecked="{x:Bind HashesViewModel.ShowHashes['MD5']}"
85-
Click="ToggleMenuFlyoutItem_Click"
86-
Command="{x:Bind HashesViewModel.ToggleIsEnabledCommand}"
87-
CommandParameter="MD5" />
88-
<ToggleMenuFlyoutItem Text="SHA1"
89-
IsChecked="{x:Bind HashesViewModel.ShowHashes['SHA1']}"
90-
Click="ToggleMenuFlyoutItem_Click"
91-
Command="{x:Bind HashesViewModel.ToggleIsEnabledCommand}"
92-
CommandParameter="SHA1" />
93-
<ToggleMenuFlyoutItem Text="SHA256"
94-
IsChecked="{x:Bind HashesViewModel.ShowHashes['SHA256']}"
95-
Click="ToggleMenuFlyoutItem_Click"
96-
Command="{x:Bind HashesViewModel.ToggleIsEnabledCommand}"
97-
CommandParameter="SHA256" />
98-
<ToggleMenuFlyoutItem Text="SHA384"
99-
IsChecked="{x:Bind HashesViewModel.ShowHashes['SHA384']}"
100-
Click="ToggleMenuFlyoutItem_Click"
101-
Command="{x:Bind HashesViewModel.ToggleIsEnabledCommand}"
102-
CommandParameter="SHA384" />
103-
<ToggleMenuFlyoutItem Text="SHA512"
104-
IsChecked="{x:Bind HashesViewModel.ShowHashes['SHA512']}"
105-
Click="ToggleMenuFlyoutItem_Click"
106-
Command="{x:Bind HashesViewModel.ToggleIsEnabledCommand}"
107-
CommandParameter="SHA512" />
78+
<ToggleMenuFlyoutItem
79+
Click="ToggleMenuFlyoutItem_Click"
80+
Command="{x:Bind HashesViewModel.ToggleIsEnabledCommand}"
81+
CommandParameter="CRC32"
82+
IsChecked="{x:Bind HashesViewModel.ShowHashes['CRC32']}"
83+
Text="CRC32" />
84+
<ToggleMenuFlyoutItem
85+
Click="ToggleMenuFlyoutItem_Click"
86+
Command="{x:Bind HashesViewModel.ToggleIsEnabledCommand}"
87+
CommandParameter="MD5"
88+
IsChecked="{x:Bind HashesViewModel.ShowHashes['MD5']}"
89+
Text="MD5" />
90+
<ToggleMenuFlyoutItem
91+
Click="ToggleMenuFlyoutItem_Click"
92+
Command="{x:Bind HashesViewModel.ToggleIsEnabledCommand}"
93+
CommandParameter="SHA1"
94+
IsChecked="{x:Bind HashesViewModel.ShowHashes['SHA1']}"
95+
Text="SHA1" />
96+
<ToggleMenuFlyoutItem
97+
Click="ToggleMenuFlyoutItem_Click"
98+
Command="{x:Bind HashesViewModel.ToggleIsEnabledCommand}"
99+
CommandParameter="SHA256"
100+
IsChecked="{x:Bind HashesViewModel.ShowHashes['SHA256']}"
101+
Text="SHA256" />
102+
<ToggleMenuFlyoutItem
103+
Click="ToggleMenuFlyoutItem_Click"
104+
Command="{x:Bind HashesViewModel.ToggleIsEnabledCommand}"
105+
CommandParameter="SHA384"
106+
IsChecked="{x:Bind HashesViewModel.ShowHashes['SHA384']}"
107+
Text="SHA384" />
108+
<ToggleMenuFlyoutItem
109+
Click="ToggleMenuFlyoutItem_Click"
110+
Command="{x:Bind HashesViewModel.ToggleIsEnabledCommand}"
111+
CommandParameter="SHA512"
112+
IsChecked="{x:Bind HashesViewModel.ShowHashes['SHA512']}"
113+
Text="SHA512" />
108114
</MenuFlyout>
109115
</Button.Flyout>
110116
</Button>
@@ -142,9 +148,9 @@
142148
<!-- Copy button -->
143149
<Button
144150
x:Name="CopyHashButton"
145-
x:Load="{x:Bind IsCalculated, Mode=OneWay}"
146151
Grid.Column="3"
147152
Padding="6"
153+
x:Load="{x:Bind IsCalculated, Mode=OneWay}"
148154
AutomationProperties.Name="{helpers:ResourceString Name=Copy}"
149155
Background="Transparent"
150156
BorderBrush="Transparent"

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

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -24,12 +24,13 @@
2424
<EntranceThemeTransition />
2525
</TransitionCollection>
2626
</StackPanel.ChildrenTransitions>
27-
<!-- Version -->
27+
28+
<!-- Title -->
2829
<TextBlock
29-
Padding="0,0,0,4"
30-
FontSize="14"
30+
Padding="0,0,0,12"
31+
FontSize="24"
3132
FontWeight="Medium"
32-
Text="{helpers:ResourceString Name=Version}" />
33+
Text="{helpers:ResourceString Name=About}" />
3334

3435
<!-- App Info -->
3536
<local:SettingsBlockControl
@@ -67,8 +68,8 @@
6768

6869
<!-- Help and support -->
6970
<TextBlock
70-
Padding="0,12,0,4"
71-
FontSize="14"
71+
Padding="0,16,0,4"
72+
FontSize="16"
7273
FontWeight="Medium"
7374
Text="{helpers:ResourceString Name=HelpAndSupport}" />
7475

@@ -141,8 +142,8 @@
141142

142143
<!-- Open Source -->
143144
<TextBlock
144-
Padding="0,12,0,4"
145-
FontSize="14"
145+
Padding="0,16,0,4"
146+
FontSize="16"
146147
FontWeight="Medium"
147148
Text="{helpers:ResourceString Name=OpenSource}" />
148149

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

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -30,12 +30,12 @@
3030
</TransitionCollection>
3131
</StackPanel.ChildrenTransitions>
3232

33-
<!-- Manage Settings -->
33+
<!-- Title -->
3434
<TextBlock
35-
Padding="0,0,0,4"
36-
FontSize="14"
35+
Padding="0,0,0,12"
36+
FontSize="24"
3737
FontWeight="Medium"
38-
Text="{helpers:ResourceString Name=ManageSettings}" />
38+
Text="{helpers:ResourceString Name=Advanced}" />
3939

4040
<!-- Export -->
4141
<local:SettingsBlockControl
@@ -82,8 +82,8 @@
8282

8383
<!-- Default file manager -->
8484
<TextBlock
85-
Padding="0,12,0,4"
86-
FontSize="14"
85+
Padding="0,16,0,4"
86+
FontSize="16"
8787
FontWeight="Medium"
8888
Text="{helpers:ResourceString Name=ExperimentalFeatureFlags}" />
8989

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -95,12 +95,12 @@
9595
</TransitionCollection>
9696
</StackPanel.ChildrenTransitions>
9797

98-
<!-- Personalization -->
98+
<!-- Title -->
9999
<TextBlock
100-
Padding="0,0,0,4"
101-
FontSize="14"
100+
Padding="0,0,0,12"
101+
FontSize="24"
102102
FontWeight="Medium"
103-
Text="{helpers:ResourceString Name=Personalization}" />
103+
Text="{helpers:ResourceString Name=Appearance}" />
104104

105105
<!-- Theme -->
106106
<local:SettingsBlockControl Title="{helpers:ResourceString Name=SettingsAppearanceTheme}" HorizontalAlignment="Stretch">

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

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -28,12 +28,12 @@
2828
</TransitionCollection>
2929
</StackPanel.ChildrenTransitions>
3030

31-
<!-- Layout And Sorting -->
31+
<!-- Title -->
3232
<TextBlock
33-
Padding="0,0,0,4"
34-
FontSize="14"
33+
Padding="0,0,0,12"
34+
FontSize="24"
3535
FontWeight="Medium"
36-
Text="{helpers:ResourceString Name=LayoutAndSorting}" />
36+
Text="{helpers:ResourceString Name=Folders}" />
3737

3838
<!-- Folder Overrides -->
3939
<local:SettingsBlockControl
@@ -169,8 +169,8 @@
169169

170170
<!-- Display -->
171171
<TextBlock
172-
Padding="0,12,0,4"
173-
FontSize="14"
172+
Padding="0,16,0,4"
173+
FontSize="16"
174174
FontWeight="Medium"
175175
Text="{helpers:ResourceString Name=Display}" />
176176

@@ -251,8 +251,8 @@
251251

252252
<!-- Behaviors -->
253253
<TextBlock
254-
Padding="0,12,0,4"
255-
FontSize="14"
254+
Padding="0,16,0,4"
255+
FontSize="16"
256256
FontWeight="Medium"
257257
Text="{helpers:ResourceString Name=Behaviors}" />
258258

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

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,13 @@
3131
</TransitionCollection>
3232
</StackPanel.ChildrenTransitions>
3333

34+
<!-- Title -->
35+
<TextBlock
36+
Padding="0,0,0,12"
37+
FontSize="24"
38+
FontWeight="Medium"
39+
Text="{helpers:ResourceString Name=General}" />
40+
3441
<!-- Language settings -->
3542
<local:SettingsBlockControl Title="{helpers:ResourceString Name=Language}" HorizontalAlignment="Stretch">
3643
<local:SettingsBlockControl.Icon>
@@ -254,8 +261,8 @@
254261

255262
<!-- Right Click Menu -->
256263
<TextBlock
257-
Padding="0,12,0,4"
258-
FontSize="14"
264+
Padding="0,16,0,4"
265+
FontSize="16"
259266
FontWeight="Medium"
260267
Text="{helpers:ResourceString Name=SettingsContextMenu/Text}" />
261268

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

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,13 @@
4242
</TransitionCollection>
4343
</StackPanel.ChildrenTransitions>
4444

45+
<!-- Title -->
46+
<TextBlock
47+
Padding="0,0,0,12"
48+
FontSize="24"
49+
FontWeight="Medium"
50+
Text="{helpers:ResourceString Name=FileTags}" />
51+
4552
<!-- Edit Tags -->
4653
<local:SettingsBlockControl
4754
Title="{helpers:ResourceString Name=FileTags}"

0 commit comments

Comments
 (0)