Skip to content

cleanup(ui): use all-caps label typography tokens #1341

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
9thLevelSoftware merged 1 commit into from
Oct 23, 2026
Merged

cleanup(ui): use all-caps label typography tokens #1341

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 2 additions & 3 deletions ...mmonMain/kotlin/com/devil/phoenixproject/presentation/components/EchoLevelPillSelector.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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))
Expand Down
6 changes: 2 additions & 4 deletions ...ain/kotlin/com/devil/phoenixproject/presentation/components/EquipmentRackSelectionCard.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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(
Expand Down
5 changes: 2 additions & 3 deletions shared/src/commonMain/kotlin/com/devil/phoenixproject/presentation/screen/RestTimerCard.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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)
Expand Down
Loading