Skip to content

Commit

Permalink
Simplify scratch (#2252)
Browse files Browse the repository at this point in the history
  • Loading branch information
@yschimke
yschimke authored Jun 4, 2024
1 parent 521bb78 commit dbd42c8
Showing 1 changed file with 4 additions and 183 deletions.
187 changes: 4 additions & 183 deletions sample/src/main/java/com/google/android/horologist/scratch/ScratchActivity.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,35 +19,8 @@ package com.google.android.horologist.scratch
import android.os.Bundle
import androidx.activity.ComponentActivity
import androidx.activity.compose.setContent
import androidx.compose.foundation.Canvas
import androidx.compose.foundation.border
import androidx.compose.foundation.layout.Box
import androidx.compose.foundation.layout.fillMaxSize
import androidx.compose.foundation.layout.fillMaxWidth
import androidx.compose.foundation.layout.height
import androidx.compose.runtime.Composable
import androidx.compose.runtime.getValue
import androidx.compose.runtime.key
import androidx.compose.runtime.mutableStateOf
import androidx.compose.runtime.saveable.Saver
import androidx.compose.runtime.saveable.rememberSaveable
import androidx.compose.runtime.setValue
import androidx.compose.ui.Modifier
import androidx.compose.ui.geometry.Offset
import androidx.compose.ui.graphics.Color
import androidx.compose.ui.unit.dp
import androidx.wear.compose.foundation.lazy.AutoCenteringParams
import androidx.wear.compose.foundation.lazy.ScalingLazyListAnchorType
import androidx.wear.compose.material.Chip
import androidx.wear.compose.material.MaterialTheme
import androidx.wear.compose.material.Scaffold
import androidx.wear.compose.material.Text
import androidx.wear.compose.material.curvedText
import androidx.wear.compose.material.scrollAway
import com.google.android.horologist.compose.layout.ResponsiveTimeText
import com.google.android.horologist.compose.layout.ScalingLazyColumn
import com.google.android.horologist.compose.layout.ScalingLazyColumnDefaults
import com.google.android.horologist.compose.layout.rememberColumnState
import androidx.wear.compose.ui.tooling.preview.WearPreviewLargeRound

class ScratchActivity : ComponentActivity() {
override fun onCreate(savedInstanceState: Bundle?) {
Expand All @@ -59,164 +32,12 @@ class ScratchActivity : ComponentActivity() {
}
}

data class Offsets(
val index: Int = 0,
val offset: Int = 0,
)

@Composable
fun WearApp() {
var settings by rememberSaveable(stateSaver = Settings.Saver) {
mutableStateOf(Settings())
}

key(settings) {
val initialOffset = settings.initialOffset
val itemHeight = settings.itemHeight
val autoCentering = settings.autoCentering
val anchorType = settings.anchorType

val columnState = rememberColumnState(
ScalingLazyColumnDefaults.scalingLazyColumnDefaults(
initialCenterIndex = initialOffset.index,
initialCenterOffset = initialOffset.offset,
autoCentering = autoCentering,
anchorType = anchorType,
),
)

Scaffold(
modifier = Modifier.fillMaxSize(),
timeText = {
ResponsiveTimeText(
modifier = Modifier
.scrollAway(
columnState.state,
columnState.initialScrollPosition.index,
columnState.initialScrollPosition.offsetPx.dp,
),
startCurvedContent = {
curvedText("${columnState.state.centerItemIndex}/${columnState.state.centerItemScrollOffset}")
},
)
},
) {
ScalingLazyColumn(
columnState = columnState,
) {
item {
val text = "Initial Offset: ${initialOffset.index} / ${initialOffset.offset}"
FixedHeightChip(text, itemHeight, onClick = {
settings = settings.copy(
initialOffsetsMode = (settings.initialOffsetsMode + 1) % Settings.initialOffsets.size,
)
})
}
item {
val text =
"Auto Centering: ${Settings.autoCenterings[settings.autoCenteringMode].first}"
FixedHeightChip(text, itemHeight, onClick = {
settings = settings.copy(
autoCenteringMode = (settings.autoCenteringMode + 1) % Settings.autoCenterings.size,
)
})
}
item {
val text = "Anchor Type: ${Settings.anchorTypes[settings.anchorTypeMode].first}"
FixedHeightChip(text, itemHeight, onClick = {
settings = settings.copy(
anchorTypeMode = (settings.anchorTypeMode + 1) % Settings.anchorTypes.size,
)
})
}
item {
val text = "Item Height: ${settings.itemHeight}"
FixedHeightChip(text, itemHeight, onClick = {
settings = settings.copy(
itemHeightMode = (settings.itemHeightMode + 1) % Settings.itemHeights.size,
)
})
}
}
Canvas(modifier = Modifier.fillMaxSize()) {
drawLine(
Color.Red,
Offset(0f, size.height / 2f),
Offset(size.width, size.height / 2f),
)
}
}
}
}

data class Settings(
val initialOffsetsMode: Int = 0,
val autoCenteringMode: Int = 1,
val itemHeightMode: Int = 0,
val anchorTypeMode: Int = 0,
) {
val initialOffset: Offsets = initialOffsets[initialOffsetsMode]
val itemHeight: Int = itemHeights[itemHeightMode]
val autoCentering: AutoCenteringParams? = autoCenterings[autoCenteringMode].second
val anchorType: ScalingLazyListAnchorType = anchorTypes[anchorTypeMode].second

companion object {
val initialOffsets = listOf(
Offsets(0, 0),
Offsets(1, 0),
Offsets(1, -20),
Offsets(1, 20),
Offsets(2, 0),
)

val autoCenterings = listOf(
Pair("null", null),
Pair("0/0", AutoCenteringParams(0, 0)),
Pair("1/0", AutoCenteringParams(1, 0)),
Pair("2/0", AutoCenteringParams(2, 0)),
Pair("3/0", AutoCenteringParams(3, 0)),
)

val itemHeights = listOf(40, 80, 120)

val anchorTypes = listOf(
Pair("Center", ScalingLazyListAnchorType.ItemCenter),
Pair("Start", ScalingLazyListAnchorType.ItemStart),
)

val Saver = Saver<Settings, List<Int>>(
save = {
listOf(
it.initialOffsetsMode,
it.autoCenteringMode,
it.itemHeightMode,
it.anchorTypeMode,
)
},
restore = {
Settings(it[0], it[1], it[2], it[3])
},
)
}
}

@WearPreviewLargeRound
@Composable
fun FixedHeightChip(text: String, itemHeight: Int, onClick: () -> Unit) {
Box(
modifier = Modifier
.height(itemHeight.dp)
.fillMaxWidth()
.border(1.dp, Color.DarkGray),
) {
Chip(
modifier = Modifier.fillMaxWidth(),
onClick = onClick,
label = {
Text(
text = text,
style = MaterialTheme.typography.caption3,
)
},
)
}
fun WearAppPreview() {
WearApp()
}

0 comments on commit dbd42c8

Please sign in to comment.