From d4c410ba6ff8a4d3fbf7373cae090b9ea82b7de3 Mon Sep 17 00:00:00 2001 From: Phillip Thelen Date: Thu, 30 May 2024 15:08:49 +0200 Subject: [PATCH] update equipment overview text --- .../inventory/customization/AvatarOverviewFragment.kt | 6 ++++-- .../habitrpg/common/habitica/theme/HabiticaTheme.kt | 11 +++++------ 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/customization/AvatarOverviewFragment.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/customization/AvatarOverviewFragment.kt index 43d99998c..eb606afef 100644 --- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/customization/AvatarOverviewFragment.kt +++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/customization/AvatarOverviewFragment.kt @@ -262,7 +262,7 @@ fun AvatarOverviewView( verticalAlignment = Alignment.CenterVertically, ) { Text( - stringResource(R.string.equipped), + stringResource(R.string.equipped).uppercase(), style = HabiticaTheme.typography.titleSmall, color = HabiticaTheme.colors.textSecondary, ) @@ -271,6 +271,7 @@ fun AvatarOverviewView( stringResource(R.string.equip_automatically), style = HabiticaTheme.typography.bodyMedium, color = HabiticaTheme.colors.textPrimary, + modifier = Modifier.padding(end = 6.dp) ) Switch(checked = user?.preferences?.autoEquip == true, onCheckedChange = { userViewModel.updateUser("preferences.autoEquip", it) @@ -286,7 +287,7 @@ fun AvatarOverviewView( verticalAlignment = Alignment.CenterVertically, ) { Text( - stringResource(R.string.costume), + stringResource(R.string.costume).uppercase(), style = HabiticaTheme.typography.titleSmall, color = HabiticaTheme.colors.textSecondary, ) @@ -295,6 +296,7 @@ fun AvatarOverviewView( stringResource(R.string.wear_costume), style = HabiticaTheme.typography.bodyMedium, color = HabiticaTheme.colors.textPrimary, + modifier = Modifier.padding(end = 6.dp), ) Switch(checked = user?.preferences?.costume == true, onCheckedChange = { userViewModel.updateUser("preferences.costume", it) diff --git a/common/src/main/java/com/habitrpg/common/habitica/theme/HabiticaTheme.kt b/common/src/main/java/com/habitrpg/common/habitica/theme/HabiticaTheme.kt index 7e01a7a99..79cfb1165 100644 --- a/common/src/main/java/com/habitrpg/common/habitica/theme/HabiticaTheme.kt +++ b/common/src/main/java/com/habitrpg/common/habitica/theme/HabiticaTheme.kt @@ -53,6 +53,11 @@ fun HabiticaTheme( fontSize = 16.sp, letterSpacing = 0.1.sp, ), + titleSmall = + TextStyle( + fontWeight = FontWeight.Normal, + fontSize = 14.sp, + ), bodyLarge = TextStyle( fontWeight = FontWeight.Medium, @@ -78,12 +83,6 @@ fun HabiticaTheme( fontWeight = FontWeight.Bold, fontSize = 12.sp, ), - titleSmall = - TextStyle( - fontWeight = FontWeight.Medium, - fontSize = 10.sp, - letterSpacing = 1.5.sp, - ), ), shapes = Shapes(