feat(ui): use Google Sans Flex throughout the UI

Author: nsh07

app/src/main/java/org/nsh07/pomodoro/ui/statsScreen/StatsScreen.kt

@@ -285,7 +285,7 @@ fun StatsScreen(
                     Text(
                         stringResource(R.string.focus_per_day_avg),
                         style = typography.titleSmall,
-                        modifier = Modifier.padding(bottom = 6.3.dp)
+                        modifier = Modifier.padding(bottom = 4.dp)
                     )
                 }
             }
@@ -361,7 +361,7 @@ fun StatsScreen(
                     Text(
                         text = stringResource(R.string.focus_per_day_avg),
                         style = typography.titleSmall,
-                        modifier = Modifier.padding(bottom = 6.3.dp)
+                        modifier = Modifier.padding(bottom = 4.dp)
                     )
                 }
             }
@@ -438,7 +438,7 @@ fun StatsScreen(
                     Text(
                         text = stringResource(R.string.focus_per_day_avg),
                         style = typography.titleSmall,
-                        modifier = Modifier.padding(bottom = 6.3.dp)
+                        modifier = Modifier.padding(bottom = 4.dp)
                     )
                 }
             }

app/src/main/java/org/nsh07/pomodoro/ui/theme/Type.kt

@@ -25,30 +25,27 @@ import androidx.compose.ui.text.font.FontStyle
 import androidx.compose.ui.text.font.FontVariation
 import androidx.compose.ui.text.font.FontWeight
 import org.nsh07.pomodoro.R
-import org.nsh07.pomodoro.ui.theme.AppFonts.interBody
-import org.nsh07.pomodoro.ui.theme.AppFonts.interLabel
-import org.nsh07.pomodoro.ui.theme.AppFonts.robotoFlexHeadline
-import org.nsh07.pomodoro.ui.theme.AppFonts.robotoFlexTitle
+import org.nsh07.pomodoro.ui.theme.AppFonts.googleFlex400
+import org.nsh07.pomodoro.ui.theme.AppFonts.googleFlex600
 
 val TYPOGRAPHY = Typography()
 
-// Set of Material typography styles to start with
 val Typography = Typography(
-    displayLarge = TYPOGRAPHY.displayLarge.copy(fontFamily = robotoFlexHeadline),
-    displayMedium = TYPOGRAPHY.displayMedium.copy(fontFamily = robotoFlexHeadline),
-    displaySmall = TYPOGRAPHY.displaySmall.copy(fontFamily = robotoFlexHeadline),
-    headlineLarge = TYPOGRAPHY.headlineLarge.copy(fontFamily = robotoFlexHeadline),
-    headlineMedium = TYPOGRAPHY.headlineMedium.copy(fontFamily = robotoFlexHeadline),
-    headlineSmall = TYPOGRAPHY.headlineSmall.copy(fontFamily = robotoFlexHeadline),
-    titleLarge = TYPOGRAPHY.titleLarge.copy(fontFamily = robotoFlexTitle),
-    titleMedium = TYPOGRAPHY.titleMedium.copy(fontFamily = robotoFlexTitle),
-    titleSmall = TYPOGRAPHY.titleSmall.copy(fontFamily = robotoFlexTitle),
-    bodyLarge = TYPOGRAPHY.bodyLarge.copy(fontFamily = interBody),
-    bodyMedium = TYPOGRAPHY.bodyMedium.copy(fontFamily = interBody),
-    bodySmall = TYPOGRAPHY.bodySmall.copy(fontFamily = interBody),
-    labelLarge = TYPOGRAPHY.labelLarge.copy(fontFamily = interLabel),
-    labelMedium = TYPOGRAPHY.labelMedium.copy(fontFamily = interLabel),
-    labelSmall = TYPOGRAPHY.labelSmall.copy(fontFamily = interLabel)
+    displayLarge = TYPOGRAPHY.displayLarge.copy(fontFamily = googleFlex600),
+    displayMedium = TYPOGRAPHY.displayMedium.copy(fontFamily = googleFlex600),
+    displaySmall = TYPOGRAPHY.displaySmall.copy(fontFamily = googleFlex600),
+    headlineLarge = TYPOGRAPHY.headlineLarge.copy(fontFamily = googleFlex600),
+    headlineMedium = TYPOGRAPHY.headlineMedium.copy(fontFamily = googleFlex600),
+    headlineSmall = TYPOGRAPHY.headlineSmall.copy(fontFamily = googleFlex600),
+    titleLarge = TYPOGRAPHY.titleLarge.copy(fontFamily = googleFlex400),
+    titleMedium = TYPOGRAPHY.titleMedium.copy(fontFamily = googleFlex600),
+    titleSmall = TYPOGRAPHY.titleSmall.copy(fontFamily = googleFlex600),
+    bodyLarge = TYPOGRAPHY.bodyLarge.copy(fontFamily = googleFlex600),
+    bodyMedium = TYPOGRAPHY.bodyMedium.copy(fontFamily = googleFlex400),
+    bodySmall = TYPOGRAPHY.bodySmall.copy(fontFamily = googleFlex400),
+    labelLarge = TYPOGRAPHY.labelLarge.copy(fontFamily = googleFlex600),
+    labelMedium = TYPOGRAPHY.labelMedium.copy(fontFamily = googleFlex600),
+    labelSmall = TYPOGRAPHY.labelSmall.copy(fontFamily = googleFlex600)
 )
 
 @OptIn(ExperimentalTextApi::class)
@@ -62,20 +59,19 @@ object AppFonts {
         )
     )
 
-    val interBody = FontFamily(
+    val googleFlex400 = FontFamily(
         Font(
-            R.font.inter_variable, variationSettings = FontVariation.Settings(
-                FontWeight.Normal,
-                FontStyle.Normal
+            R.font.google_sans_flex_variable, variationSettings = FontVariation.Settings(
+                FontVariation.weight(400)
             )
         )
     )
 
-    val interLabel = FontFamily(
+    val googleFlex600 = FontFamily(
         Font(
-            R.font.inter_variable, variationSettings = FontVariation.Settings(
-                FontWeight.Medium,
-                FontStyle.Normal
+            R.font.google_sans_flex_variable, variationSettings = FontVariation.Settings(
+                FontVariation.weight(600),
+                FontVariation.Setting("ROND", 100f)
             )
         )
     )
@@ -98,26 +94,4 @@ object AppFonts {
             )
         )
     )
-
-    val robotoFlexHeadline = FontFamily(
-        Font(
-            R.font.roboto_flex_variable,
-            variationSettings = FontVariation.Settings(
-                FontVariation.width(130f),
-                FontVariation.weight(600),
-                FontVariation.grade(0)
-            )
-        )
-    )
-
-    val robotoFlexTitle = FontFamily(
-        Font(
-            R.font.roboto_flex_variable,
-            variationSettings = FontVariation.Settings(
-                FontVariation.width(130f),
-                FontVariation.weight(700),
-                FontVariation.grade(0)
-            )
-        )
-    )
 }