From e5ee03288af554a4950f6ba61c1aba279f1199a7 Mon Sep 17 00:00:00 2001 From: Sean Mac Gillicuddy Date: Wed, 11 Sep 2019 11:24:16 +0100 Subject: [PATCH] #1419 hide search icon when no zim is present --- .../kiwix/kiwixmobile/main/MainActivity.java | 19 ++++++++----------- 1 file changed, 8 insertions(+), 11 deletions(-) diff --git a/app/src/main/java/org/kiwix/kiwixmobile/main/MainActivity.java b/app/src/main/java/org/kiwix/kiwixmobile/main/MainActivity.java index f44f3bf37..e2a5e8023 100644 --- a/app/src/main/java/org/kiwix/kiwixmobile/main/MainActivity.java +++ b/app/src/main/java/org/kiwix/kiwixmobile/main/MainActivity.java @@ -1660,27 +1660,19 @@ public class MainActivity extends BaseActivity implements WebViewCallback, toggleActionItemsConfig(); this.menu = menu; - if (getCurrentWebView().getUrl() == null || - getCurrentWebView().getUrl().equals(HOME_URL)) { - menu.findItem(R.id.menu_read_aloud).setVisible(false); - } else { - menu.findItem(R.id.menu_read_aloud).setVisible(true); - } - if (tabSwitcherRoot.getVisibility() == View.VISIBLE) { menu.findItem(R.id.menu_search).setVisible(false); menu.findItem(R.id.menu_fullscreen).setVisible(false); menu.findItem(R.id.menu_random_article).setVisible(false); menu.findItem(R.id.menu_read_aloud).setVisible(false); } else { - menu.findItem(R.id.menu_search).setVisible(true); menu.findItem(R.id.menu_fullscreen).setVisible(true); - if (getCurrentWebView().getUrl() == null || - getCurrentWebView().getUrl().equals(HOME_URL)) { + if (urlIsHomeOrNull()) { + menu.findItem(R.id.menu_search).setVisible(false); menu.findItem(R.id.menu_read_aloud).setVisible(false); menu.findItem(R.id.menu_random_article).setVisible(false); - menu.findItem(R.id.menu_host_books).setVisible(true); } else { + menu.findItem(R.id.menu_search).setVisible(true); menu.findItem(R.id.menu_read_aloud).setVisible(true); menu.findItem(R.id.menu_random_article).setVisible(true); } @@ -1688,6 +1680,11 @@ public class MainActivity extends BaseActivity implements WebViewCallback, return true; } + private boolean urlIsHomeOrNull() { + return getCurrentWebView().getUrl() == null || + getCurrentWebView().getUrl().equals(HOME_URL); + } + private void updateTabSwitcherIcon() { if (tabSwitcherIcon != null) { if (webViewList.size() < 100) {