From fec27ed91417f426ab0cc6881db855c68f4d70e0 Mon Sep 17 00:00:00 2001 From: Ayan Sarkar <71203077+Ayan-10@users.noreply.github.com> Date: Fri, 29 Sep 2023 12:25:26 +0530 Subject: [PATCH] Fixes 4745 : Add bookmarked items to suggested depictions (#4746) * Dialog can't be dismissed * Dialog can't be dismissed * Appended bookmarked items in searching * Test fixed * Resolve conflicts * Resolve conflicts --- .../nrw/commons/upload/depicts/DepictsPresenter.kt | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/app/src/main/java/fr/free/nrw/commons/upload/depicts/DepictsPresenter.kt b/app/src/main/java/fr/free/nrw/commons/upload/depicts/DepictsPresenter.kt index a2cba9a52..53cee0d86 100644 --- a/app/src/main/java/fr/free/nrw/commons/upload/depicts/DepictsPresenter.kt +++ b/app/src/main/java/fr/free/nrw/commons/upload/depicts/DepictsPresenter.kt @@ -3,6 +3,7 @@ package fr.free.nrw.commons.upload.depicts import android.annotation.SuppressLint import androidx.lifecycle.LiveData import androidx.lifecycle.MutableLiveData +import fr.free.nrw.commons.bookmarks.items.BookmarkItemsController import fr.free.nrw.commons.Media import fr.free.nrw.commons.di.CommonsApplicationModule import fr.free.nrw.commons.repository.UploadRepository @@ -42,6 +43,13 @@ class DepictsPresenter @Inject constructor( private var media: Media? = null @Inject lateinit var depictsDao: DepictsDao + + /** + * Helps to get all bookmarked items + */ + @Inject + lateinit var controller: BookmarkItemsController + @Inject lateinit var depictsHelper: DepictEditHelper @@ -82,7 +90,7 @@ class DepictsPresenter @Inject constructor( if (media == null) { return repository.searchAllEntities(querystring) .subscribeOn(ioScheduler) - .map { repository.selectedDepictions + it + recentDepictedItemList } + .map { repository.selectedDepictions + it + recentDepictedItemList + controller.loadFavoritesItems() } .map { it.filterNot { item -> WikidataDisambiguationItems.isDisambiguationItem(item.instanceOfs) } } .map { it.distinctBy(DepictedItem::id) } @@ -99,7 +107,7 @@ class DepictsPresenter @Inject constructor( } ) .subscribeOn(ioScheduler) - .map { repository.selectedDepictions + it + recentDepictedItemList } + .map { repository.selectedDepictions + it + recentDepictedItemList + controller.loadFavoritesItems() } .map { it.filterNot { item -> WikidataDisambiguationItems.isDisambiguationItem(item.instanceOfs) } } .map { it.distinctBy(DepictedItem::id) }