yetangitu/deltachat
1
0
Fork 0
mirror of https://github.com/deltachat/deltachat-android.git synced 2025-10-05 10:39:24 +02:00
Code Issues Releases Wiki Activity

hide input field and attachment draft when opening in-chat search

Browse source
This commit is contained in:
B. Petersen 2020-04-04 20:23:48 +02:00
parent e60345d817
commit 4af6fea84d
No known key found for this signature in database
GPG key ID: 3B88E92DEA8E9AFC
2 changed files with 36 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

24
src/org/thoughtcrime/securesms/ConversationActivity.java
View file

@ -461,13 +461,13 @@ public class ConversationActivity extends PassphraseRequiredActionBarActivity
searchItem.setOnActionExpandListener(new MenuItem.OnActionExpandListener() { searchItem.setOnActionExpandListener(new MenuItem.OnActionExpandListener() {
@Override @Override
public boolean onMenuItemActionExpand(final MenuItem item) { public boolean onMenuItemActionExpand(final MenuItem item) {
ConversationActivity.this.makeSearchMenuVisible(menu, searchItem, false); searchExpand(menu, item);
return true; return true;
} }
@Override @Override
public boolean onMenuItemActionCollapse(final MenuItem item) { public boolean onMenuItemActionCollapse(final MenuItem item) {
ConversationActivity.this.makeSearchMenuVisible(menu, searchItem, true); searchCollapse(menu, item);
return true; return true;
} }
}); });
@ -1534,6 +1534,26 @@ public class ConversationActivity extends PassphraseRequiredActionBarActivity
// in-chat search // in-chat search
int beforeSearchComposeVisibility = View.VISIBLE;
int beforeSearchAttachVisibility = View.GONE;
private void searchExpand(final Menu menu, final MenuItem searchItem) {
beforeSearchComposeVisibility = composePanel.getVisibility();
composePanel.setVisibility(View.GONE);
beforeSearchAttachVisibility = attachmentManager.getVisibility();
attachmentManager.setVisibility(View.GONE);
ConversationActivity.this.makeSearchMenuVisible(menu, searchItem, false);
}
private void searchCollapse(final Menu menu, final MenuItem searchItem) {
composePanel.setVisibility(beforeSearchComposeVisibility);
attachmentManager.setVisibility(beforeSearchAttachVisibility);
ConversationActivity.this.makeSearchMenuVisible(menu, searchItem, true);
}
private void handleMenuSearchNext(boolean searchNext) { private void handleMenuSearchNext(boolean searchNext) {
} }

14
src/org/thoughtcrime/securesms/mms/AttachmentManager.java
View file

@ -592,4 +592,18 @@ public class AttachmentManager {
} }
} }
public int getVisibility() {
int ret = View.GONE;
try {
ret = attachmentViewStub.get().getVisibility();
} catch(Exception e) {}
return ret;
}
public void setVisibility(int vis) {
try {
attachmentViewStub.get().setVisibility(vis);
} catch(Exception e) {}
}
} }