Mastodon
/
Twidere-App-Android-Twitter-Mastodon
mirror of https://github.com/TwidereProject/Twidere-Android
1
0
Fork 0
Code Issues Releases Wiki Activity

Fix #1318

This commit is contained in:
Tlaster 2020-05-26 14:19:00 +08:00
parent 0c2c0eea83
commit 96cfc4b4c1
1 changed files with 14 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
twidere/src/main/kotlin/org/mariotaku/twidere/activity/HomeActivity.kt
View File

@ -422,8 +422,13 @@ class HomeActivity : BaseActivity(), OnClickListener, OnPageChangeListener, Supp
if (!ViewCompat.getFitsSystemWindows(homeMenu)) { if (!ViewCompat.getFitsSystemWindows(homeMenu)) {
homeContent.setPadding(0, insets.systemWindowInsetTop, 0, 0) homeContent.setPadding(0, insets.systemWindowInsetTop, 0, 0)
} }
(toolbar.layoutParams as? MarginLayoutParams)?.bottomMargin = insets.systemWindowInsetBottom
(actionsButton.layoutParams as? MarginLayoutParams)?.bottomMargin = (actionsButton.layoutParams as? MarginLayoutParams)?.bottomMargin =
actionsButtonBottomMargin + insets.systemWindowInsetBottom actionsButtonBottomMargin + if (preferences[tabPositionKey] == SharedPreferenceConstants.VALUE_TAB_POSITION_TOP) {
insets.systemWindowInsetBottom
} else {
0
}
return insets return insets
} }
@ -623,16 +628,22 @@ class HomeActivity : BaseActivity(), OnClickListener, OnPageChangeListener, Supp
} }
notifyControlBarOffsetChanged() notifyControlBarOffsetChanged()
} else { } else {
val layoutparams = toolbar.layoutParams
val toolbarMarginBottom = if (layoutparams is MarginLayoutParams) {
layoutparams.bottomMargin
} else {
0
}
val translationY = if (mainTabs.columns > 1 || !toolbar.isVisible) { val translationY = if (mainTabs.columns > 1 || !toolbar.isVisible) {
0 0
} else { } else {
(toolbar.height * (offset - 1)).toInt() ((toolbar.height + toolbarMarginBottom) * (offset - 1)).toInt()
} }
toolbar.translationY = -translationY.toFloat() toolbar.translationY = -translationY.toFloat()
windowOverlay.translationY = -translationY.toFloat() windowOverlay.translationY = -translationY.toFloat()
val lp = actionsButton.layoutParams val lp = actionsButton.layoutParams
if (lp is MarginLayoutParams) { if (lp is MarginLayoutParams) {
actionsButton.translationY = (lp.bottomMargin + toolbar.height + actionsButton.height) * (1 - offset) actionsButton.translationY = (lp.bottomMargin + toolbar.height + actionsButton.height + toolbarMarginBottom) * (1 - offset)
} else { } else {
actionsButton.translationY = actionsButton.height * (1 - offset) actionsButton.translationY = actionsButton.height * (1 - offset)
} }