Feature: Enabled tags by default and removed option to turn them off (#9710)

ferrariofilippo · web-flow · commit 25531940d01c · 2022-08-18T16:29:36.000-04:00
diff --git a/src/Files.Backend/Services/Settings/IPreferencesSettingsService.cs b/src/Files.Backend/Services/Settings/IPreferencesSettingsService.cs
@@ -65,11 +65,6 @@ public interface IPreferencesSettingsService : IBaseSettingsService, INotifyProp
         /// </summary>
         bool AreLayoutPreferencesPerFolder { get; set; }
 
-        /// <summary>
-        /// Gets or sets a value indicating whether or not to enable file tags feature.
-        /// </summary>
-        bool AreFileTagsEnabled { get; set; }
-
         /// <summary>
         /// Gets or sets a value indicating whether or not to show folder size.
         /// </summary>
diff --git a/src/Files.Uwp/BaseLayout.cs b/src/Files.Uwp/BaseLayout.cs
@@ -662,7 +662,7 @@ private async Task LoadMenuItemsAsync()
             secondaryElements.OfType<FrameworkElement>().ForEach(i => i.MinWidth = Constants.UI.ContextMenuItemsMaxWidth); // Set menu min width
             secondaryElements.ForEach(i => ItemContextMenuFlyout.SecondaryCommands.Add(i));
 
-            if (UserSettingsService.PreferencesSettingsService.AreFileTagsEnabled && InstanceViewModel.CanTagFilesInPage)
+            if (InstanceViewModel.CanTagFilesInPage)
             {
                 AddNewFileTagsToMenu(ItemContextMenuFlyout);
             }
diff --git a/src/Files.Uwp/Filesystem/ListedItem.cs b/src/Files.Uwp/Filesystem/ListedItem.cs
@@ -133,8 +133,7 @@ public string[] FileTags
 
         public IList<FileTagViewModel> FileTagsUI
         {
-            get => UserSettingsService.PreferencesSettingsService.AreFileTagsEnabled ?
-                FileTagsSettingsService.GetTagsByIds(FileTags) : null;
+            get => FileTagsSettingsService.GetTagsByIds(FileTags);
         }
 
         private Uri customIconSource;
diff --git a/src/Files.Uwp/Helpers/ContextFlyoutItemHelper.cs b/src/Files.Uwp/Helpers/ContextFlyoutItemHelper.cs
@@ -291,7 +291,6 @@ public static List<ContextMenuFlyoutItemViewModel> GetBaseLayoutMenuItems(Curren
                             Text = "FileTags".GetLocalized(),
                             IsChecked = itemViewModel.IsSortedByFileTag,
                             Command = new RelayCommand(() => itemViewModel.IsSortedByFileTag = true),
-                            ShowItem = userSettingsService.PreferencesSettingsService.AreFileTagsEnabled,
                             ShowInRecycleBin = true,
                             ShowInSearchPage = true,
                             ItemType = ItemType.Toggle
@@ -441,7 +440,6 @@ public static List<ContextMenuFlyoutItemViewModel> GetBaseLayoutMenuItems(Curren
                         {
                             Text = "FileTags".GetLocalized(),
                             IsChecked = currentInstanceViewModel.FolderSettings.DirectoryGroupOption == GroupOption.FileTag,
-                            ShowItem = userSettingsService.PreferencesSettingsService.AreFileTagsEnabled,
                             ShowInRecycleBin = true,
                             ShowInSearchPage = true,
                             Command = currentInstanceViewModel.FolderSettings.ChangeGroupOptionCommand,
diff --git a/src/Files.Uwp/ServicesImplementation/Settings/PreferencesSettingsService.cs b/src/Files.Uwp/ServicesImplementation/Settings/PreferencesSettingsService.cs
@@ -86,12 +86,6 @@ public bool AreLayoutPreferencesPerFolder
             set => Set(value);
         }
 
-        public bool AreFileTagsEnabled
-        {
-            get => Get(false);
-            set => Set(value);
-        }
-
         public bool ShowFolderSize
         {
             get => Get(false);
@@ -155,7 +149,6 @@ protected override void RaiseOnSettingChangedEvent(object sender, SettingChanged
                 case nameof(OpenFoldersWithOneClick):
                 case nameof(SearchUnindexedItems):
                 case nameof(AreLayoutPreferencesPerFolder):
-                case nameof(AreFileTagsEnabled):
                 case nameof(ShowFolderSize):
                 case nameof(OpenSpecificPageOnStartup):
                 case nameof(ContinueLastSessionOnStartUp):
@@ -181,7 +174,6 @@ public void ReportToAppCenter()
             Analytics.TrackEvent($"{nameof(OpenFoldersWithOneClick)}, {OpenFoldersWithOneClick}");
             Analytics.TrackEvent($"{nameof(SearchUnindexedItems)}, {SearchUnindexedItems}");
             Analytics.TrackEvent($"{nameof(AreLayoutPreferencesPerFolder)}, {AreLayoutPreferencesPerFolder}");
-            Analytics.TrackEvent($"{nameof(AreFileTagsEnabled)}, {AreFileTagsEnabled}");
             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
@@ -2348,9 +2348,6 @@ We use App Center to track which settings are being used, find bugs, and fix cra
   <data name="SettingsEditFileTagsExpander.Title" xml:space="preserve">
     <value>Edit tags</value>
   </data>
-  <data name="SettingsEnableFileTags.Title" xml:space="preserve">
-    <value>Enable tags</value>
-  </data>
   <data name="SettingsShowFavoritesSection.Title" xml:space="preserve">
     <value>Show favorites section</value>
   </data>
diff --git a/src/Files.Uwp/UserControls/InnerNavigationToolbar.xaml b/src/Files.Uwp/UserControls/InnerNavigationToolbar.xaml
@@ -448,8 +448,7 @@
                                 Text="{helpers:ResourceString Name=SyncStatus}" />
                             <ToggleMenuFlyoutItem
                                 IsChecked="{x:Bind ViewModel.IsSortedByFileTag, Mode=TwoWay}"
-                                Text="{helpers:ResourceString Name=FileTags}"
-                                Visibility="{x:Bind UserSettingsService.PreferencesSettingsService.AreFileTagsEnabled, Mode=OneWay}" />
+                                Text="{helpers:ResourceString Name=FileTags}" />
                             <ToggleMenuFlyoutItem
                                 IsChecked="{x:Bind ViewModel.IsSortedByOriginalFolder, Mode=TwoWay}"
                                 IsEnabled="{x:Bind ViewModel.InstanceViewModel.IsPageTypeRecycleBin, Mode=OneWay}"
@@ -472,8 +471,7 @@
                                 Text="{helpers:ResourceString Name=SyncStatus}" />
                             <ToggleMenuFlyoutItem
                                 IsChecked="{x:Bind ViewModel.IsGroupedByFileTag, Mode=TwoWay}"
-                                Text="{helpers:ResourceString Name=FileTags}"
-                                Visibility="{x:Bind UserSettingsService.PreferencesSettingsService.AreFileTagsEnabled, Mode=OneWay}" />
+                                Text="{helpers:ResourceString Name=FileTags}" />
                             <ToggleMenuFlyoutItem
                                 IsChecked="{x:Bind ViewModel.IsGroupedByOriginalFolder, Mode=TwoWay}"
                                 IsEnabled="{x:Bind ViewModel.InstanceViewModel.IsPageTypeRecycleBin, Mode=OneWay}"
diff --git a/src/Files.Uwp/UserControls/SidebarControl.xaml b/src/Files.Uwp/UserControls/SidebarControl.xaml
@@ -36,7 +36,6 @@
             <ToggleMenuFlyoutItem IsChecked="{x:Bind ViewModel.ShowWslSection, Mode=TwoWay}" Text="{helpers:ResourceString Name=WSL}" />
             <ToggleMenuFlyoutItem
                 x:Name="SidebarContextMenuFileTagsSection"
-                x:Load="{x:Bind ViewModel.AreFileTagsEnabled, Mode=OneWay}"
                 IsChecked="{x:Bind ViewModel.ShowFileTagsSection, Mode=TwoWay}"
                 Text="{helpers:ResourceString Name=FileTags}" />
         </MenuFlyout>
diff --git a/src/Files.Uwp/ViewModels/ItemViewModel.cs b/src/Files.Uwp/ViewModels/ItemViewModel.cs
@@ -467,7 +467,6 @@ private async void UserSettingsService_OnSettingChangedEvent(object sender, Sett
                 case nameof(UserSettingsService.PreferencesSettingsService.AreSystemItemsHidden):
                 case nameof(UserSettingsService.PreferencesSettingsService.AreAlternateStreamsVisible):
                 case nameof(UserSettingsService.PreferencesSettingsService.ShowDotFiles):
-                case nameof(UserSettingsService.PreferencesSettingsService.AreFileTagsEnabled):
                 case nameof(UserSettingsService.PreferencesSettingsService.ShowFolderSize):
                     await dispatcherQueue.EnqueueAsync(() =>
                     {
diff --git a/src/Files.Uwp/ViewModels/Previews/BasePreviewModel.cs b/src/Files.Uwp/ViewModels/Previews/BasePreviewModel.cs
@@ -131,22 +131,15 @@ private async Task<List<FileProperty>> GetSystemFilePropertiesAsync()
             );
 
             // adds the value for the file tag
-            if (userSettingsService.PreferencesSettingsService.AreFileTagsEnabled)
-            {
-                list.FirstOrDefault(x => x.ID is "filetag").Value = 
-                    Item.FileTagsUI is not null ? string.Join(',', Item.FileTagsUI.Select(x => x.TagName)) : null;
-            }
-            else
-            {
-                _ = list.Remove(list.FirstOrDefault(x => x.ID is "filetag"));
-            }
+            list.FirstOrDefault(x => x.ID is "filetag").Value =
+                Item.FileTagsUI is not null ? string.Join(',', Item.FileTagsUI.Select(x => x.TagName)) : null;
 
             return list.Where(i => i.ValueText is not null).ToList();
         }
 
         private class DetailsOnlyPreviewModel : BasePreviewModel
         {
-            public DetailsOnlyPreviewModel(ListedItem item) : base(item) {}
+            public DetailsOnlyPreviewModel(ListedItem item) : base(item) { }
 
             public override Task<List<FileProperty>> LoadPreviewAndDetailsAsync() => Task.FromResult(DetailsFromPreview);
         }
diff --git a/src/Files.Uwp/ViewModels/Previews/FolderPreviewViewModel.cs b/src/Files.Uwp/ViewModels/Previews/FolderPreviewViewModel.cs
@@ -50,11 +50,8 @@ private async Task LoadPreviewAndDetailsAsync()
                 GetFileProperty("PropertyItemPathDisplay", Folder.Path),
             };
 
-            if (preferencesSettingsService.AreFileTagsEnabled)
-            {
-                Item.FileDetails.Add(GetFileProperty("FileTags",
-                    Item.FileTagsUI is not null ? string.Join(',', Item.FileTagsUI.Select(x => x.TagName)) : null));
-            }
+            Item.FileDetails.Add(GetFileProperty("FileTags",
+                Item.FileTagsUI is not null ? string.Join(',', Item.FileTagsUI.Select(x => x.TagName)) : null));
         }
 
         private static FileProperty GetFileProperty(string nameResource, object value)
diff --git a/src/Files.Uwp/ViewModels/SettingsViewModels/AppearanceViewModel.cs b/src/Files.Uwp/ViewModels/SettingsViewModels/AppearanceViewModel.cs
@@ -234,8 +234,6 @@ public bool ShowWslSection
             }
         }
 
-        public bool AreFileTagsEnabled => UserSettingsService.PreferencesSettingsService.AreFileTagsEnabled;
-
         public bool ShowFileTagsSection
         {
             get => UserSettingsService.AppearanceSettingsService.ShowFileTagsSection;
diff --git a/src/Files.Uwp/ViewModels/SettingsViewModels/ExperimentalViewModel.cs b/src/Files.Uwp/ViewModels/SettingsViewModels/ExperimentalViewModel.cs
@@ -34,19 +34,6 @@ public ExperimentalViewModel()
             SetAsOpenFileDialogCommand = new AsyncRelayCommand(SetAsOpenFileDialog);
         }
 
-        public bool AreFileTagsEnabled
-        {
-            get => UserSettingsService.PreferencesSettingsService.AreFileTagsEnabled;
-            set
-            {
-                if (value != UserSettingsService.PreferencesSettingsService.AreFileTagsEnabled)
-                {
-                    UserSettingsService.PreferencesSettingsService.AreFileTagsEnabled = value;
-                    OnPropertyChanged();
-                }
-            }
-        }
-
         public bool ShowFolderSize
         {
             get => UserSettingsService.PreferencesSettingsService.ShowFolderSize;
diff --git a/src/Files.Uwp/ViewModels/SidebarViewModel.cs b/src/Files.Uwp/ViewModels/SidebarViewModel.cs
@@ -208,11 +208,6 @@ public bool ShowFileTagsSection
             }
         }
 
-        public bool AreFileTagsEnabled
-        {
-            get => UserSettingsService.PreferencesSettingsService.AreFileTagsEnabled;
-        }
-
         private INavigationControlItem selectedSidebarItem;
 
         public INavigationControlItem SidebarSelectedItem
@@ -526,7 +521,7 @@ private async Task<LocationItem> GetOrCreateSection(SectionType sectionType)
                 case SectionType.FileTag:
                     {
                         var section = SideBarItems.FirstOrDefault(x => x.Text == "FileTags".GetLocalized()) as LocationItem;
-                        if (UserSettingsService.PreferencesSettingsService.AreFileTagsEnabled && UserSettingsService.AppearanceSettingsService.ShowFileTagsSection && section == null)
+                        if (UserSettingsService.AppearanceSettingsService.ShowFileTagsSection && section == null)
                         {
                             section = new LocationItem()
                             {
@@ -619,9 +614,6 @@ private void UserSettingsService_OnSettingChangedEvent(object sender, SettingCha
                     UpdateSectionVisibility(SectionType.FileTag, ShowFileTagsSection);
                     OnPropertyChanged(nameof(ShowFileTagsSection));
                     break;
-                case nameof(UserSettingsService.PreferencesSettingsService.AreFileTagsEnabled):
-                    OnPropertyChanged(nameof(AreFileTagsEnabled));
-                    break;
                 case nameof(UserSettingsService.AppearanceSettingsService.UseCompactStyles):
                     new SettingsViewModels.AppearanceViewModel().SetCompactStyles(true);
                     break;
diff --git a/src/Files.Uwp/Views/LayoutModes/DetailsLayoutBrowser.xaml.cs b/src/Files.Uwp/Views/LayoutModes/DetailsLayoutBrowser.xaml.cs
@@ -286,14 +286,7 @@ private void FilesystemViewModel_PageTypeUpdated(object sender, PageTypeUpdatedE
                 ColumnsViewModel.StatusColumn.Show();
             }
 
-            if (!UserSettingsService.PreferencesSettingsService.AreFileTagsEnabled)
-            {
-                ColumnsViewModel.TagColumn.Hide();
-            }
-            else
-            {
-                ColumnsViewModel.TagColumn.Show();
-            }
+            ColumnsViewModel.TagColumn.Show();
 
             UpdateSortIndicator();
         }
@@ -752,7 +745,7 @@ private void ResizeColumnToFit(int columnToResize)
 
                 if (columnToResize == 1) // file name column
                 {
-                    columnSizeToFit += UserSettingsService.PreferencesSettingsService.AreFileTagsEnabled ? 20 : 0;
+                    columnSizeToFit += 20;
                 }
 
                 var minFitLength = Math.Max(columnSizeToFit, column.NormalMinLength);
diff --git a/src/Files.Uwp/Views/SettingsPages/Appearance.xaml b/src/Files.Uwp/Views/SettingsPages/Appearance.xaml
@@ -177,7 +177,6 @@
                             </local:SettingsBlockControl.Icon>
                             <ToggleSwitch
                                 AutomationProperties.Name="{helpers:ResourceString Name=SettingsShowFileTagsSectionSwitch/AutomationProperties/Name}"
-                                IsEnabled="{Binding AreFileTagsEnabled}"
                                 IsOn="{Binding ShowFileTagsSection, Mode=TwoWay}"
                                 Style="{StaticResource RightAlignedToggleSwitchStyle}" />
                         </local:SettingsBlockControl>
diff --git a/src/Files.Uwp/Views/SettingsPages/Experimental.xaml b/src/Files.Uwp/Views/SettingsPages/Experimental.xaml
@@ -34,33 +34,23 @@
                 FontStyle="Italic"
                 Text="{helpers:ResourceString Name=SettingsExperimentalDescription/Text}" />
 
-            <local:SettingsBlockControl
-                Title="{helpers:ResourceString Name=SettingsEnableFileTags/Title}"
-                HorizontalAlignment="Stretch">
+            <!--  Edit File Tags  -->
+            <local:SettingsBlockControl Title="{helpers:ResourceString Name=SettingsEditFileTagsExpander/Title}" HorizontalAlignment="Stretch"
+                ButtonCommand="{Binding EditFileTagsCommand}"
+                IsClickable="True">
                 <local:SettingsBlockControl.Icon>
-                    <FontIcon Glyph="&#xE1CB;" />
-                </local:SettingsBlockControl.Icon>
-                <ToggleSwitch IsOn="{Binding AreFileTagsEnabled, Mode=TwoWay}" Style="{StaticResource RightAlignedToggleSwitchStyle}" />
-                <local:SettingsBlockControl.ExpandableContent>
-                    <local:SettingsBlockControl
-                        Title="{helpers:ResourceString Name=SettingsEditFileTagsExpander/Title}"
-                        ButtonCommand="{Binding EditFileTagsCommand}"
-                        IsClickable="True">
-                        <local:SettingsBlockControl.Icon>
-                            <FontIcon
-                                FontSize="14"
-                                Foreground="{ThemeResource TextFillColorPrimaryBrush}"
-                                Glyph="&#xE104;" />
-                        </local:SettingsBlockControl.Icon>
-
-                        <FontIcon
+                    <FontIcon
                             FontSize="14"
                             Foreground="{ThemeResource TextFillColorPrimaryBrush}"
-                            Glyph="&#xE2B4;" />
-                    </local:SettingsBlockControl>
-                </local:SettingsBlockControl.ExpandableContent>
-            </local:SettingsBlockControl>
+                            Glyph="&#xE104;" />
+                </local:SettingsBlockControl.Icon>
 
+                <FontIcon
+                    FontSize="14"
+                    Foreground="{ThemeResource TextFillColorPrimaryBrush}"
+                    Glyph="&#xE2B4;" />
+            </local:SettingsBlockControl>
+            
             <local:SettingsBlockControl
                 Title="{helpers:ResourceString Name=ShowFolderSize}"
                 HorizontalAlignment="Stretch"

Original file line number	Diff line number	Diff line change
`@@ -662,7 +662,7 @@ private async Task LoadMenuItemsAsync()`
`662`	`662`	`secondaryElements.OfType<FrameworkElement>().ForEach(i => i.MinWidth = Constants.UI.ContextMenuItemsMaxWidth); // Set menu min width`
`663`	`663`	`secondaryElements.ForEach(i => ItemContextMenuFlyout.SecondaryCommands.Add(i));`
`664`	`664`
`665`		`- if (UserSettingsService.PreferencesSettingsService.AreFileTagsEnabled && InstanceViewModel.CanTagFilesInPage)`
	`665`	`+ if (InstanceViewModel.CanTagFilesInPage)`
`666`	`666`	`{`
`667`	`667`	`AddNewFileTagsToMenu(ItemContextMenuFlyout);`
`668`	`668`	`}`
Original file line number	Diff line number	Diff line change
`@@ -133,8 +133,7 @@ public string[] FileTags`
`133`	`133`
`134`	`134`	`public IList<FileTagViewModel> FileTagsUI`
`135`	`135`	`{`
`136`		`- get => UserSettingsService.PreferencesSettingsService.AreFileTagsEnabled ?`
`137`		`- FileTagsSettingsService.GetTagsByIds(FileTags) : null;`
	`136`	`+ get => FileTagsSettingsService.GetTagsByIds(FileTags);`
`138`	`137`	`}`
`139`	`138`
`140`	`139`	`private Uri customIconSource;`
Original file line number	Diff line number	Diff line change
`@@ -467,7 +467,6 @@ private async void UserSettingsService_OnSettingChangedEvent(object sender, Sett`
`467`	`467`	`case nameof(UserSettingsService.PreferencesSettingsService.AreSystemItemsHidden):`
`468`	`468`	`case nameof(UserSettingsService.PreferencesSettingsService.AreAlternateStreamsVisible):`
`469`	`469`	`case nameof(UserSettingsService.PreferencesSettingsService.ShowDotFiles):`
`470`		`- case nameof(UserSettingsService.PreferencesSettingsService.AreFileTagsEnabled):`
`471`	`470`	`case nameof(UserSettingsService.PreferencesSettingsService.ShowFolderSize):`
`472`	`471`	`await dispatcherQueue.EnqueueAsync(() =>`
`473`	`472`	`{`