diff --git a/app/src/main/kotlin/org/koitharu/kotatsu/favourites/data/FavouritesDao.kt b/app/src/main/kotlin/org/koitharu/kotatsu/favourites/data/FavouritesDao.kt index ba7c02b18..d569ba69a 100644 --- a/app/src/main/kotlin/org/koitharu/kotatsu/favourites/data/FavouritesDao.kt +++ b/app/src/main/kotlin/org/koitharu/kotatsu/favourites/data/FavouritesDao.kt @@ -82,15 +82,15 @@ abstract class FavouritesDao { ) abstract suspend fun findAllManga(categoryId: Int): List - suspend fun findCovers(categoryId: Long, order: ListSortOrder, limit: Int): List { + suspend fun findCovers(categoryId: Long, order: ListSortOrder): List { val orderBy = getOrderBy(order) @Language("RoomSql") val query = SimpleSQLiteQuery( "SELECT manga.cover_url AS url, manga.source AS source FROM favourites " + "LEFT JOIN manga ON favourites.manga_id = manga.manga_id " + - "WHERE favourites.category_id = ? AND deleted_at = 0 ORDER BY $orderBy LIMIT ?", - arrayOf(categoryId, limit), + "WHERE favourites.category_id = ? AND deleted_at = 0 ORDER BY $orderBy", + arrayOf(categoryId), ) return findCoversImpl(query) } diff --git a/app/src/main/kotlin/org/koitharu/kotatsu/favourites/domain/FavouritesRepository.kt b/app/src/main/kotlin/org/koitharu/kotatsu/favourites/domain/FavouritesRepository.kt index b3e4ec4f4..7c6bd3c5b 100644 --- a/app/src/main/kotlin/org/koitharu/kotatsu/favourites/domain/FavouritesRepository.kt +++ b/app/src/main/kotlin/org/koitharu/kotatsu/favourites/domain/FavouritesRepository.kt @@ -77,7 +77,7 @@ class FavouritesRepository @Inject constructor( }.distinctUntilChanged() } - fun observeCategoriesWithCovers(coversLimit: Int): Flow>> { + fun observeCategoriesWithCovers(): Flow>> { return db.getFavouriteCategoriesDao().observeAll() .map { db.withTransaction { @@ -87,7 +87,6 @@ class FavouritesRepository @Inject constructor( res[cat] = db.getFavouritesDao().findCovers( categoryId = cat.id, order = cat.order, - limit = coversLimit, ) } res diff --git a/app/src/main/kotlin/org/koitharu/kotatsu/favourites/ui/categories/FavouritesCategoriesViewModel.kt b/app/src/main/kotlin/org/koitharu/kotatsu/favourites/ui/categories/FavouritesCategoriesViewModel.kt index 4ba9720dc..4b680f8a8 100644 --- a/app/src/main/kotlin/org/koitharu/kotatsu/favourites/ui/categories/FavouritesCategoriesViewModel.kt +++ b/app/src/main/kotlin/org/koitharu/kotatsu/favourites/ui/categories/FavouritesCategoriesViewModel.kt @@ -35,7 +35,7 @@ class FavouritesCategoriesViewModel @Inject constructor( private var commitJob: Job? = null val content = combine( - repository.observeCategoriesWithCovers(coversLimit = 3), + repository.observeCategoriesWithCovers(), observeAllCategories(), settings.observeAsFlow(AppSettings.KEY_ALL_FAVOURITES_VISIBLE) { isAllFavouritesVisible }, ) { cats, all, showAll ->