Merge pull request #945 from ImranR98/dev

Add export dir pick button + update packages

lib/main.dart

@@ -19,7 +19,7 @@ import 'package:easy_localization/src/easy_localization_controller.dart';
 // ignore: implementation_imports
 import 'package:easy_localization/src/localization.dart';
 
-const String currentVersion = '0.14.20';
+const String currentVersion = '0.14.21';
 const String currentReleaseTag =
     'v$currentVersion-beta'; // KEEP THIS IN SYNC WITH GITHUB RELEASES
 

lib/pages/import_export.dart

@@ -102,11 +102,12 @@ class _ImportExportPageState extends State<ImportExportPage> {
       });
     }
 
-    runObtainiumExport() async {
+    runObtainiumExport({bool pickOnly = false}) async {
       HapticFeedback.selectionClick();
       appsProvider
           .exportApps(
-              pickOnly: (await settingsProvider.getExportDir()) == null,
+              pickOnly:
+                  pickOnly || (await settingsProvider.getExportDir()) == null,
               sp: settingsProvider)
           .then((String? result) {
         if (result != null) {
@@ -320,21 +321,38 @@ class _ImportExportPageState extends State<ImportExportPage> {
                                     onPressed: appsProvider.apps.isEmpty ||
                                             importInProgress
                                         ? null
-                                        : runObtainiumExport,
+                                        : () {
-                                    child: Text(tr(snapshot.data != null
+                                            runObtainiumExport(pickOnly: true);
-                                        ? 'obtainiumExport'
+                                          },
-                                        : 'pickExportDir')),
+                                    child: Text(tr('pickExportDir')),
                                   )),
                                   const SizedBox(
                                     width: 16,
                                   ),
+                                  Expanded(
+                                      child: TextButton(
+                                    style: outlineButtonStyle,
+                                    onPressed: appsProvider.apps.isEmpty ||
+                                            importInProgress ||
+                                            snapshot.data == null
+                                        ? null
+                                        : runObtainiumExport,
+                                    child: Text(tr('obtainiumExport')),
+                                  )),
+                                ],
+                              ),
+                              const SizedBox(
+                                height: 8,
+                              ),
+                              Row(
+                                children: [
                                   Expanded(
                                       child: TextButton(
                                           style: outlineButtonStyle,
                                           onPressed: importInProgress
                                               ? null
                                               : runObtainiumImport,
-                                          child: Text(tr('obtainiumImport'))))
+                                          child: Text(tr('obtainiumImport')))),
                                 ],
                               ),
                               if (snapshot.data != null)

pubspec.lock

@@ -46,10 +46,10 @@ packages:
     dependency: transitive
     description:
       name: archive
-      sha256: "20071638cbe4e5964a427cfa0e86dce55d060bc7d82d56f3554095d7239a8765"
+      sha256: d4dc11707abb32ef756ab95678c0d6df54003d98277f7c9aeda14c48e7a38c2f
       url: "https://pub.dev"
     source: hosted
-    version: "3.4.2"
+    version: "3.4.3"
   args:
     dependency: transitive
     description:
@@ -386,10 +386,10 @@ packages:
     dependency: transitive
     description:
       name: image
-      sha256: "6e703d5e2f8c63fb31a77753915c1ec8baebde8088844e0d29f71b8f0b108888"
+      sha256: "028f61960d56f26414eb616b48b04eb37d700cbe477b7fb09bf1d7ce57fd9271"
       url: "https://pub.dev"
     source: hosted
-    version: "4.1.0"
+    version: "4.1.3"
   intl:
     dependency: transitive
     description:
@@ -546,10 +546,10 @@ packages:
     dependency: transitive
     description:
       name: permission_handler_android
-      sha256: f23cfe9af0d49c6b9fd8a8b09f7b3301ca7e346204939b5afef4404d36d2608f
+      sha256: ace7d15a3d1a4a0b91c041d01e5405df221edb9de9116525efc773c74e6fc790
       url: "https://pub.dev"
     source: hosted
-    version: "11.0.1"
+    version: "11.0.5"
   permission_handler_apple:
     dependency: transitive
     description:
@@ -911,10 +911,10 @@ packages:
     dependency: transitive
     description:
       name: win32
-      sha256: c97defd418eef4ec88c0d1652cdce84b9f7b63dd7198e266d06ac1710d527067
+      sha256: "350a11abd2d1d97e0cc7a28a81b781c08002aa2864d9e3f192ca0ffa18b06ed3"
       url: "https://pub.dev"
     source: hosted
-    version: "5.0.8"
+    version: "5.0.9"
   win32_registry:
     dependency: transitive
     description:

pubspec.yaml

@@ -17,7 +17,7 @@ publish_to: 'none' # Remove this line if you wish to publish to pub.dev
 # https://developer.apple.com/library/archive/documentation/General/Reference/InfoPlistKeyReference/Articles/CoreFoundationKeys.html
 # In Windows, build-name is used as the major, minor, and patch parts
 # of the product and file versions while build-number is used as the build suffix.
-version: 0.14.20+212 # When changing this, update the tag in main() accordingly
+version: 0.14.21+213 # When changing this, update the tag in main() accordingly
 
 environment:
   sdk: '>=3.0.0 <4.0.0'