feat(ui): use Google Sans Flex font in clock

This commit is contained in:
Nishant Mishra
2025-11-29 16:15:36 +05:30
parent 8d77333fec
commit 94449139a8
5 changed files with 9 additions and 11 deletions

View File

@@ -64,7 +64,7 @@ import androidx.core.view.WindowInsetsCompat
import androidx.core.view.WindowInsetsControllerCompat
import androidx.navigation3.ui.LocalNavAnimatedContentScope
import kotlinx.coroutines.delay
import org.nsh07.pomodoro.ui.theme.AppFonts.interClock
import org.nsh07.pomodoro.ui.theme.AppFonts.googleFlex600
import org.nsh07.pomodoro.ui.theme.TomatoTheme
import org.nsh07.pomodoro.ui.timerScreen.TimerScreen
import org.nsh07.pomodoro.ui.timerScreen.viewModel.TimerMode
@@ -248,7 +248,7 @@ fun SharedTransitionScope.AlwaysOnDisplay(
Text(
text = timerState.timeStr,
style = TextStyle(
fontFamily = interClock,
fontFamily = googleFlex600,
fontSize = 56.sp,
letterSpacing = (-2).sp,
fontFeatureSettings = "tnum"

View File

@@ -39,7 +39,7 @@ import androidx.compose.ui.text.input.KeyboardType
import androidx.compose.ui.text.style.TextAlign
import androidx.compose.ui.unit.dp
import androidx.compose.ui.unit.sp
import org.nsh07.pomodoro.ui.theme.AppFonts.interClock
import org.nsh07.pomodoro.ui.theme.AppFonts.googleFlex600
import org.nsh07.pomodoro.ui.theme.CustomColors.listItemColors
@OptIn(ExperimentalMaterial3ExpressiveApi::class)
@@ -62,7 +62,7 @@ fun MinuteInputField(
imeAction = imeAction
),
textStyle = TextStyle(
fontFamily = interClock,
fontFamily = googleFlex600,
fontSize = 57.sp,
letterSpacing = (-2).sp,
color = if (enabled) colorScheme.onSurfaceVariant else colorScheme.outlineVariant,

View File

@@ -92,8 +92,6 @@ val Typography = Typography(
@OptIn(ExperimentalTextApi::class)
object AppFonts {
val interClock = FontFamily(Font(R.font.inter_bold))
val googleFlex400 = FontFamily(Font(R.font.google_sans_flex_400))
val googleFlex600 = FontFamily(Font(R.font.google_sans_flex_600))

View File

@@ -94,7 +94,7 @@ import androidx.compose.ui.unit.dp
import androidx.compose.ui.unit.sp
import androidx.navigation3.ui.LocalNavAnimatedContentScope
import org.nsh07.pomodoro.R
import org.nsh07.pomodoro.ui.theme.AppFonts.interClock
import org.nsh07.pomodoro.ui.theme.AppFonts.googleFlex600
import org.nsh07.pomodoro.ui.theme.AppFonts.robotoFlexTopBar
import org.nsh07.pomodoro.ui.theme.TomatoTheme
import org.nsh07.pomodoro.ui.timerScreen.viewModel.TimerAction
@@ -282,9 +282,9 @@ fun SharedTransitionScope.TimerScreen(
Text(
text = timerState.timeStr,
style = TextStyle(
fontFamily = interClock,
fontFamily = googleFlex600,
fontSize = 72.sp,
letterSpacing = (-2).sp,
letterSpacing = (-2.6).sp,
fontFeatureSettings = "tnum"
),
textAlign = TextAlign.Center,
@@ -307,7 +307,7 @@ fun SharedTransitionScope.TimerScreen(
timerState.currentFocusCount,
timerState.totalFocusCount
),
fontFamily = interClock,
fontFamily = googleFlex600,
style = typography.titleLarge,
color = colorScheme.outline
)
@@ -497,7 +497,7 @@ fun SharedTransitionScope.TimerScreen(
Text(
it,
style = TextStyle(
fontFamily = interClock,
fontFamily = googleFlex600,
fontSize = 22.sp,
lineHeight = 28.sp,
color = if (timerState.nextTimerMode == TimerMode.FOCUS) colorScheme.primary else colorScheme.tertiary,

Binary file not shown.