Make Empty Folder Text Dis/Appear More Consistently

Author: lukeb

Files UWP/Filesystem/ItemViewModel.cs

@@ -65,11 +65,16 @@ public ItemViewModel()
         public void AddFileOrFolder(ListedItem item)
         {
             _filesAndFolders.Add(item);
+            App.ViewModel.TextState.isVisible = Visibility.Collapsed;
         }
 
         public void RemoveFileOrFolder(ListedItem item)
         {
             _filesAndFolders.Remove(item);
+            if (_filesAndFolders.Count == 0)
+            {
+                App.ViewModel.TextState.isVisible = Visibility.Visible;
+            }
         }
 
         public void CancelLoadAndClearFiles()
@@ -314,6 +319,7 @@ private async Task AddFolder(StorageFolder folder, string pageName, Cancellation
                     FilePath = folder.Path
                 });
             }
+            App.ViewModel.TextState.isVisible = Visibility.Collapsed;
         }
 
         private async Task AddFile(StorageFile file, string pageName, CancellationToken token)
@@ -418,6 +424,7 @@ private async Task AddFile(StorageFile file, string pageName, CancellationToken
                     FilePath = itemPath
                 });
             }
+            App.ViewModel.TextState.isVisible = Visibility.Collapsed;
         }
 
         private async void FileContentsChanged(IStorageQueryResultBase sender, object args)
@@ -482,7 +489,6 @@ await CoreApplication.MainView.CoreWindow.Dispatcher.RunAsync(CoreDispatcherPrio
                     RemoveFileOrFolder(toRemove);
                 });
             }
-
             _filesRefreshing = false;
             Debug.WriteLine("Filesystem refresh complete");
         }

Files UWP/GenericFileBrowser.xaml.cs

@@ -1,28 +1,15 @@
 using Microsoft.Toolkit.Uwp.UI.Controls;
 using System;
 using System.ComponentModel;
-using System.Diagnostics;
-using System.Linq;
-using Windows.ApplicationModel.Core;
 using Windows.ApplicationModel.DataTransfer;
 using Windows.Storage;
-using Windows.UI;
-using Windows.UI.Core;
-using Windows.UI.ViewManagement;
 using Windows.UI.Xaml;
 using Windows.UI.Xaml.Controls;
-using Windows.UI.Xaml.Media.Animation;
 using Windows.UI.Xaml.Navigation;
 using Files.Filesystem;
 using Files.Navigation;
 using Files.Interacts;
-using Windows.System;
-using Windows.UI.Xaml.Input;
-using Windows.UI.Popups;
-using System.IO;
-using Windows.UI.Xaml.Controls.Primitives;
-using Windows.ApplicationModel.DataTransfer.DragDrop.Core;
-using System.Collections.Generic;
+using System.Diagnostics;
 
 namespace Files
 {
@@ -148,9 +135,14 @@ protected override void OnNavigatedTo(NavigationEventArgs eventArgs)
                 App.PathText.Text = parameters;
             }
 
-            if (Interaction.dataGridRows != null)
+            // Reset DataGrid Rows that may be in "cut" command mode
+            Interaction.FindChildren<DataGridRow>(Interaction.dataGridRows, GenericFileBrowser.GFBPageName.Content);
+            foreach (DataGridRow dataGridRow in Interaction.dataGridRows)
             {
-
+                if (data.Columns[0].GetCellContent(dataGridRow).Opacity < 1)
+                {
+                    data.Columns[0].GetCellContent(dataGridRow).Opacity = 1;
+                }
             }
         }
 
@@ -227,6 +219,8 @@ private void ContentDialog_Loaded(object sender, RoutedEventArgs e)
         private void GenericItemView_PointerReleased(object sender, Windows.UI.Xaml.Input.PointerRoutedEventArgs e)
         {
             data.SelectedItem = null;
+            App.HomeItems.isEnabled = false;
+            App.ShareItems.isEnabled = false;
         }
 
         private void AllView_SelectionChanged(object sender, SelectionChangedEventArgs e)

Files UWP/Interacts/Interaction.cs

@@ -686,10 +686,10 @@ public async static void CutItem_Click(object sender, RoutedEventArgs e)
                             if(dataGridRow.GetIndex() == StorItem.RowIndex)
                             {
                                 Debug.WriteLine(dataGridRow.GetIndex());
-                                dataGrid.Columns[0].GetCellContent(dataGridRow).Opacity = 0.4;
+                                GenericFileBrowser.data.Columns[0].GetCellContent(dataGridRow).Opacity = 0.4;
                             }
                         }
-                        var RowPressed = FindParent<DataGridRow>(dataGrid as DependencyObject);
+                        var RowPressed = FindParent<DataGridRow>(GenericFileBrowser.data as DependencyObject);
                         pathsToDeleteAfterPaste.Add(StorItem.FilePath);
                         if (StorItem.FileType != "Folder")
                         {

Files UWP/PhotoAlbum.xaml.cs

@@ -139,12 +139,13 @@ private void FileList_Tapped(object sender, Windows.UI.Xaml.Input.TappedRoutedEv
         private void PhotoAlbumViewer_PointerReleased(object sender, Windows.UI.Xaml.Input.PointerRoutedEventArgs e)
         {
             FileList.SelectedItem = null;
+            App.HomeItems.isEnabled = false;
+            App.ShareItems.isEnabled = false;
         }
 
         private void PhotoAlbumViewer_RightTapped(object sender, Windows.UI.Xaml.Input.RightTappedRoutedEventArgs e)
         {
             gridContext.ShowAt(sender as Grid, e.GetPosition(sender as Grid));
-            Debug.WriteLine("---context displayed---");
         }
 
         private void NameDialog_PrimaryButtonClick(ContentDialog sender, ContentDialogButtonClickEventArgs args)

Files UWP/ProHome.xaml.cs

@@ -1,29 +1,22 @@
 using Files.Interacts;
-using Microsoft.Toolkit.Uwp.UI.Controls;
 using Microsoft.UI.Xaml.Controls;
 using System;
-using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Diagnostics;
 using System.IO;
 using System.Linq;
-using System.Runtime.InteropServices.WindowsRuntime;
 using Windows.ApplicationModel.Core;
 using Windows.Foundation;
-using Windows.Foundation.Collections;
 using Windows.Storage;
 using Windows.System;
 using Windows.UI;
 using Windows.UI.Popups;
 using Windows.UI.ViewManagement;
 using Windows.UI.Xaml;
 using Windows.UI.Xaml.Controls;
-using Windows.UI.Xaml.Controls.Primitives;
-using Windows.UI.Xaml.Data;
 using Windows.UI.Xaml.Input;
 using Windows.UI.Xaml.Media;
 using Windows.UI.Xaml.Media.Animation;
-using Windows.UI.Xaml.Navigation;
 
 namespace Files
 {