From 9e14b49c074d5b1bd2717d2396a1940f10d57d30 Mon Sep 17 00:00:00 2001
From: Satindar Dhillon <satindar@gmail.com>
Date: Tue, 23 Aug 2022 08:00:18 -0700
Subject: [PATCH] apply font styles to welcome screen text

---
 .../omnivore/ui/auth/WelcomeScreen.kt         |  6 ++-
 .../app/omnivore/omnivore/ui/theme/Theme.kt   |  2 +-
 .../app/omnivore/omnivore/ui/theme/Type.kt    | 47 +++++++++----------
 3 files changed, 28 insertions(+), 27 deletions(-)

diff --git a/android/Omnivore/app/src/main/java/app/omnivore/omnivore/ui/auth/WelcomeScreen.kt b/android/Omnivore/app/src/main/java/app/omnivore/omnivore/ui/auth/WelcomeScreen.kt
index fd5b0683d..59452cabd 100644
--- a/android/Omnivore/app/src/main/java/app/omnivore/omnivore/ui/auth/WelcomeScreen.kt
+++ b/android/Omnivore/app/src/main/java/app/omnivore/omnivore/ui/auth/WelcomeScreen.kt
@@ -55,7 +55,10 @@ fun WelcomeScreenContent(viewModel: LoginViewModel, navController: NavHostContro
                 contentDescription = "Omnivore Icon with Name"
             )
             Spacer(modifier = Modifier.height(50.dp))
-            Text(stringResource(id = R.string.welcome_title))
+            Text(
+                text = stringResource(id = R.string.welcome_title),
+                style = MaterialTheme.typography.headlineLarge
+            )
             MoreInfoButton()
 
             Spacer(modifier = Modifier.height(50.dp))
@@ -96,6 +99,7 @@ fun MoreInfoButton() {
 
     ClickableText(
         text = AnnotatedString("Learn More ->"),
+        style = MaterialTheme.typography.titleLarge,
         onClick = {
             context.startActivity(intent)
         },
diff --git a/android/Omnivore/app/src/main/java/app/omnivore/omnivore/ui/theme/Theme.kt b/android/Omnivore/app/src/main/java/app/omnivore/omnivore/ui/theme/Theme.kt
index f55b9dea7..38c6bc295 100644
--- a/android/Omnivore/app/src/main/java/app/omnivore/omnivore/ui/theme/Theme.kt
+++ b/android/Omnivore/app/src/main/java/app/omnivore/omnivore/ui/theme/Theme.kt
@@ -82,7 +82,7 @@ fun OmnivoreTheme(
 
   MaterialTheme(
     colorScheme = colorScheme,
-//    typography = Typography,
+    typography = Typography,
 //    shapes = Shapes,
     content = content
   )
diff --git a/android/Omnivore/app/src/main/java/app/omnivore/omnivore/ui/theme/Type.kt b/android/Omnivore/app/src/main/java/app/omnivore/omnivore/ui/theme/Type.kt
index 5a70fbaec..86df5fe88 100644
--- a/android/Omnivore/app/src/main/java/app/omnivore/omnivore/ui/theme/Type.kt
+++ b/android/Omnivore/app/src/main/java/app/omnivore/omnivore/ui/theme/Type.kt
@@ -1,28 +1,25 @@
 package app.omnivore.omnivore.ui.theme
 
-import androidx.compose.material.Typography
-import androidx.compose.ui.text.TextStyle
-import androidx.compose.ui.text.font.FontFamily
-import androidx.compose.ui.text.font.FontWeight
-import androidx.compose.ui.unit.sp
+import androidx.compose.material3.Typography
+
+val Typography = Typography()
+
+// ex: https://github.com/android/compose-samples/blob/main/Jetchat/app/src/main/java/com/example/compose/jetchat/theme/Typography.kt
+//val Typography = Typography(
+//displayLarge: TextStyle = TypographyTokens.DisplayLarge,
+//displayMedium: TextStyle = TypographyTokens.DisplayMedium,
+//displaySmall: TextStyle = TypographyTokens.DisplaySmall,
+//headlineLarge: TextStyle = TypographyTokens.HeadlineLarge,
+//headlineMedium: TextStyle = TypographyTokens.HeadlineMedium,
+//headlineSmall: TextStyle = TypographyTokens.HeadlineSmall,
+//titleLarge: TextStyle = TypographyTokens.TitleLarge,
+//titleMedium: TextStyle = TypographyTokens.TitleMedium,
+//titleSmall: TextStyle = TypographyTokens.TitleSmall,
+//bodyLarge: TextStyle = TypographyTokens.BodyLarge,
+//bodyMedium: TextStyle = TypographyTokens.BodyMedium,
+//bodySmall: TextStyle = TypographyTokens.BodySmall,
+//labelLarge: TextStyle = TypographyTokens.LabelLarge,
+//labelMedium: TextStyle = TypographyTokens.LabelMedium,
+//labelSmall: TextStyle = TypographyTokens.LabelSmall
+//)
 
-// Set of Material typography styles to start with
-val Typography = Typography(
-  body1 = TextStyle(
-    fontFamily = FontFamily.Default,
-    fontWeight = FontWeight.Normal,
-    fontSize = 16.sp
-  )
-  /* Other default text styles to override
-    button = TextStyle(
-        fontFamily = FontFamily.Default,
-        fontWeight = FontWeight.W500,
-        fontSize = 14.sp
-    ),
-    caption = TextStyle(
-        fontFamily = FontFamily.Default,
-        fontWeight = FontWeight.Normal,
-        fontSize = 12.sp
-    )
-    */
-)