From c4a2292aa692f18d04e93aa4972b64421b8834b5 Mon Sep 17 00:00:00 2001
From: Winston de Jong <winiston2212@outlook.com>
Date: Sat, 19 Jun 2021 00:55:49 -0700
Subject: [PATCH 1/7] Added compact overlay feature

---
 Files/Strings/en-US/Resources.resw           |  6 ++++++
 Files/UserControls/NavigationToolbar.xaml    | 19 +++++++++++++++++++
 Files/UserControls/NavigationToolbar.xaml.cs | 20 ++++++++++++++++++++
 3 files changed, 45 insertions(+)

diff --git a/Files/Strings/en-US/Resources.resw b/Files/Strings/en-US/Resources.resw
index b43829ac5e05..b79484bf1bf8 100644
--- a/Files/Strings/en-US/Resources.resw
+++ b/Files/Strings/en-US/Resources.resw
@@ -2565,4 +2565,10 @@
   <data name="NavigationToolbarClosePane.Label" xml:space="preserve">
     <value>Close pane</value>
   </data>
+  <data name="NavigationToolbarEnterCompactOverlay.Label" xml:space="preserve">
+    <value>Enter compact overlay</value>
+  </data>
+  <data name="NavigationToolbarExitCompactOverlay.Label" xml:space="preserve">
+    <value>Exit compact overlay</value>
+  </data>
 </root>
\ No newline at end of file
diff --git a/Files/UserControls/NavigationToolbar.xaml b/Files/UserControls/NavigationToolbar.xaml
index d82fd400f691..f55bb1ff4238 100644
--- a/Files/UserControls/NavigationToolbar.xaml
+++ b/Files/UserControls/NavigationToolbar.xaml
@@ -934,6 +934,25 @@
                             Modifiers="Control" />
                     </AppBarButton.KeyboardAccelerators>
                 </AppBarButton>
+                <AppBarButton
+                    x:Name="NavToolbarEnterCompactOverlay"
+                    x:Uid="NavigationToolbarEnterCompactOverlay"
+                    Click="NavToolbarEnterCompactOverlay_Click"
+                    Label="Enter compact overlay">
+                    <AppBarButton.Icon>
+                        <FontIcon Glyph="&#xE8A7;" />
+                    </AppBarButton.Icon>
+                </AppBarButton>
+                <AppBarButton
+                    x:Name="NavToolbarExitCompactOverlay"
+                    x:Uid="NavigationToolbarExitCompactOverlay"
+                    Click="NavToolbarEnterCompactOverlay_Click"
+                    Label="Exit compact overlay"
+                    Visibility="Collapsed">
+                    <AppBarButton.Icon>
+                        <FontIcon Glyph="&#xE944;" />
+                    </AppBarButton.Icon>
+                </AppBarButton>
                 <AppBarButton
                     x:Name="CopyPathButton"
                     x:Uid="NavigationToolbarCopyPath"
diff --git a/Files/UserControls/NavigationToolbar.xaml.cs b/Files/UserControls/NavigationToolbar.xaml.cs
index a42e3d545ba8..081327f02214 100644
--- a/Files/UserControls/NavigationToolbar.xaml.cs
+++ b/Files/UserControls/NavigationToolbar.xaml.cs
@@ -3,9 +3,11 @@
 using Files.Helpers.XamlHelpers;
 using Files.ViewModels;
 using Files.Views;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using Windows.System;
+using Windows.UI.ViewManagement;
 using Windows.UI.Xaml;
 using Windows.UI.Xaml.Controls;
 using Windows.UI.Xaml.Controls.Primitives;
@@ -192,5 +194,23 @@ private void NavMoreButtonFlyout_Opening(object sender, object e)
         }
 
         private void VisiblePath_QuerySubmitted(AutoSuggestBox sender, AutoSuggestBoxQuerySubmittedEventArgs args) => ViewModel.VisiblePath_QuerySubmitted(sender, args);
+
+        private async void NavToolbarEnterCompactOverlay_Click(object sender, RoutedEventArgs e)
+        {
+            var view = ApplicationView.GetForCurrentView();
+            if (view.ViewMode == ApplicationViewMode.CompactOverlay)
+            {
+                await view.TryEnterViewModeAsync(ApplicationViewMode.Default);
+                NavToolbarExitCompactOverlay.Visibility = Visibility.Collapsed;
+                NavToolbarEnterCompactOverlay.Visibility = Visibility.Visible;
+            }
+            else
+            {
+                await view.TryEnterViewModeAsync(ApplicationViewMode.CompactOverlay);
+                view.TryResizeView(new Windows.Foundation.Size(400, 500));
+                NavToolbarExitCompactOverlay.Visibility = Visibility.Visible;
+                NavToolbarEnterCompactOverlay.Visibility = Visibility.Collapsed;
+            }
+        }
     }
 }
\ No newline at end of file

From 52316daa6df85cb16319967a544724c1e8b53e37 Mon Sep 17 00:00:00 2001
From: Winston de Jong <winiston2212@outlook.com>
Date: Sat, 19 Jun 2021 00:55:49 -0700
Subject: [PATCH 2/7] Added compact overlay feature

---
 Files/Strings/en-US/Resources.resw           |  6 ++++++
 Files/UserControls/NavigationToolbar.xaml    | 19 +++++++++++++++++++
 Files/UserControls/NavigationToolbar.xaml.cs | 19 +++++++++++++++++++
 3 files changed, 44 insertions(+)

diff --git a/Files/Strings/en-US/Resources.resw b/Files/Strings/en-US/Resources.resw
index b43829ac5e05..b79484bf1bf8 100644
--- a/Files/Strings/en-US/Resources.resw
+++ b/Files/Strings/en-US/Resources.resw
@@ -2565,4 +2565,10 @@
   <data name="NavigationToolbarClosePane.Label" xml:space="preserve">
     <value>Close pane</value>
   </data>
+  <data name="NavigationToolbarEnterCompactOverlay.Label" xml:space="preserve">
+    <value>Enter compact overlay</value>
+  </data>
+  <data name="NavigationToolbarExitCompactOverlay.Label" xml:space="preserve">
+    <value>Exit compact overlay</value>
+  </data>
 </root>
\ No newline at end of file
diff --git a/Files/UserControls/NavigationToolbar.xaml b/Files/UserControls/NavigationToolbar.xaml
index d82fd400f691..f55bb1ff4238 100644
--- a/Files/UserControls/NavigationToolbar.xaml
+++ b/Files/UserControls/NavigationToolbar.xaml
@@ -934,6 +934,25 @@
                             Modifiers="Control" />
                     </AppBarButton.KeyboardAccelerators>
                 </AppBarButton>
+                <AppBarButton
+                    x:Name="NavToolbarEnterCompactOverlay"
+                    x:Uid="NavigationToolbarEnterCompactOverlay"
+                    Click="NavToolbarEnterCompactOverlay_Click"
+                    Label="Enter compact overlay">
+                    <AppBarButton.Icon>
+                        <FontIcon Glyph="&#xE8A7;" />
+                    </AppBarButton.Icon>
+                </AppBarButton>
+                <AppBarButton
+                    x:Name="NavToolbarExitCompactOverlay"
+                    x:Uid="NavigationToolbarExitCompactOverlay"
+                    Click="NavToolbarEnterCompactOverlay_Click"
+                    Label="Exit compact overlay"
+                    Visibility="Collapsed">
+                    <AppBarButton.Icon>
+                        <FontIcon Glyph="&#xE944;" />
+                    </AppBarButton.Icon>
+                </AppBarButton>
                 <AppBarButton
                     x:Name="CopyPathButton"
                     x:Uid="NavigationToolbarCopyPath"
diff --git a/Files/UserControls/NavigationToolbar.xaml.cs b/Files/UserControls/NavigationToolbar.xaml.cs
index a42e3d545ba8..f4fbd687f60d 100644
--- a/Files/UserControls/NavigationToolbar.xaml.cs
+++ b/Files/UserControls/NavigationToolbar.xaml.cs
@@ -3,9 +3,11 @@
 using Files.Helpers.XamlHelpers;
 using Files.ViewModels;
 using Files.Views;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using Windows.System;
+using Windows.UI.ViewManagement;
 using Windows.UI.Xaml;
 using Windows.UI.Xaml.Controls;
 using Windows.UI.Xaml.Controls.Primitives;
@@ -192,5 +194,22 @@ private void NavMoreButtonFlyout_Opening(object sender, object e)
         }
 
         private void VisiblePath_QuerySubmitted(AutoSuggestBox sender, AutoSuggestBoxQuerySubmittedEventArgs args) => ViewModel.VisiblePath_QuerySubmitted(sender, args);
+
+        private async void NavToolbarEnterCompactOverlay_Click(object sender, RoutedEventArgs e)
+        {
+            var view = ApplicationView.GetForCurrentView();
+            if (view.ViewMode == ApplicationViewMode.CompactOverlay)
+            {
+                await view.TryEnterViewModeAsync(ApplicationViewMode.Default);
+                NavToolbarExitCompactOverlay.Visibility = Visibility.Collapsed;
+                NavToolbarEnterCompactOverlay.Visibility = Visibility.Visible;
+            }
+            else
+            {
+                await view.TryEnterViewModeAsync(ApplicationViewMode.CompactOverlay);
+                NavToolbarExitCompactOverlay.Visibility = Visibility.Visible;
+                NavToolbarEnterCompactOverlay.Visibility = Visibility.Collapsed;
+            }
+        }
     }
 }
\ No newline at end of file

From 7ce9e16f1e6dad66456298a8cab068c0b21297c5 Mon Sep 17 00:00:00 2001
From: Winston de Jong <winiston2212@outlook.com>
Date: Sun, 20 Jun 2021 13:08:27 -0700
Subject: [PATCH 3/7] Better icons

---
 Files/UserControls/NavigationToolbar.xaml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Files/UserControls/NavigationToolbar.xaml b/Files/UserControls/NavigationToolbar.xaml
index f55bb1ff4238..79b4170e6173 100644
--- a/Files/UserControls/NavigationToolbar.xaml
+++ b/Files/UserControls/NavigationToolbar.xaml
@@ -940,7 +940,7 @@
                     Click="NavToolbarEnterCompactOverlay_Click"
                     Label="Enter compact overlay">
                     <AppBarButton.Icon>
-                        <FontIcon Glyph="&#xE8A7;" />
+                        <FontIcon Glyph="&#xEE49;" />
                     </AppBarButton.Icon>
                 </AppBarButton>
                 <AppBarButton
@@ -950,7 +950,7 @@
                     Label="Exit compact overlay"
                     Visibility="Collapsed">
                     <AppBarButton.Icon>
-                        <FontIcon Glyph="&#xE944;" />
+                        <FontIcon Glyph="&#xEE47;" />
                     </AppBarButton.Icon>
                 </AppBarButton>
                 <AppBarButton

From 0518c9ca391ce404f534d066e18706b2795b4922 Mon Sep 17 00:00:00 2001
From: Winston de Jong <winiston2212@outlook.com>
Date: Sun, 20 Jun 2021 14:53:29 -0700
Subject: [PATCH 4/7] Hide horizontal tab view for narrow window widths

---
 Files/Views/MainPage.xaml | 99 ++++++++++++++++++++++++++-------------
 1 file changed, 66 insertions(+), 33 deletions(-)

diff --git a/Files/Views/MainPage.xaml b/Files/Views/MainPage.xaml
index 2376a4bf867a..0fa9c1cb73c5 100644
--- a/Files/Views/MainPage.xaml
+++ b/Files/Views/MainPage.xaml
@@ -216,40 +216,11 @@
         IsPaneOpen="{x:Bind SidebarAdaptiveViewModel.IsSidebarOpen, Mode=TwoWay}"
         Loaded="SidebarControl_Loaded"
         SelectedSidebarItem="{x:Bind SidebarAdaptiveViewModel.SidebarSelectedItem, Mode=TwoWay}">
-        <Grid>
-            <Grid.RowDefinitions>
-                <RowDefinition Height="Auto" />
-                <RowDefinition Height="*" />
-                <RowDefinition Height="40" />
-            </Grid.RowDefinitions>
-            <Custom:DropShadowPanel
-                HorizontalAlignment="Stretch"
-                HorizontalContentAlignment="Stretch"
-                BlurRadius="8"
-                OffsetY="2"
-                ShadowOpacity="0.04">
-                <controls:NavigationToolbar x:Name="NavToolbar" HorizontalAlignment="Stretch" />
-            </Custom:DropShadowPanel>
-
-            <ContentPresenter
-                Grid.Row="1"
-                HorizontalAlignment="Stretch"
-                Content="{x:Bind ((viewmodels:MainPageViewModel)DataContext).SelectedTabItem.Control, Mode=OneWay}" />
-
-            <controls:StatusBarControl
-                x:Name="StatusBarControl"
-                Grid.Row="2"
-                x:Load="False"
-                ShowInfoText="{x:Bind SidebarAdaptiveViewModel.PaneHolder.ActivePane.InstanceViewModel.IsPageTypeNotHome, Mode=OneWay}"
-                ShowStatusCenter="True"
-                StatusCenterViewModel="{x:Bind StatusCenterViewModel}" />
-
-        </Grid>
-
         <controls:SidebarControl.TabContent>
             <Grid
                 x:Name="RightMarginGrid"
                 Grid.Column="1"
+                Height="50"
                 Margin="{x:Bind SidebarAdaptiveViewModel.TabControlMargin, Mode=OneWay}"
                 HorizontalAlignment="Left"
                 VerticalAlignment="Top"
@@ -267,12 +238,16 @@
                     VerticalAlignment="Top"
                     x:FieldModifier="public"
                     Canvas.ZIndex="40"
-                    Loaded="HorizontalMultitaskingControl_Loaded" />
+                    Loaded="HorizontalMultitaskingControl_Loaded"
+                    Visibility="Visible" />
                 <StackPanel
+                    x:Name="ActionButtonsPanel"
                     Grid.Column="1"
+                    VerticalAlignment="Stretch"
                     Orientation="Horizontal"
                     Spacing="4">
                     <Button
+                        x:Name="HorizontalMultitaskingControlAddButton"
                         x:Uid="HorizontalMultitaskingControlAddButton"
                         Width="32"
                         Height="32"
@@ -284,7 +259,10 @@
                         Click="{x:Bind ViewModel.AddNewTab, Mode=OneWay}"
                         ToolTipService.ToolTip="New tab (Ctrl+T)">
                         <Button.Content>
-                            <FontIcon FontSize="12" Glyph="&#xE710;" />
+                            <FontIcon
+                                x:Name="HorizontalMultitaskingControlAddButtonIcon"
+                                FontSize="12"
+                                Glyph="&#xE710;" />
                         </Button.Content>
                     </Button>
                     <Button
@@ -307,7 +285,10 @@
                         Tapped="VerticalTabStrip_Tapped"
                         ToolTipService.ToolTip="Vertical tab flyout">
                         <Button.Content>
-                            <FontIcon FontSize="12" Glyph="&#xF5ED;" />
+                            <FontIcon
+                                x:Name="VerticalTabStripInvokeButtonIcon"
+                                FontSize="12"
+                                Glyph="&#xF5ED;" />
                         </Button.Content>
                         <Button.Flyout>
                             <Flyout x:Name="VerticalTabViewFlyout">
@@ -322,5 +303,57 @@
                 </StackPanel>
             </Grid>
         </controls:SidebarControl.TabContent>
+        <Grid>
+            <Grid.RowDefinitions>
+                <RowDefinition Height="Auto" />
+                <RowDefinition Height="*" />
+                <RowDefinition Height="40" />
+            </Grid.RowDefinitions>
+            <Custom:DropShadowPanel
+                HorizontalAlignment="Stretch"
+                HorizontalContentAlignment="Stretch"
+                BlurRadius="8"
+                OffsetY="2"
+                ShadowOpacity="0.04">
+                <controls:NavigationToolbar x:Name="NavToolbar" HorizontalAlignment="Stretch" />
+            </Custom:DropShadowPanel>
+
+            <ContentPresenter
+                Grid.Row="1"
+                HorizontalAlignment="Stretch"
+                Content="{x:Bind ((viewmodels:MainPageViewModel)DataContext).SelectedTabItem.Control, Mode=OneWay}" />
+
+            <controls:StatusBarControl
+                x:Name="StatusBarControl"
+                Grid.Row="2"
+                x:Load="False"
+                ShowInfoText="{x:Bind SidebarAdaptiveViewModel.PaneHolder.ActivePane.InstanceViewModel.IsPageTypeNotHome, Mode=OneWay}"
+                ShowStatusCenter="True"
+                StatusCenterViewModel="{x:Bind StatusCenterViewModel}" />
+
+        </Grid>
+        <VisualStateManager.VisualStateGroups>
+            <VisualStateGroup x:Name="MultitaskingControlStates">
+                <VisualState x:Name="NormalWindowWidth">
+                    <VisualState.StateTriggers>
+                        <AdaptiveTrigger MinWindowWidth="500" />
+                    </VisualState.StateTriggers>
+                </VisualState>
+                <VisualState x:Name="HorizontalTabViewCollapsed">
+                    <VisualState.StateTriggers>
+                        <AdaptiveTrigger MinWindowWidth="0" />
+                    </VisualState.StateTriggers>
+                    <VisualState.Setters>
+                        <Setter Target="horizontalMultitaskingControl.Visibility" Value="Collapsed" />
+
+                        <!--  Update the button size to match the pane toggle button size  -->
+                        <Setter Target="VerticalTabStripInvokeButton.Height" Value="36" />
+                        <Setter Target="VerticalTabStripInvokeButton.Width" Value="36" />
+                        <Setter Target="HorizontalMultitaskingControlAddButton.Visibility" Value="Collapsed" />
+                        <Setter Target="VerticalTabStripInvokeButtonIcon.FontSize" Value="16" />
+                    </VisualState.Setters>
+                </VisualState>
+            </VisualStateGroup>
+        </VisualStateManager.VisualStateGroups>
     </controls:SidebarControl>
 </Page>
\ No newline at end of file

From 2c83061e598fdf39986815f3de127bdb80f4bf1b Mon Sep 17 00:00:00 2001
From: Yair Aichenbaum <39923744+yaichenbaum@users.noreply.github.com>
Date: Sun, 20 Jun 2021 19:15:59 -0400
Subject: [PATCH 5/7] Update Files/Strings/en-US/Resources.resw

---
 Files/Strings/en-US/Resources.resw | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/Files/Strings/en-US/Resources.resw b/Files/Strings/en-US/Resources.resw
index 6b8d32d7c261..3e44f64cd7d3 100644
--- a/Files/Strings/en-US/Resources.resw
+++ b/Files/Strings/en-US/Resources.resw
@@ -2573,6 +2573,7 @@
   </data>
   <data name="NavigationToolbarExitCompactOverlay.Label" xml:space="preserve">
     <value>Exit compact overlay</value>
+</data>
   <data name="PropertyFileDescription" xml:space="preserve">
     <value>File description</value>
   </data>
@@ -2597,4 +2598,4 @@
   <data name="PreviewPaneLoadCloudItemButton.ToolTipService.ToolTip" xml:space="preserve">
     <value>Downloads the item from the cloud and loads the preview</value>
   </data>
-</root>
\ No newline at end of file
+</root>

From 74e9fb6e41199ffea31b67b2e26145d14c1c170e Mon Sep 17 00:00:00 2001
From: Winston de Jong <winiston2212@outlook.com>
Date: Mon, 21 Jun 2021 18:12:42 -0700
Subject: [PATCH 6/7] Added keyboard shortcuts

---
 Files/UserControls/NavigationToolbar.xaml    | 29 +++++++++++++++++---
 Files/UserControls/NavigationToolbar.xaml.cs | 27 ++++++++++++++++++
 Files/Views/MainPage.xaml                    | 29 +++++++++++++++++++-
 Files/Views/MainPage.xaml.cs                 | 19 +++++++++++++
 4 files changed, 99 insertions(+), 5 deletions(-)

diff --git a/Files/UserControls/NavigationToolbar.xaml b/Files/UserControls/NavigationToolbar.xaml
index 79b4170e6173..dc9ef6dc696b 100644
--- a/Files/UserControls/NavigationToolbar.xaml
+++ b/Files/UserControls/NavigationToolbar.xaml
@@ -24,9 +24,15 @@
             <converters:LayoutModeToBoolConverter x:Key="LayoutModeConverter" />
             <converters:VisiblityInvertConverter x:Key="VisiblityInvertConverter" />
             <converters1:BoolNegationConverter x:Key="BoolNegationConverter" />
+            <converters1:BoolToVisibilityConverter
+                x:Key="NegatedBoolToVisibilityConverter"
+                FalseValue="Visible"
+                TrueValue="Collapsed" />
             <converters:IntToGroupOption x:Key="IntToGroupOption" />
             <converters:IntToSortOption x:Key="IntToSortOption" />
             <converters:IntToSortDirection x:Key="IntToSortDirection" />
+            <x:Boolean x:Key="True">True</x:Boolean>
+            <x:Boolean x:Key="False">False</x:Boolean>
             <ResourceDictionary.MergedDictionaries>
                 <ResourceDictionary Source="/ResourceDictionaries/ToolbarButtonStyle.xaml" />
 
@@ -937,8 +943,16 @@
                 <AppBarButton
                     x:Name="NavToolbarEnterCompactOverlay"
                     x:Uid="NavigationToolbarEnterCompactOverlay"
-                    Click="NavToolbarEnterCompactOverlay_Click"
-                    Label="Enter compact overlay">
+                    Command="{x:Bind SetCompactOverlayCommand}"
+                    CommandParameter="{StaticResource True}"
+                    Label="Enter compact overlay"
+                    Visibility="{x:Bind IsCompactOverlay, Mode=OneWay, Converter={StaticResource NegatedBoolToVisibilityConverter}}">
+                    <AppBarButton.KeyboardAccelerators>
+                        <KeyboardAccelerator
+                            Key="Up"
+                            IsEnabled="False"
+                            Modifiers="Menu,Control" />
+                    </AppBarButton.KeyboardAccelerators>
                     <AppBarButton.Icon>
                         <FontIcon Glyph="&#xEE49;" />
                     </AppBarButton.Icon>
@@ -946,12 +960,19 @@
                 <AppBarButton
                     x:Name="NavToolbarExitCompactOverlay"
                     x:Uid="NavigationToolbarExitCompactOverlay"
-                    Click="NavToolbarEnterCompactOverlay_Click"
+                    Command="{x:Bind SetCompactOverlayCommand}"
+                    CommandParameter="{StaticResource False}"
                     Label="Exit compact overlay"
-                    Visibility="Collapsed">
+                    Visibility="{x:Bind IsCompactOverlay, Mode=OneWay}">
                     <AppBarButton.Icon>
                         <FontIcon Glyph="&#xEE47;" />
                     </AppBarButton.Icon>
+                    <AppBarButton.KeyboardAccelerators>
+                        <KeyboardAccelerator
+                            Key="Down"
+                            IsEnabled="False"
+                            Modifiers="Menu,Control" />
+                    </AppBarButton.KeyboardAccelerators>
                 </AppBarButton>
                 <AppBarButton
                     x:Name="CopyPathButton"
diff --git a/Files/UserControls/NavigationToolbar.xaml.cs b/Files/UserControls/NavigationToolbar.xaml.cs
index f4fbd687f60d..9d08baf0671b 100644
--- a/Files/UserControls/NavigationToolbar.xaml.cs
+++ b/Files/UserControls/NavigationToolbar.xaml.cs
@@ -6,6 +6,7 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
+using System.Windows.Input;
 using Windows.System;
 using Windows.UI.ViewManagement;
 using Windows.UI.Xaml;
@@ -195,6 +196,32 @@ private void NavMoreButtonFlyout_Opening(object sender, object e)
 
         private void VisiblePath_QuerySubmitted(AutoSuggestBox sender, AutoSuggestBoxQuerySubmittedEventArgs args) => ViewModel.VisiblePath_QuerySubmitted(sender, args);
 
+
+
+        public bool IsCompactOverlay
+        {
+            get { return (bool)GetValue(IsCompactOverlayProperty); }
+            set { SetValue(IsCompactOverlayProperty, value); }
+        }
+
+        // Using a DependencyProperty as the backing store for IsCompactOverlay.  This enables animation, styling, binding, etc...
+        public static readonly DependencyProperty IsCompactOverlayProperty =
+            DependencyProperty.Register("IsCompactOverlay", typeof(bool), typeof(NavigationToolbar), new PropertyMetadata(null));
+
+
+
+        public ICommand SetCompactOverlayCommand
+        {
+            get { return (ICommand)GetValue(SetCompactOverlayCommandProperty); }
+            set { SetValue(SetCompactOverlayCommandProperty, value); }
+        }
+
+        // Using a DependencyProperty as the backing store for ToggleCompactOverlayCommand.  This enables animation, styling, binding, etc...
+        public static readonly DependencyProperty SetCompactOverlayCommandProperty =
+            DependencyProperty.Register("ToggleCompactOverlayCommand", typeof(ICommand), typeof(NavigationToolbar), new PropertyMetadata(null));
+
+
+
         private async void NavToolbarEnterCompactOverlay_Click(object sender, RoutedEventArgs e)
         {
             var view = ApplicationView.GetForCurrentView();
diff --git a/Files/Views/MainPage.xaml b/Files/Views/MainPage.xaml
index 0fa9c1cb73c5..ad61f3b2858f 100644
--- a/Files/Views/MainPage.xaml
+++ b/Files/Views/MainPage.xaml
@@ -35,6 +35,9 @@
                 </ResourceDictionary>
             </ResourceDictionary.ThemeDictionaries>
 
+            <x:Boolean x:Key="True">True</x:Boolean>
+            <x:Boolean x:Key="False">False</x:Boolean>
+
             <Style x:Key="DefaultGridSplitterStyle" TargetType="Custom:GridSplitter">
                 <Setter Property="IsTabStop" Value="True" />
                 <Setter Property="UseSystemFocusVisuals" Value="True" />
@@ -201,6 +204,27 @@
                 </icore:EventTriggerBehavior>
             </i:Interaction.Behaviors>
         </KeyboardAccelerator>
+        <KeyboardAccelerator Key="F12">
+            <i:Interaction.Behaviors>
+                <icore:EventTriggerBehavior EventName="Invoked">
+                    <icore:InvokeCommandAction Command="{x:Bind ToggleCompactOverlayCommand}" />
+                </icore:EventTriggerBehavior>
+            </i:Interaction.Behaviors>
+        </KeyboardAccelerator>
+        <KeyboardAccelerator Key="Up" Modifiers="Menu,Control">
+            <i:Interaction.Behaviors>
+                <icore:EventTriggerBehavior EventName="Invoked">
+                    <icore:InvokeCommandAction Command="{x:Bind SetCompactOverlayCommand}" CommandParameter="{StaticResource True}" />
+                </icore:EventTriggerBehavior>
+            </i:Interaction.Behaviors>
+        </KeyboardAccelerator>
+        <KeyboardAccelerator Key="Down" Modifiers="Menu,Control">
+            <i:Interaction.Behaviors>
+                <icore:EventTriggerBehavior EventName="Invoked">
+                    <icore:InvokeCommandAction Command="{x:Bind SetCompactOverlayCommand}" CommandParameter="{StaticResource False}" />
+                </icore:EventTriggerBehavior>
+            </i:Interaction.Behaviors>
+        </KeyboardAccelerator>
     </Page.KeyboardAccelerators>
 
     <controls:SidebarControl
@@ -315,7 +339,10 @@
                 BlurRadius="8"
                 OffsetY="2"
                 ShadowOpacity="0.04">
-                <controls:NavigationToolbar x:Name="NavToolbar" HorizontalAlignment="Stretch" />
+                <controls:NavigationToolbar
+                    x:Name="NavToolbar"
+                    HorizontalAlignment="Stretch"
+                    SetCompactOverlayCommand="{x:Bind SetCompactOverlayCommand}" />
             </Custom:DropShadowPanel>
 
             <ContentPresenter
diff --git a/Files/Views/MainPage.xaml.cs b/Files/Views/MainPage.xaml.cs
index 012111e57a17..2ccf38588d27 100644
--- a/Files/Views/MainPage.xaml.cs
+++ b/Files/Views/MainPage.xaml.cs
@@ -43,6 +43,9 @@ public MainPageViewModel ViewModel
 
         public ICommand ToggleFullScreenAcceleratorCommand { get; private set; }
 
+        private ICommand ToggleCompactOverlayCommand => new RelayCommand<KeyboardAcceleratorInvokedEventArgs>(x => ToggleCompactOverlay());
+        private ICommand SetCompactOverlayCommand => new RelayCommand<bool>(x => SetCompactOverlay(x));
+
         public MainPage()
         {
             this.InitializeComponent();
@@ -310,5 +313,21 @@ private void SidebarControl_Loaded(object sender, RoutedEventArgs e)
         {
             SidebarAdaptiveViewModel.UpdateTabControlMargin(); // Set the correct tab margin on startup
         }
+
+        private void ToggleCompactOverlay() => SetCompactOverlay(ApplicationView.GetForCurrentView().ViewMode != ApplicationViewMode.CompactOverlay);
+
+        private async void SetCompactOverlay(bool isCompact)
+        {
+            var view = ApplicationView.GetForCurrentView();
+
+            if (!isCompact)
+            {
+                NavToolbar.IsCompactOverlay = !await view.TryEnterViewModeAsync(ApplicationViewMode.Default);
+            }
+            else
+            {
+                NavToolbar.IsCompactOverlay = await view.TryEnterViewModeAsync(ApplicationViewMode.CompactOverlay);
+            }
+        }
     }
 }
\ No newline at end of file

From fac314200c0402d03d85c5c1dc267188a75711d3 Mon Sep 17 00:00:00 2001
From: Winston de Jong <winiston2212@outlook.com>
Date: Mon, 21 Jun 2021 23:18:47 -0700
Subject: [PATCH 7/7] Fix keyboard shortcuts

---
 .../KeyboardAcceleratorExtensions.cs          | 23 +++++++++++++++++++
 Files/Files.csproj                            |  1 +
 Files/Views/MainPage.xaml                     | 15 +++++++++---
 Files/Views/MainPage.xaml.cs                  | 10 ++++++++
 4 files changed, 46 insertions(+), 3 deletions(-)
 create mode 100644 Files/Extensions/KeyboardAcceleratorExtensions.cs

diff --git a/Files/Extensions/KeyboardAcceleratorExtensions.cs b/Files/Extensions/KeyboardAcceleratorExtensions.cs
new file mode 100644
index 000000000000..f26f22bf0f8b
--- /dev/null
+++ b/Files/Extensions/KeyboardAcceleratorExtensions.cs
@@ -0,0 +1,23 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using Windows.System;
+using Windows.UI.Core;
+using Windows.UI.Xaml;
+using Windows.UI.Xaml.Input;
+
+namespace Files.Extensions
+{
+    public static class KeyboardAcceleratorExtensions
+    {
+        public static bool CheckIsPressed(this KeyboardAccelerator keyboardAccelerator)
+        {
+            return Window.Current.CoreWindow.GetKeyState(keyboardAccelerator.Key).HasFlag(CoreVirtualKeyStates.Down) && // check if the main key is pressed
+                (!keyboardAccelerator.Modifiers.HasFlag(VirtualKeyModifiers.Menu) || Window.Current.CoreWindow.GetKeyState(VirtualKey.Menu).HasFlag(CoreVirtualKeyStates.Down)) && // check if menu (alt) key is a modifier, and if so check if it's pressed
+                (!keyboardAccelerator.Modifiers.HasFlag(VirtualKeyModifiers.Shift) || Window.Current.CoreWindow.GetKeyState(VirtualKey.Shift).HasFlag(CoreVirtualKeyStates.Down)) && // check if shift key is a modifier, and if so check if it's pressed
+                (!keyboardAccelerator.Modifiers.HasFlag(VirtualKeyModifiers.Control) || Window.Current.CoreWindow.GetKeyState(VirtualKey.Control).HasFlag(CoreVirtualKeyStates.Down)); // check if ctrl key is a modifier, and if so check if it's pressed
+        }
+    }
+}
diff --git a/Files/Files.csproj b/Files/Files.csproj
index 2390982fb9d7..e8f74eb9b71d 100644
--- a/Files/Files.csproj
+++ b/Files/Files.csproj
@@ -204,6 +204,7 @@
     <Compile Include="Extensions\EnumExtensions.cs" />
     <Compile Include="Extensions\FileIconInfoExtensions.cs" />
     <Compile Include="Extensions\ImageSourceExtensions.cs" />
+    <Compile Include="Extensions\KeyboardAcceleratorExtensions.cs" />
     <Compile Include="Extensions\TaskExtensions.cs" />
     <Compile Include="Filesystem\Permissions\FilePermissionsManager.cs" />
     <Compile Include="Filesystem\Permissions\FileSystemAccessRule.cs" />
diff --git a/Files/Views/MainPage.xaml b/Files/Views/MainPage.xaml
index a1bb084a3f2c..97569c4d5c36 100644
--- a/Files/Views/MainPage.xaml
+++ b/Files/Views/MainPage.xaml
@@ -211,14 +211,20 @@
                 </icore:EventTriggerBehavior>
             </i:Interaction.Behaviors>
         </KeyboardAccelerator>
-        <KeyboardAccelerator Key="Up" Modifiers="Menu,Control">
+        <KeyboardAccelerator
+            Key="Up"
+            x:Name="EnterCompactOverlayKeyboardAccelerator"
+            Modifiers="Menu,Control">
             <i:Interaction.Behaviors>
                 <icore:EventTriggerBehavior EventName="Invoked">
                     <icore:InvokeCommandAction Command="{x:Bind SetCompactOverlayCommand}" CommandParameter="{StaticResource True}" />
                 </icore:EventTriggerBehavior>
             </i:Interaction.Behaviors>
         </KeyboardAccelerator>
-        <KeyboardAccelerator Key="Down" Modifiers="Menu,Control">
+        <KeyboardAccelerator
+            Key="Down"
+            x:Name="ExitCompactOverlayKeyboardAccelerator"
+            Modifiers="Menu,Control">
             <i:Interaction.Behaviors>
                 <icore:EventTriggerBehavior EventName="Invoked">
                     <icore:InvokeCommandAction Command="{x:Bind SetCompactOverlayCommand}" CommandParameter="{StaticResource False}" />
@@ -328,7 +334,10 @@
             </Grid>
         </controls:SidebarControl.TabContent>
 
-        <Grid x:Name="RootGrid" SizeChanged="RootGrid_SizeChanged">
+        <Grid
+            x:Name="RootGrid"
+            PreviewKeyDown="RootGrid_PreviewKeyDown"
+            SizeChanged="RootGrid_SizeChanged">
             <Grid.RowDefinitions>
                 <RowDefinition Height="Auto" />
                 <RowDefinition Height="*" />
diff --git a/Files/Views/MainPage.xaml.cs b/Files/Views/MainPage.xaml.cs
index f79f611f10c3..80b7fcaf31de 100644
--- a/Files/Views/MainPage.xaml.cs
+++ b/Files/Views/MainPage.xaml.cs
@@ -22,6 +22,7 @@
 using Windows.UI.Xaml.Controls;
 using Windows.UI.Xaml.Input;
 using Windows.UI.Xaml.Navigation;
+using Files.Extensions;
 
 namespace Files.Views
 {
@@ -460,5 +461,14 @@ private async void SetCompactOverlay(bool isCompact)
                 NavToolbar.IsCompactOverlay = await view.TryEnterViewModeAsync(ApplicationViewMode.CompactOverlay);
             }
         }
+
+        private void RootGrid_PreviewKeyDown(object sender, KeyRoutedEventArgs e)
+        {
+            // prevents the arrow key events from navigating the list instead of switching compact ovleray
+            if(EnterCompactOverlayKeyboardAccelerator.CheckIsPressed() || ExitCompactOverlayKeyboardAccelerator.CheckIsPressed())
+            {
+                Focus(FocusState.Keyboard);
+            }
+        }
     }
 }
\ No newline at end of file