From d23d94882d2da148ce5fc9f9891dfaa2b9411d78 Mon Sep 17 00:00:00 2001 From: Miguel Ruivo Date: Sun, 24 Jun 2018 16:07:34 +0100 Subject: [PATCH] fixes a few iOS bugs --- .../example/filepicker/FilePickerPlugin.java | 4 ---- example/lib/main.dart | 22 +++++++++++++------ ios/Classes/FilePickerPlugin.m | 12 +++++----- 3 files changed, 21 insertions(+), 17 deletions(-) diff --git a/android/src/main/java/com/example/filepicker/FilePickerPlugin.java b/android/src/main/java/com/example/filepicker/FilePickerPlugin.java index e3db77c..3cc20b0 100644 --- a/android/src/main/java/com/example/filepicker/FilePickerPlugin.java +++ b/android/src/main/java/com/example/filepicker/FilePickerPlugin.java @@ -56,10 +56,6 @@ public class FilePickerPlugin implements MethodCallHandler { } } - private void setOnActivityResult() - { - - } private void startFileExplorer() diff --git a/example/lib/main.dart b/example/lib/main.dart index 6a66454..c1b824f 100644 --- a/example/lib/main.dart +++ b/example/lib/main.dart @@ -1,5 +1,4 @@ import 'package:flutter/material.dart'; -import 'dart:async'; import 'package:flutter/services.dart'; import 'package:file_picker/file_picker.dart'; @@ -18,8 +17,8 @@ class _MyAppState extends State { void _openFileExplorer() async { try { _path = await FilePicker.getFilePath; - } on PlatformException { - print('Something went wrong...'); + } on PlatformException catch (e) { + print(e.toString()); } if (!mounted) return; @@ -46,7 +45,7 @@ class _MyAppState extends State { child: new Column( mainAxisAlignment: MainAxisAlignment.center, children: [ - Padding( + new Padding( padding: const EdgeInsets.all(20.0), child: new RaisedButton( onPressed: () => _openFileExplorer(), @@ -55,18 +54,27 @@ class _MyAppState extends State { ), new Text( 'URI PATH ', + textAlign: TextAlign.center, style: new TextStyle(fontWeight: FontWeight.bold), ), new Text( _path, + textAlign: TextAlign.center, softWrap: true, textScaleFactor: 0.85, ), - Padding( + new Padding( padding: const EdgeInsets.only(top: 10.0), - child: new Text('FILE NAME ', style: new TextStyle(fontWeight: FontWeight.bold)), + child: new Text( + 'FILE NAME ', + textAlign: TextAlign.center, + style: new TextStyle(fontWeight: FontWeight.bold), + ), + ), + new Text( + _fileName, + textAlign: TextAlign.center, ), - new Text(_fileName), ], )), ), diff --git a/ios/Classes/FilePickerPlugin.m b/ios/Classes/FilePickerPlugin.m index 3bda53d..20bd6c2 100644 --- a/ios/Classes/FilePickerPlugin.m +++ b/ios/Classes/FilePickerPlugin.m @@ -7,12 +7,12 @@ UIDocumentInteractionController *_interactionController; + (void)registerWithRegistrar:(NSObject*)registrar { + FlutterMethodChannel* channel = [FlutterMethodChannel methodChannelWithName:@"file_picker" binaryMessenger:[registrar messenger]]; - - - UIViewController *viewController = [UIApplication sharedApplication].delegate.window.rootViewController; + + UIViewController *viewController = [UIApplication sharedApplication].delegate.window.rootViewController; FilePickerPlugin* instance = [[FilePickerPlugin alloc] initWithViewController:viewController]; [registrar addMethodCallDelegate:instance channel:channel]; @@ -61,13 +61,13 @@ didPickDocumentsAtURLs:(NSArray *)urls{ [_pickerController dismissViewControllerAnimated:YES completion:nil]; - NSMutableArray *resultUrls = [[NSMutableArray alloc] init]; + NSString * uri; for (NSURL *url in urls) { - [resultUrls addObject: (NSString *)[url path]]; + uri = (NSString *)[url path]; } - _result(resultUrls); + _result(uri); } // DocumentInteractionController delegate