From 8494b74646a637395bb5cbf1c05a5ea311e9a9e0 Mon Sep 17 00:00:00 2001 From: Don Turner Date: Thu, 22 Feb 2024 20:28:02 +0000 Subject: [PATCH] Fix spotless (really should enable the commit hook to do this) Change-Id: I68cb9bd989a809e5db1bca3157c2c978ad8c8906 --- .../core/designsystem/component/Navigation.kt | 1 - .../nowinandroid/core/designsystem/theme/Type.kt | 13 +++++-------- .../core/designsystem/NavigationScreenshotTests.kt | 1 - 3 files changed, 5 insertions(+), 10 deletions(-) diff --git a/core/designsystem/src/main/kotlin/com/google/samples/apps/nowinandroid/core/designsystem/component/Navigation.kt b/core/designsystem/src/main/kotlin/com/google/samples/apps/nowinandroid/core/designsystem/component/Navigation.kt index 73eaf1135..9f8f71f14 100644 --- a/core/designsystem/src/main/kotlin/com/google/samples/apps/nowinandroid/core/designsystem/component/Navigation.kt +++ b/core/designsystem/src/main/kotlin/com/google/samples/apps/nowinandroid/core/designsystem/component/Navigation.kt @@ -245,7 +245,6 @@ fun NiaNavigationRailPreview() { } } - /** * Now in Android navigation default values. */ 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 ead29352f..99d5f6f1e 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 @@ -17,14 +17,11 @@ package com.google.samples.apps.nowinandroid.core.designsystem.theme import androidx.compose.material3.Typography -import androidx.compose.ui.text.PlatformTextStyle import androidx.compose.ui.text.TextStyle import androidx.compose.ui.text.font.FontWeight import androidx.compose.ui.text.style.LineHeightStyle import androidx.compose.ui.text.style.LineHeightStyle.Alignment -import androidx.compose.ui.text.style.LineHeightStyle.Alignment.Companion import androidx.compose.ui.text.style.LineHeightStyle.Trim -import androidx.compose.ui.unit.TextUnit import androidx.compose.ui.unit.sp /** @@ -68,7 +65,7 @@ internal val NiaTypography = Typography( letterSpacing = 0.sp, lineHeightStyle = LineHeightStyle( alignment = Alignment.Bottom, - trim = Trim.None + trim = Trim.None, ), ), titleLarge = TextStyle( @@ -78,7 +75,7 @@ internal val NiaTypography = Typography( letterSpacing = 0.sp, lineHeightStyle = LineHeightStyle( alignment = Alignment.Bottom, - trim = Trim.LastLineBottom + trim = Trim.LastLineBottom, ), ), titleMedium = TextStyle( @@ -100,7 +97,7 @@ internal val NiaTypography = Typography( letterSpacing = 0.5.sp, lineHeightStyle = LineHeightStyle( alignment = Alignment.Bottom, - trim = Trim.Both + trim = Trim.Both, ), ), bodyMedium = TextStyle( @@ -128,7 +125,7 @@ internal val NiaTypography = Typography( letterSpacing = 0.5.sp, lineHeightStyle = LineHeightStyle( alignment = Alignment.Bottom, - trim = Trim.None + trim = Trim.None, ), ), labelSmall = TextStyle( @@ -138,7 +135,7 @@ internal val NiaTypography = Typography( letterSpacing = 0.sp, lineHeightStyle = LineHeightStyle( alignment = Alignment.Bottom, - trim = Trim.Both + trim = Trim.Both, ), ), ) 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 1995a4246..89ae5a196 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 @@ -25,7 +25,6 @@ import androidx.compose.runtime.CompositionLocalProvider import androidx.compose.ui.platform.LocalInspectionMode import androidx.compose.ui.test.junit4.createAndroidComposeRule import androidx.compose.ui.test.onRoot -import androidx.compose.ui.tooling.preview.Preview import com.github.takahirom.roborazzi.captureRoboImage import com.google.accompanist.testharness.TestHarness import com.google.samples.apps.nowinandroid.core.designsystem.component.NiaNavigationBar