refactor(mobile): unify padding metrics in thumbnail tile widget

cli/package.json

@@ -20,7 +20,7 @@
     "@types/lodash-es": "^4.17.12",
     "@types/micromatch": "^4.0.9",
     "@types/mock-fs": "^4.13.1",
-    "@types/node": "^24.10.3",
+    "@types/node": "^24.10.1",
     "@vitest/coverage-v8": "^3.0.0",
     "byte-size": "^9.0.0",
     "cli-progress": "^3.12.0",

e2e/package.json

@@ -26,7 +26,7 @@
     "@playwright/test": "^1.44.1",
     "@socket.io/component-emitter": "^3.1.2",
     "@types/luxon": "^3.4.2",
-    "@types/node": "^24.10.3",
+    "@types/node": "^24.10.1",
     "@types/oidc-provider": "^9.0.0",
     "@types/pg": "^8.15.1",
     "@types/pngjs": "^6.0.4",

i18n/en.json

@@ -2062,6 +2062,7 @@
   "theme": "Theme",
   "theme_selection": "Theme selection",
   "theme_selection_description": "Automatically set the theme to light or dark based on your browser's system preference",
+  "theme_setting_asset_list_show_owner_name_title": "Show asset owner name",
   "theme_setting_asset_list_storage_indicator_title": "Show storage indicator on asset tiles",
   "theme_setting_asset_list_tiles_per_row_title": "Number of assets per row ({count})",
   "theme_setting_colorful_interface_subtitle": "Apply primary color to background surfaces.",

mobile/lib/constants/enums.dart

@@ -7,5 +7,3 @@ enum AssetVisibilityEnum { timeline, hidden, archive, locked }
 enum SortUserBy { id }
 
 enum ActionSource { timeline, viewer }
-
-enum ButtonPosition { bottomBar, kebabMenu, other }

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

@@ -9,7 +9,8 @@ enum Setting<T> {
   autoPlayVideo<bool>(StoreKey.autoPlayVideo, true),
   preferRemoteImage<bool>(StoreKey.preferRemoteImage, false),
   advancedTroubleshooting<bool>(StoreKey.advancedTroubleshooting, false),
-  enableBackup<bool>(StoreKey.enableBackup, false);
+  enableBackup<bool>(StoreKey.enableBackup, false),
+  showOwnerName<bool>(StoreKey.showOwnerName, false);
 
   const Setting(this.storeKey, this.defaultValue);
 

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

@@ -72,6 +72,7 @@ enum StoreKey<T> {
 
   autoPlayVideo<bool>._(139),
   albumGridView<bool>._(140),
+  showOwnerName<bool>._(141),
 
   // Experimental stuff
   photoManagerCustomFilter<bool>._(1000),

mobile/lib/presentation/widgets/action_buttons/edit_image_action_button.widget.dart

@@ -8,10 +8,7 @@ import 'package:immich_mobile/providers/infrastructure/asset_viewer/current_asse
 import 'package:immich_mobile/routing/router.dart';
 
 class EditImageActionButton extends ConsumerWidget {
-  final bool iconOnly;
-  final bool menuItem;
-
-  const EditImageActionButton({super.key, this.iconOnly = false, this.menuItem = false});
+  const EditImageActionButton({super.key});
 
   @override
   Widget build(BuildContext context, WidgetRef ref) {
@@ -30,8 +27,6 @@ class EditImageActionButton extends ConsumerWidget {
       iconData: Icons.tune,
       label: "edit".t(context: context),
       onPressed: onPress,
-      iconOnly: iconOnly,
-      menuItem: menuItem,
     );
   }
 }

mobile/lib/presentation/widgets/action_buttons/like_activity_action_button.widget.dart

@@ -47,7 +47,7 @@ class LikeActivityActionButton extends ConsumerWidget {
 
         return BaseActionButton(
           maxWidth: 60,
-          iconData: liked != null ? Icons.thumb_up : Icons.thumb_up_off_alt,
+          iconData: liked != null ? Icons.favorite : Icons.favorite_border,
           label: "like".t(context: context),
           onPressed: () => onTap(liked),
           iconOnly: iconOnly,
@@ -57,7 +57,7 @@ class LikeActivityActionButton extends ConsumerWidget {
 
       // default to empty heart during loading
       loading: () => BaseActionButton(
-        iconData: Icons.thumb_up_off_alt,
+        iconData: Icons.favorite_border,
         label: "like".t(context: context),
         iconOnly: iconOnly,
         menuItem: menuItem,

mobile/lib/presentation/widgets/action_buttons/open_activity_action_button.widget.dart

@@ -1,24 +0,0 @@
-import 'package:flutter/material.dart';
-import 'package:hooks_riverpod/hooks_riverpod.dart';
-import 'package:immich_mobile/domain/models/events.model.dart';
-import 'package:immich_mobile/domain/utils/event_stream.dart';
-import 'package:immich_mobile/extensions/translate_extensions.dart';
-import 'package:immich_mobile/presentation/widgets/action_buttons/base_action_button.widget.dart';
-
-class OpenActivityActionButton extends ConsumerWidget {
-  const OpenActivityActionButton({super.key, this.iconOnly = false, this.menuItem = false});
-
-  final bool iconOnly;
-  final bool menuItem;
-
-  @override
-  Widget build(BuildContext context, WidgetRef ref) {
-    return BaseActionButton(
-      iconData: Icons.chat_outlined,
-      label: "activity".t(context: context),
-      onPressed: () => EventStream.shared.emit(const ViewerOpenBottomSheetEvent(activitiesMode: true)),
-      iconOnly: iconOnly,
-      menuItem: menuItem,
-    );
-  }
-}

mobile/lib/presentation/widgets/asset_viewer/activities_bottom_sheet.widget.dart

@@ -79,7 +79,7 @@ class ActivitiesBottomSheet extends HookConsumerWidget {
       expand: false,
       shouldCloseOnMinExtent: false,
       resizeOnScroll: false,
-      backgroundColor: context.isDarkTheme ? context.colorScheme.surface : Colors.white,
+      backgroundColor: context.isDarkTheme ? Colors.black : Colors.white,
     );
   }
 }

mobile/lib/presentation/widgets/asset_viewer/asset_viewer.page.dart

@@ -97,7 +97,7 @@ class AssetViewer extends ConsumerStatefulWidget {
 }
 
 const double _kBottomSheetMinimumExtent = 0.4;
-const double _kBottomSheetSnapExtent = 0.67;
+const double _kBottomSheetSnapExtent = 0.7;
 
 class _AssetViewerState extends ConsumerState<AssetViewer> {
   static final _dummyListener = ImageStreamListener((image, _) => image.dispose());
@@ -399,14 +399,10 @@ class _AssetViewerState extends ConsumerState<AssetViewer> {
     final isDraggingDown = currentExtent < previousExtent;
     previousExtent = currentExtent;
     // Closes the bottom sheet if the user is dragging down
-    if (isDraggingDown && delta.extent < 0.67) {
+    if (isDraggingDown && delta.extent < 0.55) {
       if (dragInProgress) {
         blockGestures = true;
       }
-      // Jump to a lower position before starting close animation to prevent glitch
-      if (bottomSheetController.isAttached) {
-        bottomSheetController.jumpTo(0.67);
-      }
       sheetCloseController?.close();
     }
 
@@ -484,7 +480,7 @@ class _AssetViewerState extends ConsumerState<AssetViewer> {
     previousExtent = _kBottomSheetMinimumExtent;
     sheetCloseController = showBottomSheet(
       context: ctx,
-      sheetAnimationStyle: const AnimationStyle(duration: Durations.medium2, reverseDuration: Durations.medium2),
+      sheetAnimationStyle: const AnimationStyle(duration: Durations.short4, reverseDuration: Durations.short2),
       constraints: const BoxConstraints(maxWidth: double.infinity),
       shape: const RoundedRectangleBorder(borderRadius: BorderRadius.vertical(top: Radius.circular(20.0))),
       backgroundColor: ctx.colorScheme.surfaceContainerLowest,
@@ -692,20 +688,16 @@ class _AssetViewerState extends ConsumerState<AssetViewer> {
               backgroundDecoration: BoxDecoration(color: backgroundColor),
               enablePanAlways: true,
             ),
-            if (!showingBottomSheet)
-              const Positioned(
-                bottom: 0,
-                left: 0,
-                right: 0,
-                child: Column(
-                  mainAxisSize: MainAxisSize.min,
-                  mainAxisAlignment: MainAxisAlignment.end,
-                  crossAxisAlignment: CrossAxisAlignment.stretch,
-                  children: [AssetStackRow(), ViewerBottomBar()],
-                ),
-              ),
           ],
         ),
+        bottomNavigationBar: showingBottomSheet
+            ? const SizedBox.shrink()
+            : const Column(
+                mainAxisSize: MainAxisSize.min,
+                mainAxisAlignment: MainAxisAlignment.end,
+                crossAxisAlignment: CrossAxisAlignment.stretch,
+                children: [AssetStackRow(), ViewerBottomBar()],
+              ),
       ),
     );
   }

mobile/lib/presentation/widgets/asset_viewer/bottom_bar.widget.dart

@@ -2,18 +2,18 @@ import 'package:flutter/material.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
 import 'package:immich_mobile/constants/enums.dart';
 import 'package:immich_mobile/domain/models/asset/base_asset.model.dart';
-import 'package:immich_mobile/domain/models/setting.model.dart';
 import 'package:immich_mobile/extensions/build_context_extensions.dart';
+import 'package:immich_mobile/presentation/widgets/action_buttons/delete_action_button.widget.dart';
+import 'package:immich_mobile/presentation/widgets/action_buttons/delete_local_action_button.widget.dart';
+import 'package:immich_mobile/presentation/widgets/action_buttons/edit_image_action_button.widget.dart';
+import 'package:immich_mobile/presentation/widgets/action_buttons/share_action_button.widget.dart';
+import 'package:immich_mobile/presentation/widgets/action_buttons/upload_action_button.widget.dart';
+import 'package:immich_mobile/presentation/widgets/action_buttons/add_action_button.widget.dart';
 import 'package:immich_mobile/presentation/widgets/asset_viewer/asset_viewer.state.dart';
 import 'package:immich_mobile/providers/infrastructure/asset_viewer/current_asset.provider.dart';
-import 'package:immich_mobile/providers/infrastructure/current_album.provider.dart';
 import 'package:immich_mobile/providers/infrastructure/readonly_mode.provider.dart';
-import 'package:immich_mobile/providers/infrastructure/setting.provider.dart';
-import 'package:immich_mobile/providers/infrastructure/timeline.provider.dart';
 import 'package:immich_mobile/providers/routes.provider.dart';
-import 'package:immich_mobile/providers/server_info.provider.dart';
 import 'package:immich_mobile/providers/user.provider.dart';
-import 'package:immich_mobile/utils/action_button.utils.dart';
 import 'package:immich_mobile/widgets/asset_viewer/video_controls.dart';
 
 class ViewerBottomBar extends ConsumerWidget {
@@ -33,11 +33,6 @@ class ViewerBottomBar extends ConsumerWidget {
     int opacity = ref.watch(assetViewerProvider.select((state) => state.backgroundOpacity));
     final showControls = ref.watch(assetViewerProvider.select((s) => s.showingControls));
     final isInLockedView = ref.watch(inLockedViewProvider);
-    final album = ref.watch(currentRemoteAlbumProvider);
-    final isArchived = asset is RemoteAsset && asset.visibility == AssetVisibility.archive;
-    final advancedTroubleshooting = ref.watch(settingsProvider.notifier).get(Setting.advancedTroubleshooting);
-    final timelineOrigin = ref.read(timelineServiceProvider).origin;
-    final isTrashEnable = ref.watch(serverInfoProvider.select((state) => state.serverFeatures.trash));
 
     if (!showControls) {
       opacity = 0;
@@ -45,22 +40,21 @@ class ViewerBottomBar extends ConsumerWidget {
 
     final originalTheme = context.themeData;
 
-    final buttonContext = ActionButtonContext(
-      asset: asset,
-      isOwner: isOwner,
-      isArchived: isArchived,
-      isTrashEnabled: isTrashEnable,
-      isStacked: asset is RemoteAsset && asset.stackId != null,
-      isInLockedView: isInLockedView,
-      currentAlbum: album,
-      advancedTroubleshooting: advancedTroubleshooting,
-      source: ActionSource.viewer,
-      timelineOrigin: timelineOrigin,
-      originalTheme: originalTheme,
-      buttonPosition: ButtonPosition.bottomBar,
-    );
+    final actions = <Widget>[
+      const ShareActionButton(source: ActionSource.viewer),
 
-    final actions = ActionButtonBuilder.buildViewerBottomBar(buttonContext, context, ref);
+      if (!isInLockedView) ...[
+        if (asset.isLocalOnly) const UploadActionButton(source: ActionSource.viewer),
+        if (asset.type == AssetType.image) const EditImageActionButton(),
+        if (asset.hasRemote) AddActionButton(originalTheme: originalTheme),
+
+        if (isOwner) ...[
+          asset.isLocalOnly
+              ? const DeleteLocalActionButton(source: ActionSource.viewer)
+              : const DeleteActionButton(source: ActionSource.viewer, showConfirmation: true),
+        ],
+      ],
+    ];
 
     return IgnorePointer(
       ignoring: opacity < 255,
@@ -86,11 +80,7 @@ class ViewerBottomBar extends ConsumerWidget {
                       children: [
                         if (asset.isVideo) const VideoControls(),
                         if (!isReadonlyModeEnabled)
-                          Row(
-                            mainAxisAlignment: MainAxisAlignment.spaceEvenly,
-                            crossAxisAlignment: CrossAxisAlignment.start,
-                            children: actions.map((action) => Expanded(child: action)).toList(),
-                          ),
+                          Row(mainAxisAlignment: MainAxisAlignment.spaceEvenly, children: actions),
                       ],
                     ),
                   ),

mobile/lib/presentation/widgets/asset_viewer/bottom_sheet.widget.dart

@@ -52,7 +52,7 @@ class AssetDetailBottomSheet extends ConsumerWidget {
       expand: false,
       shouldCloseOnMinExtent: false,
       resizeOnScroll: false,
-      backgroundColor: context.isDarkTheme ? context.colorScheme.surface : Colors.white,
+      backgroundColor: context.isDarkTheme ? Colors.black : Colors.white,
     );
   }
 }
@@ -299,7 +299,7 @@ class _AssetDetailBottomSheet extends ConsumerWidget {
         // Appears in (Albums)
         Padding(padding: const EdgeInsets.only(top: 16.0), child: _buildAppearsInList(ref, context)),
         // padding at the bottom to avoid cut-off
-        const SizedBox(height: 30),
+        const SizedBox(height: 100),
       ],
     );
   }

mobile/lib/presentation/widgets/asset_viewer/top_app_bar.widget.dart

@@ -3,6 +3,8 @@ import 'package:flutter/material.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
 import 'package:immich_mobile/constants/enums.dart';
 import 'package:immich_mobile/domain/models/asset/base_asset.model.dart';
+import 'package:immich_mobile/domain/models/events.model.dart';
+import 'package:immich_mobile/domain/utils/event_stream.dart';
 import 'package:immich_mobile/extensions/build_context_extensions.dart';
 import 'package:immich_mobile/presentation/widgets/action_buttons/favorite_action_button.widget.dart';
 import 'package:immich_mobile/presentation/widgets/action_buttons/motion_photo_action_button.widget.dart';
@@ -49,6 +51,13 @@ class ViewerTopAppBar extends ConsumerWidget implements PreferredSizeWidget {
 
     final actions = <Widget>[
       if (asset.isMotionPhoto) const MotionPhotoActionButton(iconOnly: true),
+      if (album != null && album.isActivityEnabled && album.isShared)
+        IconButton(
+          icon: const Icon(Icons.chat_outlined),
+          onPressed: () {
+            EventStream.shared.emit(const ViewerOpenBottomSheetEvent(activitiesMode: true));
+          },
+        ),
 
       if (asset.hasRemote && isOwner && !asset.isFavorite)
         const FavoriteActionButton(source: ActionSource.viewer, iconOnly: true),

mobile/lib/presentation/widgets/bottom_sheet/archive_bottom_sheet.widget.dart

@@ -14,6 +14,7 @@ import 'package:immich_mobile/presentation/widgets/action_buttons/stack_action_b
 import 'package:immich_mobile/presentation/widgets/action_buttons/trash_action_button.widget.dart';
 import 'package:immich_mobile/presentation/widgets/action_buttons/unarchive_action_button.widget.dart';
 import 'package:immich_mobile/presentation/widgets/action_buttons/unstack_action_button.widget.dart';
+import 'package:immich_mobile/presentation/widgets/action_buttons/upload_action_button.widget.dart';
 import 'package:immich_mobile/presentation/widgets/bottom_sheet/base_bottom_sheet.widget.dart';
 import 'package:immich_mobile/providers/server_info.provider.dart';
 import 'package:immich_mobile/providers/timeline/multiselect.provider.dart';
@@ -46,7 +47,10 @@ class ArchiveBottomSheet extends ConsumerWidget {
           if (multiselect.selectedAssets.length > 1) const StackActionButton(source: ActionSource.timeline),
           if (multiselect.hasStacked) const UnStackActionButton(source: ActionSource.timeline),
         ],
-        if (multiselect.hasMerged) const DeleteLocalActionButton(source: ActionSource.timeline),
+        if (multiselect.hasLocal) ...[
+          const DeleteLocalActionButton(source: ActionSource.timeline),
+          const UploadActionButton(source: ActionSource.timeline),
+        ],
       ],
     );
   }

mobile/lib/presentation/widgets/bottom_sheet/base_bottom_sheet.widget.dart

@@ -81,7 +81,7 @@ class _BaseDraggableScrollableSheetState extends ConsumerState<BaseBottomSheet>
                 child: CustomScrollView(
                   controller: scrollController,
                   slivers: [
-                    const SliverToBoxAdapter(child: _DragHandle()),
+                    const SliverPersistentHeader(delegate: _DragHandleDelegate(), pinned: true),
                     if (widget.actions.isNotEmpty)
                       SliverToBoxAdapter(
                         child: Column(
@@ -108,13 +108,31 @@ class _BaseDraggableScrollableSheetState extends ConsumerState<BaseBottomSheet>
   }
 }
 
+class _DragHandleDelegate extends SliverPersistentHeaderDelegate {
+  const _DragHandleDelegate();
+
+  @override
+  Widget build(BuildContext context, double shrinkOffset, bool overlapsContent) {
+    return const _DragHandle();
+  }
+
+  @override
+  bool shouldRebuild(_DragHandleDelegate oldDelegate) => false;
+
+  @override
+  double get minExtent => 50.0;
+
+  @override
+  double get maxExtent => 50.0;
+}
+
 class _DragHandle extends StatelessWidget {
   const _DragHandle();
 
   @override
   Widget build(BuildContext context) {
     return SizedBox(
-      height: 38,
+      height: 50,
       child: Center(
         child: SizedBox(
           width: 32,

mobile/lib/presentation/widgets/bottom_sheet/favorite_bottom_sheet.widget.dart

@@ -17,6 +17,7 @@ import 'package:immich_mobile/presentation/widgets/action_buttons/stack_action_b
 import 'package:immich_mobile/presentation/widgets/action_buttons/trash_action_button.widget.dart';
 import 'package:immich_mobile/presentation/widgets/action_buttons/unfavorite_action_button.widget.dart';
 import 'package:immich_mobile/presentation/widgets/action_buttons/unstack_action_button.widget.dart';
+import 'package:immich_mobile/presentation/widgets/action_buttons/upload_action_button.widget.dart';
 import 'package:immich_mobile/presentation/widgets/album/album_selector.widget.dart';
 import 'package:immich_mobile/presentation/widgets/bottom_sheet/base_bottom_sheet.widget.dart';
 import 'package:immich_mobile/providers/infrastructure/album.provider.dart';
@@ -85,7 +86,10 @@ class FavoriteBottomSheet extends ConsumerWidget {
           if (multiselect.selectedAssets.length > 1) const StackActionButton(source: ActionSource.timeline),
           if (multiselect.hasStacked) const UnStackActionButton(source: ActionSource.timeline),
         ],
-        if (multiselect.hasMerged) const DeleteLocalActionButton(source: ActionSource.timeline),
+        if (multiselect.hasLocal) ...[
+          const DeleteLocalActionButton(source: ActionSource.timeline),
+          const UploadActionButton(source: ActionSource.timeline),
+        ],
       ],
       slivers: multiselect.hasRemote
           ? [const AddToAlbumHeader(), AlbumSelector(onAlbumSelected: addAssetsToAlbum)]

mobile/lib/presentation/widgets/bottom_sheet/remote_album_bottom_sheet.widget.dart

@@ -18,6 +18,7 @@ import 'package:immich_mobile/presentation/widgets/action_buttons/share_link_act
 import 'package:immich_mobile/presentation/widgets/action_buttons/stack_action_button.widget.dart';
 import 'package:immich_mobile/presentation/widgets/action_buttons/trash_action_button.widget.dart';
 import 'package:immich_mobile/presentation/widgets/action_buttons/unstack_action_button.widget.dart';
+import 'package:immich_mobile/presentation/widgets/action_buttons/upload_action_button.widget.dart';
 import 'package:immich_mobile/presentation/widgets/album/album_selector.widget.dart';
 import 'package:immich_mobile/presentation/widgets/bottom_sheet/base_bottom_sheet.widget.dart';
 import 'package:immich_mobile/providers/infrastructure/album.provider.dart';
@@ -111,7 +112,10 @@ class _RemoteAlbumBottomSheetState extends ConsumerState<RemoteAlbumBottomSheet>
             if (multiselect.hasStacked) const UnStackActionButton(source: ActionSource.timeline),
           ],
         ],
-        if (multiselect.hasMerged) const DeleteLocalActionButton(source: ActionSource.timeline),
+        if (multiselect.hasLocal) ...[
+          const DeleteLocalActionButton(source: ActionSource.timeline),
+          const UploadActionButton(source: ActionSource.timeline),
+        ],
         if (ownsAlbum) RemoveFromAlbumActionButton(source: ActionSource.timeline, albumId: widget.album.id),
       ],
       slivers: ownsAlbum

mobile/lib/presentation/widgets/images/thumbnail_tile.widget.dart

@@ -19,6 +19,7 @@ class ThumbnailTile extends ConsumerWidget {
     this.showStorageIndicator = false,
     this.lockSelection = false,
     this.heroOffset,
+    this.ownerName,
     super.key,
   });
 
@@ -28,6 +29,7 @@ class ThumbnailTile extends ConsumerWidget {
   final bool showStorageIndicator;
   final bool lockSelection;
   final int? heroOffset;
+  final String? ownerName;
 
   @override
   Widget build(BuildContext context, WidgetRef ref) {
@@ -45,68 +47,90 @@ class ThumbnailTile extends ConsumerWidget {
     final bool storageIndicator =
         ref.watch(settingsProvider.select((s) => s.get(Setting.showStorageIndicator))) && showStorageIndicator;
 
+    final bool showOwnerNameSetting = ref.watch(settingsProvider.select((s) => s.get(Setting.showOwnerName)));
+    final shouldShowOwnerName = showOwnerNameSetting && ownerName != null;
+
     return Stack(
       children: [
         Container(color: lockSelection ? context.colorScheme.surfaceContainerHighest : assetContainerColor),
-        AnimatedContainer(
-          duration: Durations.short4,
-          curve: Curves.decelerate,
-          padding: EdgeInsets.all(isSelected || lockSelection ? 6 : 0),
-          child: TweenAnimationBuilder<double>(
-            tween: Tween<double>(begin: 0.0, end: (isSelected || lockSelection) ? 15.0 : 0.0),
-            duration: Durations.short4,
-            curve: Curves.decelerate,
-            builder: (context, value, child) {
-              return ClipRRect(borderRadius: BorderRadius.all(Radius.circular(value)), child: child);
-            },
-            child: Stack(
-              children: [
-                Positioned.fill(
-                  child: Hero(
-                    tag: '${asset?.heroTag ?? ''}_$heroIndex',
-                    child: Thumbnail.fromAsset(asset: asset, size: size),
-                  ),
+        LayoutBuilder(
+          builder: (context, constraints) {
+            final metrics = _OverlayMetrics.fromConstraints(constraints);
+
+            return AnimatedContainer(
+              duration: Durations.short4,
+              curve: Curves.decelerate,
+              padding: EdgeInsets.all(isSelected || lockSelection ? 6 : 0),
+              child: TweenAnimationBuilder<double>(
+                tween: Tween<double>(begin: 0.0, end: (isSelected || lockSelection) ? 15.0 : 0.0),
+                duration: Durations.short4,
+                curve: Curves.decelerate,
+                builder: (context, value, child) {
+                  return ClipRRect(borderRadius: BorderRadius.all(Radius.circular(value)), child: child);
+                },
+                child: Stack(
+                  children: [
+                    Positioned.fill(
+                      child: Hero(
+                        tag: '${asset?.heroTag ?? ''}_$heroIndex',
+                        child: Thumbnail.fromAsset(asset: asset, size: size),
+                      ),
+                    ),
+                    if (asset != null)
+                      Align(
+                        alignment: Alignment.topRight,
+                        child: Padding(
+                          padding: EdgeInsets.symmetric(horizontal: metrics.padding, vertical: metrics.padding),
+                          child: Row(
+                            mainAxisAlignment: MainAxisAlignment.end,
+                            crossAxisAlignment: CrossAxisAlignment.center,
+                            children: [_AssetTypeIcons(asset: asset, metrics: metrics)],
+                          ),
+                        ),
+                      ),
+                    if (shouldShowOwnerName ||
+                        (storageIndicator && asset != null) ||
+                        (asset != null && asset.isFavorite))
+                      Align(
+                        alignment: Alignment.bottomCenter,
+                        child: Padding(
+                          padding: EdgeInsets.symmetric(horizontal: metrics.padding, vertical: metrics.padding),
+                          child: Row(
+                            mainAxisAlignment: MainAxisAlignment.spaceBetween,
+                            crossAxisAlignment: CrossAxisAlignment.center,
+                            children: [
+                              if (asset != null && asset.isFavorite)
+                                Padding(
+                                  padding: EdgeInsets.only(right: metrics.iconSpacing),
+                                  child: _TileOverlayIcon(Icons.favorite_rounded, metrics: metrics),
+                                )
+                              else
+                                const SizedBox.shrink(),
+                              if (shouldShowOwnerName)
+                                Flexible(
+                                  child: Padding(
+                                    padding: EdgeInsets.symmetric(horizontal: metrics.iconSpacing),
+                                    child: _OwnerNameLabel(ownerName: ownerName!, metrics: metrics),
+                                  ),
+                                ),
+                              if (storageIndicator && asset != null)
+                                Padding(
+                                  padding: EdgeInsets.only(right: metrics.iconSpacing),
+                                  child: _TileOverlayIcon(switch (asset.storage) {
+                                    AssetState.local => Icons.cloud_off_outlined,
+                                    AssetState.remote => Icons.cloud_outlined,
+                                    AssetState.merged => Icons.cloud_done_outlined,
+                                  }, metrics: metrics),
+                                ),
+                            ],
+                          ),
+                        ),
+                      ),
+                  ],
                 ),
-                if (asset != null)
-                  Align(
-                    alignment: Alignment.topRight,
-                    child: _AssetTypeIcons(asset: asset),
-                  ),
-                if (storageIndicator && asset != null)
-                  switch (asset.storage) {
-                    AssetState.local => const Align(
-                      alignment: Alignment.bottomRight,
-                      child: Padding(
-                        padding: EdgeInsets.only(right: 10.0, bottom: 6.0),
-                        child: _TileOverlayIcon(Icons.cloud_off_outlined),
-                      ),
-                    ),
-                    AssetState.remote => const Align(
-                      alignment: Alignment.bottomRight,
-                      child: Padding(
-                        padding: EdgeInsets.only(right: 10.0, bottom: 6.0),
-                        child: _TileOverlayIcon(Icons.cloud_outlined),
-                      ),
-                    ),
-                    AssetState.merged => const Align(
-                      alignment: Alignment.bottomRight,
-                      child: Padding(
-                        padding: EdgeInsets.only(right: 10.0, bottom: 6.0),
-                        child: _TileOverlayIcon(Icons.cloud_done_outlined),
-                      ),
-                    ),
-                  },
-                if (asset != null && asset.isFavorite)
-                  const Align(
-                    alignment: Alignment.bottomLeft,
-                    child: Padding(
-                      padding: EdgeInsets.only(left: 10.0, bottom: 6.0),
-                      child: _TileOverlayIcon(Icons.favorite_rounded),
-                    ),
-                  ),
-              ],
-            ),
-          ),
+              ),
+            );
+          },
         ),
         TweenAnimationBuilder<double>(
           tween: Tween<double>(begin: 0.0, end: (isSelected || lockSelection) ? 1.0 : 0.0),
@@ -157,12 +181,12 @@ class _SelectionIndicator extends StatelessWidget {
 
 class _VideoIndicator extends StatelessWidget {
   final Duration duration;
-  const _VideoIndicator(this.duration);
+  final _OverlayMetrics metrics;
+  const _VideoIndicator(this.duration, {required this.metrics});
 
   @override
   Widget build(BuildContext context) {
     return Row(
-      spacing: 3,
       mainAxisSize: MainAxisSize.min,
       mainAxisAlignment: MainAxisAlignment.end,
       // CrossAxisAlignment.start looks more centered vertically than CrossAxisAlignment.center
@@ -170,14 +194,15 @@ class _VideoIndicator extends StatelessWidget {
       children: [
         Text(
           duration.format(),
-          style: const TextStyle(
+          style: TextStyle(
             color: Colors.white,
-            fontSize: 12,
+            fontSize: metrics.fontSize,
             fontWeight: FontWeight.bold,
-            shadows: [Shadow(blurRadius: 5.0, color: Color.fromRGBO(0, 0, 0, 0.6))],
+            shadows: [Shadow(blurRadius: metrics.blurRadius, color: const Color.fromRGBO(0, 0, 0, 0.6))],
           ),
         ),
-        const _TileOverlayIcon(Icons.play_circle_outline_rounded),
+        SizedBox(width: metrics.iconSpacing),
+        _TileOverlayIcon(Icons.play_circle_outline_rounded, metrics: metrics),
       ],
     );
   }
@@ -185,47 +210,115 @@ class _VideoIndicator extends StatelessWidget {
 
 class _TileOverlayIcon extends StatelessWidget {
   final IconData icon;
+  final _OverlayMetrics metrics;
 
-  const _TileOverlayIcon(this.icon);
+  const _TileOverlayIcon(this.icon, {required this.metrics});
 
   @override
   Widget build(BuildContext context) {
     return Icon(
       icon,
       color: Colors.white,
-      size: 16,
-      shadows: [const Shadow(blurRadius: 5.0, color: Color.fromRGBO(0, 0, 0, 0.6), offset: Offset(0.0, 0.0))],
+      size: metrics.iconSize,
+      shadows: [
+        Shadow(
+          blurRadius: metrics.blurRadius,
+          color: const Color.fromRGBO(0, 0, 0, 0.6),
+          offset: const Offset(0.0, 0.0),
+        ),
+      ],
     );
   }
 }
 
 class _AssetTypeIcons extends StatelessWidget {
   final BaseAsset asset;
+  final _OverlayMetrics metrics;
 
-  const _AssetTypeIcons({required this.asset});
+  const _AssetTypeIcons({required this.asset, required this.metrics});
 
   @override
   Widget build(BuildContext context) {
     final hasStack = asset is RemoteAsset && (asset as RemoteAsset).stackId != null;
     final isLivePhoto = asset is RemoteAsset && asset.livePhotoVideoId != null;
 
-    return Column(
+    return Row(
       mainAxisSize: MainAxisSize.min,
-      crossAxisAlignment: CrossAxisAlignment.end,
       children: [
         if (asset.isVideo)
-          Padding(padding: const EdgeInsets.only(right: 10.0, top: 6.0), child: _VideoIndicator(asset.duration)),
+          Padding(
+            padding: EdgeInsets.only(left: metrics.iconSpacing),
+            child: _VideoIndicator(asset.duration, metrics: metrics),
+          ),
         if (hasStack)
-          const Padding(
-            padding: EdgeInsets.only(right: 10.0, top: 6.0),
-            child: _TileOverlayIcon(Icons.burst_mode_rounded),
+          Padding(
+            padding: EdgeInsets.only(left: metrics.iconSpacing),
+            child: _TileOverlayIcon(Icons.burst_mode_rounded, metrics: metrics),
           ),
         if (isLivePhoto)
-          const Padding(
-            padding: EdgeInsets.only(right: 10.0, top: 6.0),
-            child: _TileOverlayIcon(Icons.motion_photos_on_rounded),
+          Padding(
+            padding: EdgeInsets.only(left: metrics.iconSpacing),
+            child: _TileOverlayIcon(Icons.motion_photos_on_rounded, metrics: metrics),
           ),
       ],
     );
   }
 }
+
+class _OwnerNameLabel extends StatelessWidget {
+  final String ownerName;
+  final _OverlayMetrics metrics;
+
+  const _OwnerNameLabel({required this.ownerName, required this.metrics});
+
+  @override
+  Widget build(BuildContext context) {
+    return Text(
+      ownerName,
+      style: TextStyle(
+        color: Colors.white,
+        fontSize: metrics.fontSize,
+        fontWeight: FontWeight.w500,
+        shadows: [
+          Shadow(
+            blurRadius: metrics.blurRadius,
+            color: const Color.fromRGBO(0, 0, 0, 0.6),
+            offset: const Offset(0.0, 0.0),
+          ),
+        ],
+      ),
+      overflow: TextOverflow.fade,
+      softWrap: false,
+      maxLines: 1,
+    );
+  }
+}
+
+class _OverlayMetrics {
+  final double padding;
+  final double iconSize;
+  final double fontSize;
+  final double iconSpacing;
+  final double blurRadius;
+
+  const _OverlayMetrics({
+    required this.padding,
+    required this.iconSize,
+    required this.fontSize,
+    required this.iconSpacing,
+    required this.blurRadius,
+  });
+
+  factory _OverlayMetrics.fromConstraints(BoxConstraints constraints) {
+    const baseSize = 120.0;
+    final scale = (constraints.maxWidth / baseSize).clamp(0.5, 2.0);
+
+    return _OverlayMetrics(
+      padding: (2.0 * scale).clamp(1.0, 4.0),
+      iconSize: (16.0 * scale).clamp(14.0, 20.0),
+      fontSize: (12.0 * scale).clamp(11.0, 14.0),
+      iconSpacing: (2.0 * scale).clamp(1.0, 4.0),
+      blurRadius: (5.0 * scale).clamp(3.0, 7.0),
+    );
+  }
+}

mobile/lib/presentation/widgets/timeline/fixed/segment.model.dart

@@ -2,6 +2,7 @@ import 'dart:async';
 import 'dart:math' as math;
 
 import 'package:auto_route/auto_route.dart';
+import 'package:collection/collection.dart';
 import 'package:flutter/material.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
 import 'package:immich_mobile/domain/models/asset/base_asset.model.dart';
@@ -18,6 +19,7 @@ import 'package:immich_mobile/providers/asset_viewer/is_motion_video_playing.pro
 import 'package:immich_mobile/providers/haptic_feedback.provider.dart';
 import 'package:immich_mobile/providers/infrastructure/current_album.provider.dart';
 import 'package:immich_mobile/providers/infrastructure/readonly_mode.provider.dart';
+import 'package:immich_mobile/providers/infrastructure/remote_album.provider.dart';
 import 'package:immich_mobile/providers/infrastructure/timeline.provider.dart';
 import 'package:immich_mobile/providers/timeline/multiselect.provider.dart';
 import 'package:immich_mobile/routing/router.dart';
@@ -191,6 +193,29 @@ class _AssetTileWidget extends ConsumerWidget {
     return lockSelectionAssets.contains(asset);
   }
 
+  String? _getOwnerName(WidgetRef ref) {
+    final album = ref.watch(currentRemoteAlbumProvider);
+    if (album == null || !album.isShared) {
+      return null;
+    }
+
+    if (asset case RemoteAsset remoteAsset) {
+      final ownerId = remoteAsset.ownerId;
+
+      if (album.ownerId == ownerId) {
+        return album.ownerName;
+      }
+
+      final sharedUsersAsync = ref.watch(remoteAlbumSharedUsersProvider(album.id));
+      return sharedUsersAsync.maybeWhen(
+        data: (sharedUsers) => sharedUsers.firstWhereOrNull((user) => user.id == ownerId)?.name,
+        orElse: () => null,
+      );
+    }
+
+    return null;
+  }
+
   @override
   Widget build(BuildContext context, WidgetRef ref) {
     final heroOffset = TabsRouterScope.of(context)?.controller.activeIndex ?? 0;
@@ -198,6 +223,7 @@ class _AssetTileWidget extends ConsumerWidget {
     final lockSelection = _getLockSelectionStatus(ref);
     final showStorageIndicator = ref.watch(timelineArgsProvider.select((args) => args.showStorageIndicator));
     final isReadonlyModeEnabled = ref.watch(readonlyModeProvider);
+    final ownerName = _getOwnerName(ref);
 
     return RepaintBoundary(
       child: GestureDetector(
@@ -208,6 +234,7 @@ class _AssetTileWidget extends ConsumerWidget {
           lockSelection: lockSelection,
           showStorageIndicator: showStorageIndicator,
           heroOffset: heroOffset,
+          ownerName: ownerName,
         ),
       ),
     );

mobile/lib/services/app_settings.service.dart

@@ -54,7 +54,8 @@ enum AppSettingsEnum<T> {
   readonlyModeEnabled<bool>(StoreKey.readonlyModeEnabled, "readonlyModeEnabled", false),
   albumGridView<bool>(StoreKey.albumGridView, "albumGridView", false),
   backupRequireCharging<bool>(StoreKey.backupRequireCharging, null, false),
-  backupTriggerDelay<int>(StoreKey.backupTriggerDelay, null, 30);
+  backupTriggerDelay<int>(StoreKey.backupTriggerDelay, null, 30),
+  showOwnerName<bool>(StoreKey.showOwnerName, "showOwnerName", false);
 
   const AppSettingsEnum(this.storeKey, this.hiveKey, this.defaultValue);
 

mobile/lib/utils/action_button.utils.dart

@@ -17,7 +17,6 @@ import 'package:immich_mobile/presentation/widgets/action_buttons/delete_local_a
 import 'package:immich_mobile/presentation/widgets/action_buttons/delete_permanent_action_button.widget.dart';
 import 'package:immich_mobile/presentation/widgets/action_buttons/download_action_button.widget.dart';
 import 'package:immich_mobile/presentation/widgets/action_buttons/like_activity_action_button.widget.dart';
-import 'package:immich_mobile/presentation/widgets/action_buttons/open_activity_action_button.widget.dart';
 import 'package:immich_mobile/presentation/widgets/action_buttons/move_to_lock_folder_action_button.widget.dart';
 import 'package:immich_mobile/presentation/widgets/action_buttons/remove_from_album_action_button.widget.dart';
 import 'package:immich_mobile/presentation/widgets/action_buttons/remove_from_lock_folder_action_button.widget.dart';
@@ -28,8 +27,6 @@ import 'package:immich_mobile/presentation/widgets/action_buttons/trash_action_b
 import 'package:immich_mobile/presentation/widgets/action_buttons/unarchive_action_button.widget.dart';
 import 'package:immich_mobile/presentation/widgets/action_buttons/unstack_action_button.widget.dart';
 import 'package:immich_mobile/presentation/widgets/action_buttons/upload_action_button.widget.dart';
-import 'package:immich_mobile/presentation/widgets/action_buttons/edit_image_action_button.widget.dart';
-import 'package:immich_mobile/presentation/widgets/action_buttons/add_action_button.widget.dart';
 import 'package:immich_mobile/routing/router.dart';
 
 class ActionButtonContext {
@@ -45,7 +42,6 @@ class ActionButtonContext {
   final bool isCasting;
   final TimelineOrigin timelineOrigin;
   final ThemeData? originalTheme;
-  final ButtonPosition buttonPosition;
 
   const ActionButtonContext({
     required this.asset,
@@ -60,34 +56,13 @@ class ActionButtonContext {
     this.isCasting = false,
     this.timelineOrigin = TimelineOrigin.main,
     this.originalTheme,
-    this.buttonPosition = ButtonPosition.other,
   });
-
-  ActionButtonContext withButtonPosition(ButtonPosition position) {
-    return ActionButtonContext(
-      asset: asset,
-      isOwner: isOwner,
-      isArchived: isArchived,
-      isTrashEnabled: isTrashEnabled,
-      isStacked: isStacked,
-      isInLockedView: isInLockedView,
-      currentAlbum: currentAlbum,
-      advancedTroubleshooting: advancedTroubleshooting,
-      source: source,
-      isCasting: isCasting,
-      timelineOrigin: timelineOrigin,
-      originalTheme: originalTheme,
-      buttonPosition: position,
-    );
-  }
 }
 
 enum ActionButtonType {
   openInfo,
-  openActivity,
   likeActivity,
   share,
-  editImage,
   shareLink,
   cast,
   similarPhotos,
@@ -104,7 +79,6 @@ enum ActionButtonType {
   deleteLocal,
   deletePermanent,
   delete,
-  addTo,
   advancedInfo;
 
   bool shouldShow(ActionButtonContext context) {
@@ -182,22 +156,10 @@ enum ActionButtonType {
             context.timelineOrigin != TimelineOrigin.localAlbum &&
             context.isOwner,
       ActionButtonType.cast => context.isCasting || context.asset.hasRemote,
-      ActionButtonType.editImage =>
-        !context.isInLockedView && //
-            context.asset.type == AssetType.image &&
-            !(context.buttonPosition == ButtonPosition.bottomBar && context.currentAlbum?.isShared == true),
-      ActionButtonType.addTo =>
-        !context.isInLockedView && //
-            context.asset.hasRemote,
-      ActionButtonType.openActivity =>
-        !context.isInLockedView &&
-            context.currentAlbum != null &&
-            context.currentAlbum!.isActivityEnabled &&
-            context.currentAlbum!.isShared,
     };
   }
 
-  Widget buildButton(
+  ConsumerWidget buildButton(
     ActionButtonContext context, [
     BuildContext? buildContext,
     bool iconOnly = false,
@@ -280,9 +242,6 @@ enum ActionButtonType {
               },
       ),
       ActionButtonType.cast => CastActionButton(iconOnly: iconOnly, menuItem: menuItem),
-      ActionButtonType.editImage => EditImageActionButton(iconOnly: iconOnly, menuItem: menuItem),
-      ActionButtonType.addTo => AddActionButton(originalTheme: context.originalTheme),
-      ActionButtonType.openActivity => OpenActivityActionButton(iconOnly: iconOnly, menuItem: menuItem),
     };
   }
 
@@ -313,77 +272,39 @@ enum ActionButtonType {
 class ActionButtonBuilder {
   static const List<ActionButtonType> _actionTypes = ActionButtonType.values;
   static const List<ActionButtonType> defaultViewerKebabMenuOrder = _actionTypes;
-  static const List<ActionButtonType> _defaultViewerBottomBarOrder = [
+  static const Set<ActionButtonType> defaultViewerBottomBarButtons = {
     ActionButtonType.share,
+    ActionButtonType.moveToLockFolder,
     ActionButtonType.upload,
-    ActionButtonType.editImage,
-    ActionButtonType.addTo,
-    ActionButtonType.openActivity,
-    ActionButtonType.likeActivity,
-    ActionButtonType.deleteLocal,
     ActionButtonType.delete,
-    ActionButtonType.removeFromLockFolder,
-    ActionButtonType.deletePermanent,
-  ];
+    ActionButtonType.archive,
+    ActionButtonType.unarchive,
+  };
 
   static List<Widget> build(ActionButtonContext context) {
     return _actionTypes.where((type) => type.shouldShow(context)).map((type) => type.buildButton(context)).toList();
   }
 
-  static List<ActionButtonType> getViewerKebabMenuTypes(ActionButtonContext context) {
-    final visibleBottomBarButtons = getViewerBottomBarTypes(context);
-    final excludedTypes = <ActionButtonType>{...visibleBottomBarButtons, ActionButtonType.addTo};
-
-    if (visibleBottomBarButtons.contains(ActionButtonType.addTo)) {
-      excludedTypes.addAll([ActionButtonType.moveToLockFolder, ActionButtonType.archive, ActionButtonType.unarchive]);
-    }
-
-    return defaultViewerKebabMenuOrder
-        .where((type) => !excludedTypes.contains(type) && type.shouldShow(context))
-        .toList();
-  }
-
-  static List<ActionButtonType> getViewerBottomBarTypes(ActionButtonContext context) {
-    final bottomBarContext = context.withButtonPosition(ButtonPosition.bottomBar);
-    return _defaultViewerBottomBarOrder.where((type) => type.shouldShow(bottomBarContext)).take(4).toList();
-  }
-
   static List<Widget> buildViewerKebabMenu(ActionButtonContext context, BuildContext buildContext, WidgetRef ref) {
-    final visibleButtons = getViewerKebabMenuTypes(context);
-    return visibleButtons.toKebabMenuWidgets(context, buildContext, ref);
-  }
+    final visibleButtons = defaultViewerKebabMenuOrder
+        .where((type) => !defaultViewerBottomBarButtons.contains(type) && type.shouldShow(context))
+        .toList();
 
-  static List<Widget> buildViewerBottomBar(ActionButtonContext context, BuildContext buildContext, WidgetRef ref) {
-    final visibleButtons = getViewerBottomBarTypes(context);
-    return visibleButtons.toBottomBarWidgets(context, buildContext, ref);
-  }
-}
-
-extension ActionButtonTypeListExtension on List<ActionButtonType> {
-  List<Widget> toKebabMenuWidgets(ActionButtonContext context, BuildContext buildContext, WidgetRef ref) {
-    if (isEmpty) {
+    if (visibleButtons.isEmpty) {
       return [];
     }
 
     final List<Widget> result = [];
     int? lastGroup;
 
-    for (final type in this) {
+    for (final type in visibleButtons) {
       if (lastGroup != null && type.kebabMenuGroup != lastGroup) {
         result.add(const Divider(height: 1));
       }
-      final widget = type.buildButton(context, buildContext, false, true);
-      result.add(widget is ConsumerWidget ? widget.build(buildContext, ref) : widget);
+      result.add(type.buildButton(context, buildContext, false, true).build(buildContext, ref));
       lastGroup = type.kebabMenuGroup;
     }
 
     return result;
   }
-
-  List<Widget> toBottomBarWidgets(ActionButtonContext context, BuildContext buildContext, WidgetRef ref) {
-    return map((type) {
-      final widget = type.buildButton(context, buildContext, false, false);
-      return widget is ConsumerWidget ? widget.build(buildContext, ref) : widget;
-    }).toList();
-  }
 }

mobile/lib/widgets/activities/activity_text_field.dart

@@ -2,7 +2,6 @@ import 'package:easy_localization/easy_localization.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_hooks/flutter_hooks.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
-import 'package:immich_mobile/extensions/build_context_extensions.dart';
 import 'package:immich_mobile/providers/activity.provider.dart';
 import 'package:immich_mobile/providers/album/current_album.provider.dart';
 import 'package:immich_mobile/providers/asset_viewer/current_asset.provider.dart';
@@ -69,11 +68,11 @@ class ActivityTextField extends HookConsumerWidget {
           suffixIcon: Padding(
             padding: const EdgeInsets.only(right: 10),
             child: IconButton(
-              icon: Icon(liked ? Icons.thumb_up : Icons.thumb_up_off_alt),
+              icon: Icon(liked ? Icons.favorite_rounded : Icons.favorite_border_rounded),
               onPressed: liked ? removeLike : addLike,
             ),
           ),
-          suffixIconColor: liked ? context.primaryColor : null,
+          suffixIconColor: liked ? Colors.red[700] : null,
           hintText: !isEnabled ? 'shared_album_activities_input_disable'.tr() : 'say_something'.tr(),
           hintStyle: TextStyle(fontWeight: FontWeight.normal, fontSize: 14, color: Colors.grey[600]),
         ),

mobile/lib/widgets/activities/activity_tile.dart

@@ -37,7 +37,7 @@ class ActivityTile extends HookConsumerWidget {
           ? Container(
               width: isBottomSheet ? 30 : 44,
               alignment: Alignment.center,
-              child: Icon(Icons.thumb_up, color: context.primaryColor),
+              child: Icon(Icons.favorite_rounded, color: Colors.red[700]),
             )
           : isBottomSheet
           ? UserCircleAvatar(user: activity.user, size: 30, radius: 15)

mobile/lib/widgets/activities/comment_bubble.dart

@@ -67,8 +67,8 @@ class CommentBubble extends ConsumerWidget {
                 bottom: 6,
                 child: Container(
                   padding: const EdgeInsets.all(4),
-                  decoration: BoxDecoration(color: context.colorScheme.surfaceContainer, shape: BoxShape.circle),
-                  child: Icon(Icons.thumb_up, color: context.primaryColor, size: 18),
+                  decoration: BoxDecoration(color: Colors.white.withValues(alpha: 0.7), shape: BoxShape.circle),
+                  child: Icon(Icons.favorite, color: Colors.red[600], size: 18),
                 ),
               ),
           ],
@@ -81,8 +81,8 @@ class CommentBubble extends ConsumerWidget {
     if (isLike && !showThumbnail) {
       likes = Container(
         padding: const EdgeInsets.all(8),
-        decoration: BoxDecoration(color: context.colorScheme.surfaceContainer, shape: BoxShape.circle),
-        child: Icon(Icons.thumb_up, color: context.primaryColor, size: 18),
+        decoration: BoxDecoration(color: Colors.white.withValues(alpha: 0.7), shape: BoxShape.circle),
+        child: Icon(Icons.favorite, color: Colors.red[600], size: 18),
       );
     }
 

mobile/lib/widgets/settings/asset_list_settings/asset_list_settings.dart

@@ -17,6 +17,7 @@ class AssetListSettings extends HookConsumerWidget {
   @override
   Widget build(BuildContext context, WidgetRef ref) {
     final showStorageIndicator = useAppSettingsState(AppSettingsEnum.storageIndicator);
+    final showOwnerName = useAppSettingsState(AppSettingsEnum.showOwnerName);
 
     final assetListSetting = [
       SettingsSwitchListTile(
@@ -27,6 +28,14 @@ class AssetListSettings extends HookConsumerWidget {
           ref.invalidate(settingsProvider);
         },
       ),
+      SettingsSwitchListTile(
+        valueNotifier: showOwnerName,
+        title: 'theme_setting_asset_list_show_owner_name_title'.tr(),
+        onChanged: (_) {
+          ref.invalidate(appSettingsServiceProvider);
+          ref.invalidate(settingsProvider);
+        },
+      ),
       const LayoutSettings(),
       const GroupSettings(),
     ];

mobile/test/modules/activity/activity_text_field_test.dart

@@ -77,15 +77,15 @@ void main() {
       overrides: overrides,
     );
 
-    expect(find.widgetWithIcon(IconButton, Icons.thumb_up), findsOneWidget);
-    expect(find.widgetWithIcon(IconButton, Icons.thumb_up_off_alt), findsNothing);
+    expect(find.widgetWithIcon(IconButton, Icons.favorite_rounded), findsOneWidget);
+    expect(find.widgetWithIcon(IconButton, Icons.favorite_border_rounded), findsNothing);
   });
 
   testWidgets('Bordered icon if likedId == null', (tester) async {
     await tester.pumpConsumerWidget(ActivityTextField(onSubmit: (_) {}), overrides: overrides);
 
-    expect(find.widgetWithIcon(IconButton, Icons.thumb_up_off_alt), findsOneWidget);
-    expect(find.widgetWithIcon(IconButton, Icons.thumb_up), findsNothing);
+    expect(find.widgetWithIcon(IconButton, Icons.favorite_border_rounded), findsOneWidget);
+    expect(find.widgetWithIcon(IconButton, Icons.favorite_rounded), findsNothing);
   });
 
   testWidgets('Adds new like', (tester) async {

mobile/test/modules/activity/activity_tile_test.dart

@@ -91,17 +91,17 @@ void main() {
   group('Like Activity', () {
     final activity = Activity(id: '1', createdAt: DateTime(100), type: ActivityType.like, user: UserStub.admin);
 
-    testWidgets('Like contains filled thumbs-up as leading', (tester) async {
+    testWidgets('Like contains filled heart as leading', (tester) async {
       await tester.pumpConsumerWidget(ActivityTile(activity), overrides: overrides);
 
       // Leading widget should not be null
       final listTile = tester.widget<ListTile>(find.byType(ListTile));
       expect(listTile.leading, isNotNull);
 
-      // And should have a thumb_up icon
-      final thumbUpIconFinder = find.widgetWithIcon(listTile.leading!.runtimeType, Icons.thumb_up);
+      // And should have a favorite icon
+      final favoIconFinder = find.widgetWithIcon(listTile.leading!.runtimeType, Icons.favorite_rounded);
 
-      expect(thumbUpIconFinder, findsOneWidget);
+      expect(favoIconFinder, findsOneWidget);
     });
 
     testWidgets('Like title is center aligned', (tester) async {

mobile/test/utils/action_button_utils_test.dart

@@ -1,4 +1,3 @@
-import 'package:collection/collection.dart';
 import 'package:flutter/widgets.dart';
 import 'package:flutter_test/flutter_test.dart';
 import 'package:immich_mobile/constants/enums.dart';
@@ -963,128 +962,4 @@ void main() {
       expect(nonArchivedWidgets, isNotEmpty);
     });
   });
-
-  group('ActionButtonBuilder.getViewerBottomBarTypes', () {
-    test('should return correct button types for shared album with activity', () {
-      final remoteAsset = createRemoteAsset();
-      final album = createRemoteAlbum(isActivityEnabled: true, isShared: true);
-      final context = ActionButtonContext(
-        asset: remoteAsset,
-        isOwner: true,
-        isArchived: false,
-        isTrashEnabled: true,
-        isInLockedView: false,
-        currentAlbum: album,
-        advancedTroubleshooting: false,
-        isStacked: false,
-        source: ActionSource.viewer,
-        buttonPosition: ButtonPosition.bottomBar,
-      );
-
-      const expectedTypes = [
-        ActionButtonType.share,
-        ActionButtonType.addTo,
-        ActionButtonType.openActivity,
-        ActionButtonType.likeActivity,
-      ];
-
-      final bottomBarTypes = ActionButtonBuilder.getViewerBottomBarTypes(context);
-      final kebabTypes = ActionButtonBuilder.getViewerKebabMenuTypes(context);
-
-      expect(const ListEquality().equals(bottomBarTypes, expectedTypes), isTrue);
-      expect(bottomBarTypes.any(kebabTypes.contains), isFalse);
-    });
-
-    test('should return correct button types for local only asset', () {
-      final localAsset = createLocalAsset();
-      final context = ActionButtonContext(
-        asset: localAsset,
-        isOwner: true,
-        isArchived: false,
-        isTrashEnabled: true,
-        isInLockedView: false,
-        currentAlbum: null,
-        advancedTroubleshooting: false,
-        isStacked: false,
-        source: ActionSource.viewer,
-        buttonPosition: ButtonPosition.bottomBar,
-      );
-
-      const expectedTypes = [
-        ActionButtonType.share,
-        ActionButtonType.upload,
-        ActionButtonType.editImage,
-        ActionButtonType.deleteLocal,
-      ];
-
-      final bottomBarTypes = ActionButtonBuilder.getViewerBottomBarTypes(context);
-      final kebabTypes = ActionButtonBuilder.getViewerKebabMenuTypes(
-        context.withButtonPosition(ButtonPosition.kebabMenu),
-      );
-
-      expect(const ListEquality().equals(bottomBarTypes, expectedTypes), isTrue);
-      expect(bottomBarTypes.any(kebabTypes.contains), isFalse);
-    });
-
-    test('should return correct button types for locked view', () {
-      final remoteAsset = createRemoteAsset();
-      final context = ActionButtonContext(
-        asset: remoteAsset,
-        isOwner: true,
-        isArchived: false,
-        isTrashEnabled: false,
-        isInLockedView: true,
-        currentAlbum: null,
-        advancedTroubleshooting: false,
-        isStacked: false,
-        source: ActionSource.viewer,
-        buttonPosition: ButtonPosition.bottomBar,
-      );
-
-      const expectedTypes = [
-        ActionButtonType.share,
-        ActionButtonType.removeFromLockFolder,
-        ActionButtonType.deletePermanent,
-      ];
-
-      final bottomBarTypes = ActionButtonBuilder.getViewerBottomBarTypes(context);
-      final kebabTypes = ActionButtonBuilder.getViewerKebabMenuTypes(
-        context.withButtonPosition(ButtonPosition.kebabMenu),
-      );
-
-      expect(const ListEquality().equals(bottomBarTypes, expectedTypes), isTrue);
-      expect(bottomBarTypes.any(kebabTypes.contains), isFalse);
-    });
-
-    test('should return correct button types for remote only asset', () {
-      final remoteAsset = createRemoteAsset();
-      final context = ActionButtonContext(
-        asset: remoteAsset,
-        isOwner: true,
-        isArchived: false,
-        isTrashEnabled: true,
-        isInLockedView: false,
-        currentAlbum: null,
-        advancedTroubleshooting: false,
-        isStacked: false,
-        source: ActionSource.viewer,
-        buttonPosition: ButtonPosition.bottomBar,
-      );
-
-      const expectedTypes = [
-        ActionButtonType.share,
-        ActionButtonType.editImage,
-        ActionButtonType.addTo,
-        ActionButtonType.delete,
-      ];
-
-      final bottomBarTypes = ActionButtonBuilder.getViewerBottomBarTypes(context);
-      final kebabTypes = ActionButtonBuilder.getViewerKebabMenuTypes(
-        context.withButtonPosition(ButtonPosition.kebabMenu),
-      );
-
-      expect(const ListEquality().equals(bottomBarTypes, expectedTypes), isTrue);
-      expect(bottomBarTypes.any(kebabTypes.contains), isFalse);
-    });
-  });
 }

open-api/typescript-sdk/package.json

@@ -19,7 +19,7 @@
     "@oazapfts/runtime": "^1.0.2"
   },
   "devDependencies": {
-    "@types/node": "^24.10.3",
+    "@types/node": "^24.10.1",
     "typescript": "^5.3.3"
   },
   "repository": {

pnpm-lock.yaml

@@ -63,7 +63,7 @@ importers:
         specifier: ^4.13.1
         version: 4.13.4
       '@types/node':
-        specifier: ^24.10.3
+        specifier: ^24.10.1
         version: 24.10.4
       '@vitest/coverage-v8':
         specifier: ^3.0.0
@@ -214,7 +214,7 @@ importers:
         specifier: ^3.4.2
         version: 3.7.1
       '@types/node':
-        specifier: ^24.10.3
+        specifier: ^24.10.1
         version: 24.10.4
       '@types/oidc-provider':
         specifier: ^9.0.0
@@ -299,7 +299,7 @@ importers:
         version: 1.1.0
     devDependencies:
       '@types/node':
-        specifier: ^24.10.3
+        specifier: ^24.10.1
         version: 24.10.4
       typescript:
         specifier: ^5.3.3
@@ -615,7 +615,7 @@ importers:
         specifier: ^2.0.0
         version: 2.0.0
       '@types/node':
-        specifier: ^24.10.3
+        specifier: ^24.10.1
         version: 24.10.4
       '@types/nodemailer':
         specifier: ^7.0.0
@@ -16567,7 +16567,7 @@ snapshots:
 
   '@types/connect-history-api-fallback@1.5.4':
     dependencies:
-      '@types/express-serve-static-core': 5.1.0
+      '@types/express-serve-static-core': 4.19.7
       '@types/node': 24.10.4
 
   '@types/connect@3.4.38':
@@ -16813,7 +16813,7 @@ snapshots:
 
   '@types/pg-pool@2.0.6':
     dependencies:
-      '@types/pg': 8.16.0
+      '@types/pg': 8.15.6
 
   '@types/pg@8.15.6':
     dependencies:

server/package.json

@@ -134,7 +134,7 @@
     "@types/luxon": "^3.6.2",
     "@types/mock-fs": "^4.13.1",
     "@types/multer": "^2.0.0",
-    "@types/node": "^24.10.3",
+    "@types/node": "^24.10.1",
     "@types/nodemailer": "^7.0.0",
     "@types/picomatch": "^4.0.0",
     "@types/pngjs": "^6.0.5",

server/src/database.ts

@@ -240,7 +240,7 @@ export type Session = {
   isPendingSyncReset: boolean;
 };
 
-export type Exif = Omit<Selectable<AssetExifTable>, 'updatedAt' | 'updateId' | 'lockedProperties'>;
+export type Exif = Omit<Selectable<AssetExifTable>, 'updatedAt' | 'updateId'>;
 
 export type Person = {
   createdAt: Date;
@@ -465,13 +465,3 @@ export const columns = {
     'plugin.updatedAt as updatedAt',
   ],
 } as const;
-
-export type LockableProperty = (typeof lockableProperties)[number];
-export const lockableProperties = [
-  'description',
-  'dateTimeOriginal',
-  'latitude',
-  'longitude',
-  'rating',
-  'timeZone',
-] as const;

server/src/queries/asset.job.repository.sql

@@ -50,11 +50,9 @@ select
         where
           "asset"."id" = "tag_asset"."assetId"
       ) as agg
-  ) as "tags",
-  to_json("asset_exif") as "exifInfo"
+  ) as "tags"
 from
   "asset"
-  inner join "asset_exif" on "asset"."id" = "asset_exif"."assetId"
 where
   "asset"."id" = $2::uuid
 limit
@@ -226,14 +224,6 @@ from
 where
   "asset"."id" = $2
 
--- AssetJobRepository.getLockedPropertiesForMetadataExtraction
-select
-  "asset_exif"."lockedProperties"
-from
-  "asset_exif"
-where
-  "asset_exif"."assetId" = $1
-
 -- AssetJobRepository.getAlbumThumbnailFiles
 select
   "asset_file"."id",

server/src/queries/asset.repository.sql

@@ -1,49 +1,19 @@
 -- NOTE: This file is auto generated by ./sql-generator
 
--- AssetRepository.upsertExif
-insert into
-  "asset_exif" ("dateTimeOriginal", "lockedProperties")
-values
-  ($1, $2)
-on conflict ("assetId") do update
-set
-  "dateTimeOriginal" = "excluded"."dateTimeOriginal",
-  "lockedProperties" = nullif(
-    array(
-      select distinct
-        unnest("asset_exif"."lockedProperties" || $3)
-    ),
-    '{}'
-  )
-
 -- AssetRepository.updateAllExif
 update "asset_exif"
 set
-  "model" = $1,
-  "lockedProperties" = nullif(
-    array(
-      select distinct
-        unnest("asset_exif"."lockedProperties" || $2)
-    ),
-    '{}'
-  )
+  "model" = $1
 where
-  "assetId" in ($3)
+  "assetId" in ($2)
 
 -- AssetRepository.updateDateTimeOriginal
 update "asset_exif"
 set
   "dateTimeOriginal" = "dateTimeOriginal" + $1::interval,
-  "timeZone" = $2,
-  "lockedProperties" = nullif(
-    array(
-      select distinct
-        unnest("asset_exif"."lockedProperties" || $3)
-    ),
-    '{}'
-  )
+  "timeZone" = $2
 where
-  "assetId" in ($4)
+  "assetId" in ($3)
 returning
   "assetId",
   "dateTimeOriginal",

server/src/repositories/asset-job.repository.ts

@@ -50,7 +50,6 @@ export class AssetJobRepository {
             .whereRef('asset.id', '=', 'tag_asset.assetId'),
         ).as('tags'),
       )
-      .$call(withExifInner)
       .limit(1)
       .executeTakeFirst();
   }
@@ -129,16 +128,6 @@ export class AssetJobRepository {
       .executeTakeFirst();
   }
 
-  @GenerateSql({ params: [DummyValue.UUID] })
-  async getLockedPropertiesForMetadataExtraction(assetId: string) {
-    return this.db
-      .selectFrom('asset_exif')
-      .select('asset_exif.lockedProperties')
-      .where('asset_exif.assetId', '=', assetId)
-      .executeTakeFirst()
-      .then((row) => row?.lockedProperties ?? []);
-  }
-
   @GenerateSql({ params: [DummyValue.UUID, AssetFileType.Thumbnail] })
   getAlbumThumbnailFiles(id: string, fileType?: AssetFileType) {
     return this.db

server/src/repositories/asset.repository.ts

@@ -1,8 +1,8 @@
 import { Injectable } from '@nestjs/common';
-import { ExpressionBuilder, Insertable, Kysely, NotNull, Selectable, sql, Updateable, UpdateResult } from 'kysely';
+import { Insertable, Kysely, NotNull, Selectable, sql, Updateable, UpdateResult } from 'kysely';
 import { isEmpty, isUndefined, omitBy } from 'lodash';
 import { InjectKysely } from 'nestjs-kysely';
-import { LockableProperty, Stack } from 'src/database';
+import { Stack } from 'src/database';
 import { Chunked, ChunkedArray, DummyValue, GenerateSql } from 'src/decorators';
 import { AuthDto } from 'src/dtos/auth.dto';
 import { AssetFileType, AssetMetadataKey, AssetOrder, AssetStatus, AssetType, AssetVisibility } from 'src/enum';
@@ -113,77 +113,51 @@ interface GetByIdsRelations {
   tags?: boolean;
 }
 
-const distinctLocked = <T extends LockableProperty[] | null>(eb: ExpressionBuilder<DB, 'asset_exif'>, columns: T) =>
-  sql<T>`nullif(array(select distinct unnest(${eb.ref('asset_exif.lockedProperties')} || ${columns})), '{}')`;
-
 @Injectable()
 export class AssetRepository {
   constructor(@InjectKysely() private db: Kysely<DB>) {}
 
-  @GenerateSql({
-    params: [
-      { dateTimeOriginal: DummyValue.DATE, lockedProperties: ['dateTimeOriginal'] },
-      { lockedPropertiesBehavior: 'append' },
-    ],
-  })
-  async upsertExif(
-    exif: Insertable<AssetExifTable>,
-    { lockedPropertiesBehavior }: { lockedPropertiesBehavior: 'override' | 'append' | 'skip' },
-  ): Promise<void> {
+  async upsertExif(exif: Insertable<AssetExifTable>): Promise<void> {
+    const value = { ...exif, assetId: asUuid(exif.assetId) };
     await this.db
       .insertInto('asset_exif')
-      .values(exif)
+      .values(value)
       .onConflict((oc) =>
-        oc.column('assetId').doUpdateSet((eb) => {
-          const updateLocked = <T extends keyof AssetExifTable>(col: T) => eb.ref(`excluded.${col}`);
-          const skipLocked = <T extends keyof AssetExifTable>(col: T) =>
-            eb
-              .case()
-              .when(sql`${col}`, '=', eb.fn.any('asset_exif.lockedProperties'))
-              .then(eb.ref(`asset_exif.${col}`))
-              .else(eb.ref(`excluded.${col}`))
-              .end();
-          const ref = lockedPropertiesBehavior === 'skip' ? skipLocked : updateLocked;
-          return {
-            ...removeUndefinedKeys(
-              {
-                description: ref('description'),
-                exifImageWidth: ref('exifImageWidth'),
-                exifImageHeight: ref('exifImageHeight'),
-                fileSizeInByte: ref('fileSizeInByte'),
-                orientation: ref('orientation'),
-                dateTimeOriginal: ref('dateTimeOriginal'),
-                modifyDate: ref('modifyDate'),
-                timeZone: ref('timeZone'),
-                latitude: ref('latitude'),
-                longitude: ref('longitude'),
-                projectionType: ref('projectionType'),
-                city: ref('city'),
-                livePhotoCID: ref('livePhotoCID'),
-                autoStackId: ref('autoStackId'),
-                state: ref('state'),
-                country: ref('country'),
-                make: ref('make'),
-                model: ref('model'),
-                lensModel: ref('lensModel'),
-                fNumber: ref('fNumber'),
-                focalLength: ref('focalLength'),
-                iso: ref('iso'),
-                exposureTime: ref('exposureTime'),
-                profileDescription: ref('profileDescription'),
-                colorspace: ref('colorspace'),
-                bitsPerSample: ref('bitsPerSample'),
-                rating: ref('rating'),
-                fps: ref('fps'),
-                lockedProperties:
-                  lockedPropertiesBehavior === 'append'
-                    ? distinctLocked(eb, exif.lockedProperties ?? null)
-                    : ref('lockedProperties'),
-              },
-              exif,
-            ),
-          };
-        }),
+        oc.column('assetId').doUpdateSet((eb) =>
+          removeUndefinedKeys(
+            {
+              description: eb.ref('excluded.description'),
+              exifImageWidth: eb.ref('excluded.exifImageWidth'),
+              exifImageHeight: eb.ref('excluded.exifImageHeight'),
+              fileSizeInByte: eb.ref('excluded.fileSizeInByte'),
+              orientation: eb.ref('excluded.orientation'),
+              dateTimeOriginal: eb.ref('excluded.dateTimeOriginal'),
+              modifyDate: eb.ref('excluded.modifyDate'),
+              timeZone: eb.ref('excluded.timeZone'),
+              latitude: eb.ref('excluded.latitude'),
+              longitude: eb.ref('excluded.longitude'),
+              projectionType: eb.ref('excluded.projectionType'),
+              city: eb.ref('excluded.city'),
+              livePhotoCID: eb.ref('excluded.livePhotoCID'),
+              autoStackId: eb.ref('excluded.autoStackId'),
+              state: eb.ref('excluded.state'),
+              country: eb.ref('excluded.country'),
+              make: eb.ref('excluded.make'),
+              model: eb.ref('excluded.model'),
+              lensModel: eb.ref('excluded.lensModel'),
+              fNumber: eb.ref('excluded.fNumber'),
+              focalLength: eb.ref('excluded.focalLength'),
+              iso: eb.ref('excluded.iso'),
+              exposureTime: eb.ref('excluded.exposureTime'),
+              profileDescription: eb.ref('excluded.profileDescription'),
+              colorspace: eb.ref('excluded.colorspace'),
+              bitsPerSample: eb.ref('excluded.bitsPerSample'),
+              rating: eb.ref('excluded.rating'),
+              fps: eb.ref('excluded.fps'),
+            },
+            value,
+          ),
+        ),
       )
       .execute();
   }
@@ -195,26 +169,19 @@ export class AssetRepository {
       return;
     }
 
-    await this.db
-      .updateTable('asset_exif')
-      .set((eb) => ({
-        ...options,
-        lockedProperties: distinctLocked(eb, Object.keys(options) as LockableProperty[]),
-      }))
-      .where('assetId', 'in', ids)
-      .execute();
+    await this.db.updateTable('asset_exif').set(options).where('assetId', 'in', ids).execute();
   }
 
   @GenerateSql({ params: [[DummyValue.UUID], DummyValue.NUMBER, DummyValue.STRING] })
   @Chunked()
-  updateDateTimeOriginal(ids: string[], delta?: number, timeZone?: string) {
-    return this.db
+  async updateDateTimeOriginal(
+    ids: string[],
+    delta?: number,
+    timeZone?: string,
+  ): Promise<{ assetId: string; dateTimeOriginal: Date | null; timeZone: string | null }[]> {
+    return await this.db
       .updateTable('asset_exif')
-      .set((eb) => ({
-        dateTimeOriginal: sql`"dateTimeOriginal" + ${(delta ?? 0) + ' minute'}::interval`,
-        timeZone,
-        lockedProperties: distinctLocked(eb, ['dateTimeOriginal', 'timeZone']),
-      }))
+      .set({ dateTimeOriginal: sql`"dateTimeOriginal" + ${(delta ?? 0) + ' minute'}::interval`, timeZone })
       .where('assetId', 'in', ids)
       .returning(['assetId', 'dateTimeOriginal', 'timeZone'])
       .execute();

server/src/schema/migrations/1764957138636-AddLockedPropertiesToAssetExif.ts

@@ -1,9 +0,0 @@
-import { Kysely, sql } from 'kysely';
-
-export async function up(db: Kysely<any>): Promise<void> {
-  await sql`ALTER TABLE "asset_exif" ADD "lockedProperties" character varying[];`.execute(db);
-}
-
-export async function down(db: Kysely<any>): Promise<void> {
-  await sql`ALTER TABLE "asset_exif" DROP COLUMN "lockedProperties";`.execute(db);
-}

server/src/schema/tables/asset-exif.table.ts

@@ -1,4 +1,3 @@
-import { LockableProperty } from 'src/database';
 import { UpdatedAtTrigger, UpdateIdColumn } from 'src/decorators';
 import { AssetTable } from 'src/schema/tables/asset.table';
 import { Column, ForeignKeyColumn, Generated, Int8, Table, Timestamp, UpdateDateColumn } from 'src/sql-tools';
@@ -98,7 +97,4 @@ export class AssetExifTable {
 
   @UpdateIdColumn({ index: true })
   updateId!: Generated<string>;
-
-  @Column({ type: 'character varying', array: true, nullable: true })
-  lockedProperties!: Array<LockableProperty> | null;
 }

server/src/services/asset-media.service.ts

@@ -370,10 +370,7 @@ export class AssetMediaService extends BaseService {
       : this.assetRepository.deleteFile({ assetId, type: AssetFileType.Sidecar }));
 
     await this.storageRepository.utimes(file.originalPath, new Date(), new Date(dto.fileModifiedAt));
-    await this.assetRepository.upsertExif(
-      { assetId, fileSizeInByte: file.size },
-      { lockedPropertiesBehavior: 'override' },
-    );
+    await this.assetRepository.upsertExif({ assetId, fileSizeInByte: file.size });
     await this.jobRepository.queue({
       name: JobName.AssetExtractMetadata,
       data: { id: assetId, source: 'upload' },
@@ -402,10 +399,7 @@ export class AssetMediaService extends BaseService {
     });
 
     const { size } = await this.storageRepository.stat(created.originalPath);
-    await this.assetRepository.upsertExif(
-      { assetId: created.id, fileSizeInByte: size },
-      { lockedPropertiesBehavior: 'override' },
-    );
+    await this.assetRepository.upsertExif({ assetId: created.id, fileSizeInByte: size });
     await this.jobRepository.queue({ name: JobName.AssetExtractMetadata, data: { id: created.id, source: 'copy' } });
     return created;
   }
@@ -446,10 +440,7 @@ export class AssetMediaService extends BaseService {
       await this.storageRepository.utimes(sidecarFile.originalPath, new Date(), new Date(dto.fileModifiedAt));
     }
     await this.storageRepository.utimes(file.originalPath, new Date(), new Date(dto.fileModifiedAt));
-    await this.assetRepository.upsertExif(
-      { assetId: asset.id, fileSizeInByte: file.size },
-      { lockedPropertiesBehavior: 'override' },
-    );
+    await this.assetRepository.upsertExif({ assetId: asset.id, fileSizeInByte: file.size });
 
     await this.eventRepository.emit('AssetCreate', { asset });
 

server/src/services/asset.service.spec.ts

@@ -225,10 +225,7 @@ describe(AssetService.name, () => {
 
       await sut.update(authStub.admin, 'asset-1', { description: 'Test description' });
 
-      expect(mocks.asset.upsertExif).toHaveBeenCalledWith(
-        { assetId: 'asset-1', description: 'Test description', lockedProperties: ['description'] },
-        { lockedPropertiesBehavior: 'append' },
-      );
+      expect(mocks.asset.upsertExif).toHaveBeenCalledWith({ assetId: 'asset-1', description: 'Test description' });
     });
 
     it('should update the exif rating', async () => {
@@ -238,14 +235,7 @@ describe(AssetService.name, () => {
 
       await sut.update(authStub.admin, 'asset-1', { rating: 3 });
 
-      expect(mocks.asset.upsertExif).toHaveBeenCalledWith(
-        {
-          assetId: 'asset-1',
-          rating: 3,
-          lockedProperties: ['rating'],
-        },
-        { lockedPropertiesBehavior: 'append' },
-      );
+      expect(mocks.asset.upsertExif).toHaveBeenCalledWith({ assetId: 'asset-1', rating: 3 });
     });
 
     it('should fail linking a live video if the motion part could not be found', async () => {
@@ -437,7 +427,9 @@ describe(AssetService.name, () => {
       });
       expect(mocks.asset.updateAll).toHaveBeenCalled();
       expect(mocks.asset.updateAllExif).toHaveBeenCalledWith(['asset-1'], { latitude: 0, longitude: 0 });
-      expect(mocks.job.queueAll).toHaveBeenCalledWith([{ name: JobName.SidecarWrite, data: { id: 'asset-1' } }]);
+      expect(mocks.job.queueAll).toHaveBeenCalledWith([
+        { name: JobName.SidecarWrite, data: { id: 'asset-1', latitude: 0, longitude: 0 } },
+      ]);
     });
 
     it('should update exif table if latitude field is provided', async () => {
@@ -458,7 +450,9 @@ describe(AssetService.name, () => {
         latitude: 30,
         longitude: 50,
       });
-      expect(mocks.job.queueAll).toHaveBeenCalledWith([{ name: JobName.SidecarWrite, data: { id: 'asset-1' } }]);
+      expect(mocks.job.queueAll).toHaveBeenCalledWith([
+        { name: JobName.SidecarWrite, data: { id: 'asset-1', dateTimeOriginal, latitude: 30, longitude: 50 } },
+      ]);
     });
 
     it('should update Assets table if duplicateId is provided as null', async () => {
@@ -488,7 +482,18 @@ describe(AssetService.name, () => {
         timeZone,
       });
       expect(mocks.asset.updateDateTimeOriginal).toHaveBeenCalledWith(['asset-1'], dateTimeRelative, timeZone);
-      expect(mocks.job.queueAll).toHaveBeenCalledWith([{ name: JobName.SidecarWrite, data: { id: 'asset-1' } }]);
+      expect(mocks.job.queueAll).toHaveBeenCalledWith([
+        {
+          name: JobName.SidecarWrite,
+          data: {
+            id: 'asset-1',
+            dateTimeOriginal: '2020-02-25T06:41:00.000+02:00',
+            description: undefined,
+            latitude: undefined,
+            longitude: undefined,
+          },
+        },
+      ]);
     });
   });
 

server/src/services/asset.service.ts

@@ -30,10 +30,9 @@ import {
   QueueName,
 } from 'src/enum';
 import { BaseService } from 'src/services/base.service';
-import { JobItem, JobOf } from 'src/types';
+import { ISidecarWriteJob, JobItem, JobOf } from 'src/types';
 import { requireElevatedPermission } from 'src/utils/access';
 import { getAssetFiles, getMyPartnerIds, onAfterUnlink, onBeforeLink, onBeforeUnlink } from 'src/utils/asset.util';
-import { updateLockedColumns } from 'src/utils/database';
 
 @Injectable()
 export class AssetService extends BaseService {
@@ -143,26 +142,56 @@ export class AssetService extends BaseService {
     } = dto;
     await this.requireAccess({ auth, permission: Permission.AssetUpdate, ids });
 
-    const assetDto = _.omitBy({ isFavorite, visibility, duplicateId }, _.isUndefined);
-    const exifDto = _.omitBy({ latitude, longitude, rating, description, dateTimeOriginal }, _.isUndefined);
+    const assetDto = { isFavorite, visibility, duplicateId };
+    const exifDto = { latitude, longitude, rating, description, dateTimeOriginal };
 
-    if (Object.keys(exifDto).length > 0) {
+    const isExifChanged = Object.values(exifDto).some((v) => v !== undefined);
+    if (isExifChanged) {
       await this.assetRepository.updateAllExif(ids, exifDto);
     }
 
-    if ((dateTimeRelative !== undefined && dateTimeRelative !== 0) || timeZone !== undefined) {
-      await this.assetRepository.updateDateTimeOriginal(ids, dateTimeRelative, timeZone);
+    const assets =
+      (dateTimeRelative !== undefined && dateTimeRelative !== 0) || timeZone !== undefined
+        ? await this.assetRepository.updateDateTimeOriginal(ids, dateTimeRelative, timeZone)
+        : undefined;
+
+    const dateTimesWithTimezone = assets
+      ? assets.map((asset) => {
+          const isoString = asset.dateTimeOriginal?.toISOString();
+          let dateTime = isoString ? DateTime.fromISO(isoString) : null;
+
+          if (dateTime && asset.timeZone) {
+            dateTime = dateTime.setZone(asset.timeZone);
+          }
+
+          return {
+            assetId: asset.assetId,
+            dateTimeOriginal: dateTime?.toISO() ?? null,
+          };
+        })
+      : ids.map((id) => ({ assetId: id, dateTimeOriginal }));
+
+    if (dateTimesWithTimezone.length > 0) {
+      await this.jobRepository.queueAll(
+        dateTimesWithTimezone.map(({ assetId: id, dateTimeOriginal }) => ({
+          name: JobName.SidecarWrite,
+          data: {
+            ...exifDto,
+            id,
+            dateTimeOriginal: dateTimeOriginal ?? undefined,
+          },
+        })),
+      );
     }
 
-    if (Object.keys(assetDto).length > 0) {
+    const isAssetChanged = Object.values(assetDto).some((v) => v !== undefined);
+    if (isAssetChanged) {
       await this.assetRepository.updateAll(ids, assetDto);
-    }
 
-    if (visibility === AssetVisibility.Locked) {
-      await this.albumRepository.removeAssetsFromAll(ids);
+      if (visibility === AssetVisibility.Locked) {
+        await this.albumRepository.removeAssetsFromAll(ids);
+      }
     }
-
-    await this.jobRepository.queueAll(ids.map((id) => ({ name: JobName.SidecarWrite, data: { id } })));
   }
 
   async copy(
@@ -427,25 +456,12 @@ export class AssetService extends BaseService {
     return asset;
   }
 
-  private async updateExif(dto: {
-    id: string;
-    description?: string;
-    dateTimeOriginal?: string;
-    latitude?: number;
-    longitude?: number;
-    rating?: number;
-  }) {
+  private async updateExif(dto: ISidecarWriteJob) {
     const { id, description, dateTimeOriginal, latitude, longitude, rating } = dto;
     const writes = _.omitBy({ description, dateTimeOriginal, latitude, longitude, rating }, _.isUndefined);
     if (Object.keys(writes).length > 0) {
-      await this.assetRepository.upsertExif(
-        updateLockedColumns({
-          assetId: id,
-          ...writes,
-        }),
-        { lockedPropertiesBehavior: 'append' },
-      );
-      await this.jobRepository.queue({ name: JobName.SidecarWrite, data: { id } });
+      await this.assetRepository.upsertExif({ assetId: id, ...writes });
+      await this.jobRepository.queue({ name: JobName.SidecarWrite, data: { id, ...writes } });
     }
   }
 }

server/src/services/metadata.service.spec.ts

@@ -187,9 +187,7 @@ describe(MetadataService.name, () => {
 
       await sut.handleMetadataExtraction({ id: assetStub.image.id });
       expect(mocks.assetJob.getForMetadataExtraction).toHaveBeenCalledWith(assetStub.sidecar.id);
-      expect(mocks.asset.upsertExif).toHaveBeenCalledWith(expect.objectContaining({ dateTimeOriginal: sidecarDate }), {
-        lockedPropertiesBehavior: 'skip',
-      });
+      expect(mocks.asset.upsertExif).toHaveBeenCalledWith(expect.objectContaining({ dateTimeOriginal: sidecarDate }));
       expect(mocks.asset.update).toHaveBeenCalledWith(
         expect.objectContaining({
           id: assetStub.image.id,
@@ -216,7 +214,6 @@ describe(MetadataService.name, () => {
       expect(mocks.assetJob.getForMetadataExtraction).toHaveBeenCalledWith(assetStub.image.id);
       expect(mocks.asset.upsertExif).toHaveBeenCalledWith(
         expect.objectContaining({ dateTimeOriginal: fileModifiedAt }),
-        { lockedPropertiesBehavior: 'skip' },
       );
       expect(mocks.asset.update).toHaveBeenCalledWith({
         id: assetStub.image.id,
@@ -241,10 +238,7 @@ describe(MetadataService.name, () => {
 
       await sut.handleMetadataExtraction({ id: assetStub.image.id });
       expect(mocks.assetJob.getForMetadataExtraction).toHaveBeenCalledWith(assetStub.image.id);
-      expect(mocks.asset.upsertExif).toHaveBeenCalledWith(
-        expect.objectContaining({ dateTimeOriginal: fileCreatedAt }),
-        { lockedPropertiesBehavior: 'skip' },
-      );
+      expect(mocks.asset.upsertExif).toHaveBeenCalledWith(expect.objectContaining({ dateTimeOriginal: fileCreatedAt }));
       expect(mocks.asset.update).toHaveBeenCalledWith({
         id: assetStub.image.id,
         duration: null,
@@ -264,7 +258,6 @@ describe(MetadataService.name, () => {
         expect.objectContaining({
           dateTimeOriginal: new Date('2022-01-01T00:00:00.000Z'),
         }),
-        { lockedPropertiesBehavior: 'skip' },
       );
 
       expect(mocks.asset.update).toHaveBeenCalledWith(
@@ -288,9 +281,7 @@ describe(MetadataService.name, () => {
 
       await sut.handleMetadataExtraction({ id: assetStub.image.id });
       expect(mocks.assetJob.getForMetadataExtraction).toHaveBeenCalledWith(assetStub.image.id);
-      expect(mocks.asset.upsertExif).toHaveBeenCalledWith(expect.objectContaining({ iso: 160 }), {
-        lockedPropertiesBehavior: 'skip',
-      });
+      expect(mocks.asset.upsertExif).toHaveBeenCalledWith(expect.objectContaining({ iso: 160 }));
       expect(mocks.asset.update).toHaveBeenCalledWith({
         id: assetStub.image.id,
         duration: null,
@@ -319,7 +310,6 @@ describe(MetadataService.name, () => {
       expect(mocks.assetJob.getForMetadataExtraction).toHaveBeenCalledWith(assetStub.image.id);
       expect(mocks.asset.upsertExif).toHaveBeenCalledWith(
         expect.objectContaining({ city: null, state: null, country: null }),
-        { lockedPropertiesBehavior: 'skip' },
       );
       expect(mocks.asset.update).toHaveBeenCalledWith({
         id: assetStub.withLocation.id,
@@ -349,7 +339,6 @@ describe(MetadataService.name, () => {
       expect(mocks.assetJob.getForMetadataExtraction).toHaveBeenCalledWith(assetStub.image.id);
       expect(mocks.asset.upsertExif).toHaveBeenCalledWith(
         expect.objectContaining({ city: 'City', state: 'State', country: 'Country' }),
-        { lockedPropertiesBehavior: 'skip' },
       );
       expect(mocks.asset.update).toHaveBeenCalledWith({
         id: assetStub.withLocation.id,
@@ -369,10 +358,7 @@ describe(MetadataService.name, () => {
 
       await sut.handleMetadataExtraction({ id: assetStub.image.id });
       expect(mocks.assetJob.getForMetadataExtraction).toHaveBeenCalledWith(assetStub.image.id);
-      expect(mocks.asset.upsertExif).toHaveBeenCalledWith(
-        expect.objectContaining({ latitude: null, longitude: null }),
-        { lockedPropertiesBehavior: 'skip' },
-      );
+      expect(mocks.asset.upsertExif).toHaveBeenCalledWith(expect.objectContaining({ latitude: null, longitude: null }));
     });
 
     it('should extract tags from TagsList', async () => {
@@ -585,7 +571,6 @@ describe(MetadataService.name, () => {
       expect(mocks.assetJob.getForMetadataExtraction).toHaveBeenCalledWith(assetStub.video.id);
       expect(mocks.asset.upsertExif).toHaveBeenCalledWith(
         expect.objectContaining({ orientation: ExifOrientation.Rotate270CW.toString() }),
-        { lockedPropertiesBehavior: 'skip' },
       );
     });
 
@@ -894,40 +879,37 @@ describe(MetadataService.name, () => {
 
       await sut.handleMetadataExtraction({ id: assetStub.image.id });
       expect(mocks.assetJob.getForMetadataExtraction).toHaveBeenCalledWith(assetStub.image.id);
-      expect(mocks.asset.upsertExif).toHaveBeenCalledWith(
-        {
-          assetId: assetStub.image.id,
-          bitsPerSample: expect.any(Number),
-          autoStackId: null,
-          colorspace: tags.ColorSpace,
-          dateTimeOriginal: dateForTest,
-          description: tags.ImageDescription,
-          exifImageHeight: null,
-          exifImageWidth: null,
-          exposureTime: tags.ExposureTime,
-          fNumber: null,
-          fileSizeInByte: 123_456,
-          focalLength: tags.FocalLength,
-          fps: null,
-          iso: tags.ISO,
-          latitude: null,
-          lensModel: tags.LensModel,
-          livePhotoCID: tags.MediaGroupUUID,
-          longitude: null,
-          make: tags.Make,
-          model: tags.Model,
-          modifyDate: expect.any(Date),
-          orientation: tags.Orientation?.toString(),
-          profileDescription: tags.ProfileDescription,
-          projectionType: 'EQUIRECTANGULAR',
-          timeZone: tags.tz,
-          rating: tags.Rating,
-          country: null,
-          state: null,
-          city: null,
-        },
-        { lockedPropertiesBehavior: 'skip' },
-      );
+      expect(mocks.asset.upsertExif).toHaveBeenCalledWith({
+        assetId: assetStub.image.id,
+        bitsPerSample: expect.any(Number),
+        autoStackId: null,
+        colorspace: tags.ColorSpace,
+        dateTimeOriginal: dateForTest,
+        description: tags.ImageDescription,
+        exifImageHeight: null,
+        exifImageWidth: null,
+        exposureTime: tags.ExposureTime,
+        fNumber: null,
+        fileSizeInByte: 123_456,
+        focalLength: tags.FocalLength,
+        fps: null,
+        iso: tags.ISO,
+        latitude: null,
+        lensModel: tags.LensModel,
+        livePhotoCID: tags.MediaGroupUUID,
+        longitude: null,
+        make: tags.Make,
+        model: tags.Model,
+        modifyDate: expect.any(Date),
+        orientation: tags.Orientation?.toString(),
+        profileDescription: tags.ProfileDescription,
+        projectionType: 'EQUIRECTANGULAR',
+        timeZone: tags.tz,
+        rating: tags.Rating,
+        country: null,
+        state: null,
+        city: null,
+      });
       expect(mocks.asset.update).toHaveBeenCalledWith(
         expect.objectContaining({
           id: assetStub.image.id,
@@ -961,7 +943,6 @@ describe(MetadataService.name, () => {
         expect.objectContaining({
           timeZone: 'UTC+0',
         }),
-        { lockedPropertiesBehavior: 'skip' },
       );
     });
 
@@ -1122,7 +1103,6 @@ describe(MetadataService.name, () => {
         expect.objectContaining({
           description: '',
         }),
-        { lockedPropertiesBehavior: 'skip' },
       );
 
       mockReadTags({ ImageDescription: ' my\n description' });
@@ -1131,7 +1111,6 @@ describe(MetadataService.name, () => {
         expect.objectContaining({
           description: 'my\n description',
         }),
-        { lockedPropertiesBehavior: 'skip' },
       );
     });
 
@@ -1144,7 +1123,6 @@ describe(MetadataService.name, () => {
         expect.objectContaining({
           description: '1000',
         }),
-        { lockedPropertiesBehavior: 'skip' },
       );
     });
 
@@ -1368,7 +1346,6 @@ describe(MetadataService.name, () => {
         expect.objectContaining({
           modifyDate: expect.any(Date),
         }),
-        { lockedPropertiesBehavior: 'skip' },
       );
     });
 
@@ -1381,7 +1358,6 @@ describe(MetadataService.name, () => {
         expect.objectContaining({
           rating: null,
         }),
-        { lockedPropertiesBehavior: 'skip' },
       );
     });
 
@@ -1394,7 +1370,6 @@ describe(MetadataService.name, () => {
         expect.objectContaining({
           rating: 5,
         }),
-        { lockedPropertiesBehavior: 'skip' },
       );
     });
 
@@ -1407,7 +1382,6 @@ describe(MetadataService.name, () => {
         expect.objectContaining({
           rating: -1,
         }),
-        { lockedPropertiesBehavior: 'skip' },
       );
     });
 
@@ -1529,9 +1503,7 @@ describe(MetadataService.name, () => {
       mockReadTags(exif);
 
       await sut.handleMetadataExtraction({ id: assetStub.image.id });
-      expect(mocks.asset.upsertExif).toHaveBeenCalledWith(expect.objectContaining(expected), {
-        lockedPropertiesBehavior: 'skip',
-      });
+      expect(mocks.asset.upsertExif).toHaveBeenCalledWith(expect.objectContaining(expected));
     });
 
     it.each([
@@ -1557,7 +1529,6 @@ describe(MetadataService.name, () => {
         expect.objectContaining({
           lensModel: expected,
         }),
-        { lockedPropertiesBehavior: 'skip' },
       );
     });
   });
@@ -1666,14 +1637,12 @@ describe(MetadataService.name, () => {
 
   describe('handleSidecarWrite', () => {
     it('should skip assets that no longer exist', async () => {
-      mocks.assetJob.getLockedPropertiesForMetadataExtraction.mockResolvedValue([]);
       mocks.assetJob.getForSidecarWriteJob.mockResolvedValue(void 0);
       await expect(sut.handleSidecarWrite({ id: 'asset-123' })).resolves.toBe(JobStatus.Failed);
       expect(mocks.metadata.writeTags).not.toHaveBeenCalled();
     });
 
     it('should skip jobs with no metadata', async () => {
-      mocks.assetJob.getLockedPropertiesForMetadataExtraction.mockResolvedValue([]);
       const asset = factory.jobAssets.sidecarWrite();
       mocks.assetJob.getForSidecarWriteJob.mockResolvedValue(asset);
       await expect(sut.handleSidecarWrite({ id: asset.id })).resolves.toBe(JobStatus.Skipped);
@@ -1686,22 +1655,20 @@ describe(MetadataService.name, () => {
       const gps = 12;
       const date = '2023-11-22T04:56:12.196Z';
 
-      mocks.assetJob.getLockedPropertiesForMetadataExtraction.mockResolvedValue([
-        'description',
-        'latitude',
-        'longitude',
-        'dateTimeOriginal',
-      ]);
       mocks.assetJob.getForSidecarWriteJob.mockResolvedValue(asset);
       await expect(
         sut.handleSidecarWrite({
           id: asset.id,
+          description,
+          latitude: gps,
+          longitude: gps,
+          dateTimeOriginal: date,
         }),
       ).resolves.toBe(JobStatus.Success);
       expect(mocks.metadata.writeTags).toHaveBeenCalledWith(asset.files[0].path, {
-        DateTimeOriginal: date,
         Description: description,
         ImageDescription: description,
+        DateTimeOriginal: date,
         GPSLatitude: gps,
         GPSLongitude: gps,
       });

server/src/services/metadata.service.ts

@@ -290,7 +290,7 @@ export class MetadataService extends BaseService {
     };
 
     const promises: Promise<unknown>[] = [
-      this.assetRepository.upsertExif(exifData, { lockedPropertiesBehavior: 'skip' }),
+      this.assetRepository.upsertExif(exifData),
       this.assetRepository.update({
         id: asset.id,
         duration: this.getDuration(exifTags),
@@ -393,34 +393,22 @@ export class MetadataService extends BaseService {
 
   @OnJob({ name: JobName.SidecarWrite, queue: QueueName.Sidecar })
   async handleSidecarWrite(job: JobOf<JobName.SidecarWrite>): Promise<JobStatus> {
-    const { id, tags } = job;
+    const { id, description, dateTimeOriginal, latitude, longitude, rating, tags } = job;
     const asset = await this.assetJobRepository.getForSidecarWriteJob(id);
     if (!asset) {
       return JobStatus.Failed;
     }
 
-    const lockedProperties = await this.assetJobRepository.getLockedPropertiesForMetadataExtraction(id);
     const tagsList = (asset.tags || []).map((tag) => tag.value);
 
     const { sidecarFile } = getAssetFiles(asset.files);
     const sidecarPath = sidecarFile?.path || `${asset.originalPath}.xmp`;
 
-    const { description, dateTimeOriginal, latitude, longitude, rating } = _.pick(
-      {
-        description: asset.exifInfo.description,
-        dateTimeOriginal: asset.exifInfo.dateTimeOriginal,
-        latitude: asset.exifInfo.latitude,
-        longitude: asset.exifInfo.longitude,
-        rating: asset.exifInfo.rating,
-      },
-      lockedProperties,
-    );
-
     const exif = _.omitBy(
       <Tags>{
         Description: description,
         ImageDescription: description,
-        DateTimeOriginal: dateTimeOriginal ? String(dateTimeOriginal) : undefined,
+        DateTimeOriginal: dateTimeOriginal,
         GPSLatitude: latitude,
         GPSLongitude: longitude,
         Rating: rating,

server/src/types.ts

@@ -222,6 +222,11 @@ export interface IDeleteFilesJob extends IBaseJob {
 }
 
 export interface ISidecarWriteJob extends IEntityJob {
+  description?: string;
+  dateTimeOriginal?: string;
+  latitude?: number;
+  longitude?: number;
+  rating?: number;
   tags?: true;
 }
 

server/src/utils/database.ts

@@ -15,7 +15,7 @@ import { PostgresJSDialect } from 'kysely-postgres-js';
 import { jsonArrayFrom, jsonObjectFrom } from 'kysely/helpers/postgres';
 import { parse } from 'pg-connection-string';
 import postgres, { Notice, PostgresError } from 'postgres';
-import { columns, Exif, lockableProperties, LockableProperty, Person } from 'src/database';
+import { columns, Exif, Person } from 'src/database';
 import { AssetFileType, AssetVisibility, DatabaseExtension, DatabaseSslMode } from 'src/enum';
 import { AssetSearchBuilderOptions } from 'src/repositories/search.repository';
 import { DB } from 'src/schema';
@@ -488,10 +488,3 @@ export function vectorIndexQuery({ vectorExtension, table, indexName, lists }: V
     }
   }
 }
-
-export const updateLockedColumns = <T extends Record<string, unknown> & { lockedProperties?: LockableProperty[] }>(
-  exif: T,
-) => {
-  exif.lockedProperties = lockableProperties.filter((property) => property in exif);
-  return exif;
-};

server/test/medium.factory.ts

@@ -202,7 +202,7 @@ export class MediumTestContext<S extends BaseService = BaseService> {
   }
 
   async newExif(dto: Insertable<AssetExifTable>) {
-    const result = await this.get(AssetRepository).upsertExif(dto, { lockedPropertiesBehavior: 'override' });
+    const result = await this.get(AssetRepository).upsertExif(dto);
     return { result };
   }
 

server/test/medium/specs/services/asset.service.spec.ts

@@ -268,65 +268,4 @@ describe(AssetService.name, () => {
       });
     });
   });
-
-  describe('update', () => {
-    it('should update dateTimeOriginal', async () => {
-      const { sut, ctx } = setup();
-      ctx.getMock(JobRepository).queue.mockResolvedValue();
-      const { user } = await ctx.newUser();
-      const auth = factory.auth({ user });
-      const { asset } = await ctx.newAsset({ ownerId: user.id });
-      await ctx.newExif({ assetId: asset.id, description: 'test' });
-
-      await expect(
-        ctx.database
-          .selectFrom('asset_exif')
-          .select('lockedProperties')
-          .where('assetId', '=', asset.id)
-          .executeTakeFirstOrThrow(),
-      ).resolves.toEqual({ lockedProperties: null });
-      await sut.update(auth, asset.id, { dateTimeOriginal: '2023-11-19T18:11:00.000-07:00' });
-
-      await expect(
-        ctx.database
-          .selectFrom('asset_exif')
-          .select('lockedProperties')
-          .where('assetId', '=', asset.id)
-          .executeTakeFirstOrThrow(),
-      ).resolves.toEqual({ lockedProperties: ['dateTimeOriginal'] });
-      await expect(ctx.get(AssetRepository).getById(asset.id, { exifInfo: true })).resolves.toEqual(
-        expect.objectContaining({
-          exifInfo: expect.objectContaining({ dateTimeOriginal: '2023-11-20T01:11:00+00:00' }),
-        }),
-      );
-    });
-  });
-
-  describe('updateAll', () => {
-    it('should relatively update assets', async () => {
-      const { sut, ctx } = setup();
-      ctx.getMock(JobRepository).queueAll.mockResolvedValue();
-      const { user } = await ctx.newUser();
-      const auth = factory.auth({ user });
-      const { asset } = await ctx.newAsset({ ownerId: user.id });
-      await ctx.newExif({ assetId: asset.id, dateTimeOriginal: '2023-11-19T18:11:00' });
-
-      await sut.updateAll(auth, { ids: [asset.id], dateTimeRelative: -11 });
-
-      await expect(
-        ctx.database
-          .selectFrom('asset_exif')
-          .select('lockedProperties')
-          .where('assetId', '=', asset.id)
-          .executeTakeFirstOrThrow(),
-      ).resolves.toEqual({ lockedProperties: ['timeZone', 'dateTimeOriginal'] });
-      await expect(ctx.get(AssetRepository).getById(asset.id, { exifInfo: true })).resolves.toEqual(
-        expect.objectContaining({
-          exifInfo: expect.objectContaining({
-            dateTimeOriginal: '2023-11-19T18:00:00+00:00',
-          }),
-        }),
-      );
-    });
-  });
 });

server/test/medium/specs/services/metadata.service.spec.ts

@@ -95,7 +95,6 @@ describe(MetadataService.name, () => {
           dateTimeOriginal: new Date(expected.dateTimeOriginal),
           timeZone: expected.timeZone,
         }),
-        { lockedPropertiesBehavior: 'skip' },
       );
 
       expect(mocks.asset.update).toHaveBeenCalledWith(

server/test/medium/specs/sync/sync-album-asset-exif.spec.ts

@@ -2,7 +2,6 @@ import { Kysely } from 'kysely';
 import { AlbumUserRole, SyncEntityType, SyncRequestType } from 'src/enum';
 import { AssetRepository } from 'src/repositories/asset.repository';
 import { DB } from 'src/schema';
-import { updateLockedColumns } from 'src/utils/database';
 import { SyncTestContext } from 'test/medium.factory';
 import { factory } from 'test/small.factory';
 import { getKyselyDB, wait } from 'test/utils';
@@ -289,13 +288,10 @@ describe(SyncRequestType.AlbumAssetExifsV1, () => {
 
     // update the asset
     const assetRepository = ctx.get(AssetRepository);
-    await assetRepository.upsertExif(
-      updateLockedColumns({
-        assetId: asset.id,
-        city: 'New City',
-      }),
-      { lockedPropertiesBehavior: 'append' },
-    );
+    await assetRepository.upsertExif({
+      assetId: asset.id,
+      city: 'New City',
+    });
 
     await expect(ctx.syncStream(auth, [SyncRequestType.AlbumAssetExifsV1])).resolves.toEqual([
       {
@@ -350,13 +346,10 @@ describe(SyncRequestType.AlbumAssetExifsV1, () => {
 
     // update the asset
     const assetRepository = ctx.get(AssetRepository);
-    await assetRepository.upsertExif(
-      updateLockedColumns({
-        assetId: assetDelayedExif.id,
-        city: 'Delayed Exif',
-      }),
-      { lockedPropertiesBehavior: 'append' },
-    );
+    await assetRepository.upsertExif({
+      assetId: assetDelayedExif.id,
+      city: 'Delayed Exif',
+    });
 
     await expect(ctx.syncStream(auth, [SyncRequestType.AlbumAssetExifsV1])).resolves.toEqual([
       {

server/test/small.factory.ts

@@ -4,7 +4,6 @@ import {
   AuthApiKey,
   AuthSharedLink,
   AuthUser,
-  Exif,
   Library,
   Memory,
   Partner,
@@ -320,28 +319,18 @@ const versionHistoryFactory = () => ({
   version: '1.123.45',
 });
 
-const assetSidecarWriteFactory = () => {
-  const id = newUuid();
-  return {
-    id,
-    originalPath: '/path/to/original-path.jpg.xmp',
-    tags: [],
-    files: [
-      {
-        id: newUuid(),
-        path: '/path/to/original-path.jpg.xmp',
-        type: AssetFileType.Sidecar,
-      },
-    ],
-    exifInfo: {
-      assetId: id,
-      description: 'this is a description',
-      latitude: 12,
-      longitude: 12,
-      dateTimeOriginal: '2023-11-22T04:56:12.196Z',
-    } as unknown as Exif,
-  };
-};
+const assetSidecarWriteFactory = () => ({
+  id: newUuid(),
+  originalPath: '/path/to/original-path.jpg.xmp',
+  tags: [],
+  files: [
+    {
+      id: newUuid(),
+      path: '/path/to/original-path.jpg.xmp',
+      type: AssetFileType.Sidecar,
+    },
+  ],
+});
 
 const assetOcrFactory = (
   ocr: {

web/src/lib/components/album-page/album-viewer.svelte

@@ -12,8 +12,6 @@
   import { AssetInteraction } from '$lib/stores/asset-interaction.svelte';
   import { assetViewingStore } from '$lib/stores/asset-viewing.store';
   import { dragAndDropFilesStore } from '$lib/stores/drag-and-drop-files.store';
-  import { mobileDevice } from '$lib/stores/mobile-device.svelte';
-  import { SlideshowNavigation, SlideshowState, slideshowStore } from '$lib/stores/slideshow.store';
   import { handlePromiseError } from '$lib/utils';
   import { cancelMultiselect } from '$lib/utils/asset-utils';
   import { fileUploadHandler, openFileUploadDialog } from '$lib/utils/file-uploader';
@@ -24,6 +22,7 @@
   import ControlAppBar from '../shared-components/control-app-bar.svelte';
   import ThemeButton from '../shared-components/theme-button.svelte';
   import AlbumSummary from './album-summary.svelte';
+  import { SlideshowNavigation, SlideshowState, slideshowStore } from '$lib/stores/slideshow.store';
 
   interface Props {
     sharedLink: SharedLinkResponseDto;
@@ -111,7 +110,7 @@
     <ControlAppBar showBackButton={false}>
       {#snippet leading()}
         <a data-sveltekit-preload-data="hover" class="ms-4" href="/">
-          <Logo variant={mobileDevice.maxMd ? 'icon' : 'inline'} class="min-w-10" />
+          <Logo variant="inline" class="min-w-min" />
         </a>
       {/snippet}
 

web/src/lib/components/asset-viewer/activity-status.svelte

@@ -2,7 +2,7 @@
   import { locale } from '$lib/stores/preferences.store';
   import type { ActivityResponseDto } from '@immich/sdk';
   import { Icon } from '@immich/ui';
-  import { mdiCommentOutline, mdiThumbUp, mdiThumbUpOutline } from '@mdi/js';
+  import { mdiCommentOutline, mdiHeart, mdiHeartOutline } from '@mdi/js';
 
   interface Props {
     isLiked: ActivityResponseDto | null;
@@ -19,7 +19,7 @@
 <div class="w-full flex p-4 items-center justify-center rounded-full gap-5 bg-subtle border bg-opacity-60">
   <button type="button" class={disabled ? 'cursor-not-allowed' : ''} onclick={onFavorite} {disabled}>
     <div class="flex gap-2 items-center justify-center">
-      <Icon icon={isLiked ? mdiThumbUp : mdiThumbUpOutline} size="24" class={isLiked ? 'text-primary' : 'text-fg'} />
+      <Icon icon={isLiked ? mdiHeart : mdiHeartOutline} size="24" class={isLiked ? 'text-red-400' : 'text-fg'} />
       {#if numberOfLikes}
         <div class="text-l">{numberOfLikes.toLocaleString($locale)}</div>
       {/if}

web/src/lib/components/asset-viewer/activity-viewer.svelte

@@ -13,7 +13,7 @@
   import { isTenMinutesApart } from '$lib/utils/timesince';
   import { ReactionType, type ActivityResponseDto, type AssetTypeEnum, type UserResponseDto } from '@immich/sdk';
   import { Icon, IconButton, LoadingSpinner, toastManager } from '@immich/ui';
-  import { mdiClose, mdiDeleteOutline, mdiDotsVertical, mdiSend, mdiThumbUp } from '@mdi/js';
+  import { mdiClose, mdiDeleteOutline, mdiDotsVertical, mdiHeart, mdiSend } from '@mdi/js';
   import * as luxon from 'luxon';
   import { t } from 'svelte-i18n';
   import UserAvatar from '../shared-components/user-avatar.svelte';
@@ -181,7 +181,7 @@
           {:else if reaction.type === ReactionType.Like}
             <div class="relative">
               <div class="flex py-3 ps-3 mt-3 gap-4 items-center text-sm">
-                <div class="text-primary"><Icon icon={mdiThumbUp} size="20" /></div>
+                <div class="text-red-600"><Icon icon={mdiHeart} size="20" /></div>
 
                 <div class="w-full" title={`${reaction.user.name} (${reaction.user.email})`}>
                   {$t('user_liked', {
@@ -254,7 +254,7 @@
                 shortcut: { key: 'Enter' },
                 onShortcut: () => handleSendComment(),
               }}
-              class="h-4.5 {disabled
+              class="h-[18px] {disabled
                 ? 'cursor-not-allowed'
                 : ''} w-full max-h-56 pe-2 items-center overflow-y-auto leading-4 outline-none resize-none bg-gray-200"
             ></textarea>

web/src/lib/components/share-page/individual-shared-viewer.svelte

@@ -9,7 +9,6 @@
   import type { Viewport } from '$lib/managers/timeline-manager/types';
   import { AssetInteraction } from '$lib/stores/asset-interaction.svelte';
   import { dragAndDropFilesStore } from '$lib/stores/drag-and-drop-files.store';
-  import { mobileDevice } from '$lib/stores/mobile-device.svelte';
   import { handlePromiseError } from '$lib/utils';
   import { cancelMultiselect, downloadArchive } from '$lib/utils/asset-utils';
   import { fileUploadHandler, openFileUploadDialog } from '$lib/utils/file-uploader';
@@ -109,7 +108,7 @@
       <ControlAppBar onClose={() => goto(AppRoute.PHOTOS)} backIcon={mdiArrowLeft} showBackButton={false}>
         {#snippet leading()}
           <a data-sveltekit-preload-data="hover" class="ms-4" href="/">
-            <Logo variant={mobileDevice.maxMd ? 'icon' : 'inline'} class="min-w-10" />
+            <Logo variant="inline" />
           </a>
         {/snippet}
 

web/src/lib/components/sharedlinks-page/shared-link-card.svelte

@@ -5,7 +5,7 @@
   import { getSharedLinkActions } from '$lib/services/shared-link.service';
   import { locale } from '$lib/stores/preferences.store';
   import { SharedLinkType, type SharedLinkResponseDto } from '@immich/sdk';
-  import { ContextMenuButton, MenuItemType, Text } from '@immich/ui';
+  import { Badge, ContextMenuButton, MenuItemType, Text } from '@immich/ui';
   import { DateTime, type ToRelativeUnit } from 'luxon';
   import { t } from 'svelte-i18n';
 
@@ -32,28 +32,6 @@
   };
 
   const { Edit, Copy, Delete } = $derived(getSharedLinkActions($t, sharedLink));
-
-  const capabilities = $derived.by(() => {
-    const items = [];
-
-    if (sharedLink.allowUpload) {
-      items.push($t('upload'));
-    }
-
-    if (sharedLink.allowDownload) {
-      items.push($t('download'));
-    }
-
-    if (sharedLink.showMetadata) {
-      items.push($t('exif'));
-    }
-
-    if (sharedLink.password) {
-      items.push($t('password'));
-    }
-
-    return items;
-  });
 </script>
 
 <div
@@ -66,41 +44,50 @@
   >
     <ShareCover class="transition-all duration-300 hover:shadow-lg" {sharedLink} />
 
-    <div class="flex flex-col gap-4 justify-between">
-      <div class="flex flex-col">
-        <Text size="tiny" color={isExpired ? 'danger' : 'muted'} class="font-medium">
-          {#if isExpired}
-            {$t('expired')}
-          {:else if expiresAt}
+    <div class="flex flex-col gap-2">
+      <Text size="large" color="primary" class="flex place-items-center gap-2 break-all">
+        {#if sharedLink.type === SharedLinkType.Album}
+          {sharedLink.album?.albumName}
+        {:else if sharedLink.type === SharedLinkType.Individual}
+          {$t('individual_share')}
+        {/if}
+      </Text>
+
+      <div class="flex flex-wrap gap-1">
+        {#if isExpired}
+          <Badge size="small" color="danger">{$t('expired')}</Badge>
+        {:else if expiresAt}
+          <Badge size="small" color="secondary">
             {$t('expires_date', { values: { date: getCountDownExpirationDate(expiresAt, now) } })}
-          {:else}
-            {$t('expires_date', { values: { date: '∞' } })}
-          {/if}
-        </Text>
+          </Badge>
+        {:else}
+          <Badge size="small" color="secondary">{$t('expires_date', { values: { date: '∞' } })}</Badge>
+        {/if}
 
-        <Text size="large" color="primary" class="flex place-items-center gap-2 break-all font-medium">
-          {#if sharedLink.type === SharedLinkType.Album}
-            {sharedLink.album?.albumName}
-          {:else if sharedLink.type === SharedLinkType.Individual}
-            {$t('individual_share')}
-          {/if}
-        </Text>
+        {#if sharedLink.slug}
+          <Badge size="small" color="secondary">{$t('custom_url')}</Badge>
+        {/if}
 
-        {#if sharedLink.description}
-          <Text size="small" class="line-clamp-1">{sharedLink.description}</Text>
+        {#if sharedLink.allowUpload}
+          <Badge size="small" color="secondary">{$t('upload')}</Badge>
+        {/if}
+
+        {#if sharedLink.showMetadata && sharedLink.allowDownload}
+          <Badge size="small" color="secondary">{$t('download')}</Badge>
+        {/if}
+
+        {#if sharedLink.showMetadata}
+          <Badge size="small" color="secondary">{$t('exif')}</Badge>
+        {/if}
+
+        {#if sharedLink.password}
+          <Badge size="small" color="secondary">{$t('password')}</Badge>
         {/if}
       </div>
 
-      <div class="flex flex-wrap items-center gap-2">
-        {#each capabilities as capability, index (index)}
-          <Text size="small" color="primary" class="font-medium">
-            {capability}
-          </Text>
-          {#if index < capabilities.length - 1}
-            <Text size="small" color="muted">•</Text>
-          {/if}
-        {/each}
-      </div>
+      {#if sharedLink.description}
+        <Text size="small" class="line-clamp-1">{sharedLink.description}</Text>
+      {/if}
     </div>
   </svelte:element>
   <div class="flex flex-auto flex-col place-content-center place-items-end text-end ms-4">

web/src/routes/(user)/shared-links/[[id=id]]/+page.svelte

@@ -3,7 +3,7 @@
   import { page } from '$app/state';
   import UserPageLayout from '$lib/components/layouts/user-page-layout.svelte';
   import OnEvents from '$lib/components/OnEvents.svelte';
-  import SharedLinkCard from '$lib/components/sharedlinks-page/SharedLinkCard.svelte';
+  import SharedLinkCard from '$lib/components/sharedlinks-page/shared-link-card.svelte';
   import { AppRoute } from '$lib/constants';
   import GroupTab from '$lib/elements/GroupTab.svelte';
   import SharedLinkUpdateModal from '$lib/modals/SharedLinkUpdateModal.svelte';