Don't store selected tab instance in ItemViewModel

lukeblevins · lukeblevins · commit 31cb3deb2920 · 2019-09-21T21:57:55.000-04:00
diff --git a/Files UWP/AddItem.xaml.cs b/Files UWP/AddItem.xaml.cs
@@ -56,7 +56,7 @@ public T GetCurrentSelectedTabInstance<T>()
         }
         private async void ListView_ItemClick(object sender, ItemClickEventArgs e)
         {
-            var TabInstance = GetCurrentSelectedTabInstance<ProHome>();
+            var TabInstance = App.selectedTabInstance;
             TabInstance.addItemDialog.Hide();
             string currentPath = null;
             if (TabInstance.accessibleContentFrame.SourcePageType == typeof(GenericFileBrowser))
diff --git a/Files UWP/App.xaml.cs b/Files UWP/App.xaml.cs
@@ -22,6 +22,7 @@ namespace Files
 {
     sealed partial class App : Application
     {
+        public static ProHome selectedTabInstance { get; set; }
         public App()
         {
             this.InitializeComponent();
@@ -96,6 +97,7 @@ private async void App_UnhandledException(object sender, Windows.UI.Xaml.Unhandl
         public static PasteState PS { get; set; } = new PasteState();
         public static List<string> pathsToDeleteAfterPaste = new List<string>();
 
+
         /// <summary>
         /// Invoked when the application is launched normally by the end user.  Other entry points
         /// will be used such as when the application is launched to open a specific file.
diff --git a/Files UWP/Filesystem/ItemViewModel.cs b/Files UWP/Filesystem/ItemViewModel.cs
diff --git a/Files UWP/GenericFileBrowser.xaml.cs b/Files UWP/GenericFileBrowser.xaml.cs
@@ -50,7 +50,7 @@ public GenericFileBrowser()
             grid = RootGrid;
             Clipboard.ContentChanged += Clipboard_ContentChanged;
             RefreshEmptySpace.Click += NavigationActions.Refresh_Click;
-            tabInstance = ItemViewModel.GetCurrentSelectedTabInstance<ProHome>();
+            tabInstance = App.selectedTabInstance;
             viewModelInstance = tabInstance.instanceViewModel;
             PasteEmptySpace.Click += tabInstance.instanceInteraction.PasteItem_ClickAsync;
             OpenItem.Click += tabInstance.instanceInteraction.OpenItem_Click;
diff --git a/Files UWP/InstanceTabsView.xaml.cs b/Files UWP/InstanceTabsView.xaml.cs
@@ -1,4 +1,5 @@
-﻿using Microsoft.UI.Xaml.Controls;
+﻿using Files.Filesystem;
+using Microsoft.UI.Xaml.Controls;
 using System;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
@@ -235,6 +236,10 @@ private void TabStrip_SelectionChanged(object sender, SelectionChangedEventArgs
                     }
                 }
             }
+            else
+            {
+                App.selectedTabInstance = ItemViewModel.GetCurrentSelectedTabInstance<ProHome>();
+            }
 
         }
 
diff --git a/Files UWP/Interacts/Interaction.cs b/Files UWP/Interacts/Interaction.cs
diff --git a/Files UWP/PhotoAlbum.xaml.cs b/Files UWP/PhotoAlbum.xaml.cs
@@ -55,7 +55,7 @@ public PhotoAlbum()
             progressBar = ProgBar;
             gridContext = GridRightClickContextMenu;
             Clipboard.ContentChanged += Clipboard_ContentChanged;
-            tabInstance = ItemViewModel.GetCurrentSelectedTabInstance<ProHome>();
+            tabInstance = App.selectedTabInstance;
             viewModelInstance = tabInstance.instanceViewModel;
             FileList.DoubleTapped += tabInstance.instanceInteraction.List_ItemClick;
             SidebarPinItem.Click += tabInstance.instanceInteraction.PinItem_Click;
diff --git a/Files UWP/ProHome.xaml.cs b/Files UWP/ProHome.xaml.cs
diff --git a/Files UWP/SettingsPages/Preferences.xaml.cs b/Files UWP/SettingsPages/Preferences.xaml.cs
@@ -130,7 +130,7 @@ private async void SaveCustomL_Click(object sender, Windows.UI.Xaml.RoutedEventA
                 }
                 catch (UnauthorizedAccessException)
                 {
-                    await ItemViewModel.GetCurrentSelectedTabInstance<ProHome>().consentDialog.ShowAsync();
+                    await App.selectedTabInstance.consentDialog.ShowAsync();
                     return;
                 }
                 catch (ArgumentException)
@@ -156,7 +156,7 @@ private async void SaveCustomL_Click(object sender, Windows.UI.Xaml.RoutedEventA
                 }
                 catch (UnauthorizedAccessException)
                 {
-                    await ItemViewModel.GetCurrentSelectedTabInstance<ProHome>().consentDialog.ShowAsync();
+                    await App.selectedTabInstance.consentDialog.ShowAsync();
                     return;
                 }
                 catch (ArgumentException)
@@ -181,7 +181,7 @@ private async void SaveCustomL_Click(object sender, Windows.UI.Xaml.RoutedEventA
                 }
                 catch (UnauthorizedAccessException)
                 {
-                    await ItemViewModel.GetCurrentSelectedTabInstance<ProHome>().consentDialog.ShowAsync();
+                    await App.selectedTabInstance.consentDialog.ShowAsync();
                     return;
                 }
                 catch (ArgumentException)
@@ -206,7 +206,7 @@ private async void SaveCustomL_Click(object sender, Windows.UI.Xaml.RoutedEventA
                 }
                 catch (UnauthorizedAccessException)
                 {
-                    await ItemViewModel.GetCurrentSelectedTabInstance<ProHome>().consentDialog.ShowAsync();
+                    await App.selectedTabInstance.consentDialog.ShowAsync();
                     return;
                 }
                 catch (ArgumentException)
@@ -231,7 +231,7 @@ private async void SaveCustomL_Click(object sender, Windows.UI.Xaml.RoutedEventA
                 }
                 catch (UnauthorizedAccessException)
                 {
-                    await ItemViewModel.GetCurrentSelectedTabInstance<ProHome>().consentDialog.ShowAsync();
+                    await App.selectedTabInstance.consentDialog.ShowAsync();
                     return;
                 }
                 catch (ArgumentException)
@@ -256,7 +256,7 @@ private async void SaveCustomL_Click(object sender, Windows.UI.Xaml.RoutedEventA
                 }
                 catch (UnauthorizedAccessException)
                 {
-                    await ItemViewModel.GetCurrentSelectedTabInstance<ProHome>().consentDialog.ShowAsync();
+                    await App.selectedTabInstance.consentDialog.ShowAsync();
                     return;
                 }
                 catch (ArgumentException)
diff --git a/Files UWP/YourHome.xaml.cs b/Files UWP/YourHome.xaml.cs
@@ -37,7 +37,7 @@ public sealed partial class YourHome : Page
         public YourHome()
         {
             InitializeComponent();
-            GetCurrentSelectedTabInstance<ProHome>().PathText.Text = "Favorites";
+            App.selectedTabInstance.PathText.Text = "Favorites";
 
             // Overwrite paths for common locations if Custom Locations setting is enabled
             ApplicationDataContainer localSettings = ApplicationData.Current.LocalSettings;
@@ -82,16 +82,16 @@ protected override void OnNavigatedTo(NavigationEventArgs eventArgs)
             Frame rootFrame = Window.Current.Content as Frame;
             var instanceTabsView = rootFrame.Content as InstanceTabsView;
             instanceTabsView.SetSelectedTabInfo("Favorites", null);
-            GetCurrentSelectedTabInstance<ProHome>().BackButton.IsEnabled = GetCurrentSelectedTabInstance<ProHome>().accessibleContentFrame.CanGoBack;
-            GetCurrentSelectedTabInstance<ProHome>().ForwardButton.IsEnabled = GetCurrentSelectedTabInstance<ProHome>().accessibleContentFrame.CanGoForward;
-            GetCurrentSelectedTabInstance<ProHome>().RefreshButton.IsEnabled = false;
-            GetCurrentSelectedTabInstance<ProHome>().accessiblePasteButton.IsEnabled = false;
-            GetCurrentSelectedTabInstance<ProHome>().AlwaysPresentCommands.isEnabled = false;
-            GetCurrentSelectedTabInstance<ProHome>().LayoutItems.isEnabled = false;
+            App.selectedTabInstance.BackButton.IsEnabled = App.selectedTabInstance.accessibleContentFrame.CanGoBack;
+            App.selectedTabInstance.ForwardButton.IsEnabled = App.selectedTabInstance.accessibleContentFrame.CanGoForward;
+            App.selectedTabInstance.RefreshButton.IsEnabled = false;
+            App.selectedTabInstance.accessiblePasteButton.IsEnabled = false;
+            App.selectedTabInstance.AlwaysPresentCommands.isEnabled = false;
+            App.selectedTabInstance.LayoutItems.isEnabled = false;
 
             // Clear the path UI and replace with Favorites
-            GetCurrentSelectedTabInstance<ProHome>().pathBoxItems.Clear();
-            //Style tabStyleFixed = GetCurrentSelectedTabInstance<ProHome>().accessiblePathTabView.Resources["PathSectionTabStyle"] as Style;
+            App.selectedTabInstance.pathBoxItems.Clear();
+            //Style tabStyleFixed = App.selectedTabInstance.accessiblePathTabView.Resources["PathSectionTabStyle"] as Style;
 
             string componentLabel = "Favorites";
             string tag = "Favorites";
@@ -100,7 +100,7 @@ protected override void OnNavigatedTo(NavigationEventArgs eventArgs)
                 Title = componentLabel,
                 Path = tag,
             };
-            GetCurrentSelectedTabInstance<ProHome>().pathBoxItems.Add(item);
+            App.selectedTabInstance.pathBoxItems.Add(item);
 
         }
 
@@ -110,39 +110,39 @@ private void CardPressed(object sender, ItemClickEventArgs e)
             if (BelowCardText == "Downloads")
             {
                 
-                GetCurrentSelectedTabInstance<ProHome>().locationsList.SelectedIndex = 2;
+                App.selectedTabInstance.locationsList.SelectedIndex = 2;
                 //instanceViewModel.TextState.isVisible = Visibility.Collapsed;
-                GetCurrentSelectedTabInstance<ProHome>().accessibleContentFrame.Navigate(typeof(GenericFileBrowser), DownloadsPath);
-                GetCurrentSelectedTabInstance<ProHome>().LayoutItems.isEnabled = true;
+                App.selectedTabInstance.accessibleContentFrame.Navigate(typeof(GenericFileBrowser), DownloadsPath);
+                App.selectedTabInstance.LayoutItems.isEnabled = true;
             }
             else if (BelowCardText == "Documents")
             {
                 
-                GetCurrentSelectedTabInstance<ProHome>().locationsList.SelectedIndex = 3;
-                GetCurrentSelectedTabInstance<ProHome>().accessibleContentFrame.Navigate(typeof(GenericFileBrowser), DocumentsPath);
-                GetCurrentSelectedTabInstance<ProHome>().LayoutItems.isEnabled = true;
+                App.selectedTabInstance.locationsList.SelectedIndex = 3;
+                App.selectedTabInstance.accessibleContentFrame.Navigate(typeof(GenericFileBrowser), DocumentsPath);
+                App.selectedTabInstance.LayoutItems.isEnabled = true;
             }
             else if (BelowCardText == "Pictures")
             {
                 
-                GetCurrentSelectedTabInstance<ProHome>().locationsList.SelectedIndex = 4;
-                GetCurrentSelectedTabInstance<ProHome>().accessibleContentFrame.Navigate(typeof(PhotoAlbum), PicturesPath);
-                GetCurrentSelectedTabInstance<ProHome>().LayoutItems.isEnabled = true;
+                App.selectedTabInstance.locationsList.SelectedIndex = 4;
+                App.selectedTabInstance.accessibleContentFrame.Navigate(typeof(PhotoAlbum), PicturesPath);
+                App.selectedTabInstance.LayoutItems.isEnabled = true;
 
             }
             else if (BelowCardText == "Music")
             {
                 
-                GetCurrentSelectedTabInstance<ProHome>().locationsList.SelectedIndex = 5;
-                GetCurrentSelectedTabInstance<ProHome>().accessibleContentFrame.Navigate(typeof(GenericFileBrowser), MusicPath);
-                GetCurrentSelectedTabInstance<ProHome>().LayoutItems.isEnabled = true;
+                App.selectedTabInstance.locationsList.SelectedIndex = 5;
+                App.selectedTabInstance.accessibleContentFrame.Navigate(typeof(GenericFileBrowser), MusicPath);
+                App.selectedTabInstance.LayoutItems.isEnabled = true;
             }
             else if (BelowCardText == "Videos")
             {
                 
-                GetCurrentSelectedTabInstance<ProHome>().locationsList.SelectedIndex = 6;
-                GetCurrentSelectedTabInstance<ProHome>().accessibleContentFrame.Navigate(typeof(GenericFileBrowser), VideosPath);
-                GetCurrentSelectedTabInstance<ProHome>().LayoutItems.isEnabled = true;
+                App.selectedTabInstance.locationsList.SelectedIndex = 6;
+                App.selectedTabInstance.accessibleContentFrame.Navigate(typeof(GenericFileBrowser), VideosPath);
+                App.selectedTabInstance.LayoutItems.isEnabled = true;
             }
         }
 
@@ -162,37 +162,37 @@ private void Button_Tapped(object sender, Windows.UI.Xaml.Input.TappedRoutedEven
             if (clickedButton.Tag.ToString() == "\xE896") // Downloads
             {
                 
-                GetCurrentSelectedTabInstance<ProHome>().locationsList.SelectedIndex = 2;
-                GetCurrentSelectedTabInstance<ProHome>().accessibleContentFrame.Navigate(typeof(GenericFileBrowser), DownloadsPath);
-                GetCurrentSelectedTabInstance<ProHome>().LayoutItems.isEnabled = true;
+                App.selectedTabInstance.locationsList.SelectedIndex = 2;
+                App.selectedTabInstance.accessibleContentFrame.Navigate(typeof(GenericFileBrowser), DownloadsPath);
+                App.selectedTabInstance.LayoutItems.isEnabled = true;
             }
             else if (clickedButton.Tag.ToString() == "\xE8A5") // Documents
             {
                 
-                GetCurrentSelectedTabInstance<ProHome>().locationsList.SelectedIndex = 3;
-                GetCurrentSelectedTabInstance<ProHome>().accessibleContentFrame.Navigate(typeof(GenericFileBrowser), DocumentsPath);
-                GetCurrentSelectedTabInstance<ProHome>().LayoutItems.isEnabled = true;
+                App.selectedTabInstance.locationsList.SelectedIndex = 3;
+                App.selectedTabInstance.accessibleContentFrame.Navigate(typeof(GenericFileBrowser), DocumentsPath);
+                App.selectedTabInstance.LayoutItems.isEnabled = true;
             }
             else if (clickedButton.Tag.ToString() == "\xEB9F") // Pictures
             {
                 
-                GetCurrentSelectedTabInstance<ProHome>().locationsList.SelectedIndex = 4;
-                GetCurrentSelectedTabInstance<ProHome>().accessibleContentFrame.Navigate(typeof(PhotoAlbum), PicturesPath);
-                GetCurrentSelectedTabInstance<ProHome>().LayoutItems.isEnabled = true;
+                App.selectedTabInstance.locationsList.SelectedIndex = 4;
+                App.selectedTabInstance.accessibleContentFrame.Navigate(typeof(PhotoAlbum), PicturesPath);
+                App.selectedTabInstance.LayoutItems.isEnabled = true;
             }
             else if (clickedButton.Tag.ToString() == "\xEC4F") // Music
             {
                 
-                GetCurrentSelectedTabInstance<ProHome>().locationsList.SelectedIndex = 5;
-                GetCurrentSelectedTabInstance<ProHome>().accessibleContentFrame.Navigate(typeof(GenericFileBrowser), MusicPath);
-                GetCurrentSelectedTabInstance<ProHome>().LayoutItems.isEnabled = true;
+                App.selectedTabInstance.locationsList.SelectedIndex = 5;
+                App.selectedTabInstance.accessibleContentFrame.Navigate(typeof(GenericFileBrowser), MusicPath);
+                App.selectedTabInstance.LayoutItems.isEnabled = true;
             }
             else if (clickedButton.Tag.ToString() == "\xE8B2") // Videos
             {
                 
-                GetCurrentSelectedTabInstance<ProHome>().locationsList.SelectedIndex = 6;
-                GetCurrentSelectedTabInstance<ProHome>().accessibleContentFrame.Navigate(typeof(GenericFileBrowser), VideosPath);
-                GetCurrentSelectedTabInstance<ProHome>().LayoutItems.isEnabled = true;
+                App.selectedTabInstance.locationsList.SelectedIndex = 6;
+                App.selectedTabInstance.accessibleContentFrame.Navigate(typeof(GenericFileBrowser), VideosPath);
+                App.selectedTabInstance.LayoutItems.isEnabled = true;
             }
         }
         public static StorageFile RecentsFile;
@@ -286,24 +286,24 @@ private async void RecentsView_ItemClick(object sender, ItemClickEventArgs e)
             }
             catch (UnauthorizedAccessException)
             {
-                await GetCurrentSelectedTabInstance<ProHome>().consentDialog.ShowAsync();
+                await App.selectedTabInstance.consentDialog.ShowAsync();
             }
             catch (System.ArgumentException)
             {
                 if (new DirectoryInfo(path).Root.ToString().Contains(@"C:\"))
                 {
-                    GetCurrentSelectedTabInstance<ProHome>().drivesList.SelectedIndex = 0;
-                    GetCurrentSelectedTabInstance<ProHome>().accessibleContentFrame.Navigate(typeof(GenericFileBrowser), path);
+                    App.selectedTabInstance.drivesList.SelectedIndex = 0;
+                    App.selectedTabInstance.accessibleContentFrame.Navigate(typeof(GenericFileBrowser), path);
                 }
                 else
                 {
-                    foreach(ListViewItem drive in GetCurrentSelectedTabInstance<ProHome>().drivesList.Items)
+                    foreach(ListViewItem drive in App.selectedTabInstance.drivesList.Items)
                     {
                         if (drive.Tag.ToString() == new DirectoryInfo(path).Root.ToString())
                         {
-                            GetCurrentSelectedTabInstance<ProHome>().drivesList.SelectedItem = null;
+                            App.selectedTabInstance.drivesList.SelectedItem = null;
                             drive.IsSelected = true;
-                            GetCurrentSelectedTabInstance<ProHome>().accessibleContentFrame.Navigate(typeof(GenericFileBrowser), path);
+                            App.selectedTabInstance.accessibleContentFrame.Navigate(typeof(GenericFileBrowser), path);
                             return;
                         }
                     }

Original file line number	Diff line number	Diff line change
`@@ -56,7 +56,7 @@ public T GetCurrentSelectedTabInstance<T>()`
`56`	`56`	`}`
`57`	`57`	`private async void ListView_ItemClick(object sender, ItemClickEventArgs e)`
`58`	`58`	`{`
`59`		`- var TabInstance = GetCurrentSelectedTabInstance<ProHome>();`
	`59`	`+ var TabInstance = App.selectedTabInstance;`
`60`	`60`	`TabInstance.addItemDialog.Hide();`
`61`	`61`	`string currentPath = null;`
`62`	`62`	`if (TabInstance.accessibleContentFrame.SourcePageType == typeof(GenericFileBrowser))`
Original file line number	Diff line number	Diff line change
`@@ -22,6 +22,7 @@ namespace Files`
`22`	`22`	`{`
`23`	`23`	`sealed partial class App : Application`
`24`	`24`	`{`
	`25`	`+ public static ProHome selectedTabInstance { get; set; }`
`25`	`26`	`public App()`
`26`	`27`	`{`
`27`	`28`	`this.InitializeComponent();`
`@@ -96,6 +97,7 @@ private async void App_UnhandledException(object sender, Windows.UI.Xaml.Unhandl`
`96`	`97`	`public static PasteState PS { get; set; } = new PasteState();`
`97`	`98`	`public static List<string> pathsToDeleteAfterPaste = new List<string>();`
`98`	`99`
	`100`	`+`
`99`	`101`	`/// <summary>`
`100`	`102`	`/// Invoked when the application is launched normally by the end user. Other entry points`
`101`	`103`	`/// will be used such as when the application is launched to open a specific file.`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,5 @@`
`1`		`-using Microsoft.UI.Xaml.Controls;`
	`1`	`+using Files.Filesystem;`
	`2`	`+using Microsoft.UI.Xaml.Controls;`
`2`	`3`	`using System;`
`3`	`4`	`using System.Collections.Generic;`
`4`	`5`	`using System.Collections.ObjectModel;`
`@@ -235,6 +236,10 @@ private void TabStrip_SelectionChanged(object sender, SelectionChangedEventArgs`
`235`	`236`	`}`
`236`	`237`	`}`
`237`	`238`	`}`
	`239`	`+ else`
	`240`	`+ {`
	`241`	`+ App.selectedTabInstance = ItemViewModel.GetCurrentSelectedTabInstance<ProHome>();`
	`242`	`+ }`
`238`	`243`
`239`	`244`	`}`
`240`	`245`
Original file line number	Diff line number	Diff line change
`@@ -130,7 +130,7 @@ private async void SaveCustomL_Click(object sender, Windows.UI.Xaml.RoutedEventA`
`130`	`130`	`}`
`131`	`131`	`catch (UnauthorizedAccessException)`
`132`	`132`	`{`
`133`		`- await ItemViewModel.GetCurrentSelectedTabInstance<ProHome>().consentDialog.ShowAsync();`
	`133`	`+ await App.selectedTabInstance.consentDialog.ShowAsync();`
`134`	`134`	`return;`
`135`	`135`	`}`
`136`	`136`	`catch (ArgumentException)`
`@@ -156,7 +156,7 @@ private async void SaveCustomL_Click(object sender, Windows.UI.Xaml.RoutedEventA`
`156`	`156`	`}`
`157`	`157`	`catch (UnauthorizedAccessException)`
`158`	`158`	`{`
`159`		`- await ItemViewModel.GetCurrentSelectedTabInstance<ProHome>().consentDialog.ShowAsync();`
	`159`	`+ await App.selectedTabInstance.consentDialog.ShowAsync();`
`160`	`160`	`return;`
`161`	`161`	`}`
`162`	`162`	`catch (ArgumentException)`
`@@ -181,7 +181,7 @@ private async void SaveCustomL_Click(object sender, Windows.UI.Xaml.RoutedEventA`
`181`	`181`	`}`
`182`	`182`	`catch (UnauthorizedAccessException)`
`183`	`183`	`{`
`184`		`- await ItemViewModel.GetCurrentSelectedTabInstance<ProHome>().consentDialog.ShowAsync();`
	`184`	`+ await App.selectedTabInstance.consentDialog.ShowAsync();`
`185`	`185`	`return;`
`186`	`186`	`}`
`187`	`187`	`catch (ArgumentException)`
`@@ -206,7 +206,7 @@ private async void SaveCustomL_Click(object sender, Windows.UI.Xaml.RoutedEventA`
`206`	`206`	`}`
`207`	`207`	`catch (UnauthorizedAccessException)`
`208`	`208`	`{`
`209`		`- await ItemViewModel.GetCurrentSelectedTabInstance<ProHome>().consentDialog.ShowAsync();`
	`209`	`+ await App.selectedTabInstance.consentDialog.ShowAsync();`
`210`	`210`	`return;`
`211`	`211`	`}`
`212`	`212`	`catch (ArgumentException)`
`@@ -231,7 +231,7 @@ private async void SaveCustomL_Click(object sender, Windows.UI.Xaml.RoutedEventA`
`231`	`231`	`}`
`232`	`232`	`catch (UnauthorizedAccessException)`
`233`	`233`	`{`
`234`		`- await ItemViewModel.GetCurrentSelectedTabInstance<ProHome>().consentDialog.ShowAsync();`
	`234`	`+ await App.selectedTabInstance.consentDialog.ShowAsync();`
`235`	`235`	`return;`
`236`	`236`	`}`
`237`	`237`	`catch (ArgumentException)`
`@@ -256,7 +256,7 @@ private async void SaveCustomL_Click(object sender, Windows.UI.Xaml.RoutedEventA`
`256`	`256`	`}`
`257`	`257`	`catch (UnauthorizedAccessException)`
`258`	`258`	`{`
`259`		`- await ItemViewModel.GetCurrentSelectedTabInstance<ProHome>().consentDialog.ShowAsync();`
	`259`	`+ await App.selectedTabInstance.consentDialog.ShowAsync();`
`260`	`260`	`return;`
`261`	`261`	`}`
`262`	`262`	`catch (ArgumentException)`
Original file line number	Diff line number	Diff line change
`@@ -37,7 +37,7 @@ public sealed partial class YourHome : Page`
`37`	`37`	`public YourHome()`
`38`	`38`	`{`
`39`	`39`	`InitializeComponent();`
`40`		`- GetCurrentSelectedTabInstance<ProHome>().PathText.Text = "Favorites";`
	`40`	`+ App.selectedTabInstance.PathText.Text = "Favorites";`
`41`	`41`
`42`	`42`	`// Overwrite paths for common locations if Custom Locations setting is enabled`
`43`	`43`	`ApplicationDataContainer localSettings = ApplicationData.Current.LocalSettings;`
`@@ -82,16 +82,16 @@ protected override void OnNavigatedTo(NavigationEventArgs eventArgs)`
`82`	`82`	`Frame rootFrame = Window.Current.Content as Frame;`
`83`	`83`	`var instanceTabsView = rootFrame.Content as InstanceTabsView;`
`84`	`84`	`instanceTabsView.SetSelectedTabInfo("Favorites", null);`
`85`		`- GetCurrentSelectedTabInstance<ProHome>().BackButton.IsEnabled = GetCurrentSelectedTabInstance<ProHome>().accessibleContentFrame.CanGoBack;`
`86`		`- GetCurrentSelectedTabInstance<ProHome>().ForwardButton.IsEnabled = GetCurrentSelectedTabInstance<ProHome>().accessibleContentFrame.CanGoForward;`
`87`		`- GetCurrentSelectedTabInstance<ProHome>().RefreshButton.IsEnabled = false;`
`88`		`- GetCurrentSelectedTabInstance<ProHome>().accessiblePasteButton.IsEnabled = false;`
`89`		`- GetCurrentSelectedTabInstance<ProHome>().AlwaysPresentCommands.isEnabled = false;`
`90`		`- GetCurrentSelectedTabInstance<ProHome>().LayoutItems.isEnabled = false;`
	`85`	`+ App.selectedTabInstance.BackButton.IsEnabled = App.selectedTabInstance.accessibleContentFrame.CanGoBack;`
	`86`	`+ App.selectedTabInstance.ForwardButton.IsEnabled = App.selectedTabInstance.accessibleContentFrame.CanGoForward;`
	`87`	`+ App.selectedTabInstance.RefreshButton.IsEnabled = false;`
	`88`	`+ App.selectedTabInstance.accessiblePasteButton.IsEnabled = false;`
	`89`	`+ App.selectedTabInstance.AlwaysPresentCommands.isEnabled = false;`
	`90`	`+ App.selectedTabInstance.LayoutItems.isEnabled = false;`
`91`	`91`
`92`	`92`	`// Clear the path UI and replace with Favorites`
`93`		`- GetCurrentSelectedTabInstance<ProHome>().pathBoxItems.Clear();`
`94`		`- //Style tabStyleFixed = GetCurrentSelectedTabInstance<ProHome>().accessiblePathTabView.Resources["PathSectionTabStyle"] as Style;`
	`93`	`+ App.selectedTabInstance.pathBoxItems.Clear();`
	`94`	`+ //Style tabStyleFixed = App.selectedTabInstance.accessiblePathTabView.Resources["PathSectionTabStyle"] as Style;`
`95`	`95`
`96`	`96`	`string componentLabel = "Favorites";`
`97`	`97`	`string tag = "Favorites";`
`@@ -100,7 +100,7 @@ protected override void OnNavigatedTo(NavigationEventArgs eventArgs)`
`100`	`100`	`Title = componentLabel,`
`101`	`101`	`Path = tag,`
`102`	`102`	`};`
`103`		`- GetCurrentSelectedTabInstance<ProHome>().pathBoxItems.Add(item);`
	`103`	`+ App.selectedTabInstance.pathBoxItems.Add(item);`
`104`	`104`
`105`	`105`	`}`
`106`	`106`
`@@ -110,39 +110,39 @@ private void CardPressed(object sender, ItemClickEventArgs e)`
`110`	`110`	`if (BelowCardText == "Downloads")`
`111`	`111`	`{`
`112`	`112`
`113`		`- GetCurrentSelectedTabInstance<ProHome>().locationsList.SelectedIndex = 2;`
	`113`	`+ App.selectedTabInstance.locationsList.SelectedIndex = 2;`
`114`	`114`	`//instanceViewModel.TextState.isVisible = Visibility.Collapsed;`
`115`		`- GetCurrentSelectedTabInstance<ProHome>().accessibleContentFrame.Navigate(typeof(GenericFileBrowser), DownloadsPath);`
`116`		`- GetCurrentSelectedTabInstance<ProHome>().LayoutItems.isEnabled = true;`
	`115`	`+ App.selectedTabInstance.accessibleContentFrame.Navigate(typeof(GenericFileBrowser), DownloadsPath);`
	`116`	`+ App.selectedTabInstance.LayoutItems.isEnabled = true;`
`117`	`117`	`}`
`118`	`118`	`else if (BelowCardText == "Documents")`
`119`	`119`	`{`
`120`	`120`
`121`		`- GetCurrentSelectedTabInstance<ProHome>().locationsList.SelectedIndex = 3;`
`122`		`- GetCurrentSelectedTabInstance<ProHome>().accessibleContentFrame.Navigate(typeof(GenericFileBrowser), DocumentsPath);`
`123`		`- GetCurrentSelectedTabInstance<ProHome>().LayoutItems.isEnabled = true;`
	`121`	`+ App.selectedTabInstance.locationsList.SelectedIndex = 3;`
	`122`	`+ App.selectedTabInstance.accessibleContentFrame.Navigate(typeof(GenericFileBrowser), DocumentsPath);`
	`123`	`+ App.selectedTabInstance.LayoutItems.isEnabled = true;`
`124`	`124`	`}`
`125`	`125`	`else if (BelowCardText == "Pictures")`
`126`	`126`	`{`
`127`	`127`
`128`		`- GetCurrentSelectedTabInstance<ProHome>().locationsList.SelectedIndex = 4;`
`129`		`- GetCurrentSelectedTabInstance<ProHome>().accessibleContentFrame.Navigate(typeof(PhotoAlbum), PicturesPath);`
`130`		`- GetCurrentSelectedTabInstance<ProHome>().LayoutItems.isEnabled = true;`
	`128`	`+ App.selectedTabInstance.locationsList.SelectedIndex = 4;`
	`129`	`+ App.selectedTabInstance.accessibleContentFrame.Navigate(typeof(PhotoAlbum), PicturesPath);`
	`130`	`+ App.selectedTabInstance.LayoutItems.isEnabled = true;`
`131`	`131`
`132`	`132`	`}`
`133`	`133`	`else if (BelowCardText == "Music")`
`134`	`134`	`{`
`135`	`135`
`136`		`- GetCurrentSelectedTabInstance<ProHome>().locationsList.SelectedIndex = 5;`
`137`		`- GetCurrentSelectedTabInstance<ProHome>().accessibleContentFrame.Navigate(typeof(GenericFileBrowser), MusicPath);`
`138`		`- GetCurrentSelectedTabInstance<ProHome>().LayoutItems.isEnabled = true;`
	`136`	`+ App.selectedTabInstance.locationsList.SelectedIndex = 5;`
	`137`	`+ App.selectedTabInstance.accessibleContentFrame.Navigate(typeof(GenericFileBrowser), MusicPath);`
	`138`	`+ App.selectedTabInstance.LayoutItems.isEnabled = true;`
`139`	`139`	`}`
`140`	`140`	`else if (BelowCardText == "Videos")`
`141`	`141`	`{`
`142`	`142`
`143`		`- GetCurrentSelectedTabInstance<ProHome>().locationsList.SelectedIndex = 6;`
`144`		`- GetCurrentSelectedTabInstance<ProHome>().accessibleContentFrame.Navigate(typeof(GenericFileBrowser), VideosPath);`
`145`		`- GetCurrentSelectedTabInstance<ProHome>().LayoutItems.isEnabled = true;`
	`143`	`+ App.selectedTabInstance.locationsList.SelectedIndex = 6;`
	`144`	`+ App.selectedTabInstance.accessibleContentFrame.Navigate(typeof(GenericFileBrowser), VideosPath);`
	`145`	`+ App.selectedTabInstance.LayoutItems.isEnabled = true;`
`146`	`146`	`}`
`147`	`147`	`}`
`148`	`148`
`@@ -162,37 +162,37 @@ private void Button_Tapped(object sender, Windows.UI.Xaml.Input.TappedRoutedEven`
`162`	`162`	`if (clickedButton.Tag.ToString() == "\xE896") // Downloads`
`163`	`163`	`{`
`164`	`164`
`165`		`- GetCurrentSelectedTabInstance<ProHome>().locationsList.SelectedIndex = 2;`
`166`		`- GetCurrentSelectedTabInstance<ProHome>().accessibleContentFrame.Navigate(typeof(GenericFileBrowser), DownloadsPath);`
`167`		`- GetCurrentSelectedTabInstance<ProHome>().LayoutItems.isEnabled = true;`
	`165`	`+ App.selectedTabInstance.locationsList.SelectedIndex = 2;`
	`166`	`+ App.selectedTabInstance.accessibleContentFrame.Navigate(typeof(GenericFileBrowser), DownloadsPath);`
	`167`	`+ App.selectedTabInstance.LayoutItems.isEnabled = true;`
`168`	`168`	`}`
`169`	`169`	`else if (clickedButton.Tag.ToString() == "\xE8A5") // Documents`
`170`	`170`	`{`
`171`	`171`
`172`		`- GetCurrentSelectedTabInstance<ProHome>().locationsList.SelectedIndex = 3;`
`173`		`- GetCurrentSelectedTabInstance<ProHome>().accessibleContentFrame.Navigate(typeof(GenericFileBrowser), DocumentsPath);`
`174`		`- GetCurrentSelectedTabInstance<ProHome>().LayoutItems.isEnabled = true;`
	`172`	`+ App.selectedTabInstance.locationsList.SelectedIndex = 3;`
	`173`	`+ App.selectedTabInstance.accessibleContentFrame.Navigate(typeof(GenericFileBrowser), DocumentsPath);`
	`174`	`+ App.selectedTabInstance.LayoutItems.isEnabled = true;`
`175`	`175`	`}`
`176`	`176`	`else if (clickedButton.Tag.ToString() == "\xEB9F") // Pictures`
`177`	`177`	`{`
`178`	`178`
`179`		`- GetCurrentSelectedTabInstance<ProHome>().locationsList.SelectedIndex = 4;`
`180`		`- GetCurrentSelectedTabInstance<ProHome>().accessibleContentFrame.Navigate(typeof(PhotoAlbum), PicturesPath);`
`181`		`- GetCurrentSelectedTabInstance<ProHome>().LayoutItems.isEnabled = true;`
	`179`	`+ App.selectedTabInstance.locationsList.SelectedIndex = 4;`
	`180`	`+ App.selectedTabInstance.accessibleContentFrame.Navigate(typeof(PhotoAlbum), PicturesPath);`
	`181`	`+ App.selectedTabInstance.LayoutItems.isEnabled = true;`
`182`	`182`	`}`
`183`	`183`	`else if (clickedButton.Tag.ToString() == "\xEC4F") // Music`
`184`	`184`	`{`
`185`	`185`
`186`		`- GetCurrentSelectedTabInstance<ProHome>().locationsList.SelectedIndex = 5;`
`187`		`- GetCurrentSelectedTabInstance<ProHome>().accessibleContentFrame.Navigate(typeof(GenericFileBrowser), MusicPath);`
`188`		`- GetCurrentSelectedTabInstance<ProHome>().LayoutItems.isEnabled = true;`
	`186`	`+ App.selectedTabInstance.locationsList.SelectedIndex = 5;`
	`187`	`+ App.selectedTabInstance.accessibleContentFrame.Navigate(typeof(GenericFileBrowser), MusicPath);`
	`188`	`+ App.selectedTabInstance.LayoutItems.isEnabled = true;`
`189`	`189`	`}`
`190`	`190`	`else if (clickedButton.Tag.ToString() == "\xE8B2") // Videos`
`191`	`191`	`{`
`192`	`192`
`193`		`- GetCurrentSelectedTabInstance<ProHome>().locationsList.SelectedIndex = 6;`
`194`		`- GetCurrentSelectedTabInstance<ProHome>().accessibleContentFrame.Navigate(typeof(GenericFileBrowser), VideosPath);`
`195`		`- GetCurrentSelectedTabInstance<ProHome>().LayoutItems.isEnabled = true;`
	`193`	`+ App.selectedTabInstance.locationsList.SelectedIndex = 6;`
	`194`	`+ App.selectedTabInstance.accessibleContentFrame.Navigate(typeof(GenericFileBrowser), VideosPath);`
	`195`	`+ App.selectedTabInstance.LayoutItems.isEnabled = true;`
`196`	`196`	`}`
`197`	`197`	`}`
`198`	`198`	`public static StorageFile RecentsFile;`
`@@ -286,24 +286,24 @@ private async void RecentsView_ItemClick(object sender, ItemClickEventArgs e)`
`286`	`286`	`}`
`287`	`287`	`catch (UnauthorizedAccessException)`
`288`	`288`	`{`
`289`		`- await GetCurrentSelectedTabInstance<ProHome>().consentDialog.ShowAsync();`
	`289`	`+ await App.selectedTabInstance.consentDialog.ShowAsync();`
`290`	`290`	`}`
`291`	`291`	`catch (System.ArgumentException)`
`292`	`292`	`{`
`293`	`293`	`if (new DirectoryInfo(path).Root.ToString().Contains(@"C:\"))`
`294`	`294`	`{`
`295`		`- GetCurrentSelectedTabInstance<ProHome>().drivesList.SelectedIndex = 0;`
`296`		`- GetCurrentSelectedTabInstance<ProHome>().accessibleContentFrame.Navigate(typeof(GenericFileBrowser), path);`
	`295`	`+ App.selectedTabInstance.drivesList.SelectedIndex = 0;`
	`296`	`+ App.selectedTabInstance.accessibleContentFrame.Navigate(typeof(GenericFileBrowser), path);`
`297`	`297`	`}`
`298`	`298`	`else`
`299`	`299`	`{`
`300`		`- foreach(ListViewItem drive in GetCurrentSelectedTabInstance<ProHome>().drivesList.Items)`
	`300`	`+ foreach(ListViewItem drive in App.selectedTabInstance.drivesList.Items)`
`301`	`301`	`{`
`302`	`302`	`if (drive.Tag.ToString() == new DirectoryInfo(path).Root.ToString())`
`303`	`303`	`{`
`304`		`- GetCurrentSelectedTabInstance<ProHome>().drivesList.SelectedItem = null;`
	`304`	`+ App.selectedTabInstance.drivesList.SelectedItem = null;`
`305`	`305`	`drive.IsSelected = true;`
`306`		`- GetCurrentSelectedTabInstance<ProHome>().accessibleContentFrame.Navigate(typeof(GenericFileBrowser), path);`
	`306`	`+ App.selectedTabInstance.accessibleContentFrame.Navigate(typeof(GenericFileBrowser), path);`
`307`	`307`	`return;`
`308`	`308`	`}`
`309`	`309`	`}`