diff --git a/.gitignore b/.gitignore index 2fd9b94..ead445e 100644 --- a/.gitignore +++ b/.gitignore @@ -59,3 +59,4 @@ react-native-dialogs.iml .idea .gradle local.properties +android/*.iml diff --git a/DialogAndroid.js b/DialogAndroid.js index e9eae63..36905e0 100644 --- a/DialogAndroid.js +++ b/DialogAndroid.js @@ -70,6 +70,10 @@ class DialogAndroid { dismiss() { NativeModules.DialogAndroid.dismiss(); } + + list(options, cb){ + NativeModules.DialogAndroid.list(options, cb) + } } module.exports = DialogAndroid; diff --git a/README.md b/README.md index 6059bdc..9b1f85c 100644 --- a/README.md +++ b/README.md @@ -40,15 +40,18 @@ Next, you need to change the `MainActivity` of your app to register `ReactNative ```java import com.aakashns.reactnativedialogs.ReactNativeDialogsPackage; -public class MainActivity extends Activity implements DefaultHardwareBackBtnHandler { //... +public class MainActivity extends ReactActivity { + //... - mReactInstanceManager = ReactInstanceManager.builder() - //... - .addPackage(new MainReactPackage()) - .addPackage(new ReactNativeDialogsPackage(this)) // <- ADD THIS LINE! - //... - .build(); + @Override + protected List getPackages() { + return Arrays.asList( + new MainReactPackage(), + new ReactNativeDialogsPackage() // add this manager + ); + } +} ``` See [this changelog](https://github.com/aakashns/react-native-dialogs-example/commit/52cac27756963bcd2f4fdcd039e1a78028bb0abd) for reference. diff --git a/android/build.gradle b/android/build.gradle index 4f90cb3..f336891 100644 --- a/android/build.gradle +++ b/android/build.gradle @@ -1,11 +1,10 @@ buildscript { repositories { jcenter() - maven { url "https://jitpack.io" } } dependencies { - classpath 'com.android.tools.build:gradle:1.1.3' + classpath 'com.android.tools.build:gradle:1.3.1' } } @@ -25,14 +24,12 @@ android { repositories { maven { url "https://jitpack.io" } + jcenter() } dependencies { - compile 'com.android.support:appcompat-v7:23.1' - compile 'com.facebook.react:react-native:0.14.+' - compile fileTree(dir: 'libs', include: ['*.jar']) + compile 'com.facebook.react:react-native:0.20.+' + compile fileTree(include: ['*.jar'], dir: 'libs') testCompile 'junit:junit:4.12' - compile('com.github.afollestad.material-dialogs:core:0.8.5.0@aar') { - transitive = true - } + compile 'com.github.afollestad.material-dialogs:commons:8f8ab21' // version 0.8.5.0 } diff --git a/android/gradle/wrapper/gradle-wrapper.jar b/android/gradle/wrapper/gradle-wrapper.jar new file mode 100644 index 0000000..05ef575 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 0000000..f23df6e --- /dev/null +++ b/android/gradle/wrapper/gradle-wrapper.properties @@ -0,0 +1,6 @@ +#Wed Oct 21 11:34:03 PDT 2015 +distributionBase=GRADLE_USER_HOME +distributionPath=wrapper/dists +zipStoreBase=GRADLE_USER_HOME +zipStorePath=wrapper/dists +distributionUrl=https\://services.gradle.org/distributions/gradle-2.8-all.zip diff --git a/android/gradlew b/android/gradlew new file mode 100644 index 0000000..9d82f78 --- /dev/null +++ b/android/gradlew @@ -0,0 +1,160 @@ +#!/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 + +# 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\"`/" >/dev/null +APP_HOME="`pwd -P`" +cd "$SAVED" >/dev/null + +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"` + JAVACMD=`cygpath --unix "$JAVACMD"` + + # 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 0000000..aec9973 --- /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/src/main/java/com/aakashns/reactnativedialogs/ReactNativeDialogsPackage.java b/android/src/main/java/com/aakashns/reactnativedialogs/ReactNativeDialogsPackage.java index 42c64fe..dbfabb0 100644 --- a/android/src/main/java/com/aakashns/reactnativedialogs/ReactNativeDialogsPackage.java +++ b/android/src/main/java/com/aakashns/reactnativedialogs/ReactNativeDialogsPackage.java @@ -10,30 +10,28 @@ import com.facebook.react.bridge.ReactApplicationContext; import com.facebook.react.uimanager.ViewManager; import java.util.ArrayList; +import java.util.Arrays; +import java.util.Collections; import java.util.List; public class ReactNativeDialogsPackage implements ReactPackage { - Activity mActivity; - public ReactNativeDialogsPackage(Activity activity) { - mActivity = activity; + public ReactNativeDialogsPackage() { + } @Override - public List createNativeModules( - ReactApplicationContext reactContext) { - List modules = new ArrayList<>(); - modules.add(new DialogAndroid(reactContext, mActivity)); - return modules; + public List createNativeModules(ReactApplicationContext reactContext) { + return Arrays.asList(new DialogAndroid(reactContext)); } @Override public List> createJSModules() { - return new ArrayList<>(); + return Collections.emptyList(); } @Override public List createViewManagers(ReactApplicationContext reactContext) { - return new ArrayList<>(); + return Collections.emptyList(); } } diff --git a/android/src/main/java/com/aakashns/reactnativedialogs/modules/DialogAndroid.java b/android/src/main/java/com/aakashns/reactnativedialogs/modules/DialogAndroid.java index 3b07e05..3933c22 100644 --- a/android/src/main/java/com/aakashns/reactnativedialogs/modules/DialogAndroid.java +++ b/android/src/main/java/com/aakashns/reactnativedialogs/modules/DialogAndroid.java @@ -1,11 +1,12 @@ package com.aakashns.reactnativedialogs.modules; -import android.app.Activity; import android.content.DialogInterface; import android.view.View; import com.afollestad.materialdialogs.DialogAction; import com.afollestad.materialdialogs.MaterialDialog; +import com.afollestad.materialdialogs.simplelist.MaterialSimpleListAdapter; +import com.afollestad.materialdialogs.simplelist.MaterialSimpleListItem; import com.facebook.react.bridge.Callback; import com.facebook.react.bridge.ReactApplicationContext; import com.facebook.react.bridge.ReactContextBaseJavaModule; @@ -13,6 +14,7 @@ import com.facebook.react.bridge.ReactMethod; import com.facebook.react.bridge.ReadableArray; import com.facebook.react.bridge.ReadableMap; import com.facebook.react.bridge.ReadableMapKeySetIterator; +import com.facebook.react.bridge.UiThreadUtil; import java.lang.reflect.InvocationTargetException; @@ -23,13 +25,9 @@ public class DialogAndroid extends ReactContextBaseJavaModule { return "DialogAndroid"; } - Activity mActivity; - public DialogAndroid( - ReactApplicationContext reactContext, - Activity activity) { + public DialogAndroid(ReactApplicationContext reactContext) { super(reactContext); - mActivity = activity; } /* Apply the options to the provided builder */ @@ -118,7 +116,7 @@ public class DialogAndroid extends ReactContextBaseJavaModule { @ReactMethod public void show(ReadableMap options, final Callback callback) { - mBuilder = new MaterialDialog.Builder(mActivity); + mBuilder = new MaterialDialog.Builder(getCurrentActivity()); try { applyOptions(mBuilder, options); } catch (Exception e) { @@ -177,13 +175,13 @@ public class DialogAndroid extends ReactContextBaseJavaModule { options.getInt("selectedIndex") : -1; mBuilder.itemsCallbackSingleChoice(selectedIndex, new MaterialDialog.ListCallbackSingleChoice() { - @Override - public boolean onSelection(MaterialDialog materialDialog, View view, int i, - CharSequence charSequence) { - callback.invoke("itemsCallbackSingleChoice", i, charSequence.toString()); - return true; - } - }); + @Override + public boolean onSelection(MaterialDialog materialDialog, View view, int i, + CharSequence charSequence) { + callback.invoke("itemsCallbackSingleChoice", i, charSequence.toString()); + return true; + } + }); } if (options.hasKey("itemsCallbackMultiChoice")) { @@ -199,23 +197,23 @@ public class DialogAndroid extends ReactContextBaseJavaModule { mBuilder.itemsCallbackMultiChoice(selectedIndices, new MaterialDialog.ListCallbackMultiChoice() { - @Override - public boolean onSelection(MaterialDialog materialDialog, - Integer[] integers, CharSequence[] charSequences) { + @Override + public boolean onSelection(MaterialDialog materialDialog, + Integer[] integers, CharSequence[] charSequences) { - // Concatenate selected IDs into a string - StringBuilder selected = new StringBuilder(""); - for (int i = 0; i < integers.length - 1; i++) { - selected.append(integers[i]).append(","); - } - if (integers.length > 0) { - selected.append(integers[integers.length - 1]); - } + // Concatenate selected IDs into a string + StringBuilder selected = new StringBuilder(""); + for (int i = 0; i < integers.length - 1; i++) { + selected.append(integers[i]).append(","); + } + if (integers.length > 0) { + selected.append(integers[integers.length - 1]); + } - callback.invoke("itemsCallbackMultiChoice", selected.toString()); - return true; - } - }); + callback.invoke("itemsCallbackMultiChoice", selected.toString()); + return true; + } + }); // Provide a 'Clear' button to unselect all choices if (options.hasKey("multiChoiceClearButton") && @@ -284,20 +282,56 @@ public class DialogAndroid extends ReactContextBaseJavaModule { } }); } - mActivity.runOnUiThread(new Runnable() { + UiThreadUtil.runOnUiThread(new Runnable() { public void run() { - if(mDialog != null) - mDialog.dismiss(); + if (mDialog != null) + mDialog.dismiss(); mDialog = mBuilder.build(); mDialog.show(); } }); } + MaterialDialog simple; + @ReactMethod + public void list(ReadableMap options, final Callback callback) { + final MaterialSimpleListAdapter simpleListAdapter = new MaterialSimpleListAdapter(getCurrentActivity()); + + ReadableArray arr = options.getArray("items"); + for(int i = 0; i < arr.size(); i++){ + simpleListAdapter.add(new MaterialSimpleListItem.Builder(getCurrentActivity()) + .content(arr.getString(i)) + .build()); + } + + final MaterialDialog.Builder adapter = new MaterialDialog.Builder(getCurrentActivity()) + .title(options.hasKey("title") ? options.getString("title") : "") + .adapter(simpleListAdapter, new MaterialDialog.ListCallback() { + @Override + public void onSelection(MaterialDialog dialog, View itemView, int which, CharSequence text) { + callback.invoke(which, text); + if (simple != null) { + simple.dismiss(); + } + } + }) + .autoDismiss(true); + + UiThreadUtil.runOnUiThread(new Runnable() { + public void run() { + if (simple != null) { + simple.dismiss(); + } + simple = adapter.build(); + simple.show(); + } + }); + } + @ReactMethod public void dismiss() { - if(mDialog != null) - mDialog.dismiss(); + if(mDialog != null) + mDialog.dismiss(); } }