Remove callback and redo logic to have real tiles

google · Oct 9, 2024 · e2342e8 · e2342e8
1 parent eb12c5c
commit e2342e8
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 13 deletions.
diff --git a/...in/java/com/google/android/horologist/datalayer/sample/screens/tracking/TrackingScreen.kt b/...in/java/com/google/android/horologist/datalayer/sample/screens/tracking/TrackingScreen.kt
@@ -56,7 +56,6 @@ fun TrackingScreen(
         state = state,
         onActivityLaunchedOnceCheckedChanged = viewModel::onActivityLaunchedOnceCheckedChanged,
         onSetupCompletedCheckedChanged = viewModel::onSetupCompletedCheckedChanged,
-        onTileCheckedChanged = viewModel::onTileCheckedChanged,
         onComplicationCheckedChanged = viewModel::onComplicationCheckedChanged,
         onDisplayInfoClicked = onDisplayInfoClicked,
         columnState = columnState,
@@ -69,7 +68,6 @@ fun TrackingScreen(
     state: TrackingScreenUiState,
     onActivityLaunchedOnceCheckedChanged: (Boolean) -> Unit,
     onSetupCompletedCheckedChanged: (Boolean) -> Unit,
-    onTileCheckedChanged: () -> Unit,
     onComplicationCheckedChanged: (complication: String, Boolean) -> Unit,
     onDisplayInfoClicked: (info: String) -> Unit,
     columnState: ScalingLazyColumnState,
@@ -140,7 +138,7 @@ fun TrackingScreen(
                         )
                         SplitToggleChip(
                             checked = tileEntry.value,
-                            onCheckedChanged = { onTileCheckedChanged() },
+                            onCheckedChanged = { /* NO-OP */ },
                             label = tileEntry.key,
                             onClick = { onDisplayInfoClicked(info) },
                             toggleControl = ToggleChipToggleControl.Switch,
@@ -196,7 +194,6 @@ fun TrackingScreenPreview() {
         ),
         onActivityLaunchedOnceCheckedChanged = { },
         onSetupCompletedCheckedChanged = { },
-        onTileCheckedChanged = { },
         onComplicationCheckedChanged = { _, _ -> },
         onDisplayInfoClicked = { },
         columnState = rememberResponsiveColumnState(),

diff --git a/...om/google/android/horologist/datalayer/sample/screens/tracking/TrackingScreenViewModel.kt b/...om/google/android/horologist/datalayer/sample/screens/tracking/TrackingScreenViewModel.kt
@@ -38,14 +38,15 @@ class TrackingScreenViewModel
         private val wearDataLayerAppHelper: WearDataLayerAppHelper,
     ) : ViewModel() {
 
-        private val fakeTileList = listOf("Tile1", "Tile2")
+        private val realTileList = listOf(
+            "com.google.android.horologist.datalayer.sample.SampleTileService"
+        )
         private val fakeComplicationList = listOf("Comp1", "Comp2")
 
         private var initializeCalled = false
 
         private val _uiState = MutableStateFlow<TrackingScreenUiState>(TrackingScreenUiState.Idle)
         public val uiState: StateFlow<TrackingScreenUiState> = _uiState
-        private val executor = Dispatchers.Default.asExecutor()
 
         @MainThread
         fun initialize() {
@@ -60,7 +61,7 @@ class TrackingScreenViewModel
                         TrackingScreenUiState.Loading,
                         is TrackingScreenUiState.Loaded,
                         -> {
-                            val tilesMap = fakeTileList.associateWith { tile ->
+                            val tilesMap = realTileList.associateWith { tile ->
                                 surfacesInfo.tilesList.any { it.name == tile }
                             }
 
@@ -102,12 +103,6 @@ class TrackingScreenViewModel
             }
         }
 
-        fun onTileCheckedChanged() {
-            viewModelScope.launch {
-                wearDataLayerAppHelper.updateInstalledTiles(executor)
-            }
-        }
-
         fun onComplicationCheckedChanged(complication: String, checked: Boolean) {
             viewModelScope.launch {
                 if (checked) {