blallo
/
Signal-Android
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix masking when attachment keyboard is visible.

master
Alex Hart 2020-07-31 11:34:46 -03:00
parent dc48ee5aed
commit eeb0c838db
1 changed files with 15 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationActivity.java
View File

@ -2934,7 +2934,7 @@ public class ConversationActivity extends PassphraseRequiredActivity
{ {
reactionOverlay.setOnToolbarItemClickedListener(toolbarListener); reactionOverlay.setOnToolbarItemClickedListener(toolbarListener);
reactionOverlay.setOnHideListener(onHideListener); reactionOverlay.setOnHideListener(onHideListener);
reactionOverlay.show(this, maskTarget, messageRecord, panelParent.getMeasuredHeight()); reactionOverlay.show(this, maskTarget, messageRecord, inputAreaHeight());
} }
@Override @Override
@ -2959,7 +2959,7 @@ public class ConversationActivity extends PassphraseRequiredActivity
@Override @Override
public void handleReactionDetails(@NonNull View maskTarget) { public void handleReactionDetails(@NonNull View maskTarget) {
reactionOverlay.showMask(maskTarget, titleView.getMeasuredHeight(), panelParent.getMeasuredHeight()); reactionOverlay.showMask(maskTarget, titleView.getMeasuredHeight(), inputAreaHeight());
} }
@Override @Override
@ -3059,6 +3059,19 @@ public class ConversationActivity extends PassphraseRequiredActivity
updateLinkPreviewState(); updateLinkPreviewState();
} }
private int inputAreaHeight() {
int height = panelParent.getMeasuredHeight();
if (attachmentKeyboardStub.resolved()) {
View keyboard = attachmentKeyboardStub.get();
if (keyboard.getVisibility() == View.VISIBLE) {
return height + keyboard.getMeasuredHeight();
}
}
return height;
}
private void onMessageRequestDeleteClicked(@NonNull MessageRequestViewModel requestModel) { private void onMessageRequestDeleteClicked(@NonNull MessageRequestViewModel requestModel) {
Recipient recipient = requestModel.getRecipient().getValue(); Recipient recipient = requestModel.getRecipient().getValue();
if (recipient == null) { if (recipient == null) {