Skip to content

Commit a971cb5

Browse files
yaira2yaira2
authored
Feature: Apply app theme to settings dialog (#11286)
1 parent c4b4c48 commit a971cb5

File tree

1 file changed

+105
-103
lines changed

1 file changed

+105
-103
lines changed

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

Lines changed: 105 additions & 103 deletions
Original file line numberDiff line numberDiff line change
@@ -16,112 +16,114 @@
1616
</ResourceDictionary>
1717
</ContentDialog.Resources>
1818

19-
<Grid
20-
x:Name="ContainerGrid"
21-
MaxHeight="790"
22-
HorizontalAlignment="Stretch"
23-
VerticalAlignment="Stretch"
24-
Background="{ThemeResource SolidBackgroundFillColorBase}">
25-
<Grid.RowDefinitions>
26-
<RowDefinition Height="44" />
27-
<RowDefinition Height="*" />
28-
</Grid.RowDefinitions>
29-
19+
<Border Background="{ThemeResource App.Theme.BackgroundBrush}">
3020
<Grid
31-
Grid.Row="0"
32-
Padding="8,0"
33-
HorizontalAlignment="Stretch">
34-
<TextBlock
35-
Padding="8,0,0,0"
36-
HorizontalAlignment="Left"
37-
VerticalAlignment="Center"
38-
FontWeight="SemiBold"
39-
Text="{helpers:ResourceString Name=Settings}" />
21+
x:Name="ContainerGrid"
22+
MaxHeight="790"
23+
HorizontalAlignment="Stretch"
24+
VerticalAlignment="Stretch"
25+
Background="{ThemeResource CardBackgroundFillColorSecondary}">
26+
<Grid.RowDefinitions>
27+
<RowDefinition Height="44" />
28+
<RowDefinition Height="*" />
29+
</Grid.RowDefinitions>
4030

41-
<Button
42-
x:Name="ButtonClose"
43-
Width="36"
44-
Height="36"
45-
HorizontalAlignment="Right"
46-
VerticalAlignment="Center"
47-
AutomationProperties.Name="{helpers:ResourceString Name=Close}"
48-
Background="Transparent"
49-
BorderBrush="Transparent"
50-
Click="ButtonClose_Click"
51-
ToolTipService.ToolTip="{helpers:ResourceString Name=Close}">
52-
<FontIcon FontSize="12" Glyph="&#xE8BB;" />
53-
</Button>
54-
</Grid>
31+
<Grid
32+
Grid.Row="0"
33+
Padding="8,0"
34+
HorizontalAlignment="Stretch">
35+
<TextBlock
36+
Padding="8,0,0,0"
37+
HorizontalAlignment="Left"
38+
VerticalAlignment="Center"
39+
FontWeight="SemiBold"
40+
Text="{helpers:ResourceString Name=Settings}" />
5541

56-
<NavigationView
57-
x:Name="SettingsPane"
58-
Grid.Row="1"
59-
IsBackButtonVisible="Collapsed"
60-
IsBackEnabled="False"
61-
IsPaneToggleButtonVisible="False"
62-
IsSettingsVisible="False"
63-
IsTitleBarAutoPaddingEnabled="False"
64-
OpenPaneLength="260"
65-
PaneDisplayMode="Left"
66-
SelectionChanged="SettingsPane_SelectionChanged">
42+
<Button
43+
x:Name="ButtonClose"
44+
Width="36"
45+
Height="36"
46+
HorizontalAlignment="Right"
47+
VerticalAlignment="Center"
48+
AutomationProperties.Name="{helpers:ResourceString Name=Close}"
49+
Background="Transparent"
50+
BorderBrush="Transparent"
51+
Click="ButtonClose_Click"
52+
ToolTipService.ToolTip="{helpers:ResourceString Name=Close}">
53+
<FontIcon FontSize="12" Glyph="&#xE8BB;" />
54+
</Button>
55+
</Grid>
6756

68-
<NavigationView.MenuItems>
69-
<NavigationViewItem
70-
AccessKey="A"
71-
AutomationProperties.AutomationId="SettingsItemAppearance"
72-
Content="{helpers:ResourceString Name=Appearance}"
73-
IsSelected="True"
74-
Tag="0">
75-
<NavigationViewItem.Icon>
76-
<FontIcon HorizontalAlignment="Left" Glyph="&#xE790;" />
77-
</NavigationViewItem.Icon>
78-
</NavigationViewItem>
79-
<NavigationViewItem
80-
AccessKey="P"
81-
AutomationProperties.AutomationId="SettingsItemPreferences"
82-
Content="{helpers:ResourceString Name=SettingsNavPreferences/Content}"
83-
Tag="1">
84-
<NavigationViewItem.Icon>
85-
<FontIcon FontFamily="{StaticResource CustomGlyph}" Glyph="&#xF116;" />
86-
</NavigationViewItem.Icon>
87-
</NavigationViewItem>
88-
<NavigationViewItem
89-
AccessKey="F"
90-
AutomationProperties.AutomationId="SettingsItemFolders"
91-
Content="{helpers:ResourceString Name=Folders}"
92-
Tag="2">
93-
<NavigationViewItem.Icon>
94-
<FontIcon Glyph="&#xE8B7;" />
95-
</NavigationViewItem.Icon>
96-
</NavigationViewItem>
97-
<NavigationViewItem
98-
AccessKey="E"
99-
AutomationProperties.AutomationId="SettingsItemAdvanced"
100-
Content="{helpers:ResourceString Name=Advanced}"
101-
CornerRadius="0"
102-
Tag="3">
103-
<NavigationViewItem.Icon>
104-
<FontIcon Glyph="&#xF1AD;" />
105-
</NavigationViewItem.Icon>
106-
</NavigationViewItem>
107-
<NavigationViewItem
108-
AccessKey="B"
109-
AutomationProperties.AutomationId="SettingsItemAbout"
110-
Content="{helpers:ResourceString Name=About}"
111-
Tag="4">
112-
<NavigationViewItem.Icon>
113-
<FontIcon FontSize="16" Glyph="&#xE946;" />
114-
</NavigationViewItem.Icon>
115-
</NavigationViewItem>
116-
</NavigationView.MenuItems>
57+
<NavigationView
58+
x:Name="SettingsPane"
59+
Grid.Row="1"
60+
IsBackButtonVisible="Collapsed"
61+
IsBackEnabled="False"
62+
IsPaneToggleButtonVisible="False"
63+
IsSettingsVisible="False"
64+
IsTitleBarAutoPaddingEnabled="False"
65+
OpenPaneLength="260"
66+
PaneDisplayMode="Left"
67+
SelectionChanged="SettingsPane_SelectionChanged">
11768

118-
<ScrollViewer
119-
x:Name="SettingsScrollViewer"
120-
VerticalAlignment="Stretch"
121-
VerticalScrollBarVisibility="Visible"
122-
VerticalScrollMode="Enabled">
123-
<Frame x:Name="SettingsContentFrame" Padding="12" />
124-
</ScrollViewer>
125-
</NavigationView>
126-
</Grid>
69+
<NavigationView.MenuItems>
70+
<NavigationViewItem
71+
AccessKey="A"
72+
AutomationProperties.AutomationId="SettingsItemAppearance"
73+
Content="{helpers:ResourceString Name=Appearance}"
74+
IsSelected="True"
75+
Tag="0">
76+
<NavigationViewItem.Icon>
77+
<FontIcon HorizontalAlignment="Left" Glyph="&#xE790;" />
78+
</NavigationViewItem.Icon>
79+
</NavigationViewItem>
80+
<NavigationViewItem
81+
AccessKey="P"
82+
AutomationProperties.AutomationId="SettingsItemPreferences"
83+
Content="{helpers:ResourceString Name=SettingsNavPreferences/Content}"
84+
Tag="1">
85+
<NavigationViewItem.Icon>
86+
<FontIcon FontFamily="{StaticResource CustomGlyph}" Glyph="&#xF116;" />
87+
</NavigationViewItem.Icon>
88+
</NavigationViewItem>
89+
<NavigationViewItem
90+
AccessKey="F"
91+
AutomationProperties.AutomationId="SettingsItemFolders"
92+
Content="{helpers:ResourceString Name=Folders}"
93+
Tag="2">
94+
<NavigationViewItem.Icon>
95+
<FontIcon Glyph="&#xE8B7;" />
96+
</NavigationViewItem.Icon>
97+
</NavigationViewItem>
98+
<NavigationViewItem
99+
AccessKey="E"
100+
AutomationProperties.AutomationId="SettingsItemAdvanced"
101+
Content="{helpers:ResourceString Name=Advanced}"
102+
CornerRadius="0"
103+
Tag="3">
104+
<NavigationViewItem.Icon>
105+
<FontIcon Glyph="&#xF1AD;" />
106+
</NavigationViewItem.Icon>
107+
</NavigationViewItem>
108+
<NavigationViewItem
109+
AccessKey="B"
110+
AutomationProperties.AutomationId="SettingsItemAbout"
111+
Content="{helpers:ResourceString Name=About}"
112+
Tag="4">
113+
<NavigationViewItem.Icon>
114+
<FontIcon FontSize="16" Glyph="&#xE946;" />
115+
</NavigationViewItem.Icon>
116+
</NavigationViewItem>
117+
</NavigationView.MenuItems>
118+
119+
<ScrollViewer
120+
x:Name="SettingsScrollViewer"
121+
VerticalAlignment="Stretch"
122+
VerticalScrollBarVisibility="Visible"
123+
VerticalScrollMode="Enabled">
124+
<Frame x:Name="SettingsContentFrame" Padding="12" />
125+
</ScrollViewer>
126+
</NavigationView>
127+
</Grid>
128+
</Border>
127129
</ContentDialog>

0 commit comments

Comments
 (0)