make makeSearchMenuVisible() more logical, invalidate menu when leaving search

This commit is contained in:
B. Petersen
2020-07-23 14:46:28 +02:00
parent 95da8c4b9a
commit 4fa91c6624
3 changed files with 13 additions and 10 deletions
@@ -159,16 +159,18 @@ public abstract class BaseActionBarActivity extends AppCompatActivity {
}
}
public void makeSearchMenuVisible(final Menu menu, final MenuItem exception, boolean visible) {
public void makeSearchMenuVisible(final Menu menu, final MenuItem searchItem, boolean visible) {
for (int i = 0; i < menu.size(); ++i) {
MenuItem item = menu.getItem(i);
int id = item.getItemId();
if (id==R.id.menu_search_up || id==R.id.menu_search_down) {
item.setVisible(!visible);
} else if (id==R.id.menu_search_counter) {
item.setVisible(false);
} else if (item != exception) {
if (id == R.id.menu_search_up || id == R.id.menu_search_down) {
item.setVisible(visible);
} else if (id == R.id.menu_search_counter) {
item.setVisible(false); // always hide menu_search_counter initially
} else if (item == searchItem) {
; // searchItem is just always visible
} else {
item.setVisible(!visible); // if search is shown, other items are hidden - and the other way round
}
}
}
@@ -1505,14 +1505,15 @@ public class ConversationActivity extends PassphraseRequiredActionBarActivity
beforeSearchAttachVisibility = attachmentManager.getVisibility();
attachmentManager.setVisibility(View.GONE);
ConversationActivity.this.makeSearchMenuVisible(menu, searchItem, false);
ConversationActivity.this.makeSearchMenuVisible(menu, searchItem, true);
}
private void searchCollapse(final Menu menu, final MenuItem searchItem) {
composePanel.setVisibility(beforeSearchComposeVisibility);
attachmentManager.setVisibility(beforeSearchAttachVisibility);
ConversationActivity.this.makeSearchMenuVisible(menu, searchItem, true);
ConversationActivity.this.makeSearchMenuVisible(menu, searchItem, false);
invalidateOptionsMenu();
}
private void handleMenuSearchNext(boolean searchNext) {
@@ -117,13 +117,13 @@ public class LocalHelpActivity extends PassphraseRequiredActionBarActivity
public boolean onMenuItemActionExpand(final MenuItem item) {
searchMenu = menu;
LocalHelpActivity.this.lastQuery = "";
LocalHelpActivity.this.makeSearchMenuVisible(menu, searchItem, false);
LocalHelpActivity.this.makeSearchMenuVisible(menu, searchItem, true);
return true;
}
@Override
public boolean onMenuItemActionCollapse(final MenuItem item) {
LocalHelpActivity.this.makeSearchMenuVisible(menu, searchItem, true);
LocalHelpActivity.this.makeSearchMenuVisible(menu, searchItem, false);
return true;
}
});