kiwix/kiwix-android
1
0
Fork 0
mirror of https://github.com/kiwix/kiwix-android.git synced 2025-09-22 20:24:03 -04:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
#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
1 changed files with 8 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
app/src/main/java/org/kiwix/kiwixmobile/main/MainActivity.java
View File

@ -1650,27 +1650,19 @@ public class MainActivity extends BaseActivity implements WebViewCallback,
toggleActionItemsConfig(); toggleActionItemsConfig();
this.menu = menu; 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) { if (tabSwitcherRoot.getVisibility() == View.VISIBLE) {
menu.findItem(R.id.menu_search).setVisible(false); menu.findItem(R.id.menu_search).setVisible(false);
menu.findItem(R.id.menu_fullscreen).setVisible(false); menu.findItem(R.id.menu_fullscreen).setVisible(false);
menu.findItem(R.id.menu_random_article).setVisible(false); menu.findItem(R.id.menu_random_article).setVisible(false);
menu.findItem(R.id.menu_read_aloud).setVisible(false); menu.findItem(R.id.menu_read_aloud).setVisible(false);
} else { } else {
menu.findItem(R.id.menu_search).setVisible(true);
menu.findItem(R.id.menu_fullscreen).setVisible(true); menu.findItem(R.id.menu_fullscreen).setVisible(true);
if (getCurrentWebView().getUrl() == null || if (urlIsHomeOrNull()) {
getCurrentWebView().getUrl().equals(HOME_URL)) { menu.findItem(R.id.menu_search).setVisible(false);
menu.findItem(R.id.menu_read_aloud).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_random_article).setVisible(false);
menu.findItem(R.id.menu_host_books).setVisible(true);
} else { } else {
menu.findItem(R.id.menu_search).setVisible(true);
menu.findItem(R.id.menu_read_aloud).setVisible(true); menu.findItem(R.id.menu_read_aloud).setVisible(true);
menu.findItem(R.id.menu_random_article).setVisible(true); menu.findItem(R.id.menu_random_article).setVisible(true);
} }
@ -1678,6 +1670,11 @@ public class MainActivity extends BaseActivity implements WebViewCallback,
return true; return true;
} }
private boolean urlIsHomeOrNull() {
return getCurrentWebView().getUrl() == null ||
getCurrentWebView().getUrl().equals(HOME_URL);
}
private void updateTabSwitcherIcon() { private void updateTabSwitcherIcon() {
if (tabSwitcherIcon != null) { if (tabSwitcherIcon != null) {
if (webViewList.size() < 100) { if (webViewList.size() < 100) {