Skip to content

Feature: Expand the background colors section by default #10932

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Jan 5, 2023
Merged

Feature: Expand the background colors section by default #10932

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
620b279
Feature: Expand backgrounds section by default
yaira2 Jan 5, 2023
454ebb2
Renamed CompactStyles to CompactSpacing
yaira2 Jan 5, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions src/Files.App/Strings/en-US/Resources.resw
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2665,8 +2665,8 @@
<data name="SettingsShowFileTagsSectionSwitch.AutomationProperties.Name" xml:space="preserve">
<value>Show Tags section</value>
</data>
<data name="UseCompactStyles" xml:space="preserve">
<value>Use compact styles in the details layout</value>
<data name="UseCompactSpacing" xml:space="preserve">
<value>Use compact spacing in the details layout</value>
</data>
<data name="Universal" xml:space="preserve">
<value>Universal</value>
Expand Down
9 changes: 6 additions & 3 deletions src/Files.App/Views/SettingsPages/Appearance.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,10 @@
SelectedIndex="{x:Bind ViewModel.SelectedThemeIndex, Mode=TwoWay}" />
</local:SettingsBlockControl>

<local:SettingsBlockControl Title="{helpers:ResourceString Name=Background}" HorizontalAlignment="Stretch">
<local:SettingsBlockControl
Title="{helpers:ResourceString Name=Background}"
HorizontalAlignment="Stretch"
IsExpanded="True">
<local:SettingsBlockControl.Icon>
<FontIcon Glyph="&#xE771;" />
</local:SettingsBlockControl.Icon>
Expand Down Expand Up @@ -164,12 +167,12 @@
</local:SettingsBlockControl.ExpandableContent>
</local:SettingsBlockControl>

<local:SettingsBlockControl Title="{helpers:ResourceString Name=UseCompactStyles}" HorizontalAlignment="Stretch">
<local:SettingsBlockControl Title="{helpers:ResourceString Name=UseCompactSpacing}" HorizontalAlignment="Stretch">
<local:SettingsBlockControl.Icon>
<FontIcon Glyph="&#xE14C;" />
</local:SettingsBlockControl.Icon>
<ToggleSwitch
AutomationProperties.Name="{helpers:ResourceString Name=UseCompactStyles}"
AutomationProperties.Name="{helpers:ResourceString Name=UseCompactSpacing}"
IsOn="{x:Bind ViewModel.UseCompactStyles, Mode=TwoWay}"
Style="{StaticResource RightAlignedToggleSwitchStyle}" />
</local:SettingsBlockControl>
Expand Down
72 changes: 36 additions & 36 deletions src/Files.App/Views/SettingsPages/Appearance/AppThemeResourcesFactory.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,24 +33,24 @@ public static class AppThemeResourceFactory
PreviewColor = new SolidColorBrush(Color.FromArgb(255, 247, 99, 12)), /* #F7630C */
Name = "Orange Bright"
},
new AppThemeResource
{
BackgroundColor = Color.FromArgb(50, 202, 80, 16), /* #CA5010 */
PreviewColor = new SolidColorBrush(Color.FromArgb(255, 202, 80, 16)), /* #CA5010 */
Name = "Orange Dark"
},
//new AppThemeResource
//{
// BackgroundColor = Color.FromArgb(50, 202, 80, 16), /* #CA5010 */
// PreviewColor = new SolidColorBrush(Color.FromArgb(255, 202, 80, 16)), /* #CA5010 */
// Name = "Orange Dark"
//},
new AppThemeResource
{
BackgroundColor = Color.FromArgb(50, 218, 59, 1), /* #DA3B01 */
PreviewColor = new SolidColorBrush(Color.FromArgb(255, 218, 59, 1)), /* #DA3B01 */
Name = "Rust",
},
new AppThemeResource
{
BackgroundColor = Color.FromArgb(50, 239, 105, 80), /* #EF6950 */
PreviewColor = new SolidColorBrush(Color.FromArgb(255, 239, 105, 80)), /* #EF6950 */
Name = "Pale Rust"
},
//new AppThemeResource
//{
// BackgroundColor = Color.FromArgb(50, 239, 105, 80), /* #EF6950 */
// PreviewColor = new SolidColorBrush(Color.FromArgb(255, 239, 105, 80)), /* #EF6950 */
// Name = "Pale Rust"
//},
new AppThemeResource
{
BackgroundColor = Color.FromArgb(50, 209, 52, 56), /* #D13438 */
Expand Down Expand Up @@ -81,36 +81,36 @@ public static class AppThemeResourceFactory
PreviewColor = new SolidColorBrush(Color.FromArgb(255, 234, 0, 94)), /* #EA005E */
Name = "Rose Bright"
},
new AppThemeResource
{
BackgroundColor = Color.FromArgb(50, 195, 0, 82), /* #C30052 */
PreviewColor = new SolidColorBrush(Color.FromArgb(255, 195, 0, 82)), /* #C30052 */
Name = "Rose"
},
//new AppThemeResource
//{
// BackgroundColor = Color.FromArgb(50, 195, 0, 82), /* #C30052 */
// PreviewColor = new SolidColorBrush(Color.FromArgb(255, 195, 0, 82)), /* #C30052 */
// Name = "Rose"
//},
new AppThemeResource
{
BackgroundColor = Color.FromArgb(50, 227, 0, 140), /* #E3008C */
PreviewColor = new SolidColorBrush(Color.FromArgb(100, 227, 0, 140)), /* #E3008C */
Name = "Plum Light"
},
new AppThemeResource
{
BackgroundColor = Color.FromArgb(50, 191, 0, 119), /* #BF0077 */
PreviewColor = new SolidColorBrush(Color.FromArgb(100, 191, 0, 119)), /* #BF0077 */
Name = "Plum"
},
new AppThemeResource
{
BackgroundColor = Color.FromArgb(50, 194, 57, 179), /* #C239B3 */
PreviewColor = new SolidColorBrush(Color.FromArgb(255, 194, 57, 179)), /* #C239B3 */
Name = "Orchid Light"
},
new AppThemeResource
{
BackgroundColor = Color.FromArgb(50, 154, 0, 137), /* #9A0089 */
PreviewColor = new SolidColorBrush(Color.FromArgb(255, 154, 0, 137)), /* #9A0089 */
Name = "Orchid"
},
//new AppThemeResource
//{
// BackgroundColor = Color.FromArgb(50, 191, 0, 119), /* #BF0077 */
// PreviewColor = new SolidColorBrush(Color.FromArgb(100, 191, 0, 119)), /* #BF0077 */
// Name = "Plum"
//},
//new AppThemeResource
//{
// BackgroundColor = Color.FromArgb(50, 194, 57, 179), /* #C239B3 */
// PreviewColor = new SolidColorBrush(Color.FromArgb(255, 194, 57, 179)), /* #C239B3 */
// Name = "Orchid Light"
//},
//new AppThemeResource
//{
// BackgroundColor = Color.FromArgb(50, 154, 0, 137), /* #9A0089 */
// PreviewColor = new SolidColorBrush(Color.FromArgb(255, 154, 0, 137)), /* #9A0089 */
// Name = "Orchid"
//},
new AppThemeResource
{
BackgroundColor = Color.FromArgb(50, 0, 120, 215), /* #0078D7 */
Expand Down