Update Rotary snippet to M3, uses M3 scroll indicator

Change-Id: I7e3810b633ab4e54db26d5771b44558941c61333

Author: kul3r4

wear/src/main/java/com.example.wear.snippets.m3/rotary/Rotary.kt

@@ -37,76 +37,32 @@ import androidx.compose.runtime.remember
 import androidx.compose.runtime.rememberCoroutineScope
 import androidx.compose.runtime.setValue
 import androidx.compose.ui.Alignment
-import androidx.compose.ui.ExperimentalComposeUiApi
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.focus.FocusRequester
 import androidx.compose.ui.focus.focusRequester
 import androidx.compose.ui.input.pointer.pointerInteropFilter
 import androidx.compose.ui.input.rotary.onRotaryScrollEvent
 import androidx.compose.ui.unit.dp
-import androidx.wear.compose.foundation.ExperimentalWearFoundationApi
 import androidx.wear.compose.foundation.lazy.ScalingLazyColumn
 import androidx.wear.compose.foundation.lazy.ScalingLazyColumnDefaults
 import androidx.wear.compose.foundation.lazy.rememberScalingLazyListState
-import androidx.wear.compose.foundation.rememberActiveFocusRequester
-import androidx.wear.compose.material.Chip
-import androidx.wear.compose.material.ChipDefaults
-import androidx.wear.compose.material.ListHeader
-import androidx.wear.compose.material.MaterialTheme
-import androidx.wear.compose.material.Picker
-import androidx.wear.compose.material.PositionIndicator
-import androidx.wear.compose.material.Scaffold
-import androidx.wear.compose.material.Text
-import androidx.wear.compose.material.rememberPickerState
+import androidx.wear.compose.foundation.lazy.rememberTransformingLazyColumnState
+import androidx.wear.compose.material3.Button
+import androidx.wear.compose.material3.ListHeader
+import androidx.wear.compose.material3.MaterialTheme
+import androidx.wear.compose.material3.Picker
+import androidx.wear.compose.material3.ButtonDefaults
+import androidx.wear.compose.material3.ScreenScaffold
+import androidx.wear.compose.material3.ScrollIndicator
+import androidx.wear.compose.material3.Text
+import androidx.wear.compose.material3.rememberPickerState
 import androidx.wear.compose.ui.tooling.preview.WearPreviewDevices
 import androidx.wear.compose.ui.tooling.preview.WearPreviewFontScales
 import kotlinx.coroutines.launch
 
-@OptIn(ExperimentalWearFoundationApi::class)
-@Composable
-fun ScrollableScreen() {
-    // This sample doesn't add a Time Text at the top of the screen.
-    // If using Time Text, add padding to ensure content does not overlap with Time Text.
-    // [START android_wear_rotary_input]
-    val listState = rememberScalingLazyListState()
-    Scaffold(
-        positionIndicator = {
-            PositionIndicator(scalingLazyListState = listState)
-        }
-    ) {
-
-        val focusRequester = rememberActiveFocusRequester()
-        val coroutineScope = rememberCoroutineScope()
-
-        ScalingLazyColumn(
-            modifier = Modifier
-                .onRotaryScrollEvent {
-                    coroutineScope.launch {
-                        listState.scrollBy(it.verticalScrollPixels)
-                        listState.animateScrollBy(0f)
-                    }
-                    true
-                }
-                .focusRequester(focusRequester)
-                .focusable()
-                .fillMaxSize(),
-            state = listState
-        ) {
-            // Content goes here
-            // [START_EXCLUDE]
-            items(count = 5) {
-                Chip(onClick = { }, label = { Text("Item #$it") })
-            }
-            // [END_EXCLUDE]
-        }
-    }
-    // [END android_wear_rotary_input]
-}
-
-@OptIn(ExperimentalComposeUiApi::class)
 @Composable
 fun TimePicker() {
-    val textStyle = MaterialTheme.typography.display1
+    val textStyle = MaterialTheme.typography.displayMedium
 
     // [START android_wear_rotary_input_picker]
     var selectedColumn by remember { mutableIntStateOf(0) }
@@ -120,8 +76,8 @@ fun TimePicker() {
     fun Option(column: Int, text: String) = Box(modifier = Modifier.fillMaxSize()) {
         Text(
             text = text, style = textStyle,
-            color = if (selectedColumn == column) MaterialTheme.colors.secondary
-            else MaterialTheme.colors.onBackground,
+            color = if (selectedColumn == column) MaterialTheme.colorScheme.secondary
+            else MaterialTheme.colorScheme.onBackground,
             modifier = Modifier
                 .pointerInteropFilter {
                     if (it.action == MotionEvent.ACTION_DOWN) selectedColumn = column
@@ -130,7 +86,7 @@ fun TimePicker() {
         )
     }
     // [END_EXCLUDE]
-    Scaffold(modifier = Modifier.fillMaxSize()) {
+    ScreenScaffold(modifier = Modifier.fillMaxSize()) {
         Row(
             // [START_EXCLUDE]
             modifier = Modifier.fillMaxSize(),
@@ -142,10 +98,10 @@ fun TimePicker() {
             // [START_EXCLUDE]
             val hourState = rememberPickerState(
                 initialNumberOfOptions = 12,
-                initiallySelectedOption = 5
+                initiallySelectedIndex = 5
             )
             val hourContentDescription by remember {
-                derivedStateOf { "${hourState.selectedOption + 1 } hours" }
+                derivedStateOf { "${hourState.selectedOptionIndex + 1 } hours" }
             }
             // [END_EXCLUDE]
             Picker(
@@ -163,18 +119,18 @@ fun TimePicker() {
                 // ...
                 // [START_EXCLUDE]
                 state = hourState,
-                contentDescription = hourContentDescription,
+                contentDescription = {hourContentDescription},
                 option = { hour: Int -> Option(0, "%2d".format(hour + 1)) }
                 // [END_EXCLUDE]
             )
             // [START_EXCLUDE]
             Spacer(Modifier.width(8.dp))
-            Text(text = ":", style = textStyle, color = MaterialTheme.colors.onBackground)
+            Text(text = ":", style = textStyle, color = MaterialTheme.colorScheme.onBackground)
             Spacer(Modifier.width(8.dp))
             val minuteState =
-                rememberPickerState(initialNumberOfOptions = 60, initiallySelectedOption = 0)
+                rememberPickerState(initialNumberOfOptions = 60, initiallySelectedIndex = 0)
             val minuteContentDescription by remember {
-                derivedStateOf { "${minuteState.selectedOption} minutes" }
+                derivedStateOf { "${minuteState.selectedOptionIndex} minutes" }
             }
             // [END_EXCLUDE]
             Picker(
@@ -192,7 +148,7 @@ fun TimePicker() {
                 // ...
                 // [START_EXCLUDE]
                 state = minuteState,
-                contentDescription = minuteContentDescription,
+                contentDescription = {minuteContentDescription},
                 option = { minute: Int -> Option(1, "%02d".format(minute)) }
                 // [END_EXCLUDE]
             )
@@ -214,9 +170,9 @@ fun SnapScrollableScreen() {
     // If using Time Text, add padding to ensure content does not overlap with Time Text.
     // [START android_wear_rotary_input_snap_fling]
     val listState = rememberScalingLazyListState()
-    Scaffold(
-        positionIndicator = {
-            PositionIndicator(scalingLazyListState = listState)
+    ScreenScaffold(
+        scrollIndicator = {
+            ScrollIndicator(state = listState)
         }
     ) {
 
@@ -230,10 +186,10 @@ fun SnapScrollableScreen() {
             // [START_EXCLUDE]
             item { ListHeader { Text(text = "List Header") } }
             items(20) {
-                Chip(
+                Button(
                     onClick = {},
                     label = { Text("List item $it") },
-                    colors = ChipDefaults.secondaryChipColors()
+                    colors = ButtonDefaults.filledTonalButtonColors()
                 )
             }
             // [END_EXCLUDE]
@@ -245,10 +201,10 @@ fun SnapScrollableScreen() {
 @Composable
 fun PositionScrollIndicator() {
     // [START android_wear_rotary_position_indicator]
-    val listState = rememberScalingLazyListState()
-    Scaffold(
-        positionIndicator = {
-            PositionIndicator(scalingLazyListState = listState)
+    val listState = rememberTransformingLazyColumnState()
+    ScreenScaffold(
+        scrollIndicator = {
+            ScrollIndicator(state = listState)
         }
     ) {
         // ...
@@ -263,13 +219,6 @@ fun TimePickerPreview() {
     TimePicker()
 }
 
-@WearPreviewDevices
-@WearPreviewFontScales
-@Composable
-fun ScrollableScreenPreview() {
-    ScrollableScreen()
-}
-
 @WearPreviewDevices
 @WearPreviewFontScales
 @Composable