Myzel394/NumberHub
1
0
Fork 0
mirror of https://github.com/Myzel394/NumberHub.git synced 2025-06-19 00:35:26 +02:00
Code Issues Packages Projects Releases Wiki Activity

Change time selector block font

Browse Source
This commit is contained in:
Sad Ellie 2023-10-09 13:20:43 +03:00
parent 25cbd82534
commit f0ea9472b3
2 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
core/ui/src/main/java/com/sadellie/unitto/core/ui/theme/Type.kt
View File

@ -40,6 +40,7 @@ import com.sadellie.unitto.core.base.R
data class NumberTypography( data class NumberTypography(
val displayLarge: TextStyle, val displayLarge: TextStyle,
val displayMedium: TextStyle, val displayMedium: TextStyle,
val displaySmall: TextStyle,
val headlineMedium: TextStyle, val headlineMedium: TextStyle,
val headlineSmall: TextStyle, val headlineSmall: TextStyle,
val bodyLarge: TextStyle, val bodyLarge: TextStyle,
@ -166,11 +167,18 @@ val NumberTypographyUnitto by lazy {
), ),
displayMedium = TextStyle( displayMedium = TextStyle(
fontFamily = latoFamily, fontFamily = latoFamily,
fontWeight = FontWeight.W400, fontWeight = FontWeight.Normal,
fontSize = 38.sp, fontSize = 38.sp,
lineHeight = 42.sp, lineHeight = 42.sp,
letterSpacing = (-0.25).sp, letterSpacing = (-0.25).sp,
), ),
displaySmall = TextStyle(
fontFamily = latoFamily,
fontWeight = FontWeight.Normal,
fontSize = 36.sp,
lineHeight = 44.sp,
letterSpacing = 0.sp,
),
headlineMedium = TextStyle( headlineMedium = TextStyle(
fontFamily = latoFamily, fontFamily = latoFamily,
fontWeight = FontWeight.Normal, fontWeight = FontWeight.Normal,
@ -201,6 +209,7 @@ val NumberTypographySystem by lazy {
NumberTypography( NumberTypography(
displayLarge = TypographySystem.displayLarge, displayLarge = TypographySystem.displayLarge,
displayMedium = TypographySystem.displayMedium, displayMedium = TypographySystem.displayMedium,
displaySmall = TypographySystem.displaySmall,
headlineMedium = TypographySystem.headlineMedium, headlineMedium = TypographySystem.headlineMedium,
headlineSmall = TypographySystem.headlineSmall, headlineSmall = TypographySystem.headlineSmall,
bodyLarge = TypographySystem.bodyLarge bodyLarge = TypographySystem.bodyLarge

3
feature/datecalculator/src/main/java/com/sadellie/unitto/feature/datecalculator/components/DateTimeSelectorBlock.kt
View File

@ -48,6 +48,7 @@ import com.sadellie.unitto.core.ui.datetime.formatDateWeekDayMonthYear
import com.sadellie.unitto.core.ui.datetime.formatTime import com.sadellie.unitto.core.ui.datetime.formatTime
import com.sadellie.unitto.core.ui.datetime.formatTime12Short import com.sadellie.unitto.core.ui.datetime.formatTime12Short
import com.sadellie.unitto.core.ui.datetime.formatTimeAmPm import com.sadellie.unitto.core.ui.datetime.formatTimeAmPm
import com.sadellie.unitto.core.ui.theme.LocalNumberTypography
import java.time.ZonedDateTime import java.time.ZonedDateTime
@Composable @Composable
@ -93,7 +94,7 @@ internal fun DateTimeSelectorBlock(
onClick = onTimeClick onClick = onTimeClick
), ),
text = time.formatTime(locale, true), text = time.formatTime(locale, true),
style = MaterialTheme.typography.displaySmall, style = LocalNumberTypography.current.displaySmall,
maxLines = 1 maxLines = 1
) )
} }