From 28e221b0a374d3fd38b06ad6372074c03b2c9fed Mon Sep 17 00:00:00 2001
From: HissPirat <franslukas@gmail.com>
Date: Tue, 14 Jul 2020 15:20:19 +0200
Subject: [PATCH 1/2] #2179 bottom toolbar is no longer hidden when a tab is
 restored

---
 .../java/org/kiwix/kiwixmobile/core/main/CoreReaderFragment.java | 1 +
 1 file changed, 1 insertion(+)

diff --git a/core/src/main/java/org/kiwix/kiwixmobile/core/main/CoreReaderFragment.java b/core/src/main/java/org/kiwix/kiwixmobile/core/main/CoreReaderFragment.java
index f0859e5c2..2d8d178fe 100644
--- a/core/src/main/java/org/kiwix/kiwixmobile/core/main/CoreReaderFragment.java
+++ b/core/src/main/java/org/kiwix/kiwixmobile/core/main/CoreReaderFragment.java
@@ -912,6 +912,7 @@ public abstract class CoreReaderFragment extends BaseFragment
 
     Snackbar.make(snackbarRoot, "Tab restored", Snackbar.LENGTH_SHORT).show();
     setUpWebViewWithTextToSpeech();
+    updateBottomToolbarVisibility();
     contentFrame.addView(tempWebViewForUndo);
   }
 

From e75127f768132bb445362ee83ef09bc7f11841db Mon Sep 17 00:00:00 2001
From: HissPirat <franslukas@gmail.com>
Date: Tue, 14 Jul 2020 15:22:26 +0200
Subject: [PATCH 2/2] #2179 custom reader fragment now inits correctly

---
 .../custom/main/CustomReaderFragment.kt           | 15 +++------------
 1 file changed, 3 insertions(+), 12 deletions(-)

diff --git a/custom/src/main/java/org/kiwix/kiwixmobile/custom/main/CustomReaderFragment.kt b/custom/src/main/java/org/kiwix/kiwixmobile/custom/main/CustomReaderFragment.kt
index 84f177bbe..9b1e13902 100644
--- a/custom/src/main/java/org/kiwix/kiwixmobile/custom/main/CustomReaderFragment.kt
+++ b/custom/src/main/java/org/kiwix/kiwixmobile/custom/main/CustomReaderFragment.kt
@@ -29,11 +29,8 @@ import android.os.Build
 import android.os.Bundle
 import android.provider.Settings
 import android.util.Log
-import android.view.LayoutInflater
 import android.view.Menu
 import android.view.MenuInflater
-import android.view.View
-import android.view.ViewGroup
 import android.widget.ImageView
 import androidx.appcompat.app.AppCompatActivity
 import androidx.core.app.ActivityCompat
@@ -69,15 +66,10 @@ class CustomReaderFragment : CoreReaderFragment() {
   @Inject lateinit var sharedPreferenceUtil: SharedPreferenceUtil
   @Inject lateinit var dialogShower: DialogShower
 
-  override fun onCreateView(
-    inflater: LayoutInflater,
-    container: ViewGroup?,
-    savedInstanceState: Bundle?
-  ): View? {
-    val view = super.onCreateView(inflater, container, savedInstanceState)
-
+  override fun onActivityCreated(savedInstanceState: Bundle?) {
+    super.onActivityCreated(savedInstanceState)
     if (enforcedLanguage()) {
-      return view
+      return
     }
     openObbOrZim()
     setDrawerLockMode(DrawerLayout.LOCK_MODE_UNLOCKED)
@@ -85,7 +77,6 @@ class CustomReaderFragment : CoreReaderFragment() {
       val toolbarToc = activity?.findViewById<ImageView>(R.id.bottom_toolbar_toc)
       toolbarToc?.isEnabled = false
     }
-    return view
   }
 
   override fun setDrawerLockMode(lockMode: Int) {