Bladeren bron

Make payment page progress dialog dismissable (#1738)

Neeraj Gupta 1 jaar geleden
bovenliggende
commit
1c34a2ec1f
2 gewijzigde bestanden met toevoegingen van 8 en 2 verwijderingen
  1. 5 1
      lib/ui/payment/payment_web_page.dart
  2. 3 1
      lib/ui/viewer/gallery/gallery_app_bar_widget.dart

+ 5 - 1
lib/ui/payment/payment_web_page.dart

@@ -49,7 +49,11 @@ class _PaymentWebPageState extends State<PaymentWebPage> {
 
   @override
   Widget build(BuildContext context) {
-    _dialog = createProgressDialog(context, S.of(context).pleaseWait);
+    _dialog = createProgressDialog(
+      context,
+      S.of(context).pleaseWait,
+      isDismissible: true,
+    );
     if (initPaymentUrl == null) {
       return const EnteLoadingWidget();
     }

+ 3 - 1
lib/ui/viewer/gallery/gallery_app_bar_widget.dart

@@ -6,7 +6,6 @@ import "package:flutter/cupertino.dart";
 import 'package:flutter/material.dart';
 import 'package:logging/logging.dart';
 import 'package:photos/core/configuration.dart';
-import "package:photos/core/constants.dart";
 import 'package:photos/core/event_bus.dart';
 import "package:photos/core/network/network.dart";
 import "package:photos/db/files_db.dart";
@@ -21,6 +20,7 @@ import 'package:photos/models/gallery_type.dart';
 import "package:photos/models/metadata/common_keys.dart";
 import 'package:photos/models/selected_files.dart';
 import 'package:photos/services/collections_service.dart';
+import "package:photos/services/feature_flag_service.dart";
 import 'package:photos/services/sync_service.dart';
 import 'package:photos/services/update_service.dart';
 import 'package:photos/ui/actions/collection/collection_sharing_actions.dart';
@@ -88,6 +88,7 @@ class _GalleryAppBarWidgetState extends State<GalleryAppBarWidget> {
   late CollectionActions collectionActions;
   final GlobalKey shareButtonKey = GlobalKey();
   bool isQuickLink = false;
+  late bool isInternalUser;
   late GalleryType galleryType;
 
   @override
@@ -96,6 +97,7 @@ class _GalleryAppBarWidgetState extends State<GalleryAppBarWidget> {
     _selectedFilesListener = () {
       setState(() {});
     };
+    isInternalUser = FeatureFlagService.instance.isInternalUserOrDebugBuild();
     collectionActions = CollectionActions(CollectionsService.instance);
     widget.selectedFiles.addListener(_selectedFilesListener);
     _userAuthEventSubscription =