π End-to-end encrypted cloud for everything.
Dart 2faandroidauthye2eeencryptionend-to-end-encryptionfluttergolanggoogle-photosgoogle-photos-alternativeiosopensourcephotosprivacyprivacy-toolstypescriptzero-knowledge
Refine desktop modal behavior
Neeraj Gupta582c599db9ee
diff --git a/mobile/apps/auth/lib/onboarding/view/common/tag_chip.dart b/mobile/apps/auth/lib/onboarding/view/common/tag_chip.dartindex 12dc9a5e73..d18e671295 100644--- a/mobile/apps/auth/lib/onboarding/view/common/tag_chip.dart+++ b/mobile/apps/auth/lib/onboarding/view/common/tag_chip.dart@@ -6,6 +6,8 @@ import 'package:ente_components/ente_components.dart';import "package:flutter/material.dart";import "package:flutter/services.dart";+enum _TagAction { edit, delete }+class TagChip extends StatefulWidget {final String label;final VoidCallback? onTap;@@ -138,14 +140,15 @@ class _TagChipState extends State<TagChip> {);}- Future<void> _showTagActions(BuildContext context) {+ Future<void> _showTagActions(BuildContext context) async {final l10n = context.l10n;- return showBottomSheetComponent<void>(+ final tag = widget.label;+ final action = await showBottomSheetComponent<_TagAction>(context: context,builder: (sheetContext) => Semantics(identifier: 'auth_tag_actions_sheet',child: BottomSheetComponent(- title: widget.label,+ title: tag,closeTooltip: l10n.close,content: MenuGroupComponent(showDividers: true,@@ -153,31 +156,27 @@ class _TagChipState extends State<TagChip> {MenuComponent(title: l10n.edit,leading: const Icon(Icons.edit_outlined),- onTap: () {- Navigator.of(sheetContext).pop();- CodeDisplayStore.instance.showEditDialog(- context,- widget.label,- );- },+ onTap: () => Navigator.of(sheetContext).pop(_TagAction.edit),),MenuComponent(title: l10n.delete,- titleColor: context.componentColors.warning,- iconColor: context.componentColors.warning,+ titleColor: sheetContext.componentColors.warning,+ iconColor: sheetContext.componentColors.warning,leading: const Icon(Icons.delete_outline),- onTap: () {- Navigator.of(sheetContext).pop();- CodeDisplayStore.instance.showDeleteTagDialog(- context,- widget.label,- );- },+ onTap: () => Navigator.of(sheetContext).pop(_TagAction.delete),),],),),),);+ if (!context.mounted || action == null) return;++ switch (action) {+ case _TagAction.edit:+ await CodeDisplayStore.instance.showEditDialog(context, tag);+ case _TagAction.delete:+ await CodeDisplayStore.instance.showDeleteTagDialog(context, tag);+ }}}diff --git a/mobile/apps/auth/lib/onboarding/view/setup_enter_secret_key_page.dart b/mobile/apps/auth/lib/onboarding/view/setup_enter_secret_key_page.dartindex 5af44a14db..1baffa3889 100644--- a/mobile/apps/auth/lib/onboarding/view/setup_enter_secret_key_page.dart+++ b/mobile/apps/auth/lib/onboarding/view/setup_enter_secret_key_page.dart@@ -453,7 +453,7 @@ class _SetupEnterSecretKeyPageState extends State<SetupEnterSecretKeyPage> {context: context,builder: (sheetContext) => BottomSheetComponent(title: title,- closeTooltip: context.l10n.close,+ closeTooltip: sheetContext.l10n.close,content: MenuGroupComponent(showDividers: true,items: [diff --git a/mobile/apps/auth/lib/ui/code_widget.dart b/mobile/apps/auth/lib/ui/code_widget.dartindex 93171393d3..0ab1cceff5 100644--- a/mobile/apps/auth/lib/ui/code_widget.dart+++ b/mobile/apps/auth/lib/ui/code_widget.dart@@ -957,15 +957,15 @@ class _CodeWidgetState extends State<CodeWidget> {await showBottomSheetComponent<void>(context: context,useRootNavigator: true,- builder: (_) {+ builder: (dialogContext) {return AuthQrDialog(data: qrData,title: widget.code.issuer,subtitle: widget.code.account,shareFileName: 'ente_auth_qr_${widget.code.account}.png',shareText: 'QR code for ${widget.code.account}',- dialogTitle: context.l10n.qrCode,- shareButtonText: context.l10n.share,+ dialogTitle: dialogContext.l10n.qrCode,+ shareButtonText: dialogContext.l10n.share,);},);diff --git a/mobile/apps/auth/lib/ui/components/dialog_widget.dart b/mobile/apps/auth/lib/ui/components/dialog_widget.dartindex 075d17d71a..60308108dd 100644--- a/mobile/apps/auth/lib/ui/components/dialog_widget.dart+++ b/mobile/apps/auth/lib/ui/components/dialog_widget.dart@@ -17,6 +17,7 @@ Future<ButtonResult?> showDialogWidget({required List<ButtonWidget> buttons,IconData? icon,bool isDismissible = true,+ bool alwaysShowCloseButton = false,bool useRootNavigator = false,}) {return showBottomSheetComponent<ButtonResult>(@@ -30,6 +31,7 @@ Future<ButtonResult?> showDialogWidget({body: body,buttons: buttons,icon: icon,+ alwaysShowCloseButton: alwaysShowCloseButton,);},);@@ -40,11 +42,13 @@ class DialogWidget extends StatelessWidget {final String? body;final List<ButtonWidget> buttons;final IconData? icon;+ final bool alwaysShowCloseButton;const DialogWidget({required this.title,this.body,required this.buttons,this.icon,+ this.alwaysShowCloseButton = false,super.key,});@@ -63,7 +67,7 @@ class DialogWidget extends StatelessWidget {: Icon(icon, size: 48, color: colors.iconColor),content: hasBody ? _DialogBody(body!) : null,actions: sheetButtons.actions,- showCloseButton: sheetButtons.showCloseButton,+ showCloseButton: alwaysShowCloseButton || sheetButtons.showCloseButton,closeTooltip: context.l10n.close,closeResult: sheetButtons.closeResult,onClose: sheetButtons.onClose(context),diff --git a/mobile/apps/auth/lib/ui/home_page.dart b/mobile/apps/auth/lib/ui/home_page.dartindex f58874fe08..561df8f247 100644--- a/mobile/apps/auth/lib/ui/home_page.dart+++ b/mobile/apps/auth/lib/ui/home_page.dart@@ -538,15 +538,15 @@ class _HomePageState extends State<HomePage> {await showBottomSheetComponent<void>(context: context,useRootNavigator: true,- builder: (_) {+ builder: (dialogContext) {return AuthQrDialog(data: qrData,title: code.issuer,subtitle: code.account,shareFileName: 'ente_auth_qr_${code.account}.png',shareText: 'QR code for ${code.account}',- dialogTitle: context.l10n.qrCode,- shareButtonText: context.l10n.share,+ dialogTitle: dialogContext.l10n.qrCode,+ shareButtonText: dialogContext.l10n.share,);},);diff --git a/mobile/apps/auth/lib/ui/settings/data/duplicate_code_page.dart b/mobile/apps/auth/lib/ui/settings/data/duplicate_code_page.dartindex 25129dbaec..33ecf0bf95 100644--- a/mobile/apps/auth/lib/ui/settings/data/duplicate_code_page.dart+++ b/mobile/apps/auth/lib/ui/settings/data/duplicate_code_page.dart@@ -175,12 +175,12 @@ class _DuplicateCodePageState extends State<DuplicateCodePage> {builder: (sheetContext) => Semantics(identifier: 'auth_duplicate_confirm_sheet',child: BottomSheetComponent(- title: context.l10n.deleteDuplicates,- message: context.l10n.moveMultipleToTrashMessage(itemCount),- closeTooltip: context.l10n.close,+ title: sheetContext.l10n.deleteDuplicates,+ message: sheetContext.l10n.moveMultipleToTrashMessage(itemCount),+ closeTooltip: sheetContext.l10n.close,actions: [ButtonComponent(- label: context.l10n.trash,+ label: sheetContext.l10n.trash,variant: ButtonComponentVariant.critical,onTap: () async {final didTrash = await _trashSelectedDuplicates();diff --git a/mobile/apps/auth/lib/ui/settings/data/export_widget.dart b/mobile/apps/auth/lib/ui/settings/data/export_widget.dartindex 548b7024f5..c3b11b11cb 100644--- a/mobile/apps/auth/lib/ui/settings/data/export_widget.dart+++ b/mobile/apps/auth/lib/ui/settings/data/export_widget.dart@@ -25,6 +25,7 @@ Future<void> handleExportClick(BuildContext context) async {context: context,title: context.l10n.selectExportFormat,body: context.l10n.exportDialogDesc,+ alwaysShowCloseButton: true,buttons: [ButtonWidget(buttonType: ButtonType.primary,diff --git a/mobile/packages/ente_components/lib/components/bottom_sheet/bottom_sheet_component.dart b/mobile/packages/ente_components/lib/components/bottom_sheet/bottom_sheet_component.dartindex 1257db23e0..0142a32d94 100644--- a/mobile/packages/ente_components/lib/components/bottom_sheet/bottom_sheet_component.dart+++ b/mobile/packages/ente_components/lib/components/bottom_sheet/bottom_sheet_component.dart@@ -298,31 +298,62 @@ Future<T?> showBottomSheetComponent<T>({barrierColor ?? colors.specialScrim.withValues(alpha: 0.55);if (_isDesktopPlatform(Theme.of(context).platform)) {- return showDialog<T>(+ return _showDesktopDialog<T>(context: context,+ builder: builder,+ isDismissible: isDismissible,useRootNavigator: useRootNavigator,- barrierDismissible: isDismissible,barrierColor: effectiveBarrierColor,- builder: (dialogContext) {- return Dialog(- elevation: 0,- backgroundColor: Colors.transparent,- insetPadding: const EdgeInsets.all(Spacing.xl),- child: ConstrainedBox(- constraints: BoxConstraints(- maxWidth: 520,- maxHeight: MediaQuery.sizeOf(dialogContext).height * 0.8,- ),- child: PopScope(- canPop: isDismissible,- child: builder(dialogContext),- ),- ),- );- },);}+ return _showMobileBottomSheet<T>(+ context: context,+ builder: builder,+ isDismissible: isDismissible,+ enableDrag: enableDrag,+ useRootNavigator: useRootNavigator,+ barrierColor: effectiveBarrierColor,+ );+}++Future<T?> _showDesktopDialog<T>({+ required BuildContext context,+ required WidgetBuilder builder,+ required bool isDismissible,+ required bool useRootNavigator,+ required Color barrierColor,+}) {+ return showDialog<T>(+ context: context,+ useRootNavigator: useRootNavigator,+ barrierDismissible: isDismissible,+ barrierColor: barrierColor,+ builder: (dialogContext) {+ return Dialog(+ elevation: 0,+ backgroundColor: Colors.transparent,+ insetPadding: const EdgeInsets.all(Spacing.xl),+ child: ConstrainedBox(+ constraints: BoxConstraints(+ maxWidth: _desktopDialogMaxWidth,+ maxHeight: MediaQuery.sizeOf(dialogContext).height * 0.8,+ ),+ child: PopScope(canPop: isDismissible, child: builder(dialogContext)),+ ),+ );+ },+ );+}++Future<T?> _showMobileBottomSheet<T>({+ required BuildContext context,+ required WidgetBuilder builder,+ required bool isDismissible,+ required bool enableDrag,+ required bool useRootNavigator,+ required Color barrierColor,+}) {return showModalBottomSheet<T>(context: context,useRootNavigator: useRootNavigator,@@ -330,7 +361,7 @@ Future<T?> showBottomSheetComponent<T>({isDismissible: isDismissible,enableDrag: enableDrag,backgroundColor: Colors.transparent,- barrierColor: effectiveBarrierColor,+ barrierColor: barrierColor,useSafeArea: true,builder: (context) {return PopScope(canPop: isDismissible, child: builder(context));@@ -473,6 +504,7 @@ class _BottomSheetActions extends StatelessWidget {const double _headerHeight = 38;const double _illustrationSlotBottomInset = 11;+const double _desktopDialogMaxWidth = 440;bool _isDesktopPlatform(TargetPlatform platform) => switch (platform) {TargetPlatform.linux ||