From 8844fbb95329d1541ccff672d9e8c24ae1915afb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Aleksander=20=C5=81ukasiewicz?=
 <aleksander_lukasiewicz@outlook.com>
Date: Sat, 12 Feb 2022 16:06:10 +0100
Subject: [PATCH 1/6] Added sidebar context menu for sections visibility

---
 src/Files/Strings/en-US/Resources.resw        |   9 +
 src/Files/UserControls/SidebarControl.xaml    |   6 +-
 src/Files/UserControls/SidebarControl.xaml.cs | 176 +++++++++++++++++-
 3 files changed, 177 insertions(+), 14 deletions(-)

diff --git a/src/Files/Strings/en-US/Resources.resw b/src/Files/Strings/en-US/Resources.resw
index 2912f17e2290..0b0a72f4bded 100644
--- a/src/Files/Strings/en-US/Resources.resw
+++ b/src/Files/Strings/en-US/Resources.resw
@@ -2753,4 +2753,13 @@ We use App Center to track which settings are being used, find bugs, and fix cra
   <data name="PrepareInProgress" xml:space="preserve">
     <value>Preparing items</value>
   </data>
+  <data name="HideAllSections" xml:space="preserve">
+    <value>Hide all sections</value>
+  </data>
+  <data name="Sections" xml:space="preserve">
+    <value>Sections</value>
+  </data>
+  <data name="ShowAllSections" xml:space="preserve">
+    <value>Show all sections</value>
+  </data>
 </root>
\ No newline at end of file
diff --git a/src/Files/UserControls/SidebarControl.xaml b/src/Files/UserControls/SidebarControl.xaml
index 39690e870e62..9daa9dc64020 100644
--- a/src/Files/UserControls/SidebarControl.xaml
+++ b/src/Files/UserControls/SidebarControl.xaml
@@ -7,7 +7,7 @@
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
     xmlns:mconv="using:Microsoft.Toolkit.Uwp.UI.Converters"
     xmlns:muxc="using:Microsoft.UI.Xaml.Controls"
-    xmlns:navigationcontrolitems="using:Files.DataModels.NavigationControlItems"
+    xmlns:navigationcontrolitems="using:Files.DataModels.NavigationControlItems" 
     HorizontalAlignment="Stretch"
     d:DesignHeight="768"
     d:DesignWidth="200"
@@ -90,7 +90,6 @@
             </DataTemplate>
 
             <mconv:BoolNegationConverter x:Key="BoolNegationConverter" />
-
             <Style TargetType="SplitView">
                 <Setter Property="BorderBrush" Value="{ThemeResource SystemControlForegroundTransparentBrush}" />
                 <Setter Property="BorderThickness" Value="{ThemeResource SplitViewLeftBorderThemeThickness}" />
@@ -132,7 +131,6 @@
                                     VerticalAlignment="Stretch"
                                     Background="{ThemeResource SidebarContentBackgroundBrush}"
                                     IsHitTestVisible="False" />
-
                                 <!--  Pane Content Area  -->
                                 <Grid
                                     x:Name="PaneRoot"
@@ -145,8 +143,8 @@
                                     BorderBrush="{TemplateBinding BorderBrush}"
                                     BorderThickness="{TemplateBinding BorderThickness}"
                                     CornerRadius="{TemplateBinding CornerRadius}"
+                                    RightTapped="PaneRoot_RightTapped"
                                     Visibility="Collapsed">
-
                                     <Grid.BackgroundTransition>
                                         <BrushTransition />
                                     </Grid.BackgroundTransition>
diff --git a/src/Files/UserControls/SidebarControl.xaml.cs b/src/Files/UserControls/SidebarControl.xaml.cs
index 88006426b562..94188495ad7d 100644
--- a/src/Files/UserControls/SidebarControl.xaml.cs
+++ b/src/Files/UserControls/SidebarControl.xaml.cs
@@ -140,6 +140,84 @@ public bool CanOpenInNewPane
 
         public bool IsLibrariesHeader { get; set; }
 
+        public bool ShowFavoritesSection
+        {
+            get => UserSettingsService.AppearanceSettingsService.ShowFavoritesSection;
+            set
+            {
+                if (value != UserSettingsService.AppearanceSettingsService.ShowFavoritesSection)
+                {
+                    UserSettingsService.AppearanceSettingsService.ShowFavoritesSection = value;
+                    App.SidebarPinnedController.Model.UpdateFavoritesSectionVisibility();
+                }
+            }
+        }
+
+        public bool ShowLibrarySection
+        {
+            get => UserSettingsService.AppearanceSettingsService.ShowLibrarySection;
+            set
+            {
+                if (value != UserSettingsService.AppearanceSettingsService.ShowLibrarySection)
+                {
+                    UserSettingsService.AppearanceSettingsService.ShowLibrarySection = value;
+                    App.LibraryManager.UpdateLibrariesSectionVisibility();
+                }
+            }
+        }
+
+        public bool ShowDrivesSection
+        {
+            get => UserSettingsService.AppearanceSettingsService.ShowDrivesSection;
+            set
+            {
+                if (value != UserSettingsService.AppearanceSettingsService.ShowDrivesSection)
+                {
+                    UserSettingsService.AppearanceSettingsService.ShowDrivesSection = value;
+                    App.DrivesManager.UpdateDrivesSectionVisibility();
+                }
+            }
+        }
+
+        public bool ShowCloudDrivesSection
+        {
+            get => UserSettingsService.AppearanceSettingsService.ShowCloudDrivesSection;
+            set
+            {
+                if (value != UserSettingsService.AppearanceSettingsService.ShowCloudDrivesSection)
+                {
+                    UserSettingsService.AppearanceSettingsService.ShowCloudDrivesSection = value;
+                    App.CloudDrivesManager.UpdateCloudDrivesSectionVisibility();
+                }
+            }
+        }
+
+        public bool ShowNetworkDrivesSection
+        {
+            get => UserSettingsService.AppearanceSettingsService.ShowNetworkDrivesSection;
+            set
+            {
+                if (value != UserSettingsService.AppearanceSettingsService.ShowNetworkDrivesSection)
+                {
+                    UserSettingsService.AppearanceSettingsService.ShowNetworkDrivesSection = value;
+                    App.NetworkDrivesManager.UpdateNetworkDrivesSectionVisibility();
+                }
+            }
+        }
+
+        public bool ShowWslSection
+        {
+            get => UserSettingsService.AppearanceSettingsService.ShowWslSection;
+            set
+            {
+                if (value != UserSettingsService.AppearanceSettingsService.ShowWslSection)
+                {
+                    UserSettingsService.AppearanceSettingsService.ShowWslSection = value;
+                    App.WSLDistroManager.UpdateWslSectionVisibility();
+                }
+            }
+        }
+
         public INavigationControlItem RightClickedItem;
 
         public event PropertyChangedEventHandler PropertyChanged;
@@ -153,13 +231,11 @@ public void HideSection_Click(object sender, RoutedEventArgs e)
         {
             if ("SidebarFavorites".GetLocalized().Equals(RightClickedItem.Text))
             {
-                UserSettingsService.AppearanceSettingsService.ShowFavoritesSection = false;
-                App.SidebarPinnedController.Model.UpdateFavoritesSectionVisibility();
+                ShowFavoritesSection = false;
             }
             else if ("SidebarLibraries".GetLocalized().Equals(RightClickedItem.Text))
             {
-                UserSettingsService.AppearanceSettingsService.ShowLibrarySection = false;
-                App.LibraryManager.UpdateLibrariesSectionVisibility();
+                ShowLibrarySection = false;
             }
             else if ("SidebarCloudDrives".GetLocalized().Equals(RightClickedItem.Text))
             {
@@ -168,18 +244,15 @@ public void HideSection_Click(object sender, RoutedEventArgs e)
             }
             else if ("Drives".GetLocalized().Equals(RightClickedItem.Text))
             {
-                UserSettingsService.AppearanceSettingsService.ShowDrivesSection = false;
-                App.DrivesManager.UpdateDrivesSectionVisibility();
+                ShowDrivesSection = false;
             }
             else if ("SidebarNetworkDrives".GetLocalized().Equals(RightClickedItem.Text))
             {
-                UserSettingsService.AppearanceSettingsService.ShowNetworkDrivesSection = false;
-                App.NetworkDrivesManager.UpdateNetworkDrivesSectionVisibility();
+                ShowNetworkDrivesSection = false;
             }
             else if ("WSL".GetLocalized().Equals(RightClickedItem.Text))
             {
-                UserSettingsService.AppearanceSettingsService.ShowWslSection = false;
-                App.WSLDistroManager.UpdateWslSectionVisibility();
+                ShowWslSection = false;
             }
         }
 
@@ -332,6 +405,89 @@ private async void Sidebar_PointerPressed(object sender, PointerRoutedEventArgs
             }
         }
 
+        private void PaneRoot_RightTapped(object sender, RightTappedRoutedEventArgs e)
+        {
+            var sidebarContextMenu = new MenuFlyout();
+            var sidebarContextMenuSectionsSubMenu = new MenuFlyoutSubItem()
+            {
+                Text = "Sections".GetLocalized(),
+                Icon = new FontIcon() { Glyph = "\uE71D" }
+            };
+            var sidebarContextMenuItems = new List<MenuFlyoutItemBase>()
+            {
+                new MenuFlyoutItem()
+                {
+                    Text="ShowAllSections".GetLocalized(),
+                    Icon=new FontIcon(){ Glyph="\uE8A9" },
+                    IsEnabled=!areAllSectionsHaveSameVisibility(true),
+                    Command=new RelayCommand(()=>setAllSectionVisibility(true))
+                },
+                new MenuFlyoutItem()
+                {
+                    Text="HideAllSections".GetLocalized(),
+                    Icon=new FontIcon(){ Glyph="\uE77A" },
+                    IsEnabled=!areAllSectionsHaveSameVisibility(false),
+                    Command=new RelayCommand(()=>setAllSectionVisibility(false))
+                },
+                new MenuFlyoutSeparator(),
+                sidebarContextMenuSectionsSubMenu,
+            };
+            var sidebarContextMenuSectionsSubMenuItems = new List<MenuFlyoutItemBase>()
+            {
+                new ToggleMenuFlyoutItem()
+                {
+                    Text="SidebarFavorites".GetLocalized(),
+                    IsChecked=ShowFavoritesSection,
+                    Command=new RelayCommand(()=>ShowFavoritesSection=!ShowFavoritesSection)
+                },
+                new ToggleMenuFlyoutItem()
+                {
+                    Text="SidebarLibraries".GetLocalized(),
+                    IsChecked=ShowLibrarySection,
+                    Command=new RelayCommand(()=>ShowLibrarySection=!ShowLibrarySection)
+                },
+                new ToggleMenuFlyoutItem()
+                {
+                    Text="Drives".GetLocalized(),
+                    IsChecked=ShowDrivesSection,
+                    Command=new RelayCommand(()=>ShowDrivesSection=!ShowDrivesSection)
+                },
+                new ToggleMenuFlyoutItem()
+                {
+                    Text="SidebarNetworkDrives".GetLocalized(),
+                    IsChecked=ShowNetworkDrivesSection,
+                    Command=new RelayCommand(()=>ShowNetworkDrivesSection=!ShowNetworkDrivesSection)
+                },
+                new ToggleMenuFlyoutItem()
+                {
+                    Text="SidebarCloudDrives".GetLocalized(),
+                    IsChecked=ShowCloudDrivesSection,
+                    Command=new RelayCommand(()=>ShowCloudDrivesSection=!ShowCloudDrivesSection)
+                },
+                new ToggleMenuFlyoutItem()
+                {
+                    Text="WSL".GetLocalized(),
+                    IsChecked=ShowWslSection,
+                    Command=new RelayCommand(()=>ShowWslSection=!ShowWslSection)
+                }
+            };
+            sidebarContextMenuSectionsSubMenuItems.ForEach((i) => sidebarContextMenuSectionsSubMenu.Items.Add(i));
+            sidebarContextMenuItems.ForEach((i) => sidebarContextMenu.Items.Add(i));
+            sidebarContextMenu.ShowAt(this, new Windows.UI.Xaml.Controls.Primitives.FlyoutShowOptions() { Position = e.GetPosition(this) });
+
+            e.Handled = true;
+        }
+
+        private void setAllSectionVisibility(bool isVisible)
+        {
+            ShowFavoritesSection = isVisible;
+            ShowLibrarySection = isVisible;
+            ShowDrivesSection = isVisible;
+            ShowCloudDrivesSection = isVisible;
+            ShowNetworkDrivesSection = isVisible;
+            ShowWslSection = isVisible;
+        }
+        private bool areAllSectionsHaveSameVisibility(bool isVisible) => (ShowFavoritesSection == isVisible && ShowLibrarySection == isVisible && ShowDrivesSection == isVisible && ShowCloudDrivesSection == isVisible && ShowNetworkDrivesSection == isVisible && ShowWslSection == isVisible);
         private void NavigationViewLocationItem_RightTapped(object sender, RightTappedRoutedEventArgs e)
         {
             var itemContextMenuFlyout = new Microsoft.UI.Xaml.Controls.CommandBarFlyout();

From d4aa6aab92f31ef101745c1a78b321f64ffb1a17 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Aleksander=20=C5=81ukasiewicz?=
 <aleksander_lukasiewicz@outlook.com>
Date: Sat, 12 Feb 2022 16:16:29 +0100
Subject: [PATCH 2/6] Formatting fix

---
 src/Files/UserControls/SidebarControl.xaml | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/Files/UserControls/SidebarControl.xaml b/src/Files/UserControls/SidebarControl.xaml
index 9daa9dc64020..7799e905ec05 100644
--- a/src/Files/UserControls/SidebarControl.xaml
+++ b/src/Files/UserControls/SidebarControl.xaml
@@ -7,7 +7,7 @@
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
     xmlns:mconv="using:Microsoft.Toolkit.Uwp.UI.Converters"
     xmlns:muxc="using:Microsoft.UI.Xaml.Controls"
-    xmlns:navigationcontrolitems="using:Files.DataModels.NavigationControlItems" 
+    xmlns:navigationcontrolitems="using:Files.DataModels.NavigationControlItems"
     HorizontalAlignment="Stretch"
     d:DesignHeight="768"
     d:DesignWidth="200"
@@ -90,6 +90,7 @@
             </DataTemplate>
 
             <mconv:BoolNegationConverter x:Key="BoolNegationConverter" />
+
             <Style TargetType="SplitView">
                 <Setter Property="BorderBrush" Value="{ThemeResource SystemControlForegroundTransparentBrush}" />
                 <Setter Property="BorderThickness" Value="{ThemeResource SplitViewLeftBorderThemeThickness}" />
@@ -131,6 +132,7 @@
                                     VerticalAlignment="Stretch"
                                     Background="{ThemeResource SidebarContentBackgroundBrush}"
                                     IsHitTestVisible="False" />
+
                                 <!--  Pane Content Area  -->
                                 <Grid
                                     x:Name="PaneRoot"
@@ -145,6 +147,7 @@
                                     CornerRadius="{TemplateBinding CornerRadius}"
                                     RightTapped="PaneRoot_RightTapped"
                                     Visibility="Collapsed">
+
                                     <Grid.BackgroundTransition>
                                         <BrushTransition />
                                     </Grid.BackgroundTransition>

From 7cad7b776d16a3988ab179cb036a2a30fbc65b6d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Aleksander=20=C5=81ukasiewicz?=
 <aleksander_lukasiewicz@outlook.com>
Date: Sun, 13 Feb 2022 14:27:27 +0100
Subject: [PATCH 3/6] Moved ContextMenu form C# to XAML

---
 src/Files/UserControls/SidebarControl.xaml    |  44 +++++
 src/Files/UserControls/SidebarControl.xaml.cs | 170 ++----------------
 src/Files/ViewModels/SidebarViewModel.cs      | 131 ++++++++++++++
 src/Files/Views/MainPage.xaml                 |   1 +
 4 files changed, 187 insertions(+), 159 deletions(-)

diff --git a/src/Files/UserControls/SidebarControl.xaml b/src/Files/UserControls/SidebarControl.xaml
index 7799e905ec05..94419acf07ea 100644
--- a/src/Files/UserControls/SidebarControl.xaml
+++ b/src/Files/UserControls/SidebarControl.xaml
@@ -7,6 +7,7 @@
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
     xmlns:mconv="using:Microsoft.Toolkit.Uwp.UI.Converters"
     xmlns:muxc="using:Microsoft.UI.Xaml.Controls"
+    xmlns:helpers="using:Files.Helpers"
     xmlns:navigationcontrolitems="using:Files.DataModels.NavigationControlItems"
     HorizontalAlignment="Stretch"
     d:DesignHeight="768"
@@ -21,6 +22,49 @@
     mc:Ignorable="d">
     <muxc:NavigationView.Resources>
         <ResourceDictionary>
+            <MenuFlyout x:Key="SidebarContextMenu">
+                <MenuFlyoutItem 
+                     Text="{helpers:ResourceString Name=ShowAllSections}"
+                     IsEnabled="{Binding AreAllSectionsVisible, Converter={StaticResource BoolNegationConverter},Mode=OneWay}"
+                     Command="{Binding ShowAllSectionsCommand}">
+                    <MenuFlyoutItem.Icon>
+                        <FontIcon Glyph="&#xE8A9;"/>
+                    </MenuFlyoutItem.Icon>
+                </MenuFlyoutItem>
+                <MenuFlyoutItem 
+                     Text="{helpers:ResourceString Name=HideAllSections}"
+                     IsEnabled="{Binding AreAllSectionsHidden, Converter={StaticResource BoolNegationConverter},Mode=OneWay}"
+                     Command="{Binding HideAllSectionsCommand}">
+                    <MenuFlyoutItem.Icon>
+                        <FontIcon Glyph="&#xE77A;"/>
+                    </MenuFlyoutItem.Icon>
+                </MenuFlyoutItem>
+                <MenuFlyoutSeparator/>
+                <MenuFlyoutSubItem 
+                    Text="{helpers:ResourceString Name=Sections}">
+                    <MenuFlyoutSubItem.Icon>
+                        <FontIcon Glyph="&#xE71D;"/>
+                    </MenuFlyoutSubItem.Icon>
+                    <ToggleMenuFlyoutItem
+                        Text="{helpers:ResourceString Name=SidebarFavorites}"
+                        IsChecked="{Binding ShowFavoritesSection,Mode=TwoWay}"/>
+                    <ToggleMenuFlyoutItem
+                        Text="{helpers:ResourceString Name=SidebarLibraries}"
+                        IsChecked="{Binding ShowLibrarySection,Mode=TwoWay}"/>
+                    <ToggleMenuFlyoutItem
+                        Text="{helpers:ResourceString Name=Drives}"
+                        IsChecked="{Binding ShowDrivesSection,Mode=TwoWay}"/>
+                    <ToggleMenuFlyoutItem
+                        Text="{helpers:ResourceString Name=SidebarCloudDrives}"
+                        IsChecked="{Binding ShowCloudDrivesSection,Mode=TwoWay}"/>
+                    <ToggleMenuFlyoutItem
+                        Text="{helpers:ResourceString Name=SidebarNetworkDrives}"
+                        IsChecked="{Binding ShowNetworkDrivesSection,Mode=TwoWay}"/>
+                    <ToggleMenuFlyoutItem
+                        Text="{helpers:ResourceString Name=WSL}"
+                        IsChecked="{Binding ShowWslSection,Mode=TwoWay}"/>
+                </MenuFlyoutSubItem>
+            </MenuFlyout>
             <DataTemplate x:Key="LocationNavItem" x:DataType="navigationcontrolitems:LocationItem">
                 <muxc:NavigationViewItem
                     AllowDrop="True"
diff --git a/src/Files/UserControls/SidebarControl.xaml.cs b/src/Files/UserControls/SidebarControl.xaml.cs
index 94188495ad7d..dca73991973a 100644
--- a/src/Files/UserControls/SidebarControl.xaml.cs
+++ b/src/Files/UserControls/SidebarControl.xaml.cs
@@ -140,84 +140,6 @@ public bool CanOpenInNewPane
 
         public bool IsLibrariesHeader { get; set; }
 
-        public bool ShowFavoritesSection
-        {
-            get => UserSettingsService.AppearanceSettingsService.ShowFavoritesSection;
-            set
-            {
-                if (value != UserSettingsService.AppearanceSettingsService.ShowFavoritesSection)
-                {
-                    UserSettingsService.AppearanceSettingsService.ShowFavoritesSection = value;
-                    App.SidebarPinnedController.Model.UpdateFavoritesSectionVisibility();
-                }
-            }
-        }
-
-        public bool ShowLibrarySection
-        {
-            get => UserSettingsService.AppearanceSettingsService.ShowLibrarySection;
-            set
-            {
-                if (value != UserSettingsService.AppearanceSettingsService.ShowLibrarySection)
-                {
-                    UserSettingsService.AppearanceSettingsService.ShowLibrarySection = value;
-                    App.LibraryManager.UpdateLibrariesSectionVisibility();
-                }
-            }
-        }
-
-        public bool ShowDrivesSection
-        {
-            get => UserSettingsService.AppearanceSettingsService.ShowDrivesSection;
-            set
-            {
-                if (value != UserSettingsService.AppearanceSettingsService.ShowDrivesSection)
-                {
-                    UserSettingsService.AppearanceSettingsService.ShowDrivesSection = value;
-                    App.DrivesManager.UpdateDrivesSectionVisibility();
-                }
-            }
-        }
-
-        public bool ShowCloudDrivesSection
-        {
-            get => UserSettingsService.AppearanceSettingsService.ShowCloudDrivesSection;
-            set
-            {
-                if (value != UserSettingsService.AppearanceSettingsService.ShowCloudDrivesSection)
-                {
-                    UserSettingsService.AppearanceSettingsService.ShowCloudDrivesSection = value;
-                    App.CloudDrivesManager.UpdateCloudDrivesSectionVisibility();
-                }
-            }
-        }
-
-        public bool ShowNetworkDrivesSection
-        {
-            get => UserSettingsService.AppearanceSettingsService.ShowNetworkDrivesSection;
-            set
-            {
-                if (value != UserSettingsService.AppearanceSettingsService.ShowNetworkDrivesSection)
-                {
-                    UserSettingsService.AppearanceSettingsService.ShowNetworkDrivesSection = value;
-                    App.NetworkDrivesManager.UpdateNetworkDrivesSectionVisibility();
-                }
-            }
-        }
-
-        public bool ShowWslSection
-        {
-            get => UserSettingsService.AppearanceSettingsService.ShowWslSection;
-            set
-            {
-                if (value != UserSettingsService.AppearanceSettingsService.ShowWslSection)
-                {
-                    UserSettingsService.AppearanceSettingsService.ShowWslSection = value;
-                    App.WSLDistroManager.UpdateWslSectionVisibility();
-                }
-            }
-        }
-
         public INavigationControlItem RightClickedItem;
 
         public event PropertyChangedEventHandler PropertyChanged;
@@ -231,11 +153,13 @@ public void HideSection_Click(object sender, RoutedEventArgs e)
         {
             if ("SidebarFavorites".GetLocalized().Equals(RightClickedItem.Text))
             {
-                ShowFavoritesSection = false;
+                UserSettingsService.AppearanceSettingsService.ShowFavoritesSection = false;
+                App.SidebarPinnedController.Model.UpdateFavoritesSectionVisibility();
             }
             else if ("SidebarLibraries".GetLocalized().Equals(RightClickedItem.Text))
             {
-                ShowLibrarySection = false;
+                UserSettingsService.AppearanceSettingsService.ShowLibrarySection = false;
+                App.LibraryManager.UpdateLibrariesSectionVisibility();
             }
             else if ("SidebarCloudDrives".GetLocalized().Equals(RightClickedItem.Text))
             {
@@ -244,15 +168,18 @@ public void HideSection_Click(object sender, RoutedEventArgs e)
             }
             else if ("Drives".GetLocalized().Equals(RightClickedItem.Text))
             {
-                ShowDrivesSection = false;
+                UserSettingsService.AppearanceSettingsService.ShowDrivesSection = false;
+                App.DrivesManager.UpdateDrivesSectionVisibility();
             }
             else if ("SidebarNetworkDrives".GetLocalized().Equals(RightClickedItem.Text))
             {
-                ShowNetworkDrivesSection = false;
+                UserSettingsService.AppearanceSettingsService.ShowNetworkDrivesSection = false;
+                App.NetworkDrivesManager.UpdateNetworkDrivesSectionVisibility();
             }
             else if ("WSL".GetLocalized().Equals(RightClickedItem.Text))
             {
-                ShowWslSection = false;
+                UserSettingsService.AppearanceSettingsService.ShowWslSection = false;
+                App.WSLDistroManager.UpdateWslSectionVisibility();
             }
         }
 
@@ -407,87 +334,12 @@ private async void Sidebar_PointerPressed(object sender, PointerRoutedEventArgs
 
         private void PaneRoot_RightTapped(object sender, RightTappedRoutedEventArgs e)
         {
-            var sidebarContextMenu = new MenuFlyout();
-            var sidebarContextMenuSectionsSubMenu = new MenuFlyoutSubItem()
-            {
-                Text = "Sections".GetLocalized(),
-                Icon = new FontIcon() { Glyph = "\uE71D" }
-            };
-            var sidebarContextMenuItems = new List<MenuFlyoutItemBase>()
-            {
-                new MenuFlyoutItem()
-                {
-                    Text="ShowAllSections".GetLocalized(),
-                    Icon=new FontIcon(){ Glyph="\uE8A9" },
-                    IsEnabled=!areAllSectionsHaveSameVisibility(true),
-                    Command=new RelayCommand(()=>setAllSectionVisibility(true))
-                },
-                new MenuFlyoutItem()
-                {
-                    Text="HideAllSections".GetLocalized(),
-                    Icon=new FontIcon(){ Glyph="\uE77A" },
-                    IsEnabled=!areAllSectionsHaveSameVisibility(false),
-                    Command=new RelayCommand(()=>setAllSectionVisibility(false))
-                },
-                new MenuFlyoutSeparator(),
-                sidebarContextMenuSectionsSubMenu,
-            };
-            var sidebarContextMenuSectionsSubMenuItems = new List<MenuFlyoutItemBase>()
-            {
-                new ToggleMenuFlyoutItem()
-                {
-                    Text="SidebarFavorites".GetLocalized(),
-                    IsChecked=ShowFavoritesSection,
-                    Command=new RelayCommand(()=>ShowFavoritesSection=!ShowFavoritesSection)
-                },
-                new ToggleMenuFlyoutItem()
-                {
-                    Text="SidebarLibraries".GetLocalized(),
-                    IsChecked=ShowLibrarySection,
-                    Command=new RelayCommand(()=>ShowLibrarySection=!ShowLibrarySection)
-                },
-                new ToggleMenuFlyoutItem()
-                {
-                    Text="Drives".GetLocalized(),
-                    IsChecked=ShowDrivesSection,
-                    Command=new RelayCommand(()=>ShowDrivesSection=!ShowDrivesSection)
-                },
-                new ToggleMenuFlyoutItem()
-                {
-                    Text="SidebarNetworkDrives".GetLocalized(),
-                    IsChecked=ShowNetworkDrivesSection,
-                    Command=new RelayCommand(()=>ShowNetworkDrivesSection=!ShowNetworkDrivesSection)
-                },
-                new ToggleMenuFlyoutItem()
-                {
-                    Text="SidebarCloudDrives".GetLocalized(),
-                    IsChecked=ShowCloudDrivesSection,
-                    Command=new RelayCommand(()=>ShowCloudDrivesSection=!ShowCloudDrivesSection)
-                },
-                new ToggleMenuFlyoutItem()
-                {
-                    Text="WSL".GetLocalized(),
-                    IsChecked=ShowWslSection,
-                    Command=new RelayCommand(()=>ShowWslSection=!ShowWslSection)
-                }
-            };
-            sidebarContextMenuSectionsSubMenuItems.ForEach((i) => sidebarContextMenuSectionsSubMenu.Items.Add(i));
-            sidebarContextMenuItems.ForEach((i) => sidebarContextMenu.Items.Add(i));
+            var sidebarContextMenu = this.FindResource("SidebarContextMenu") as MenuFlyout;
             sidebarContextMenu.ShowAt(this, new Windows.UI.Xaml.Controls.Primitives.FlyoutShowOptions() { Position = e.GetPosition(this) });
 
             e.Handled = true;
         }
 
-        private void setAllSectionVisibility(bool isVisible)
-        {
-            ShowFavoritesSection = isVisible;
-            ShowLibrarySection = isVisible;
-            ShowDrivesSection = isVisible;
-            ShowCloudDrivesSection = isVisible;
-            ShowNetworkDrivesSection = isVisible;
-            ShowWslSection = isVisible;
-        }
-        private bool areAllSectionsHaveSameVisibility(bool isVisible) => (ShowFavoritesSection == isVisible && ShowLibrarySection == isVisible && ShowDrivesSection == isVisible && ShowCloudDrivesSection == isVisible && ShowNetworkDrivesSection == isVisible && ShowWslSection == isVisible);
         private void NavigationViewLocationItem_RightTapped(object sender, RightTappedRoutedEventArgs e)
         {
             var itemContextMenuFlyout = new Microsoft.UI.Xaml.Controls.CommandBarFlyout();
diff --git a/src/Files/ViewModels/SidebarViewModel.cs b/src/Files/ViewModels/SidebarViewModel.cs
index cf47dc924480..a275e8ed3b58 100644
--- a/src/Files/ViewModels/SidebarViewModel.cs
+++ b/src/Files/ViewModels/SidebarViewModel.cs
@@ -22,6 +22,10 @@ public class SidebarViewModel : ObservableObject, IDisposable
         private IUserSettingsService UserSettingsService { get; } = Ioc.Default.GetService<IUserSettingsService>();
         public ICommand EmptyRecycleBinCommand { get; private set; }
 
+        public ICommand ShowAllSectionsCommand { get; private set; }
+
+        public ICommand HideAllSectionsCommand { get; private set; }
+
         private IPaneHolder paneHolder;
 
         public IPaneHolder PaneHolder
@@ -114,6 +118,90 @@ public bool IsSidebarOpen
             }
         }
 
+        public bool ShowFavoritesSection
+        {
+            get => UserSettingsService.AppearanceSettingsService.ShowFavoritesSection;
+            set
+            {
+                if (value != UserSettingsService.AppearanceSettingsService.ShowFavoritesSection)
+                {
+                    UserSettingsService.AppearanceSettingsService.ShowFavoritesSection = value;
+                    App.SidebarPinnedController.Model.UpdateFavoritesSectionVisibility();
+                }
+            }
+        }
+
+        public bool ShowLibrarySection
+        {
+            get => UserSettingsService.AppearanceSettingsService.ShowLibrarySection;
+            set
+            {
+                if (value != UserSettingsService.AppearanceSettingsService.ShowLibrarySection)
+                {
+                    UserSettingsService.AppearanceSettingsService.ShowLibrarySection = value;
+                    App.LibraryManager.UpdateLibrariesSectionVisibility();
+                }
+            }
+        }
+
+        public bool ShowDrivesSection
+        {
+            get => UserSettingsService.AppearanceSettingsService.ShowDrivesSection;
+            set
+            {
+                if (value != UserSettingsService.AppearanceSettingsService.ShowDrivesSection)
+                {
+                    UserSettingsService.AppearanceSettingsService.ShowDrivesSection = value;
+                    App.DrivesManager.UpdateDrivesSectionVisibility();
+                }
+            }
+        }
+
+        public bool ShowCloudDrivesSection
+        {
+            get => UserSettingsService.AppearanceSettingsService.ShowCloudDrivesSection;
+            set
+            {
+                if (value != UserSettingsService.AppearanceSettingsService.ShowCloudDrivesSection)
+                {
+                    UserSettingsService.AppearanceSettingsService.ShowCloudDrivesSection = value;
+                    App.CloudDrivesManager.UpdateCloudDrivesSectionVisibility();
+                }
+            }
+        }
+
+        public bool ShowNetworkDrivesSection
+        {
+            get => UserSettingsService.AppearanceSettingsService.ShowNetworkDrivesSection;
+            set
+            {
+                if (value != UserSettingsService.AppearanceSettingsService.ShowNetworkDrivesSection)
+                {
+                    UserSettingsService.AppearanceSettingsService.ShowNetworkDrivesSection = value;
+                    App.NetworkDrivesManager.UpdateNetworkDrivesSectionVisibility();
+                }
+            }
+        }
+
+        public bool ShowWslSection
+        {
+            get => UserSettingsService.AppearanceSettingsService.ShowWslSection;
+            set
+            {
+                if (value != UserSettingsService.AppearanceSettingsService.ShowWslSection)
+                {
+                    UserSettingsService.AppearanceSettingsService.ShowWslSection = value;
+                    App.WSLDistroManager.UpdateWslSectionVisibility();
+                }
+            }
+        }
+
+        private bool areAllSectionsHaveSameVisibility(bool isVisible) => (ShowFavoritesSection == isVisible && ShowLibrarySection == isVisible && ShowDrivesSection == isVisible && ShowCloudDrivesSection == isVisible && ShowNetworkDrivesSection == isVisible && ShowWslSection == isVisible);
+
+        public bool AreAllSectionsVisible => areAllSectionsHaveSameVisibility(true);
+
+        public bool AreAllSectionsHidden => areAllSectionsHaveSameVisibility(false);
+
         private INavigationControlItem selectedSidebarItem;
 
         public INavigationControlItem SidebarSelectedItem
@@ -125,6 +213,8 @@ public INavigationControlItem SidebarSelectedItem
         public SidebarViewModel()
         {
             EmptyRecycleBinCommand = new RelayCommand<RoutedEventArgs>(EmptyRecycleBin);
+            ShowAllSectionsCommand = new RelayCommand(() => SetAllSectionsVisibility(true));
+            HideAllSectionsCommand = new RelayCommand(() => SetAllSectionsVisibility(false));
             UserSettingsService.OnSettingChangedEvent += UserSettingsService_OnSettingChangedEvent;
         }
 
@@ -133,6 +223,22 @@ public async void EmptyRecycleBin(RoutedEventArgs e)
             await RecycleBinHelpers.S_EmptyRecycleBin();
         }
 
+        public void SetAllSectionsVisibility(bool isVisible)
+        {
+            ShowFavoritesSection = isVisible;
+            ShowLibrarySection = isVisible;
+            ShowDrivesSection = isVisible;
+            ShowCloudDrivesSection = isVisible;
+            ShowNetworkDrivesSection = isVisible;
+            ShowWslSection = isVisible;
+        }
+
+        public void NotifyAllSectionVisibilityChanged()
+        {
+            OnPropertyChanged(nameof(AreAllSectionsHidden));
+            OnPropertyChanged(nameof(AreAllSectionsVisible));
+        }
+
         private void UserSettingsService_OnSettingChangedEvent(object sender, EventArguments.SettingChangedEventArgs e)
         {
             switch (e.settingName)
@@ -143,6 +249,30 @@ private void UserSettingsService_OnSettingChangedEvent(object sender, EventArgum
                         OnPropertyChanged(nameof(IsSidebarOpen));
                     }
                     break;
+                case nameof(UserSettingsService.AppearanceSettingsService.ShowFavoritesSection):
+                    NotifyAllSectionVisibilityChanged();
+                    OnPropertyChanged(nameof(ShowFavoritesSection));
+                    break;
+                case nameof(UserSettingsService.AppearanceSettingsService.ShowLibrarySection):
+                    NotifyAllSectionVisibilityChanged();
+                    OnPropertyChanged(nameof(ShowLibrarySection));
+                    break;
+                case nameof(UserSettingsService.AppearanceSettingsService.ShowCloudDrivesSection):
+                    NotifyAllSectionVisibilityChanged();
+                    OnPropertyChanged(nameof(ShowCloudDrivesSection));
+                    break;
+                case nameof(UserSettingsService.AppearanceSettingsService.ShowDrivesSection):
+                    NotifyAllSectionVisibilityChanged();
+                    OnPropertyChanged(nameof(ShowDrivesSection));
+                    break;
+                case nameof(UserSettingsService.AppearanceSettingsService.ShowNetworkDrivesSection):
+                    NotifyAllSectionVisibilityChanged();
+                    OnPropertyChanged(nameof(ShowNetworkDrivesSection));
+                    break;
+                case nameof(UserSettingsService.AppearanceSettingsService.ShowWslSection):
+                    NotifyAllSectionVisibilityChanged();
+                    OnPropertyChanged(nameof(ShowWslSection));
+                    break;
             }
         }
 
@@ -173,5 +303,6 @@ public GridLength TabControlMargin
             get => tabControlMargin;
             set => SetProperty(ref tabControlMargin, value);
         }
+
     }
 }
\ No newline at end of file
diff --git a/src/Files/Views/MainPage.xaml b/src/Files/Views/MainPage.xaml
index 525ad11ffdc2..316a330826f2 100644
--- a/src/Files/Views/MainPage.xaml
+++ b/src/Files/Views/MainPage.xaml
@@ -228,6 +228,7 @@
         IsPaneOpen="{x:Bind SidebarAdaptiveViewModel.IsSidebarOpen, Mode=TwoWay}"
         IsPaneToggleButtonVisible="False"
         Loaded="SidebarControl_Loaded"
+        DataContext="{x:Bind SidebarAdaptiveViewModel}"
         PaneDisplayMode="Left"
         SelectedSidebarItem="{x:Bind SidebarAdaptiveViewModel.SidebarSelectedItem, Mode=TwoWay}">
         <controls:SidebarControl.TabContent>

From 8ef342d361bc1a3affe52c4974ae5ee42e2a483d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Aleksander=20=C5=81ukasiewicz?=
 <aleksander_lukasiewicz@outlook.com>
Date: Sun, 13 Feb 2022 14:29:27 +0100
Subject: [PATCH 4/6] SidebarViewModel format fix

---
 src/Files/ViewModels/SidebarViewModel.cs | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/Files/ViewModels/SidebarViewModel.cs b/src/Files/ViewModels/SidebarViewModel.cs
index a275e8ed3b58..007c79e2b80f 100644
--- a/src/Files/ViewModels/SidebarViewModel.cs
+++ b/src/Files/ViewModels/SidebarViewModel.cs
@@ -303,6 +303,5 @@ public GridLength TabControlMargin
             get => tabControlMargin;
             set => SetProperty(ref tabControlMargin, value);
         }
-
     }
 }
\ No newline at end of file

From 9d3c15d6fced509bd0103077e6813da08ce3bc7d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Aleksander=20=C5=81ukasiewicz?=
 <aleksander_lukasiewicz@outlook.com>
Date: Sun, 13 Feb 2022 17:55:09 +0100
Subject: [PATCH 5/6] Removed Show/Hide all sections options

---
 src/Files/Strings/en-US/Resources.resw     |  9 ------
 src/Files/UserControls/SidebarControl.xaml | 27 ++---------------
 src/Files/ViewModels/SidebarViewModel.cs   | 34 ----------------------
 3 files changed, 2 insertions(+), 68 deletions(-)

diff --git a/src/Files/Strings/en-US/Resources.resw b/src/Files/Strings/en-US/Resources.resw
index 0b0a72f4bded..2912f17e2290 100644
--- a/src/Files/Strings/en-US/Resources.resw
+++ b/src/Files/Strings/en-US/Resources.resw
@@ -2753,13 +2753,4 @@ We use App Center to track which settings are being used, find bugs, and fix cra
   <data name="PrepareInProgress" xml:space="preserve">
     <value>Preparing items</value>
   </data>
-  <data name="HideAllSections" xml:space="preserve">
-    <value>Hide all sections</value>
-  </data>
-  <data name="Sections" xml:space="preserve">
-    <value>Sections</value>
-  </data>
-  <data name="ShowAllSections" xml:space="preserve">
-    <value>Show all sections</value>
-  </data>
 </root>
\ No newline at end of file
diff --git a/src/Files/UserControls/SidebarControl.xaml b/src/Files/UserControls/SidebarControl.xaml
index 94419acf07ea..9f3a56bf977f 100644
--- a/src/Files/UserControls/SidebarControl.xaml
+++ b/src/Files/UserControls/SidebarControl.xaml
@@ -23,29 +23,7 @@
     <muxc:NavigationView.Resources>
         <ResourceDictionary>
             <MenuFlyout x:Key="SidebarContextMenu">
-                <MenuFlyoutItem 
-                     Text="{helpers:ResourceString Name=ShowAllSections}"
-                     IsEnabled="{Binding AreAllSectionsVisible, Converter={StaticResource BoolNegationConverter},Mode=OneWay}"
-                     Command="{Binding ShowAllSectionsCommand}">
-                    <MenuFlyoutItem.Icon>
-                        <FontIcon Glyph="&#xE8A9;"/>
-                    </MenuFlyoutItem.Icon>
-                </MenuFlyoutItem>
-                <MenuFlyoutItem 
-                     Text="{helpers:ResourceString Name=HideAllSections}"
-                     IsEnabled="{Binding AreAllSectionsHidden, Converter={StaticResource BoolNegationConverter},Mode=OneWay}"
-                     Command="{Binding HideAllSectionsCommand}">
-                    <MenuFlyoutItem.Icon>
-                        <FontIcon Glyph="&#xE77A;"/>
-                    </MenuFlyoutItem.Icon>
-                </MenuFlyoutItem>
-                <MenuFlyoutSeparator/>
-                <MenuFlyoutSubItem 
-                    Text="{helpers:ResourceString Name=Sections}">
-                    <MenuFlyoutSubItem.Icon>
-                        <FontIcon Glyph="&#xE71D;"/>
-                    </MenuFlyoutSubItem.Icon>
-                    <ToggleMenuFlyoutItem
+                <ToggleMenuFlyoutItem
                         Text="{helpers:ResourceString Name=SidebarFavorites}"
                         IsChecked="{Binding ShowFavoritesSection,Mode=TwoWay}"/>
                     <ToggleMenuFlyoutItem
@@ -60,10 +38,9 @@
                     <ToggleMenuFlyoutItem
                         Text="{helpers:ResourceString Name=SidebarNetworkDrives}"
                         IsChecked="{Binding ShowNetworkDrivesSection,Mode=TwoWay}"/>
-                    <ToggleMenuFlyoutItem
+                <ToggleMenuFlyoutItem
                         Text="{helpers:ResourceString Name=WSL}"
                         IsChecked="{Binding ShowWslSection,Mode=TwoWay}"/>
-                </MenuFlyoutSubItem>
             </MenuFlyout>
             <DataTemplate x:Key="LocationNavItem" x:DataType="navigationcontrolitems:LocationItem">
                 <muxc:NavigationViewItem
diff --git a/src/Files/ViewModels/SidebarViewModel.cs b/src/Files/ViewModels/SidebarViewModel.cs
index 007c79e2b80f..af2cb9ce9691 100644
--- a/src/Files/ViewModels/SidebarViewModel.cs
+++ b/src/Files/ViewModels/SidebarViewModel.cs
@@ -22,10 +22,6 @@ public class SidebarViewModel : ObservableObject, IDisposable
         private IUserSettingsService UserSettingsService { get; } = Ioc.Default.GetService<IUserSettingsService>();
         public ICommand EmptyRecycleBinCommand { get; private set; }
 
-        public ICommand ShowAllSectionsCommand { get; private set; }
-
-        public ICommand HideAllSectionsCommand { get; private set; }
-
         private IPaneHolder paneHolder;
 
         public IPaneHolder PaneHolder
@@ -196,12 +192,6 @@ public bool ShowWslSection
             }
         }
 
-        private bool areAllSectionsHaveSameVisibility(bool isVisible) => (ShowFavoritesSection == isVisible && ShowLibrarySection == isVisible && ShowDrivesSection == isVisible && ShowCloudDrivesSection == isVisible && ShowNetworkDrivesSection == isVisible && ShowWslSection == isVisible);
-
-        public bool AreAllSectionsVisible => areAllSectionsHaveSameVisibility(true);
-
-        public bool AreAllSectionsHidden => areAllSectionsHaveSameVisibility(false);
-
         private INavigationControlItem selectedSidebarItem;
 
         public INavigationControlItem SidebarSelectedItem
@@ -213,8 +203,6 @@ public INavigationControlItem SidebarSelectedItem
         public SidebarViewModel()
         {
             EmptyRecycleBinCommand = new RelayCommand<RoutedEventArgs>(EmptyRecycleBin);
-            ShowAllSectionsCommand = new RelayCommand(() => SetAllSectionsVisibility(true));
-            HideAllSectionsCommand = new RelayCommand(() => SetAllSectionsVisibility(false));
             UserSettingsService.OnSettingChangedEvent += UserSettingsService_OnSettingChangedEvent;
         }
 
@@ -223,22 +211,6 @@ public async void EmptyRecycleBin(RoutedEventArgs e)
             await RecycleBinHelpers.S_EmptyRecycleBin();
         }
 
-        public void SetAllSectionsVisibility(bool isVisible)
-        {
-            ShowFavoritesSection = isVisible;
-            ShowLibrarySection = isVisible;
-            ShowDrivesSection = isVisible;
-            ShowCloudDrivesSection = isVisible;
-            ShowNetworkDrivesSection = isVisible;
-            ShowWslSection = isVisible;
-        }
-
-        public void NotifyAllSectionVisibilityChanged()
-        {
-            OnPropertyChanged(nameof(AreAllSectionsHidden));
-            OnPropertyChanged(nameof(AreAllSectionsVisible));
-        }
-
         private void UserSettingsService_OnSettingChangedEvent(object sender, EventArguments.SettingChangedEventArgs e)
         {
             switch (e.settingName)
@@ -250,27 +222,21 @@ private void UserSettingsService_OnSettingChangedEvent(object sender, EventArgum
                     }
                     break;
                 case nameof(UserSettingsService.AppearanceSettingsService.ShowFavoritesSection):
-                    NotifyAllSectionVisibilityChanged();
                     OnPropertyChanged(nameof(ShowFavoritesSection));
                     break;
                 case nameof(UserSettingsService.AppearanceSettingsService.ShowLibrarySection):
-                    NotifyAllSectionVisibilityChanged();
                     OnPropertyChanged(nameof(ShowLibrarySection));
                     break;
                 case nameof(UserSettingsService.AppearanceSettingsService.ShowCloudDrivesSection):
-                    NotifyAllSectionVisibilityChanged();
                     OnPropertyChanged(nameof(ShowCloudDrivesSection));
                     break;
                 case nameof(UserSettingsService.AppearanceSettingsService.ShowDrivesSection):
-                    NotifyAllSectionVisibilityChanged();
                     OnPropertyChanged(nameof(ShowDrivesSection));
                     break;
                 case nameof(UserSettingsService.AppearanceSettingsService.ShowNetworkDrivesSection):
-                    NotifyAllSectionVisibilityChanged();
                     OnPropertyChanged(nameof(ShowNetworkDrivesSection));
                     break;
                 case nameof(UserSettingsService.AppearanceSettingsService.ShowWslSection):
-                    NotifyAllSectionVisibilityChanged();
                     OnPropertyChanged(nameof(ShowWslSection));
                     break;
             }

From 88d0dc25a43b3f3f5b3f9930687ce50d3bf8f026 Mon Sep 17 00:00:00 2001
From: Marco Gavelli <marcogavelli2@gmail.com>
Date: Sun, 20 Feb 2022 19:44:26 +0100
Subject: [PATCH 6/6] Update for new file tags section

---
 src/Files/UserControls/SidebarControl.xaml | 27 +++++++---------------
 src/Files/ViewModels/SidebarViewModel.cs   | 16 +++++++++++++
 2 files changed, 24 insertions(+), 19 deletions(-)

diff --git a/src/Files/UserControls/SidebarControl.xaml b/src/Files/UserControls/SidebarControl.xaml
index ddedfb81b92c..2ddae9bb5a5c 100644
--- a/src/Files/UserControls/SidebarControl.xaml
+++ b/src/Files/UserControls/SidebarControl.xaml
@@ -3,11 +3,11 @@
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+    xmlns:helpers="using:Files.Helpers"
     xmlns:local="using:Files.UserControls"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
     xmlns:mconv="using:Microsoft.Toolkit.Uwp.UI.Converters"
     xmlns:muxc="using:Microsoft.UI.Xaml.Controls"
-    xmlns:helpers="using:Files.Helpers"
     xmlns:navigationcontrolitems="using:Files.DataModels.NavigationControlItems"
     HorizontalAlignment="Stretch"
     d:DesignHeight="768"
@@ -23,24 +23,13 @@
     <muxc:NavigationView.Resources>
         <ResourceDictionary>
             <MenuFlyout x:Key="SidebarContextMenu">
-                <ToggleMenuFlyoutItem
-                        Text="{helpers:ResourceString Name=SidebarFavorites}"
-                        IsChecked="{Binding ShowFavoritesSection,Mode=TwoWay}"/>
-                    <ToggleMenuFlyoutItem
-                        Text="{helpers:ResourceString Name=SidebarLibraries}"
-                        IsChecked="{Binding ShowLibrarySection,Mode=TwoWay}"/>
-                    <ToggleMenuFlyoutItem
-                        Text="{helpers:ResourceString Name=Drives}"
-                        IsChecked="{Binding ShowDrivesSection,Mode=TwoWay}"/>
-                    <ToggleMenuFlyoutItem
-                        Text="{helpers:ResourceString Name=SidebarCloudDrives}"
-                        IsChecked="{Binding ShowCloudDrivesSection,Mode=TwoWay}"/>
-                    <ToggleMenuFlyoutItem
-                        Text="{helpers:ResourceString Name=SidebarNetworkDrives}"
-                        IsChecked="{Binding ShowNetworkDrivesSection,Mode=TwoWay}"/>
-                <ToggleMenuFlyoutItem
-                        Text="{helpers:ResourceString Name=WSL}"
-                        IsChecked="{Binding ShowWslSection,Mode=TwoWay}"/>
+                <ToggleMenuFlyoutItem IsChecked="{Binding ShowFavoritesSection, Mode=TwoWay}" Text="{helpers:ResourceString Name=SidebarFavorites}" />
+                <ToggleMenuFlyoutItem IsChecked="{Binding ShowLibrarySection, Mode=TwoWay}" Text="{helpers:ResourceString Name=SidebarLibraries}" />
+                <ToggleMenuFlyoutItem IsChecked="{Binding ShowDrivesSection, Mode=TwoWay}" Text="{helpers:ResourceString Name=Drives}" />
+                <ToggleMenuFlyoutItem IsChecked="{Binding ShowCloudDrivesSection, Mode=TwoWay}" Text="{helpers:ResourceString Name=SidebarCloudDrives}" />
+                <ToggleMenuFlyoutItem IsChecked="{Binding ShowNetworkDrivesSection, Mode=TwoWay}" Text="{helpers:ResourceString Name=SidebarNetworkDrives}" />
+                <ToggleMenuFlyoutItem IsChecked="{Binding ShowWslSection, Mode=TwoWay}" Text="{helpers:ResourceString Name=WSL}" />
+                <ToggleMenuFlyoutItem IsChecked="{Binding ShowFileTagsSection, Mode=TwoWay}" Text="{helpers:ResourceString Name=FileTags}" />
             </MenuFlyout>
             <DataTemplate x:Key="LocationNavItem" x:DataType="navigationcontrolitems:LocationItem">
                 <muxc:NavigationViewItem
diff --git a/src/Files/ViewModels/SidebarViewModel.cs b/src/Files/ViewModels/SidebarViewModel.cs
index af2cb9ce9691..95cb4eddff86 100644
--- a/src/Files/ViewModels/SidebarViewModel.cs
+++ b/src/Files/ViewModels/SidebarViewModel.cs
@@ -192,6 +192,19 @@ public bool ShowWslSection
             }
         }
 
+        public bool ShowFileTagsSection
+        {
+            get => UserSettingsService.AppearanceSettingsService.ShowFileTagsSection;
+            set
+            {
+                if (value != UserSettingsService.AppearanceSettingsService.ShowFileTagsSection)
+                {
+                    UserSettingsService.AppearanceSettingsService.ShowFileTagsSection = value;
+                    App.FileTagsManager.UpdateFileTagsSectionVisibility();
+                }
+            }
+        }
+
         private INavigationControlItem selectedSidebarItem;
 
         public INavigationControlItem SidebarSelectedItem
@@ -239,6 +252,9 @@ private void UserSettingsService_OnSettingChangedEvent(object sender, EventArgum
                 case nameof(UserSettingsService.AppearanceSettingsService.ShowWslSection):
                     OnPropertyChanged(nameof(ShowWslSection));
                     break;
+                case nameof(UserSettingsService.AppearanceSettingsService.ShowFileTagsSection):
+                    OnPropertyChanged(nameof(ShowFileTagsSection));
+                    break;
             }
         }