From 95ad51e204ec624f343b445836acc1827890b707 Mon Sep 17 00:00:00 2001 From: Paul Hawke Date: Fri, 11 Jul 2025 16:00:13 -0500 Subject: [PATCH] Convert BookmarkItemsController to kotlin --- .../items/BookmarkItemsController.java | 27 ------------------- .../items/BookmarkItemsController.kt | 23 ++++++++++++++++ 2 files changed, 23 insertions(+), 27 deletions(-) delete mode 100644 app/src/main/java/fr/free/nrw/commons/bookmarks/items/BookmarkItemsController.java create mode 100644 app/src/main/java/fr/free/nrw/commons/bookmarks/items/BookmarkItemsController.kt diff --git a/app/src/main/java/fr/free/nrw/commons/bookmarks/items/BookmarkItemsController.java b/app/src/main/java/fr/free/nrw/commons/bookmarks/items/BookmarkItemsController.java deleted file mode 100644 index d059e4cc4..000000000 --- a/app/src/main/java/fr/free/nrw/commons/bookmarks/items/BookmarkItemsController.java +++ /dev/null @@ -1,27 +0,0 @@ -package fr.free.nrw.commons.bookmarks.items; - -import fr.free.nrw.commons.upload.structure.depictions.DepictedItem; -import java.util.List; -import javax.inject.Inject; -import javax.inject.Singleton; - -/** - * Handles loading bookmarked items from Database - */ -@Singleton -public class BookmarkItemsController { - - @Inject - BookmarkItemsDao bookmarkItemsDao; - - @Inject - public BookmarkItemsController() {} - - /** - * Load from DB the bookmarked items - * @return a list of DepictedItem objects. - */ - public List loadFavoritesItems() { - return bookmarkItemsDao.getAllBookmarksItems(); - } -} diff --git a/app/src/main/java/fr/free/nrw/commons/bookmarks/items/BookmarkItemsController.kt b/app/src/main/java/fr/free/nrw/commons/bookmarks/items/BookmarkItemsController.kt new file mode 100644 index 000000000..ca81d716b --- /dev/null +++ b/app/src/main/java/fr/free/nrw/commons/bookmarks/items/BookmarkItemsController.kt @@ -0,0 +1,23 @@ +package fr.free.nrw.commons.bookmarks.items + +import fr.free.nrw.commons.upload.structure.depictions.DepictedItem +import javax.inject.Inject +import javax.inject.Singleton + +/** + * Handles loading bookmarked items from Database + */ +@Singleton +class BookmarkItemsController @Inject constructor() { + @JvmField + @Inject + var bookmarkItemsDao: BookmarkItemsDao? = null + + /** + * Load from DB the bookmarked items + * @return a list of DepictedItem objects. + */ + fun loadFavoritesItems(): List { + return bookmarkItemsDao?.allBookmarksItems ?: emptyList() + } +}