From d29e979fbf321b28365cb106ebdfcc97521ccc7a Mon Sep 17 00:00:00 2001 From: Koitharu Date: Fri, 13 Oct 2023 16:31:51 +0300 Subject: [PATCH] Add option to order favorites by reading progress --- .../org/koitharu/kotatsu/favourites/data/FavouritesDao.kt | 1 + .../kotlin/org/koitharu/kotatsu/list/domain/ListSortOrder.kt | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) 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 5b23ad3c0..b9480a456 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 @@ -169,6 +169,7 @@ abstract class FavouritesDao { ListSortOrder.NEWEST -> "favourites.created_at DESC" ListSortOrder.ALPHABETIC -> "manga.title ASC" ListSortOrder.NEW_CHAPTERS -> "(SELECT chapters_new FROM tracks WHERE tracks.manga_id = manga.manga_id) DESC" + ListSortOrder.PROGRESS -> "(SELECT percent FROM history WHERE history.manga_id = manga.manga_id) DESC" else -> throw IllegalArgumentException("Sort order $sortOrder is not supported") } } diff --git a/app/src/main/kotlin/org/koitharu/kotatsu/list/domain/ListSortOrder.kt b/app/src/main/kotlin/org/koitharu/kotatsu/list/domain/ListSortOrder.kt index 673f85773..932edd88f 100644 --- a/app/src/main/kotlin/org/koitharu/kotatsu/list/domain/ListSortOrder.kt +++ b/app/src/main/kotlin/org/koitharu/kotatsu/list/domain/ListSortOrder.kt @@ -23,7 +23,7 @@ enum class ListSortOrder( companion object { val HISTORY: Set = EnumSet.of(UPDATED, NEWEST, PROGRESS, ALPHABETIC, NEW_CHAPTERS) - val FAVORITES: Set = EnumSet.of(ALPHABETIC, NEWEST, RATING, NEW_CHAPTERS) + val FAVORITES: Set = EnumSet.of(ALPHABETIC, NEWEST, RATING, NEW_CHAPTERS, PROGRESS) val SUGGESTIONS: Set = EnumSet.of(RELEVANCE) operator fun invoke(value: String, fallback: ListSortOrder) = entries.find(value) ?: fallback