Fix spotless (really should enable the commit hook to do this)

Change-Id: I68cb9bd989a809e5db1bca3157c2c978ad8c8906
pull/1220/head
Don Turner 9 months ago
parent 68c15a891c
commit 8494b74646

@ -245,7 +245,6 @@ fun NiaNavigationRailPreview() {
} }
} }
/** /**
* Now in Android navigation default values. * Now in Android navigation default values.
*/ */

@ -17,14 +17,11 @@
package com.google.samples.apps.nowinandroid.core.designsystem.theme package com.google.samples.apps.nowinandroid.core.designsystem.theme
import androidx.compose.material3.Typography import androidx.compose.material3.Typography
import androidx.compose.ui.text.PlatformTextStyle
import androidx.compose.ui.text.TextStyle import androidx.compose.ui.text.TextStyle
import androidx.compose.ui.text.font.FontWeight import androidx.compose.ui.text.font.FontWeight
import androidx.compose.ui.text.style.LineHeightStyle import androidx.compose.ui.text.style.LineHeightStyle
import androidx.compose.ui.text.style.LineHeightStyle.Alignment 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.text.style.LineHeightStyle.Trim
import androidx.compose.ui.unit.TextUnit
import androidx.compose.ui.unit.sp import androidx.compose.ui.unit.sp
/** /**
@ -68,7 +65,7 @@ internal val NiaTypography = Typography(
letterSpacing = 0.sp, letterSpacing = 0.sp,
lineHeightStyle = LineHeightStyle( lineHeightStyle = LineHeightStyle(
alignment = Alignment.Bottom, alignment = Alignment.Bottom,
trim = Trim.None trim = Trim.None,
), ),
), ),
titleLarge = TextStyle( titleLarge = TextStyle(
@ -78,7 +75,7 @@ internal val NiaTypography = Typography(
letterSpacing = 0.sp, letterSpacing = 0.sp,
lineHeightStyle = LineHeightStyle( lineHeightStyle = LineHeightStyle(
alignment = Alignment.Bottom, alignment = Alignment.Bottom,
trim = Trim.LastLineBottom trim = Trim.LastLineBottom,
), ),
), ),
titleMedium = TextStyle( titleMedium = TextStyle(
@ -100,7 +97,7 @@ internal val NiaTypography = Typography(
letterSpacing = 0.5.sp, letterSpacing = 0.5.sp,
lineHeightStyle = LineHeightStyle( lineHeightStyle = LineHeightStyle(
alignment = Alignment.Bottom, alignment = Alignment.Bottom,
trim = Trim.Both trim = Trim.Both,
), ),
), ),
bodyMedium = TextStyle( bodyMedium = TextStyle(
@ -128,7 +125,7 @@ internal val NiaTypography = Typography(
letterSpacing = 0.5.sp, letterSpacing = 0.5.sp,
lineHeightStyle = LineHeightStyle( lineHeightStyle = LineHeightStyle(
alignment = Alignment.Bottom, alignment = Alignment.Bottom,
trim = Trim.None trim = Trim.None,
), ),
), ),
labelSmall = TextStyle( labelSmall = TextStyle(
@ -138,7 +135,7 @@ internal val NiaTypography = Typography(
letterSpacing = 0.sp, letterSpacing = 0.sp,
lineHeightStyle = LineHeightStyle( lineHeightStyle = LineHeightStyle(
alignment = Alignment.Bottom, alignment = Alignment.Bottom,
trim = Trim.Both trim = Trim.Both,
), ),
), ),
) )

@ -25,7 +25,6 @@ import androidx.compose.runtime.CompositionLocalProvider
import androidx.compose.ui.platform.LocalInspectionMode import androidx.compose.ui.platform.LocalInspectionMode
import androidx.compose.ui.test.junit4.createAndroidComposeRule import androidx.compose.ui.test.junit4.createAndroidComposeRule
import androidx.compose.ui.test.onRoot import androidx.compose.ui.test.onRoot
import androidx.compose.ui.tooling.preview.Preview
import com.github.takahirom.roborazzi.captureRoboImage import com.github.takahirom.roborazzi.captureRoboImage
import com.google.accompanist.testharness.TestHarness import com.google.accompanist.testharness.TestHarness
import com.google.samples.apps.nowinandroid.core.designsystem.component.NiaNavigationBar import com.google.samples.apps.nowinandroid.core.designsystem.component.NiaNavigationBar

Loading…
Cancel
Save