From 8660fab3e93151ab0b3e9312a419e8bf5ffda236 Mon Sep 17 00:00:00 2001 From: Hafiz Date: Wed, 18 Jun 2025 16:58:51 -0500 Subject: [PATCH] Unify button height to match stable Updated pause damage and copy token buttons to match stable button height --- .../habitica/ui/views/ApiTokenBottomSheet.kt | 21 ++++++++----------- .../preferences/PauseResumeDamageView.kt | 7 +++++++ 2 files changed, 16 insertions(+), 12 deletions(-) diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/ApiTokenBottomSheet.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/ApiTokenBottomSheet.kt index 1b31a98d9..672d67821 100644 --- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/ApiTokenBottomSheet.kt +++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/ApiTokenBottomSheet.kt @@ -115,20 +115,17 @@ fun ApiTokenBottomSheet( ) } Spacer(modifier = Modifier.height(22.dp)) - Button( - onClick = { onCopyToken(apiToken) }, - shape = RoundedCornerShape(12.dp), - colors = ButtonDefaults.buttonColors(containerColor = buttonBg), - modifier = Modifier + HabiticaButton( + background = buttonBg, + color = buttonText, + onClick = { onCopyToken(apiToken) }, + modifier = Modifier .fillMaxWidth() - .height(54.dp) + .height(48.dp), + contentPadding = PaddingValues(0.dp), + fontSize = 16.sp ) { - Text( - stringResource(id = R.string.copy_token), - color = buttonText, - fontSize = 16.sp, - fontWeight = FontWeight.SemiBold, - ) + Text(stringResource(id = R.string.copy_token)) } Spacer(modifier = Modifier.height(8.dp)) } diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/preferences/PauseResumeDamageView.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/preferences/PauseResumeDamageView.kt index 7afbf0c5f..0c2537e84 100644 --- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/preferences/PauseResumeDamageView.kt +++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/preferences/PauseResumeDamageView.kt @@ -2,6 +2,7 @@ package com.habitrpg.android.habitica.ui.views.preferences import androidx.compose.foundation.layout.Column import androidx.compose.foundation.layout.fillMaxWidth +import androidx.compose.foundation.layout.height import androidx.compose.foundation.layout.padding import androidx.compose.material3.Text import androidx.compose.runtime.Composable @@ -78,6 +79,9 @@ fun PauseResumeDamageView( HabiticaButton( background = colorResource(R.color.yellow_100), color = colorResource(R.color.yellow_1), + modifier = Modifier + .fillMaxWidth() + .height(48.dp), onClick = { onClick() } ) { Text(stringResource(R.string.resume_damage)) @@ -136,6 +140,9 @@ fun PauseResumeDamageView( HabiticaButton( background = colorResource(R.color.yellow_100), color = colorResource(R.color.yellow_1), + modifier = Modifier + .fillMaxWidth() + .height(48.dp), onClick = { onClick() } ) { Text(stringResource(R.string.pause_damage))