Skip to content

Commit f0a0310

Browse files
yaira2yaira2
authored
Feature: Expand the background colors section by default (#10932)
1 parent 39f171f commit f0a0310

File tree

3 files changed

+44
-41
lines changed

3 files changed

+44
-41
lines changed

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2665,8 +2665,8 @@
26652665
<data name="SettingsShowFileTagsSectionSwitch.AutomationProperties.Name" xml:space="preserve">
26662666
<value>Show Tags section</value>
26672667
</data>
2668-
<data name="UseCompactStyles" xml:space="preserve">
2669-
<value>Use compact styles in the details layout</value>
2668+
<data name="UseCompactSpacing" xml:space="preserve">
2669+
<value>Use compact spacing in the details layout</value>
26702670
</data>
26712671
<data name="Universal" xml:space="preserve">
26722672
<value>Universal</value>

‎src/Files.App/Views/SettingsPages/Appearance.xaml

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,10 @@
7070
SelectedIndex="{x:Bind ViewModel.SelectedThemeIndex, Mode=TwoWay}" />
7171
</local:SettingsBlockControl>
7272

73-
<local:SettingsBlockControl Title="{helpers:ResourceString Name=Background}" HorizontalAlignment="Stretch">
73+
<local:SettingsBlockControl
74+
Title="{helpers:ResourceString Name=Background}"
75+
HorizontalAlignment="Stretch"
76+
IsExpanded="True">
7477
<local:SettingsBlockControl.Icon>
7578
<FontIcon Glyph="&#xE771;" />
7679
</local:SettingsBlockControl.Icon>
@@ -164,12 +167,12 @@
164167
</local:SettingsBlockControl.ExpandableContent>
165168
</local:SettingsBlockControl>
166169

167-
<local:SettingsBlockControl Title="{helpers:ResourceString Name=UseCompactStyles}" HorizontalAlignment="Stretch">
170+
<local:SettingsBlockControl Title="{helpers:ResourceString Name=UseCompactSpacing}" HorizontalAlignment="Stretch">
168171
<local:SettingsBlockControl.Icon>
169172
<FontIcon Glyph="&#xE14C;" />
170173
</local:SettingsBlockControl.Icon>
171174
<ToggleSwitch
172-
AutomationProperties.Name="{helpers:ResourceString Name=UseCompactStyles}"
175+
AutomationProperties.Name="{helpers:ResourceString Name=UseCompactSpacing}"
173176
IsOn="{x:Bind ViewModel.UseCompactStyles, Mode=TwoWay}"
174177
Style="{StaticResource RightAlignedToggleSwitchStyle}" />
175178
</local:SettingsBlockControl>

‎src/Files.App/Views/SettingsPages/Appearance/AppThemeResourcesFactory.cs

Lines changed: 36 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -33,24 +33,24 @@ public static class AppThemeResourceFactory
3333
PreviewColor = new SolidColorBrush(Color.FromArgb(255, 247, 99, 12)), /* #F7630C */
3434
Name = "Orange Bright"
3535
},
36-
new AppThemeResource
37-
{
38-
BackgroundColor = Color.FromArgb(50, 202, 80, 16), /* #CA5010 */
39-
PreviewColor = new SolidColorBrush(Color.FromArgb(255, 202, 80, 16)), /* #CA5010 */
40-
Name = "Orange Dark"
41-
},
36+
//new AppThemeResource
37+
//{
38+
// BackgroundColor = Color.FromArgb(50, 202, 80, 16), /* #CA5010 */
39+
// PreviewColor = new SolidColorBrush(Color.FromArgb(255, 202, 80, 16)), /* #CA5010 */
40+
// Name = "Orange Dark"
41+
//},
4242
new AppThemeResource
4343
{
4444
BackgroundColor = Color.FromArgb(50, 218, 59, 1), /* #DA3B01 */
4545
PreviewColor = new SolidColorBrush(Color.FromArgb(255, 218, 59, 1)), /* #DA3B01 */
4646
Name = "Rust",
4747
},
48-
new AppThemeResource
49-
{
50-
BackgroundColor = Color.FromArgb(50, 239, 105, 80), /* #EF6950 */
51-
PreviewColor = new SolidColorBrush(Color.FromArgb(255, 239, 105, 80)), /* #EF6950 */
52-
Name = "Pale Rust"
53-
},
48+
//new AppThemeResource
49+
//{
50+
// BackgroundColor = Color.FromArgb(50, 239, 105, 80), /* #EF6950 */
51+
// PreviewColor = new SolidColorBrush(Color.FromArgb(255, 239, 105, 80)), /* #EF6950 */
52+
// Name = "Pale Rust"
53+
//},
5454
new AppThemeResource
5555
{
5656
BackgroundColor = Color.FromArgb(50, 209, 52, 56), /* #D13438 */
@@ -81,36 +81,36 @@ public static class AppThemeResourceFactory
8181
PreviewColor = new SolidColorBrush(Color.FromArgb(255, 234, 0, 94)), /* #EA005E */
8282
Name = "Rose Bright"
8383
},
84-
new AppThemeResource
85-
{
86-
BackgroundColor = Color.FromArgb(50, 195, 0, 82), /* #C30052 */
87-
PreviewColor = new SolidColorBrush(Color.FromArgb(255, 195, 0, 82)), /* #C30052 */
88-
Name = "Rose"
89-
},
84+
//new AppThemeResource
85+
//{
86+
// BackgroundColor = Color.FromArgb(50, 195, 0, 82), /* #C30052 */
87+
// PreviewColor = new SolidColorBrush(Color.FromArgb(255, 195, 0, 82)), /* #C30052 */
88+
// Name = "Rose"
89+
//},
9090
new AppThemeResource
9191
{
9292
BackgroundColor = Color.FromArgb(50, 227, 0, 140), /* #E3008C */
9393
PreviewColor = new SolidColorBrush(Color.FromArgb(100, 227, 0, 140)), /* #E3008C */
9494
Name = "Plum Light"
9595
},
96-
new AppThemeResource
97-
{
98-
BackgroundColor = Color.FromArgb(50, 191, 0, 119), /* #BF0077 */
99-
PreviewColor = new SolidColorBrush(Color.FromArgb(100, 191, 0, 119)), /* #BF0077 */
100-
Name = "Plum"
101-
},
102-
new AppThemeResource
103-
{
104-
BackgroundColor = Color.FromArgb(50, 194, 57, 179), /* #C239B3 */
105-
PreviewColor = new SolidColorBrush(Color.FromArgb(255, 194, 57, 179)), /* #C239B3 */
106-
Name = "Orchid Light"
107-
},
108-
new AppThemeResource
109-
{
110-
BackgroundColor = Color.FromArgb(50, 154, 0, 137), /* #9A0089 */
111-
PreviewColor = new SolidColorBrush(Color.FromArgb(255, 154, 0, 137)), /* #9A0089 */
112-
Name = "Orchid"
113-
},
96+
//new AppThemeResource
97+
//{
98+
// BackgroundColor = Color.FromArgb(50, 191, 0, 119), /* #BF0077 */
99+
// PreviewColor = new SolidColorBrush(Color.FromArgb(100, 191, 0, 119)), /* #BF0077 */
100+
// Name = "Plum"
101+
//},
102+
//new AppThemeResource
103+
//{
104+
// BackgroundColor = Color.FromArgb(50, 194, 57, 179), /* #C239B3 */
105+
// PreviewColor = new SolidColorBrush(Color.FromArgb(255, 194, 57, 179)), /* #C239B3 */
106+
// Name = "Orchid Light"
107+
//},
108+
//new AppThemeResource
109+
//{
110+
// BackgroundColor = Color.FromArgb(50, 154, 0, 137), /* #9A0089 */
111+
// PreviewColor = new SolidColorBrush(Color.FromArgb(255, 154, 0, 137)), /* #9A0089 */
112+
// Name = "Orchid"
113+
//},
114114
new AppThemeResource
115115
{
116116
BackgroundColor = Color.FromArgb(50, 0, 120, 215), /* #0078D7 */

0 commit comments

Comments
 (0)