sudoxreboot/habitica-android
1
0
Fork 0
mirror of https://github.com/sudoxnym/habitica-android.git synced 2026-05-18 19:59:00 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

improve header layout

Browse source
This commit is contained in:
Phillip Thelen 2022-12-20 14:39:11 +01:00
parent 6533a19854
commit 5ce0425c8a
1 changed files with 11 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/AppHeaderView.kt
View file

@ -1,7 +1,7 @@
package com.habitrpg.android.habitica.ui.views
import android.content.res.Resources
import androidx.compose.animation.AnimatedVisibility
import androidx.compose.animation.core.animateFloatAsState
import androidx.compose.animation.fadeIn
import androidx.compose.animation.fadeOut
import androidx.compose.animation.slideInHorizontally
@ -105,9 +105,9 @@ fun AppHeaderView(
MainNavigationController.navigate(R.id.avatarOverviewFragment)
}
)
Column(modifier = Modifier.height(100.dp)) {
Row(verticalAlignment = Alignment.CenterVertically, modifier = Modifier.weight(1f)) {
Column(modifier = Modifier.weight(1f)) {
val animationValue = animateFloatAsState(targetValue = if (teamPlan != null) 1f else 0f).value
Box(modifier = Modifier.height(100.dp)) {
Column(Modifier.padding(bottom = (animationValue * 48f).dp, end = (animationValue * 80f).dp)) {
LabeledBar(
icon = HabiticaIconsHelper.imageOfHeartLightBg(),
label = stringResource(R.string.HP_default),
@ -158,10 +158,11 @@ fun AppHeaderView(
}
}
val animWidth = with(LocalDensity.current) { 48.dp.roundToPx() }
AnimatedVisibility(
androidx.compose.animation.AnimatedVisibility(
visible = teamPlan != null,
enter = slideInHorizontally { animWidth } + fadeIn(),
exit = slideOutHorizontally { animWidth } + fadeOut()) {
exit = slideOutHorizontally { animWidth } + fadeOut(),
modifier = Modifier.align(Alignment.TopEnd)) {
Row(
horizontalArrangement = Arrangement.Center,
verticalAlignment = Alignment.CenterVertically,
@ -184,12 +185,12 @@ fun AppHeaderView(
colorResource(R.color.text_ternary)))
}
}
}
val animHeight = with(LocalDensity.current) { 40.dp.roundToPx() }
AnimatedVisibility(
androidx.compose.animation.AnimatedVisibility(
visible = teamPlan != null,
enter = slideInVertically { animHeight } + fadeIn(),
exit = slideOutVertically { animHeight } + fadeOut()) {
exit = slideOutVertically { animHeight } + fadeOut(),
modifier = Modifier.align(Alignment.BottomCenter)) {
Row(
horizontalArrangement = Arrangement.spacedBy(12.dp, Alignment.CenterHorizontally),
verticalAlignment = Alignment.CenterVertically,
@ -201,7 +202,7 @@ fun AppHeaderView(
.background(
colorResource(R.color.window_background)
)
.padding(top = 12.dp, start = 12.dp, end = 12.dp)
.padding(start = 12.dp, end = 12.dp)
.clickable {
onMemberRowClicked()
}