Enabled the option to continue where you left off when opening Files UWP (#1779)

Author: d2dyno1

Files/App.xaml.cs

@@ -4,6 +4,7 @@
 using Files.Controls;
 using Files.Filesystem;
 using Files.Helpers;
+using Files.UserControls;
 using Files.View_Models;
 using Files.Views;
 using Microsoft.AppCenter;
@@ -15,6 +16,7 @@
 using System;
 using System.Collections.Generic;
 using System.Diagnostics;
+using System.Linq;
 using System.Threading.Tasks;
 using Windows.ApplicationModel;
 using Windows.ApplicationModel.Activation;
@@ -391,6 +393,8 @@ private void OnNavigationFailed(object sender, NavigationFailedEventArgs e)
         /// <param name="e">Details about the suspend request.</param>
         private void OnSuspending(object sender, SuspendingEventArgs e)
         {
+            SaveSessionTabs();
+
             var deferral = e.SuspendingOperation.GetDeferral();
             //TODO: Save application state and stop any background activity
             if (Connection != null)
@@ -402,6 +406,11 @@ private void OnSuspending(object sender, SuspendingEventArgs e)
             deferral.Complete();
         }
 
+        private void SaveSessionTabs() // Enumerates through all tabs and gets the Path property and saves it to AppSettings.LastSessionPages
+        {
+            AppSettings.LastSessionPages = MainPage.AppInstances.Select(x => x.Path ?? ResourceController.GetTranslation("NewTab")).ToArray();
+        }
+
         // Occurs when an exception is not handled on the UI thread.
         private static void OnUnhandledException(object sender, Windows.UI.Xaml.UnhandledExceptionEventArgs e)
         {

Files/UserControls/MultitaskingControl/HorizontalMultitaskingControl.xaml.cs

@@ -41,6 +41,8 @@ public async void SetSelectedTabInfo(string text, string currentPathForTabIcon)
             var selectedTabItem = (MainPage.AppInstances[App.InteractionViewModel.TabStripSelectedIndex] as TabItem);
             selectedTabItem.AllowStorageItemDrop = App.CurrentInstance.InstanceViewModel.IsPageTypeNotHome;
 
+            (MainPage.AppInstances[App.InteractionViewModel.TabStripSelectedIndex] as TabItem).Path = currentPathForTabIcon;
+
             string tabLocationHeader;
             Microsoft.UI.Xaml.Controls.FontIconSource fontIconSource = new Microsoft.UI.Xaml.Controls.FontIconSource();
             Microsoft.UI.Xaml.Controls.IconSource tabIcon;

Files/UserControls/MultitaskingControl/TabItem.cs

@@ -14,6 +14,17 @@ public string Header
             set => SetProperty(ref _Header, value);
         }
 
+        private string _Path;
+
+        // Please, remember to update the Path whenever navigating to directory,
+        // currently the update is done in both methods SetSelectedTabInfo in
+        // classes HorizontalMultitaskingControl and VerticalTabView
+        public string Path 
+        {
+            get => _Path;
+            set => SetProperty(ref _Path, value);
+        }
+
         private string _Description = null;
 
         public string Description

Files/UserControls/MultitaskingControl/VerticalTabView.xaml.cs

@@ -36,6 +36,8 @@ public async void SetSelectedTabInfo(string text, string currentPathForTabIcon =
             var selectedTabItem = (MainPage.AppInstances[App.InteractionViewModel.TabStripSelectedIndex] as TabItem);
             selectedTabItem.AllowStorageItemDrop = App.CurrentInstance.InstanceViewModel.IsPageTypeNotHome;
 
+            MainPage.AppInstances[App.InteractionViewModel.TabStripSelectedIndex].Path = currentPathForTabIcon;
+
             string tabLocationHeader;
             Microsoft.UI.Xaml.Controls.FontIconSource fontIconSource = new Microsoft.UI.Xaml.Controls.FontIconSource();
             Microsoft.UI.Xaml.Controls.IconSource tabIcon;

Files/View Models/SettingsViewModel.cs

@@ -10,6 +10,7 @@
 using Microsoft.Toolkit.Mvvm.Input;
 using Microsoft.Toolkit.Uwp.UI;
 using System;
+using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Linq;
 using System.Reflection;
@@ -447,6 +448,12 @@ public bool OpenASpecificPageOnStartup
             set => Set(value);
         }
 
+        public bool ContinueLastSessionOnStartUp
+        {
+            get => Get(false);
+            set => Set(value);
+        }
+
         public string OpenASpecificPageOnStartupPath
         {
             get => Get("");
@@ -712,5 +719,11 @@ public string[] PagesOnStartupList
             get => Get<string[]>(null);
             set => Set(value);
         }
+
+        public string[] LastSessionPages
+        {
+            get => Get<string[]>(null);
+            set => Set(value);
+        }
     }
 }

Files/Views/MainPage.xaml.cs

@@ -84,15 +84,37 @@ protected override async void OnNavigatedTo(NavigationEventArgs eventArgs)
                 Clipboard.ContentChanged += Clipboard_ContentChanged;
                 Clipboard_ContentChanged(null, null);
 
-                if (string.IsNullOrEmpty(navArgs) && App.AppSettings.OpenASpecificPageOnStartup)
+                if (string.IsNullOrEmpty(navArgs))
                 {
                     try
                     {
-                        if (App.AppSettings.PagesOnStartupList != null)
+                        if (App.AppSettings.OpenASpecificPageOnStartup)
                         {
-                            foreach (string path in App.AppSettings.PagesOnStartupList)
+
+                            if (App.AppSettings.PagesOnStartupList != null)
+                            {
+                                foreach (string path in App.AppSettings.PagesOnStartupList)
+                                {
+                                    await AddNewTab(typeof(ModernShellPage), path);
+                                }
+                            }
+                            else
+                            {
+                                await AddNewTab(typeof(ModernShellPage), ResourceController.GetTranslation("NewTab"));
+                            }
+                        }
+                        else if (App.AppSettings.ContinueLastSessionOnStartUp)
+                        {
+                            if (App.AppSettings.LastSessionPages != null)
+                            {
+                                foreach (string path in App.AppSettings.LastSessionPages)
+                                {
+                                    await AddNewTab(typeof(ModernShellPage), path);
+                                }
+                            }
+                            else
                             {
-                                await AddNewTab(typeof(ModernShellPage), path);
+                                await AddNewTab(typeof(ModernShellPage), ResourceController.GetTranslation("NewTab"));
                             }
                         }
                         else
@@ -231,6 +253,7 @@ public static async Task AddNewTab(Type t, string path, int atIndex = -1)
             TabItem tvi = new TabItem()
             {
                 Header = tabLocationHeader,
+                Path = path,
                 Content = new Grid()
                 {
                     Children =
@@ -380,4 +403,4 @@ private async void AddNewInstanceAccelerator_Invoked(KeyboardAccelerator sender,
             args.Handled = true;
         }
     }
-}
+}

Files/Views/SettingsPages/OnStartup.xaml

@@ -47,7 +47,7 @@
                     Content="Continue where you left off"
                     FontSize="16"
                     GroupName="StartupPageSettingRadioGroup"
-                    IsEnabled="False" />
+                    IsChecked="{x:Bind AppSettings.ContinueLastSessionOnStartUp, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" />
 
                 <RadioButton
                     x:Name="OpenSpecificPage"