Feature: Removed Bundles (#12616)

Author: yaira2

src/Files.App/App.xaml.cs

@@ -192,7 +192,6 @@ protected override void OnLaunched(LaunchActivatedEventArgs e)
 						.AddSingleton<ILayoutSettingsService, LayoutSettingsService>((sp) => new LayoutSettingsService((sp.GetService<IUserSettingsService>() as UserSettingsService).GetSharingContext()))
 						.AddSingleton<IAppSettingsService, AppSettingsService>((sp) => new AppSettingsService((sp.GetService<IUserSettingsService>() as UserSettingsService).GetSharingContext()))
 						.AddSingleton<IFileTagsSettingsService, FileTagsSettingsService>()
-						.AddSingleton<IBundlesSettingsService, BundlesSettingsService>()
 						.AddSingleton<IPageContext, PageContext>()
 						.AddSingleton<IContentPageContext, ContentPageContext>()
 						.AddSingleton<IDisplayPageContext, DisplayPageContext>()
@@ -343,9 +342,6 @@ await SafetyExtensions.IgnoreExceptions(async () =>
 		public static void SaveSessionTabs() 
 		{
 			IUserSettingsService userSettingsService = Ioc.Default.GetRequiredService<IUserSettingsService>();
-			IBundlesSettingsService bundlesSettingsService = Ioc.Default.GetRequiredService<IBundlesSettingsService>();
-
-			bundlesSettingsService.FlushSettings();
 
 			userSettingsService.GeneralSettingsService.LastSessionTabList = MainPageViewModel.AppInstances.DefaultIfEmpty().Select(tab =>
 			{

src/Files.App/Constants.cs

@@ -141,11 +141,6 @@ public static class ColumnViewBrowser
 
 		public static class Widgets
 		{
-			public static class Bundles
-			{
-				public const int MaxAmountOfItemsPerBundle = 8;
-			}
-
 			public static class Drives
 			{
 				public const float LowStorageSpacePercentageThreshold = 90.0f;
@@ -158,12 +153,8 @@ public static class LocalSettings
 		{
 			public const string DateTimeFormat = "datetimeformat";
 
-			public const string Theme = "theme";
-
 			public const string SettingsFolderName = "settings";
 
-			public const string BundlesSettingsFileName = "bundles.json";
-
 			public const string UserSettingsFileName = "user_settings.json";
 
 			public const string FileTagSettingsFileName = "filetags.json";

src/Files.App/Data/EventArguments/BundlesOpenPathEventArgs.cs

@@ -52,10 +52,6 @@ public static bool TryGetIsWidgetSettingEnabled<TWidget>(IGeneralSettingsService
 			{
 				return generalSettingsService.ShowFileTagsWidget;
 			}
-			if (typeof(TWidget) == typeof(BundlesWidget))
-			{
-				return generalSettingsService.ShowBundlesWidget;
-			}
 			if (typeof(TWidget) == typeof(RecentFilesWidget))
 			{
 				return generalSettingsService.ShowRecentFilesWidget;

src/Files.App/Helpers/WidgetsHelpers.cs

@@ -108,12 +108,6 @@ public bool ShowFileTagsWidget
 			set => Set(value);
 		}
 
-		public bool ShowBundlesWidget
-		{
-			get => Get(false);
-			set => Set(value);
-		}
-
 		public bool FoldersWidgetExpanded
 		{
 			get => Get(true);
@@ -138,12 +132,6 @@ public bool FileTagsWidgetExpanded
 			set => Set(value);
 		}
 
-		public bool BundlesWidgetExpanded
-		{
-			get => Get(true);
-			set => Set(value);
-		}
-
 		public bool ShowFavoritesSection
 		{
 			get => Get(true);
@@ -247,10 +235,8 @@ protected override void RaiseOnSettingChangedEvent(object sender, SettingChanged
 				case nameof(ShowQuickAccessWidget):
 				case nameof(ShowRecentFilesWidget):
 				case nameof(ShowDrivesWidget):
-				case nameof(ShowBundlesWidget):
 				case nameof(FoldersWidgetExpanded):
 				case nameof(RecentFilesWidgetExpanded):
-				case nameof(BundlesWidgetExpanded):
 				case nameof(DrivesWidgetExpanded):
 				case nameof(ShowFavoritesSection):
 				case nameof(ShowLibrarySection):

src/Files.App/ServicesImplementation/Settings/BundlesSettingsService.cs

@@ -1053,51 +1053,9 @@
   <data name="SidebarCloudDrives" xml:space="preserve">
     <value>Cloud Drives</value>
   </data>
-  <data name="BundlesWidgetOptionsFlyoutExportBundlesMenuItem.Text" xml:space="preserve">
-    <value>Export Bundles</value>
-  </data>
-  <data name="BundlesWidgetOptionsFlyoutImportBundlesMenuItem.Text" xml:space="preserve">
-    <value>Import Bundles</value>
-  </data>
-  <data name="BundlesWidgetAddBundleErrorAlreadyExists" xml:space="preserve">
-    <value>Bundle with the same name already exists!</value>
-  </data>
-  <data name="BundleItemFlyouOpenItemLocationMenuItem.Text" xml:space="preserve">
-    <value>Open item location</value>
-  </data>
-  <data name="BundleItemFlyouRemoveFromBundleMenuItem.Text" xml:space="preserve">
-    <value>Remove from bundle</value>
-  </data>
-  <data name="BundleOptionsFlyoutRemoveBundleMenuItem.Text" xml:space="preserve">
-    <value>Remove Bundle</value>
-  </data>
-  <data name="Bundles" xml:space="preserve">
-    <value>Bundles</value>
-  </data>
-  <data name="BundleNoContentsTextBlock.Text" xml:space="preserve">
-    <value>Drag and drop any file or folder here to quickly access it</value>
-  </data>
-  <data name="EnterBundleName" xml:space="preserve">
-    <value>Enter Bundle name</value>
-  </data>
-  <data name="BundlesWidgetRenameBundleDialogSubtitleText" xml:space="preserve">
-    <value>Enter new name</value>
-  </data>
-  <data name="BundlesWidgetRenameBundleDialogTitleText" xml:space="preserve">
-    <value>Rename "{0}"</value>
-  </data>
-  <data name="CreateBundle" xml:space="preserve">
-    <value>Create Bundle</value>
-  </data>
   <data name="Confirm" xml:space="preserve">
     <value>Confirm</value>
   </data>
-  <data name="BundlesWidgetCreateBundleDialogSubtitleText" xml:space="preserve">
-    <value>Add Bundle</value>
-  </data>
-  <data name="BundleOptionsFlyoutRenameBundleMenuItem.Text" xml:space="preserve">
-    <value>Rename Bundle</value>
-  </data>
   <data name="DesiredName" xml:space="preserve">
     <value>Desired name</value>
   </data>
@@ -1197,9 +1155,6 @@
   <data name="DrivesWidgetOptionsFlyoutMapNetDriveMenuItem.Text" xml:space="preserve">
     <value>Map network drive</value>
   </data>
-  <data name="BundlesWidgetMoreOptionsButton.AutomationProperties.Name" xml:space="preserve">
-    <value>More bundles options</value>
-  </data>
   <data name="SidebarFavorites" xml:space="preserve">
     <value>Favorites</value>
   </data>
@@ -1215,9 +1170,6 @@
   <data name="Arguments" xml:space="preserve">
     <value>Arguments</value>
   </data>
-  <data name="BundlesOpenInNewPane.Text" xml:space="preserve">
-    <value>Open in new Pane</value>
-  </data>
   <data name="Default" xml:space="preserve">
     <value>Default</value>
   </data>
@@ -1800,12 +1752,6 @@
   <data name="AddFile" xml:space="preserve">
     <value>Add file</value>
   </data>
-  <data name="BundleOptionsFlyoutAddFolderMenuItem.Text" xml:space="preserve">
-    <value>Add folder</value>
-  </data>
-  <data name="BundleOptionsFlyoutAddItemMenuItem.Text" xml:space="preserve">
-    <value>Add item...</value>
-  </data>
   <data name="ConsentDialogTitle" xml:space="preserve">
     <value>Updates available</value>
   </data>
@@ -1887,9 +1833,6 @@
   <data name="CredentialDialogUserName.PlaceholderText" xml:space="preserve">
     <value>UserName</value>
   </data>
-  <data name="BundlesWidgetAutomationProperties.Name" xml:space="preserve">
-    <value>Bundles Widget</value>
-  </data>
   <data name="DrivesWidgetAutomationProperties.Name" xml:space="preserve">
     <value>Drives Widget</value>
   </data>
@@ -2445,12 +2388,6 @@
   <data name="ViewMore" xml:space="preserve">
     <value>View more</value>
   </data>
-  <data name="BundlesBeingRemovedMessage" xml:space="preserve">
-    <value>But don't worry, we built a fantastic replacement that's more reliable and has more features. You can enable the File Tags widget from Settings &gt; Preferences &gt; Widgets. Enabling the tags widget will automatically turn off the bundles widget.</value>
-  </data>
-  <data name="BundlesBeingRemovedTitle" xml:space="preserve">
-    <value>Bundles will be retiring in a future update 📎</value>
-  </data>
   <data name="ShowEditTagsMenu" xml:space="preserve">
     <value>Show edit tags flyout</value>
   </data>