Merge branch 'v2.0' of https://github.com/wix/react-native-navigation into v2.0

android/app/src/main/java/com/reactnativenavigation/layouts/BottomTabsLayout.java

@@ -105,6 +105,10 @@ public class BottomTabsLayout extends RelativeLayout implements Layout, AHBottom
 
     @Override
     public boolean onBackPressed() {
+        if (getCurrentScreenStack().handleBackPressInJs()) {
+            return true;
+        }
+
         if (getCurrentScreenStack().canPop()) {
             getCurrentScreenStack().pop(true);
             setBottomTabsStyleFromCurrentScreen();

android/app/src/main/java/com/reactnativenavigation/layouts/SingleScreenLayout.java

@@ -68,6 +68,10 @@ public class SingleScreenLayout extends RelativeLayout implements Layout {
 
     @Override
     public boolean onBackPressed() {
+        if (stack.handleBackPressInJs()) {
+            return true;
+        }
+
         if (stack.canPop()) {
             stack.pop(true);
             return true;

android/app/src/main/java/com/reactnativenavigation/params/ScreenParams.java

@@ -9,6 +9,7 @@ public class ScreenParams {
     public String screenId;
     public List<TitleBarButtonParams> rightButtons;
     public TitleBarLeftButtonParams leftButton;
+    public boolean overrideBackPressInJs;
     public String title;
     public StyleParams styleParams;
     public List<TopTabParams> topTabParams;

android/app/src/main/java/com/reactnativenavigation/params/TitleBarLeftButtonParams.java

@@ -4,6 +4,7 @@ import com.balysv.materialmenu.MaterialMenuDrawable;
 
 public class TitleBarLeftButtonParams extends TitleBarButtonParams {
     public MaterialMenuDrawable.IconState iconState;
+    public boolean overrideBackPressInJs;
 
     public TitleBarLeftButtonParams(TitleBarButtonParams params) {
         icon = params.icon;
@@ -15,4 +16,8 @@ public class TitleBarLeftButtonParams extends TitleBarButtonParams {
     public boolean isBackButton() {
         return eventId.equals("back");
     }
+
+    public void setOverrideBackPressInJs(boolean overrideBackPressInJs) {
+        this.overrideBackPressInJs = overrideBackPressInJs;
+    }
 }

android/app/src/main/java/com/reactnativenavigation/params/parsers/ScreenParamsParser.java

@@ -26,6 +26,7 @@ public class ScreenParamsParser extends Parser {
     private static final String TOP_TABS = "topTabs";
     private static final String FRAGMENT_CREATOR_CLASS_NAME = "fragmentCreatorClassName";
     private static final String FRAGMENT_CREATOR_PASS_PROPS = "fragmentCreatorPassProps";
+    public static final String OVERRIDE_BACK_PRESS = "overrideBackPress";
 
     @SuppressWarnings("ConstantConditions")
     public static ScreenParams parse(Bundle params) {
@@ -42,6 +43,7 @@ public class ScreenParamsParser extends Parser {
 
         result.title = params.getString(KEY_TITLE);
         result.rightButtons = parseRightButton(params);
+        result.overrideBackPressInJs = params.getBoolean(OVERRIDE_BACK_PRESS, false);
         result.leftButton = parseLeftButton(params);
 
         result.topTabParams = parseTopTabs(params);

android/app/src/main/java/com/reactnativenavigation/screens/Screen.java

@@ -66,8 +66,11 @@ public abstract class Screen extends RelativeLayout {
         if (screenParams.leftButton != null) {
             screenParams.leftButton.setColorFromScreenStyle(screenParams.styleParams.titleBarButtonColor);
         }
-        topBar.addTitleBarAndSetButtons(screenParams.rightButtons, screenParams.leftButton,
-                leftButtonOnClickListener, screenParams.navigatorEventId);
+        topBar.addTitleBarAndSetButtons(screenParams.rightButtons,
+                screenParams.leftButton,
+                leftButtonOnClickListener,
+                screenParams.navigatorEventId,
+                screenParams.overrideBackPressInJs);
     }
 
     private void createTopBar() {
@@ -140,7 +143,10 @@ public abstract class Screen extends RelativeLayout {
 
     public void setTitleBarLeftButton(String navigatorEventId, LeftButtonOnClickListener backButtonListener,
                                       TitleBarLeftButtonParams titleBarLeftButtonParams) {
-        topBar.setTitleBarRightButton(navigatorEventId, backButtonListener, titleBarLeftButtonParams);
+        topBar.setTitleBarLeftButton(navigatorEventId,
+                backButtonListener,
+                titleBarLeftButtonParams,
+                screenParams.overrideBackPressInJs);
     }
 
     public StyleParams getStyleParams() {

android/app/src/main/java/com/reactnativenavigation/screens/ScreenStack.java

@@ -5,6 +5,7 @@ import android.support.v7.app.AppCompatActivity;
 import android.view.View;
 import android.widget.RelativeLayout;
 
+import com.reactnativenavigation.NavigationApplication;
 import com.reactnativenavigation.params.ScreenParams;
 import com.reactnativenavigation.params.StyleParams;
 import com.reactnativenavigation.params.TitleBarButtonParams;
@@ -201,6 +202,15 @@ public class ScreenStack {
         return stack.peek().getStyleParams();
     }
 
+    public boolean handleBackPressInJs() {
+        ScreenParams currentScreen = stack.peek().screenParams;
+        if (currentScreen.overrideBackPressInJs) {
+            NavigationApplication.instance.sendNavigatorEvent("backPress", currentScreen.navigatorEventId);
+            return true;
+        }
+        return false;
+    }
+
     private void performOnScreen(String screenInstanceId, Task<Screen> task) {
         if (stack.isEmpty()) {
             return;

android/app/src/main/java/com/reactnativenavigation/views/LeftButton.java

@@ -21,15 +21,18 @@ public class LeftButton extends MaterialMenuDrawable implements View.OnClickList
     private TitleBarLeftButtonParams params;
     private final LeftButtonOnClickListener onClickListener;
     private final String navigatorEventId;
+    private final boolean overrideBackPressInJs;
 
     public LeftButton(Context context,
                       TitleBarLeftButtonParams params,
                       LeftButtonOnClickListener onClickListener,
-                      String navigatorEventId) {
+                      String navigatorEventId,
+                      boolean overrideBackPressInJs) {
         super(context, getColor(params), Stroke.THIN);
         this.params = params;
         this.onClickListener = onClickListener;
         this.navigatorEventId = navigatorEventId;
+        this.overrideBackPressInJs = overrideBackPressInJs;
         setInitialState();
     }
 
@@ -44,7 +47,7 @@ public class LeftButton extends MaterialMenuDrawable implements View.OnClickList
     @Override
     public void onClick(View v) {
         if (isBackButton()) {
-            onClickListener.onTitleBarBackButtonClick();
+            handleBackButtonClick();
         } else if (isSideMenuButton()) {
             onClickListener.onSideMenuButtonClick();
         } else {
@@ -52,6 +55,14 @@ public class LeftButton extends MaterialMenuDrawable implements View.OnClickList
         }
     }
 
+    private void handleBackButtonClick() {
+        if (overrideBackPressInJs) {
+            NavigationApplication.instance.sendNavigatorEvent("backPress", navigatorEventId);
+        } else {
+            onClickListener.onTitleBarBackButtonClick();
+        }
+    }
+
     private void setInitialState() {
         if (params != null) {
             setIconState(params.iconState);

android/app/src/main/java/com/reactnativenavigation/views/TitleBar.java

@@ -46,9 +46,9 @@ public class TitleBar extends Toolbar {
     }
 
     public void setLeftButton(TitleBarLeftButtonParams leftButtonParams,
-                              LeftButtonOnClickListener leftButtonOnClickListener, String navigatorEventId) {
+                              LeftButtonOnClickListener leftButtonOnClickListener, String navigatorEventId, boolean overrideBackPressInJs) {
         if (shouldSetLeftButton(leftButtonParams)) {
-            createAndSetLeftButton(leftButtonParams, leftButtonOnClickListener, navigatorEventId);
+            createAndSetLeftButton(leftButtonParams, leftButtonOnClickListener, navigatorEventId, overrideBackPressInJs);
         } else if (hasLeftButton()) {
             updateLeftButton(leftButtonParams);
         }
@@ -101,8 +101,12 @@ public class TitleBar extends Toolbar {
         return leftButton == null && leftButtonParams != null;
     }
 
-    private void createAndSetLeftButton(TitleBarLeftButtonParams leftButtonParams, LeftButtonOnClickListener leftButtonOnClickListener, String navigatorEventId) {
-        leftButton = new LeftButton(getContext(), leftButtonParams, leftButtonOnClickListener, navigatorEventId);
+    private void createAndSetLeftButton(TitleBarLeftButtonParams leftButtonParams,
+                                        LeftButtonOnClickListener leftButtonOnClickListener,
+                                        String navigatorEventId,
+                                        boolean overrideBackPressInJs) {
+        leftButton = new LeftButton(getContext(), leftButtonParams, leftButtonOnClickListener, navigatorEventId,
+                overrideBackPressInJs);
         setNavigationOnClickListener(leftButton);
         setNavigationIcon(leftButton);
     }

android/app/src/main/java/com/reactnativenavigation/views/TopBar.java

@@ -25,11 +25,11 @@ public class TopBar extends AppBarLayout {
     public void addTitleBarAndSetButtons(List<TitleBarButtonParams> rightButtons,
                                          TitleBarLeftButtonParams leftButton,
                                          LeftButtonOnClickListener leftButtonOnClickListener,
-                                         String navigatorEventId) {
+                                         String navigatorEventId, boolean overrideBackPressInJs) {
         titleBar = new TitleBar(getContext());
         addView(titleBar);
         titleBar.setRightButtons(rightButtons, navigatorEventId);
-        titleBar.setLeftButton(leftButton, leftButtonOnClickListener, navigatorEventId);
+        titleBar.setLeftButton(leftButton, leftButtonOnClickListener, navigatorEventId, overrideBackPressInJs);
     }
 
     public void setTitle(String title) {
@@ -55,10 +55,12 @@ public class TopBar extends AppBarLayout {
         return topTabs;
     }
 
-    public void setTitleBarRightButton(String navigatorEventId,
-                                       LeftButtonOnClickListener leftButtonOnClickListener,
-                                       TitleBarLeftButtonParams titleBarLeftButtonParams) {
-        titleBar.setLeftButton(titleBarLeftButtonParams, leftButtonOnClickListener, navigatorEventId);
+    public void setTitleBarLeftButton(String navigatorEventId,
+                                      LeftButtonOnClickListener leftButtonOnClickListener,
+                                      TitleBarLeftButtonParams titleBarLeftButtonParams,
+                                      boolean overrideBackPressInJs) {
+        titleBar.setLeftButton(titleBarLeftButtonParams, leftButtonOnClickListener, navigatorEventId,
+                overrideBackPressInJs);
     }
 
     private void setTopTabsStyle(StyleParams style) {

example-redux/src/app.js

@@ -121,6 +121,7 @@ export default class App {
               icon: require('../img/one.png'),
               selectedIcon: require('../img/one_selected.png'),
               title: 'Screen One',
+              overrideBackPress: true,
               navigatorStyle: {}
             },
             {

example-redux/src/screens/FirstTabScreen.js

@@ -181,6 +181,7 @@ class FirstTabScreen extends Component {
     this.props.navigator.push({
       title: "More",
       screen: "example.PushedScreen",
+      overrideBackPress: true,
       passProps: {
         str: 'This is a prop passed in \'navigator.push()\'!',
         obj: {

example-redux/src/screens/PushedScreen.js

@@ -62,9 +62,26 @@ class PushedScreen extends Component {
       case 'accept':
         Alert.alert('NavBar', 'Accept button pressed');
         break;
+
+      case 'backPress':
+        this.handleBackPress();
+        break;
+
+      default:
+        console.log('PushedScreen', 'Unknown event ' + event.id);
     }
   }
 
+  handleBackPress() {
+    Alert.alert(
+      'Back button press!',
+      'Handling back press in JS',
+      [
+        {text: 'Pop', onPress: () => this.props.navigator.pop()}
+      ]
+    )
+  }
+
   render() {
     return (
       <ScrollView style={{flex: 1, padding: 20, backgroundColor: this.bgColor}}>

package.json

@@ -7,7 +7,7 @@
     "type": "git",
     "url": "https://github.com/wix/react-native-navigation.git"
   },
-  "version": "2.0.0-experimental.52",
+  "version": "2.0.0-experimental.53",
   "description": "React Native Navigation - truly native navigation for iOS and Android",
   "nativePackage": true,
   "bugs": {

src/deprecated/platformSpecificDeprecated.android.js

@@ -28,6 +28,7 @@ function startSingleScreenApp(params) {
   params.screen = adaptNavigationParams(screen);
   params.appStyle = convertStyleParams(params.appStyle);
   params.sideMenu = convertDrawerParamsToSideMenuParams(params.drawer);
+  params.overrideBackPress = screen.overrideBackPress;
 
   newPlatformSpecific.startApp(params);
 }
@@ -50,7 +51,8 @@ function navigatorPush(navigator, params) {
   params.screenId = params.screen;
   let adapted = adaptNavigationStyleToScreenStyle(params);
   adapted = adaptNavigationParams(adapted);
-
+  adapted.overrideBackPress = params.overrideBackPress;
+  
   newPlatformSpecific.push(adapted);
 }
 
@@ -178,6 +180,7 @@ function startTabBasedApp(params) {
 
     let newtab = adaptNavigationStyleToScreenStyle(tab);
     newtab = adaptNavigationParams(tab);
+    newtab.overrideBackPress = tab.overrideBackPress;
     newTabs.push(newtab);
   });
   params.tabs = newTabs;
@@ -282,6 +285,7 @@ function showModal(params) {
   params.screenId = params.screen;
   let adapted = adaptNavigationStyleToScreenStyle(params);
   adapted = adaptNavigationParams(adapted);
+  adapted.overrideBackPress = params.overrideBackPress;
 
   newPlatformSpecific.showModal(adapted);
 }