Disable Ribbon Items Correctly

lukeblevins · lukeblevins · commit 2498cd0c761d · 2019-05-13T21:02:16.000-04:00
diff --git a/Files UWP/Filesystem/ItemViewModel.cs b/Files UWP/Filesystem/ItemViewModel.cs
@@ -33,13 +33,6 @@ public class ItemViewModel<PageType> where PageType : class
         public ReadOnlyObservableCollection<ListedItem> ClassicFileList { get; }
         public UniversalPath Universal { get; } = new UniversalPath();
 
-
-
-        public Interacts.Home.HomeItemsState HomeItems { get; set; } = new Interacts.Home.HomeItemsState();
-        public Interacts.Share.ShareItemsState ShareItems { get; set; } = new Interacts.Share.ShareItemsState();
-        public Interacts.Layout.LayoutItemsState LayoutItems { get; set; } = new Interacts.Layout.LayoutItemsState();
-        public Interacts.AlwaysPresentCommandsState AlwaysPresentCommands { get; set; } = new Interacts.AlwaysPresentCommandsState();
-
         private ObservableCollection<ListedItem> _filesAndFolders;
         private ObservableCollection<ListedItem> _classicFileList;
         private ObservableCollection<Classic_ListedFolderItem> _classicFolderList;
@@ -90,16 +83,16 @@ public ItemViewModel(PageType typeOfPage, Type pageTypeAlt)
                     }
                 }
             }
-            
-            HomeItems.PropertyChanged += HomeItems_PropertyChanged;
-            ShareItems.PropertyChanged += ShareItems_PropertyChanged;
-            LayoutItems.PropertyChanged += LayoutItems_PropertyChanged;
-            AlwaysPresentCommands.PropertyChanged += AlwaysPresentCommands_PropertyChanged;
+
+            GetCurrentSelectedTabInstance<ProHome>().HomeItems.PropertyChanged += HomeItems_PropertyChanged;
+            GetCurrentSelectedTabInstance<ProHome>().ShareItems.PropertyChanged += ShareItems_PropertyChanged;
+            GetCurrentSelectedTabInstance<ProHome>().LayoutItems.PropertyChanged += LayoutItems_PropertyChanged;
+            GetCurrentSelectedTabInstance<ProHome>().AlwaysPresentCommands.PropertyChanged += AlwaysPresentCommands_PropertyChanged;
         }
 
         private void AlwaysPresentCommands_PropertyChanged(object sender, System.ComponentModel.PropertyChangedEventArgs e)
         {
-            if(AlwaysPresentCommands.isEnabled == true)
+            if(GetCurrentSelectedTabInstance<ProHome>().AlwaysPresentCommands.isEnabled == true)
             {
                 GetCurrentSelectedTabInstance<ProHome>().AlwaysPresentCommands.isEnabled = true;
             }
@@ -111,7 +104,7 @@ private void AlwaysPresentCommands_PropertyChanged(object sender, System.Compone
 
         private void LayoutItems_PropertyChanged(object sender, System.ComponentModel.PropertyChangedEventArgs e)
         {
-            if (LayoutItems.isEnabled == true)
+            if (GetCurrentSelectedTabInstance<ProHome>().LayoutItems.isEnabled == true)
             {
                 GetCurrentSelectedTabInstance<ProHome>().LayoutItems.isEnabled = true;
             }
@@ -123,7 +116,7 @@ private void LayoutItems_PropertyChanged(object sender, System.ComponentModel.Pr
 
         private void ShareItems_PropertyChanged(object sender, System.ComponentModel.PropertyChangedEventArgs e)
         {
-            if (ShareItems.isEnabled == true)
+            if (GetCurrentSelectedTabInstance<ProHome>().ShareItems.isEnabled == true)
             {
                 GetCurrentSelectedTabInstance<ProHome>().ShareItems.isEnabled = true;
             }
@@ -135,7 +128,7 @@ private void ShareItems_PropertyChanged(object sender, System.ComponentModel.Pro
 
         private void HomeItems_PropertyChanged(object sender, System.ComponentModel.PropertyChangedEventArgs e)
         {
-            if (HomeItems.isEnabled == true)
+            if (GetCurrentSelectedTabInstance<ProHome>().HomeItems.isEnabled == true)
             {
                 GetCurrentSelectedTabInstance<ProHome>().HomeItems.isEnabled = true;
             }
diff --git a/Files UWP/GenericFileBrowser.xaml.cs b/Files UWP/GenericFileBrowser.xaml.cs
@@ -102,7 +102,7 @@ protected override void OnNavigatedTo(NavigationEventArgs eventArgs)
             CurrentInstance.ForwardButton.IsEnabled = CurrentInstance.accessibleContentFrame.CanGoForward;
             CurrentInstance.RefreshButton.IsEnabled = true;
             Clipboard_ContentChanged(null, null);
-            instanceViewModel.AlwaysPresentCommands.isEnabled = true;
+            CurrentInstance.AlwaysPresentCommands.isEnabled = true;
             var parameters = (string)eventArgs.Parameter;
             instanceViewModel.CancelLoadAndClearFiles();
             instanceViewModel.Universal.path = parameters;
@@ -227,8 +227,8 @@ private void ContentDialog_Loaded(object sender, RoutedEventArgs e)
         private void GenericItemView_PointerReleased(object sender, Windows.UI.Xaml.Input.PointerRoutedEventArgs e)
         {
             data.SelectedItem = null;
-            instanceViewModel.HomeItems.isEnabled = false;
-            instanceViewModel.ShareItems.isEnabled = false;
+            ItemViewModel<GenericFileBrowser>.GetCurrentSelectedTabInstance<ProHome>().HomeItems.isEnabled = false;
+            ItemViewModel<GenericFileBrowser>.GetCurrentSelectedTabInstance<ProHome>().ShareItems.isEnabled = false;
         }
 
         private void AllView_SelectionChanged(object sender, SelectionChangedEventArgs e)
@@ -237,8 +237,8 @@ private void AllView_SelectionChanged(object sender, SelectionChangedEventArgs e
             AllView.CommitEdit();
             if(e.AddedItems.Count > 0)
             {
-                instanceViewModel.HomeItems.isEnabled = true;
-                instanceViewModel.ShareItems.isEnabled = true;
+                ItemViewModel<GenericFileBrowser>.GetCurrentSelectedTabInstance<ProHome>().HomeItems.isEnabled = true;
+                ItemViewModel<GenericFileBrowser>.GetCurrentSelectedTabInstance<ProHome>().ShareItems.isEnabled = true;
 
             }
         }
diff --git a/Files UWP/PhotoAlbum.xaml.cs b/Files UWP/PhotoAlbum.xaml.cs
@@ -58,7 +58,7 @@ protected override void OnNavigatedTo(NavigationEventArgs eventArgs)
             CurrentInstance.BackButton.IsEnabled = CurrentInstance.accessibleContentFrame.CanGoBack;
             CurrentInstance.ForwardButton.IsEnabled = CurrentInstance.accessibleContentFrame.CanGoForward;
             CurrentInstance.RefreshButton.IsEnabled = true;
-            instanceViewModel.AlwaysPresentCommands.isEnabled = true;
+            ItemViewModel<PhotoAlbum>.GetCurrentSelectedTabInstance<ProHome>().AlwaysPresentCommands.isEnabled = true;
             var parameters = eventArgs.Parameter.ToString();
             instanceViewModel.AddItemsToCollectionAsync(parameters, this);
             TextState_PropertyChanged(null, null);
@@ -142,8 +142,8 @@ 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;
-            instanceViewModel.HomeItems.isEnabled = false;
-            instanceViewModel.ShareItems.isEnabled = false;
+            ItemViewModel<PhotoAlbum>.GetCurrentSelectedTabInstance<ProHome>().HomeItems.isEnabled = false;
+            ItemViewModel<PhotoAlbum>.GetCurrentSelectedTabInstance<ProHome>().ShareItems.isEnabled = false;
         }
 
         private void PhotoAlbumViewer_RightTapped(object sender, Windows.UI.Xaml.Input.RightTappedRoutedEventArgs e)
diff --git a/Files UWP/ProHome.xaml b/Files UWP/ProHome.xaml
@@ -647,7 +647,7 @@
 
                     <StackPanel Margin="0,0,5,0" Grid.Column="2" Orientation="Horizontal">
                         <TextBox Style="{StaticResource TextBoxStyleForPathBar}" Padding="5" Windows10version1809:CornerRadius="5,0,0,5" BorderThickness="1" Margin="0,5,0,5" VerticalAlignment="Stretch"  PlaceholderText="Search" Width="260"/>
-                        <Button Width="35" BorderThickness="0" Margin="0,5,0,5.5" VerticalAlignment="Stretch" Windows10version1809:CornerRadius="0,5,5,0" Background="{StaticResource SystemAccentColor}">
+                        <Button BorderBrush="{StaticResource SystemAccentColor}" Width="35" BorderThickness="1" Margin="0,5,0,5.5" VerticalAlignment="Stretch" Windows10version1809:CornerRadius="0,5,5,0" Background="{StaticResource SystemAccentColor}">
                             <FontIcon FontSize="12" Foreground="White" Glyph="&#xEBE7;"/>
                         </Button>
                     </StackPanel>
diff --git a/Files UWP/ProHome.xaml.cs b/Files UWP/ProHome.xaml.cs
diff --git a/Files UWP/YourHome.xaml.cs b/Files UWP/YourHome.xaml.cs

Original file line number	Diff line number	Diff line change
`@@ -33,13 +33,6 @@ public class ItemViewModel<PageType> where PageType : class`
`33`	`33`	`public ReadOnlyObservableCollection<ListedItem> ClassicFileList { get; }`
`34`	`34`	`public UniversalPath Universal { get; } = new UniversalPath();`
`35`	`35`
`36`		`-`
`37`		`-`
`38`		`- public Interacts.Home.HomeItemsState HomeItems { get; set; } = new Interacts.Home.HomeItemsState();`
`39`		`- public Interacts.Share.ShareItemsState ShareItems { get; set; } = new Interacts.Share.ShareItemsState();`
`40`		`- public Interacts.Layout.LayoutItemsState LayoutItems { get; set; } = new Interacts.Layout.LayoutItemsState();`
`41`		`- public Interacts.AlwaysPresentCommandsState AlwaysPresentCommands { get; set; } = new Interacts.AlwaysPresentCommandsState();`
`42`		`-`
`43`	`36`	`private ObservableCollection<ListedItem> _filesAndFolders;`
`44`	`37`	`private ObservableCollection<ListedItem> _classicFileList;`
`45`	`38`	`private ObservableCollection<Classic_ListedFolderItem> _classicFolderList;`
`@@ -90,16 +83,16 @@ public ItemViewModel(PageType typeOfPage, Type pageTypeAlt)`
`90`	`83`	`}`
`91`	`84`	`}`
`92`	`85`	`}`
`93`		`-`
`94`		`- HomeItems.PropertyChanged += HomeItems_PropertyChanged;`
`95`		`- ShareItems.PropertyChanged += ShareItems_PropertyChanged;`
`96`		`- LayoutItems.PropertyChanged += LayoutItems_PropertyChanged;`
`97`		`- AlwaysPresentCommands.PropertyChanged += AlwaysPresentCommands_PropertyChanged;`
	`86`	`+`
	`87`	`+ GetCurrentSelectedTabInstance<ProHome>().HomeItems.PropertyChanged += HomeItems_PropertyChanged;`
	`88`	`+ GetCurrentSelectedTabInstance<ProHome>().ShareItems.PropertyChanged += ShareItems_PropertyChanged;`
	`89`	`+ GetCurrentSelectedTabInstance<ProHome>().LayoutItems.PropertyChanged += LayoutItems_PropertyChanged;`
	`90`	`+ GetCurrentSelectedTabInstance<ProHome>().AlwaysPresentCommands.PropertyChanged += AlwaysPresentCommands_PropertyChanged;`
`98`	`91`	`}`
`99`	`92`
`100`	`93`	`private void AlwaysPresentCommands_PropertyChanged(object sender, System.ComponentModel.PropertyChangedEventArgs e)`
`101`	`94`	`{`
`102`		`- if(AlwaysPresentCommands.isEnabled == true)`
	`95`	`+ if(GetCurrentSelectedTabInstance<ProHome>().AlwaysPresentCommands.isEnabled == true)`
`103`	`96`	`{`
`104`	`97`	`GetCurrentSelectedTabInstance<ProHome>().AlwaysPresentCommands.isEnabled = true;`
`105`	`98`	`}`
`@@ -111,7 +104,7 @@ private void AlwaysPresentCommands_PropertyChanged(object sender, System.Compone`
`111`	`104`
`112`	`105`	`private void LayoutItems_PropertyChanged(object sender, System.ComponentModel.PropertyChangedEventArgs e)`
`113`	`106`	`{`
`114`		`- if (LayoutItems.isEnabled == true)`
	`107`	`+ if (GetCurrentSelectedTabInstance<ProHome>().LayoutItems.isEnabled == true)`
`115`	`108`	`{`
`116`	`109`	`GetCurrentSelectedTabInstance<ProHome>().LayoutItems.isEnabled = true;`
`117`	`110`	`}`
`@@ -123,7 +116,7 @@ private void LayoutItems_PropertyChanged(object sender, System.ComponentModel.Pr`
`123`	`116`
`124`	`117`	`private void ShareItems_PropertyChanged(object sender, System.ComponentModel.PropertyChangedEventArgs e)`
`125`	`118`	`{`
`126`		`- if (ShareItems.isEnabled == true)`
	`119`	`+ if (GetCurrentSelectedTabInstance<ProHome>().ShareItems.isEnabled == true)`
`127`	`120`	`{`
`128`	`121`	`GetCurrentSelectedTabInstance<ProHome>().ShareItems.isEnabled = true;`
`129`	`122`	`}`
`@@ -135,7 +128,7 @@ private void ShareItems_PropertyChanged(object sender, System.ComponentModel.Pro`
`135`	`128`
`136`	`129`	`private void HomeItems_PropertyChanged(object sender, System.ComponentModel.PropertyChangedEventArgs e)`
`137`	`130`	`{`
`138`		`- if (HomeItems.isEnabled == true)`
	`131`	`+ if (GetCurrentSelectedTabInstance<ProHome>().HomeItems.isEnabled == true)`
`139`	`132`	`{`
`140`	`133`	`GetCurrentSelectedTabInstance<ProHome>().HomeItems.isEnabled = true;`
`141`	`134`	`}`
Original file line number	Diff line number	Diff line change
`@@ -102,7 +102,7 @@ protected override void OnNavigatedTo(NavigationEventArgs eventArgs)`
`102`	`102`	`CurrentInstance.ForwardButton.IsEnabled = CurrentInstance.accessibleContentFrame.CanGoForward;`
`103`	`103`	`CurrentInstance.RefreshButton.IsEnabled = true;`
`104`	`104`	`Clipboard_ContentChanged(null, null);`
`105`		`- instanceViewModel.AlwaysPresentCommands.isEnabled = true;`
	`105`	`+ CurrentInstance.AlwaysPresentCommands.isEnabled = true;`
`106`	`106`	`var parameters = (string)eventArgs.Parameter;`
`107`	`107`	`instanceViewModel.CancelLoadAndClearFiles();`
`108`	`108`	`instanceViewModel.Universal.path = parameters;`
`@@ -227,8 +227,8 @@ private void ContentDialog_Loaded(object sender, RoutedEventArgs e)`
`227`	`227`	`private void GenericItemView_PointerReleased(object sender, Windows.UI.Xaml.Input.PointerRoutedEventArgs e)`
`228`	`228`	`{`
`229`	`229`	`data.SelectedItem = null;`
`230`		`- instanceViewModel.HomeItems.isEnabled = false;`
`231`		`- instanceViewModel.ShareItems.isEnabled = false;`
	`230`	`+ ItemViewModel<GenericFileBrowser>.GetCurrentSelectedTabInstance<ProHome>().HomeItems.isEnabled = false;`
	`231`	`+ ItemViewModel<GenericFileBrowser>.GetCurrentSelectedTabInstance<ProHome>().ShareItems.isEnabled = false;`
`232`	`232`	`}`
`233`	`233`
`234`	`234`	`private void AllView_SelectionChanged(object sender, SelectionChangedEventArgs e)`
`@@ -237,8 +237,8 @@ private void AllView_SelectionChanged(object sender, SelectionChangedEventArgs e`
`237`	`237`	`AllView.CommitEdit();`
`238`	`238`	`if(e.AddedItems.Count > 0)`
`239`	`239`	`{`
`240`		`- instanceViewModel.HomeItems.isEnabled = true;`
`241`		`- instanceViewModel.ShareItems.isEnabled = true;`
	`240`	`+ ItemViewModel<GenericFileBrowser>.GetCurrentSelectedTabInstance<ProHome>().HomeItems.isEnabled = true;`
	`241`	`+ ItemViewModel<GenericFileBrowser>.GetCurrentSelectedTabInstance<ProHome>().ShareItems.isEnabled = true;`
`242`	`242`
`243`	`243`	`}`
`244`	`244`	`}`