From 9d8a8dc404c9dfaed1d74ed1e0abad7aba418314 Mon Sep 17 00:00:00 2001
From: mhutti1 <mhutti1@gmail.com>
Date: Wed, 9 Aug 2017 15:21:00 -0400
Subject: [PATCH] Bottom bar scrolls out of view when in scroll mode

---
 .../main/java/org/kiwix/kiwixmobile/KiwixMobileActivity.java | 2 +-
 .../kiwixmobile/views/web/ToolbarScrollingKiwixWebView.java  | 5 ++++-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/app/src/main/java/org/kiwix/kiwixmobile/KiwixMobileActivity.java b/app/src/main/java/org/kiwix/kiwixmobile/KiwixMobileActivity.java
index 5c5d0556f..b4fd07582 100644
--- a/app/src/main/java/org/kiwix/kiwixmobile/KiwixMobileActivity.java
+++ b/app/src/main/java/org/kiwix/kiwixmobile/KiwixMobileActivity.java
@@ -668,7 +668,7 @@ public class KiwixMobileActivity extends BaseActivity implements WebViewCallback
     AttributeSet attrs = StyleUtils.getAttributes(this, R.xml.webview);
     KiwixWebView webView;
     if (isHideToolbar) {
-      webView = new ToolbarScrollingKiwixWebView(KiwixMobileActivity.this, this, toolbarContainer, attrs);
+      webView = new ToolbarScrollingKiwixWebView(KiwixMobileActivity.this, this, toolbarContainer, pageBottomTabLayout , attrs);
       ((ToolbarScrollingKiwixWebView) webView).setOnToolbarVisibilityChangeListener(
           new ToolbarScrollingKiwixWebView.OnToolbarVisibilityChangeListener() {
             @Override
diff --git a/app/src/main/java/org/kiwix/kiwixmobile/views/web/ToolbarScrollingKiwixWebView.java b/app/src/main/java/org/kiwix/kiwixmobile/views/web/ToolbarScrollingKiwixWebView.java
index ef8e97b11..e4b427006 100644
--- a/app/src/main/java/org/kiwix/kiwixmobile/views/web/ToolbarScrollingKiwixWebView.java
+++ b/app/src/main/java/org/kiwix/kiwixmobile/views/web/ToolbarScrollingKiwixWebView.java
@@ -33,12 +33,14 @@ public class ToolbarScrollingKiwixWebView extends KiwixWebView {
   private final int statusBarHeight = DimenUtils.getTranslucentStatusBarHeight(getContext());
   private final int toolbarHeight = DimenUtils.getToolbarHeight(getContext());
   private View toolbarView;
+  private View bottombarView;
   private OnToolbarVisibilityChangeListener listener;
   private float startY;
 
-  public ToolbarScrollingKiwixWebView(Context context, WebViewCallback callback, View toolbarView, AttributeSet attrs) {
+  public ToolbarScrollingKiwixWebView(Context context, WebViewCallback callback, View toolbarView, View bottombarView, AttributeSet attrs) {
     super(context, callback, attrs);
     this.toolbarView = toolbarView;
+    this.bottombarView = bottombarView;
   }
 
   protected boolean moveToolbar(int scrollDelta) {
@@ -53,6 +55,7 @@ public class ToolbarScrollingKiwixWebView extends KiwixWebView {
     }
 
     toolbarView.setTranslationY(newTranslation + statusBarHeight);
+    bottombarView.setTranslationY(newTranslation * -1 * (bottombarView.getHeight() / (float) (statusBarHeight + toolbarHeight)));
     this.setTranslationY(newTranslation + toolbarHeight + statusBarHeight);
     if (listener != null && newTranslation != originalTranslation) {
       if (newTranslation == -toolbarHeight -statusBarHeight) {