Merge pull request #864 from cypherstack/ios-fixes

Ios file picker fix

Author: julian-CStack

ios/Podfile.lock

@@ -117,8 +117,7 @@ PODS:
     - Flutter
   - flutter_secure_storage (6.0.0):
     - Flutter
-  - frostdart (0.0.1):
-    - Flutter
+  - frostdart (0.0.1)
   - integration_test (0.0.1):
     - Flutter
   - isar_flutter_libs (1.0.0):
@@ -272,7 +271,7 @@ SPEC CHECKSUMS:
   flutter_local_notifications: 4cde75091f6327eb8517fa068a0a5950212d2086
   flutter_native_splash: 52501b97d1c0a5f898d687f1646226c1f93c56ef
   flutter_secure_storage: 23fc622d89d073675f2eaa109381aefbcf5a49be
-  frostdart: ed3dc4e5dce431a1a8791dd7ddba472a05ea626d
+  frostdart: 4c72b69ccac2f13ede744107db046a125acce597
   integration_test: 13825b8a9334a850581300559b8839134b124670
   isar_flutter_libs: b69f437aeab9c521821c3f376198c4371fa21073
   lelantus: 417f0221260013dfc052cae9cf4b741b6479edba
@@ -293,4 +292,4 @@ SPEC CHECKSUMS:
 
 PODFILE CHECKSUM: 57c8aed26fba39d3ec9424816221f294a07c58eb
 
-COCOAPODS: 1.14.3
+COCOAPODS: 1.15.2

ios/Runner.xcodeproj/project.pbxproj

@@ -193,7 +193,7 @@
 		97C146E61CF9000F007C117D /* Project object */ = {
 			isa = PBXProject;
 			attributes = {
-				LastUpgradeCheck = 1300;
+				LastUpgradeCheck = 1510;
 				ORGANIZATIONNAME = "The Chromium Authors";
 				TargetAttributes = {
 					97C146ED1CF9000F007C117D = {

ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1300"
+   LastUpgradeVersion = "1510"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"

lib/pages/settings_views/global_settings_view/stack_backup_views/create_auto_backup_view.dart

@@ -88,7 +88,7 @@ class _EnableAutoBackupViewState extends ConsumerState<CreateAutoBackupView> {
     passwordFocusNode = FocusNode();
     passwordRepeatFocusNode = FocusNode();
 
-    if (Platform.isAndroid) {
+    if (Platform.isAndroid || Platform.isIOS) {
       WidgetsBinding.instance.addPostFrameCallback((timeStamp) async {
         final dir = await stackFileSystem.prepareStorage();
         if (mounted) {
@@ -151,11 +151,11 @@ class _EnableAutoBackupViewState extends ConsumerState<CreateAutoBackupView> {
                       const SizedBox(
                         height: 10,
                       ),
-                      if (!Platform.isAndroid)
+                      if (!Platform.isAndroid && !Platform.isIOS)
                         TextField(
                           autocorrect: Util.isDesktop ? false : true,
                           enableSuggestions: Util.isDesktop ? false : true,
-                          onTap: Platform.isAndroid
+                          onTap: Platform.isAndroid || Platform.isIOS
                               ? null
                               : () async {
                                   try {
@@ -213,7 +213,7 @@ class _EnableAutoBackupViewState extends ConsumerState<CreateAutoBackupView> {
                           ),
                           onChanged: (newValue) {},
                         ),
-                      if (!Platform.isAndroid)
+                      if (!Platform.isAndroid && !Platform.isIOS)
                         const SizedBox(
                           height: 10,
                         ),

lib/pages/settings_views/global_settings_view/stack_backup_views/create_backup_view.dart

@@ -80,7 +80,7 @@ class _RestoreFromFileViewState extends State<CreateBackupView> {
     passwordFocusNode = FocusNode();
     passwordRepeatFocusNode = FocusNode();
 
-    if (Platform.isAndroid) {
+    if (Platform.isAndroid || Platform.isIOS) {
       WidgetsBinding.instance.addPostFrameCallback((timeStamp) async {
         final dir = await stackFileSystem.prepareStorage();
         if (mounted) {
@@ -179,14 +179,14 @@ class _RestoreFromFileViewState extends State<CreateBackupView> {
         child: Column(
           crossAxisAlignment: CrossAxisAlignment.stretch,
           children: [
-            if (!Platform.isAndroid)
+            if (!Platform.isAndroid && !Platform.isIOS)
               Consumer(builder: (context, ref, __) {
                 return Container(
                   color: Colors.transparent,
                   child: TextField(
                     autocorrect: Util.isDesktop ? false : true,
                     enableSuggestions: Util.isDesktop ? false : true,
-                    onTap: Platform.isAndroid
+                    onTap: Platform.isAndroid || Platform.isIOS
                         ? null
                         : () async {
                             try {
@@ -248,7 +248,7 @@ class _RestoreFromFileViewState extends State<CreateBackupView> {
                   ),
                 );
               }),
-            if (!Platform.isAndroid)
+            if (!Platform.isAndroid && !Platform.isIOS)
               SizedBox(
                 height: !isDesktop ? 8 : 24,
               ),

lib/pages/settings_views/global_settings_view/stack_backup_views/edit_auto_backup_view.dart

@@ -260,7 +260,7 @@ class _EditAutoBackupViewState extends ConsumerState<EditAutoBackupView> {
     passwordFocusNode = FocusNode();
     passwordRepeatFocusNode = FocusNode();
 
-    if (Platform.isAndroid) {
+    if (Platform.isAndroid || Platform.isIOS) {
       WidgetsBinding.instance.addPostFrameCallback((timeStamp) async {
         final dir = await stackFileSystem.prepareStorage();
         if (mounted) {
@@ -346,11 +346,11 @@ class _EditAutoBackupViewState extends ConsumerState<EditAutoBackupView> {
           const SizedBox(
             height: 10,
           ),
-          if (!Platform.isAndroid)
+          if (!Platform.isAndroid && !Platform.isIOS)
             TextField(
               autocorrect: Util.isDesktop ? false : true,
               enableSuggestions: Util.isDesktop ? false : true,
-              onTap: Platform.isAndroid
+              onTap: Platform.isAndroid || Platform.isIOS
                   ? null
                   : () async {
                       try {
@@ -418,7 +418,7 @@ class _EditAutoBackupViewState extends ConsumerState<EditAutoBackupView> {
               ),
               textAlign: TextAlign.left,
             ),
-          if (!Platform.isAndroid)
+          if (!Platform.isAndroid && !Platform.isIOS)
             const SizedBox(
               height: 10,
             ),

lib/pages/settings_views/global_settings_view/stack_backup_views/helpers/swb_file_system.dart

@@ -79,11 +79,16 @@ class SWBFileSystem {
   }
 
   Future<void> pickDir(BuildContext context) async {
-    final String? path = await FilePicker.platform.getDirectoryPath(
-      dialogTitle: "Choose Backup location",
-      initialDirectory: startPath!.path,
-      lockParentWindow: true,
-    );
+    final String? path;
+    if (Platform.isIOS) {
+      path = startPath?.path;
+    } else {
+      path = await FilePicker.platform.getDirectoryPath(
+        dialogTitle: "Choose Backup location",
+        initialDirectory: startPath!.path,
+        lockParentWindow: true,
+      );
+    }
     dirPath = path;
   }
 

lib/pages_desktop_specific/settings/settings_menu/backup_and_restore/create_auto_backup.dart

@@ -99,7 +99,7 @@ class _CreateAutoBackup extends ConsumerState<CreateAutoBackup> {
     passphraseFocusNode = FocusNode();
     passphraseRepeatFocusNode = FocusNode();
 
-    if (Platform.isAndroid) {
+    if (Platform.isAndroid || Platform.isIOS) {
       WidgetsBinding.instance.addPostFrameCallback((timeStamp) async {
         final dir = await stackFileSystem.prepareStorage();
         if (mounted) {
@@ -174,14 +174,14 @@ class _CreateAutoBackup extends ConsumerState<CreateAutoBackup> {
             child: Column(
               crossAxisAlignment: CrossAxisAlignment.stretch,
               children: [
-                if (!Platform.isAndroid)
+                if (!Platform.isAndroid && !Platform.isIOS)
                   Consumer(builder: (context, ref, __) {
                     return Container(
                       color: Colors.transparent,
                       child: TextField(
                         autocorrect: false,
                         enableSuggestions: false,
-                        onTap: Platform.isAndroid
+                        onTap: Platform.isAndroid || Platform.isIOS
                             ? null
                             : () async {
                                 try {
@@ -241,7 +241,7 @@ class _CreateAutoBackup extends ConsumerState<CreateAutoBackup> {
                       ),
                     );
                   }),
-                if (!Platform.isAndroid)
+                if (!Platform.isAndroid && !Platform.isIOS)
                   const SizedBox(
                     height: 24,
                   ),

pubspec.yaml

@@ -140,7 +140,7 @@ dependencies:
   pointycastle: ^3.6.0
   package_info_plus: ^4.0.2
   lottie: ^2.3.2
-  file_picker: ^5.5.0
+  file_picker: ^8.0.3
   connectivity_plus: ^4.0.1
   isar: 3.0.5
   isar_flutter_libs: 3.0.5 # contains the binaries