Review comments: Fix favorite deselection, update favorits in onResume

home-assistant · Nov 19, 2021 · 7f0b2eb · 7f0b2eb
1 parent 8e67151
commit 7f0b2eb
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 1 deletion.
diff --git a/.../full/java/io/homeassistant/companion/android/settings/views/SettingsWearFavoritesView.kt b/.../full/java/io/homeassistant/companion/android/settings/views/SettingsWearFavoritesView.kt
@@ -78,7 +78,7 @@ fun LoadWearFavoritesSettings(
                         .padding(15.dp)
                         .clickable {
                             onEntitySelected(
-                                isFavoriteSelected(index),
+                                false,
                                 favoritesList[index],
                                 activity
                             )

diff --git a/wear/src/main/java/io/homeassistant/companion/android/home/HomeActivity.kt b/wear/src/main/java/io/homeassistant/companion/android/home/HomeActivity.kt
@@ -43,6 +43,11 @@ class HomeActivity : ComponentActivity(), HomeView {
         mainViewModel.init(presenter)
     }
 
+    override fun onResume() {
+        mainViewModel.updateFavorites()
+        super.onResume()
+    }
+
     override fun onDestroy() {
         presenter.onFinish()
         super.onDestroy()

diff --git a/wear/src/main/java/io/homeassistant/companion/android/home/MainViewModel.kt b/wear/src/main/java/io/homeassistant/companion/android/home/MainViewModel.kt
@@ -81,6 +81,14 @@ class MainViewModel @Inject constructor() : ViewModel() {
         }
     }
 
+    // TODO: Remove the below as we should save favorites to the DB so we can use a proper flow like above
+    fun updateFavorites() {
+        viewModelScope.launch {
+            favoriteEntityIds.clear()
+            favoriteEntityIds.addAll(homePresenter.getWearHomeFavorites())
+        }
+    }
+
     fun setTileShortcut(index: Int, entity: SimplifiedEntity) {
         viewModelScope.launch {
             if (index < shortcutEntities.size) {