From 2e0e051b77c4c52937f8fec77c48db6a48da48b4 Mon Sep 17 00:00:00 2001 From: Nadeesha Cabral Date: Mon, 26 Dec 2016 18:59:10 +0530 Subject: [PATCH 1/7] fix: react-native 0.33 compatibility (#1) --- android/build.gradle | 2 +- .../ca/jaysoo/activityandroid/ActivityAndroidModule.java | 7 ++----- .../ca/jaysoo/activityandroid/ActivityAndroidPackage.java | 6 ++---- 3 files changed, 5 insertions(+), 10 deletions(-) diff --git a/android/build.gradle b/android/build.gradle index b4a98a1..a6386d2 100644 --- a/android/build.gradle +++ b/android/build.gradle @@ -16,5 +16,5 @@ android { } dependencies { - compile 'com.facebook.react:react-native:0.11.+' + compile 'com.facebook.react:react-native:0.33.+' } 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..8370767 100644 --- a/android/src/main/java/ca/jaysoo/activityandroid/ActivityAndroidPackage.java +++ b/android/src/main/java/ca/jaysoo/activityandroid/ActivityAndroidPackage.java @@ -13,16 +13,14 @@ 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) ); } From 72484fb7dca111a2fca749757493d85bd077331e Mon Sep 17 00:00:00 2001 From: Nadeesha Cabral Date: Mon, 26 Dec 2016 18:59:59 +0530 Subject: [PATCH 2/7] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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(); From 061ef485cad19965c34c9bb775a7593d397b8366 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sondre=20M=C3=A6re=20Overskaug?= Date: Wed, 8 Mar 2017 10:58:30 +0100 Subject: [PATCH 3/7] fix: support React Native versions over 0.33 --- android/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/android/build.gradle b/android/build.gradle index a6386d2..361ce62 100644 --- a/android/build.gradle +++ b/android/build.gradle @@ -16,5 +16,5 @@ android { } dependencies { - compile 'com.facebook.react:react-native:0.33.+' + compile 'com.facebook.react:react-native:+' } From 50856280d981b4eeed7ede7931ad9b02a1cc3f88 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sondre=20M=C3=A6re=20Overskaug?= Date: Fri, 6 Oct 2017 16:37:54 +0200 Subject: [PATCH 4/7] fix: make compatible with RN 0.47 BREAKING CHANGE: will not work for RN 0.46 and lower --- .../ca/jaysoo/activityandroid/ActivityAndroidPackage.java | 5 ----- 1 file changed, 5 deletions(-) diff --git a/android/src/main/java/ca/jaysoo/activityandroid/ActivityAndroidPackage.java b/android/src/main/java/ca/jaysoo/activityandroid/ActivityAndroidPackage.java index 8370767..3f13d75 100644 --- a/android/src/main/java/ca/jaysoo/activityandroid/ActivityAndroidPackage.java +++ b/android/src/main/java/ca/jaysoo/activityandroid/ActivityAndroidPackage.java @@ -24,11 +24,6 @@ public List createNativeModules(ReactApplicationContext reactConte ); } - @Override - public List> createJSModules() { - return Collections.emptyList(); - } - @Override public List createViewManagers(ReactApplicationContext reactContext) { return Arrays.asList(); From 10a89bbbd1b3bdebddb611885e017cab2c88dd5d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sondre=20M=C3=A6re=20Overskaug?= Date: Fri, 6 Oct 2017 16:38:18 +0200 Subject: [PATCH 5/7] chore: release version 1.0.0 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index b227217..71a203f 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "react-native-activity-android", - "version": "0.17.3", + "version": "1.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": { From 9bef17720eaaf04c07b0258f95b38e7c06dbc9ad Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sondre=20M=C3=A6re=20Overskaug?= Date: Thu, 27 Sep 2018 15:08:57 +0200 Subject: [PATCH 6/7] fix: support react native 0.57 React native 0.57 uses gradle 3, which in turn requires higher build tools and sdk version of android. So we bump it here in order to prevent build failures. --- .gitignore | 2 +- android/build.gradle | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) 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/android/build.gradle b/android/build.gradle index 361ce62..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 { From 1eeadaee12c960c83b5edc0310bfea415dc0adec Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sondre=20M=C3=A6re=20Overskaug?= Date: Thu, 27 Sep 2018 15:09:25 +0200 Subject: [PATCH 7/7] chore: release version 2.0.0 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 71a203f..031c3c3 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "react-native-activity-android", - "version": "1.0.0", + "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": {