Improved ProHome code

Author: Yair Aichenbaum

Files/Interacts/Interaction.cs

@@ -426,6 +426,24 @@ private async void OpenSelectedItems(bool displayApplicationPicker)
             }
         }
 
+        public void CloseTab()
+        {
+            if (((Window.Current.Content as Frame).Content as InstanceTabsView).TabStrip.TabItems.Count == 1)
+            {
+                Application.Current.Exit();
+            }
+            else if (((Window.Current.Content as Frame).Content as InstanceTabsView).TabStrip.TabItems.Count > 1)
+            {
+                ((Window.Current.Content as Frame).Content as InstanceTabsView).TabStrip.TabItems.RemoveAt(((Window.Current.Content as Frame).Content as InstanceTabsView).TabStrip.SelectedIndex);
+            }
+        }
+
+        public async void LaunchNewWindow()
+        {
+            var filesUWPUri = new Uri("files-uwp:");
+            await Launcher.LaunchUriAsync(filesUWPUri);
+        }
+
         public void ShareItem_Click(object sender, RoutedEventArgs e)
         {
             DataTransferManager manager = DataTransferManager.GetForCurrentView();

Files/ProHome.xaml.cs

@@ -302,10 +302,10 @@ private async void ProHomeInstance_KeyUp(object sender, KeyRoutedEventArgs e)
                     App.CurrentInstance.InteractionOperations.SelectAllItems();
                     break;
                 case (true, false, false, true, VirtualKey.N):
-                    LaunchNewWindow();
+                    App.CurrentInstance.InteractionOperations.LaunchNewWindow();
                     break;
                 case (true, false, false, true, VirtualKey.W):
-                    CloseTab();
+                    App.CurrentInstance.InteractionOperations.CloseTab();
                     break;
                 case (false, false, false, true, VirtualKey.Delete):
                     App.CurrentInstance.InteractionOperations.DeleteItem_Click(null, null);
@@ -353,25 +353,6 @@ private async void ProHomeInstance_KeyUp(object sender, KeyRoutedEventArgs e)
                 }
             }
         }
-
-        private void CloseTab()
-        {
-            if (((Window.Current.Content as Frame).Content as InstanceTabsView).TabStrip.TabItems.Count == 1)
-            {
-                Application.Current.Exit();
-            }
-            else if (((Window.Current.Content as Frame).Content as InstanceTabsView).TabStrip.TabItems.Count > 1)
-            {
-                ((Window.Current.Content as Frame).Content as InstanceTabsView).TabStrip.TabItems.RemoveAt(((Window.Current.Content as Frame).Content as InstanceTabsView).TabStrip.SelectedIndex);
-            }
-        }
-
-        private async void LaunchNewWindow()
-        {
-            var filesUWPUri = new Uri("files-uwp:");
-            await Launcher.LaunchUriAsync(filesUWPUri);
-        }
-
     }
 
     public enum InteractionOperationType