Skip to content

Commit 27f2678

Browse files
committed
Fix bottom bar vertical positioning in media viewer
1 parent fecb13e commit 27f2678

File tree

1 file changed

+2
-15
lines changed

1 file changed

+2
-15
lines changed

app/src/main/java/org/thunderdog/challegram/mediaview/MediaViewController.java

Lines changed: 2 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -3528,15 +3528,14 @@ private void checkBottomWrapY () {
35283528
int thumbsDistance = (Screen.dp(THUMBS_PADDING) * 2 + Screen.dp(THUMBS_HEIGHT)) * (inForceEditMode() ? 0 : 1);
35293529
float offsetDistance = (float) measureBottomWrapHeight() * dismissFactor - getKeyboardOffset();
35303530
float maxY = 0;
3531-
int appliedBottomPadding = emojiShown ? 0 : this.appliedBottomPadding;
35323531
if (bottomWrap != null) {
3533-
float y = offsetDistance - (thumbsFactor * (float) thumbsDistance) * (1f - dismissFactor) - appliedBottomPadding;
3532+
float y = offsetDistance - (thumbsFactor * (float) thumbsDistance) * (1f - dismissFactor);
35343533
bottomWrap.setTranslationY(y);
35353534
maxY = Math.max(0, y);
35363535
}
35373536
if (thumbsRecyclerView != null) {
35383537
float dy = ((float) thumbsDistance * Math.max((1f - thumbsFactor), dismissFactor));
3539-
float y = offsetDistance + dy - appliedBottomPadding;
3538+
float y = offsetDistance + dy;
35403539
thumbsRecyclerView.setTranslationY(y);
35413540
maxY = Math.max(0, y);
35423541
}
@@ -5385,15 +5384,6 @@ public int getBottomInnerMargin () {
53855384
return bottomInnerMargin;
53865385
}
53875386

5388-
private int appliedBottomPadding;
5389-
5390-
private void setAppliedBottomPadding (int padding) {
5391-
if (this.appliedBottomPadding != padding) {
5392-
this.appliedBottomPadding = padding;
5393-
checkBottomWrapY();
5394-
}
5395-
}
5396-
53975387
private int topOffset;
53985388

53995389
private void setTopOffset (int topOffset) {
@@ -5460,9 +5450,6 @@ public void dispatchSystemInsets (View parentView, ViewGroup.MarginLayoutParams
54605450
if (changed) {
54615451
int offsetBottom = getSectionBottomOffset(currentSection);
54625452
mediaView.setNavigationalOffsets(0, 0, offsetBottom);
5463-
if (canRunFullscreen() && mode != MODE_SECRET) {
5464-
setAppliedBottomPadding(offsetBottom);
5465-
}
54665453
}
54675454
mediaView.layoutCells();
54685455
}

0 commit comments

Comments
 (0)