Fix Empty folder text display

lukeblevins · lukeblevins · commit a1110585cdb7 · 2019-05-10T21:49:50.000-04:00
diff --git a/Files UWP/Filesystem/ItemViewModel.cs b/Files UWP/Filesystem/ItemViewModel.cs
@@ -7,6 +7,7 @@
 using System.Collections.ObjectModel;
 using System.Diagnostics;
 using System.Globalization;
+using System.IO;
 using System.Linq;
 using System.Runtime.InteropServices;
 using System.Threading;
@@ -367,17 +368,17 @@ public async void AddItemsToCollectionAsync(string path, Page currentPage)
                 }
                 else
                 {
-                    MessageDialog unsupportedDevice = new MessageDialog("This device may be unsupported. Please file an issue report in Settings - About containing what device we couldn't access. Technical information: " + e, "Unsupported Device");
+                    MessageDialog unsupportedDevice = new MessageDialog("This device may be unsupported. Please file an issue report containing what device we couldn't access. Technical information: " + e, "Unsupported Device");
                     await unsupportedDevice.ShowAsync();
                     return;
                 }
             }
             catch (COMException e)
             {
                 Frame rootFrame = Window.Current.Content as Frame;
-                MessageDialog driveGone = new MessageDialog(e.Message, "Drive Unplugged");
+                MessageDialog driveGone = new MessageDialog(e.Message, "Did you unplug this drive?");
                 await driveGone.ShowAsync();
-                rootFrame.Navigate(typeof(ProHome), null, new SuppressNavigationTransitionInfo());
+                rootFrame.Navigate(typeof(InstanceTabsView), null, new SuppressNavigationTransitionInfo());
                 return;
             }
 
diff --git a/Files UWP/GenericFileBrowser.xaml b/Files UWP/GenericFileBrowser.xaml
@@ -176,7 +176,7 @@
             </MenuFlyout>
         </Grid.ContextFlyout>
         <ProgressBar Name="progBar" Height="10" VerticalAlignment="Top" IsIndeterminate="True"/>
-        <TextBlock Name="EmptyText" HorizontalAlignment="Center" Text="This folder is empty." TextWrapping="Wrap" VerticalAlignment="Top" Margin="0,125,0,0"/>
+        <TextBlock Visibility="{x:Bind TextState.isVisible, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" Name="EmptyText" HorizontalAlignment="Center" Text="This folder is empty." TextWrapping="Wrap" VerticalAlignment="Top" Margin="0,125,0,0"/>
         <controls:DataGrid RowDetailsVisibilityMode="Collapsed" AllowDrop="True" Drop="AllView_DropAsync" DragLeave="AllView_DragLeave" DragStarting="AllView_DragStarting" SelectionChanged="AllView_SelectionChanged" Margin="24,24,0,0" Grid.Row="3" CellEditEnded="AllView_CellEditEnded" FocusVisualPrimaryThickness="0" SelectionMode="Extended" IsDoubleTapEnabled="True" x:FieldModifier="public" x:Name="AllView" AutoGenerateColumns="False" CanDrag="True" DragOver="AllView_DragOver" IsRightTapEnabled="True" CanUserReorderColumns="False" IsReadOnly="True" HorizontalAlignment="Left">
             <controls:DataGrid.ColumnHeaderStyle>
                 <Style TargetType="controlsprimitives:DataGridColumnHeader">
diff --git a/Files UWP/GenericFileBrowser.xaml.cs b/Files UWP/GenericFileBrowser.xaml.cs
@@ -33,15 +33,14 @@ public sealed partial class GenericFileBrowser : Page
         public ProgressBar progressBar;
         public ItemViewModel<GenericFileBrowser> instanceViewModel;
         public Interaction<GenericFileBrowser> instanceInteraction;
-
+        public EmptyFolderTextState TextState { get; set; } = new EmptyFolderTextState();
 
         public GenericFileBrowser()
         {
             this.InitializeComponent();
             GFBPageName = GenericItemView;
             emptyTextGFB = EmptyText;
             progressBar = progBar;
-            EmptyText.Visibility = Visibility.Collapsed;
             progressBar.Visibility = Visibility.Collapsed;
             data = AllView;
             context = RightClickContextMenu;
@@ -61,19 +60,6 @@ public GenericFileBrowser()
             CopyItem.Click += instanceInteraction.CopyItem_ClickAsync;
             AllView.RightTapped += instanceInteraction.AllView_RightTapped;
             AllView.DoubleTapped += instanceInteraction.List_ItemClick;
-            ItemViewModel<GenericFileBrowser>.GetCurrentSelectedTabInstance<ProHome>().TextState.PropertyChanged += TextState_PropertyChanged;
-        }
-
-        private void TextState_PropertyChanged(object sender, PropertyChangedEventArgs e)
-        {
-            if (ItemViewModel<GenericFileBrowser>.GetCurrentSelectedTabInstance<ProHome>().TextState.isVisible == Visibility.Visible)
-            {
-                emptyTextGFB.Visibility = Visibility.Visible;
-            }
-            else if (ItemViewModel<GenericFileBrowser>.GetCurrentSelectedTabInstance<ProHome>().TextState.isVisible == Visibility.Collapsed)
-            {
-                emptyTextGFB.Visibility = Visibility.Collapsed;
-            }
         }
 
         private void SelectAllAcceleratorDG_Invoked(Windows.UI.Xaml.Input.KeyboardAccelerator sender, Windows.UI.Xaml.Input.KeyboardAcceleratorInvokedEventArgs args)
@@ -122,6 +108,7 @@ protected override void OnNavigatedTo(NavigationEventArgs eventArgs)
             CurrentInstance.RefreshButton.Click += NavigationActions.Refresh_Click;
             CurrentInstance.AddItemButton.Click += AddItem_Click;
             instanceViewModel.AddItemsToCollectionAsync(instanceViewModel.Universal.path, this);
+            TextState_PropertyChanged(null, null);
             if (parameters.Equals(Environment.GetFolderPath(Environment.SpecialFolder.DesktopDirectory)))
             {
                 CurrentInstance.PathText.Text = "Desktop";
@@ -290,6 +277,10 @@ private void AllView_DragLeave(object sender, DragEventArgs e)
             
         }
 
+        internal void TextState_PropertyChanged(object sender, PropertyChangedEventArgs e)
+        {
+            TextState.isVisible = ItemViewModel<GenericFileBrowser>.GetCurrentSelectedTabInstance<ProHome>().TextState.isVisible;
+        }
     }
 
     public class EmptyFolderTextState : INotifyPropertyChanged
diff --git a/Files UWP/PhotoAlbum.xaml b/Files UWP/PhotoAlbum.xaml
@@ -396,7 +396,7 @@
             </MenuFlyout>
         </Grid.ContextFlyout>
         <ProgressBar Name="ProgBar" Height="10" VerticalAlignment="Top" IsIndeterminate="True"/>
-        <TextBlock Name="EmptyText" HorizontalAlignment="Center" Text="This folder is empty." TextWrapping="Wrap" VerticalAlignment="Top" Margin="0,125,0,0" Grid.Row="3" Canvas.ZIndex="0"/>
+        <TextBlock Visibility="{x:Bind TextState.isVisible, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" Name="EmptyText" HorizontalAlignment="Center" Text="This folder is empty." TextWrapping="Wrap" VerticalAlignment="Top" Margin="0,125,0,0" Grid.Row="3" Canvas.ZIndex="0"/>
 
         <controls:AdaptiveGridView animations:ReorderGridAnimation.Duration="300" ShowsScrollingPlaceholders="True" Margin="24,24,24,0" Grid.Row="3" SelectionMode="Extended" IsRightTapEnabled="True" IsDoubleTapEnabled="True" Name="FileList" Padding="0, 0, 0, 0" >
             <controls:AdaptiveGridView.ItemTemplate>
diff --git a/Files UWP/PhotoAlbum.xaml.cs b/Files UWP/PhotoAlbum.xaml.cs
@@ -14,6 +14,7 @@
 using Files.Navigation;
 using System.Diagnostics;
 using Windows.UI.Xaml.Media.Animation;
+using System.ComponentModel;
 
 namespace Files
 {
@@ -33,6 +34,7 @@ public sealed partial class PhotoAlbum : Page
         public ProgressBar progressBar;
         public ItemViewModel<PhotoAlbum> instanceViewModel;
         public Interaction<PhotoAlbum> instanceInteraction;
+        public EmptyFolderTextState TextState { get; set; } = new EmptyFolderTextState();
 
 
         public PhotoAlbum()
@@ -47,19 +49,6 @@ public PhotoAlbum()
             instanceViewModel = new ItemViewModel<PhotoAlbum>(this, null);
             instanceInteraction = new Interaction<PhotoAlbum>(this);
             gv.ItemsSource = instanceViewModel.FilesAndFolders;
-            ItemViewModel<PhotoAlbum>.GetCurrentSelectedTabInstance<ProHome>().TextState.PropertyChanged += TextState_PropertyChanged;
-        }
-
-        private void TextState_PropertyChanged(object sender, System.ComponentModel.PropertyChangedEventArgs e)
-        {
-            if (ItemViewModel<PhotoAlbum>.GetCurrentSelectedTabInstance<ProHome>().TextState.isVisible == Visibility.Visible)
-            {
-                EmptyTextPA.Visibility = Visibility.Visible;
-            }
-            else if (ItemViewModel<PhotoAlbum>.GetCurrentSelectedTabInstance<ProHome>().TextState.isVisible == Visibility.Collapsed)
-            {
-                EmptyTextPA.Visibility = Visibility.Collapsed;
-            }
         }
 
         protected override void OnNavigatedTo(NavigationEventArgs eventArgs)
@@ -72,6 +61,7 @@ protected override void OnNavigatedTo(NavigationEventArgs eventArgs)
             instanceViewModel.AlwaysPresentCommands.isEnabled = true;
             var parameters = eventArgs.Parameter.ToString();
             instanceViewModel.AddItemsToCollectionAsync(parameters, this);
+            TextState_PropertyChanged(null, null);
             FileList.DoubleTapped += instanceInteraction.List_ItemClick;
 
             if (parameters.Equals(Environment.GetFolderPath(Environment.SpecialFolder.DesktopDirectory)))
@@ -218,5 +208,10 @@ private async void PropertiesItemGrid_Click(object sender, RoutedEventArgs e)
             ItemViewModel<PhotoAlbum>.GetCurrentSelectedTabInstance<ProHome>().accessiblePropertiesFrame.Navigate(typeof(Properties), ItemViewModel<PhotoAlbum>.GetCurrentSelectedTabInstance<ProHome>().PathText.Text, new SuppressNavigationTransitionInfo());
             await ItemViewModel<PhotoAlbum>.GetCurrentSelectedTabInstance<ProHome>().propertiesBox.ShowAsync();
         }
+
+        internal void TextState_PropertyChanged(object sender, PropertyChangedEventArgs e)
+        {
+            TextState.isVisible = ItemViewModel<PhotoAlbum>.GetCurrentSelectedTabInstance<ProHome>().TextState.isVisible;
+        }
     }
 }
diff --git a/Files UWP/ProHome.xaml b/Files UWP/ProHome.xaml
@@ -742,7 +742,7 @@
                 </ScrollViewer>
             </SplitView.Pane>
 
-            <Frame Navigated="ItemDisplayFrame_Navigated" Background="{StaticResource ApplicationPageBackgroundThemeBrush}" Name="ItemDisplayFrame"/>
+            <Frame Navigating="ItemDisplayFrame_Navigating" Navigated="ItemDisplayFrame_Navigated" Background="{StaticResource ApplicationPageBackgroundThemeBrush}" Name="ItemDisplayFrame"/>
 
         </SplitView>
         <ContentDialog Windows10version1809:CornerRadius="5" Grid.RowSpan="4" DefaultButton="Primary" PrimaryButtonClick="PermissionDialog_PrimaryButtonClick" PrimaryButtonText="Grant Permission" Name="PermissionDialog" Title="Welcome to Files UWP">
@@ -753,7 +753,7 @@
                 <TextBlock TextWrapping="WrapWholeWords" Text="To get started, we need you to grant us permission to show you your files. This will open a Settings page where you can grant us permission. Files will close in the process, so don't be afraid to come back! "/>
             </Grid>
         </ContentDialog>
-        <ContentDialog Windows10version1809:CornerRadius="5" Grid.RowSpan="4" Loaded="AddDialog_Loaded" Background="{StaticResource ApplicationPageBackgroundThemeBrush}" BorderThickness="0" Name="AddDialog" PrimaryButtonText="Cancel">
+        <ContentDialog Windows10version1809:CornerRadius="5" Grid.RowSpan="4" Background="{StaticResource ApplicationPageBackgroundThemeBrush}" BorderThickness="0" Name="AddDialog" PrimaryButtonText="Cancel">
             <Windows10version1903:ContentDialog.Shadow>
                 <Windows10version1903:ThemeShadow/>
             </Windows10version1903:ContentDialog.Shadow>
diff --git a/Files UWP/ProHome.xaml.cs b/Files UWP/ProHome.xaml.cs
@@ -91,6 +91,7 @@ public ProHome()
             ForwardButton.Click += NavigationActions.Forward_Click;
             ribbonShadow.Receivers.Add(RibbonShadowSurface);
             Ribbon.Translation += new System.Numerics.Vector3(0, 0, 4);
+
         }
 
         public async void PopulateNavViewWithExternalDrives()
@@ -738,13 +739,6 @@ private void ClearAllButton_Click(object sender, RoutedEventArgs e)
 
         }
 
-        AddItem addItemPageInstance;
-        private void AddDialog_Loaded(object sender, RoutedEventArgs e)
-        {
-            addItemPageInstance = null;
-
-        }
-
         private void NameDialog_SecondaryButtonClick(ContentDialog sender, ContentDialogButtonClickEventArgs args)
         {
             inputForRename = null;
@@ -785,10 +779,22 @@ private void Page_Loaded(object sender, RoutedEventArgs e)
             this.Loaded -= Page_Loaded;
         }
 
-        private void ItemDisplayFrame_Navigated(object sender, Windows.UI.Xaml.Navigation.NavigationEventArgs e)
+        private void ItemDisplayFrame_Navigating(object sender, Windows.UI.Xaml.Navigation.NavigatingCancelEventArgs e)
         {
             
         }
+
+        private void ItemDisplayFrame_Navigated(object sender, Windows.UI.Xaml.Navigation.NavigationEventArgs e)
+        {
+            if (accessibleContentFrame.SourcePageType == typeof(GenericFileBrowser))
+            {
+                TextState.PropertyChanged += (accessibleContentFrame.Content as GenericFileBrowser).TextState_PropertyChanged;
+            }
+            else if (accessibleContentFrame.SourcePageType == typeof(PhotoAlbum))
+            {
+                TextState.PropertyChanged += (accessibleContentFrame.Content as PhotoAlbum).TextState_PropertyChanged;
+            }
+        }
     }
     public class NavigationActions
     {

Original file line number	Diff line number	Diff line change
`@@ -7,6 +7,7 @@`
`7`	`7`	`using System.Collections.ObjectModel;`
`8`	`8`	`using System.Diagnostics;`
`9`	`9`	`using System.Globalization;`
	`10`	`+using System.IO;`
`10`	`11`	`using System.Linq;`
`11`	`12`	`using System.Runtime.InteropServices;`
`12`	`13`	`using System.Threading;`
`@@ -367,17 +368,17 @@ public async void AddItemsToCollectionAsync(string path, Page currentPage)`
`367`	`368`	`}`
`368`	`369`	`else`
`369`	`370`	`{`
`370`		`- MessageDialog unsupportedDevice = new MessageDialog("This device may be unsupported. Please file an issue report in Settings - About containing what device we couldn't access. Technical information: " + e, "Unsupported Device");`
	`371`	`+ MessageDialog unsupportedDevice = new MessageDialog("This device may be unsupported. Please file an issue report containing what device we couldn't access. Technical information: " + e, "Unsupported Device");`
`371`	`372`	`await unsupportedDevice.ShowAsync();`
`372`	`373`	`return;`
`373`	`374`	`}`
`374`	`375`	`}`
`375`	`376`	`catch (COMException e)`
`376`	`377`	`{`
`377`	`378`	`Frame rootFrame = Window.Current.Content as Frame;`
`378`		`- MessageDialog driveGone = new MessageDialog(e.Message, "Drive Unplugged");`
	`379`	`+ MessageDialog driveGone = new MessageDialog(e.Message, "Did you unplug this drive?");`
`379`	`380`	`await driveGone.ShowAsync();`
`380`		`- rootFrame.Navigate(typeof(ProHome), null, new SuppressNavigationTransitionInfo());`
	`381`	`+ rootFrame.Navigate(typeof(InstanceTabsView), null, new SuppressNavigationTransitionInfo());`
`381`	`382`	`return;`
`382`	`383`	`}`
`383`	`384`
Original file line number	Diff line number	Diff line change
`@@ -91,6 +91,7 @@ public ProHome()`
`91`	`91`	`ForwardButton.Click += NavigationActions.Forward_Click;`
`92`	`92`	`ribbonShadow.Receivers.Add(RibbonShadowSurface);`
`93`	`93`	`Ribbon.Translation += new System.Numerics.Vector3(0, 0, 4);`
	`94`	`+`
`94`	`95`	`}`
`95`	`96`
`96`	`97`	`public async void PopulateNavViewWithExternalDrives()`
`@@ -738,13 +739,6 @@ private void ClearAllButton_Click(object sender, RoutedEventArgs e)`
`738`	`739`
`739`	`740`	`}`
`740`	`741`
`741`		`- AddItem addItemPageInstance;`
`742`		`- private void AddDialog_Loaded(object sender, RoutedEventArgs e)`
`743`		`- {`
`744`		`- addItemPageInstance = null;`
`745`		`-`
`746`		`- }`
`747`		`-`
`748`	`742`	`private void NameDialog_SecondaryButtonClick(ContentDialog sender, ContentDialogButtonClickEventArgs args)`
`749`	`743`	`{`
`750`	`744`	`inputForRename = null;`
`@@ -785,10 +779,22 @@ private void Page_Loaded(object sender, RoutedEventArgs e)`
`785`	`779`	`this.Loaded -= Page_Loaded;`
`786`	`780`	`}`
`787`	`781`
`788`		`- private void ItemDisplayFrame_Navigated(object sender, Windows.UI.Xaml.Navigation.NavigationEventArgs e)`
	`782`	`+ private void ItemDisplayFrame_Navigating(object sender, Windows.UI.Xaml.Navigation.NavigatingCancelEventArgs e)`
`789`	`783`	`{`
`790`	`784`
`791`	`785`	`}`
	`786`	`+`
	`787`	`+ private void ItemDisplayFrame_Navigated(object sender, Windows.UI.Xaml.Navigation.NavigationEventArgs e)`
	`788`	`+ {`
	`789`	`+ if (accessibleContentFrame.SourcePageType == typeof(GenericFileBrowser))`
	`790`	`+ {`
	`791`	`+ TextState.PropertyChanged += (accessibleContentFrame.Content as GenericFileBrowser).TextState_PropertyChanged;`
	`792`	`+ }`
	`793`	`+ else if (accessibleContentFrame.SourcePageType == typeof(PhotoAlbum))`
	`794`	`+ {`
	`795`	`+ TextState.PropertyChanged += (accessibleContentFrame.Content as PhotoAlbum).TextState_PropertyChanged;`
	`796`	`+ }`
	`797`	`+ }`
`792`	`798`	`}`
`793`	`799`	`public class NavigationActions`
`794`	`800`	`{`