null2264/yokai
1
0
Fork 0
mirror of https://github.com/null2264/yokai.git synced 2025-06-21 02:34:39 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix(AppBar): Also adjust the other placeables' padding

Browse source
This commit is contained in:
Ahmad Ansori Palembani 2025-01-17 09:35:32 +07:00
parent 8b53e5ad10
commit d2ddf7dfb0
Signed by: null2264
GPG key ID: BA64F8B60AF3EFB6
1 changed files with 3 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

9
presentation/core/src/main/java/yokai/presentation/core/AppBar.kt
View file

@ -475,13 +475,11 @@ private class TopAppBarMeasurePolicy(
y = y =
when (titleVerticalArrangement) { when (titleVerticalArrangement) {
Arrangement.Bottom -> { Arrangement.Bottom -> {
val padding = (constraints.maxHeight - navigationIconPlaceable.height) / 2 val paddingFromBottom = (constraints.maxHeight - (navigationIconPlaceable.height - titleBaseline)) / 2
val paddingFromBottom = padding - (navigationIconPlaceable.height - titleBaseline)
val heightWithPadding = paddingFromBottom + navigationIconPlaceable.height val heightWithPadding = paddingFromBottom + navigationIconPlaceable.height
val adjustedBottomPadding = val adjustedBottomPadding =
if (heightWithPadding > constraints.maxHeight) { if (heightWithPadding > constraints.maxHeight) {
paddingFromBottom - paddingFromBottom - (heightWithPadding - constraints.maxHeight)
(heightWithPadding - constraints.maxHeight)
} else { } else {
paddingFromBottom paddingFromBottom
} }
@ -557,8 +555,7 @@ private class TopAppBarMeasurePolicy(
y = y =
when (titleVerticalArrangement) { when (titleVerticalArrangement) {
Arrangement.Bottom -> { Arrangement.Bottom -> {
val padding = (constraints.maxHeight - actionIconsPlaceable.height) / 2 val paddingFromBottom = (constraints.maxHeight - (actionIconsPlaceable.height - titleBaseline)) / 2
val paddingFromBottom = padding - (actionIconsPlaceable.height - titleBaseline)
val heightWithPadding = paddingFromBottom + actionIconsPlaceable.height val heightWithPadding = paddingFromBottom + actionIconsPlaceable.height
val adjustedBottomPadding = val adjustedBottomPadding =
if (heightWithPadding > constraints.maxHeight) { if (heightWithPadding > constraints.maxHeight) {