Toggle tabs

android/app/src/main/java/com/reactnativenavigation/activities/BottomTabActivity.java

@@ -5,7 +5,6 @@ import android.graphics.drawable.Drawable;
 import android.os.AsyncTask;
 import android.os.Bundle;
 import android.support.design.widget.CoordinatorLayout;
-import android.view.View;
 
 import com.aurelhubert.ahbottomnavigation.AHBottomNavigation;
 import com.aurelhubert.ahbottomnavigation.AHBottomNavigationItem;
@@ -115,7 +114,7 @@ public class BottomTabActivity extends BaseReactActivity implements AHBottomNavi
         StyleHelper.updateStyles(mToolbar, getCurrentScreen());
 
         if (shouldToggleTabs(screen)) {
-            toggleTabs(screen.bottomTabsHidden, false);
+            mBottomNavigation.toggleTabs(screen.bottomTabsHidden, false);
         }
     }
 
@@ -129,7 +128,7 @@ public class BottomTabActivity extends BaseReactActivity implements AHBottomNavi
                 StyleHelper.updateStyles(mToolbar, currentScreen);
 
                 if (shouldToggleTabs(currentScreen)) {
-                    toggleTabs(currentScreen.bottomTabsHidden, false);
+                    mBottomNavigation.toggleTabs(currentScreen.bottomTabsHidden, false);
                 }
 
                 return popped;
@@ -148,7 +147,7 @@ public class BottomTabActivity extends BaseReactActivity implements AHBottomNavi
                 StyleHelper.updateStyles(mToolbar, currentScreen);
 
                 if (shouldToggleTabs(currentScreen)) {
-                    toggleTabs(currentScreen.bottomTabsHidden, false);
+                    mBottomNavigation.toggleTabs(currentScreen.bottomTabsHidden, false);
                 }
 
                 return popped;
@@ -236,24 +235,17 @@ public class BottomTabActivity extends BaseReactActivity implements AHBottomNavi
     public void toggleTabs(ReadableMap params) {
         boolean hide = params.getBoolean(KEY_HIDDEN);
         boolean animated = params.getBoolean(KEY_ANIMATED);
-        toggleTabs(hide, animated);
-    }
-
-    // TODO: support animated = false -guyca
-    private void toggleTabs(boolean hide, boolean animated) {
-        if (hide) {
-//            mBottomNavigation.hideBottomNavigation(animated);
-            mBottomNavigation.setVisibility(View.GONE);
-        } else {
-            mBottomNavigation.setVisibility(View.VISIBLE);
-//            mBottomNavigation.restoreBottomNavigation(animated);
-        }
+        mBottomNavigation.toggleTabs(hide, animated);
     }
 
     private boolean shouldToggleTabs(Screen newScreen) {
         return mBottomNavigation.isShown() == newScreen.bottomTabsHidden;
     }
 
+    public void notifyScroll(int direction) {
+        mBottomNavigation.onScroll(direction);
+    }
+
     private static class SetupTabsTask extends AsyncTask<Void, Void, Map<Screen, Drawable>> {
         private BottomTabActivity mActivity;
         private RnnToolBar mToolBar;
@@ -308,7 +300,6 @@ public class BottomTabActivity extends BaseReactActivity implements AHBottomNavi
         this.onTabSelected(0, false);
     }
 
-
     @Override
     protected void removeAllReactViews() {
         for (ScreenStack screenStack : mScreenStacks) {

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

@@ -2,6 +2,7 @@ package com.reactnativenavigation.views;
 
 import android.content.Context;
 import android.util.AttributeSet;
+import android.view.View;
 
 import com.aurelhubert.ahbottomnavigation.AHBottomNavigation;
 
@@ -10,6 +11,9 @@ import com.aurelhubert.ahbottomnavigation.AHBottomNavigation;
  */
 public class BottomNavigation extends AHBottomNavigation {
 
+    public static final int SCROLL_DIRECTION_UP = 0;
+    public static final int SCROLL_DIRECTION_DOWN = 1;
+
     public BottomNavigation(Context context) {
         super(context);
     }
@@ -22,12 +26,30 @@ public class BottomNavigation extends AHBottomNavigation {
         super(context, attrs, defStyleAttr);
     }
 
-    /**
-     * Synchronize the BottomNavigation with a {@link android.widget.ScrollView}. When
-     */
-    public void setupWithScrollView() {
+    // TODO: support animated = false -guyca
+    public void toggleTabs(boolean hide, boolean animated) {
+        if (hide) {
+            hide();
+        } else {
+            show();
+        }
+    }
 
+    private void hide() {
+        // mBottomNavigation.hideBottomNavigation(animated);
+        setVisibility(View.GONE);
     }
 
+    private void show() {
+        setVisibility(View.VISIBLE);
+        // mBottomNavigation.restoreBottomNavigation(animated);
+    }
 
+    public void onScroll(int direction) {
+        if (direction == SCROLL_DIRECTION_DOWN) {
+            hideBottomNavigation(true);
+        } else if (direction == SCROLL_DIRECTION_UP) {
+            restoreBottomNavigation(true);
+        }
+    }
 }

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

@@ -11,6 +11,7 @@ import android.widget.ScrollView;
 import com.facebook.react.ReactInstanceManager;
 import com.facebook.react.ReactRootView;
 import com.reactnativenavigation.activities.BaseReactActivity;
+import com.reactnativenavigation.activities.BottomTabActivity;
 import com.reactnativenavigation.core.objects.Screen;
 import com.reactnativenavigation.utils.BridgeUtils;
 import com.reactnativenavigation.utils.ReflectionUtils;
@@ -20,13 +21,24 @@ import com.reactnativenavigation.utils.ReflectionUtils;
  */
 public class RctView extends FrameLayout {
     private static final String TAG = "RctView";
+
+    private BottomTabActivity mContext;
     private ReactRootView mReactRootView;
     private ScrollView mScrollView;
+    private int mLastScrollY = -1;
     private final ViewTreeObserver.OnScrollChangedListener mScrollChangedListener = new ViewTreeObserver.OnScrollChangedListener() {
         @Override
         public void onScrollChanged() {
             if (mScrollView.getViewTreeObserver().isAlive()) {
-                Log.i(TAG, "onScrollChanged: " + mScrollView.getScrollY());
+                if (mScrollView.getScrollY() != mLastScrollY) {
+                    int currentScrollY = mScrollView.getScrollY();
+                    mContext.notifyScroll(currentScrollY > mLastScrollY ?
+                            BottomNavigation.SCROLL_DIRECTION_DOWN :
+                            BottomNavigation.SCROLL_DIRECTION_UP);
+
+                    mLastScrollY = currentScrollY;
+                }
+                Log.i(TAG, "onScrollChanged: " + mLastScrollY);
             }
         }
     };
@@ -119,6 +131,7 @@ public class RctView extends FrameLayout {
     private void setupScrollViewWithBottomTabs() {
         mScrollView = getScrollView((ViewGroup) getParent());
         if (mScrollView != null) {
+            mContext = (BottomTabActivity) getContext();
             attachStateChangeListener(mScrollView);
             addScrollListener();
         }