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

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

@@ -22,7 +22,6 @@ enum StoreKey<T> {
   // user settings from [AppSettingsEnum] below:
   loadPreview<bool>._(100),
   loadOriginal<bool>._(101),
-  themeMode<String>._(102),
   tilesPerRow<int>._(103),
   dynamicLayout<bool>._(104),
   groupAssetsBy<int>._(105),
@@ -35,7 +34,6 @@ enum StoreKey<T> {
   albumThumbnailCacheSize<int>._(112),
   selectedAlbumSortOrder<int>._(113),
   advancedTroubleshooting<bool>._(114),
-  logLevel<int>._(115),
   preferRemoteImage<bool>._(116),
   loopVideo<bool>._(117),
   // map related settings
@@ -50,11 +48,6 @@ enum StoreKey<T> {
   enableHapticFeedback<bool>._(126),
   customHeaders<String>._(127),
 
-  // theme settings
-  primaryColor<String>._(128),
-  dynamicTheme<bool>._(129),
-  colorfulInterface<bool>._(130),
-
   syncAlbums<bool>._(131),
 
   // Auto endpoint switching
@@ -98,7 +91,14 @@ enum StoreKey<T> {
   cleanupCutoffDaysAgo<int>._(1011),
   cleanupDefaultsInitialized<bool>._(1012),
 
-  syncMigrationStatus<String>._(1013);
+  syncMigrationStatus<String>._(1013),
+
+  // Legacy keys that have been migrated to the new metadata store
+  legacyPrimaryColor<String>._(128),
+  legacyDynamicTheme<bool>._(129),
+  legacyColorfulInterface<bool>._(130),
+  legacyThemeMode<String>._(102),
+  legacyLogLevel<int>._(115);
 
   const StoreKey._(this.id);
   final int id;