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 a6dd4ac..51a07d0 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 @@ -1,9 +1,11 @@ package org.nsh07.pomodoro.ui.theme import androidx.compose.material3.Typography +import androidx.compose.ui.text.ExperimentalTextApi import androidx.compose.ui.text.TextStyle import androidx.compose.ui.text.font.Font import androidx.compose.ui.text.font.FontFamily +import androidx.compose.ui.text.font.FontVariation import androidx.compose.ui.text.font.FontWeight import androidx.compose.ui.unit.sp import org.nsh07.pomodoro.R @@ -23,7 +25,16 @@ object AppFonts { val openRundeClock = FontFamily( Font(R.font.open_runde_bold_clock_only, FontWeight.Bold) ) - val interDisplayBlack = FontFamily( - Font(R.font.inter_display_black, FontWeight.Black) + + @OptIn(ExperimentalTextApi::class) + val robotoFlexTitle = FontFamily( + Font( + R.font.roboto_flex_variable, + variationSettings = FontVariation.Settings( + FontVariation.width(125f), + FontVariation.weight(1000), + FontVariation.Setting("xtra", 500F) + ) + ) ) } \ No newline at end of file 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 0b19323..ecf9d40 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 @@ -52,8 +52,8 @@ import androidx.compose.ui.tooling.preview.Preview import androidx.compose.ui.unit.dp import androidx.compose.ui.unit.sp import org.nsh07.pomodoro.R -import org.nsh07.pomodoro.ui.theme.AppFonts.interDisplayBlack import org.nsh07.pomodoro.ui.theme.AppFonts.openRundeClock +import org.nsh07.pomodoro.ui.theme.AppFonts.robotoFlexTitle import org.nsh07.pomodoro.ui.theme.TomatoTheme import org.nsh07.pomodoro.ui.viewModel.TimerMode import org.nsh07.pomodoro.ui.viewModel.UiState @@ -114,7 +114,7 @@ fun TimerScreen( Text( "Tomato", style = TextStyle( - fontFamily = interDisplayBlack, + fontFamily = robotoFlexTitle, fontSize = 32.sp, lineHeight = 32.sp, color = colorScheme.onErrorContainer @@ -127,7 +127,7 @@ fun TimerScreen( Text( "Focus", style = TextStyle( - fontFamily = interDisplayBlack, + fontFamily = robotoFlexTitle, fontSize = 32.sp, lineHeight = 32.sp, color = colorScheme.onPrimaryContainer @@ -139,7 +139,7 @@ fun TimerScreen( TimerMode.SHORT_BREAK -> Text( "Short Break", style = TextStyle( - fontFamily = interDisplayBlack, + fontFamily = robotoFlexTitle, fontSize = 32.sp, lineHeight = 32.sp, color = colorScheme.onTertiaryContainer @@ -151,7 +151,7 @@ fun TimerScreen( TimerMode.LONG_BREAK -> Text( "Long Break", style = TextStyle( - fontFamily = interDisplayBlack, + fontFamily = robotoFlexTitle, fontSize = 32.sp, lineHeight = 32.sp, color = colorScheme.onTertiaryContainer diff --git a/app/src/main/res/font/inter_display_black.otf b/app/src/main/res/font/inter_display_black.otf deleted file mode 100644 index d698536..0000000 Binary files a/app/src/main/res/font/inter_display_black.otf and /dev/null differ diff --git a/app/src/main/res/font/roboto_flex_variable.ttf b/app/src/main/res/font/roboto_flex_variable.ttf new file mode 100644 index 0000000..2e5c2a2 Binary files /dev/null and b/app/src/main/res/font/roboto_flex_variable.ttf differ