mirror of
https://github.com/kiwix/kiwix-android.git
synced 2025-09-22 12:03:09 -04:00
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:
commit
4f5e2f1f33
@ -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) {
|
||||
|
Loading…
x
Reference in New Issue
Block a user