Fixes 4745 : Add bookmarked items to suggested depictions (commons-app#4746)

* Dialog can't be dismissed

* Dialog can't be dismissed

* Appended bookmarked items in searching

* Test fixed

* Resolve conflicts

* Resolve conflicts

Author: Ayan-10

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) }