From 39a9cd3db4024057c73c13ad3334e3adcb95d18f Mon Sep 17 00:00:00 2001 From: Aman Raj Singh Mourya Date: Mon, 27 Jan 2025 14:57:54 +0530 Subject: [PATCH] [auth] Hide [Share/QR/Edit/Trash] popup in code reorder screen --- auth/lib/ui/code_widget.dart | 46 ++++++++++++++++------------- auth/lib/ui/reorder_codes_page.dart | 1 + 2 files changed, 26 insertions(+), 21 deletions(-) diff --git a/auth/lib/ui/code_widget.dart b/auth/lib/ui/code_widget.dart index 442b118314..3ccb7ab67b 100644 --- a/auth/lib/ui/code_widget.dart +++ b/auth/lib/ui/code_widget.dart @@ -33,12 +33,14 @@ class CodeWidget extends StatefulWidget { final Code code; final bool isCompactMode; final CodeSortKey? sortKey; + final bool isReordering; const CodeWidget( this.code, { super.key, required this.isCompactMode, this.sortKey, + this.isReordering = false, }); @override @@ -222,25 +224,27 @@ class _CodeWidgetState extends State { ); } : null, - onLongPress: () { - showModalBottomSheet( - context: context, - builder: (_) { - return BottomActionBarWidget( - code: widget.code, - showPin: !ignorePin, - onEdit: () => _onEditPressed(true), - onShare: () => _onSharePressed(true), - onPin: () => _onPinPressed(true), - onTrashed: () => _onTrashPressed(true), - onDelete: () => _onDeletePressed(true), - onRestore: () => _onRestoreClicked(true), - onShowQR: () => _onShowQrPressed(true), - onCancel: () => Navigator.of(context).pop(), - ); - }, - ); - }, + onLongPress: widget.isReordering + ? null + : () { + showModalBottomSheet( + context: context, + builder: (_) { + return BottomActionBarWidget( + code: widget.code, + showPin: !ignorePin, + onEdit: () => _onEditPressed(true), + onShare: () => _onSharePressed(true), + onPin: () => _onPinPressed(true), + onTrashed: () => _onTrashPressed(true), + onDelete: () => _onDeletePressed(true), + onRestore: () => _onRestoreClicked(true), + onShowQR: () => _onShowQrPressed(true), + onCancel: () => Navigator.of(context).pop(), + ); + }, + ); + }, child: getCardContents(l10n), ), ), @@ -647,8 +651,8 @@ class _CodeWidgetState extends State { firstButtonOnTap: () async { try { await CodeStore.instance.removeCode(widget.code); - } catch (e,s) { - logger.severe('Failed to delete code',e,s); + } catch (e, s) { + logger.severe('Failed to delete code', e, s); showGenericErrorDialog(context: context, error: e).ignore(); } }, diff --git a/auth/lib/ui/reorder_codes_page.dart b/auth/lib/ui/reorder_codes_page.dart index ecf685c4f4..3c372ca8be 100644 --- a/auth/lib/ui/reorder_codes_page.dart +++ b/auth/lib/ui/reorder_codes_page.dart @@ -90,6 +90,7 @@ class _ReorderCodesPageState extends State { key: ValueKey(code.generatedID), code, isCompactMode: isCompactMode, + isReordering: true, ), ), ],