files-community · yaira2 · Apr 7, 2021 · Apr 6, 2021 · Apr 6, 2021 · Apr 6, 2021
diff --git a/Files/BaseLayout.cs b/Files/BaseLayout.cs
@@ -1,40 +1,26 @@
-using Files.Common;
-using Files.DataModels;
-using Files.Dialogs;
-using Files.EventArguments;
+using Files.EventArguments;
 using Files.Extensions;
 using Files.Filesystem;
 using Files.Helpers;
 using Files.Helpers.ContextFlyouts;
 using Files.Interacts;
-using Files.UserControls;
 using Files.ViewModels;
 using Files.Views;
-using Microsoft.Toolkit.Mvvm.Input;
 using Microsoft.Toolkit.Uwp;
 using Microsoft.Toolkit.Uwp.UI;
-using Newtonsoft.Json;
 using System;
 using System.Collections;
 using System.Collections.Generic;
 using System.ComponentModel;
 using System.Diagnostics;
-using System.IO;
 using System.Linq;
 using System.Runtime.CompilerServices;
-using System.Threading.Tasks;
-using Windows.ApplicationModel.AppService;
 using Windows.ApplicationModel.DataTransfer;
-using Windows.Foundation;
-using Windows.Foundation.Collections;
 using Windows.Storage;
 using Windows.System;
 using Windows.UI.Core;
 using Windows.UI.Xaml;
 using Windows.UI.Xaml.Controls;
-using Windows.UI.Xaml.Controls.Primitives;
-using Windows.UI.Xaml.Input;
-using Windows.UI.Xaml.Media.Imaging;
 using Windows.UI.Xaml.Navigation;
 using static Files.Helpers.PathNormalization;
 
@@ -130,8 +116,8 @@ public string JumpString
 
                     if (jumpedToItem != null)
                     {
-                        SetSelectedItemOnUi(jumpedToItem);
-                        ScrollIntoView(jumpedToItem);
+                        ItemManipulationModel.SetSelectedItem(jumpedToItem);
+                        ItemManipulationModel.ScrollIntoView(jumpedToItem);
                     }
 
                     // Restart the timer
@@ -196,7 +182,7 @@ internal set
                         }
                     }
                     NotifyPropertyChanged(nameof(SelectedItems));
-                    SetDragModeForItems();
+                    ItemManipulationModel.SetDragModeForItems();
                 }
             }
         }
@@ -207,6 +193,10 @@ internal set
 
         public BaseLayout()
         {
+            ItemManipulationModel = new ItemManipulationModel();
+
+            HookEvents();
+
             jumpTimer = new DispatcherTimer();
             jumpTimer.Interval = TimeSpan.FromSeconds(0.8);
             jumpTimer.Tick += JumpTimer_Tick;
@@ -226,6 +216,12 @@ public BaseLayout()
             dragOverTimer = DispatcherQueue.GetForCurrentThread().CreateTimer();
         }
 
+        protected abstract void HookEvents();
+
+        protected abstract void UnhookEvents();
+
+        public ItemManipulationModel ItemManipulationModel { get; private set; }
+
         private void JumpTimer_Tick(object sender, object e)
         {
             jumpString = string.Empty;
@@ -234,54 +230,8 @@ private void JumpTimer_Tick(object sender, object e)
 
         protected abstract void InitializeCommandsViewModel();
 
-        public abstract void FocusFileList();
-
-        public abstract void SelectAllItems();
-
-        public virtual void InvertSelection()
-        {
-            List<ListedItem> newSelectedItems = GetAllItems()
-                .Cast<ListedItem>()
-                .Except(SelectedItems)
-                .ToList();
-
-            SetSelectedItemsOnUi(newSelectedItems);
-        }
-
-        public abstract void ClearSelection();
-
-        public abstract void SetDragModeForItems();
-
-        public abstract void ScrollIntoView(ListedItem item);
-
-        protected abstract void AddSelectedItem(ListedItem item);
-
         protected abstract IEnumerable GetAllItems();
 
-        public virtual void SetSelectedItemOnUi(ListedItem selectedItem)
-        {
-            ClearSelection();
-            AddSelectedItem(selectedItem);
-        }
-
-        public virtual void SetSelectedItemsOnUi(List<ListedItem> selectedItems)
-        {
-            ClearSelection();
-            AddSelectedItemsOnUi(selectedItems);
-        }
-
-        public virtual void AddSelectedItemsOnUi(List<ListedItem> selectedItems)
-        {
-            foreach (ListedItem selectedItem in selectedItems)
-            {
-                AddSelectedItem(selectedItem);
-            }
-        }
-
-        public abstract void FocusSelectedItems();
-
-        public abstract void StartRenameItem();
-
         public virtual void ResetItemOpacity()
         {
             IEnumerable items = GetAllItems();
@@ -294,7 +244,7 @@ public virtual void ResetItemOpacity()
             {
                 if (listedItem.IsHiddenItem)
                 {
-                    listedItem.Opacity = 0.4;
+                    listedItem.Opacity = Constants.UI.DimItemOpacity;
                 }
                 else
                 {
@@ -303,11 +253,6 @@ public virtual void ResetItemOpacity()
             }
         }
 
-        public virtual void SetItemOpacity(ListedItem item)
-        {
-            item.Opacity = 0.4;
-        }
-
         protected abstract ListedItem GetItemFromElement(object element);
 
         private void FolderSettings_LayoutModeChangeRequested(object sender, LayoutModeEventArgs e)
@@ -407,7 +352,7 @@ protected override async void OnNavigatedTo(NavigationEventArgs eventArgs)
 
             FolderSettings.IsLayoutModeChanging = false;
 
-            FocusFileList(); // Set focus on layout specific file list control
+            ItemManipulationModel.FocusFileList(); // Set focus on layout specific file list control
 
             try
             {
@@ -419,7 +364,7 @@ protected override async void OnNavigatedTo(NavigationEventArgs eventArgs)
                         liItemsToSelect.Add(ParentShellPageInstance.FilesystemViewModel.FilesAndFolders.Where((li) => li.ItemName == item).First());
                     }
 
-                    SetSelectedItemsOnUi(liItemsToSelect);
+                    ItemManipulationModel.SetSelectedItems(liItemsToSelect);
                 }
             }
             catch (Exception e)
@@ -549,7 +494,7 @@ protected async void Item_DragOver(object sender, DragEventArgs e)
                 item = gvi.Content as ListedItem;
             }
 
-            SetSelectedItemOnUi(item);
+            ItemManipulationModel.SetSelectedItem(item);
 
             if (dragOverItem != item)
             {
@@ -661,10 +606,5 @@ protected void UninitializeDrag(UIElement element)
         public readonly VirtualKey MinusKey = (VirtualKey)189;
 
         public abstract void Dispose();
-
-        public void RefreshItems()
-        {
-            ParentShellPageInstance.Refresh_Click();
-        }
     }
 }
diff --git a/Files/Constants.cs b/Files/Constants.cs
@@ -2,6 +2,11 @@
 {
     public static class Constants
     {
+        public static class UI
+        {
+            public const float DimItemOpacity = 0.4f;
+        }
+
         public static class Browser
         {
             public static class GridViewBrowser

diff --git a/Files/Files.csproj b/Files/Files.csproj
@@ -228,6 +228,7 @@
     <Compile Include="Helpers\WallpaperHelpers.cs" />
     <Compile Include="Helpers\WidgetsHelpers.cs" />
     <Compile Include="Helpers\Win32Helpers.cs" />
+    <Compile Include="Interacts\ItemManipulationModel.cs" />
     <Compile Include="UserControls\RestartControl.xaml.cs">
       <DependentUpon>RestartControl.xaml</DependentUpon>
     </Compile>

diff --git a/Files/Filesystem/FilesystemOperations/FilesystemOperations.cs b/Files/Filesystem/FilesystemOperations/FilesystemOperations.cs
@@ -3,6 +3,7 @@
 using Files.Extensions;
 using Files.Filesystem.FilesystemHistory;
 using Files.Helpers;
+using Files.Interacts;
 using Microsoft.Toolkit.Uwp;
 using Microsoft.Toolkit.Uwp.Helpers;
 using System;
@@ -32,6 +33,8 @@ public class FilesystemOperations : IFilesystemOperations
 
         private IShellPage associatedInstance;
 
+        private ItemManipulationModel itemManipulationModel => associatedInstance.SlimContentPage?.ItemManipulationModel;
+
         private RecycleBinHelpers recycleBinHelpers;
 
         #endregion Private Members
@@ -249,8 +252,8 @@ await Windows.ApplicationModel.Core.CoreApplication.MainView.DispatcherQueue.Enq
 
                     if (copiedListedItems.Count > 0)
                     {
-                        associatedInstance.SlimContentPage.AddSelectedItemsOnUi(copiedListedItems);
-                        associatedInstance.SlimContentPage.FocusSelectedItems();
+                        itemManipulationModel.AddSelectedItems(copiedListedItems);
+                        itemManipulationModel.FocusSelectedItems();
                     }
                 }, Windows.System.DispatcherQueuePriority.Low);
             }
@@ -432,8 +435,8 @@ await Windows.ApplicationModel.Core.CoreApplication.MainView.DispatcherQueue.Enq
 
                     if (movedListedItems.Count > 0)
                     {
-                        associatedInstance.SlimContentPage.AddSelectedItemsOnUi(movedListedItems);
-                        associatedInstance.SlimContentPage.FocusSelectedItems();
+                        itemManipulationModel.AddSelectedItems(movedListedItems);
+                        itemManipulationModel.FocusSelectedItems();
                     }
                 }, Windows.System.DispatcherQueuePriority.Low);
             }

diff --git a/Files/Filesystem/FilesystemOperations/Helpers/FilesystemHelpers.cs b/Files/Filesystem/FilesystemOperations/Helpers/FilesystemHelpers.cs
@@ -4,6 +4,7 @@
 using Files.Extensions;
 using Files.Filesystem.FilesystemHistory;
 using Files.Helpers;
+using Files.Interacts;
 using Files.UserControls;
 using Files.ViewModels.Dialogs;
 using Microsoft.Toolkit.Uwp;
@@ -32,6 +33,8 @@ public class FilesystemHelpers : IFilesystemHelpers
 
         private IFilesystemOperations filesystemOperations;
 
+        private ItemManipulationModel itemManipulationModel => associatedInstance.SlimContentPage?.ItemManipulationModel;
+
         private RecycleBinHelpers recycleBinHelpers;
 
         private readonly CancellationToken cancellationToken;
@@ -59,8 +62,8 @@ public FilesystemHelpers(IShellPage associatedInstance, CancellationToken cancel
         {
             this.associatedInstance = associatedInstance;
             this.cancellationToken = cancellationToken;
-            filesystemOperations = new FilesystemOperations(this.associatedInstance);
-            recycleBinHelpers = new RecycleBinHelpers(this.associatedInstance);
+            this.filesystemOperations = new FilesystemOperations(this.associatedInstance);
+            this.recycleBinHelpers = new RecycleBinHelpers(this.associatedInstance);
         }
 
         #endregion Constructor
@@ -448,7 +451,7 @@ public async Task<ReturnResult> CopyItemsAsync(IEnumerable<IStorageItemWithPath>
             IStorageHistory history;
             List<IStorageHistory> rawStorageHistory = new List<IStorageHistory>();
 
-            associatedInstance.SlimContentPage.ClearSelection();
+            itemManipulationModel.ClearSelection();
             float progress;
             for (int i = 0; i < source.Count(); i++)
             {
@@ -519,7 +522,7 @@ public async Task<ReturnResult> CopyItemAsync(IStorageItemWithPath source, strin
             var sw = new Stopwatch();
             sw.Start();
 
-            associatedInstance.SlimContentPage.ClearSelection();
+            itemManipulationModel.ClearSelection();
 
             IStorageHistory history = null;
             if (collisions.First() != FileNameConflictResolveOptionType.Skip)
@@ -650,7 +653,7 @@ public async Task<ReturnResult> MoveItemsAsync(IEnumerable<IStorageItemWithPath>
             IStorageHistory history;
             var rawStorageHistory = new List<IStorageHistory>();
 
-            associatedInstance.SlimContentPage.ClearSelection();
+            itemManipulationModel.ClearSelection();
             float progress;
             for (int i = 0; i < source.Count(); i++)
             {
@@ -727,7 +730,7 @@ public async Task<ReturnResult> MoveItemAsync(IStorageItemWithPath source, strin
             var sw = new Stopwatch();
             sw.Start();
 
-            associatedInstance.SlimContentPage.ClearSelection();
+            itemManipulationModel.ClearSelection();
 
             IStorageHistory history = null;
 

diff --git a/Files/Filesystem/Search/FolderSearch.cs b/Files/Filesystem/Search/FolderSearch.cs
@@ -92,7 +92,7 @@ await Task.Run(() =>
                                         ItemPropertiesInitialized = false, // Load thumbnail
                                         FileExtension = itemFileExtension,
                                         ItemType = itemType,
-                                        Opacity = isHidden ? 0.4 : 1
+                                        Opacity = isHidden ? Constants.UI.DimItemOpacity : 1
                                     });
                                 }
                                 else if (((FileAttributes)findData.dwFileAttributes & FileAttributes.Directory) == FileAttributes.Directory)
@@ -109,7 +109,7 @@ await Task.Run(() =>
                                             LoadUnknownTypeGlyph = false,
                                             LoadFolderGlyph = true,
                                             ItemPropertiesInitialized = true,
-                                            Opacity = isHidden ? 0.4 : 1
+                                            Opacity = isHidden ? Constants.UI.DimItemOpacity : 1
                                         });
                                     }
                                 }

diff --git a/Files/Filesystem/StorageEnumerators/Win32StorageEnumerator.cs b/Files/Filesystem/StorageEnumerators/Win32StorageEnumerator.cs
@@ -143,7 +143,7 @@ CancellationToken cancellationToken
 
             if (isHidden)
             {
-                opacity = 0.4;
+                opacity = Constants.UI.DimItemOpacity;
             }
 
             return new ListedItem(null, dateReturnFormat)
@@ -272,7 +272,7 @@ CancellationToken cancellationToken
 
                         if (isHidden)
                         {
-                            opacity = 0.4;
+                            opacity = Constants.UI.DimItemOpacity;
                         }
 
                         return new ShortcutItem(null, dateReturnFormat)
@@ -319,7 +319,7 @@ CancellationToken cancellationToken
 
                 if (isHidden)
                 {
-                    opacity = 0.4;
+                    opacity = Constants.UI.DimItemOpacity;
                 }
 
                 return new ListedItem(null, dateReturnFormat)

diff --git a/Files/Filesystem/StorageHistory/StorageHistoryOperations.cs b/Files/Filesystem/StorageHistory/StorageHistoryOperations.cs
@@ -1,5 +1,6 @@
 using Files.Enums;
 using Files.Helpers;
+using Files.Interacts;
 using System;
 using System.Collections.Generic;
 using System.Diagnostics;
@@ -32,7 +33,7 @@ public StorageHistoryOperations(IShellPage associatedInstance, CancellationToken
             this.associatedInstance = associatedInstance;
             this.cancellationToken = cancellationToken;
             filesystemOperations = new FilesystemOperations(associatedInstance);
-            filesystemHelpers = new FilesystemHelpers(associatedInstance, cancellationToken);
+            filesystemHelpers = this.associatedInstance.FilesystemHelpers;
         }
 
         #endregion Constructor