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

[v1][Android] react-native v.0.57 compatibility / remove deprecated UIImplementationProvider #3836

Merged
merged 2 commits into from
Aug 30, 2018
Merged

[v1][Android] react-native v.0.57 compatibility / remove deprecated UIImplementationProvider #3836

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
7b632b4
remove deprecated com.facebook.react.uimanager.UIImplementationProvider
johakr Aug 23, 2018
27c3e05
Merge pull request #1 from wix/master
johakr Aug 30, 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: 1 addition & 7 deletions android/app/src/main/java/com/reactnativenavigation/NavigationApplication.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@
import com.facebook.react.ReactNativeHost;
import com.facebook.react.ReactPackage;
import com.facebook.react.bridge.ReactContext;
import com.facebook.react.uimanager.UIImplementationProvider;
import com.facebook.react.uimanager.UIManagerModule;
import com.reactnativenavigation.bridge.EventEmitter;
import com.reactnativenavigation.controllers.ActivityCallbacks;
Expand All @@ -35,7 +34,7 @@ public void onCreate() {
super.onCreate();
instance = this;
handler = new Handler(getMainLooper());
reactGateway = new NavigationReactGateway(getUIImplementationProvider());
reactGateway = new NavigationReactGateway();
eventEmitter = new EventEmitter(reactGateway);
activityCallbacks = new ActivityCallbacks();
}
Expand All @@ -54,11 +53,6 @@ public void startActivity(Intent intent) {
}
}

// here in case someone wants to override this
protected UIImplementationProvider getUIImplementationProvider() {
return null; // if null the default UIImplementationProvider will be used
}

public void startReactContextOnceInBackgroundAndExecuteJS() {
reactGateway.startReactContextOnceInBackgroundAndExecuteJS();
}
Expand Down
24 changes: 1 addition & 23 deletions android/app/src/main/java/com/reactnativenavigation/react/NavigationReactGateway.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@
import com.facebook.react.bridge.ReactContext;
import com.facebook.react.modules.core.DefaultHardwareBackBtnHandler;
import com.facebook.react.shell.MainReactPackage;
import com.facebook.react.uimanager.UIImplementationProvider;
import com.reactnativenavigation.NavigationApplication;
import com.reactnativenavigation.bridge.NavigationReactEventEmitter;
import com.reactnativenavigation.bridge.NavigationReactPackage;
Expand All @@ -29,28 +28,7 @@ public class NavigationReactGateway implements ReactGateway {
private JsDevReloadHandler jsDevReloadHandler;

public NavigationReactGateway() {
this(null);
}

public NavigationReactGateway(final UIImplementationProvider customImplProvider) {

if (customImplProvider != null) {
host = new ReactNativeHostImpl() {
/**
* This was added in case someone needs to provide a different UIImplementationProvider
* @param {UIImplementationProvider} defaultProvider
* @return {UIImplementationProvider}
*/
@Override
protected UIImplementationProvider getUIImplementationProvider() {
return customImplProvider;
}
};
} else {
host = new ReactNativeHostImpl();
}


host = new ReactNativeHostImpl();
jsDevReloadHandler = new JsDevReloadHandler();
}

Expand Down