status-im
/
react-native-dialogs
mirror of https://github.com/status-im/react-native-dialogs.git
2
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #7 from jeffchienzabinet/master 

Added dismiss method
This commit is contained in:
Aakash N S 2016-01-10 18:02:14 +05:30
parent 13a24e6daa 72d9c0526f
commit afcb088eab
2 changed files with 33 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
DialogAndroid.js
View File

@ -66,6 +66,10 @@ class DialogAndroid {
NativeModules.DialogAndroid.show(finalOptions, callbackFunc); NativeModules.DialogAndroid.show(finalOptions, callbackFunc);
} }
dismiss() {
NativeModules.DialogAndroid.dismiss();
}
} }
module.exports = DialogAndroid; module.exports = DialogAndroid;

46
android/src/main/java/com/aakashns/reactnativedialogs/modules/DialogAndroid.java
View File

@ -113,17 +113,20 @@ public class DialogAndroid extends ReactContextBaseJavaModule {
return builder; return builder;
} }
MaterialDialog.Builder mBuilder;
MaterialDialog mDialog;
@ReactMethod @ReactMethod
public void show(ReadableMap options, final Callback callback) { public void show(ReadableMap options, final Callback callback) {
MaterialDialog.Builder builder = new MaterialDialog.Builder(mActivity); mBuilder = new MaterialDialog.Builder(mActivity);
try { try {
applyOptions(builder, options); applyOptions(mBuilder, options);
} catch (Exception e) { } catch (Exception e) {
callback.invoke("error", e.getMessage(), options.toString()); callback.invoke("error", e.getMessage(), options.toString());
} }
if (options.hasKey("onPositive")) { if (options.hasKey("onPositive")) {
builder.onPositive(new MaterialDialog.SingleButtonCallback() { mBuilder.onPositive(new MaterialDialog.SingleButtonCallback() {
@Override @Override
public void onClick(MaterialDialog materialDialog, DialogAction dialogAction) { public void onClick(MaterialDialog materialDialog, DialogAction dialogAction) {
callback.invoke("onPositive"); callback.invoke("onPositive");
@ -132,7 +135,7 @@ public class DialogAndroid extends ReactContextBaseJavaModule {
} }
if (options.hasKey("onNegative")) { if (options.hasKey("onNegative")) {
builder.onNegative(new MaterialDialog.SingleButtonCallback() { mBuilder.onNegative(new MaterialDialog.SingleButtonCallback() {
@Override @Override
public void onClick(MaterialDialog materialDialog, DialogAction dialogAction) { public void onClick(MaterialDialog materialDialog, DialogAction dialogAction) {
callback.invoke("onNegative"); callback.invoke("onNegative");
@ -141,7 +144,7 @@ public class DialogAndroid extends ReactContextBaseJavaModule {
} }
if (options.hasKey("onNeutral")) { if (options.hasKey("onNeutral")) {
builder.onNeutral(new MaterialDialog.SingleButtonCallback() { mBuilder.onNeutral(new MaterialDialog.SingleButtonCallback() {
@Override @Override
public void onClick(MaterialDialog materialDialog, DialogAction dialogAction) { public void onClick(MaterialDialog materialDialog, DialogAction dialogAction) {
callback.invoke("onNeutral"); callback.invoke("onNeutral");
@ -150,7 +153,7 @@ public class DialogAndroid extends ReactContextBaseJavaModule {
} }
if (options.hasKey("onAny")) { if (options.hasKey("onAny")) {
builder.onAny(new MaterialDialog.SingleButtonCallback() { mBuilder.onAny(new MaterialDialog.SingleButtonCallback() {
@Override @Override
public void onClick(MaterialDialog materialDialog, DialogAction dialogAction) { public void onClick(MaterialDialog materialDialog, DialogAction dialogAction) {
callback.invoke("onAny"); callback.invoke("onAny");
@ -159,7 +162,7 @@ public class DialogAndroid extends ReactContextBaseJavaModule {
} }
if (options.hasKey("itemsCallback")) { if (options.hasKey("itemsCallback")) {
builder.itemsCallback(new MaterialDialog.ListCallback() { mBuilder.itemsCallback(new MaterialDialog.ListCallback() {
@Override @Override
public void onSelection(MaterialDialog materialDialog, View view, int i, public void onSelection(MaterialDialog materialDialog, View view, int i,
CharSequence charSequence) { CharSequence charSequence) {
@ -172,7 +175,7 @@ public class DialogAndroid extends ReactContextBaseJavaModule {
// Check if there is a preselected index // Check if there is a preselected index
int selectedIndex = options.hasKey("selectedIndex") ? int selectedIndex = options.hasKey("selectedIndex") ?
options.getInt("selectedIndex") : -1; options.getInt("selectedIndex") : -1;
builder.itemsCallbackSingleChoice(selectedIndex, mBuilder.itemsCallbackSingleChoice(selectedIndex,
new MaterialDialog.ListCallbackSingleChoice() { new MaterialDialog.ListCallbackSingleChoice() {
@Override @Override
public boolean onSelection(MaterialDialog materialDialog, View view, int i, public boolean onSelection(MaterialDialog materialDialog, View view, int i,
@ -194,7 +197,7 @@ public class DialogAndroid extends ReactContextBaseJavaModule {
} }
} }
builder.itemsCallbackMultiChoice(selectedIndices, mBuilder.itemsCallbackMultiChoice(selectedIndices,
new MaterialDialog.ListCallbackMultiChoice() { new MaterialDialog.ListCallbackMultiChoice() {
@Override @Override
public boolean onSelection(MaterialDialog materialDialog, public boolean onSelection(MaterialDialog materialDialog,
@ -217,7 +220,7 @@ public class DialogAndroid extends ReactContextBaseJavaModule {
// Provide a 'Clear' button to unselect all choices // Provide a 'Clear' button to unselect all choices
if (options.hasKey("multiChoiceClearButton") && if (options.hasKey("multiChoiceClearButton") &&
options.getBoolean("multiChoiceClearButton")) { options.getBoolean("multiChoiceClearButton")) {
builder.neutralText("Clear").onNeutral(new MaterialDialog.SingleButtonCallback() { mBuilder.neutralText("Clear").onNeutral(new MaterialDialog.SingleButtonCallback() {
@Override @Override
public void onClick(MaterialDialog materialDialog, DialogAction dialogAction) { public void onClick(MaterialDialog materialDialog, DialogAction dialogAction) {
materialDialog.clearSelectedIndices(); materialDialog.clearSelectedIndices();
@ -227,7 +230,7 @@ public class DialogAndroid extends ReactContextBaseJavaModule {
} }
if (options.hasKey("showListener")) { if (options.hasKey("showListener")) {
builder.showListener(new DialogInterface.OnShowListener() { mBuilder.showListener(new DialogInterface.OnShowListener() {
@Override @Override
public void onShow(DialogInterface dialog) { public void onShow(DialogInterface dialog) {
callback.invoke("showListener"); callback.invoke("showListener");
@ -236,7 +239,7 @@ public class DialogAndroid extends ReactContextBaseJavaModule {
} }
if (options.hasKey("cancelListener")) { if (options.hasKey("cancelListener")) {
builder.cancelListener(new DialogInterface.OnCancelListener() { mBuilder.cancelListener(new DialogInterface.OnCancelListener() {
@Override @Override
public void onCancel(DialogInterface dialog) { public void onCancel(DialogInterface dialog) {
callback.invoke("cancelListener"); callback.invoke("cancelListener");
@ -245,7 +248,7 @@ public class DialogAndroid extends ReactContextBaseJavaModule {
} }
if (options.hasKey("dismissListener")) { if (options.hasKey("dismissListener")) {
builder.dismissListener(new DialogInterface.OnDismissListener() { mBuilder.dismissListener(new DialogInterface.OnDismissListener() {
@Override @Override
public void onDismiss(DialogInterface dialog) { public void onDismiss(DialogInterface dialog) {
callback.invoke("dismissListener"); callback.invoke("dismissListener");
@ -266,15 +269,15 @@ public class DialogAndroid extends ReactContextBaseJavaModule {
// TODO : Provide pre-selected input types in Javascript // TODO : Provide pre-selected input types in Javascript
if (input.hasKey("type")) { if (input.hasKey("type")) {
builder.inputType(input.getInt("type")); mBuilder.inputType(input.getInt("type"));
} }
int minLength = input.hasKey("minLength") ? input.getInt("minLength") : 0; int minLength = input.hasKey("minLength") ? input.getInt("minLength") : 0;
int maxLength = input.hasKey("maxLength") ? input.getInt("maxLength") : -1; int maxLength = input.hasKey("maxLength") ? input.getInt("maxLength") : -1;
builder.inputRange(minLength, maxLength); mBuilder.inputRange(minLength, maxLength);
builder.input(hint, prefill, allowEmptyInput, new MaterialDialog.InputCallback() { mBuilder.input(hint, prefill, allowEmptyInput, new MaterialDialog.InputCallback() {
@Override @Override
public void onInput(MaterialDialog materialDialog, CharSequence charSequence) { public void onInput(MaterialDialog materialDialog, CharSequence charSequence) {
callback.invoke("input", charSequence.toString()); callback.invoke("input", charSequence.toString());
@ -282,7 +285,16 @@ public class DialogAndroid extends ReactContextBaseJavaModule {
}); });
} }
builder.show(); if(mDialog != null)
mDialog.dismiss();
mDialog = mBuilder.build();
mDialog.show();
}
@ReactMethod
public void dismiss() {
if(mDialog != null)
mDialog.dismiss();
} }
} }