Skip to content

High performance self-hosted photo and video management solution.

feat(mobile): remove from album in asset viewer bar (#20672)

Brandon Wees7a7843467c6c
diff --git a/mobile/lib/presentation/widgets/action_buttons/move_to_lock_folder_action_button.widget.dart b/mobile/lib/presentation/widgets/action_buttons/move_to_lock_folder_action_button.widget.dart
index 0fde43b459..d1ea85bcc4 100644
--- a/mobile/lib/presentation/widgets/action_buttons/move_to_lock_folder_action_button.widget.dart
+++ b/mobile/lib/presentation/widgets/action_buttons/move_to_lock_folder_action_button.widget.dart
@@ -45,7 +45,7 @@ class MoveToLockFolderActionButton extends ConsumerWidget {
@override
Widget build(BuildContext context, WidgetRef ref) {
return BaseActionButton(
- maxWidth: 100.0,
+ maxWidth: 110.0,
iconData: Icons.lock_outline_rounded,
label: "move_to_locked_folder".t(context: context),
onPressed: () => _onTap(context, ref),
diff --git a/mobile/lib/presentation/widgets/action_buttons/remove_from_album_action_button.widget.dart b/mobile/lib/presentation/widgets/action_buttons/remove_from_album_action_button.widget.dart
index a1f6f7e7d1..2ce8b345a1 100644
--- a/mobile/lib/presentation/widgets/action_buttons/remove_from_album_action_button.widget.dart
+++ b/mobile/lib/presentation/widgets/action_buttons/remove_from_album_action_button.widget.dart
@@ -43,6 +43,7 @@ class RemoveFromAlbumActionButton extends ConsumerWidget {
iconData: Icons.remove_circle_outline,
label: "remove_from_album".t(context: context),
onPressed: () => _onTap(context, ref),
+ maxWidth: 100,
);
}
}
diff --git a/mobile/lib/presentation/widgets/asset_viewer/bottom_sheet.widget.dart b/mobile/lib/presentation/widgets/asset_viewer/bottom_sheet.widget.dart
index 1d76d3c39d..6baac82889 100644
--- a/mobile/lib/presentation/widgets/asset_viewer/bottom_sheet.widget.dart
+++ b/mobile/lib/presentation/widgets/asset_viewer/bottom_sheet.widget.dart
@@ -12,6 +12,7 @@ import 'package:immich_mobile/presentation/widgets/action_buttons/delete_permane
import 'package:immich_mobile/presentation/widgets/action_buttons/delete_local_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/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/share_action_button.widget.dart';
import 'package:immich_mobile/presentation/widgets/action_buttons/share_link_action_button.widget.dart';
import 'package:immich_mobile/presentation/widgets/action_buttons/trash_action_button.widget.dart';
@@ -21,6 +22,7 @@ import 'package:immich_mobile/presentation/widgets/asset_viewer/bottom_sheet/she
import 'package:immich_mobile/presentation/widgets/bottom_sheet/base_bottom_sheet.widget.dart';
import 'package:immich_mobile/providers/infrastructure/action.provider.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/routes.provider.dart';
import 'package:immich_mobile/providers/server_info.provider.dart';
import 'package:immich_mobile/utils/bytes_units.dart';
@@ -42,8 +44,8 @@ class AssetDetailBottomSheet extends ConsumerWidget {
}
final isTrashEnable = ref.watch(serverInfoProvider.select((state) => state.serverFeatures.trash));
-
final isInLockedView = ref.watch(inLockedViewProvider);
+ final currentAlbum = ref.watch(currentRemoteAlbumProvider);
final actions = <Widget>[
const ShareActionButton(source: ActionSource.viewer),
@@ -61,6 +63,7 @@ class AssetDetailBottomSheet extends ConsumerWidget {
const DeleteLocalActionButton(source: ActionSource.viewer),
const UploadActionButton(source: ActionSource.timeline),
],
+ if (currentAlbum != null) RemoveFromAlbumActionButton(albumId: currentAlbum.id, source: ActionSource.viewer),
];
final lockedViewActions = <Widget>[];