Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
Compatibility with react-native 0.29.0 and higher.
  • Loading branch information
techrah committed Jan 4, 2017
commit a7e19193870f74dd9d84752fa9899a4979ed98d8
3 changes: 0 additions & 3 deletions .babelrc

This file was deleted.

31 changes: 10 additions & 21 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -34,32 +34,21 @@ Useful if you want to capture listen for `BackButton` press and pause your appli
}
```

4. Register module (in `MainActivity.java`)
4. Register module (in `MainApplication.java`)

```
import ca.jaysoo.activityandroid.ActivityAndroidPackage; // <---- Import here

public class MainActivity extends Activity implements DefaultHardwareBackBtnHandler {
public class MainApplication extends Application implements ReactApplication {
......

@Override
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
mReactRootView = new ReactRootView(this);

mReactInstanceManager = ReactInstanceManager.builder()
.setApplication(getApplication())
.setBundleAssetName("index.android.bundle")
.setJSMainModuleName("index.android")
.addPackage(new MainReactPackage())
.addPackage(new ActivityAndroidPackage(this)) // <---- Add here
.setUseDeveloperSupport(BuildConfig.DEBUG)
.setInitialLifecycleState(LifecycleState.RESUMED)
.build();

mReactRootView.startReactApplication(mReactInstanceManager, "ExampleRN", null);

setContentView(mReactRootView);
protected List<ReactPackage> getPackages() {
return Arrays.<ReactPackage>asList(
new MainReactPackage(),
......,
new ActivityAndroidPackage() // <---- Add here
);
}

......
Expand All @@ -73,12 +62,12 @@ Moving an application to the background.

```js
import { BackAndroid } from 'react-native';
import ActivityAndroid 'react-native-activity-android';
import ActivityAndroid from 'react-native-activity-android';

BackAndroid.addEventListener('hardwareBackPress', () => {
// Note: callbacks are optional.
ActivityAndroid.moveTaskToBack(() => console.log('worked'), () => console.log('failed'));
return false; // Don't exit the app.
return true; // Don't exit the app.
});
```

Expand Down
2 changes: 1 addition & 1 deletion android/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -16,5 +16,5 @@ android {
}

dependencies {
compile 'com.facebook.react:react-native:0.11.+'
compile 'com.facebook.react:react-native:0.17.+'
}
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}

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

@ReactMethod
public void moveTaskToBack(Callback onSuccess, Callback onError) {
boolean wasMoved = mCurrentActivity.moveTaskToBack(true);
final Activity activity = getCurrentActivity();

if (activity == null) return;

boolean wasMoved = activity.moveTaskToBack(true);

if (wasMoved) {
onSuccess.invoke();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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<NativeModule> createNativeModules(ReactApplicationContext reactContext) {
return Arrays.<NativeModule>asList(
new ActivityAndroidModule(reactContext, mCurrentActivity)
new ActivityAndroidModule(reactContext)
);
}

Expand Down
7 changes: 6 additions & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "react-native-activity-android",
"version": "0.17.3",
"version": "0.18.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": {
Expand Down Expand Up @@ -32,5 +32,10 @@
"chai": "^3.4.1",
"mocha": "^2.3.4",
"sinon": "^1.17.2"
},
"babel": {
"presets": [
"es2015"
]
}
}