Merge branch 'master' of git://github.com/wix/react-native-navigation

Author: diegolmello

README.md

@@ -6,7 +6,7 @@
 
 [![NPM Version](https://img.shields.io/npm/v/react-native-navigation.svg?style=flat)](https://www.npmjs.com/package/react-native-navigation)
 [![NPM Downloads](https://img.shields.io/npm/dm/react-native-navigation.svg?style=flat)](https://www.npmjs.com/package/react-native-navigation)
-[![Build Status](https://jenkins-oss.wixpress.com/buildStatus/icon?job=react-native-navigation-master)](https://jenkins-oss.wixpress.com/job/react-native-navigation-master/)
+[![Build Status](https://img.shields.io/jenkins/s/http/jenkins-oss.wixpress.com:8080/job/react-native-navigation-master.svg)](https://jenkins-oss.wixpress.com/job/react-native-navigation-master/)
 [![Join us on Discord](https://img.shields.io/badge/discord-react--native--navigation-738bd7.svg?style=flat)](https://discord.gg/DhkZjq2)
 
 ## Important
@@ -16,7 +16,9 @@ We are currently in late stages of development of [v2](https://github.com/wix/re
 * [v2 Documentation](https://wix.github.io/react-native-navigation/v2/#/)
 <br><br>Have any questions regarding v2? Join us in [Discord](https://discord.gg/DhkZjq2) #v2 channel.
 
-<br><br>Latest stable version is `1.1.x` and is published to npm under tag `latest`. It supports react-native >= 0.48.
+<br><br>Latest stable version is `1.1.x` and is published to npm under tag `latest`.
+Version 1.1.483 supports react-native >= 0.48 up to react-native 0.56
+Version 1.1.484 supports react-native >= 0.57 
 >⚠️Since we're focusing our efforts on v2, we are not accepting pull requests for v1 and are not addresing issues for v1.
 
 ### tl;dr

android/app/build.gradle

@@ -2,7 +2,7 @@ apply plugin: 'com.android.library'
 apply from: '../prepare-robolectric.gradle'
 
 android {
-    compileSdkVersion 25
+    compileSdkVersion 26
     buildToolsVersion '26.0.2'
 
     defaultConfig {

android/app/src/main/java/com/reactnativenavigation/NavigationApplication.java

@@ -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;
@@ -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();
     }
@@ -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();
     }

android/app/src/main/java/com/reactnativenavigation/react/NavigationReactGateway.java

@@ -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;
@@ -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();
 	}
 

docs/_sidebar.md

@@ -1,3 +1,6 @@
+#### V 1.1.X  
+For [V2 docs click here](https://github.com/wix/react-native-navigation/tree/v2)
+
 - Getting started
  - [Installation - iOS](/installation-ios)
  - [Installation - Android](/installation-android)
@@ -14,4 +17,4 @@
   - [Styling the Navigator](/styling-the-navigator)
   - [Adding Buttons to the Navigator](/adding-buttons-to-the-navigator)
   - [Styling the Tab Bar](/styling-the-tab-bar)
-  
+  

docs/installation-android.md

@@ -5,7 +5,7 @@
 1. Install `react-native-navigation` latest stable version.
 
 	```sh
-	yarn add react-native-navigation@latest
+	yarn add react-native-navigation@1.x.x
 	```
 
 2. Add the following in `android/settings.gradle`.

docs/installation-ios.md

@@ -5,7 +5,7 @@
 1. Install `react-native-navigation` latest stable version.
 
     ```sh
-    yarn add react-native-navigation@latest
+	yarn add react-native-navigation@1.x.x
     ```
 
 2. In Xcode, in Project Navigator (left pane), right-click on the `Libraries` > `Add files to [project name]`. Add `./node_modules/react-native-navigation/ios/ReactNativeNavigation.xcodeproj` ([screenshots](https://facebook.github.io/react-native/docs/0.54/linking-libraries-ios.html#step-1-1))

package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-native-navigation",
-  "version": "1.1.406",
+  "version": "1.1.486",
   "description": "React Native Navigation - truly native navigation for iOS and Android",
   "license": "MIT",
   "nativePackage": true,