diff --git a/app/src/main/java/org/nsh07/pomodoro/ui/theme/Type.kt b/app/src/main/java/org/nsh07/pomodoro/ui/theme/Type.kt index 51a07d0..a2966f0 100644 --- a/app/src/main/java/org/nsh07/pomodoro/ui/theme/Type.kt +++ b/app/src/main/java/org/nsh07/pomodoro/ui/theme/Type.kt @@ -33,7 +33,15 @@ object AppFonts { variationSettings = FontVariation.Settings( FontVariation.width(125f), FontVariation.weight(1000), - FontVariation.Setting("xtra", 500F) + FontVariation.grade(0), + FontVariation.Setting("XOPQ", 96F), + FontVariation.Setting("XTRA", 500F), + FontVariation.Setting("YOPQ", 79F), + FontVariation.Setting("YTAS", 750F), + FontVariation.Setting("YTDE", -203F), + FontVariation.Setting("YTFI", 738F), + FontVariation.Setting("YTLC", 514F), + FontVariation.Setting("YTUC", 712F) ) ) ) diff --git a/app/src/main/java/org/nsh07/pomodoro/ui/timerScreen/TimerScreen.kt b/app/src/main/java/org/nsh07/pomodoro/ui/timerScreen/TimerScreen.kt index ecf9d40..86d24cc 100644 --- a/app/src/main/java/org/nsh07/pomodoro/ui/timerScreen/TimerScreen.kt +++ b/app/src/main/java/org/nsh07/pomodoro/ui/timerScreen/TimerScreen.kt @@ -120,7 +120,7 @@ fun TimerScreen( color = colorScheme.onErrorContainer ), textAlign = TextAlign.Center, - modifier = Modifier.width(200.dp) + modifier = Modifier.width(210.dp) ) TimerMode.FOCUS -> @@ -133,7 +133,7 @@ fun TimerScreen( color = colorScheme.onPrimaryContainer ), textAlign = TextAlign.Center, - modifier = Modifier.width(200.dp) + modifier = Modifier.width(210.dp) ) TimerMode.SHORT_BREAK -> Text( @@ -145,7 +145,7 @@ fun TimerScreen( color = colorScheme.onTertiaryContainer ), textAlign = TextAlign.Center, - modifier = Modifier.width(200.dp) + modifier = Modifier.width(210.dp) ) TimerMode.LONG_BREAK -> Text( @@ -157,7 +157,7 @@ fun TimerScreen( color = colorScheme.onTertiaryContainer ), textAlign = TextAlign.Center, - modifier = Modifier.width(200.dp) + modifier = Modifier.width(210.dp) ) } }