Merge pull request #59 from duke7553/less-static-everywhere

Greatly Improve Code Architecture

Author: lukeblevins

Files UWP/AddItem.xaml.cs

@@ -34,7 +34,7 @@ private async void ListView_ItemClick(object sender, ItemClickEventArgs e)
         {
 
             GenericFileBrowser.AddItemBox.Hide();
-            var currentPath = ItemViewModel.PUIP.Path;
+            var currentPath = App.ViewModel.Universal.path;
             StorageFolder folderToCreateItem = await StorageFolder.GetFolderFromPathAsync(currentPath);
             if ((e.ClickedItem as AddListItem).Header == "Folder")
             {
@@ -43,7 +43,7 @@ private async void ListView_ItemClick(object sender, ItemClickEventArgs e)
                 if (userInput != null)
                 {
                     await folderToCreateItem.CreateFolderAsync(userInput, CreationCollisionOption.FailIfExists);
-                    ItemViewModel.FilesAndFolders.Add(new ListedItem(){ FileName = userInput, FileDate = "Now", EmptyImgVis = Visibility.Collapsed, FolderImg = Visibility.Visible, FileIconVis = Visibility.Collapsed, FileExtension = "Folder", FileImg = null, FilePath = (ItemViewModel.PUIP.Path + "\\" + userInput) });
+                    App.ViewModel.FilesAndFolders.Add(new ListedItem(){ FileName = userInput, FileDate = "Now", EmptyImgVis = Visibility.Collapsed, FolderImg = Visibility.Visible, FileIconVis = Visibility.Collapsed, FileExtension = "Folder", FileImg = null, FilePath = (App.ViewModel.Universal.path + "\\" + userInput) });
                 }
             }
             else if ((e.ClickedItem as AddListItem).Header == "Text Document")
@@ -53,7 +53,7 @@ private async void ListView_ItemClick(object sender, ItemClickEventArgs e)
                 if (userInput != null)
                 {
                     await folderToCreateItem.CreateFileAsync(userInput + ".txt", CreationCollisionOption.FailIfExists);
-                    ItemViewModel.FilesAndFolders.Add(new ListedItem() { FileName = userInput, FileDate = "Now", EmptyImgVis = Visibility.Visible, FolderImg = Visibility.Collapsed, FileIconVis = Visibility.Collapsed, FileExtension = "Text Document", FileImg = null, FilePath = (ItemViewModel.PUIP.Path + "\\" + userInput + ".txt"), DotFileExtension = ".txt" });
+                    App.ViewModel.FilesAndFolders.Add(new ListedItem() { FileName = userInput, FileDate = "Now", EmptyImgVis = Visibility.Visible, FolderImg = Visibility.Collapsed, FileIconVis = Visibility.Collapsed, FileExtension = "Text Document", FileImg = null, FilePath = (App.ViewModel.Universal.path + "\\" + userInput + ".txt"), DotFileExtension = ".txt" });
                 }
             }
             else if ((e.ClickedItem as AddListItem).Header == "Bitmap Image")
@@ -63,7 +63,7 @@ private async void ListView_ItemClick(object sender, ItemClickEventArgs e)
                 if (userInput != null)
                 {
                     await folderToCreateItem.CreateFileAsync(userInput + ".bmp", CreationCollisionOption.FailIfExists);
-                    ItemViewModel.FilesAndFolders.Add(new ListedItem() { FileName = userInput, FileDate = "Now", EmptyImgVis = Visibility.Visible, FolderImg = Visibility.Collapsed, FileIconVis = Visibility.Collapsed, FileExtension = "BMP File", FileImg = null, FilePath = (ItemViewModel.PUIP.Path + "\\" + userInput + ".bmp"), DotFileExtension = ".bmp" });
+                    App.ViewModel.FilesAndFolders.Add(new ListedItem() { FileName = userInput, FileDate = "Now", EmptyImgVis = Visibility.Visible, FolderImg = Visibility.Collapsed, FileIconVis = Visibility.Collapsed, FileExtension = "BMP File", FileImg = null, FilePath = (App.ViewModel.Universal.path + "\\" + userInput + ".bmp"), DotFileExtension = ".bmp" });
 
                 }
             }

Files UWP/App.xaml.cs

@@ -1,5 +1,7 @@
-using System;
+using Files.Navigation;
+using System;
 using System.Diagnostics;
+using System.Threading;
 using Windows.ApplicationModel;
 using Windows.ApplicationModel.Activation;
 using Windows.UI;
@@ -54,6 +56,8 @@ public App()
             this.RequestedTheme = SettingsPages.Personalization.TV.ThemeValue;
             Debug.WriteLine("!!Requested Theme!!" + RequestedTheme.ToString());
         }
+        public static Filesystem.ItemViewModel ViewModel = new Filesystem.ItemViewModel();
+        public static DisplayedPathText PathText { get; set; } = new DisplayedPathText();
 
         /// <summary>
         /// Invoked when the application is launched normally by the end user.  Other entry points

Files UWP/ClassicMode.xaml

@@ -2,6 +2,7 @@
     x:Class="Files.ClassicMode"
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:local="using:Files"
     xmlns:local1="using:Files.Filesystem"
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
@@ -53,7 +54,7 @@
         <SplitView DisplayMode="Inline" IsPaneOpen="True" HorizontalAlignment="Stretch" Margin="0,0,0,0" Grid.RowSpan="1" Grid.Row="1" VerticalAlignment="Stretch">
             <SplitView.Pane>
                 <Grid Background="{StaticResource SystemControlAcrylicWindowMediumHighBrush}">
-                    <UILib:TreeView ScrollViewer.HorizontalScrollMode="Enabled" Expanding="DirectoryView_Expanding" UILib:ItemsSource="{x:Bind local1:ItemViewModel.ClassicFolderList}" Name="DirectoryView">
+                    <UILib:TreeView ScrollViewer.HorizontalScrollMode="Enabled" Expanding="DirectoryView_Expanding" UILib:ItemsSource="{x:Bind local:App.ViewModel.ClassicFolderList}" Name="DirectoryView">
                         <UILib:TreeView.ItemTemplate>
                             <DataTemplate>
                                 <UILib:TreeViewItem ItemsSource="{Binding Children}" HasUnrealizedChildren="True">

Files UWP/ClassicMode.xaml.cs

@@ -22,7 +22,7 @@ public ClassicMode()
             titleBar.ButtonHoverBackgroundColor = Color.FromArgb(75, 10, 10, 10);
             titleBar.ButtonHoverBackgroundColor = Color.FromArgb(75, 10, 10, 10);
             ClassicView = ClassicModePage;
-            ItemViewModel viewModel = new ItemViewModel(@"C:\", ClassicView);
+            App.ViewModel.MemoryFriendlyGetItemsAsync(@"C:\", ClassicView);
         }
 
 

Files UWP/Filesystem/ItemViewModel.cs

@@ -22,143 +22,76 @@ namespace Files.Filesystem
 {
     public class ItemViewModel
     {
-        public static ObservableCollection<Classic_ListedFolderItem> classicFolderList = new ObservableCollection<Classic_ListedFolderItem>();
-        public static ObservableCollection<Classic_ListedFolderItem> ClassicFolderList { get { return classicFolderList; } }
-
-        public static ObservableCollection<ListedItem> classicFileList = new ObservableCollection<ListedItem>();
-        public static ObservableCollection<ListedItem> ClassicFileList { get { return classicFileList; } }
-
-        public static ObservableCollection<ListedItem> filesAndFolders = new ObservableCollection<ListedItem>();
-        public static ObservableCollection<ListedItem> FilesAndFolders { get { return filesAndFolders; } }
-
-        StorageFolder folder;
-        static string gotName;
-        static string gotDate;
-        static string gotType;
-        static string gotPath;
-        static string gotFolName;
-        static string gotFolDate;
-        static string gotFolPath;
-        static string gotDotFileExtension;
-        static string gotFolType;
-        static Visibility gotFileImgVis;
-        static Visibility gotEmptyImgVis;
-        static Visibility gotFolImg;
-        static StorageItemThumbnail gotFileImg;
-        public static ObservableCollection<Classic_ListedFolderItem> ChildrenList;
-        public static IReadOnlyList<StorageFolder> folderList;
-        public static IReadOnlyList<StorageFile> fileList;
-        public static bool isPhotoAlbumMode;
-        public static string pageName;
-
-        public static ItemViewModel vm;
-        public static ItemViewModel ViewModel { get { return vm; } set { } }
-
-        public static BackState bs = new BackState();
-        public static BackState BS
-        {
-            get
-            {
-                return bs;
-            }
-        }
-
-        public static ForwardState fs = new ForwardState();
-        public static ForwardState FS
+        public ObservableCollection<Classic_ListedFolderItem> ClassicFolderList { get; set; } = new ObservableCollection<Classic_ListedFolderItem>();
+        public ObservableCollection<ListedItem> ClassicFileList { get; set; } = new ObservableCollection<ListedItem>();
+        public ObservableCollection<ListedItem> FilesAndFolders { get; set; } = new ObservableCollection<ListedItem>();
+        public ObservableCollection<Classic_ListedFolderItem> ChildrenList;
+        public ListedItem LI { get; } = new ListedItem();
+        public UniversalPath Universal { get; } = new UniversalPath();
+        public EmptyFolderTextState TextState { get; set; } = new EmptyFolderTextState();
+        public BackState BS { get; set; } = new BackState();
+        public ForwardState FS { get; set; } = new ForwardState();
+        public ProgressUIVisibility PVIS { get; set; } = new ProgressUIVisibility();
+        private StorageFolder folder;
+        private string gotName;
+        private string gotDate;
+        private string gotType;
+        private string gotPath;
+        private string gotFolName;
+        private string gotFolDate;
+        private string gotFolPath;
+        private string gotDotFileExtension;
+        private string gotFolType;
+        private Visibility gotFileImgVis;
+        private Visibility gotEmptyImgVis;
+        private Visibility gotFolImg;
+        private StorageItemThumbnail gotFileImg;
+        private bool isPhotoAlbumMode;
+        public string pageName;
+        private StorageFileQueryResult fileQueryResult;
+        private StorageFolderQueryResult folderQueryResult;
+        public CancellationTokenSource tokenSource;
+
+
+        public ItemViewModel()
         {
-            get
-            {
-                return fs;
-            }
+            
         }
 
-        public static ProgressUIVisibility pvis = new ProgressUIVisibility();
-        public static ProgressUIVisibility PVIS
+        private async void DisplayConsentDialog()
         {
-            get
-            {
-                return pvis;
-            }
+            await MainPage.permissionBox.ShowAsync();
         }
-
-        private ListedItem li = new ListedItem();
-        public ListedItem LI { get { return this.li; } }
-
-        private static ProgressUIHeader pUIh = new ProgressUIHeader();
-        public static ProgressUIHeader PUIH { get { return ItemViewModel.pUIh; } }
-
-        private static ProgressUIPath pUIp = new ProgressUIPath();
-        public static ProgressUIPath PUIP { get { return ItemViewModel.pUIp; } }
-
-        private static EmptyFolderTextState textState = new EmptyFolderTextState();
-        public static EmptyFolderTextState TextState { get { return textState; } }
-
-        public static int NumOfItems;
-        public static int NumItemsRead;
-        public static int NumOfFiles;
-        public static int NumOfFolders;
-        StorageFileQueryResult fileQueryResult;
-        StorageFolderQueryResult folderQueryResult;
-        public static CancellationToken token;
-        public static CancellationTokenSource tokenSource;
-
-        public ItemViewModel(string viewPath, Page p)
+        public async void MemoryFriendlyGetItemsAsync(string path, Page passedPage)
         {
-
-            pageName = p.Name;
+            TextState.isVisible = Visibility.Collapsed;
+            tokenSource = new CancellationTokenSource();
+            CancellationToken token = App.ViewModel.tokenSource.Token;
+            pageName = passedPage.Name;
+            Universal.path = path;
             // Personalize retrieved items for view they are displayed in
-            if (p.Name == "GenericItemView" || p.Name == "ClassicModePage")
+            switch (pageName)
             {
-                isPhotoAlbumMode = false;
-            }
-            else if (p.Name == "PhotoAlbumViewer")
-            {
-                isPhotoAlbumMode = true;
+                case "GenericItemView":
+                    isPhotoAlbumMode = false;
+                    break;
+                case "PhotoAlbumViewer":
+                    isPhotoAlbumMode = true;
+                    break;
+                case "ClassicModePage":
+                    isPhotoAlbumMode = false;
+                    break;
             }
 
             if (pageName != "ClassicModePage")
             {
-                GenericFileBrowser.P.path = viewPath;
                 FilesAndFolders.Clear();
             }
 
-            tokenSource = new CancellationTokenSource();
-            token = tokenSource.Token;
-            MemoryFriendlyGetItemsAsync(viewPath, token);
-
-            if (pageName != "ClassicModePage")
-            {
-                History.AddToHistory(viewPath);
-
-                if (History.HistoryList.Count == 1)
-                {
-                    BS.isEnabled = false;
-                    //Debug.WriteLine("Disabled Property");
-
-
-                }
-                else if (History.HistoryList.Count > 1)
-                {
-                    BS.isEnabled = true;
-                    //Debug.WriteLine("Enabled Property");
-                }
-            }
-
-
-        }
-
-        private async void DisplayConsentDialog()
-        {
-            await MainPage.permissionBox.ShowAsync();
-        }
-        string sort = "By_Name";
-        SortEntry entry;
-        public async void MemoryFriendlyGetItemsAsync(string path, CancellationToken token)
-        {
             Stopwatch stopwatch = new Stopwatch();
             stopwatch.Start();
 
-            PUIP.Path = path;
+            Universal.path = path;      // Set visible path to reflect new navigation
             try
             {
 
@@ -170,16 +103,16 @@ public async void MemoryFriendlyGetItemsAsync(string path, CancellationToken tok
                     FolderDepth = FolderDepth.Shallow,
                     IndexerOption = IndexerOption.UseIndexerWhenAvailable
                 };
-
+                string sort = "By_Name";
                 if (sort == "By_Name")
                 {
-                    entry = new SortEntry()
+                    SortEntry entry = new SortEntry()
                     {
                         AscendingOrder = true,
                         PropertyName = "System.FileName"
                     };
+                    options.SortOrder.Add(entry);
                 }
-                options.SortOrder.Add(entry);
 
                 uint index = 0;
                 const uint step = 250;
@@ -309,7 +242,7 @@ public async void MemoryFriendlyGetItemsAsync(string path, CancellationToken tok
                                 }
                                 else
                                 {
-                                    FilesAndFolders.Add(new ListedItem() { EmptyImgVis = gotEmptyImgVis, FileImg = icon, FileIconVis = gotFileImgVis, FolderImg = gotFolImg, FileName = gotName, FileDate = gotDate, FileExtension = gotType, FilePath = gotPath });
+                                    FilesAndFolders.Add(new ListedItem() { DotFileExtension = gotDotFileExtension, EmptyImgVis = gotEmptyImgVis, FileImg = icon, FileIconVis = gotFileImgVis, FolderImg = gotFolImg, FileName = gotName, FileDate = gotDate, FileExtension = gotType, FilePath = gotPath });
                                 }
                             }
                             catch
@@ -360,27 +293,19 @@ public async void MemoryFriendlyGetItemsAsync(string path, CancellationToken tok
                 rootFrame.Navigate(typeof(MainPage), new SuppressNavigationTransitionInfo());
             }
 
-        }
-
-        public static ProgressPercentage progressPER = new ProgressPercentage();
+            History.AddToHistory(Universal.path);
 
-        public static ProgressPercentage PROGRESSPER
-        {
-            get
+            if (History.HistoryList.Count == 1)
             {
-                return progressPER;
+                BS.isEnabled = false;
             }
-            set
+            else if (History.HistoryList.Count > 1)
             {
-
+                BS.isEnabled = true;
             }
+            tokenSource = null;
         }
 
-        public static int UpdateProgUI(int level)
-        {
-            PROGRESSPER.prog = level;
-            return (int)level;
-        }
 
         public static async void FillTreeNode(object item, TreeView EntireControl)
         {