Remove partner sharing references in shared albums

immich-app · Sep 6, 2024 · b01a282 · b01a282
1 parent 84feac8
commit b01a282
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 3 deletions.
diff --git a/mobile/lib/widgets/asset_viewer/detail_panel/asset_state_details.dart b/mobile/lib/widgets/asset_viewer/detail_panel/asset_state_details.dart
@@ -5,6 +5,7 @@ import 'package:immich_mobile/entities/asset.entity.dart';
 import 'package:immich_mobile/entities/store.entity.dart';
 import 'package:immich_mobile/entities/user.entity.dart';
 import 'package:immich_mobile/extensions/build_context_extensions.dart';
+import 'package:immich_mobile/providers/album/current_album.provider.dart';
 import 'package:immich_mobile/services/user.service.dart';
 import 'package:immich_mobile/utils/storage_indicator.dart';
 import 'package:immich_mobile/widgets/common/user_circle_avatar.dart';
@@ -21,6 +22,7 @@ class AssetStateInfo extends ConsumerWidget {
   Widget build(BuildContext context, WidgetRef ref) {
     final textColor = context.isDarkTheme ? Colors.white : Colors.black;
     final userService = ref.watch(userServiceProvider);
+    final isInAlbum = ref.watch(currentAlbumProvider)?.isRemote ?? false;
     final User? user = (asset.ownerId == Store.get(StoreKey.currentUser).isarId)
         ? null
         : userService.lookupUserById(asset.ownerId);
@@ -39,10 +41,14 @@ class AssetStateInfo extends ConsumerWidget {
               size: 30,
             ).build(context),
       title: Text(
-        (user == null) ? storageText(asset) : "storage_asset_partner".tr(),
+        (user == null)
+            ? storageText(asset)
+            : isInAlbum
+                ? user.name
+                : "storage_asset_partner".tr(),
         style: context.textTheme.labelLarge,
       ),
-      subtitle: (user == null)
+      subtitle: (user == null || isInAlbum)
           ? null
           : Text(
               user.name,

diff --git a/mobile/lib/widgets/asset_viewer/gallery_app_bar.dart b/mobile/lib/widgets/asset_viewer/gallery_app_bar.dart
@@ -37,6 +37,7 @@ class GalleryAppBar extends ConsumerWidget {
   @override
   Widget build(BuildContext context, WidgetRef ref) {
     final album = ref.watch(currentAlbumProvider);
+    final isInAlbum = album?.isRemote ?? false;
     final isOwner = asset.ownerId == ref.watch(currentUserProvider)?.isarId;
 
     final isPartner = ref
@@ -107,7 +108,9 @@ class GalleryAppBar extends ConsumerWidget {
             title: Center(
               heightFactor: 0.8,
               child: Text(
-                "partner_sharing_dialog_title".tr(),
+                isInAlbum
+                    ? "album_thumbnail_shared_by".tr(args: [":"])
+                    : "partner_sharing_dialog_title".tr(),
                 style: const TextStyle(
                   fontSize: 16,
                   fontWeight: FontWeight.bold,