Rename: Separate file and album magic property class

lib/db/files_db.dart

@@ -10,7 +10,7 @@ import 'package:photos/models/file.dart';
 import 'package:photos/models/file_load_result.dart';
 import 'package:photos/models/file_type.dart';
 import 'package:photos/models/location/location.dart';
-import 'package:photos/models/metadata/magic_metadata.dart';
+import "package:photos/models/metadata/common_keys.dart";
 import 'package:photos/utils/file_uploader_util.dart';
 import 'package:sqflite/sqflite.dart';
 import 'package:sqflite_migration/sqflite_migration.dart';
@@ -264,7 +264,7 @@ class FilesDB {
         ALTER TABLE $filesTable ADD COLUMN $columnMMdVersion INTEGER DEFAULT 0;
       ''',
       '''
-        ALTER TABLE $filesTable ADD COLUMN $columnMMdVisibility INTEGER DEFAULT $visibilityVisible;
+        ALTER TABLE $filesTable ADD COLUMN $columnMMdVisibility INTEGER DEFAULT $visibleVisibility;
       '''
     ];
   }
@@ -500,7 +500,7 @@ class FilesDB {
     int ownerID, {
     int? limit,
     bool? asc,
-    int visibility = visibilityVisible,
+    int visibility = visibleVisibility,
     Set<int>? ignoredCollectionIDs,
   }) async {
     final stopWatch = Stopwatch()..start();
@@ -542,7 +542,7 @@ class FilesDB {
       where:
           '$columnCreationTime >= ? AND $columnCreationTime <= ? AND ($columnOwnerID IS NULL OR $columnOwnerID = ?)  AND ($columnMMdVisibility IS NULL OR $columnMMdVisibility = ?)'
           ' AND ($columnLocalID IS NOT NULL OR ($columnCollectionID IS NOT NULL AND $columnCollectionID IS NOT -1))',
-      whereArgs: [startTime, endTime, ownerID, visibilityVisible],
+      whereArgs: [startTime, endTime, ownerID, visibleVisibility],
       orderBy:
           '$columnCreationTime ' + order + ', $columnModificationTime ' + order,
       limit: limit,
@@ -613,7 +613,7 @@ class FilesDB {
     int endTime, {
     int? limit,
     bool? asc,
-    int visibility = visibilityVisible,
+    int visibility = visibleVisibility,
   }) async {
     final db = await instance.database;
     final order = (asc ?? false ? 'ASC' : 'DESC');
@@ -703,7 +703,7 @@ class FilesDB {
         whereClause += " OR ";
       }
     }
-    whereClause += ") AND $columnMMdVisibility = $visibilityVisible";
+    whereClause += ") AND $columnMMdVisibility = $visibleVisibility";
     final results = await db.query(
       filesTable,
       where: whereClause,
@@ -1484,7 +1484,7 @@ class FilesDB {
           ' AND $columnCreationTime >= ? AND $columnCreationTime <= ? AND '
           '($columnMMdVisibility IS NULL OR $columnMMdVisibility = ?)'
           ' AND ($columnLocalID IS NOT NULL OR ($columnCollectionID IS NOT NULL AND $columnCollectionID IS NOT -1))',
-      whereArgs: [startTime, endTime, visibilityVisible],
+      whereArgs: [startTime, endTime, visibleVisibility],
       orderBy:
           '$columnCreationTime ' + order + ', $columnModificationTime ' + order,
       limit: limit,

lib/models/collection.dart

@@ -2,7 +2,8 @@ import 'dart:convert';
 import 'dart:core';
 
 import 'package:flutter/foundation.dart';
-import 'package:photos/models/metadata/magic_metadata.dart';
+import "package:photos/models/metadata/collection_magic.dart";
+import "package:photos/models/metadata/common_keys.dart";
 
 class Collection {
   final int id;
@@ -46,7 +47,7 @@ class Collection {
   });
 
   bool isArchived() {
-    return mMdVersion > 0 && magicMetadata.visibility == visibilityArchive;
+    return mMdVersion > 0 && magicMetadata.visibility == archiveVisibility;
   }
 
   // hasLink returns true if there's any link attached to the collection
@@ -60,7 +61,7 @@ class Collection {
     if (isDefaultHidden()) {
       return true;
     }
-    return mMdVersion > 0 && (magicMetadata.visibility == visibilityHidden);
+    return mMdVersion > 0 && (magicMetadata.visibility == hiddenVisibility);
   }
 
   bool isDefaultHidden() {

lib/models/file.dart

@@ -9,7 +9,8 @@ import 'package:photos/core/constants.dart';
 import 'package:photos/models/ente_file.dart';
 import 'package:photos/models/file_type.dart';
 import 'package:photos/models/location/location.dart';
-import 'package:photos/models/metadata/magic_metadata.dart';
+import "package:photos/models/metadata/file_magic.dart";
+
 import 'package:photos/services/feature_flag_service.dart';
 import 'package:photos/utils/date_time_util.dart';
 import 'package:photos/utils/exif_util.dart';

lib/models/metadata/collection_magic.dart

@@ -0,0 +1,46 @@
+import 'dart:convert';
+
+import "package:photos/models/metadata/common_keys.dart";
+
+// Collection SubType Constants
+const subTypeDefaultHidden = 1;
+const subTypeSharedFilesCollection = 2;
+
+// key for collection subType
+const subTypeKey = 'subType';
+
+class CollectionMagicMetadata {
+  // 0 -> visible
+  // 1 -> archived
+  // 2 -> hidden etc?
+  int visibility;
+
+  // null/0 value -> no subType
+  // 1 -> DEFAULT_HIDDEN COLLECTION for files hidden individually
+  // 2 -> Collections created for sharing selected files
+  int? subType;
+
+  CollectionMagicMetadata({required this.visibility, this.subType});
+
+  Map<String, dynamic> toJson() {
+    final result = {magicKeyVisibility: visibility};
+    if (subType != null) {
+      result[subTypeKey] = subType!;
+    }
+    return result;
+  }
+
+  factory CollectionMagicMetadata.fromEncodedJson(String encodedJson) =>
+      CollectionMagicMetadata.fromJson(jsonDecode(encodedJson));
+
+  factory CollectionMagicMetadata.fromJson(dynamic json) =>
+      CollectionMagicMetadata.fromMap(json);
+
+  static fromMap(Map<String, dynamic>? map) {
+    if (map == null) return null;
+    return CollectionMagicMetadata(
+      visibility: map[magicKeyVisibility] ?? visibleVisibility,
+      subType: map[subTypeKey],
+    );
+  }
+}

lib/models/metadata/common_keys.dart

@@ -0,0 +1,6 @@
+const magicKeyVisibility = 'visibility';
+
+// Visibility Constants
+const visibleVisibility = 0;
+const archiveVisibility = 1;
+const hiddenVisibility = 2;

lib/models/metadata/file_magic.dart

@@ -0,0 +1,82 @@
+import "dart:convert";
+
+import 'package:photos/models/metadata/common_keys.dart';
+
+const editTimeKey = 'editedTime';
+const editNameKey = 'editedName';
+const captionKey = "caption";
+const uploaderNameKey = "uploaderName";
+const widthKey = 'w';
+const heightKey = 'h';
+const latKey = "lat";
+const longKey = "long";
+const motionVideoIndexKey = "mvi";
+
+class MagicMetadata {
+  // 0 -> visible
+  // 1 -> archived
+  // 2 -> hidden etc?
+  int visibility;
+
+  MagicMetadata({required this.visibility});
+
+  factory MagicMetadata.fromEncodedJson(String encodedJson) =>
+      MagicMetadata.fromJson(jsonDecode(encodedJson));
+
+  factory MagicMetadata.fromJson(dynamic json) => MagicMetadata.fromMap(json);
+
+  static fromMap(Map<String, dynamic>? map) {
+    if (map == null) return null;
+    return MagicMetadata(
+      visibility: map[magicKeyVisibility] ?? visibleVisibility,
+    );
+  }
+}
+
+class PubMagicMetadata {
+  int? editedTime;
+  String? editedName;
+  String? caption;
+  String? uploaderName;
+  int? w;
+  int? h;
+  double? lat;
+  double? long;
+
+  // Motion Video Index. Positive value indicates that the file is a motion
+  // photo
+  int? mvi;
+
+  PubMagicMetadata({
+    this.editedTime,
+    this.editedName,
+    this.caption,
+    this.uploaderName,
+    this.w,
+    this.h,
+    this.lat,
+    this.long,
+    this.mvi,
+  });
+
+  factory PubMagicMetadata.fromEncodedJson(String encodedJson) =>
+      PubMagicMetadata.fromJson(jsonDecode(encodedJson));
+
+  factory PubMagicMetadata.fromJson(dynamic json) =>
+      PubMagicMetadata.fromMap(json);
+
+  static fromMap(Map<String, dynamic>? map) {
+    if (map == null) return null;
+    return PubMagicMetadata(
+      editedTime: map[editTimeKey],
+      editedName: map[editNameKey],
+      caption: map[captionKey],
+      uploaderName: map[uploaderNameKey],
+      w: map[widthKey],
+      h: map[heightKey],
+      lat: map[latKey],
+      long: map[longKey],
+      mvi: map[motionVideoIndexKey],
+    );
+  }
+}

lib/models/metadata/magic_metadata.dart

@@ -1,128 +0,0 @@
-import 'dart:convert';
-
-// Visibility Constants
-const visibilityVisible = 0;
-const visibilityArchive = 1;
-const visibilityHidden = 2;
-
-// Collection SubType Constants
-const subTypeDefaultHidden = 1;
-const subTypeSharedFilesCollection = 2;
-
-const magicKeyVisibility = 'visibility';
-// key for collection subType
-const subTypeKey = 'subType';
-
-const pubMagicKeyEditedTime = 'editedTime';
-const pubMagicKeyEditedName = 'editedName';
-const pubMagicKeyCaption = "caption";
-const pubMagicKeyUploaderName = "uploaderName";
-const publicMagicKeyWidth = 'w';
-const publicMagicKeyHeight = 'h';
-const pubMagicKeyLat = "lat";
-const pubMagicKeyLong = "long";
-const pubMotionVideoIndex = "mvi";
-
-class MagicMetadata {
-  // 0 -> visible
-  // 1 -> archived
-  // 2 -> hidden etc?
-  int visibility;
-
-  MagicMetadata({required this.visibility});
-
-  factory MagicMetadata.fromEncodedJson(String encodedJson) =>
-      MagicMetadata.fromJson(jsonDecode(encodedJson));
-
-  factory MagicMetadata.fromJson(dynamic json) => MagicMetadata.fromMap(json);
-
-  static fromMap(Map<String, dynamic>? map) {
-    if (map == null) return null;
-    return MagicMetadata(
-      visibility: map[magicKeyVisibility] ?? visibilityVisible,
-    );
-  }
-}
-
-class PubMagicMetadata {
-  int? editedTime;
-  String? editedName;
-  String? caption;
-  String? uploaderName;
-  int? w;
-  int? h;
-  double? lat;
-  double? long;
-  // Motion Video Index. Positive value indicates that the file is a motion
-  // photo
-  int? mvi;
-
-  PubMagicMetadata({
-    this.editedTime,
-    this.editedName,
-    this.caption,
-    this.uploaderName,
-    this.w,
-    this.h,
-    this.lat,
-    this.long,
-    this.mvi,
-  });
-
-  factory PubMagicMetadata.fromEncodedJson(String encodedJson) =>
-      PubMagicMetadata.fromJson(jsonDecode(encodedJson));
-
-  factory PubMagicMetadata.fromJson(dynamic json) =>
-      PubMagicMetadata.fromMap(json);
-
-  static fromMap(Map<String, dynamic>? map) {
-    if (map == null) return null;
-    return PubMagicMetadata(
-      editedTime: map[pubMagicKeyEditedTime],
-      editedName: map[pubMagicKeyEditedName],
-      caption: map[pubMagicKeyCaption],
-      uploaderName: map[pubMagicKeyUploaderName],
-      w: map[publicMagicKeyWidth],
-      h: map[publicMagicKeyHeight],
-      lat: map[pubMagicKeyLat],
-      long: map[pubMagicKeyLong],
-      mvi: map[pubMotionVideoIndex],
-    );
-  }
-}
-
-class CollectionMagicMetadata {
-  // 0 -> visible
-  // 1 -> archived
-  // 2 -> hidden etc?
-  int visibility;
-
-  // null/0 value -> no subType
-  // 1 -> DEFAULT_HIDDEN COLLECTION for files hidden individually
-  // 2 -> Collections created for sharing selected files
-  int? subType;
-
-  CollectionMagicMetadata({required this.visibility, this.subType});
-
-  Map<String, dynamic> toJson() {
-    final result = {magicKeyVisibility: visibility};
-    if (subType != null) {
-      result[subTypeKey] = subType!;
-    }
-    return result;
-  }
-
-  factory CollectionMagicMetadata.fromEncodedJson(String encodedJson) =>
-      CollectionMagicMetadata.fromJson(jsonDecode(encodedJson));
-
-  factory CollectionMagicMetadata.fromJson(dynamic json) =>
-      CollectionMagicMetadata.fromMap(json);
-
-  static fromMap(Map<String, dynamic>? map) {
-    if (map == null) return null;
-    return CollectionMagicMetadata(
-      visibility: map[magicKeyVisibility] ?? visibilityVisible,
-      subType: map[subTypeKey],
-    );
-  }
-}

lib/services/collections_service.dart

@@ -26,7 +26,7 @@ import 'package:photos/models/collection.dart';
 import 'package:photos/models/collection_file_item.dart';
 import 'package:photos/models/collection_items.dart';
 import 'package:photos/models/file.dart';
-import 'package:photos/models/metadata/magic_metadata.dart';
+import "package:photos/models/metadata/collection_magic.dart";
 import 'package:photos/services/app_lifecycle_service.dart';
 import 'package:photos/services/file_magic_service.dart';
 import 'package:photos/services/local_sync_service.dart';

lib/services/file_magic_service.dart

@@ -13,7 +13,8 @@ import 'package:photos/events/force_reload_home_gallery_event.dart';
 import 'package:photos/events/local_photos_updated_event.dart';
 import 'package:photos/extensions/list.dart';
 import 'package:photos/models/file.dart';
-import 'package:photos/models/metadata/magic_metadata.dart';
+import "package:photos/models/metadata/common_keys.dart";
+import "package:photos/models/metadata/file_magic.dart";
 import 'package:photos/services/remote_sync_service.dart';
 import 'package:photos/utils/crypto_util.dart';
 import 'package:photos/utils/file_download_util.dart';
@@ -34,7 +35,7 @@ class FileMagicService {
   Future<void> changeVisibility(List<File> files, int visibility) async {
     final Map<String, dynamic> update = {magicKeyVisibility: visibility};
     await _updateMagicData(files, update);
-    if (visibility == visibilityVisible) {
+    if (visibility == visibleVisibility) {
       // Force reload home gallery to pull in the now unarchived files
       Bus.instance.fire(ForceReloadHomeGalleryEvent("unarchivedFiles"));
       Bus.instance.fire(

lib/services/files_service.dart

@@ -7,7 +7,7 @@ import 'package:photos/db/files_db.dart';
 import 'package:photos/extensions/list.dart';
 import 'package:photos/models/file.dart';
 import "package:photos/models/file_load_result.dart";
-import 'package:photos/models/metadata/magic_metadata.dart';
+import "package:photos/models/metadata/file_magic.dart";
 import 'package:photos/services/file_magic_service.dart';
 import "package:photos/services/ignored_files_service.dart";
 import 'package:photos/utils/date_time_util.dart';
@@ -75,7 +75,7 @@ class FilesService {
       if (timeResult != null) {
         remoteFilesToUpdate.add(remoteFile);
         fileIDToUpdateMetadata[remoteFile.uploadedFileID!] = {
-          pubMagicKeyEditedTime: timeResult,
+          editTimeKey: timeResult,
         };
       }
     }

lib/services/hidden_service.dart

@@ -10,7 +10,8 @@ import 'package:photos/events/local_photos_updated_event.dart';
 import 'package:photos/models/api/collection/create_request.dart';
 import 'package:photos/models/collection.dart';
 import 'package:photos/models/file.dart';
-import 'package:photos/models/metadata/magic_metadata.dart';
+import "package:photos/models/metadata/collection_magic.dart";
+import "package:photos/models/metadata/common_keys.dart";
 import 'package:photos/services/collections_service.dart';
 import 'package:photos/services/file_magic_service.dart';
 import 'package:photos/utils/crypto_util.dart';
@@ -120,7 +121,7 @@ extension HiddenService on CollectionsService {
   Future<Collection> _createDefaultHiddenAlbum() async {
     final CreateRequest createRequest = await buildCollectionCreateRequest(
       ".Hidden",
-      visibility: visibilityHidden,
+      visibility: hiddenVisibility,
       subType: subTypeDefaultHidden,
     );
     _logger.info("Creating Hidden Collection");

lib/ui/actions/collection/collection_sharing_actions.dart

@@ -8,7 +8,8 @@ import 'package:photos/models/api/collection/create_request.dart';
 import 'package:photos/models/collection.dart';
 import 'package:photos/models/file.dart';
 import 'package:photos/models/files_split.dart';
-import 'package:photos/models/metadata/magic_metadata.dart';
+import "package:photos/models/metadata/collection_magic.dart";
+import "package:photos/models/metadata/common_keys.dart";
 import 'package:photos/services/collections_service.dart';
 import 'package:photos/services/hidden_service.dart';
 import 'package:photos/services/user_service.dart';
@@ -120,7 +121,7 @@ class CollectionActions {
       final CreateRequest req =
           await collectionsService.buildCollectionCreateRequest(
         dummyName,
-        visibility: visibilityVisible,
+        visibility: visibleVisibility,
         subType: subTypeSharedFilesCollection,
       );
       final collection = await collectionsService.createAndCacheCollection(

lib/ui/collections/archived_collections_button_widget.dart

@@ -2,7 +2,7 @@ import 'package:flutter/material.dart';
 import 'package:photos/core/configuration.dart';
 import 'package:photos/db/files_db.dart';
 import "package:photos/generated/l10n.dart";
-import 'package:photos/models/metadata/magic_metadata.dart';
+import "package:photos/models/metadata/common_keys.dart";
 import "package:photos/services/collections_service.dart";
 import 'package:photos/ui/viewer/gallery/archive_page.dart';
 import 'package:photos/utils/navigation_util.dart';
@@ -48,7 +48,7 @@ class ArchivedCollectionsButtonWidget extends StatelessWidget {
                   const Padding(padding: EdgeInsets.all(6)),
                   FutureBuilder<int>(
                     future: FilesDB.instance.archivedFilesCount(
-                      visibilityArchive,
+                      archiveVisibility,
                       Configuration.instance.getUserID()!,
                       hiddenCollectionId,
                     ),

lib/ui/viewer/actions/file_selection_actions_widget.dart

@@ -8,7 +8,7 @@ import 'package:photos/models/device_collection.dart';
 import 'package:photos/models/file.dart';
 import 'package:photos/models/files_split.dart';
 import 'package:photos/models/gallery_type.dart';
-import 'package:photos/models/metadata/magic_metadata.dart';
+import "package:photos/models/metadata/common_keys.dart";
 import 'package:photos/models/selected_files.dart';
 import 'package:photos/services/collections_service.dart';
 import 'package:photos/services/hidden_service.dart';
@@ -349,7 +349,7 @@ class _FileSelectionActionWidgetState extends State<FileSelectionActionWidget> {
     await changeVisibility(
       context,
       split.ownedByCurrentUser,
-      visibilityArchive,
+      archiveVisibility,
     );
     widget.selectedFiles.clearAll();
   }
@@ -358,7 +358,7 @@ class _FileSelectionActionWidgetState extends State<FileSelectionActionWidget> {
     await changeVisibility(
       context,
       split.ownedByCurrentUser,
-      visibilityVisible,
+      visibleVisibility,
     );
     widget.selectedFiles.clearAll();
   }

lib/ui/viewer/actions/file_selection_overlay_bar.dart

@@ -3,7 +3,7 @@ import "package:photos/generated/l10n.dart";
 import 'package:photos/models/collection.dart';
 import 'package:photos/models/device_collection.dart';
 import 'package:photos/models/gallery_type.dart';
-import 'package:photos/models/metadata/magic_metadata.dart';
+import "package:photos/models/metadata/common_keys.dart";
 import 'package:photos/models/selected_files.dart';
 import 'package:photos/theme/ente_theme.dart';
 import 'package:photos/ui/collection_action_sheet.dart';
@@ -161,7 +161,7 @@ class _FileSelectionOverlayBarState extends State<FileSelectionOverlayBar> {
     await changeVisibility(
       context,
       widget.selectedFiles.files.toList(),
-      visibilityVisible,
+      visibleVisibility,
     );
     widget.selectedFiles.clearAll();
   }

lib/ui/viewer/file/fading_app_bar.dart

@@ -14,7 +14,7 @@ import "package:photos/generated/l10n.dart";
 import 'package:photos/models/file.dart';
 import 'package:photos/models/file_type.dart';
 import 'package:photos/models/ignored_file.dart';
-import 'package:photos/models/metadata/magic_metadata.dart';
+import "package:photos/models/metadata/common_keys.dart";
 import 'package:photos/models/selected_files.dart';
 import 'package:photos/models/trash_file.dart';
 import 'package:photos/services/collections_service.dart';
@@ -156,7 +156,7 @@ class FadingAppBarState extends State<FadingAppBar> {
           // options for files owned by the user
           if (isOwnedByUser && !isFileHidden) {
             final bool isArchived =
-                widget.file.magicMetadata.visibility == visibilityArchive;
+                widget.file.magicMetadata.visibility == archiveVisibility;
             items.add(
               PopupMenuItem(
                 value: 2,
@@ -290,11 +290,11 @@ class FadingAppBarState extends State<FadingAppBar> {
 
   Future<void> _toggleFileArchiveStatus(File file) async {
     final bool isArchived =
-        widget.file.magicMetadata.visibility == visibilityArchive;
+        widget.file.magicMetadata.visibility == archiveVisibility;
     await changeVisibility(
       context,
       [widget.file],
-      isArchived ? visibilityVisible : visibilityArchive,
+      isArchived ? visibleVisibility : archiveVisibility,
     );
     if (mounted) {
       setState(() {});

lib/ui/viewer/file/file_details_widget.dart

@@ -5,7 +5,7 @@ import "package:photos/core/configuration.dart";
 import "package:photos/generated/l10n.dart";
 import "package:photos/models/file.dart";
 import "package:photos/models/file_type.dart";
-import 'package:photos/models/metadata/magic_metadata.dart';
+import "package:photos/models/metadata/file_magic.dart";
 import "package:photos/services/file_magic_service.dart";
 import "package:photos/services/update_service.dart";
 import 'package:photos/theme/ente_theme.dart';
@@ -255,8 +255,8 @@ class _FileDetailsWidgetState extends State<FileDetailsWidget> {
         await FileMagicService.instance.updatePublicMagicMetadata([
           widget.file
         ], {
-          pubMagicKeyLat: locationDataFromExif!.latitude,
-          pubMagicKeyLong: locationDataFromExif.longitude
+          latKey: locationDataFromExif!.latitude,
+          longKey: locationDataFromExif.longitude
         });
         hasLocationData.value = true;
       }

lib/ui/viewer/file/zoomable_image.dart

@@ -13,7 +13,7 @@ import 'package:photos/db/files_db.dart';
 import 'package:photos/events/files_updated_event.dart';
 import 'package:photos/events/local_photos_updated_event.dart';
 import 'package:photos/models/file.dart';
-import 'package:photos/models/metadata/magic_metadata.dart';
+import "package:photos/models/metadata/file_magic.dart";
 import "package:photos/services/file_magic_service.dart";
 import 'package:photos/ui/common/loading_widget.dart';
 import 'package:photos/utils/file_util.dart';
@@ -282,8 +282,8 @@ class _ZoomableImageState extends State<ZoomableImage>
         await FileMagicService.instance.updatePublicMagicMetadata([
           widget.photo
         ], {
-          publicMagicKeyHeight: h,
-          publicMagicKeyWidth: w,
+          heightKey: h,
+          widthKey: w,
         });
       }
     }

lib/ui/viewer/file/zoomable_live_image.dart

@@ -10,7 +10,7 @@ import 'package:photos/core/constants.dart';
 import "package:photos/generated/l10n.dart";
 import 'package:photos/models/file.dart';
 import "package:photos/models/file_type.dart";
-import 'package:photos/models/metadata/magic_metadata.dart';
+import "package:photos/models/metadata/file_magic.dart";
 import "package:photos/services/file_magic_service.dart";
 import 'package:photos/ui/viewer/file/zoomable_image.dart';
 import 'package:photos/utils/file_util.dart';
@@ -184,7 +184,7 @@ class _ZoomableLiveImageState extends State<ZoomableLiveImage>
             (widget.file.ownerID ?? 0) == Configuration.instance.getUserID()!) {
           FileMagicService.instance.updatePublicMagicMetadata(
             [widget.file],
-            {pubMotionVideoIndex: index.start},
+            {motionVideoIndexKey: index.start},
           ).ignore();
         }
         return motionPhoto.getMotionVideoFile(

lib/ui/viewer/gallery/archive_page.dart

@@ -6,7 +6,7 @@ import 'package:photos/db/files_db.dart';
 import 'package:photos/events/files_updated_event.dart';
 import "package:photos/generated/l10n.dart";
 import 'package:photos/models/gallery_type.dart';
-import 'package:photos/models/metadata/magic_metadata.dart';
+import "package:photos/models/metadata/common_keys.dart";
 import 'package:photos/models/selected_files.dart';
 import 'package:photos/services/collections_service.dart';
 import "package:photos/ui/components/album_horizontal_list_widget.dart";
@@ -38,7 +38,7 @@ class ArchivePage extends StatelessWidget {
           creationStartTime,
           creationEndTime,
           Configuration.instance.getUserID()!,
-          visibility: visibilityArchive,
+          visibility: archiveVisibility,
           limit: limit,
           asc: asc,
           ignoredCollectionIDs: hiddenCollectionIDs,

lib/ui/viewer/gallery/gallery_app_bar_widget.dart

@@ -12,7 +12,7 @@ import 'package:photos/models/backup_status.dart';
 import 'package:photos/models/collection.dart';
 import 'package:photos/models/device_collection.dart';
 import 'package:photos/models/gallery_type.dart';
-import 'package:photos/models/metadata/magic_metadata.dart';
+import "package:photos/models/metadata/common_keys.dart";
 import 'package:photos/models/selected_files.dart';
 import 'package:photos/services/collections_service.dart';
 import 'package:photos/services/sync_service.dart';
@@ -366,8 +366,8 @@ class _GalleryAppBarWidgetState extends State<GalleryAppBarWidget> {
                 context,
                 widget.collection!,
                 widget.collection!.isArchived()
-                    ? visibilityVisible
-                    : visibilityArchive,
+                    ? visibleVisibility
+                    : archiveVisibility,
               );
             } else if (value == 3) {
               await _trashCollection();

lib/utils/diff_fetcher.dart

@@ -5,7 +5,7 @@ import 'package:logging/logging.dart';
 import 'package:photos/core/network/network.dart';
 import 'package:photos/db/files_db.dart';
 import 'package:photos/models/file.dart';
-import 'package:photos/models/metadata/magic_metadata.dart';
+import "package:photos/models/metadata/file_magic.dart";
 import 'package:photos/utils/crypto_util.dart';
 import 'package:photos/utils/file_download_util.dart';
 

lib/utils/file_uploader.dart

@@ -23,7 +23,8 @@ import 'package:photos/main.dart';
 import 'package:photos/models/encryption_result.dart';
 import 'package:photos/models/file.dart';
 import 'package:photos/models/file_type.dart';
-import 'package:photos/models/metadata/magic_metadata.dart';
+import "package:photos/models/metadata/file_magic.dart";
+
 import 'package:photos/models/upload_url.dart';
 import 'package:photos/services/collections_service.dart';
 import "package:photos/services/file_magic_service.dart";
@@ -462,11 +463,11 @@ class FileUploader {
         if ((mediaUploadData.height ?? 0) != 0 &&
             (mediaUploadData.width ?? 0) != 0) {
           final pubMetadata = {
-            publicMagicKeyHeight: mediaUploadData.height,
-            publicMagicKeyWidth: mediaUploadData.width
+            heightKey: mediaUploadData.height,
+            widthKey: mediaUploadData.width
           };
           if (mediaUploadData.motionPhotoStartIndex != null) {
-            pubMetadata[pubMotionVideoIndex] =
+            pubMetadata[motionVideoIndexKey] =
                 mediaUploadData.motionPhotoStartIndex;
           }
           pubMetadataRequest = await getPubMetadataRequest(

lib/utils/file_uploader_util.dart

@@ -17,7 +17,7 @@ import 'package:photos/core/errors.dart';
 import 'package:photos/models/file.dart' as ente;
 import 'package:photos/models/file_type.dart';
 import "package:photos/models/location/location.dart";
-import 'package:photos/models/metadata/magic_metadata.dart';
+import "package:photos/models/metadata/file_magic.dart";
 import "package:photos/services/file_magic_service.dart";
 import 'package:photos/utils/crypto_util.dart';
 import 'package:photos/utils/file_util.dart';

lib/utils/magic_util.dart

@@ -6,7 +6,8 @@ import 'package:photos/events/force_reload_home_gallery_event.dart';
 import "package:photos/generated/l10n.dart";
 import 'package:photos/models/collection.dart';
 import 'package:photos/models/file.dart';
-import 'package:photos/models/metadata/magic_metadata.dart';
+import "package:photos/models/metadata/common_keys.dart";
+import "package:photos/models/metadata/file_magic.dart";
 import 'package:photos/services/collections_service.dart';
 import 'package:photos/services/file_magic_service.dart';
 import 'package:photos/ui/common/progress_dialog.dart';
@@ -22,7 +23,7 @@ Future<void> changeVisibility(
 ) async {
   final dialog = createProgressDialog(
     context,
-    newVisibility == visibilityArchive
+    newVisibility == archiveVisibility
         ? S.of(context).archiving
         : S.of(context).unarchiving,
   );
@@ -31,7 +32,7 @@ Future<void> changeVisibility(
     await FileMagicService.instance.changeVisibility(files, newVisibility);
     showShortToast(
       context,
-      newVisibility == visibilityArchive
+      newVisibility == archiveVisibility
           ? S.of(context).successfullyArchived
           : S.of(context).successfullyUnarchived,
     );
@@ -51,7 +52,7 @@ Future<void> changeCollectionVisibility(
 ) async {
   final dialog = createProgressDialog(
     context,
-    newVisibility == visibilityArchive
+    newVisibility == archiveVisibility
         ? S.of(context).archiving
         : S.of(context).unarchiving,
   );
@@ -63,7 +64,7 @@ Future<void> changeCollectionVisibility(
     Bus.instance.fire(ForceReloadHomeGalleryEvent("CollectionArchiveChange"));
     showShortToast(
       context,
-      newVisibility == visibilityArchive
+      newVisibility == archiveVisibility
           ? S.of(context).successfullyArchived
           : S.of(context).successfullyUnarchived,
     );
@@ -85,7 +86,7 @@ Future<bool> editTime(
     await _updatePublicMetadata(
       context,
       files,
-      pubMagicKeyEditedTime,
+      editTimeKey,
       editedTime,
     );
     return true;
@@ -120,7 +121,7 @@ Future<void> editFilename(
       await _updatePublicMetadata(
         context,
         List.of([file]),
-        pubMagicKeyEditedName,
+        editNameKey,
         newName,
         showProgressDialogs: false,
         showDoneToast: false,
@@ -142,7 +143,7 @@ Future<bool> editFileCaption(
     await _updatePublicMetadata(
       context,
       [file],
-      pubMagicKeyCaption,
+      captionKey,
       caption,
       showDoneToast: false,
     );
@@ -194,5 +195,5 @@ Future<void> _updatePublicMetadata(
 }
 
 bool _shouldReloadGallery(String key) {
-  return key == pubMagicKeyEditedTime;
+  return key == editTimeKey;
 }

lib/utils/trash_diff_fetcher.dart

@@ -3,7 +3,8 @@ import 'dart:math';
 
 import 'package:logging/logging.dart';
 import 'package:photos/core/network/network.dart';
-import 'package:photos/models/metadata/magic_metadata.dart';
+import "package:photos/models/metadata/file_magic.dart";
+
 import 'package:photos/models/trash_file.dart';
 import 'package:photos/utils/crypto_util.dart';
 import 'package:photos/utils/file_download_util.dart';