Bug fixes related to Recent Items

lukeblevins · lukeblevins · commit 5f9864e19d8f · 2019-03-03T17:17:12.000-05:00
diff --git a/Files UWP/Interacts/Interaction.cs b/Files UWP/Interacts/Interaction.cs
@@ -47,7 +47,11 @@ public static async void List_ItemClick(object sender, DoubleTappedRoutedEventAr
                     var clickedOnItem = App.ViewModel.FilesAndFolders[index];
                     // Write location to recents file
                     StorageFile RecentsFile = await YourHome.dataFolder.CreateFileAsync("recents.txt", CreationCollisionOption.OpenIfExists);
-                    await FileIO.AppendTextAsync(RecentsFile, clickedOnItem.FilePath + "\n");
+                    var existingLines = (await FileIO.ReadLinesAsync(RecentsFile));
+                    if (existingLines != null && !existingLines.Contains(clickedOnItem.FilePath))
+                    {
+                        await FileIO.AppendTextAsync(RecentsFile, clickedOnItem.FilePath + "\n");
+                    }
 
                     if (clickedOnItem.FileType == "Folder")
                     {
@@ -204,7 +208,11 @@ public static async void List_ItemClick(object sender, DoubleTappedRoutedEventAr
 
                     // Write location to recents file
                     StorageFile RecentsFile = await YourHome.dataFolder.CreateFileAsync("recents.txt", CreationCollisionOption.OpenIfExists);
-                    await FileIO.AppendTextAsync(RecentsFile, clickedOnItem.FilePath + "\n");
+                    var existingLines = (await FileIO.ReadLinesAsync(RecentsFile));
+                    if (existingLines != null && !existingLines.Contains(clickedOnItem.FilePath))
+                    {
+                        await FileIO.AppendTextAsync(RecentsFile, clickedOnItem.FilePath + "\n");
+                    }
 
                     if (clickedOnItem.FileType == "Folder")
                     {
diff --git a/Files UWP/MainPage.xaml b/Files UWP/MainPage.xaml
@@ -6,7 +6,7 @@
     x:Class="Files.MainPage"
     xmlns:local="using:Files"
     xmlns:UILib="using:Microsoft.UI.Xaml.Controls"
-    mc:Ignorable="d">
+    mc:Ignorable="d" NavigationCacheMode="Disabled">
 
     <Page.Resources>
         <AcrylicBrush x:Key="RegAcrylic" BackgroundSource="HostBackdrop" TintColor="White" TintOpacity="0.7" FallbackColor="{StaticResource SystemChromeMediumColor}"/>
@@ -759,7 +759,7 @@
             </UILib:NavigationView.AutoSuggestBox>
 
 
-            <Frame Padding="0,35,0,0" Name="ContentFrame" Background="{StaticResource ApplicationPageBackgroundThemeBrush}">
+            <Frame  Padding="0,35,0,0" Name="ContentFrame" Background="{StaticResource ApplicationPageBackgroundThemeBrush}">
                 <Frame.ContentTransitions>
                     <TransitionCollection>
                         <NavigationThemeTransition/>
diff --git a/Files UWP/MainPage.xaml.cs b/Files UWP/MainPage.xaml.cs
@@ -141,7 +141,6 @@ private void navView_Loaded(object sender, RoutedEventArgs e)
 
         private void NavView_ItemInvoked(Microsoft.UI.Xaml.Controls.NavigationView sender, Microsoft.UI.Xaml.Controls.NavigationViewItemInvokedEventArgs args)
         {
-
             var item = args.InvokedItem;
             var itemContainer = args.InvokedItemContainer;
             //var item = Interaction.FindParent<NavigationViewItemBase>(args.InvokedItem as DependencyObject);
diff --git a/Files UWP/Settings.xaml.cs b/Files UWP/Settings.xaml.cs
@@ -41,7 +41,9 @@ private void NavigationView_ItemInvoked(Microsoft.UI.Xaml.Controls.NavigationVie
         private void SettingsPane_BackRequested(Microsoft.UI.Xaml.Controls.NavigationView sender, Microsoft.UI.Xaml.Controls.NavigationViewBackRequestedEventArgs args)
         {
             Frame rootFrame = Window.Current.Content as Frame;
-            rootFrame.Navigate(typeof(MainPage));
+            rootFrame.GoBack();
+            
+
         }
     }
 }
diff --git a/Files UWP/YourHome.xaml.cs b/Files UWP/YourHome.xaml.cs
@@ -33,6 +33,7 @@ public YourHome()
             InitializeComponent();
             Locations.ItemLoader.itemsAdded.Clear();
             Locations.ItemLoader.DisplayItems();
+            recentItemsCollection.Clear();
             PopulateRecentsList();
         }
 
@@ -194,6 +195,7 @@ private void Button_Tapped(object sender, Windows.UI.Xaml.Input.TappedRoutedEven
 
         public async void PopulateRecentsList()
         {
+            recentItemsCollection.Clear();
             dataFolder = Windows.Storage.ApplicationData.Current.LocalCacheFolder;
             RecentsFile = await dataFolder.CreateFileAsync("recents.txt", CreationCollisionOption.OpenIfExists);
             BitmapImage ItemImage = new BitmapImage();
@@ -227,7 +229,10 @@ public async void PopulateRecentsList()
                         ItemFolderImgVis = Visibility.Visible;
                         ItemEmptyImgVis = Visibility.Collapsed;
                         ItemFileIconVis = Visibility.Collapsed;
-                        recentItemsCollection.Add(new RecentItem() { path = ItemPath, name = ItemName, FolderImg = ItemFolderImgVis, EmptyImgVis = ItemEmptyImgVis, FileImg = ItemImage, FileIconVis = ItemFileIconVis });
+                        if(!recentItemsCollection.Contains(new RecentItem() { path = ItemPath, name = ItemName, FolderImg = ItemFolderImgVis, EmptyImgVis = ItemEmptyImgVis, FileImg = ItemImage, FileIconVis = ItemFileIconVis }))
+                        {
+                            recentItemsCollection.Add(new RecentItem() { path = ItemPath, name = ItemName, FolderImg = ItemFolderImgVis, EmptyImgVis = ItemEmptyImgVis, FileImg = ItemImage, FileIconVis = ItemFileIconVis });
+                        }
 
                     }
                     catch (System.ArgumentException)
@@ -248,7 +253,10 @@ public async void PopulateRecentsList()
                         }
                         ItemFolderImgVis = Visibility.Collapsed;
                         ItemFileIconVis = Visibility.Visible;
-                        recentItemsCollection.Add(new RecentItem() { path = ItemPath, name = ItemName, FolderImg = ItemFolderImgVis, EmptyImgVis = ItemEmptyImgVis, FileImg = ItemImage, FileIconVis = ItemFileIconVis });
+                        if (!recentItemsCollection.Contains(new RecentItem() { path = ItemPath, name = ItemName, FolderImg = ItemFolderImgVis, EmptyImgVis = ItemEmptyImgVis, FileImg = ItemImage, FileIconVis = ItemFileIconVis }))
+                        {
+                            recentItemsCollection.Add(new RecentItem() { path = ItemPath, name = ItemName, FolderImg = ItemFolderImgVis, EmptyImgVis = ItemEmptyImgVis, FileImg = ItemImage, FileIconVis = ItemFileIconVis });
+                        }
                     }
                 }
             }
@@ -266,7 +274,10 @@ public async void PopulateRecentsList()
                         ItemFolderImgVis = Visibility.Visible;
                         ItemEmptyImgVis = Visibility.Collapsed;
                         ItemFileIconVis = Visibility.Collapsed;
-                        recentItemsCollection.Add(new RecentItem() { path = ItemPath, name = ItemName, FolderImg = ItemFolderImgVis, EmptyImgVis = ItemEmptyImgVis, FileImg = ItemImage, FileIconVis = ItemFileIconVis });
+                        if (!recentItemsCollection.Contains(new RecentItem() { path = ItemPath, name = ItemName, FolderImg = ItemFolderImgVis, EmptyImgVis = ItemEmptyImgVis, FileImg = ItemImage, FileIconVis = ItemFileIconVis }))
+                        {
+                            recentItemsCollection.Add(new RecentItem() { path = ItemPath, name = ItemName, FolderImg = ItemFolderImgVis, EmptyImgVis = ItemEmptyImgVis, FileImg = ItemImage, FileIconVis = ItemFileIconVis });
+                        }
 
                     }
                     catch (System.ArgumentException)
@@ -287,7 +298,10 @@ public async void PopulateRecentsList()
                         }
                         ItemFolderImgVis = Visibility.Collapsed;
                         ItemFileIconVis = Visibility.Visible;
-                        recentItemsCollection.Add(new RecentItem() { path = ItemPath, name = ItemName, FolderImg = ItemFolderImgVis, EmptyImgVis = ItemEmptyImgVis, FileImg = ItemImage, FileIconVis = ItemFileIconVis });
+                        if (!recentItemsCollection.Contains(new RecentItem() { path = ItemPath, name = ItemName, FolderImg = ItemFolderImgVis, EmptyImgVis = ItemEmptyImgVis, FileImg = ItemImage, FileIconVis = ItemFileIconVis }))
+                        {
+                            recentItemsCollection.Add(new RecentItem() { path = ItemPath, name = ItemName, FolderImg = ItemFolderImgVis, EmptyImgVis = ItemEmptyImgVis, FileImg = ItemImage, FileIconVis = ItemFileIconVis });
+                        }
                     }
                 }
             }

Original file line number	Diff line number	Diff line change
`@@ -141,7 +141,6 @@ private void navView_Loaded(object sender, RoutedEventArgs e)`
`141`	`141`
`142`	`142`	`private void NavView_ItemInvoked(Microsoft.UI.Xaml.Controls.NavigationView sender, Microsoft.UI.Xaml.Controls.NavigationViewItemInvokedEventArgs args)`
`143`	`143`	`{`
`144`		`-`
`145`	`144`	`var item = args.InvokedItem;`
`146`	`145`	`var itemContainer = args.InvokedItemContainer;`
`147`	`146`	`//var item = Interaction.FindParent<NavigationViewItemBase>(args.InvokedItem as DependencyObject);`
Original file line number	Diff line number	Diff line change
`@@ -41,7 +41,9 @@ private void NavigationView_ItemInvoked(Microsoft.UI.Xaml.Controls.NavigationVie`
`41`	`41`	`private void SettingsPane_BackRequested(Microsoft.UI.Xaml.Controls.NavigationView sender, Microsoft.UI.Xaml.Controls.NavigationViewBackRequestedEventArgs args)`
`42`	`42`	`{`
`43`	`43`	`Frame rootFrame = Window.Current.Content as Frame;`
`44`		`- rootFrame.Navigate(typeof(MainPage));`
	`44`	`+ rootFrame.GoBack();`
	`45`	`+`
	`46`	`+`
`45`	`47`	`}`
`46`	`48`	`}`
`47`	`49`	`}`
Original file line number	Diff line number	Diff line change
`@@ -33,6 +33,7 @@ public YourHome()`
`33`	`33`	`InitializeComponent();`
`34`	`34`	`Locations.ItemLoader.itemsAdded.Clear();`
`35`	`35`	`Locations.ItemLoader.DisplayItems();`
	`36`	`+ recentItemsCollection.Clear();`
`36`	`37`	`PopulateRecentsList();`
`37`	`38`	`}`
`38`	`39`
`@@ -194,6 +195,7 @@ private void Button_Tapped(object sender, Windows.UI.Xaml.Input.TappedRoutedEven`
`194`	`195`
`195`	`196`	`public async void PopulateRecentsList()`
`196`	`197`	`{`
	`198`	`+ recentItemsCollection.Clear();`
`197`	`199`	`dataFolder = Windows.Storage.ApplicationData.Current.LocalCacheFolder;`
`198`	`200`	`RecentsFile = await dataFolder.CreateFileAsync("recents.txt", CreationCollisionOption.OpenIfExists);`
`199`	`201`	`BitmapImage ItemImage = new BitmapImage();`
`@@ -227,7 +229,10 @@ public async void PopulateRecentsList()`
`227`	`229`	`ItemFolderImgVis = Visibility.Visible;`
`228`	`230`	`ItemEmptyImgVis = Visibility.Collapsed;`
`229`	`231`	`ItemFileIconVis = Visibility.Collapsed;`
`230`		`- recentItemsCollection.Add(new RecentItem() { path = ItemPath, name = ItemName, FolderImg = ItemFolderImgVis, EmptyImgVis = ItemEmptyImgVis, FileImg = ItemImage, FileIconVis = ItemFileIconVis });`
	`232`	`+ if(!recentItemsCollection.Contains(new RecentItem() { path = ItemPath, name = ItemName, FolderImg = ItemFolderImgVis, EmptyImgVis = ItemEmptyImgVis, FileImg = ItemImage, FileIconVis = ItemFileIconVis }))`
	`233`	`+ {`
	`234`	`+ recentItemsCollection.Add(new RecentItem() { path = ItemPath, name = ItemName, FolderImg = ItemFolderImgVis, EmptyImgVis = ItemEmptyImgVis, FileImg = ItemImage, FileIconVis = ItemFileIconVis });`
	`235`	`+ }`
`231`	`236`
`232`	`237`	`}`
`233`	`238`	`catch (System.ArgumentException)`
`@@ -248,7 +253,10 @@ public async void PopulateRecentsList()`
`248`	`253`	`}`
`249`	`254`	`ItemFolderImgVis = Visibility.Collapsed;`
`250`	`255`	`ItemFileIconVis = Visibility.Visible;`
`251`		`- recentItemsCollection.Add(new RecentItem() { path = ItemPath, name = ItemName, FolderImg = ItemFolderImgVis, EmptyImgVis = ItemEmptyImgVis, FileImg = ItemImage, FileIconVis = ItemFileIconVis });`
	`256`	`+ if (!recentItemsCollection.Contains(new RecentItem() { path = ItemPath, name = ItemName, FolderImg = ItemFolderImgVis, EmptyImgVis = ItemEmptyImgVis, FileImg = ItemImage, FileIconVis = ItemFileIconVis }))`
	`257`	`+ {`
	`258`	`+ recentItemsCollection.Add(new RecentItem() { path = ItemPath, name = ItemName, FolderImg = ItemFolderImgVis, EmptyImgVis = ItemEmptyImgVis, FileImg = ItemImage, FileIconVis = ItemFileIconVis });`
	`259`	`+ }`
`252`	`260`	`}`
`253`	`261`	`}`
`254`	`262`	`}`
`@@ -266,7 +274,10 @@ public async void PopulateRecentsList()`
`266`	`274`	`ItemFolderImgVis = Visibility.Visible;`
`267`	`275`	`ItemEmptyImgVis = Visibility.Collapsed;`
`268`	`276`	`ItemFileIconVis = Visibility.Collapsed;`
`269`		`- recentItemsCollection.Add(new RecentItem() { path = ItemPath, name = ItemName, FolderImg = ItemFolderImgVis, EmptyImgVis = ItemEmptyImgVis, FileImg = ItemImage, FileIconVis = ItemFileIconVis });`
	`277`	`+ if (!recentItemsCollection.Contains(new RecentItem() { path = ItemPath, name = ItemName, FolderImg = ItemFolderImgVis, EmptyImgVis = ItemEmptyImgVis, FileImg = ItemImage, FileIconVis = ItemFileIconVis }))`
	`278`	`+ {`
	`279`	`+ recentItemsCollection.Add(new RecentItem() { path = ItemPath, name = ItemName, FolderImg = ItemFolderImgVis, EmptyImgVis = ItemEmptyImgVis, FileImg = ItemImage, FileIconVis = ItemFileIconVis });`
	`280`	`+ }`
`270`	`281`
`271`	`282`	`}`
`272`	`283`	`catch (System.ArgumentException)`
`@@ -287,7 +298,10 @@ public async void PopulateRecentsList()`
`287`	`298`	`}`
`288`	`299`	`ItemFolderImgVis = Visibility.Collapsed;`
`289`	`300`	`ItemFileIconVis = Visibility.Visible;`
`290`		`- recentItemsCollection.Add(new RecentItem() { path = ItemPath, name = ItemName, FolderImg = ItemFolderImgVis, EmptyImgVis = ItemEmptyImgVis, FileImg = ItemImage, FileIconVis = ItemFileIconVis });`
	`301`	`+ if (!recentItemsCollection.Contains(new RecentItem() { path = ItemPath, name = ItemName, FolderImg = ItemFolderImgVis, EmptyImgVis = ItemEmptyImgVis, FileImg = ItemImage, FileIconVis = ItemFileIconVis }))`
	`302`	`+ {`
	`303`	`+ recentItemsCollection.Add(new RecentItem() { path = ItemPath, name = ItemName, FolderImg = ItemFolderImgVis, EmptyImgVis = ItemEmptyImgVis, FileImg = ItemImage, FileIconVis = ItemFileIconVis });`
	`304`	`+ }`
`291`	`305`	`}`
`292`	`306`	`}`
`293`	`307`	`}`