From 4c71dc7ed3bc5e194b53e05c746d33b3f949931d Mon Sep 17 00:00:00 2001 From: Cursor Agent Date: Fri, 23 Oct 2026 09:18:15 +0000 Subject: [PATCH] cleanup(ui): use all-caps label typography tokens Replace hand-built label styles that already match labelSmallAllCaps and labelAllCaps so letter spacing stays on the shared tokens. Co-authored-by: Devil <9thLevelSoftware@users.noreply.github.com> --- .../presentation/components/EchoLevelPillSelector.kt | 5 ++--- .../presentation/components/EquipmentRackSelectionCard.kt | 6 ++---- .../phoenixproject/presentation/screen/RestTimerCard.kt | 5 ++--- 3 files changed, 6 insertions(+), 10 deletions(-) diff --git a/shared/src/commonMain/kotlin/com/devil/phoenixproject/presentation/components/EchoLevelPillSelector.kt b/shared/src/commonMain/kotlin/com/devil/phoenixproject/presentation/components/EchoLevelPillSelector.kt index 8f9541b55..ed62e8889 100644 --- a/shared/src/commonMain/kotlin/com/devil/phoenixproject/presentation/components/EchoLevelPillSelector.kt +++ b/shared/src/commonMain/kotlin/com/devil/phoenixproject/presentation/components/EchoLevelPillSelector.kt @@ -25,10 +25,10 @@ import androidx.compose.ui.semantics.selected import androidx.compose.ui.semantics.semantics import androidx.compose.ui.text.font.FontWeight import androidx.compose.ui.text.style.TextAlign -import androidx.compose.ui.unit.sp import com.devil.phoenixproject.domain.model.EchoLevel import com.devil.phoenixproject.domain.model.echoLevelLabel import com.devil.phoenixproject.ui.theme.Spacing +import com.devil.phoenixproject.ui.theme.labelSmallAllCaps import org.jetbrains.compose.resources.stringResource import projectphoenix.shared.generated.resources.Res import projectphoenix.shared.generated.resources.rest_echo_level @@ -58,9 +58,8 @@ fun EchoLevelPillSelector( Column(modifier = modifier) { Text( text = stringResource(Res.string.rest_echo_level), - style = MaterialTheme.typography.labelSmall, + style = labelSmallAllCaps, color = MaterialTheme.colorScheme.onSurfaceVariant, - letterSpacing = 1.sp, ) Spacer(modifier = Modifier.height(Spacing.small)) diff --git a/shared/src/commonMain/kotlin/com/devil/phoenixproject/presentation/components/EquipmentRackSelectionCard.kt b/shared/src/commonMain/kotlin/com/devil/phoenixproject/presentation/components/EquipmentRackSelectionCard.kt index c7d9975c7..7b1f9f912 100644 --- a/shared/src/commonMain/kotlin/com/devil/phoenixproject/presentation/components/EquipmentRackSelectionCard.kt +++ b/shared/src/commonMain/kotlin/com/devil/phoenixproject/presentation/components/EquipmentRackSelectionCard.kt @@ -38,11 +38,11 @@ import androidx.compose.ui.Alignment import androidx.compose.ui.Modifier import androidx.compose.ui.text.font.FontWeight import androidx.compose.ui.unit.dp -import androidx.compose.ui.unit.sp import com.devil.phoenixproject.domain.model.RackItem import com.devil.phoenixproject.domain.model.RackItemBehavior import com.devil.phoenixproject.domain.model.WeightUnit import com.devil.phoenixproject.ui.theme.Spacing +import com.devil.phoenixproject.ui.theme.labelAllCaps import org.jetbrains.compose.resources.stringResource import projectphoenix.shared.generated.resources.Res import projectphoenix.shared.generated.resources.equipment_rack_active_selection @@ -103,10 +103,8 @@ fun EquipmentRackSelectionCard( Row(verticalAlignment = Alignment.CenterVertically) { Text( stringResource(Res.string.equipment_rack_active_selection), - style = MaterialTheme.typography.labelLarge, - fontWeight = FontWeight.Bold, + style = labelAllCaps.copy(fontWeight = FontWeight.Bold), color = MaterialTheme.colorScheme.onSurfaceVariant, - letterSpacing = 1.sp, ) Spacer(Modifier.width(4.dp)) Icon( diff --git a/shared/src/commonMain/kotlin/com/devil/phoenixproject/presentation/screen/RestTimerCard.kt b/shared/src/commonMain/kotlin/com/devil/phoenixproject/presentation/screen/RestTimerCard.kt index c40020c4b..5524e4023 100644 --- a/shared/src/commonMain/kotlin/com/devil/phoenixproject/presentation/screen/RestTimerCard.kt +++ b/shared/src/commonMain/kotlin/com/devil/phoenixproject/presentation/screen/RestTimerCard.kt @@ -74,6 +74,7 @@ import com.devil.phoenixproject.presentation.components.SliderWithButtons import com.devil.phoenixproject.presentation.components.WeightChangePerRepControl import com.devil.phoenixproject.presentation.manager.RestActionIdentity import com.devil.phoenixproject.ui.theme.Spacing +import com.devil.phoenixproject.ui.theme.labelAllCaps import com.devil.phoenixproject.ui.theme.screenBackgroundBrush import com.devil.phoenixproject.util.Constants import org.jetbrains.compose.resources.stringResource @@ -520,10 +521,8 @@ fun RestTimerCard( ) { Text( stringResource(Res.string.rest_next_set_config), - style = MaterialTheme.typography.labelLarge, - fontWeight = FontWeight.Bold, + style = labelAllCaps.copy(fontWeight = FontWeight.Bold), color = MaterialTheme.colorScheme.onSurfaceVariant, - letterSpacing = 1.sp, ) // Reps adjuster with hybrid slider (shown for all modes)