From 6ff7cce80345a1b28835396d6af75e9e154fd653 Mon Sep 17 00:00:00 2001
From: mhutti1 <mhutti1@gmail.com>
Date: Fri, 10 Feb 2017 21:28:22 +0000
Subject: [PATCH] Fix fullscreen and autohide interaction #454

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

diff --git a/src/org/kiwix/kiwixmobile/KiwixMobileActivity.java b/src/org/kiwix/kiwixmobile/KiwixMobileActivity.java
index e5715102a..088663f23 100644
--- a/src/org/kiwix/kiwixmobile/KiwixMobileActivity.java
+++ b/src/org/kiwix/kiwixmobile/KiwixMobileActivity.java
@@ -802,6 +802,10 @@ public class KiwixMobileActivity extends AppCompatActivity implements WebViewCal
     expandDrawers();
     isFullscreenOpened = true;
     getCurrentWebView().requestLayout();
+    if (isHideToolbar) {
+      toolbarContainer.setTranslationY(0);
+      this.getCurrentWebView().setTranslationY(0);
+    }
   }
 
   private void closeFullScreen() {
@@ -818,6 +822,10 @@ public class KiwixMobileActivity extends AppCompatActivity implements WebViewCal
     shrinkDrawers();
     isFullscreenOpened = false;
     getCurrentWebView().requestLayout();
+    if (isHideToolbar) {
+      toolbarContainer.setTranslationY(DimenUtils.getTranslucentStatusBarHeight(this));
+      this.getCurrentWebView().setTranslationY(DimenUtils.getToolbarAndStatusBarHeight(this));
+    }
   }
 
   public void showHelpPage() {
diff --git a/src/org/kiwix/kiwixmobile/views/web/ToolbarScrollingKiwixWebView.java b/src/org/kiwix/kiwixmobile/views/web/ToolbarScrollingKiwixWebView.java
index d234e8467..dee4f5a28 100644
--- a/src/org/kiwix/kiwixmobile/views/web/ToolbarScrollingKiwixWebView.java
+++ b/src/org/kiwix/kiwixmobile/views/web/ToolbarScrollingKiwixWebView.java
@@ -23,6 +23,7 @@ import android.content.Context;
 import android.view.MotionEvent;
 import android.view.View;
 
+import org.kiwix.kiwixmobile.KiwixMobileActivity;
 import org.kiwix.kiwixmobile.WebViewCallback;
 import org.kiwix.kiwixmobile.utils.DimenUtils;
 
@@ -72,6 +73,10 @@ public class ToolbarScrollingKiwixWebView extends KiwixWebView {
         startY = event.getRawY();
         break;
       case MotionEvent.ACTION_MOVE:
+        // If we are in fullscreen don't scroll bar
+        if (KiwixMobileActivity.isFullscreenOpened) {
+          return super.onTouchEvent(event);
+        }
         // Filter out zooms since we don't want to affect the toolbar when zooming
         if (event.getPointerCount() == 1) {
           int diffY = (int) (event.getRawY() - startY);