Skip to content

Commit f6f9488

Browse files
lukeblevinslukeblevins
committed
Tweaked Settings Design and Iconography
1 parent aaaec01 commit f6f9488

File tree

6 files changed

+27
-33
lines changed

6 files changed

+27
-33
lines changed

‎Files UWP/App.xaml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,22 +10,22 @@
1010
<ResourceDictionary.ThemeDictionaries>
1111
<ResourceDictionary x:Key="Default">
1212
<AcrylicBrush x:Key="NavigationViewDefaultPaneBackground" BackgroundSource="Backdrop" FallbackColor="#eaeaea" TintColor="LightSlateGray" TintOpacity="0.6"/>
13-
<AcrylicBrush x:Key="NavigationViewTopPaneBackground" FallbackColor="#eaeaea" BackgroundSource="HostBackdrop" TintOpacity="0.8" TintColor="White"/>
13+
<SolidColorBrush x:Key="NavigationViewTopPaneBackground" Color="White"/>
1414
<AcrylicBrush x:Key="NavigationViewExpandedPaneBackground" BackgroundSource="HostBackdrop" TintOpacity="0.6" TintColor="White" FallbackColor="#eaeaea"/>
1515
<SolidColorBrush x:Key="UnmodifiedSystemPageColor" Color="White"/>
1616
<SolidColorBrush x:Key="YourHomeCardBackgroundColor" Color="#f4f4f4"/>
1717

1818
</ResourceDictionary>
1919
<ResourceDictionary x:Key="Light">
2020
<AcrylicBrush x:Key="NavigationViewDefaultPaneBackground" FallbackColor="#eaeaea" BackgroundSource="Backdrop" TintColor="LightSlateGray" TintOpacity="0.6"/>
21-
<AcrylicBrush x:Key="NavigationViewTopPaneBackground" BackgroundSource="HostBackdrop" TintOpacity="0.8" TintColor="White" FallbackColor="#eaeaea"/>
21+
<SolidColorBrush x:Key="NavigationViewTopPaneBackground" Color="White"/>
2222
<AcrylicBrush x:Key="NavigationViewExpandedPaneBackground" BackgroundSource="HostBackdrop" TintOpacity="0.6" TintColor="White" FallbackColor="#eaeaea"/>
2323
<SolidColorBrush x:Key="UnmodifiedSystemPageColor" Color="White"/>
2424
<SolidColorBrush x:Key="YourHomeCardBackgroundColor" Color="#f4f4f4"/>
2525
</ResourceDictionary>
2626
<ResourceDictionary x:Key="Dark">
2727
<AcrylicBrush x:Key="NavigationViewDefaultPaneBackground" BackgroundSource="Backdrop" TintColor="Black" TintOpacity="0.6"/>
28-
<AcrylicBrush x:Key="NavigationViewTopPaneBackground" BackgroundSource="HostBackdrop" TintOpacity="0.8" TintColor="Black"/>
28+
<SolidColorBrush x:Key="NavigationViewTopPaneBackground" Color="#191919"/>
2929
<AcrylicBrush x:Key="NavigationViewExpandedPaneBackground" BackgroundSource="HostBackdrop" TintOpacity="0.6" TintColor="Black"/>
3030
<SolidColorBrush x:Key="ApplicationPageBackgroundThemeBrush" Color="#191919"/>
3131
<SolidColorBrush x:Key="UnmodifiedSystemPageColor" Color="Black"/>

‎Files UWP/Settings.xaml‎

Lines changed: 16 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -9,17 +9,24 @@
99
mc:Ignorable="d"
1010
Background="{ThemeResource ApplicationPageBackgroundThemeBrush}">
1111

12-
<Page.Resources>
13-
<AcrylicBrush TintOpacity="80" x:Key="SecondaryPaneBrush" FallbackColor="LightGray" BackgroundSource="HostBackdrop" />
14-
15-
</Page.Resources>
16-
1712
<Grid>
18-
<UILib:NavigationView IsSettingsVisible="False" BackRequested="SettingsPane_BackRequested" Name="SettingsPane" IsBackEnabled="True" ItemInvoked="NavigationView_ItemInvoked" PaneTitle="Settings" PaneDisplayMode="Top">
13+
<UILib:NavigationView IsSettingsVisible="False" Name="SettingsPane" IsBackButtonVisible="Collapsed" ItemInvoked="NavigationView_ItemInvoked" PaneDisplayMode="Top">
1914
<UILib:NavigationView.MenuItems>
20-
<UILib:NavigationViewItem IsSelected="True" Content="Personalization"/>
21-
<UILib:NavigationViewItem Content="Preferences"/>
22-
<UILib:NavigationViewItem Content="About"/>
15+
<UILib:NavigationViewItem IsSelected="True" Content="Personalization">
16+
<UILib:NavigationViewItem.Icon>
17+
<FontIcon Glyph="&#xE790;"/>
18+
</UILib:NavigationViewItem.Icon>
19+
</UILib:NavigationViewItem>
20+
<UILib:NavigationViewItem Content="Preferences">
21+
<UILib:NavigationViewItem.Icon>
22+
<FontIcon Glyph="&#xE713;"/>
23+
</UILib:NavigationViewItem.Icon>
24+
</UILib:NavigationViewItem>
25+
<UILib:NavigationViewItem Content="About">
26+
<UILib:NavigationViewItem.Icon>
27+
<FontIcon Glyph="&#xE946;"/>
28+
</UILib:NavigationViewItem.Icon>
29+
</UILib:NavigationViewItem>
2330
</UILib:NavigationView.MenuItems>
2431
<Frame Name="SettingsContentFrame"/>
2532
</UILib:NavigationView>

‎Files UWP/Settings.xaml.cs‎

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -67,12 +67,5 @@ private void NavigationView_ItemInvoked(Microsoft.UI.Xaml.Controls.NavigationVie
6767

6868
}
6969

70-
private void SettingsPane_BackRequested(Microsoft.UI.Xaml.Controls.NavigationView sender, Microsoft.UI.Xaml.Controls.NavigationViewBackRequestedEventArgs args)
71-
{
72-
Frame rootFrame = Window.Current.Content as Frame;
73-
rootFrame.GoBack();
74-
75-
76-
}
7770
}
7871
}

‎Files UWP/SettingsPages/About.xaml‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -8,15 +8,15 @@
88
mc:Ignorable="d"
99
Background="{ThemeResource ApplicationPageBackgroundThemeBrush}">
1010

11-
<Grid Padding="24,24,24,0">
11+
<Grid Padding="24,24,0,0">
1212

1313
<ScrollViewer>
1414
<StackPanel Orientation="Vertical" HorizontalAlignment="Stretch" VerticalAlignment="Stretch">
15-
<TextBlock x:Name="Header" Text="About Files" Margin="0,0,0,5" FontFamily="Segoe UI Black" FontWeight="Bold" FontSize="40" HorizontalAlignment="Left" VerticalAlignment="Top" />
16-
<TextBlock Margin="0,0,0,10" FontFamily="Segoe UI" FontSize="24" Text="Product Information"/>
17-
<TextBlock FontSize="18" Text="Edition: Files Pre-Release"/>
18-
<TextBlock FontSize="18" Text="Version: 0.5.0-newui_snapshot1"/>
19-
<ListView IsItemClickEnabled="True" Margin="0,35,0,0" ItemClick="ListView_ItemClick" HorizontalAlignment="Left" Width="875">
15+
<TextBlock x:Name="Header" Text="Files UWP" Margin="0,0,0,5" FontFamily="Segoe UI Black" FontWeight="Bold" FontSize="40" HorizontalAlignment="Left" VerticalAlignment="Top" />
16+
<TextBlock Margin="0,0,0,5" FontFamily="Segoe UI" FontSize="20" Text="Product Information"/>
17+
<TextBlock FontSize="14" Text="Edition: Pre-Release"/>
18+
<TextBlock FontSize="14" Text="Version: 0.5.0-newui_snapshot1"/>
19+
<ListView IsItemClickEnabled="True" Margin="0,24,0,0" ItemClick="ListView_ItemClick" HorizontalAlignment="Left" Width="875">
2020
<ListViewItem IsEnabled="True" Name="FeedbackForm" Height="65" HorizontalAlignment="Stretch">
2121
<StackPanel Orientation="Horizontal">
2222
<FontIcon Margin="0,0,25,0" Glyph="&#xED15;"/>

‎Files UWP/SettingsPages/Personalization.xaml‎

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -9,15 +9,10 @@
99
Background="{ThemeResource ApplicationPageBackgroundThemeBrush}">
1010

1111

12-
<Grid Padding="24,24,24,0">
12+
<Grid Padding="24,24,0,0">
1313

1414
<ScrollViewer HorizontalAlignment="Stretch" VerticalAlignment="Stretch">
1515
<StackPanel>
16-
<TextBlock x:Name="Header" Text="Personalization" Margin="0,0,0,10" FontFamily="Segoe UI Black" FontWeight="Bold" FontSize="40" HorizontalAlignment="Left" VerticalAlignment="Top" />
17-
<Grid Margin="0,0,0,25" HorizontalAlignment="Left" VerticalAlignment="Top">
18-
<Rectangle Name="VisualRect" Fill="{ThemeResource SystemControlAcrylicElementBrush}" Width="350" Height="200" HorizontalAlignment="Center" VerticalAlignment="Center" Canvas.ZIndex="2" />
19-
<Image HorizontalAlignment="Stretch" Margin="0,0,0,0" VerticalAlignment="Stretch" Source="ms-appx:///Assets/abstract_HeroImage.jpg" Stretch="UniformToFill" Width="450" Height="300"/>
20-
</Grid>
2116
<TextBlock Margin="0,0,0,15" HorizontalAlignment="Left" Text="Choose your color scheme" TextWrapping="Wrap" VerticalAlignment="Top" FontSize="18"/>
2217
<ComboBox SelectionChanged="ThemeChooser_SelectionChanged" Name="ThemeChooser" HorizontalAlignment="Left" Margin="0,0,0,0" VerticalAlignment="Center" Width="300">
2318
<ComboBox.Items>

‎Files UWP/SettingsPages/Preferences.xaml‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,9 @@
88
mc:Ignorable="d"
99
Background="{ThemeResource ApplicationPageBackgroundThemeBrush}">
1010

11-
<Grid Padding="24,24,24,0">
11+
<Grid Padding="24,24,0,0">
1212
<ScrollViewer>
1313
<StackPanel Spacing="5" HorizontalAlignment="Stretch" VerticalAlignment="Stretch">
14-
<TextBlock x:Name="Header" Text="Preferences" Margin="0,0,0,0" FontFamily="Segoe UI Black" FontWeight="Bold" FontSize="40" HorizontalAlignment="Left" VerticalAlignment="Top" />
1514
<Grid Name="CustomLibraries">
1615
<StackPanel Orientation="Vertical">
1716
<TextBlock FontSize="20" Text="Custom Locations"/>

0 commit comments

Comments
 (0)