Merge branch 'main' into feat/custom-date-range

mobile/lib/domain/models/store.model.dart

@@ -19,35 +19,13 @@ enum StoreKey<T> {
   backgroundBackup<bool>._(14),
   sslClientCertData<String>._(15),
   sslClientPasswd<String>._(16),
-  // user settings from [AppSettingsEnum] below:
-  loadPreview<bool>._(100),
-  loadOriginal<bool>._(101),
-  tilesPerRow<int>._(103),
-  dynamicLayout<bool>._(104),
-  groupAssetsBy<int>._(105),
   uploadErrorNotificationGracePeriod<int>._(106),
-  backgroundBackupTotalProgress<bool>._(107),
-  backgroundBackupSingleProgress<bool>._(108),
-  storageIndicator<bool>._(109),
-  thumbnailCacheSize<int>._(110),
-  imageCacheSize<int>._(111),
-  albumThumbnailCacheSize<int>._(112),
   selectedAlbumSortOrder<int>._(113),
   advancedTroubleshooting<bool>._(114),
-  preferRemoteImage<bool>._(116),
-  loopVideo<bool>._(117),
-  // map related settings
-  mapShowFavoriteOnly<bool>._(118),
-  mapRelativeDate<int>._(119),
   selfSignedCert<bool>._(120),
-  mapIncludeArchived<bool>._(121),
-  ignoreIcloudAssets<bool>._(122),
   selectedAlbumSortReverse<bool>._(123),
-  mapThemeMode<int>._(124),
-  mapwithPartners<bool>._(125),
   enableHapticFeedback<bool>._(126),
   customHeaders<String>._(127),
-
   syncAlbums<bool>._(131),
 
   // Auto endpoint switching
@@ -56,48 +34,46 @@ enum StoreKey<T> {
   localEndpoint<String>._(134),
   externalEndpointList<String>._(135),
 
-  // Video settings
-  loadOriginalVideo<bool>._(136),
   manageLocalMediaAndroid<bool>._(137),
-
   // Read-only Mode settings
   readonlyModeEnabled<bool>._(138),
-
-  autoPlayVideo<bool>._(139),
   albumGridView<bool>._(140),
-
-  // Image viewer navigation settings
-  tapToNavigate<bool>._(141),
+  loadOriginal<bool>._(101),
 
   // Map custom time range settings
   mapCustomFrom<String>._(142),
   mapCustomTo<String>._(143),
 
   // Experimental stuff
-  photoManagerCustomFilter<bool>._(1000),
-  betaPromptShown<bool>._(1001),
-  betaTimeline<bool>._(1002),
   enableBackup<bool>._(1003),
   useWifiForUploadVideos<bool>._(1004),
   useWifiForUploadPhotos<bool>._(1005),
-  needBetaMigration<bool>._(1006),
-  // TODO: Remove this after patching open-api
-  shouldResetSync<bool>._(1007),
-
-  // Free up space
-  cleanupKeepFavorites<bool>._(1008),
-  cleanupKeepMediaType<int>._(1009),
-  cleanupKeepAlbumIds<String>._(1010),
-  cleanupCutoffDaysAgo<int>._(1011),
-  cleanupDefaultsInitialized<bool>._(1012),
-
   syncMigrationStatus<String>._(1013),
 
   // Legacy keys that have been migrated to the new metadata store
+  legacyLoopVideo<bool>._(117),
+  legacyLoadOriginalVideo<bool>._(136),
+  legacyAutoPlayVideo<bool>._(139),
+  legacyTapToNavigate<bool>._(141),
+  legacyPreferRemoteImage<bool>._(116),
+  legacyLoadOriginal<bool>._(101),
   legacyPrimaryColor<String>._(128),
   legacyDynamicTheme<bool>._(129),
   legacyColorfulInterface<bool>._(130),
   legacyThemeMode<String>._(102),
+  legacyCleanupKeepFavorites<bool>._(1008),
+  legacyCleanupKeepMediaType<int>._(1009),
+  legacyCleanupKeepAlbumIds<String>._(1010),
+  legacyCleanupCutoffDaysAgo<int>._(1011),
+  legacyCleanupDefaultsInitialized<bool>._(1012),
+  legacyTilesPerRow<int>._(103),
+  legacyGroupAssetsBy<int>._(105),
+  legacyStorageIndicator<bool>._(109),
+  legacyMapRelativeDate<int>._(119),
+  legacyMapShowFavoriteOnly<bool>._(118),
+  legacyMapIncludeArchived<bool>._(121),
+  legacyMapThemeMode<int>._(124),
+  legacyMapwithPartners<bool>._(125),
   legacyLogLevel<int>._(115);
 
   const StoreKey._(this.id);
@@ -122,7 +98,9 @@ StoreDto: {
 
   @override
   bool operator ==(covariant StoreDto<T> other) {
-    if (identical(this, other)) return true;
+    if (identical(this, other)) {
+      return true;
+    }
 
     return other.key == key && other.value == value;
   }