prehistoric-systems/omnivore
1
0
Fork 0
mirror of https://github.com/omnivore-app/omnivore.git synced 2026-03-11 08:54:26 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

apply font styles to welcome screen text

Browse source
This commit is contained in:
Satindar Dhillon 2022-08-23 08:00:18 -07:00
parent e58058a4f4
commit 9e14b49c07
3 changed files with 28 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
android/Omnivore/app/src/main/java/app/omnivore/omnivore/ui/auth/WelcomeScreen.kt
View file

@ -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)
},

2
android/Omnivore/app/src/main/java/app/omnivore/omnivore/ui/theme/Theme.kt
View file

@ -82,7 +82,7 @@ fun OmnivoreTheme(
MaterialTheme(
colorScheme = colorScheme,
// typography = Typography,
typography = Typography,
// shapes = Shapes,
content = content
)

47
android/Omnivore/app/src/main/java/app/omnivore/omnivore/ui/theme/Type.kt
View file

@ -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
)
*/
)