From 1e14339924a2386b4ce67766d298561da5ac84fd Mon Sep 17 00:00:00 2001
From: Don Turner <donturner@google.com>
Date: Fri, 23 Feb 2024 17:28:00 +0000
Subject: [PATCH] Fix individual UI components

Change-Id: I7dec3672b9efc3524371811743b06efc1e113a36
---
 .../core/designsystem/component/Button.kt     | 10 -----
 .../core/designsystem/theme/Type.kt           | 20 +++++++---
 .../designsystem/NavigationScreenshotTests.kt | 40 +++++++++----------
 3 files changed, 33 insertions(+), 37 deletions(-)

diff --git a/core/designsystem/src/main/kotlin/com/google/samples/apps/nowinandroid/core/designsystem/component/Button.kt b/core/designsystem/src/main/kotlin/com/google/samples/apps/nowinandroid/core/designsystem/component/Button.kt
index d490ff13e..795c88d72 100644
--- a/core/designsystem/src/main/kotlin/com/google/samples/apps/nowinandroid/core/designsystem/component/Button.kt
+++ b/core/designsystem/src/main/kotlin/com/google/samples/apps/nowinandroid/core/designsystem/component/Button.kt
@@ -285,16 +285,6 @@ fun NiaOutlinedButtonPreview() {
     }
 }
 
-@ThemePreviews
-@Composable
-fun NiaButtonPreview2() {
-    NiaTheme {
-        NiaBackground(modifier = Modifier.size(150.dp, 50.dp)) {
-            NiaButton(onClick = {}, text = { Text("Test button") })
-        }
-    }
-}
-
 @ThemePreviews
 @Composable
 fun NiaButtonLeadingIconPreview() {
diff --git a/core/designsystem/src/main/kotlin/com/google/samples/apps/nowinandroid/core/designsystem/theme/Type.kt b/core/designsystem/src/main/kotlin/com/google/samples/apps/nowinandroid/core/designsystem/theme/Type.kt
index 99d5f6f1e..82d769863 100644
--- a/core/designsystem/src/main/kotlin/com/google/samples/apps/nowinandroid/core/designsystem/theme/Type.kt
+++ b/core/designsystem/src/main/kotlin/com/google/samples/apps/nowinandroid/core/designsystem/theme/Type.kt
@@ -90,14 +90,15 @@ internal val NiaTypography = Typography(
         lineHeight = 20.sp,
         letterSpacing = 0.1.sp,
     ),
+    // Default text style
     bodyLarge = TextStyle(
         fontWeight = FontWeight.Normal,
         fontSize = 16.sp,
         lineHeight = 24.sp,
         letterSpacing = 0.5.sp,
         lineHeightStyle = LineHeightStyle(
-            alignment = Alignment.Bottom,
-            trim = Trim.Both,
+            alignment = Alignment.Center,
+            trim = Trim.None,
         ),
     ),
     bodyMedium = TextStyle(
@@ -112,30 +113,37 @@ internal val NiaTypography = Typography(
         lineHeight = 16.sp,
         letterSpacing = 0.4.sp,
     ),
+    // Used for Button
     labelLarge = TextStyle(
         fontWeight = FontWeight.Medium,
         fontSize = 14.sp,
         lineHeight = 20.sp,
         letterSpacing = 0.1.sp,
+        lineHeightStyle = LineHeightStyle(
+            alignment = Alignment.Center,
+            trim = Trim.LastLineBottom,
+        ),
     ),
+    // Used for Navigation items
     labelMedium = TextStyle(
         fontWeight = FontWeight.Medium,
         fontSize = 12.sp,
         lineHeight = 16.sp,
         letterSpacing = 0.5.sp,
         lineHeightStyle = LineHeightStyle(
-            alignment = Alignment.Bottom,
-            trim = Trim.None,
+            alignment = Alignment.Center,
+            trim = Trim.LastLineBottom,
         ),
     ),
+    // Used for Tag
     labelSmall = TextStyle(
         fontWeight = FontWeight.Medium,
         fontSize = 10.sp,
         lineHeight = 14.sp,
         letterSpacing = 0.sp,
         lineHeightStyle = LineHeightStyle(
-            alignment = Alignment.Bottom,
-            trim = Trim.Both,
+            alignment = Alignment.Center,
+            trim = Trim.LastLineBottom,
         ),
     ),
 )
diff --git a/core/designsystem/src/test/kotlin/com/google/samples/apps/nowinandroid/core/designsystem/NavigationScreenshotTests.kt b/core/designsystem/src/test/kotlin/com/google/samples/apps/nowinandroid/core/designsystem/NavigationScreenshotTests.kt
index 89ae5a196..e2e92b570 100644
--- a/core/designsystem/src/test/kotlin/com/google/samples/apps/nowinandroid/core/designsystem/NavigationScreenshotTests.kt
+++ b/core/designsystem/src/test/kotlin/com/google/samples/apps/nowinandroid/core/designsystem/NavigationScreenshotTests.kt
@@ -83,27 +83,25 @@ class NavigationScreenshotTests() {
 
     @Composable
     private fun NiaNavigationBarExample(label: String = "Item") {
-        NiaTheme {
-            NiaNavigationBar {
-                (0..2).forEach { index ->
-                    NiaNavigationBarItem(
-                        icon = {
-                            Icon(
-                                imageVector = NiaIcons.UpcomingBorder,
-                                contentDescription = "",
-                            )
-                        },
-                        selectedIcon = {
-                            Icon(
-                                imageVector = NiaIcons.Upcoming,
-                                contentDescription = "",
-                            )
-                        },
-                        label = { Text(label) },
-                        selected = index == 0,
-                        onClick = { },
-                    )
-                }
+        NiaNavigationBar {
+            (0..2).forEach { index ->
+                NiaNavigationBarItem(
+                    icon = {
+                        Icon(
+                            imageVector = NiaIcons.UpcomingBorder,
+                            contentDescription = "",
+                        )
+                    },
+                    selectedIcon = {
+                        Icon(
+                            imageVector = NiaIcons.Upcoming,
+                            contentDescription = "",
+                        )
+                    },
+                    label = { Text(label) },
+                    selected = index == 0,
+                    onClick = { },
+                )
             }
         }
     }