diff --git a/.gitignore b/.gitignore index 52d17115..886e3749 100644 --- a/.gitignore +++ b/.gitignore @@ -2,6 +2,8 @@ # # gitignore contributors: remember to update Global/Xcode.gitignore, Objective-C.gitignore & Swift.gitignore +.idea + ## Build generated build/ DerivedData/ diff --git a/RNDocumentPicker.xcodeproj/xcuserdata/charlesdarwin.xcuserdatad/xcschemes/RNDocumentPicker.xcscheme b/RNDocumentPicker.xcodeproj/xcuserdata/charlesdarwin.xcuserdatad/xcschemes/RNDocumentPicker.xcscheme deleted file mode 100644 index f195f4e9..00000000 --- a/RNDocumentPicker.xcodeproj/xcuserdata/charlesdarwin.xcuserdatad/xcschemes/RNDocumentPicker.xcscheme +++ /dev/null @@ -1,80 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/RNDocumentPicker.xcodeproj/xcuserdata/charlesdarwin.xcuserdatad/xcschemes/xcschememanagement.plist b/RNDocumentPicker.xcodeproj/xcuserdata/charlesdarwin.xcuserdatad/xcschemes/xcschememanagement.plist deleted file mode 100644 index 7e7e9c92..00000000 --- a/RNDocumentPicker.xcodeproj/xcuserdata/charlesdarwin.xcuserdatad/xcschemes/xcschememanagement.plist +++ /dev/null @@ -1,22 +0,0 @@ - - - - - SchemeUserState - - RNDocumentPicker.xcscheme - - orderHint - 0 - - - SuppressBuildableAutocreation - - E01DD9DA1D2311A600C39062 - - primary - - - - - diff --git a/android/.gitignore b/android/.gitignore new file mode 100644 index 00000000..191029f7 --- /dev/null +++ b/android/.gitignore @@ -0,0 +1,99 @@ +# Created by .ignore support plugin (hsz.mobi) +### Java template +*.class + +# Mobile Tools for Java (J2ME) +.mtj.tmp/ + +# Package Files # +*.war +*.ear + +# virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml +hs_err_pid* +### JetBrains template +# Covers JetBrains IDEs: IntelliJ, RubyMine, PhpStorm, AppCode, PyCharm, CLion, Android Studio and Webstorm +# Reference: https://intellij-support.jetbrains.com/hc/en-us/articles/206544839 + +.idea + +# User-specific stuff: +.idea/workspace.xml +.idea/tasks.xml +.idea/dictionaries +.idea/vcs.xml +.idea/jsLibraryMappings.xml + +# Sensitive or high-churn files: +.idea/dataSources.ids +.idea/dataSources.xml +.idea/dataSources.local.xml +.idea/sqlDataSources.xml +.idea/dynamic.xml +.idea/uiDesigner.xml + +# Gradle: +.idea/gradle.xml +.idea/libraries + +# Mongo Explorer plugin: +.idea/mongoSettings.xml + +## File-based project format: +*.iws + +## Plugin-specific files: + +# IntelliJ +/out/ + +# mpeltonen/sbt-idea plugin +.idea_modules/ + +# JIRA plugin +atlassian-ide-plugin.xml + +# Crashlytics plugin (for Android Studio and IntelliJ) +com_crashlytics_export_strings.xml +crashlytics.properties +crashlytics-build.properties +fabric.properties +### Android template +# Built application files +*.apk +*.ap_ + +# Files for the ART/Dalvik VM +*.dex + +# Java class files + +# Generated files +bin/ +gen/ +out/ + +# Gradle files +.gradle/ +build/ + +# Local configuration file (sdk path, etc) +local.properties + +# Proguard folder generated by Eclipse +proguard/ + +# Log Files +*.log + +# Android Studio Navigation editor temp files +.navigation/ + +# Android Studio captures folder +captures/ + +# Intellij +*.iml + +# Keystore files +*.jks diff --git a/android/android.iml b/android/android.iml new file mode 100644 index 00000000..1e71f4f3 --- /dev/null +++ b/android/android.iml @@ -0,0 +1,136 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/android/build.gradle b/android/build.gradle new file mode 100644 index 00000000..4f3bea5b --- /dev/null +++ b/android/build.gradle @@ -0,0 +1,41 @@ +buildscript { + repositories { + mavenCentral() + } + dependencies { + classpath 'com.android.tools.build:gradle:2.1.2' + } +} + +apply plugin: 'com.android.library' + +android { + compileSdkVersion 'android-23' + buildToolsVersion '23.0.3' + + defaultConfig { + minSdkVersion 16 + targetSdkVersion 22 + } + + buildTypes { + release { + minifyEnabled false + proguardFile getDefaultProguardFile('proguard-android.txt') + } + } +} + +allprojects { + repositories { + mavenLocal() + jcenter() + maven { + url "http://files.couchbase.com/maven2/" + } + } +} + +dependencies { + compile 'com.facebook.react:react-native:0.20.1' +} diff --git a/android/gradle/wrapper/gradle-wrapper.jar b/android/gradle/wrapper/gradle-wrapper.jar new file mode 100644 index 00000000..8c0fb64a Binary files /dev/null and b/android/gradle/wrapper/gradle-wrapper.jar differ diff --git a/android/gradle/wrapper/gradle-wrapper.properties b/android/gradle/wrapper/gradle-wrapper.properties new file mode 100644 index 00000000..83477506 --- /dev/null +++ b/android/gradle/wrapper/gradle-wrapper.properties @@ -0,0 +1,6 @@ +#Tue Aug 30 21:32:48 BST 2016 +distributionBase=GRADLE_USER_HOME +distributionPath=wrapper/dists +zipStoreBase=GRADLE_USER_HOME +zipStorePath=wrapper/dists +distributionUrl=https\://services.gradle.org/distributions/gradle-2.14.1-all.zip diff --git a/android/gradlew b/android/gradlew new file mode 100755 index 00000000..91a7e269 --- /dev/null +++ b/android/gradlew @@ -0,0 +1,164 @@ +#!/usr/bin/env bash + +############################################################################## +## +## Gradle start up script for UN*X +## +############################################################################## + +# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +DEFAULT_JVM_OPTS="" + +APP_NAME="Gradle" +APP_BASE_NAME=`basename "$0"` + +# Use the maximum available, or set MAX_FD != -1 to use that value. +MAX_FD="maximum" + +warn ( ) { + echo "$*" +} + +die ( ) { + echo + echo "$*" + echo + exit 1 +} + +# OS specific support (must be 'true' or 'false'). +cygwin=false +msys=false +darwin=false +case "`uname`" in + CYGWIN* ) + cygwin=true + ;; + Darwin* ) + darwin=true + ;; + MINGW* ) + msys=true + ;; +esac + +# For Cygwin, ensure paths are in UNIX format before anything is touched. +if $cygwin ; then + [ -n "$JAVA_HOME" ] && JAVA_HOME=`cygpath --unix "$JAVA_HOME"` +fi + +# Attempt to set APP_HOME +# Resolve links: $0 may be a link +PRG="$0" +# Need this for relative symlinks. +while [ -h "$PRG" ] ; do + ls=`ls -ld "$PRG"` + link=`expr "$ls" : '.*-> \(.*\)$'` + if expr "$link" : '/.*' > /dev/null; then + PRG="$link" + else + PRG=`dirname "$PRG"`"/$link" + fi +done +SAVED="`pwd`" +cd "`dirname \"$PRG\"`/" >&- +APP_HOME="`pwd -P`" +cd "$SAVED" >&- + +CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar + +# Determine the Java command to use to start the JVM. +if [ -n "$JAVA_HOME" ] ; then + if [ -x "$JAVA_HOME/jre/sh/java" ] ; then + # IBM's JDK on AIX uses strange locations for the executables + JAVACMD="$JAVA_HOME/jre/sh/java" + else + JAVACMD="$JAVA_HOME/bin/java" + fi + if [ ! -x "$JAVACMD" ] ; then + die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." + fi +else + JAVACMD="java" + which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." +fi + +# Increase the maximum file descriptors if we can. +if [ "$cygwin" = "false" -a "$darwin" = "false" ] ; then + MAX_FD_LIMIT=`ulimit -H -n` + if [ $? -eq 0 ] ; then + if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then + MAX_FD="$MAX_FD_LIMIT" + fi + ulimit -n $MAX_FD + if [ $? -ne 0 ] ; then + warn "Could not set maximum file descriptor limit: $MAX_FD" + fi + else + warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT" + fi +fi + +# For Darwin, add options to specify how the application appears in the dock +if $darwin; then + GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\"" +fi + +# For Cygwin, switch paths to Windows format before running java +if $cygwin ; then + APP_HOME=`cygpath --path --mixed "$APP_HOME"` + CLASSPATH=`cygpath --path --mixed "$CLASSPATH"` + + # We build the pattern for arguments to be converted via cygpath + ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null` + SEP="" + for dir in $ROOTDIRSRAW ; do + ROOTDIRS="$ROOTDIRS$SEP$dir" + SEP="|" + done + OURCYGPATTERN="(^($ROOTDIRS))" + # Add a user-defined pattern to the cygpath arguments + if [ "$GRADLE_CYGPATTERN" != "" ] ; then + OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)" + fi + # Now convert the arguments - kludge to limit ourselves to /bin/sh + i=0 + for arg in "$@" ; do + CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -` + CHECK2=`echo "$arg"|egrep -c "^-"` ### Determine if an option + + if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then ### Added a condition + eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"` + else + eval `echo args$i`="\"$arg\"" + fi + i=$((i+1)) + done + case $i in + (0) set -- ;; + (1) set -- "$args0" ;; + (2) set -- "$args0" "$args1" ;; + (3) set -- "$args0" "$args1" "$args2" ;; + (4) set -- "$args0" "$args1" "$args2" "$args3" ;; + (5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;; + (6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;; + (7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;; + (8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;; + (9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;; + esac +fi + +# Split up the JVM_OPTS And GRADLE_OPTS values into an array, following the shell quoting and substitution rules +function splitJvmOpts() { + JVM_OPTS=("$@") +} +eval splitJvmOpts $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS +JVM_OPTS[${#JVM_OPTS[*]}]="-Dorg.gradle.appname=$APP_BASE_NAME" + +exec "$JAVACMD" "${JVM_OPTS[@]}" -classpath "$CLASSPATH" org.gradle.wrapper.GradleWrapperMain "$@" diff --git a/android/gradlew.bat b/android/gradlew.bat new file mode 100644 index 00000000..8a0b282a --- /dev/null +++ b/android/gradlew.bat @@ -0,0 +1,90 @@ +@if "%DEBUG%" == "" @echo off +@rem ########################################################################## +@rem +@rem Gradle startup script for Windows +@rem +@rem ########################################################################## + +@rem Set local scope for the variables with windows NT shell +if "%OS%"=="Windows_NT" setlocal + +@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +set DEFAULT_JVM_OPTS= + +set DIRNAME=%~dp0 +if "%DIRNAME%" == "" set DIRNAME=. +set APP_BASE_NAME=%~n0 +set APP_HOME=%DIRNAME% + +@rem Find java.exe +if defined JAVA_HOME goto findJavaFromJavaHome + +set JAVA_EXE=java.exe +%JAVA_EXE% -version >NUL 2>&1 +if "%ERRORLEVEL%" == "0" goto init + +echo. +echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. +echo. +echo Please set the JAVA_HOME variable in your environment to match the +echo location of your Java installation. + +goto fail + +:findJavaFromJavaHome +set JAVA_HOME=%JAVA_HOME:"=% +set JAVA_EXE=%JAVA_HOME%/bin/java.exe + +if exist "%JAVA_EXE%" goto init + +echo. +echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% +echo. +echo Please set the JAVA_HOME variable in your environment to match the +echo location of your Java installation. + +goto fail + +:init +@rem Get command-line arguments, handling Windowz variants + +if not "%OS%" == "Windows_NT" goto win9xME_args +if "%@eval[2+2]" == "4" goto 4NT_args + +:win9xME_args +@rem Slurp the command line arguments. +set CMD_LINE_ARGS= +set _SKIP=2 + +:win9xME_args_slurp +if "x%~1" == "x" goto execute + +set CMD_LINE_ARGS=%* +goto execute + +:4NT_args +@rem Get arguments from the 4NT Shell from JP Software +set CMD_LINE_ARGS=%$ + +:execute +@rem Setup the command line + +set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar + +@rem Execute Gradle +"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS% + +:end +@rem End local scope for the variables with windows NT shell +if "%ERRORLEVEL%"=="0" goto mainEnd + +:fail +rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of +rem the _cmd.exe /c_ return code! +if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1 +exit /b 1 + +:mainEnd +if "%OS%"=="Windows_NT" endlocal + +:omega diff --git a/android/local.properties b/android/local.properties new file mode 100644 index 00000000..fe4fe217 --- /dev/null +++ b/android/local.properties @@ -0,0 +1,12 @@ +## This file is automatically generated by Android Studio. +# Do not modify this file -- YOUR CHANGES WILL BE ERASED! +# +# This file must *NOT* be checked into Version Control Systems, +# as it contains information specific to your local configuration. +# +# Location of the SDK. This is only used by Gradle. +# For customization when using a Version Control System, please read the +# header note. +#Thu Jul 07 18:20:41 BST 2016 +ndk.dir=/Users/nickpomfret/android/ndk-bundle +sdk.dir=/Users/nickpomfret/android diff --git a/android/src/main/AndroidManifest.xml b/android/src/main/AndroidManifest.xml new file mode 100644 index 00000000..af326a12 --- /dev/null +++ b/android/src/main/AndroidManifest.xml @@ -0,0 +1,6 @@ + + + diff --git a/android/src/main/java/com/reactnativedocumentpicker/DocumentPicker.java b/android/src/main/java/com/reactnativedocumentpicker/DocumentPicker.java new file mode 100644 index 00000000..9cf6688c --- /dev/null +++ b/android/src/main/java/com/reactnativedocumentpicker/DocumentPicker.java @@ -0,0 +1,126 @@ +package com.reactnativedocumentpicker; + +import android.app.Activity; +import android.content.ContentResolver; +import android.content.Intent; +import android.database.Cursor; +import android.net.Uri; +import android.os.Bundle; +import android.provider.OpenableColumns; +import android.util.Log; + +import com.facebook.react.bridge.ActivityEventListener; +import com.facebook.react.bridge.Arguments; +import com.facebook.react.bridge.Callback; +import com.facebook.react.bridge.ReactApplicationContext; +import com.facebook.react.bridge.ReactContextBaseJavaModule; +import com.facebook.react.bridge.ReactMethod; +import com.facebook.react.bridge.ReadableArray; +import com.facebook.react.bridge.ReadableMap; +import com.facebook.react.bridge.WritableMap; + +/** + * @see android documentation + */ +public class DocumentPicker extends ReactContextBaseJavaModule implements ActivityEventListener { + private static final String NAME = "RNDocumentPicker"; + private static final int READ_REQUEST_CODE = 41; + + private Callback callback; + + public DocumentPicker(ReactApplicationContext reactContext) { + super(reactContext); + reactContext.addActivityEventListener(this); + } + + @Override + public String getName() { + return NAME; + } + + @ReactMethod + public void show(ReadableMap args, Callback callback) { + Intent intent; + if (android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.KITKAT) { + intent = new Intent(Intent.ACTION_OPEN_DOCUMENT); + } else { + intent = new Intent(Intent.ACTION_PICK); + } + intent.addCategory(Intent.CATEGORY_OPENABLE); + + if (!args.isNull("filetype")) { + ReadableArray filetypes = args.getArray("filetype"); + if (filetypes.size() > 0) { + intent.setType(filetypes.getString(0)); + } + } + + this.callback = callback; + + getReactApplicationContext().startActivityForResult(intent, READ_REQUEST_CODE, Bundle.EMPTY); + } + + // removed @Override temporarily just to get it working on RN0.33 and RN0.32 - will remove + public void onActivityResult(Activity activity, int requestCode, int resultCode, Intent data) { + onActivityResult(requestCode, resultCode, data); + } + + // removed @Override temporarily just to get it working on RN0.33 and RN0.32 + public void onActivityResult(int requestCode, int resultCode, Intent data) { + if (requestCode != READ_REQUEST_CODE) + return; + + if (resultCode != Activity.RESULT_OK) { + callback.invoke("Bad result code: " + resultCode, null); + return; + } + + if (data == null) { + callback.invoke("No data", null); + return; + } + + try { + Uri uri = data.getData(); + callback.invoke(null, toMapWithMetadata(uri)); + } catch (Exception e) { + Log.e(NAME, "Failed to read", e); + callback.invoke(e.getMessage(), null); + } + } + + private WritableMap toMapWithMetadata(Uri uri) { + WritableMap map = Arguments.createMap(); + map.putString("uri", uri.toString()); + + ContentResolver contentResolver = getReactApplicationContext().getContentResolver(); + + map.putString("type", contentResolver.getType(uri)); + + Cursor cursor = contentResolver.query(uri, null, null, null, null, null); + + try { + if (cursor != null && cursor.moveToFirst()) { + + map.putString("fileName", cursor.getString(cursor.getColumnIndex(OpenableColumns.DISPLAY_NAME))); + + int sizeIndex = cursor.getColumnIndex(OpenableColumns.SIZE); + if (!cursor.isNull(sizeIndex)) { + String size = cursor.getString(sizeIndex); + if (size != null) + map.putInt("fileSize", Integer.valueOf(size)); + } + } + } finally { + if (cursor != null) { + cursor.close(); + } + } + + return map; + } + + // Required for RN 0.30+ modules than implement ActivityEventListener + public void onNewIntent(Intent intent) { + } +} diff --git a/android/src/main/java/com/reactnativedocumentpicker/ReactNativeDocumentPicker.java b/android/src/main/java/com/reactnativedocumentpicker/ReactNativeDocumentPicker.java new file mode 100644 index 00000000..30bfd813 --- /dev/null +++ b/android/src/main/java/com/reactnativedocumentpicker/ReactNativeDocumentPicker.java @@ -0,0 +1,32 @@ +package com.reactnativedocumentpicker; + +import com.facebook.react.ReactPackage; +import com.facebook.react.bridge.JavaScriptModule; +import com.facebook.react.bridge.NativeModule; +import com.facebook.react.bridge.ReactApplicationContext; +import com.facebook.react.uimanager.ViewManager; +import com.reactnativedocumentpicker.DocumentPicker; + +import java.util.ArrayList; +import java.util.Collections; +import java.util.List; + +public class ReactNativeDocumentPicker implements ReactPackage { + + @Override + public List> createJSModules() { + return Collections.emptyList(); + } + + @Override + public List createViewManagers(ReactApplicationContext reactContext) { + return Collections.emptyList(); + } + + @Override + public List createNativeModules(ReactApplicationContext reactContext) { + List modules = new ArrayList<>(); + modules.add(new DocumentPicker(reactContext)); + return modules; + } +} diff --git a/index.js b/index.js new file mode 100644 index 00000000..0b33f327 --- /dev/null +++ b/index.js @@ -0,0 +1,33 @@ +'use strict'; + +import {Platform, NativeModules} from "react-native"; +const DocumentPicker = NativeModules.RNDocumentPicker; + +/** + * Android requires mime types, iOS is a bit more complicated: + * + * @see https://developer.apple.com/library/ios/documentation/Miscellaneous/Reference/UTIRef/Articles/System-DeclaredUniformTypeIdentifiers.html + */ +class DocumentPickerUtil { + static allFiles() { + return (Platform.OS === 'android') ? "*/*" : "public.content"; + } + + static images() { + return (Platform.OS === 'android') ? "image/*" : "public.image"; + } + + static plainText() { + return (Platform.OS === 'android') ? "text/plain" : "public.plain-text"; + } + + static audio() { + return (Platform.OS === 'android') ? "audio/*" : "public.audio"; + } + + static pdf() { + return (Platform.OS === 'android') ? "application/pdf" : "com.adobe.pdf"; + } +} + +module.exports = {DocumentPickerUtil, DocumentPicker}; \ No newline at end of file diff --git a/RNDocumentPicker.xcodeproj/project.pbxproj b/ios/RNDocumentPicker.xcodeproj/project.pbxproj similarity index 98% rename from RNDocumentPicker.xcodeproj/project.pbxproj rename to ios/RNDocumentPicker.xcodeproj/project.pbxproj index 795b65c7..88409bc8 100644 --- a/RNDocumentPicker.xcodeproj/project.pbxproj +++ b/ios/RNDocumentPicker.xcodeproj/project.pbxproj @@ -218,8 +218,7 @@ "$(inherited)", /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/include, "$(SRCROOT)/node_modules/react-native/React", - "/**", - "$(SRCROOT)/../react-native/React/**", + "$(SRCROOT)/../../react-native/React/**", ); OTHER_LDFLAGS = "-ObjC"; PRODUCT_NAME = "$(TARGET_NAME)"; @@ -234,8 +233,7 @@ "$(inherited)", /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/include, "$(SRCROOT)/node_modules/react-native/React", - "/**", - "$(SRCROOT)/../react-native/React/**", + "$(SRCROOT)/../../react-native/React/**", ); OTHER_LDFLAGS = "-ObjC"; PRODUCT_NAME = "$(TARGET_NAME)"; diff --git a/RNDocumentPicker.xcodeproj/project.xcworkspace/contents.xcworkspacedata b/ios/RNDocumentPicker.xcodeproj/project.xcworkspace/contents.xcworkspacedata similarity index 100% rename from RNDocumentPicker.xcodeproj/project.xcworkspace/contents.xcworkspacedata rename to ios/RNDocumentPicker.xcodeproj/project.xcworkspace/contents.xcworkspacedata diff --git a/RNDocumentPicker/RNDocumentPicker.h b/ios/RNDocumentPicker/RNDocumentPicker.h similarity index 100% rename from RNDocumentPicker/RNDocumentPicker.h rename to ios/RNDocumentPicker/RNDocumentPicker.h diff --git a/RNDocumentPicker/RNDocumentPicker.m b/ios/RNDocumentPicker/RNDocumentPicker.m similarity index 77% rename from RNDocumentPicker/RNDocumentPicker.m rename to ios/RNDocumentPicker/RNDocumentPicker.m index c02ba3e1..8791d295 100644 --- a/RNDocumentPicker/RNDocumentPicker.m +++ b/ios/RNDocumentPicker/RNDocumentPicker.m @@ -31,16 +31,16 @@ - (dispatch_queue_t)methodQueue RCT_EXPORT_METHOD(show:(NSDictionary *)options callback:(RCTResponseSenderBlock)callback) { - + NSArray *allowedUTIs = [RCTConvert NSArray:options[@"filetype"]]; UIDocumentMenuViewController *documentPicker = [[UIDocumentMenuViewController alloc] initWithDocumentTypes:(NSArray *)allowedUTIs inMode:UIDocumentPickerModeImport]; - + [composeCallbacks addObject:callback]; - - + + documentPicker.delegate = self; documentPicker.modalPresentationStyle = UIModalPresentationFormSheet; - + UIViewController *rootViewController = [[[[UIApplication sharedApplication]delegate] window] rootViewController]; while (rootViewController.modalViewController) { rootViewController = rootViewController.modalViewController; @@ -62,14 +62,30 @@ - (void)documentPicker:(UIDocumentPickerViewController *)controller didPickDocum if (controller.documentPickerMode == UIDocumentPickerModeImport) { RCTResponseSenderBlock callback = [composeCallbacks lastObject]; [composeCallbacks removeLastObject]; + [url startAccessingSecurityScopedResource]; + NSFileCoordinator *coordinator = [[NSFileCoordinator alloc] init]; __block NSError *error; + [coordinator coordinateReadingItemAtURL:url options:NSFileCoordinatorReadingResolvesSymbolicLink error:&error byAccessor:^(NSURL *newURL) { - callback(@[[NSNull null], newURL.absoluteString]); + NSMutableDictionary* result = [NSMutableDictionary dictionary]; + + [result setValue:newURL.absoluteString forKey:@"uri"]; + [result setValue:[newURL lastPathComponent] forKey:@"fileName"]; + + NSError *attributesError = nil; + NSDictionary *fileAttributes = [[NSFileManager defaultManager] attributesOfItemAtPath:newURL.path error:&attributesError]; + if(!attributesError) { + [result setValue:[fileAttributes objectForKey:NSFileSize] forKey:@"fileSize"]; + } else { + NSLog(@"%@", attributesError); + } + + callback(@[[NSNull null], result]); }]; + [url stopAccessingSecurityScopedResource]; - } }