Skip to content

Commit 86421f3

Browse files
committed
Compatibility with react-native 0.29.0 and higher.
1 parent bdc2782 commit 86421f3

File tree

6 files changed

+20
-35
lines changed

6 files changed

+20
-35
lines changed

.babelrc

Lines changed: 0 additions & 3 deletions
This file was deleted.

README.md

Lines changed: 10 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -34,32 +34,21 @@ Useful if you want to capture listen for `BackButton` press and pause your appli
3434
}
3535
```
3636
37-
4. Register module (in `MainActivity.java`)
37+
4. Register module (in `MainApplication.java`)
3838
3939
```
4040
import ca.jaysoo.activityandroid.ActivityAndroidPackage; // <---- Import here
4141
42-
public class MainActivity extends Activity implements DefaultHardwareBackBtnHandler {
42+
public class MainApplication extends Application implements ReactApplication {
4343
......
4444
4545
@Override
46-
protected void onCreate(Bundle savedInstanceState) {
47-
super.onCreate(savedInstanceState);
48-
mReactRootView = new ReactRootView(this);
49-
50-
mReactInstanceManager = ReactInstanceManager.builder()
51-
.setApplication(getApplication())
52-
.setBundleAssetName("index.android.bundle")
53-
.setJSMainModuleName("index.android")
54-
.addPackage(new MainReactPackage())
55-
.addPackage(new ActivityAndroidPackage(this)) // <---- Add here
56-
.setUseDeveloperSupport(BuildConfig.DEBUG)
57-
.setInitialLifecycleState(LifecycleState.RESUMED)
58-
.build();
59-
60-
mReactRootView.startReactApplication(mReactInstanceManager, "ExampleRN", null);
61-
62-
setContentView(mReactRootView);
46+
protected List<ReactPackage> getPackages() {
47+
return Arrays.<ReactPackage>asList(
48+
new MainReactPackage(),
49+
......,
50+
new ActivityAndroidPackage() // <---- Add here
51+
);
6352
}
6453
6554
......
@@ -73,12 +62,12 @@ Moving an application to the background.
7362
7463
```js
7564
import { BackAndroid } from 'react-native';
76-
import ActivityAndroid 'react-native-activity-android';
65+
import ActivityAndroid from 'react-native-activity-android';
7766
7867
BackAndroid.addEventListener('hardwareBackPress', () => {
7968
// Note: callbacks are optional.
8069
ActivityAndroid.moveTaskToBack(() => console.log('worked'), () => console.log('failed'));
81-
return false; // Don't exit the app.
70+
return true; // Don't exit the app.
8271
});
8372
```
8473

android/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,5 +16,5 @@ android {
1616
}
1717

1818
dependencies {
19-
compile 'com.facebook.react:react-native:0.11.+'
19+
compile 'com.facebook.react:react-native:0.17.+'
2020
}

android/src/main/java/ca/jaysoo/activityandroid/ActivityAndroidModule.java

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -15,11 +15,8 @@
1515
import com.facebook.react.bridge.ReactMethod;
1616

1717
public class ActivityAndroidModule extends ReactContextBaseJavaModule implements LifecycleEventListener {
18-
private Activity mCurrentActivity;
19-
20-
public ActivityAndroidModule(ReactApplicationContext reactContext, Activity activity) {
18+
public ActivityAndroidModule(ReactApplicationContext reactContext) {
2119
super(reactContext);
22-
mCurrentActivity = activity;
2320
reactContext.addLifecycleEventListener(this);
2421
}
2522

@@ -30,7 +27,11 @@ public String getName() {
3027

3128
@ReactMethod
3229
public void moveTaskToBack(Callback onSuccess, Callback onError) {
33-
boolean wasMoved = mCurrentActivity.moveTaskToBack(true);
30+
final Activity activity = getCurrentActivity();
31+
32+
if (activity == null) return;
33+
34+
boolean wasMoved = activity.moveTaskToBack(true);
3435

3536
if (wasMoved) {
3637
onSuccess.invoke();

android/src/main/java/ca/jaysoo/activityandroid/ActivityAndroidPackage.java

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,16 +13,14 @@
1313
import java.util.List;
1414

1515
public class ActivityAndroidPackage implements ReactPackage {
16-
private Activity mCurrentActivity;
16+
public ActivityAndroidPackage() {
1717

18-
public ActivityAndroidPackage(Activity activity) {
19-
mCurrentActivity = activity;
2018
}
2119

2220
@Override
2321
public List<NativeModule> createNativeModules(ReactApplicationContext reactContext) {
2422
return Arrays.<NativeModule>asList(
25-
new ActivityAndroidModule(reactContext, mCurrentActivity)
23+
new ActivityAndroidModule(reactContext)
2624
);
2725
}
2826

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "react-native-activity-android",
3-
"version": "0.17.3",
3+
"version": "0.18.0",
44
"description": "Provides a method to pause Android app (Activity.moveTaskToBack), as well as lifecycle hooks when app is paused and resumed.",
55
"main": "src/index.js",
66
"scripts": {

0 commit comments

Comments
 (0)