Use Roboto Flex instead of Inter
This commit is contained in:
@@ -1,9 +1,11 @@
|
|||||||
package org.nsh07.pomodoro.ui.theme
|
package org.nsh07.pomodoro.ui.theme
|
||||||
|
|
||||||
import androidx.compose.material3.Typography
|
import androidx.compose.material3.Typography
|
||||||
|
import androidx.compose.ui.text.ExperimentalTextApi
|
||||||
import androidx.compose.ui.text.TextStyle
|
import androidx.compose.ui.text.TextStyle
|
||||||
import androidx.compose.ui.text.font.Font
|
import androidx.compose.ui.text.font.Font
|
||||||
import androidx.compose.ui.text.font.FontFamily
|
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.text.font.FontWeight
|
||||||
import androidx.compose.ui.unit.sp
|
import androidx.compose.ui.unit.sp
|
||||||
import org.nsh07.pomodoro.R
|
import org.nsh07.pomodoro.R
|
||||||
@@ -23,7 +25,16 @@ object AppFonts {
|
|||||||
val openRundeClock = FontFamily(
|
val openRundeClock = FontFamily(
|
||||||
Font(R.font.open_runde_bold_clock_only, FontWeight.Bold)
|
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)
|
||||||
|
)
|
||||||
|
)
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
@@ -52,8 +52,8 @@ import androidx.compose.ui.tooling.preview.Preview
|
|||||||
import androidx.compose.ui.unit.dp
|
import androidx.compose.ui.unit.dp
|
||||||
import androidx.compose.ui.unit.sp
|
import androidx.compose.ui.unit.sp
|
||||||
import org.nsh07.pomodoro.R
|
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.openRundeClock
|
||||||
|
import org.nsh07.pomodoro.ui.theme.AppFonts.robotoFlexTitle
|
||||||
import org.nsh07.pomodoro.ui.theme.TomatoTheme
|
import org.nsh07.pomodoro.ui.theme.TomatoTheme
|
||||||
import org.nsh07.pomodoro.ui.viewModel.TimerMode
|
import org.nsh07.pomodoro.ui.viewModel.TimerMode
|
||||||
import org.nsh07.pomodoro.ui.viewModel.UiState
|
import org.nsh07.pomodoro.ui.viewModel.UiState
|
||||||
@@ -114,7 +114,7 @@ fun TimerScreen(
|
|||||||
Text(
|
Text(
|
||||||
"Tomato",
|
"Tomato",
|
||||||
style = TextStyle(
|
style = TextStyle(
|
||||||
fontFamily = interDisplayBlack,
|
fontFamily = robotoFlexTitle,
|
||||||
fontSize = 32.sp,
|
fontSize = 32.sp,
|
||||||
lineHeight = 32.sp,
|
lineHeight = 32.sp,
|
||||||
color = colorScheme.onErrorContainer
|
color = colorScheme.onErrorContainer
|
||||||
@@ -127,7 +127,7 @@ fun TimerScreen(
|
|||||||
Text(
|
Text(
|
||||||
"Focus",
|
"Focus",
|
||||||
style = TextStyle(
|
style = TextStyle(
|
||||||
fontFamily = interDisplayBlack,
|
fontFamily = robotoFlexTitle,
|
||||||
fontSize = 32.sp,
|
fontSize = 32.sp,
|
||||||
lineHeight = 32.sp,
|
lineHeight = 32.sp,
|
||||||
color = colorScheme.onPrimaryContainer
|
color = colorScheme.onPrimaryContainer
|
||||||
@@ -139,7 +139,7 @@ fun TimerScreen(
|
|||||||
TimerMode.SHORT_BREAK -> Text(
|
TimerMode.SHORT_BREAK -> Text(
|
||||||
"Short Break",
|
"Short Break",
|
||||||
style = TextStyle(
|
style = TextStyle(
|
||||||
fontFamily = interDisplayBlack,
|
fontFamily = robotoFlexTitle,
|
||||||
fontSize = 32.sp,
|
fontSize = 32.sp,
|
||||||
lineHeight = 32.sp,
|
lineHeight = 32.sp,
|
||||||
color = colorScheme.onTertiaryContainer
|
color = colorScheme.onTertiaryContainer
|
||||||
@@ -151,7 +151,7 @@ fun TimerScreen(
|
|||||||
TimerMode.LONG_BREAK -> Text(
|
TimerMode.LONG_BREAK -> Text(
|
||||||
"Long Break",
|
"Long Break",
|
||||||
style = TextStyle(
|
style = TextStyle(
|
||||||
fontFamily = interDisplayBlack,
|
fontFamily = robotoFlexTitle,
|
||||||
fontSize = 32.sp,
|
fontSize = 32.sp,
|
||||||
lineHeight = 32.sp,
|
lineHeight = 32.sp,
|
||||||
color = colorScheme.onTertiaryContainer
|
color = colorScheme.onTertiaryContainer
|
||||||
|
|||||||
Binary file not shown.
BIN
app/src/main/res/font/roboto_flex_variable.ttf
Normal file
BIN
app/src/main/res/font/roboto_flex_variable.ttf
Normal file
Binary file not shown.
Reference in New Issue
Block a user