Feature: Added an option to set default columns (#9785)

yaira2 · web-flow · commit a8d48f0951fa · 2022-08-21T18:02:19.000-04:00
diff --git a/src/Files.Backend/Services/Settings/IPreferencesSettingsService.cs b/src/Files.Backend/Services/Settings/IPreferencesSettingsService.cs
@@ -61,9 +61,9 @@ public interface IPreferencesSettingsService : IBaseSettingsService, INotifyProp
         bool SearchUnindexedItems { get; set; }
 
         /// <summary>
-        /// Enables saving a unique layout mode, gridview size and sort direction per folder
+        /// Forces default directory preferences on all folders
         /// </summary>
-        bool AreLayoutPreferencesPerFolder { get; set; }
+        bool ForceLayoutPreferencesOnAllDirectories { get; set; }
 
         /// <summary>
         /// Gets or sets a value indicating whether or not to show folder size.
diff --git a/src/Files.Uwp/Helpers/AdaptiveLayoutHelpers.cs b/src/Files.Uwp/Helpers/AdaptiveLayoutHelpers.cs
@@ -16,7 +16,7 @@ public static bool PredictLayoutMode(FolderSettingsViewModel folderSettings, str
         {
             IUserSettingsService userSettingsService = Ioc.Default.GetService<IUserSettingsService>();
 
-            if (userSettingsService.PreferencesSettingsService.AreLayoutPreferencesPerFolder
+            if (!userSettingsService.PreferencesSettingsService.ForceLayoutPreferencesOnAllDirectories
                 && folderSettings.IsAdaptiveLayoutEnabled
                 && !folderSettings.IsLayoutModeFixed)
             {
diff --git a/src/Files.Uwp/ServicesImplementation/Settings/PreferencesSettingsService.cs b/src/Files.Uwp/ServicesImplementation/Settings/PreferencesSettingsService.cs
@@ -80,9 +80,9 @@ public bool SearchUnindexedItems
             set => Set(value);
         }
 
-        public bool AreLayoutPreferencesPerFolder
+        public bool ForceLayoutPreferencesOnAllDirectories
         {
-            get => Get(true);
+            get => Get(false);
             set => Set(value);
         }
 
@@ -148,7 +148,7 @@ protected override void RaiseOnSettingChangedEvent(object sender, SettingChanged
                 case nameof(OpenFilesWithOneClick):
                 case nameof(OpenFoldersWithOneClick):
                 case nameof(SearchUnindexedItems):
-                case nameof(AreLayoutPreferencesPerFolder):
+                case nameof(ForceLayoutPreferencesOnAllDirectories):
                 case nameof(ShowFolderSize):
                 case nameof(OpenSpecificPageOnStartup):
                 case nameof(ContinueLastSessionOnStartUp):
@@ -173,7 +173,7 @@ public void ReportToAppCenter()
             Analytics.TrackEvent($"{nameof(OpenFilesWithOneClick)}, {OpenFilesWithOneClick}");
             Analytics.TrackEvent($"{nameof(OpenFoldersWithOneClick)}, {OpenFoldersWithOneClick}");
             Analytics.TrackEvent($"{nameof(SearchUnindexedItems)}, {SearchUnindexedItems}");
-            Analytics.TrackEvent($"{nameof(AreLayoutPreferencesPerFolder)}, {AreLayoutPreferencesPerFolder}");
+            Analytics.TrackEvent($"{nameof(ForceLayoutPreferencesOnAllDirectories)}, {ForceLayoutPreferencesOnAllDirectories}");
             Analytics.TrackEvent($"{nameof(ShowFolderSize)}, {ShowFolderSize}");
             Analytics.TrackEvent($"{nameof(OpenSpecificPageOnStartup)}, {OpenSpecificPageOnStartup}");
             Analytics.TrackEvent($"{nameof(ContinueLastSessionOnStartUp)}, {ContinueLastSessionOnStartUp}");
diff --git a/src/Files.Uwp/Strings/en-US/Resources.resw b/src/Files.Uwp/Strings/en-US/Resources.resw
@@ -1239,8 +1239,8 @@
   <data name="SettingsSearchUnindexedItems" xml:space="preserve">
     <value>Show unindexed items when searching for files and folders</value>
   </data>
-  <data name="SettingsEnableLayoutPreferencesPerFolder" xml:space="preserve">
-    <value>Enable individual preferences for individual directories</value>
+  <data name="ForceThesePreferencesOnAllDirectories" xml:space="preserve">
+    <value>Force these preferences on all directories</value>
   </data>
   <data name="SettingsContextMenu.Text" xml:space="preserve">
     <value>Customize the right click context menu</value>
@@ -2795,4 +2795,22 @@ We use App Center to track which settings are being used, find bugs, and fix cra
   <data name="SetAsDefault" xml:space="preserve">
     <value>Set as default</value>
   </data>
+  <data name="DefaultFolderPreferences" xml:space="preserve">
+    <value>Default Folder preferences</value>
+  </data>
+  <data name="DisplayDateColumn" xml:space="preserve">
+    <value>Display Date column</value>
+  </data>
+  <data name="DisplayDateCreatedColumn" xml:space="preserve">
+    <value>Display Date Created column</value>
+  </data>
+  <data name="DisplaySizeColumn" xml:space="preserve">
+    <value>Display Size column</value>
+  </data>
+  <data name="DisplayTagColumn" xml:space="preserve">
+    <value>Display Tag column</value>
+  </data>
+  <data name="DisplayTypeColumn" xml:space="preserve">
+    <value>Display Type column</value>
+  </data>
 </root>
diff --git a/src/Files.Uwp/ViewModels/FolderSettingsViewModel.cs b/src/Files.Uwp/ViewModels/FolderSettingsViewModel.cs
@@ -310,7 +310,7 @@ public ColumnsViewModel ColumnsViewModel
         private static LayoutPreferences GetLayoutPreferencesForPath(string folderPath)
         {
             IUserSettingsService userSettingsService = Ioc.Default.GetService<IUserSettingsService>();
-            if (userSettingsService.PreferencesSettingsService.AreLayoutPreferencesPerFolder)
+            if (!userSettingsService.PreferencesSettingsService.ForceLayoutPreferencesOnAllDirectories)
             {
                 folderPath = folderPath.TrimPath();
                 var folderFRN = NativeFileOperationsHelper.GetFolderFRN(folderPath);
@@ -326,7 +326,7 @@ public static void SetLayoutPreferencesForPath(string folderPath, LayoutPreferen
         {
             IUserSettingsService userSettingsService = Ioc.Default.GetService<IUserSettingsService>();
 
-            if (userSettingsService.PreferencesSettingsService.AreLayoutPreferencesPerFolder)
+            if (!userSettingsService.PreferencesSettingsService.ForceLayoutPreferencesOnAllDirectories)
             {
                 var folderFRN = NativeFileOperationsHelper.GetFolderFRN(folderPath);
                 WriteLayoutPreferencesToDb(folderPath.TrimPath(), folderFRN, prefs);
@@ -529,7 +529,7 @@ public void OnDefaultPreferencesChanged(string folderPath, string settingsName)
                 case nameof(UserSettingsService.LayoutSettingsService.DefaultSortDirectoriesAlongsideFiles):
                     SortDirectoriesAlongsideFiles = prefs.SortDirectoriesAlongsideFiles;
                     break;
-                case nameof(UserSettingsService.PreferencesSettingsService.AreLayoutPreferencesPerFolder):
+                case nameof(UserSettingsService.PreferencesSettingsService.ForceLayoutPreferencesOnAllDirectories):
                     LayoutPreference = prefs;
                     // TODO: update layout
                     break;
diff --git a/src/Files.Uwp/ViewModels/ItemViewModel.cs b/src/Files.Uwp/ViewModels/ItemViewModel.cs
@@ -477,7 +477,7 @@ await dispatcherQueue.EnqueueAsync(() =>
                     });
                     break;
                 case nameof(UserSettingsService.LayoutSettingsService.DefaultSortDirectoriesAlongsideFiles):
-                case nameof(UserSettingsService.PreferencesSettingsService.AreLayoutPreferencesPerFolder):
+                case nameof(UserSettingsService.PreferencesSettingsService.ForceLayoutPreferencesOnAllDirectories):
                     await dispatcherQueue.EnqueueAsync(() =>
                     {
                         folderSettings.OnDefaultPreferencesChanged(WorkingDirectory, e.SettingName);
diff --git a/src/Files.Uwp/ViewModels/SettingsViewModels/PreferencesViewModel.cs b/src/Files.Uwp/ViewModels/SettingsViewModels/PreferencesViewModel.cs
@@ -628,14 +628,79 @@ public bool SearchUnindexedItems
             }
         }
 
-        public bool AreLayoutPreferencesPerFolder
+        public bool ForceLayoutPreferencesOnAllDirectories
         {
-            get => UserSettingsService.PreferencesSettingsService.AreLayoutPreferencesPerFolder;
+            get => UserSettingsService.PreferencesSettingsService.ForceLayoutPreferencesOnAllDirectories;
             set
             {
-                if (value != UserSettingsService.PreferencesSettingsService.AreLayoutPreferencesPerFolder)
+                if (value != UserSettingsService.PreferencesSettingsService.ForceLayoutPreferencesOnAllDirectories)
                 {
-                    UserSettingsService.PreferencesSettingsService.AreLayoutPreferencesPerFolder = value;
+                    UserSettingsService.PreferencesSettingsService.ForceLayoutPreferencesOnAllDirectories = value;
+                    OnPropertyChanged();
+                }
+            }
+        }
+        
+        public bool ShowFileTagColumn
+        {
+            get => UserSettingsService.LayoutSettingsService.ShowFileTagColumn;
+            set
+            {
+                if (value != UserSettingsService.LayoutSettingsService.ShowFileTagColumn)
+                {
+                    UserSettingsService.LayoutSettingsService.ShowFileTagColumn = value;
+                    OnPropertyChanged();
+                }
+            }
+        }
+        
+        public bool ShowSizeColumn
+        {
+            get => UserSettingsService.LayoutSettingsService.ShowSizeColumn;
+            set
+            {
+                if (value != UserSettingsService.LayoutSettingsService.ShowSizeColumn)
+                {
+                    UserSettingsService.LayoutSettingsService.ShowSizeColumn = value;
+                    OnPropertyChanged();
+                }
+            }
+        }
+
+        public bool ShowTypeColumn
+        {
+            get => UserSettingsService.LayoutSettingsService.ShowTypeColumn;
+            set
+            {
+                if (value != UserSettingsService.LayoutSettingsService.ShowTypeColumn)
+                {
+                    UserSettingsService.LayoutSettingsService.ShowTypeColumn = value;
+                    OnPropertyChanged();
+                }
+            }
+        }
+
+        public bool ShowDateCreatedColumn
+        {
+            get => UserSettingsService.LayoutSettingsService.ShowDateCreatedColumn;
+            set
+            {
+                if (value != UserSettingsService.LayoutSettingsService.ShowDateCreatedColumn)
+                {
+                    UserSettingsService.LayoutSettingsService.ShowDateCreatedColumn = value;
+                    OnPropertyChanged();
+                }
+            }
+        }
+
+        public bool ShowDateColumn
+        {
+            get => UserSettingsService.LayoutSettingsService.ShowDateColumn;
+            set
+            {
+                if (value != UserSettingsService.LayoutSettingsService.ShowDateColumn)
+                {
+                    UserSettingsService.LayoutSettingsService.ShowDateColumn = value;
                     OnPropertyChanged();
                 }
             }
diff --git a/src/Files.Uwp/ViewModels/ToolbarViewModel.cs b/src/Files.Uwp/ViewModels/ToolbarViewModel.cs
@@ -248,7 +248,7 @@ public bool IsLayoutAdaptive
             && IsAdaptiveLayoutEnabled;
 
         public bool IsAdaptiveLayoutEnabled
-            => UserSettingsService.PreferencesSettingsService.AreLayoutPreferencesPerFolder;
+            => !UserSettingsService.PreferencesSettingsService.ForceLayoutPreferencesOnAllDirectories;
 
         private bool canCopyPathInPage;
 
@@ -394,7 +394,7 @@ private void UserSettingsService_OnSettingChangedEvent(object sender, SettingCha
                     RefreshWidgetsRequested?.Invoke(this, EventArgs.Empty);
                     OnPropertyChanged(e.SettingName);
                     break;
-                case nameof(UserSettingsService.PreferencesSettingsService.AreLayoutPreferencesPerFolder):
+                case nameof(UserSettingsService.PreferencesSettingsService.ForceLayoutPreferencesOnAllDirectories):
                     FolderSettings_LayoutPreferencesUpdateRequired(null, 0);
                     break;
             }
diff --git a/src/Files.Uwp/Views/SettingsPages/Preferences.xaml b/src/Files.Uwp/Views/SettingsPages/Preferences.xaml

Original file line number	Diff line number	Diff line change
`@@ -16,7 +16,7 @@ public static bool PredictLayoutMode(FolderSettingsViewModel folderSettings, str`
`16`	`16`	`{`
`17`	`17`	`IUserSettingsService userSettingsService = Ioc.Default.GetService<IUserSettingsService>();`
`18`	`18`
`19`		`- if (userSettingsService.PreferencesSettingsService.AreLayoutPreferencesPerFolder`
	`19`	`+ if (!userSettingsService.PreferencesSettingsService.ForceLayoutPreferencesOnAllDirectories`
`20`	`20`	`&& folderSettings.IsAdaptiveLayoutEnabled`
`21`	`21`	`&& !folderSettings.IsLayoutModeFixed)`
`22`	`22`	`{`
Original file line number	Diff line number	Diff line change
`@@ -310,7 +310,7 @@ public ColumnsViewModel ColumnsViewModel`
`310`	`310`	`private static LayoutPreferences GetLayoutPreferencesForPath(string folderPath)`
`311`	`311`	`{`
`312`	`312`	`IUserSettingsService userSettingsService = Ioc.Default.GetService<IUserSettingsService>();`
`313`		`- if (userSettingsService.PreferencesSettingsService.AreLayoutPreferencesPerFolder)`
	`313`	`+ if (!userSettingsService.PreferencesSettingsService.ForceLayoutPreferencesOnAllDirectories)`
`314`	`314`	`{`
`315`	`315`	`folderPath = folderPath.TrimPath();`
`316`	`316`	`var folderFRN = NativeFileOperationsHelper.GetFolderFRN(folderPath);`
`@@ -326,7 +326,7 @@ public static void SetLayoutPreferencesForPath(string folderPath, LayoutPreferen`
`326`	`326`	`{`
`327`	`327`	`IUserSettingsService userSettingsService = Ioc.Default.GetService<IUserSettingsService>();`
`328`	`328`
`329`		`- if (userSettingsService.PreferencesSettingsService.AreLayoutPreferencesPerFolder)`
	`329`	`+ if (!userSettingsService.PreferencesSettingsService.ForceLayoutPreferencesOnAllDirectories)`
`330`	`330`	`{`
`331`	`331`	`var folderFRN = NativeFileOperationsHelper.GetFolderFRN(folderPath);`
`332`	`332`	`WriteLayoutPreferencesToDb(folderPath.TrimPath(), folderFRN, prefs);`
`@@ -529,7 +529,7 @@ public void OnDefaultPreferencesChanged(string folderPath, string settingsName)`
`529`	`529`	`case nameof(UserSettingsService.LayoutSettingsService.DefaultSortDirectoriesAlongsideFiles):`
`530`	`530`	`SortDirectoriesAlongsideFiles = prefs.SortDirectoriesAlongsideFiles;`
`531`	`531`	`break;`
`532`		`- case nameof(UserSettingsService.PreferencesSettingsService.AreLayoutPreferencesPerFolder):`
	`532`	`+ case nameof(UserSettingsService.PreferencesSettingsService.ForceLayoutPreferencesOnAllDirectories):`
`533`	`533`	`LayoutPreference = prefs;`
`534`	`534`	`// TODO: update layout`
`535`	`535`	`break;`
Original file line number	Diff line number	Diff line change
`@@ -477,7 +477,7 @@ await dispatcherQueue.EnqueueAsync(() =>`
`477`	`477`	`});`
`478`	`478`	`break;`
`479`	`479`	`case nameof(UserSettingsService.LayoutSettingsService.DefaultSortDirectoriesAlongsideFiles):`
`480`		`- case nameof(UserSettingsService.PreferencesSettingsService.AreLayoutPreferencesPerFolder):`
	`480`	`+ case nameof(UserSettingsService.PreferencesSettingsService.ForceLayoutPreferencesOnAllDirectories):`
`481`	`481`	`await dispatcherQueue.EnqueueAsync(() =>`
`482`	`482`	`{`
`483`	`483`	`folderSettings.OnDefaultPreferencesChanged(WorkingDirectory, e.SettingName);`