Updates to use Horologist for ResponsiveTimeText and rememberResponsiveColumnState

ComposeStarter/app/src/main/java/com/example/android/wearable/composestarter/presentation/MainActivity.kt

@@ -50,8 +50,9 @@ import com.example.android.wearable.composestarter.presentation.theme.WearAppThe
 import com.google.android.horologist.annotations.ExperimentalHorologistApi
 import com.google.android.horologist.compose.layout.AppScaffold
 import com.google.android.horologist.compose.layout.ScalingLazyColumn
+import com.google.android.horologist.compose.layout.ScalingLazyColumnDefaults
 import com.google.android.horologist.compose.layout.ScreenScaffold
-import com.google.android.horologist.compose.layout.rememberColumnState
+import com.google.android.horologist.compose.layout.rememberResponsiveColumnState
 import com.google.android.horologist.compose.material.Button
 import com.google.android.horologist.compose.material.Chip
 import com.google.android.horologist.compose.rotaryinput.rotaryWithScroll
@@ -127,7 +128,16 @@ fun GreetingScreen(greetingName: String, onShowList: () -> Unit) {
 
 @Composable
 fun ListScreen() {
-    val columnState = rememberColumnState()
+    /*
+     * Specifying the types of items that appear at the start and end of the list ensures that the
+     * appropriate padding is used.
+     */
+    val columnState = rememberResponsiveColumnState(
+        contentPadding = ScalingLazyColumnDefaults.padding(
+            first = ScalingLazyColumnDefaults.ItemType.Text,
+            last = ScalingLazyColumnDefaults.ItemType.SingleButton
+        )
+    )
 
     ScreenScaffold(scrollState = columnState) {
         /*

ComposeStarter/app/src/test/java/presentation/ResponsiveFixedSourceTimeText.kt → ComposeStarter/app/src/test/java/presentation/FixedTimeSource.kt

@@ -15,26 +15,13 @@
  */
 package presentation
 
-import androidx.compose.foundation.layout.PaddingValues
 import androidx.compose.runtime.Composable
-import androidx.compose.ui.platform.LocalConfiguration
-import androidx.compose.ui.unit.dp
 import androidx.wear.compose.material.TimeSource
-import androidx.wear.compose.material.TimeText
 
 /**
- * Provides a [TimeText] composable that applies the correct percentage-based padding.
- * TODO: This composable should be removed when ResponsiveTimeText is available in Horologist 0.5.x
+ * Provides a fixed time source for use with [ResponsiveTimeText]
  */
-@Composable
-fun ResponsiveFixedSourceTimeText() {
-    val height = LocalConfiguration.current.screenHeightDp
-    val padding = height * 0.021
-    TimeText(
-        contentPadding = PaddingValues(padding.dp),
-        timeSource = object : TimeSource {
-            override val currentTime: String
-                @Composable get() = "10:10"
-        }
-    )
+val FixedTimeSource = object : TimeSource {
+    override val currentTime: String
+        @Composable get() = "10:10"
 }

ComposeStarter/app/src/test/java/presentation/GreetingScreenTest.kt

@@ -17,6 +17,7 @@ package presentation
 
 import com.example.android.wearable.composestarter.presentation.GreetingScreen
 import com.google.android.horologist.compose.layout.AppScaffold
+import com.google.android.horologist.compose.layout.ResponsiveTimeText
 import org.junit.Test
 import org.junit.runner.RunWith
 import org.robolectric.ParameterizedRobolectricTestRunner
@@ -28,7 +29,7 @@ class GreetingScreenTest(override val device: WearDevice) : WearScreenshotTest()
     @Test
     fun greetingScreenTest() = runTest {
         AppScaffold(
-            timeText = { ResponsiveFixedSourceTimeText() }
+            timeText = { ResponsiveTimeText(timeSource = FixedTimeSource) }
         ) {
             GreetingScreen(greetingName = "screenshot", onShowList = {})
         }

ComposeStarter/app/src/test/java/presentation/ListScreenTest.kt

@@ -21,6 +21,7 @@ import androidx.compose.ui.test.performTouchInput
 import androidx.compose.ui.test.swipeUp
 import com.example.android.wearable.composestarter.presentation.ListScreen
 import com.google.android.horologist.compose.layout.AppScaffold
+import com.google.android.horologist.compose.layout.ResponsiveTimeText
 import org.junit.Test
 import org.junit.runner.RunWith
 import org.robolectric.ParameterizedRobolectricTestRunner
@@ -33,7 +34,7 @@ class ListScreenTest(override val device: WearDevice) : WearScreenshotTest() {
     fun listScreenTest() {
         runTest {
             AppScaffold(
-                timeText = { ResponsiveFixedSourceTimeText() }
+                timeText = { ResponsiveTimeText(timeSource = FixedTimeSource) }
             ) {
                 ListScreen()
             }