TheArchive/session-android
1
0
Fork 0
mirror of https://github.com/oxen-io/session-android.git synced 2025-06-09 09:18:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

Clip reactions mask if the view falls below the input panel.

Browse Source
This commit is contained in:
Alex Hart 2020-02-06 12:06:41 -04:00 committed by Greyson Parrelli
parent 5e59f77f83
commit 21cf390d0e
3 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/src/main/java/org/thoughtcrime/securesms/components/MaskView.java
View File

@ -74,7 +74,9 @@ public class MaskView extends View {
target.getDrawingRect(drawingRect); target.getDrawingRect(drawingRect);
activityContentView.offsetDescendantRectToMyCoords(target, drawingRect); activityContentView.offsetDescendantRectToMyCoords(target, drawingRect);
Bitmap mask = Bitmap.createBitmap(target.getWidth(), target.getHeight(), Bitmap.Config.ARGB_8888); drawingRect.bottom = Math.min(drawingRect.bottom, getBottom() - getPaddingBottom());
Bitmap mask = Bitmap.createBitmap(target.getWidth(), drawingRect.height(), Bitmap.Config.ARGB_8888);
Canvas maskCanvas = new Canvas(mask); Canvas maskCanvas = new Canvas(mask);
target.draw(maskCanvas); target.draw(maskCanvas);

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

@ -516,6 +516,10 @@ public class ConversationActivity extends PassphraseRequiredActionBarActivity
if (emojiDrawerStub.resolved() && container.getCurrentInput() == emojiDrawerStub.get()) { if (emojiDrawerStub.resolved() && container.getCurrentInput() == emojiDrawerStub.get()) {
container.hideAttachedInput(true); container.hideAttachedInput(true);
} }
if (reactionOverlay != null && reactionOverlay.isShowing()) {
reactionOverlay.hide();
}
} }
@Override @Override
@ -2797,7 +2801,7 @@ public class ConversationActivity extends PassphraseRequiredActionBarActivity
{ {
reactionOverlay.setOnToolbarItemClickedListener(toolbarListener); reactionOverlay.setOnToolbarItemClickedListener(toolbarListener);
reactionOverlay.setOnHideListener(onHideListener); reactionOverlay.setOnHideListener(onHideListener);
reactionOverlay.show(this, maskTarget, messageRecord); reactionOverlay.show(this, maskTarget, messageRecord, inputPanel.getMeasuredHeight());
} }
@Override @Override

5
app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationReactionOverlay.java
View File

@ -129,7 +129,7 @@ public final class ConversationReactionOverlay extends RelativeLayout {
initAnimators(); initAnimators();
} }
public void show(@NonNull Activity activity, @NonNull View maskTarget, @NonNull MessageRecord messageRecord) { public void show(@NonNull Activity activity, @NonNull View maskTarget, @NonNull MessageRecord messageRecord, int maskPaddingBottom) {
if (overlayState != OverlayState.HIDDEN) { if (overlayState != OverlayState.HIDDEN) {
return; return;
@ -168,6 +168,7 @@ public final class ConversationReactionOverlay extends RelativeLayout {
verticalScrubBoundary.update(lastSeenDownPoint.y - distanceFromTouchDownPointToTopOfScrubberDeadZone, verticalScrubBoundary.update(lastSeenDownPoint.y - distanceFromTouchDownPointToTopOfScrubberDeadZone,
lastSeenDownPoint.y + distanceFromTouchDownPointToBottomOfScrubberDeadZone); lastSeenDownPoint.y + distanceFromTouchDownPointToBottomOfScrubberDeadZone);
maskView.setPadding(0, 0, 0, maskPaddingBottom);
maskView.setTarget(maskTarget); maskView.setTarget(maskTarget);
hideAnimatorSet.end(); hideAnimatorSet.end();
@ -177,7 +178,7 @@ public final class ConversationReactionOverlay extends RelativeLayout {
if (Build.VERSION.SDK_INT >= 21) { if (Build.VERSION.SDK_INT >= 21) {
this.activity = activity; this.activity = activity;
originalStatusBarColor = activity.getWindow().getStatusBarColor(); originalStatusBarColor = activity.getWindow().getStatusBarColor();
activity.getWindow().setStatusBarColor(ContextCompat.getColor(activity, R.color.core_grey_45)); activity.getWindow().setStatusBarColor(ContextCompat.getColor(activity, R.color.action_mode_status_bar));
} }
} }