From f0ea9472b33f3b64e7536eee34909b58f73d5eff Mon Sep 17 00:00:00 2001
From: Sad Ellie <sadellie.dev@gmail.com>
Date: Mon, 9 Oct 2023 13:20:43 +0300
Subject: [PATCH] Change time selector block font

---
 .../java/com/sadellie/unitto/core/ui/theme/Type.kt    | 11 ++++++++++-
 .../components/DateTimeSelectorBlock.kt               |  3 ++-
 2 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/core/ui/src/main/java/com/sadellie/unitto/core/ui/theme/Type.kt b/core/ui/src/main/java/com/sadellie/unitto/core/ui/theme/Type.kt
index 97c5cba2..a5d3cc4a 100644
--- a/core/ui/src/main/java/com/sadellie/unitto/core/ui/theme/Type.kt
+++ b/core/ui/src/main/java/com/sadellie/unitto/core/ui/theme/Type.kt
@@ -40,6 +40,7 @@ import com.sadellie.unitto.core.base.R
 data class NumberTypography(
     val displayLarge: TextStyle,
     val displayMedium: TextStyle,
+    val displaySmall: TextStyle,
     val headlineMedium: TextStyle,
     val headlineSmall: TextStyle,
     val bodyLarge: TextStyle,
@@ -166,11 +167,18 @@ val NumberTypographyUnitto by lazy {
         ),
         displayMedium = TextStyle(
             fontFamily = latoFamily,
-            fontWeight = FontWeight.W400,
+            fontWeight = FontWeight.Normal,
             fontSize = 38.sp,
             lineHeight = 42.sp,
             letterSpacing = (-0.25).sp,
         ),
+        displaySmall = TextStyle(
+            fontFamily = latoFamily,
+            fontWeight = FontWeight.Normal,
+            fontSize = 36.sp,
+            lineHeight = 44.sp,
+            letterSpacing = 0.sp,
+        ),
         headlineMedium = TextStyle(
             fontFamily = latoFamily,
             fontWeight = FontWeight.Normal,
@@ -201,6 +209,7 @@ val NumberTypographySystem by lazy {
     NumberTypography(
         displayLarge = TypographySystem.displayLarge,
         displayMedium = TypographySystem.displayMedium,
+        displaySmall = TypographySystem.displaySmall,
         headlineMedium = TypographySystem.headlineMedium,
         headlineSmall = TypographySystem.headlineSmall,
         bodyLarge = TypographySystem.bodyLarge
diff --git a/feature/datecalculator/src/main/java/com/sadellie/unitto/feature/datecalculator/components/DateTimeSelectorBlock.kt b/feature/datecalculator/src/main/java/com/sadellie/unitto/feature/datecalculator/components/DateTimeSelectorBlock.kt
index 15d5d8f7..0e8db5be 100644
--- a/feature/datecalculator/src/main/java/com/sadellie/unitto/feature/datecalculator/components/DateTimeSelectorBlock.kt
+++ b/feature/datecalculator/src/main/java/com/sadellie/unitto/feature/datecalculator/components/DateTimeSelectorBlock.kt
@@ -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.formatTime12Short
 import com.sadellie.unitto.core.ui.datetime.formatTimeAmPm
+import com.sadellie.unitto.core.ui.theme.LocalNumberTypography
 import java.time.ZonedDateTime
 
 @Composable
@@ -93,7 +94,7 @@ internal fun DateTimeSelectorBlock(
                         onClick = onTimeClick
                     ),
                     text = time.formatTime(locale, true),
-                    style = MaterialTheme.typography.displaySmall,
+                    style = LocalNumberTypography.current.displaySmall,
                     maxLines = 1
                 )
             }