Fix time text on NodeDetailsScreen (#1961)

google · Jan 12, 2024 · 4b96eab · 4b96eab
1 parent 3a35072
commit 4b96eab
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 6 deletions.
diff --git a/.../java/com/google/android/horologist/datalayer/sample/screens/info/InfoScreenNavigation.kt b/.../java/com/google/android/horologist/datalayer/sample/screens/info/InfoScreenNavigation.kt
@@ -24,9 +24,9 @@ import androidx.navigation.NavController
 import androidx.navigation.NavGraphBuilder
 import androidx.navigation.NavType
 import androidx.navigation.navArgument
+import androidx.wear.compose.navigation.composable
 import com.google.android.horologist.compose.layout.ScreenScaffold
 import com.google.android.horologist.compose.layout.rememberColumnState
-import com.google.android.horologist.compose.navscaffold.composable
 import com.google.android.horologist.datalayer.sample.Screen
 import java.net.URLDecoder
 import java.net.URLEncoder

diff --git a/...e/android/horologist/datalayer/sample/screens/nodesactions/NodeDetailsScreenNavigation.kt b/...e/android/horologist/datalayer/sample/screens/nodesactions/NodeDetailsScreenNavigation.kt
@@ -21,7 +21,9 @@ import androidx.navigation.NavController
 import androidx.navigation.NavGraphBuilder
 import androidx.navigation.NavType
 import androidx.navigation.navArgument
-import com.google.android.horologist.compose.navscaffold.scrollable
+import androidx.wear.compose.navigation.composable
+import com.google.android.horologist.compose.layout.ScreenScaffold
+import com.google.android.horologist.compose.layout.rememberColumnState
 import com.google.android.horologist.datalayer.sample.Screen
 import java.net.URLDecoder
 import java.net.URLEncoder
@@ -44,14 +46,18 @@ fun NavController.navigateToNodeDetailsScreen(message: String) {
 }
 
 fun NavGraphBuilder.nodeDetailsScreen() {
-    scrollable(
+    composable(
         route = Screen.AppHelperNodeDetailsScreen.route,
         arguments = listOf(
             navArgument(nodeIdArg) { type = NavType.StringType },
         ),
     ) {
-        NodeDetailsScreen(
-            columnState = it.columnState,
-        )
+        val columnState = rememberColumnState()
+
+        ScreenScaffold(scrollState = columnState) {
+            NodeDetailsScreen(
+                columnState = columnState,
+            )
+        }
     }
 }