A fully functional Android app built entirely with Kotlin and Jetpack Compose
Apply spotless
Ben Trengrove22df321b9ece
diff --git a/core/designsystem/src/main/kotlin/com/google/samples/apps/nowinandroid/core/designsystem/component/scrollbar/AppScrollbars.kt b/core/designsystem/src/main/kotlin/com/google/samples/apps/nowinandroid/core/designsystem/component/scrollbar/AppScrollbars.ktindex 71b673a71..5b6776352 100644--- a/core/designsystem/src/main/kotlin/com/google/samples/apps/nowinandroid/core/designsystem/component/scrollbar/AppScrollbars.kt+++ b/core/designsystem/src/main/kotlin/com/google/samples/apps/nowinandroid/core/designsystem/component/scrollbar/AppScrollbars.kt@@ -20,7 +20,6 @@ import android.annotation.SuppressLintimport androidx.compose.animation.animateColorAsStateimport androidx.compose.animation.core.Springimport androidx.compose.animation.core.SpringSpec-import androidx.compose.foundation.backgroundimport androidx.compose.foundation.gestures.Orientationimport androidx.compose.foundation.gestures.Orientation.Horizontalimport androidx.compose.foundation.gestures.Orientation.Vertical@@ -49,7 +48,6 @@ import androidx.compose.ui.geometry.Sizeimport androidx.compose.ui.graphics.Colorimport androidx.compose.ui.graphics.ColorProducerimport androidx.compose.ui.graphics.Outline-import androidx.compose.ui.graphics.Shapeimport androidx.compose.ui.graphics.drawOutlineimport androidx.compose.ui.graphics.drawscope.ContentDrawScopeimport androidx.compose.ui.node.DrawModifierNode@@ -60,10 +58,7 @@ import androidx.compose.ui.unit.dpimport com.google.samples.apps.nowinandroid.core.designsystem.component.scrollbar.ThumbState.Activeimport com.google.samples.apps.nowinandroid.core.designsystem.component.scrollbar.ThumbState.Dormantimport com.google.samples.apps.nowinandroid.core.designsystem.component.scrollbar.ThumbState.Inactive-import kotlinx.coroutines.Jobimport kotlinx.coroutines.delay-import kotlinx.coroutines.flow.mapLatest-import kotlinx.coroutines.launch/*** The time period for showing the scrollbar thumb after interacting with it, before it fades away@@ -175,14 +170,14 @@ private fun ScrollableState.DecorativeScrollbarThumb(@Composableprivate fun Modifier.scrollThumb(scrollableState: ScrollableState,- interactionSource: InteractionSource+ interactionSource: InteractionSource,): Modifier {val colorState = scrollbarThumbColor(scrollableState, interactionSource)return this then ScrollThumbElement { colorState.value }}-private data class ScrollThumbElement(val colorProducer: ColorProducer)- : ModifierNodeElement<ScrollThumbNode>() {+private data class ScrollThumbElement(val colorProducer: ColorProducer) :+ ModifierNodeElement<ScrollThumbNode>() {override fun create(): ScrollThumbNode = ScrollThumbNode(colorProducer)override fun update(node: ScrollThumbNode) {node.colorProducer = colorProducer@@ -190,7 +185,7 @@ private data class ScrollThumbElement(val colorProducer: ColorProducer)}}-private class ScrollThumbNode(var colorProducer: ColorProducer): DrawModifierNode, Modifier.Node() {+private class ScrollThumbNode(var colorProducer: ColorProducer) : DrawModifierNode, Modifier.Node() {private val shape = RoundedCornerShape(16.dp)// naive cache outline calculation if size is the same@@ -221,7 +216,7 @@ private class ScrollThumbNode(var colorProducer: ColorProducer): DrawModifierNod@Composableprivate fun scrollbarThumbColor(scrollableState: ScrollableState,- interactionSource: InteractionSource+ interactionSource: InteractionSource,): State<Color> {var state by remember { mutableStateOf(Dormant) }val pressed by interactionSource.collectIsPressedAsState()diff --git a/core/designsystem/src/main/kotlin/com/google/samples/apps/nowinandroid/core/designsystem/component/scrollbar/Scrollbar.kt b/core/designsystem/src/main/kotlin/com/google/samples/apps/nowinandroid/core/designsystem/component/scrollbar/Scrollbar.ktindex bb3b08c3a..5041eff7b 100644--- a/core/designsystem/src/main/kotlin/com/google/samples/apps/nowinandroid/core/designsystem/component/scrollbar/Scrollbar.kt+++ b/core/designsystem/src/main/kotlin/com/google/samples/apps/nowinandroid/core/designsystem/component/scrollbar/Scrollbar.kt@@ -39,7 +39,6 @@ import androidx.compose.runtime.mutableStateOfimport androidx.compose.runtime.rememberimport androidx.compose.runtime.setValueimport androidx.compose.runtime.snapshotFlow-import androidx.compose.ui.Alignmentimport androidx.compose.ui.Modifierimport androidx.compose.ui.geometry.Offsetimport androidx.compose.ui.input.pointer.PointerInputChange@@ -48,7 +47,6 @@ import androidx.compose.ui.layout.Layoutimport androidx.compose.ui.layout.layoutimport androidx.compose.ui.layout.onGloballyPositionedimport androidx.compose.ui.layout.positionInRoot-import androidx.compose.ui.unit.Constraintsimport androidx.compose.ui.unit.Dpimport androidx.compose.ui.unit.IntOffsetimport androidx.compose.ui.unit.IntSize@@ -340,13 +338,13 @@ fun Scrollbar(Horizontal -> {constraints.copy(minWidth = thumbSizePx.roundToInt(),- maxWidth = thumbSizePx.roundToInt()+ maxWidth = thumbSizePx.roundToInt(),)}Vertical -> {constraints.copy(minHeight = thumbSizePx.roundToInt(),- maxHeight = thumbSizePx.roundToInt()+ maxHeight = thumbSizePx.roundToInt(),)}}@@ -392,8 +390,6 @@ fun Scrollbar(interactionThumbTravelPercent = currentThumbMovedPercentdelay(SCROLLBAR_PRESS_DELAY_MS)}--}}