Merge pull request #1461 from kiwix/feature/macgills/#1419-hide-search

#1419 hide search icon when no zim is present
This commit is contained in:
Abdul Wadood 2019-09-14 00:58:06 +05:30 committed by GitHub
commit 4f5e2f1f33
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -1650,27 +1650,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);
}
@ -1678,6 +1670,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) {