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

update equipment overview text

Browse source
This commit is contained in:
Phillip Thelen 2024-05-30 15:08:49 +02:00
parent e2c252b4b1
commit d4c410ba6f
2 changed files with 9 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/customization/AvatarOverviewFragment.kt
View file

@ -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)

11
common/src/main/java/com/habitrpg/common/habitica/theme/HabiticaTheme.kt
View file

@ -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(