From efd8ca9e662c0079f8612980f5a7eb9bbccc069b Mon Sep 17 00:00:00 2001 From: Jan Skrasek Date: Wed, 16 Mar 2022 15:44:00 +0100 Subject: [PATCH] typography: fix default text size in MaterialTheme --- .../java/kiwi/orbit/compose/catalog/screens/ButtonScreen.kt | 3 +-- .../main/java/kiwi/orbit/compose/ui/foundation/Typography.kt | 4 ++-- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/catalog/src/main/java/kiwi/orbit/compose/catalog/screens/ButtonScreen.kt b/catalog/src/main/java/kiwi/orbit/compose/catalog/screens/ButtonScreen.kt index da612f64c..6fa773057 100644 --- a/catalog/src/main/java/kiwi/orbit/compose/catalog/screens/ButtonScreen.kt +++ b/catalog/src/main/java/kiwi/orbit/compose/catalog/screens/ButtonScreen.kt @@ -174,8 +174,7 @@ private fun ButtonLinkScreenInner() { Card { Column(Modifier.padding(16.dp)) { Text( - "Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Nullam sit amet magna in magna gravida vehicula. Nam quis nulla. Nam sed tellus id magna elementum tincidunt.", - style = OrbitTheme.typography.bodyNormal + text = "Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Nullam sit amet magna in magna gravida vehicula. Nam quis nulla. Nam sed tellus id magna elementum tincidunt.", ) Spacer(Modifier.size(8.dp)) ButtonTextLinkPrimary("Translate", onClick = {}) diff --git a/ui/src/main/java/kiwi/orbit/compose/ui/foundation/Typography.kt b/ui/src/main/java/kiwi/orbit/compose/ui/foundation/Typography.kt index deba08b86..aa00f33de 100644 --- a/ui/src/main/java/kiwi/orbit/compose/ui/foundation/Typography.kt +++ b/ui/src/main/java/kiwi/orbit/compose/ui/foundation/Typography.kt @@ -191,8 +191,8 @@ public data class Typography internal constructor( subtitle1 = title4, subtitle2 = title5, overline = title6, - body1 = bodyLarge, - body2 = bodyNormal, + body1 = bodyNormal, + body2 = bodySmall, button = title5, ) }