more work

duckduckgo · May 8, 2024 · 2d7915b · 2d7915b
1 parent d003b4b
commit 2d7915b
Show file tree

Hide file tree

Showing 27 changed files with 1,579 additions and 325 deletions.
diff --git a/app/src/main/java/com/duckduckgo/app/browser/BrowserTabFragment.kt b/app/src/main/java/com/duckduckgo/app/browser/BrowserTabFragment.kt
diff --git a/app/src/main/java/com/duckduckgo/app/browser/BrowserTabViewModel.kt b/app/src/main/java/com/duckduckgo/app/browser/BrowserTabViewModel.kt
@@ -72,7 +72,7 @@ import com.duckduckgo.app.browser.customtabs.CustomTabPixelNames
 import com.duckduckgo.app.browser.favicon.FaviconManager
 import com.duckduckgo.app.browser.favicon.FaviconSource.ImageFavicon
 import com.duckduckgo.app.browser.favicon.FaviconSource.UrlFavicon
-import com.duckduckgo.app.browser.favorites.FavoritesQuickAccessAdapter
+import com.duckduckgo.app.browser.favorites.NewTabSectionsItem
 import com.duckduckgo.app.browser.history.NavigationHistoryAdapter.NavigationHistoryListener
 import com.duckduckgo.app.browser.logindetection.FireproofDialogsEventHandler
 import com.duckduckgo.app.browser.logindetection.FireproofDialogsEventHandler.Event
@@ -455,12 +455,14 @@ class BrowserTabViewModel @Inject constructor(
 
         savedSitesRepository.getFavorites()
             .combine(hiddenIds) { favorites, hiddenIds ->
+                Timber.d("New Tab: filteredFavourites combine")
                 favorites.filter { it.id !in hiddenIds.favorites }
             }
             .flowOn(dispatchers.io())
             .onEach { filteredFavourites ->
                 withContext(dispatchers.main()) {
-                    val favorites = filteredFavourites.map { FavoritesQuickAccessAdapter.QuickAccessFavorite(it) }
+                    Timber.d("New Tab: filteredFavourites $filteredFavourites")
+                    val favorites = filteredFavourites.map { NewTabSectionsItem.FavouriteItem(it) }
                     ctaViewState.value = currentCtaViewState().copy(favorites = favorites)
                     autoCompleteViewState.value = currentAutoCompleteViewState().copy(favorites = favorites)
                     val favorite = filteredFavourites.firstOrNull { it.url == url }
@@ -2833,9 +2835,9 @@ class BrowserTabViewModel @Inject constructor(
         }
     }
 
-    fun onQuickAccessListChanged(newList: List<FavoritesQuickAccessAdapter.QuickAccessFavorite>) {
+    fun onQuickAccessListChanged(newList: List<Favorite>) {
         viewModelScope.launch(dispatchers.io()) {
-            savedSitesRepository.updateWithPosition(newList.map { it.favorite })
+            savedSitesRepository.updateWithPosition(newList)
         }
     }