Skip to content

armgit / ente

Public Imported from GitHub
0

πŸ’š End-to-end encrypted cloud for everything.

Replace Locker legacy button results

Amand4e2bdc51961
diff --git a/mobile/apps/locker/lib/ui/components/delete_confirmation_sheet.dart b/mobile/apps/locker/lib/ui/components/delete_confirmation_sheet.dart
index c216769918..da05df44e5 100644
--- a/mobile/apps/locker/lib/ui/components/delete_confirmation_sheet.dart
+++ b/mobile/apps/locker/lib/ui/components/delete_confirmation_sheet.dart
@@ -1,17 +1,11 @@
import "package:ente_components/ente_components.dart";
import "package:ente_strings/ente_strings.dart";
-import "package:ente_ui/components/buttons/button_widget.dart";
-import "package:ente_ui/components/buttons/models/button_result.dart";
import "package:flutter/material.dart";
class DeleteConfirmationResult {
- final ButtonResult buttonResult;
final bool deleteFromAllCollections;
- DeleteConfirmationResult({
- required this.buttonResult,
- required this.deleteFromAllCollections,
- });
+ DeleteConfirmationResult({required this.deleteFromAllCollections});
}
Future<DeleteConfirmationResult?> showDeleteConfirmationSheet(
@@ -103,7 +97,6 @@ class _DeleteConfirmationSheetState extends State<DeleteConfirmationSheet> {
onTap: () {
Navigator.of(context).pop(
DeleteConfirmationResult(
- buttonResult: ButtonResult(ButtonAction.first),
deleteFromAllCollections: _deleteFromAllCollections,
),
);
diff --git a/mobile/apps/locker/lib/ui/components/share_link_sheet.dart b/mobile/apps/locker/lib/ui/components/share_link_sheet.dart
index f0e744599e..d102340641 100644
--- a/mobile/apps/locker/lib/ui/components/share_link_sheet.dart
+++ b/mobile/apps/locker/lib/ui/components/share_link_sheet.dart
@@ -1,7 +1,5 @@
import "package:ente_components/ente_components.dart";
import "package:ente_strings/ente_strings.dart";
-import "package:ente_ui/components/buttons/button_widget.dart";
-import "package:ente_ui/components/buttons/models/button_result.dart";
import "package:ente_ui/utils/dialog_util.dart";
import "package:ente_ui/utils/toast_util.dart";
import "package:ente_utils/share_utils.dart";
@@ -131,7 +129,7 @@ class _ShareLinkSheetState extends State<ShareLinkSheet> {
Future<void> _deleteShareLink(BuildContext context) async {
final l10n = context.strings;
- final result = await showBottomSheetComponent<ButtonResult>(
+ final confirmed = await showBottomSheetComponent<bool>(
context: context,
builder: (_) => BottomSheetComponent(
title: l10n.deleteLinkQuestion,
@@ -141,14 +139,13 @@ class _ShareLinkSheetState extends State<ShareLinkSheet> {
ButtonComponent(
label: l10n.delete,
variant: ButtonComponentVariant.critical,
- onTap: () =>
- Navigator.of(context).pop(ButtonResult(ButtonAction.first)),
+ onTap: () => Navigator.of(context).pop(true),
),
],
),
);
- if (result?.action == ButtonAction.first && context.mounted) {
+ if (confirmed == true && context.mounted) {
final dialog = createProgressDialog(
context,
l10n.deletingShareLink,
diff --git a/mobile/apps/locker/lib/ui/pages/trash_page.dart b/mobile/apps/locker/lib/ui/pages/trash_page.dart
index 977b152a90..5cb838be10 100644
--- a/mobile/apps/locker/lib/ui/pages/trash_page.dart
+++ b/mobile/apps/locker/lib/ui/pages/trash_page.dart
@@ -3,7 +3,6 @@ import "dart:async";
import 'package:ente_components/ente_components.dart';
import "package:ente_events/event_bus.dart";
import 'package:ente_strings/ente_strings.dart';
-import 'package:ente_ui/components/buttons/button_widget.dart';
import 'package:ente_ui/utils/dialog_util.dart';
import 'package:ente_ui/utils/toast_util.dart';
import 'package:flutter/material.dart';
@@ -72,7 +71,7 @@ class _TrashPageState extends State<TrashPage> {
illustration: LockerBottomSheetIllustration.collectionDelete,
);
- if (result?.buttonResult.action == ButtonAction.first) {
+ if (result != null) {
await _performEmptyTrash();
}
}
diff --git a/mobile/apps/locker/lib/ui/viewer/actions/file_selection_overlay_bar.dart b/mobile/apps/locker/lib/ui/viewer/actions/file_selection_overlay_bar.dart
index 8fa9654c99..67fad539ad 100644
--- a/mobile/apps/locker/lib/ui/viewer/actions/file_selection_overlay_bar.dart
+++ b/mobile/apps/locker/lib/ui/viewer/actions/file_selection_overlay_bar.dart
@@ -2,7 +2,6 @@ import 'package:ente_components/ente_components.dart';
import "package:ente_events/event_bus.dart";
import "package:ente_icons/ente_icons.dart";
import "package:ente_strings/ente_strings.dart";
-import "package:ente_ui/components/buttons/button_widget.dart";
import "package:ente_ui/utils/dialog_util.dart";
import "package:ente_ui/utils/toast_util.dart";
import "package:flutter/material.dart";
@@ -768,7 +767,7 @@ class _FileSelectionOverlayBarState extends State<FileSelectionOverlayBar> {
illustration: LockerBottomSheetIllustration.fileDelete,
);
- if (confirmation?.buttonResult.action != ButtonAction.first) {
+ if (confirmation == null) {
return;
}
@@ -921,7 +920,7 @@ class _FileSelectionOverlayBarState extends State<FileSelectionOverlayBar> {
illustration: LockerBottomSheetIllustration.collectionDelete,
);
- if (confirmation?.buttonResult.action != ButtonAction.first) {
+ if (confirmation == null) {
return;
}
diff --git a/mobile/apps/locker/lib/utils/collection_actions.dart b/mobile/apps/locker/lib/utils/collection_actions.dart
index 6e5b0d95eb..449c6f4c20 100644
--- a/mobile/apps/locker/lib/utils/collection_actions.dart
+++ b/mobile/apps/locker/lib/utils/collection_actions.dart
@@ -6,7 +6,6 @@ import "package:ente_pure_utils/ente_pure_utils.dart";
import "package:ente_sharing/components/invite_dialog.dart";
import "package:ente_sharing/models/user.dart";
import 'package:ente_strings/ente_strings.dart';
-import "package:ente_ui/components/buttons/button_widget.dart";
import "package:ente_ui/components/progress_dialog.dart";
import 'package:ente_ui/utils/dialog_util.dart';
import "package:ente_ui/utils/toast_util.dart";
@@ -133,7 +132,7 @@ class CollectionActions {
showDeleteFromAllCollectionsOption: true,
);
- if (dialogChoice?.buttonResult.action != ButtonAction.first) return;
+ if (dialogChoice == null) return;
ProgressDialog? progressDialog;
if (context.mounted) {
@@ -142,7 +141,7 @@ class CollectionActions {
}
bool isFavoriteCollection = false;
- final bool keepFiles = !(dialogChoice?.deleteFromAllCollections ?? false);
+ final bool keepFiles = !dialogChoice.deleteFromAllCollections;
final List<Collection> emptyCollections = [];
final List<Collection> nonEmptyCollections = [];
final List<dynamic> errors = [];
@@ -286,7 +285,7 @@ class CollectionActions {
showDeleteFromAllCollectionsOption: true,
);
- if (result?.buttonResult.action != ButtonAction.first) {
+ if (result == null) {
return;
}
@@ -302,7 +301,7 @@ class CollectionActions {
await CollectionService.instance.trashCollection(
context.mounted ? context : null,
collection,
- keepFiles: !(result?.deleteFromAllCollections ?? false),
+ keepFiles: !result.deleteFromAllCollections,
);
await progressDialog?.hide();
diff --git a/mobile/apps/locker/lib/utils/file_actions.dart b/mobile/apps/locker/lib/utils/file_actions.dart
index 25de420b52..df0d18008d 100644
--- a/mobile/apps/locker/lib/utils/file_actions.dart
+++ b/mobile/apps/locker/lib/utils/file_actions.dart
@@ -1,5 +1,4 @@
import "package:ente_strings/ente_strings.dart";
-import "package:ente_ui/components/buttons/button_widget.dart";
import "package:ente_ui/utils/dialog_util.dart";
import "package:ente_ui/utils/toast_util.dart";
import "package:flutter/material.dart";
@@ -294,7 +293,7 @@ class FileActions {
illustration: LockerBottomSheetIllustration.fileDelete,
);
- if (confirmation?.buttonResult.action != ButtonAction.first) {
+ if (confirmation == null) {
return;
}
@@ -349,7 +348,7 @@ class FileActions {
illustration: LockerBottomSheetIllustration.fileDelete,
);
- if (confirmation?.buttonResult.action != ButtonAction.first) {
+ if (confirmation == null) {
return;
}