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

fix(AppBar): Actions aren't aligned properly

Browse source
This commit is contained in:
Ahmad Ansori Palembani 2024-12-26 07:56:15 +07:00
parent f78d4e9e6a
commit 23d4fb1fdd
Signed by: null2264
GPG key ID: BA64F8B60AF3EFB6
1 changed files with 20 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -338,7 +338,7 @@ private fun AppBarLayout(
layoutHeight - navigationIconPlaceable.height - max(0, adjustedBottomPadding) layoutHeight - navigationIconPlaceable.height - max(0, adjustedBottomPadding)
} }
else -> (layoutHeight - navigationIconPlaceable.height) / 2 else -> (layoutHeight - navigationIconPlaceable.height) / 2
} },
) )
// Title // Title
@ -405,13 +405,30 @@ private fun AppBarLayout(
} }
// Arrangement.Top // Arrangement.Top
else -> 0 else -> 0
} },
) )
// Action icons // Action icons
actionIconsPlaceable.placeRelative( actionIconsPlaceable.placeRelative(
x = constraints.maxWidth - actionIconsPlaceable.width, x = constraints.maxWidth - actionIconsPlaceable.width,
y = (layoutHeight - actionIconsPlaceable.height) / 2 y =
when (titleVerticalArrangement) {
Arrangement.Bottom -> {
val padding = (constraints.maxHeight - actionIconsPlaceable.height) / 2
val paddingFromBottom = padding - (actionIconsPlaceable.height - titleBaseline)
val heightWithPadding = paddingFromBottom + actionIconsPlaceable.height
val adjustedBottomPadding =
if (heightWithPadding > constraints.maxHeight) {
paddingFromBottom -
(heightWithPadding - constraints.maxHeight)
} else {
paddingFromBottom
}
layoutHeight - actionIconsPlaceable.height - max(0, adjustedBottomPadding)
}
else -> (layoutHeight - actionIconsPlaceable.height) / 2
},
) )
} }
} }