Merge branch 'master' into v2

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

@@ -8,9 +8,9 @@ import com.reactnativenavigation.views.CollapsingContentView;
 import com.reactnativenavigation.views.LeftButtonOnClickListener;
 import com.reactnativenavigation.views.collapsingToolbar.CollapseAmount;
 import com.reactnativenavigation.views.collapsingToolbar.CollapseCalculator;
-import com.reactnativenavigation.views.collapsingToolbar.CollapsingViewMeasurer;
 import com.reactnativenavigation.views.collapsingToolbar.CollapsingTopBar;
 import com.reactnativenavigation.views.collapsingToolbar.CollapsingView;
+import com.reactnativenavigation.views.collapsingToolbar.CollapsingViewMeasurer;
 import com.reactnativenavigation.views.collapsingToolbar.OnScrollListener;
 import com.reactnativenavigation.views.collapsingToolbar.OnScrollViewAddedListener;
 import com.reactnativenavigation.views.collapsingToolbar.ScrollListener;
@@ -59,7 +59,7 @@ public class CollapsingSingleScreen extends SingleScreen {
                 new OnScrollListener() {
                     @Override
                     public void onScroll(CollapseAmount amount) {
-                        if (!screenParams.styleParams.titleBarHideOnScroll) {
+                        if (screenParams.styleParams.drawScreenBelowTopBar) {
                             ((CollapsingView) contentView).collapse(amount);
                         }
                         topBar.collapse(amount);

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

@@ -83,6 +83,7 @@ public class SideMenu extends DrawerLayout {
         leftSideMenuView = createSideMenu(leftMenuParams);
         rightSideMenuView = createSideMenu(rightMenuParams);
         setStyle(leftMenuParams);
+        setStyle(rightMenuParams);
     }
 
     private void createContentContainer() {
@@ -117,7 +118,7 @@ public class SideMenu extends DrawerLayout {
 
     private void setStyle(SideMenuParams params) {
         if (params.disableOpenGesture) {
-            setDrawerLockMode(DrawerLayout.LOCK_MODE_LOCKED_CLOSED);
+            setDrawerLockMode(DrawerLayout.LOCK_MODE_LOCKED_CLOSED, params.side.gravity);
         }
     }
 }

android/app/src/main/java/com/reactnativenavigation/views/collapsingToolbar/CollapseCalculator.java

@@ -4,6 +4,7 @@ import android.support.annotation.NonNull;
 import android.support.annotation.Nullable;
 import android.view.GestureDetector;
 import android.view.MotionEvent;
+import android.view.ViewConfiguration;
 import android.widget.ScrollView;
 
 import com.reactnativenavigation.NavigationApplication;
@@ -31,10 +32,12 @@ public class CollapseCalculator {
     private OnFlingListener flingListener;
     private int scrollY = 0;
     private int totalCollapse = 0;
+    private final int scaledTouchSlop;
 
     public CollapseCalculator(final CollapsingView collapsingView, CollapseBehaviour collapseBehaviour) {
         this.view = collapsingView;
         this.collapseBehaviour = collapseBehaviour;
+        scaledTouchSlop = ViewConfiguration.get(NavigationApplication.instance).getScaledTouchSlop();
         setFlingDetector();
     }
 
@@ -188,7 +191,7 @@ public class CollapseCalculator {
         totalCollapse += collapse;
         previousCollapseY = y;
         previousTouchEvent = MotionEvent.obtain(event);
-        return new CollapseAmount(collapse);
+        return Math.abs(totalCollapse) < scaledTouchSlop ? CollapseAmount.None : new CollapseAmount(collapse);
     }
 
     private float calculateCollapse(float y) {

src/deprecated/platformSpecificDeprecated.android.js

@@ -172,24 +172,23 @@ function convertStyleParams(originalStyleObject) {
 
 function convertDrawerParamsToSideMenuParams(drawerParams) {
   const drawer = Object.assign({}, drawerParams);
-  if (!drawer.left || !drawer.left.screen) {
-    return null;
-  }
 
   let result = {
     left: {},
     right: {}
   };
-  result.disableOpenGesture = drawer.disableOpenGesture !== undefined;
-  result.left.screenId = drawer.left.screen;
-  addNavigatorParams(result.left);
-  result.left = adaptNavigationParams(result.left);
-  result.left.passProps = drawer.left.passProps;
-
-  result.right.screenId = drawer.right.screen;
-  addNavigatorParams(result.right);
-  result.right = adaptNavigationParams(result.right);
-  result.right.passProps = drawer.right.passProps;
+
+  Object.keys(result).forEach((key) => {
+    if (drawer[key] && drawer[key].screen) {
+      result[key].screenId = drawer[key].screen;
+      addNavigatorParams(result[key]);
+      result[key] = adaptNavigationParams(result[key]);
+      result[key].passProps = drawer[key].passProps;
+      result[key].disableOpenGesture = drawer.disableOpenGesture;
+    } else {
+      result[key] = null;
+    }
+  })
 
   return result;
 }