π End-to-end encrypted cloud for everything.
Dart 2faandroidauthye2eeencryptionend-to-end-encryptionfluttergolanggoogle-photosgoogle-photos-alternativeiosopensourcephotosprivacyprivacy-toolstypescriptzero-knowledge
[mob][locker] Refresh upload, rename and download loading dialogs (#13640)
aman-pilotcb895fcad002
diff --git a/mobile/apps/locker/changes/loading-dialogs.md b/mobile/apps/locker/changes/loading-dialogs.mdnew file mode 100644index 0000000000..559300243f--- /dev/null+++ b/mobile/apps/locker/changes/loading-dialogs.md@@ -0,0 +1 @@+- Refreshed loading dialogs for uploads, collection renaming and downloads for internal users.diff --git a/mobile/apps/locker/lib/ui/components/locker_progress_dialog.dart b/mobile/apps/locker/lib/ui/components/locker_progress_dialog.dartnew file mode 100644index 0000000000..3487547835--- /dev/null+++ b/mobile/apps/locker/lib/ui/components/locker_progress_dialog.dart@@ -0,0 +1,44 @@+import 'package:ente_components/ente_components.dart';+import 'package:ente_ui/utils/dialog_util.dart';+import 'package:flutter/material.dart';+import 'package:locker/services/feature_flag_service.dart';++Future<LockerProgressDialog> showLockerProgressDialog(+ BuildContext context,+ String message, {+ bool useNewUi = false,+}) async {+ if (useNewUi || FeatureFlagService.instance.internalUser) {+ final dialog = showLoadingComponent(context, message);+ await WidgetsBinding.instance.endOfFrame;+ await WidgetsBinding.instance.endOfFrame;+ return LockerProgressDialog._(+ true,+ dialog.isShowing,+ dialog.update,+ dialog.hide,+ );+ }++ final dialog = createProgressDialog(context, message);+ return LockerProgressDialog._(+ await dialog.show(),+ dialog.isShowing,+ dialog.update,+ dialog.hide,+ );+}++class LockerProgressDialog {+ const LockerProgressDialog._(+ this.didShow,+ this.isShowing,+ this.update,+ this.hide,+ );++ final bool didShow;+ final bool Function() isShowing;+ final void Function({String? message}) update;+ final Future<void> Function() hide;+}diff --git a/mobile/apps/locker/lib/ui/pages/uploader_page.dart b/mobile/apps/locker/lib/ui/pages/uploader_page.dartindex fbabaa963d..bda13626d1 100644--- a/mobile/apps/locker/lib/ui/pages/uploader_page.dart+++ b/mobile/apps/locker/lib/ui/pages/uploader_page.dart@@ -3,9 +3,7 @@ import 'dart:io';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/progress_dialog.dart';import 'package:ente_ui/pages/base_home_page.dart';-import 'package:ente_ui/utils/dialog_util.dart';import "package:ente_utils/email_util.dart";import 'package:file_picker/file_picker.dart';import 'package:flutter/material.dart';@@ -16,6 +14,7 @@ import 'package:locker/services/collections/models/collection.dart';import 'package:locker/services/feature_flag_service.dart';import 'package:locker/services/files/sync/metadata_updater_service.dart';import 'package:locker/services/files/upload/file_upload_service.dart';+import 'package:locker/ui/components/locker_progress_dialog.dart';import 'package:locker/ui/pages/file_upload_screen.dart';import 'package:locker/ui/pages/file_upload_screen_v2.dart';import "package:locker/utils/bottom_sheet_illustration.dart";@@ -70,7 +69,7 @@ abstract class UploaderPageState<T extends UploaderPage> extends State<T> {var didShowDialog = false;var filesToUpload = <File>[];final l10n = context.strings;- ProgressDialog? progressDialog;+ LockerProgressDialog? progressDialog;try {final futures = <Future<void>>[];@@ -82,10 +81,11 @@ abstract class UploaderPageState<T extends UploaderPage> extends State<T> {return _UploadFilesOutcome.cancelled;}+ final useNewUploader = FeatureFlagService.instance.internalUser;final uploadResult = await Navigator.of(context).push<FileUploadScreenResult>(MaterialPageRoute(- builder: (context) => FeatureFlagService.instance.internalUser+ builder: (context) => useNewUploader? FileUploadScreenV2(files: files,collections: regularCollections,@@ -118,15 +118,15 @@ abstract class UploaderPageState<T extends UploaderPage> extends State<T> {}if (mounted) {- final dialog = createProgressDialog(+ progressDialog = await showLockerProgressDialog(context,l10n.uploadedFilesProgress(completed: 0,total: filesToUpload.length,),+ useNewUi: useNewUploader,);- progressDialog = dialog;- didShowDialog = await dialog.show();+ didShowDialog = progressDialog.didShow;}int completedUploads = 0;diff --git a/mobile/apps/locker/lib/utils/collection_actions.dart b/mobile/apps/locker/lib/utils/collection_actions.dartindex 08ca0a60e8..049c10a362 100644--- a/mobile/apps/locker/lib/utils/collection_actions.dart+++ b/mobile/apps/locker/lib/utils/collection_actions.dart@@ -17,6 +17,7 @@ import 'package:locker/services/collections/models/collection.dart';import "package:locker/services/configuration.dart";import "package:locker/services/trash/trash_service.dart";import "package:locker/ui/components/delete_confirmation_sheet.dart";+import 'package:locker/ui/components/locker_progress_dialog.dart';import "package:locker/ui/components/subscription_required_sheet.dart";import "package:locker/ui/components/text_input_sheet.dart";import "package:locker/utils/bottom_sheet_illustration.dart";@@ -85,8 +86,10 @@ class CollectionActions {onSubmit: (String newName) async {if (newName.isEmpty || newName == collection.name) return;- final progressDialog = createProgressDialog(context, l10n.pleaseWait);- await progressDialog.show();+ final progressDialog = await showLockerProgressDialog(+ context,+ l10n.pleaseWait,+ );try {await CollectionService.instance.rename(collection, newName);diff --git a/mobile/apps/locker/lib/utils/file_util.dart b/mobile/apps/locker/lib/utils/file_util.dartindex 8793eae17f..8134310aab 100644--- a/mobile/apps/locker/lib/utils/file_util.dart+++ b/mobile/apps/locker/lib/utils/file_util.dart@@ -3,7 +3,6 @@ import "dart:typed_data";import "package:ente_components/ente_components.dart";import "package:ente_strings/ente_strings.dart";-import "package:ente_ui/utils/dialog_util.dart";import "package:ente_ui/utils/toast_util.dart";import "package:ente_utils/email_util.dart";import "package:file_saver/file_saver.dart";@@ -15,6 +14,7 @@ import "package:locker/services/files/download/file_downloader.dart"import "package:locker/services/files/offline/offline_file_storage.dart";import "package:locker/services/files/sync/models/file.dart";import "package:locker/services/info_file_service.dart";+import 'package:locker/ui/components/locker_progress_dialog.dart';import "package:locker/ui/pages/account_credentials_page.dart";import "package:locker/ui/pages/base_info_page.dart";import "package:locker/ui/pages/emergency_contact_page.dart";@@ -71,12 +71,11 @@ class FileUtil {await cachedDecryptedFile.delete();}- final dialog = context.mounted- ? createProgressDialog(context, l10n.downloading, isDismissible: false)- : null;-+ LockerProgressDialog? dialog;try {- await dialog?.show();+ if (context.mounted) {+ dialog = await showLockerProgressDialog(context, l10n.downloading);+ }final fileKey = await CollectionService.instance.getFileKey(file);void progressCallback(int downloaded, int total) {if (!context.mounted) {@@ -154,14 +153,11 @@ class FileUtil {final total = files.length;final l10n = context.strings;- final dialog = createProgressDialog(+ final dialog = await showLockerProgressDialog(context,"${l10n.downloading} 0/$total",- isDismissible: false,);- await dialog.show();-var index = 0;final savedNames = <String>[];final savedPaths = <String>[];diff --git a/mobile/apps/locker/test/ui/components/locker_progress_dialog_test.dart b/mobile/apps/locker/test/ui/components/locker_progress_dialog_test.dartnew file mode 100644index 0000000000..957ee10709--- /dev/null+++ b/mobile/apps/locker/test/ui/components/locker_progress_dialog_test.dart@@ -0,0 +1,114 @@+import 'package:dio/dio.dart';+import 'package:ente_components/ente_components.dart';+import 'package:ente_network/network.dart';+import 'package:ente_ui/components/loading_widget.dart';+import 'package:flutter/material.dart';+import 'package:flutter_test/flutter_test.dart';+import 'package:locker/services/feature_flag_service.dart';+import 'package:locker/ui/components/locker_progress_dialog.dart';+import 'package:shared_preferences/shared_preferences.dart';++void main() {+ final originalNetwork = Network.instance;+ setUpAll(() async {+ SharedPreferences.setMockInitialValues({'remote_flags': '{}'});+ Network.instance = _TestNetwork();+ FeatureFlagService.instance.init(await SharedPreferences.getInstance());+ });+ tearDownAll(() => Network.instance = originalNetwork);++ for (final mode in [+ (+ flow: 'internal user',+ disabled: false,+ useNewUi: false,+ expectsNewUi: true,+ ),+ (+ flow: 'internal user disabled',+ disabled: true,+ useNewUi: false,+ expectsNewUi: false,+ ),+ (+ flow: 'explicit new UI',+ disabled: true,+ useNewUi: true,+ expectsNewUi: true,+ ),+ ]) {+ testWidgets('${mode.flow} keeps progress updates and dismissal', (+ tester,+ ) async {+ await FeatureFlagService.instance.setInternalUserDisabled(mode.disabled);+ late LockerProgressDialog dialog;+ var shown = false;+ await tester.pumpWidget(+ MaterialApp(+ theme: ComponentTheme.lightTheme(app: ComponentApp.locker),+ home: Builder(+ builder: (context) => TextButton(+ onPressed: () async {+ dialog = await showLockerProgressDialog(+ context,+ 'Uploaded 0 of 2 files',+ useNewUi: mode.useNewUi,+ );+ shown = true;+ },+ child: const Text('upload'),+ ),+ ),+ ),+ );++ await tester.tap(find.text('upload'));+ expect(shown, isFalse);+ await tester.pump();+ expect(shown, isFalse);+ await tester.pump(const Duration(milliseconds: 16));+ expect(shown, isTrue);+ await tester.pump(const Duration(milliseconds: 300));++ expect(dialog.didShow, isTrue);+ expect(dialog.isShowing(), isTrue);+ expect(find.text('Uploaded 0 of 2 files'), findsOneWidget);+ expect(+ find.byType(LoadingComponent),+ mode.expectsNewUi ? findsOneWidget : findsNothing,+ );+ expect(+ find.byType(EnteLoadingWidget),+ mode.expectsNewUi ? findsNothing : findsOneWidget,+ );++ await tester.tapAt(const Offset(5, 5));+ await tester.binding.handlePopRoute();+ await tester.pump(const Duration(milliseconds: 300));+ expect(dialog.isShowing(), isTrue);++ dialog.update(message: 'Uploaded 1 of 2 files');+ await tester.pump();+ expect(find.text('Uploaded 1 of 2 files'), findsOneWidget);+ expect(find.text('Uploaded 0 of 2 files'), findsNothing);++ var hidden = false;+ final dismissed = dialog.hide().then((_) => hidden = true);+ expect(hidden, isFalse);+ await tester.pump();+ await tester.pump(const Duration(milliseconds: 300));+ await dismissed;+ expect(hidden, isTrue);+ expect(dialog.isShowing(), isFalse);+ expect(find.byType(Dialog), findsNothing);+ });+ }+}++class _TestNetwork implements Network {+ @override+ final Dio enteDio = Dio();++ @override+ dynamic noSuchMethod(Invocation invocation) => super.noSuchMethod(invocation);+}