mirror of
https://github.com/ArcaneChat/android.git
synced 2026-07-03 14:05:24 +02:00
make makeSearchMenuVisible() more logical, invalidate menu when leaving search
This commit is contained in:
@@ -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;
|
||||
}
|
||||
});
|
||||
|
||||
Reference in New Issue
Block a user