From 9567a2a5606d4bdc9c016dbf3b0206d2b32cb8e9 Mon Sep 17 00:00:00 2001 From: Alex Date: Tue, 5 Aug 2025 14:18:57 -0500 Subject: [PATCH] fix: delete local asset show twice (#20700) * chore: better button width * fix: delete local action show twice --- .../download_action_button.widget.dart | 1 + ...ove_to_lock_folder_action_button.widget.dart | 2 +- .../general_bottom_sheet.widget.dart | 17 ++++++----------- 3 files changed, 8 insertions(+), 12 deletions(-) diff --git a/mobile/lib/presentation/widgets/action_buttons/download_action_button.widget.dart b/mobile/lib/presentation/widgets/action_buttons/download_action_button.widget.dart index a6464308e2..7c0db5ed9a 100644 --- a/mobile/lib/presentation/widgets/action_buttons/download_action_button.widget.dart +++ b/mobile/lib/presentation/widgets/action_buttons/download_action_button.widget.dart @@ -46,6 +46,7 @@ class DownloadActionButton extends ConsumerWidget { Widget build(BuildContext context, WidgetRef ref) { return BaseActionButton( iconData: Icons.download, + maxWidth: 95, label: "download".t(context: context), onPressed: () => _onTap(context, ref), ); 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 d1ea85bcc4..78b9e3cde6 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: 110.0, + maxWidth: 115.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/bottom_sheet/general_bottom_sheet.widget.dart b/mobile/lib/presentation/widgets/bottom_sheet/general_bottom_sheet.widget.dart index 07b0ea6da8..f1f092d2e2 100644 --- a/mobile/lib/presentation/widgets/bottom_sheet/general_bottom_sheet.widget.dart +++ b/mobile/lib/presentation/widgets/bottom_sheet/general_bottom_sheet.widget.dart @@ -94,22 +94,17 @@ class _GeneralBottomSheetState extends ConsumerState { const ArchiveActionButton(source: ActionSource.timeline), const FavoriteActionButton(source: ActionSource.timeline), const DownloadActionButton(source: ActionSource.timeline), - isTrashEnable - ? const TrashActionButton(source: ActionSource.timeline) - : const DeletePermanentActionButton(source: ActionSource.timeline), - const DeleteActionButton(source: ActionSource.timeline), - if (multiselect.hasLocal || multiselect.hasMerged) ...[ - const DeleteLocalActionButton(source: ActionSource.timeline), - ], const EditDateTimeActionButton(source: ActionSource.timeline), const EditLocationActionButton(source: ActionSource.timeline), const MoveToLockFolderActionButton(source: ActionSource.timeline), const StackActionButton(source: ActionSource.timeline), + isTrashEnable + ? const TrashActionButton(source: ActionSource.timeline) + : const DeletePermanentActionButton(source: ActionSource.timeline), + const DeleteActionButton(source: ActionSource.timeline), ], - if (multiselect.hasLocal) ...[ - const DeleteLocalActionButton(source: ActionSource.timeline), - const UploadActionButton(source: ActionSource.timeline), - ], + if (multiselect.hasLocal || multiselect.hasMerged) const DeleteLocalActionButton(source: ActionSource.timeline), + if (multiselect.hasLocal) const UploadActionButton(source: ActionSource.timeline), ], slivers: [ const AddToAlbumHeader(),