Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Implementing arguments passed back to callbacks #15

Merged
merged 2 commits into from
Oct 13, 2018
Merged

Implementing arguments passed back to callbacks #15

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8ad53bd
Android: Passing updated file path back to onDone callback. React Nat…
Oct 13, 2018
284576c
Passing args to the cancel callback as well
Oct 13, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions RNPhotoEditor.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,11 +45,11 @@ class PhotoEditor extends PureComponent {

RNPhotoEditor.Edit(
props,
() => {
props.onDone && props.onDone();
(...args) => {
props.onDone && props.onDone(...args);
},
() => {
props.onCancel && props.onCancel();
(...args) => {
props.onCancel && props.onCancel(...args);
}
);
}
Expand Down
3 changes: 2 additions & 1 deletion android/src/main/java/com/ahmedadeltito/photoeditor/PhotoEditorActivity.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -408,13 +408,14 @@ public void onFinish() {
var7.printStackTrace();
}

Intent returnIntent = new Intent();
setResult(Activity.RESULT_OK, returnIntent);

finish();
}
}.start();
}


@Override
public void onClick(View v) {
if (v.getId() == R.id.close_tv) {
Expand Down
60 changes: 47 additions & 13 deletions android/src/main/java/ui/photoeditor/RNPhotoEditorModule.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,33 +1,63 @@

package ui.photoeditor;

import android.app.Activity;
import android.content.res.Resources;
import android.graphics.Color;
import android.graphics.drawable.Drawable;
import android.util.Log;
import android.graphics.Bitmap;
import android.graphics.BitmapFactory;

import com.ahmedadeltito.photoeditor.PhotoEditorActivity;
import com.facebook.react.bridge.ActivityEventListener;
import com.facebook.react.bridge.BaseActivityEventListener;
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.Callback;
import com.facebook.react.bridge.ReadableArray;
import com.facebook.react.bridge.ReadableMap;

import com.ahmedadeltito.photoeditorsdk.PhotoEditorSDK;
import com.ahmedadeltito.photoeditor.PhotoEditorActivity;
import android.util.Log;
import android.app.Activity;
import android.content.Intent;
import android.graphics.Color;

import java.util.ArrayList;

public class RNPhotoEditorModule extends ReactContextBaseJavaModule {

private static final int PHOTO_EDITOR_REQUEST = 1539266202;
private static final String E_PHOTO_EDITOR_CANCELLED = "E_PHOTO_EDITOR_CANCELLED";


private Callback mDoneCallback;
private Callback mCancelCallback;

private final ActivityEventListener mActivityEventListener = new BaseActivityEventListener() {

@Override
public void onActivityResult(Activity activity, int requestCode, int resultCode, Intent intent) {
if (requestCode == PHOTO_EDITOR_REQUEST) {

if (mDoneCallback != null) {

if (resultCode == Activity.RESULT_CANCELED) {
mCancelCallback.invoke(resultCode);
} else {
mDoneCallback.invoke(intent.getExtras().getString("imagePath"));
}

}

mCancelCallback = null;
mDoneCallback = null;
}
}
};

public RNPhotoEditorModule(ReactApplicationContext reactContext) {
super(reactContext);

reactContext.addActivityEventListener(mActivityEventListener);

}



@Override
public String getName() {
return "RNPhotoEditor";
Expand Down Expand Up @@ -70,6 +100,10 @@ public void Edit(final ReadableMap props, final Callback onDone, final Callback
intent.putExtra("hiddenControls", hiddenControlsIntent);
intent.putExtra("stickers", stickersIntent);

getCurrentActivity().startActivityForResult(intent, 1);

mCancelCallback = onCancel;
mDoneCallback = onDone;

getCurrentActivity().startActivityForResult(intent, PHOTO_EDITOR_REQUEST);
}
}
}