diff --git a/.gitignore b/.gitignore index 64b4cb1..a2c7407 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1,4 @@ lib/ node_modules/ npm-debug.log - +.idea/ diff --git a/README.md b/README.md index aa4258b..0765fcc 100644 --- a/README.md +++ b/README.md @@ -52,7 +52,7 @@ Useful if you want to capture listen for `BackButton` press and pause your appli .setBundleAssetName("index.android.bundle") .setJSMainModuleName("index.android") .addPackage(new MainReactPackage()) - .addPackage(new ActivityAndroidPackage(this)) // <---- Add here + .addPackage(new ActivityAndroidPackage()) // <---- Add here .setUseDeveloperSupport(BuildConfig.DEBUG) .setInitialLifecycleState(LifecycleState.RESUMED) .build(); diff --git a/android/build.gradle b/android/build.gradle index b4a98a1..102983e 100644 --- a/android/build.gradle +++ b/android/build.gradle @@ -1,12 +1,12 @@ apply plugin: 'com.android.library' android { - compileSdkVersion 23 - buildToolsVersion "23.0.1" + compileSdkVersion 27 + buildToolsVersion "27.0.3" defaultConfig { minSdkVersion 16 - targetSdkVersion 22 + targetSdkVersion 26 versionCode 1 versionName "1.0" ndk { @@ -16,5 +16,5 @@ android { } dependencies { - compile 'com.facebook.react:react-native:0.11.+' + compile 'com.facebook.react:react-native:+' } diff --git a/android/src/main/java/ca/jaysoo/activityandroid/ActivityAndroidModule.java b/android/src/main/java/ca/jaysoo/activityandroid/ActivityAndroidModule.java index 3eee4d8..4b67c3d 100644 --- a/android/src/main/java/ca/jaysoo/activityandroid/ActivityAndroidModule.java +++ b/android/src/main/java/ca/jaysoo/activityandroid/ActivityAndroidModule.java @@ -15,11 +15,8 @@ import com.facebook.react.bridge.ReactMethod; public class ActivityAndroidModule extends ReactContextBaseJavaModule implements LifecycleEventListener { - private Activity mCurrentActivity; - - public ActivityAndroidModule(ReactApplicationContext reactContext, Activity activity) { + public ActivityAndroidModule(ReactApplicationContext reactContext) { super(reactContext); - mCurrentActivity = activity; reactContext.addLifecycleEventListener(this); } @@ -30,7 +27,7 @@ public String getName() { @ReactMethod public void moveTaskToBack(Callback onSuccess, Callback onError) { - boolean wasMoved = mCurrentActivity.moveTaskToBack(true); + boolean wasMoved = getCurrentActivity().moveTaskToBack(true); if (wasMoved) { onSuccess.invoke(); diff --git a/android/src/main/java/ca/jaysoo/activityandroid/ActivityAndroidPackage.java b/android/src/main/java/ca/jaysoo/activityandroid/ActivityAndroidPackage.java index bcb12cc..3f13d75 100644 --- a/android/src/main/java/ca/jaysoo/activityandroid/ActivityAndroidPackage.java +++ b/android/src/main/java/ca/jaysoo/activityandroid/ActivityAndroidPackage.java @@ -13,24 +13,17 @@ import java.util.List; public class ActivityAndroidPackage implements ReactPackage { - private Activity mCurrentActivity; + public ActivityAndroidPackage() { - public ActivityAndroidPackage(Activity activity) { - mCurrentActivity = activity; } @Override public List createNativeModules(ReactApplicationContext reactContext) { return Arrays.asList( - new ActivityAndroidModule(reactContext, mCurrentActivity) + new ActivityAndroidModule(reactContext) ); } - @Override - public List> createJSModules() { - return Collections.emptyList(); - } - @Override public List createViewManagers(ReactApplicationContext reactContext) { return Arrays.asList(); diff --git a/package.json b/package.json index b227217..031c3c3 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "react-native-activity-android", - "version": "0.17.3", + "version": "2.0.0", "description": "Provides a method to pause Android app (Activity.moveTaskToBack), as well as lifecycle hooks when app is paused and resumed.", "main": "src/index.js", "scripts": {