Skip to content

Commit 45e0f7f

Browse files
yaira2yaira2
authored
Moved the sidebar settings to the appearance settings page (#6688)
1 parent 9e7e3cf commit 45e0f7f

File tree

59 files changed

+788
-1062
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

59 files changed

+788
-1062
lines changed

‎Files/App.xaml.cs

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -97,13 +97,11 @@ private IServiceProvider ConfigureServices()
9797
// Base IUserSettingsService as parent settings store (to get ISettingsSharingContext from)
9898
.AddSingleton<IUserSettingsService, UserSettingsService>()
9999
// Children settings (from IUserSettingsService)
100-
.AddSingleton<IFilesAndFoldersSettingsService, FilesAndFoldersSettingsService>((sp) => new FilesAndFoldersSettingsService(sp.GetService<IUserSettingsService>().GetSharingContext()))
101100
.AddSingleton<IStartupSettingsService, StartupSettingsService>((sp) => new StartupSettingsService(sp.GetService<IUserSettingsService>().GetSharingContext()))
102101
.AddSingleton<IMultitaskingSettingsService, MultitaskingSettingsService>((sp) => new MultitaskingSettingsService(sp.GetService<IUserSettingsService>().GetSharingContext()))
103102
.AddSingleton<IWidgetsSettingsService, WidgetsSettingsService>((sp) => new WidgetsSettingsService(sp.GetService<IUserSettingsService>().GetSharingContext()))
104-
.AddSingleton<ISidebarSettingsService, SidebarSettingsService>((sp) => new SidebarSettingsService(sp.GetService<IUserSettingsService>().GetSharingContext()))
105-
.AddSingleton<IPreferencesSettingsService, PreferencesSettingsService>((sp) => new PreferencesSettingsService(sp.GetService<IUserSettingsService>().GetSharingContext()))
106103
.AddSingleton<IAppearanceSettingsService, AppearanceSettingsService>((sp) => new AppearanceSettingsService(sp.GetService<IUserSettingsService>().GetSharingContext()))
104+
.AddSingleton<IPreferencesSettingsService, PreferencesSettingsService>((sp) => new PreferencesSettingsService(sp.GetService<IUserSettingsService>().GetSharingContext()))
107105
.AddSingleton<IPreviewPaneSettingsService, PreviewPaneSettingsService>((sp) => new PreviewPaneSettingsService(sp.GetService<IUserSettingsService>().GetSharingContext()))
108106
.AddSingleton<ILayoutSettingsService, LayoutSettingsService>((sp) => new LayoutSettingsService(sp.GetService<IUserSettingsService>().GetSharingContext()))
109107
// Settings not related to IUserSettingsService:

‎Files/BaseLayout.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -622,7 +622,7 @@ private async Task LoadMenuItemsAsync()
622622
secondaryElements.OfType<FrameworkElement>().ForEach(i => i.MinWidth = Constants.UI.ContextMenuItemsMaxWidth); // Set menu min width
623623
secondaryElements.ForEach(i => ItemContextMenuFlyout.SecondaryCommands.Add(i));
624624

625-
if (UserSettingsService.FilesAndFoldersSettingsService.AreFileTagsEnabled && !InstanceViewModel.IsPageTypeSearchResults && !InstanceViewModel.IsPageTypeRecycleBin && !InstanceViewModel.IsPageTypeFtp && !InstanceViewModel.IsPageTypeZipFolder)
625+
if (UserSettingsService.PreferencesSettingsService.AreFileTagsEnabled && !InstanceViewModel.IsPageTypeSearchResults && !InstanceViewModel.IsPageTypeRecycleBin && !InstanceViewModel.IsPageTypeFtp && !InstanceViewModel.IsPageTypeZipFolder)
626626
{
627627
AddFileTagsItemToMenu(ItemContextMenuFlyout);
628628
}

‎Files/DataModels/SidebarPinnedModel.cs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ private void RemoveFavoritesSideBarSection()
6262
try
6363
{
6464
var item = (from n in SidebarControl.SideBarItems where n.Text.Equals("SidebarFavorites".GetLocalized()) select n).FirstOrDefault();
65-
if (!UserSettingsService.SidebarSettingsService.ShowFavoritesSection && item != null)
65+
if (!UserSettingsService.AppearanceSettingsService.ShowFavoritesSection && item != null)
6666
{
6767
SidebarControl.SideBarItems.Remove(item);
6868
}
@@ -73,7 +73,7 @@ private void RemoveFavoritesSideBarSection()
7373

7474
public async void UpdateFavoritesSectionVisibility()
7575
{
76-
if (UserSettingsService.SidebarSettingsService.ShowFavoritesSection)
76+
if (UserSettingsService.AppearanceSettingsService.ShowFavoritesSection)
7777
{
7878
await AddAllItemsToSidebar();
7979
}
@@ -314,7 +314,7 @@ private void AddItemToSidebarAsync(LocationItem section)
314314
/// </summary>
315315
public async Task AddAllItemsToSidebar()
316316
{
317-
if (!UserSettingsService.SidebarSettingsService.ShowFavoritesSection)
317+
if (!UserSettingsService.AppearanceSettingsService.ShowFavoritesSection)
318318
{
319319
return;
320320
}
@@ -366,7 +366,7 @@ public async Task AddAllItemsToSidebar()
366366
await AddItemToSidebarAsync(path);
367367
}
368368

369-
await ShowHideRecycleBinItemAsync(UserSettingsService.SidebarSettingsService.PinRecycleBinToSidebar);
369+
await ShowHideRecycleBinItemAsync(UserSettingsService.AppearanceSettingsService.PinRecycleBinToSidebar);
370370
}
371371

372372
/// <summary>

‎Files/Dialogs/SettingsDialog.xaml

Lines changed: 18 additions & 47 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
mc:Ignorable="d">
1414
<ContentDialog.Resources>
1515
<ResourceDictionary>
16-
<x:Double x:Key="ContentDialogMaxWidth">1300</x:Double>
16+
<x:Double x:Key="ContentDialogMaxWidth">800</x:Double>
1717
<Thickness x:Key="ContentDialogPadding">0</Thickness>
1818
<SolidColorBrush x:Key="ContentDialogTopOverlay" Color="Transparent" />
1919
<ResourceDictionary.ThemeDictionaries>
@@ -36,26 +36,18 @@
3636
<Grid
3737
x:Name="ContainerGrid"
3838
Width="Auto"
39-
Height="600"
39+
MaxHeight="600"
4040
HorizontalAlignment="Stretch"
41+
VerticalAlignment="Stretch"
4142
Background="{ThemeResource SolidBackgroundFillColorTertiary}">
42-
<Grid.ColumnDefinitions>
43-
<ColumnDefinition x:Name="Column0" />
44-
<ColumnDefinition Width="*" />
45-
</Grid.ColumnDefinitions>
4643
<muxc:NavigationView
4744
x:Name="SettingsPane"
48-
Grid.Column="0"
49-
Width="200"
50-
Margin="12,12,0,12"
5145
IsBackButtonVisible="Collapsed"
5246
IsBackEnabled="False"
53-
IsPaneOpen="True"
5447
IsPaneToggleButtonVisible="False"
5548
IsSettingsVisible="False"
5649
IsTitleBarAutoPaddingEnabled="False"
57-
OpenPaneLength="200"
58-
PaneDisplayMode="Left"
50+
PaneDisplayMode="Top"
5951
SelectionChanged="SettingsPane_SelectionChanged">
6052

6153
<muxc:NavigationView.MenuItems>
@@ -86,38 +78,20 @@
8678
<FontIcon FontFamily="{StaticResource CustomGlyph}" Glyph="&#xF116;" />
8779
</muxc:NavigationViewItem.Icon>
8880
</muxc:NavigationViewItem>
89-
<muxc:NavigationViewItem
90-
x:Uid="SettingsNavSidebar"
91-
AccessKey="S"
92-
Content="Sidebar"
93-
Tag="3">
94-
<muxc:NavigationViewItem.Icon>
95-
<FontIcon Glyph="&#xE145;" />
96-
</muxc:NavigationViewItem.Icon>
97-
</muxc:NavigationViewItem>
9881
<muxc:NavigationViewItem
9982
x:Uid="SettingsNavMultitasking"
10083
AccessKey="M"
10184
Content="Multitasking"
102-
Tag="4">
85+
Tag="3">
10386
<muxc:NavigationViewItem.Icon>
10487
<FontIcon FontSize="16" Glyph="&#xEE40;" />
10588
</muxc:NavigationViewItem.Icon>
10689
</muxc:NavigationViewItem>
107-
<muxc:NavigationViewItem
108-
x:Uid="SettingsNavFilesAndFolders"
109-
AccessKey="F"
110-
Content="Files &amp; Folders"
111-
Tag="5">
112-
<muxc:NavigationViewItem.Icon>
113-
<FontIcon Glyph="&#xE8B7;" />
114-
</muxc:NavigationViewItem.Icon>
115-
</muxc:NavigationViewItem>
11690
<muxc:NavigationViewItem
11791
x:Uid="SettingsNavExperimental"
11892
AccessKey="E"
11993
Content="Experimental"
120-
Tag="6">
94+
Tag="4">
12195
<muxc:NavigationViewItem.Icon>
12296
<FontIcon Glyph="&#xF1AD;" />
12397
</muxc:NavigationViewItem.Icon>
@@ -128,27 +102,24 @@
128102
<muxc:NavigationViewItem
129103
AccessKey="B"
130104
Content="{helpers:ResourceString Name=About}"
131-
Tag="7">
105+
Tag="5">
132106
<muxc:NavigationViewItem.Icon>
133107
<FontIcon FontSize="16" Glyph="&#xE946;" />
134108
</muxc:NavigationViewItem.Icon>
135109
</muxc:NavigationViewItem>
136110
</muxc:NavigationView.FooterMenuItems>
137-
</muxc:NavigationView>
138111

139-
<ScrollViewer
140-
Grid.Column="1"
141-
Margin="12,0,0,0"
142-
Padding="4,12,8,0"
143-
Background="{ThemeResource SolidBackgroundFillColorBase}"
144-
HorizontalScrollMode="Disabled"
145-
VerticalScrollBarVisibility="Auto"
146-
VerticalScrollMode="Enabled">
147-
<Frame
148-
x:Name="SettingsContentFrame"
149-
Width="460"
150-
Height="Auto" />
151-
</ScrollViewer>
112+
<ScrollViewer
113+
x:Name="SettingsScrollViewer"
114+
VerticalAlignment="Stretch"
115+
VerticalScrollBarVisibility="Visible"
116+
VerticalScrollMode="Enabled">
117+
<Frame
118+
x:Name="SettingsContentFrame"
119+
Padding="12"
120+
Background="{ThemeResource SolidBackgroundFillColorBase}" />
121+
</ScrollViewer>
122+
</muxc:NavigationView>
152123

153124
<Button
154125
x:Name="ButtonClose"

‎Files/Dialogs/SettingsDialog.xaml.cs

Lines changed: 5 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -29,26 +29,13 @@ private void Current_SizeChanged(object sender, WindowSizeChangedEventArgs e)
2929

3030
private void UpdateDialogLayout()
3131
{
32-
if (Window.Current.Bounds.Width <= 700)
33-
{
34-
SettingsPane.PaneDisplayMode = Microsoft.UI.Xaml.Controls.NavigationViewPaneDisplayMode.LeftCompact;
35-
SettingsContentFrame.Width = 410;
36-
Column0.Width = new GridLength(60);
37-
}
38-
else
39-
{
40-
SettingsPane.PaneDisplayMode = Microsoft.UI.Xaml.Controls.NavigationViewPaneDisplayMode.Left;
41-
SettingsContentFrame.Width = 460;
42-
Column0.Width = new GridLength(0, GridUnitType.Auto);
43-
}
44-
4532
if (Window.Current.Bounds.Height <= 600)
4633
{
47-
ContainerGrid.Height = Window.Current.Bounds.Height;
34+
SettingsScrollViewer.Height = Window.Current.Bounds.Height - 40;
4835
}
4936
else
5037
{
51-
ContainerGrid.Height = 600;
38+
SettingsScrollViewer.Height = 560;
5239
}
5340
}
5441

@@ -62,11 +49,9 @@ private void SettingsPane_SelectionChanged(Microsoft.UI.Xaml.Controls.Navigation
6249
0 => SettingsContentFrame.Navigate(typeof(Appearance)),
6350
1 => SettingsContentFrame.Navigate(typeof(OnStartup)),
6451
2 => SettingsContentFrame.Navigate(typeof(Preferences)),
65-
3 => SettingsContentFrame.Navigate(typeof(Sidebar)),
66-
4 => SettingsContentFrame.Navigate(typeof(Multitasking)),
67-
5 => SettingsContentFrame.Navigate(typeof(FilesAndFolders)),
68-
6 => SettingsContentFrame.Navigate(typeof(Experimental)),
69-
7 => SettingsContentFrame.Navigate(typeof(About)),
52+
3 => SettingsContentFrame.Navigate(typeof(Multitasking)),
53+
4 => SettingsContentFrame.Navigate(typeof(Experimental)),
54+
5 => SettingsContentFrame.Navigate(typeof(About)),
7055
_ => SettingsContentFrame.Navigate(typeof(Appearance))
7156
};
7257
}

‎Files/Files.csproj

Lines changed: 0 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -246,25 +246,21 @@
246246
<Compile Include="Models\JsonSettings\ISettingsSerializer.cs" />
247247
<Compile Include="Services\IAppearanceSettingsService.cs" />
248248
<Compile Include="Services\IBundlesSettingsService.cs" />
249-
<Compile Include="Services\IFilesAndFoldersSettingsService.cs" />
250249
<Compile Include="Services\IFileTagsSettingsService.cs" />
251250
<Compile Include="Services\ILayoutSettingsService.cs" />
252251
<Compile Include="Services\Implementation\AppearanceSettingsService.cs" />
253252
<Compile Include="Services\Implementation\BundlesSettingsService.cs" />
254-
<Compile Include="Services\Implementation\FilesAndFoldersSettingsService.cs" />
255253
<Compile Include="Services\Implementation\FileTagsSettingsService.cs" />
256254
<Compile Include="Services\Implementation\LayoutSettingsService.cs" />
257255
<Compile Include="Services\Implementation\MultitaskingSettingsService.cs" />
258256
<Compile Include="Services\Implementation\PreferencesSettingsService.cs" />
259257
<Compile Include="Services\Implementation\PreviewPaneSettingsService.cs" />
260-
<Compile Include="Services\Implementation\SidebarSettingsService.cs" />
261258
<Compile Include="Services\Implementation\StartupSettingsService.cs" />
262259
<Compile Include="Services\Implementation\UserSettingsService.cs" />
263260
<Compile Include="Services\Implementation\WidgetsSettingsService.cs" />
264261
<Compile Include="Services\IMultitaskingSettingsService.cs" />
265262
<Compile Include="Services\IPreferencesSettingsService.cs" />
266263
<Compile Include="Services\IPreviewPaneSettingsService.cs" />
267-
<Compile Include="Services\ISidebarSettingsService.cs" />
268264
<Compile Include="Services\IStartupSettingsService.cs" />
269265
<Compile Include="Services\IUserSettingsService.cs" />
270266
<Compile Include="Services\IWidgetsSettingsService.cs" />
@@ -373,7 +369,6 @@
373369
<Compile Include="ViewModels\Previews\ArchivePreviewViewModel.cs" />
374370
<Compile Include="ViewModels\Previews\CodePreviewViewModel.cs" />
375371
<Compile Include="ViewModels\Properties\SecurityProperties.cs" />
376-
<Compile Include="ViewModels\SettingsViewModels\SidebarViewModel.cs" />
377372
<Compile Include="ViewModels\SearchBoxViewModel.cs" />
378373
<Compile Include="ViewModels\SidebarViewModel.cs" />
379374
<Compile Include="Models\JsonSettings\BaseJsonSettingsModel.cs" />
@@ -535,7 +530,6 @@
535530
<Compile Include="ViewModels\SettingsViewModels\AboutViewModel.cs" />
536531
<Compile Include="ViewModels\SettingsViewModels\AppearanceViewModel.cs" />
537532
<Compile Include="ViewModels\SettingsViewModels\ExperimentalViewModel.cs" />
538-
<Compile Include="ViewModels\SettingsViewModels\FilesAndFoldersViewModel.cs" />
539533
<Compile Include="ViewModels\SettingsViewModels\MultitaskingViewModel.cs" />
540534
<Compile Include="ViewModels\SettingsViewModels\OnStartupViewModel.cs" />
541535
<Compile Include="ViewModels\SettingsViewModels\PreferencesViewModel.cs" />
@@ -612,9 +606,6 @@
612606
<Compile Include="Views\SettingsPages\OnStartup.xaml.cs">
613607
<DependentUpon>OnStartup.xaml</DependentUpon>
614608
</Compile>
615-
<Compile Include="Views\SettingsPages\FilesAndFolders.xaml.cs">
616-
<DependentUpon>FilesAndFolders.xaml</DependentUpon>
617-
</Compile>
618609
<Compile Include="Views\SettingsPages\Appearance.xaml.cs">
619610
<DependentUpon>Appearance.xaml</DependentUpon>
620611
</Compile>
@@ -624,9 +615,6 @@
624615
<Compile Include="Views\SettingsPages\Multitasking.xaml.cs">
625616
<DependentUpon>Multitasking.xaml</DependentUpon>
626617
</Compile>
627-
<Compile Include="Views\SettingsPages\Sidebar.xaml.cs">
628-
<DependentUpon>Sidebar.xaml</DependentUpon>
629-
</Compile>
630618
<Compile Include="Views\SettingsPages\Preferences.xaml.cs">
631619
<DependentUpon>Preferences.xaml</DependentUpon>
632620
</Compile>
@@ -1406,10 +1394,6 @@
14061394
<Generator>MSBuild:Compile</Generator>
14071395
<SubType>Designer</SubType>
14081396
</Page>
1409-
<Page Include="Views\SettingsPages\FilesAndFolders.xaml">
1410-
<Generator>MSBuild:Compile</Generator>
1411-
<SubType>Designer</SubType>
1412-
</Page>
14131397
<Page Include="Views\SettingsPages\Appearance.xaml">
14141398
<SubType>Designer</SubType>
14151399
<Generator>MSBuild:Compile</Generator>
@@ -1422,10 +1406,6 @@
14221406
<Generator>MSBuild:Compile</Generator>
14231407
<SubType>Designer</SubType>
14241408
</Page>
1425-
<Page Include="Views\SettingsPages\Sidebar.xaml">
1426-
<Generator>MSBuild:Compile</Generator>
1427-
<SubType>Designer</SubType>
1428-
</Page>
14291409
<Page Include="Views\SettingsPages\Preferences.xaml">
14301410
<SubType>Designer</SubType>
14311411
<Generator>MSBuild:Compile</Generator>

‎Files/Filesystem/CloudDrivesManager.cs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ public IReadOnlyList<DriveItem> Drives
3636

3737
public async Task EnumerateDrivesAsync()
3838
{
39-
if (!UserSettingsService.SidebarSettingsService.ShowCloudDrivesSection)
39+
if (!UserSettingsService.AppearanceSettingsService.ShowCloudDrivesSection)
4040
{
4141
return;
4242
}
@@ -105,7 +105,7 @@ await CoreApplication.MainView.CoreWindow.Dispatcher.RunAsync(CoreDispatcherPrio
105105
try
106106
{
107107
var section = SidebarControl.SideBarItems.FirstOrDefault(x => x.Text == "SidebarCloudDrives".GetLocalized()) as LocationItem;
108-
if (UserSettingsService.SidebarSettingsService.ShowCloudDrivesSection && section == null && Drives.Any())
108+
if (UserSettingsService.AppearanceSettingsService.ShowCloudDrivesSection && section == null && Drives.Any())
109109
{
110110
section = new LocationItem()
111111
{
@@ -146,7 +146,7 @@ private void RemoveCloudDrivesSideBarSection()
146146
try
147147
{
148148
var item = (from n in SidebarControl.SideBarItems where n.Text.Equals("SidebarCloudDrives".GetLocalized()) select n).FirstOrDefault();
149-
if (!UserSettingsService.SidebarSettingsService.ShowCloudDrivesSection && item != null)
149+
if (!UserSettingsService.AppearanceSettingsService.ShowCloudDrivesSection && item != null)
150150
{
151151
SidebarControl.SideBarItems.Remove(item);
152152
}
@@ -157,7 +157,7 @@ private void RemoveCloudDrivesSideBarSection()
157157

158158
public async void UpdateCloudDrivesSectionVisibility()
159159
{
160-
if (UserSettingsService.SidebarSettingsService.ShowCloudDrivesSection)
160+
if (UserSettingsService.AppearanceSettingsService.ShowCloudDrivesSection)
161161
{
162162
await EnumerateDrivesAsync();
163163
}

‎Files/Filesystem/Drives.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -134,7 +134,7 @@ await CoreApplication.MainView.CoreWindow.Dispatcher.RunAsync(CoreDispatcherPrio
134134
try
135135
{
136136
var section = SidebarControl.SideBarItems.FirstOrDefault(x => x.Text == "SidebarDrives".GetLocalized()) as LocationItem;
137-
if (UserSettingsService.SidebarSettingsService.ShowDrivesSection && section == null)
137+
if (UserSettingsService.AppearanceSettingsService.ShowDrivesSection && section == null)
138138
{
139139
section = new LocationItem()
140140
{
@@ -317,7 +317,7 @@ private void RemoveDrivesSideBarSection()
317317
try
318318
{
319319
var item = (from n in SidebarControl.SideBarItems where n.Text.Equals("SidebarDrives".GetLocalized()) select n).FirstOrDefault();
320-
if (!UserSettingsService.SidebarSettingsService.ShowDrivesSection && item != null)
320+
if (!UserSettingsService.AppearanceSettingsService.ShowDrivesSection && item != null)
321321
{
322322
SidebarControl.SideBarItems.Remove(item);
323323
}
@@ -328,7 +328,7 @@ private void RemoveDrivesSideBarSection()
328328

329329
public async void UpdateDrivesSectionVisibility()
330330
{
331-
if (UserSettingsService.SidebarSettingsService.ShowDrivesSection)
331+
if (UserSettingsService.AppearanceSettingsService.ShowDrivesSection)
332332
{
333333
await EnumerateDrivesAsync();
334334
}

0 commit comments

Comments
 (0)