Remove finger tracking scroll logic

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

@@ -38,7 +38,10 @@ public class FragmentScreen extends Screen {
     }
 
     private void addContent() {
-        ContentView contentView = new ContentView(getContext(), screenParams.screenId, screenParams.passProps, screenParams.navigationParams, topBar);
+        ContentView contentView = new ContentView(getContext(),
+                screenParams.screenId,
+                screenParams.passProps,
+                screenParams.navigationParams);
         addView(contentView, 0, 0);
         LayoutParams params = new LayoutParams(MATCH_PARENT, MATCH_PARENT);
         if (screenParams.styleParams.drawScreenBelowTopBar) {

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

@@ -9,11 +9,13 @@ import android.util.Log;
 import android.view.Window;
 import android.widget.RelativeLayout;
 
+import com.reactnativenavigation.animation.VisibilityAnimator;
 import com.reactnativenavigation.params.ScreenParams;
 import com.reactnativenavigation.params.StyleParams;
 import com.reactnativenavigation.params.TitleBarButtonParams;
 import com.reactnativenavigation.params.TitleBarLeftButtonParams;
 import com.reactnativenavigation.utils.SdkSupports;
+import com.reactnativenavigation.utils.ViewUtils;
 import com.reactnativenavigation.views.TitleBarBackButtonListener;
 import com.reactnativenavigation.views.TopBar;
 
@@ -28,6 +30,7 @@ public abstract class Screen extends RelativeLayout {
     protected final ScreenParams screenParams;
     protected TopBar topBar;
     private final TitleBarBackButtonListener titleBarBackButtonListener;
+    private VisibilityAnimator topBarVisibilityAnimator;
 
     public Screen(AppCompatActivity activity, ScreenParams screenParams, TitleBarBackButtonListener titleBarBackButtonListener) {
         super(activity);
@@ -63,9 +66,23 @@ public abstract class Screen extends RelativeLayout {
 
     private void createTopBar() {
         topBar = new TopBar(getContext());
+        createTopBarVisibilityAnimator();
         addView(topBar, new LayoutParams(MATCH_PARENT, WRAP_CONTENT));
     }
 
+    private void createTopBarVisibilityAnimator() {
+        ViewUtils.runOnPreDraw(topBar, new Runnable() {
+            @Override
+            public void run() {
+                if (topBarVisibilityAnimator == null) {
+                    topBarVisibilityAnimator = new VisibilityAnimator(topBar,
+                            VisibilityAnimator.HideDirection.Up,
+                            topBar.getHeight());
+                }
+            }
+        });
+    }
+
     private void setStyle(StyleParams styleParams) {
         setStatusBarColor(styleParams.statusBarColor);
         setNavigationBarColor(styleParams.navigationBarColor);
@@ -125,7 +142,7 @@ public abstract class Screen extends RelativeLayout {
     }
 
     public void setTopBarVisible(boolean visible, boolean animate) {
-        //        topBarVisibilityAnimator.setVisible(visible, animate); TODO
+        topBarVisibilityAnimator.setVisible(visible, animate);
     }
 
     public void setTitleBarTitle(String title) {

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

@@ -19,7 +19,10 @@ public class SingleScreen extends Screen {
 
     @Override
     protected void createContent() {
-        contentView = new ContentView(getContext(), screenParams.screenId, screenParams.passProps, screenParams.navigationParams, topBar);
+        contentView = new ContentView(getContext(),
+                screenParams.screenId,
+                screenParams.passProps,
+                screenParams.navigationParams);
         LayoutParams params = new LayoutParams(MATCH_PARENT, MATCH_PARENT);
         if (screenParams.styleParams.drawScreenBelowTopBar) {
             params.addRule(BELOW, topBar.getId());

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

@@ -21,7 +21,6 @@ public class ViewPagerScreen extends Screen {
 
     private List<ContentView> contentViews;
     private ViewPager viewPager;
-    private ContentViewPagerAdapter adapter;
 
     public ViewPagerScreen(AppCompatActivity activity, ScreenParams screenParams, TitleBarBackButtonListener backButtonListener) {
         super(activity, screenParams, backButtonListener);
@@ -39,12 +38,13 @@ public class ViewPagerScreen extends Screen {
             ContentView contentView = new ContentView(getContext(),
                     topTabParam.screenId,
                     screenParams.passProps,
-                    screenParams.navigationParams, topBar);
+                    screenParams.navigationParams);
             addContent(contentView);
             contentViews.add(contentView);
         }
 
-        adapter = new ContentViewPagerAdapter(viewPager, contentViews, screenParams.topTabParams);
+        ContentViewPagerAdapter adapter =
+                new ContentViewPagerAdapter(viewPager, contentViews, screenParams.topTabParams);
         viewPager.setAdapter(adapter);
         tabLayout.setupWithViewPager(viewPager);
     }

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

@@ -2,8 +2,6 @@ package com.reactnativenavigation.views;
 
 import android.content.Context;
 import android.os.Bundle;
-import android.view.View;
-import android.widget.ScrollView;
 
 import com.facebook.react.ReactInstanceManager;
 import com.facebook.react.ReactRootView;
@@ -15,57 +13,13 @@ public class ContentView extends ReactRootView {
     private final String screenId;
     private final Bundle passProps;
     private Bundle navigationParams;
-    private ScrollViewDelegate scrollViewDelegate = new ScrollViewDelegate();
 
-    public ContentView(Context context, final String screenId, Bundle passProps, Bundle navigationParams, final TopBar topBar) {
+    public ContentView(Context context, final String screenId, Bundle passProps, Bundle navigationParams) {
         super(context);
         this.screenId = screenId;
         this.passProps = passProps;
         this.navigationParams = navigationParams;
         attachToJS();
-
-        scrollViewDelegate.setListener(new ScrollViewDelegate.OnScrollListener() {
-
-            private ScrollDirection scrollDirectionComputer;
-
-
-            @Override
-            public void onScroll(ScrollView scrollView) {
-                /**
-                 * do our magic
-                 */
-                if (scrollDirectionComputer == null) {
-                    scrollDirectionComputer = new ScrollDirection(scrollView);
-                }
-
-                int currentTopBarTranslation = (int) topBar.getTranslationY();
-                int delta = scrollDirectionComputer.getScrollDelta();
-
-                int minTranslation = -topBar.getTitleBar().getHeight();
-                int maxTranslation = 0;
-
-                ScrollDirection.Direction direction = scrollDirectionComputer.getScrollDirection();
-
-                boolean reachedMinimum = direction == ScrollDirection.Direction.Up && currentTopBarTranslation <= minTranslation;
-                boolean reachedMaximum = direction == ScrollDirection.Direction.Down && currentTopBarTranslation >= maxTranslation;
-
-                if (direction == ScrollDirection.Direction.None || reachedMinimum || reachedMaximum) {
-                    if (reachedMinimum) {
-                        topBar.animate().translationY(minTranslation);
-                    }
-                    if (reachedMaximum) {
-                        topBar.animate().translationY(maxTranslation);
-                    }
-                } else {
-
-                    int target = currentTopBarTranslation - delta;
-                    int bound = Math.min(Math.max(minTranslation, target), maxTranslation);
-
-                    topBar.setTranslationY(bound);
-                }
-
-            }
-        });
     }
 
     private void attachToJS() {
@@ -73,12 +27,6 @@ public class ContentView extends ReactRootView {
         startReactApplication(react, screenId, mergePropsAndNavigationParams());
     }
 
-    @Override
-    public void onViewAdded(View child) {
-        super.onViewAdded(child);
-        scrollViewDelegate.onViewAdded(child);
-    }
-
     private Bundle mergePropsAndNavigationParams() {
         if (passProps != null) {
             navigationParams.putAll(passProps);

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

@@ -1,50 +0,0 @@
-package com.reactnativenavigation.views;
-
-import android.widget.ScrollView;
-
-public class ScrollDirection {
-
-    public enum Direction {
-        Up, Down, None
-    }
-
-    private final ScrollView scrollView;
-    private int lastScrollY = 0;
-
-    public ScrollDirection(ScrollView scrollView) {
-        this.scrollView = scrollView;
-    }
-
-    public Direction getScrollDirection() {
-        Direction direction = Direction.None;
-
-        final int scrollY = scrollView.getScrollY();
-        if (isScrollPositionChanged(scrollY) && !isTopOverscroll(scrollY) && !isBottomOverscroll(scrollY)) {
-            direction = getScrollDirection(scrollY);
-            lastScrollY = scrollY;
-        }
-        return direction;
-    }
-
-    public int getScrollDelta() {
-        return scrollView.getScrollY() - lastScrollY;
-    }
-
-
-    private Direction getScrollDirection(int scrollY) {
-        return scrollY > lastScrollY ? Direction.Up : Direction.Down;
-    }
-
-    private boolean isBottomOverscroll(int scrollY) {
-        return scrollY >= (scrollView.getChildAt(0).getHeight() - scrollView.getHeight());
-    }
-
-    private boolean isTopOverscroll(int scrollY) {
-        return scrollY <= 0;
-    }
-
-    private boolean isScrollPositionChanged(int scrollY) {
-        return scrollY != lastScrollY;
-    }
-
-}