prifak/Kotatsu
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Updated sort order for history and favorites

Browse Source
This commit is contained in:
Koitharu
2024-04-08 10:08:15 +03:00
parent cecf3617af
commit 89dd7beafe
4 changed files with 6 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
app/src/main/kotlin/org/koitharu/kotatsu/favourites/data/FavouritesDao.kt
View File

@@ -210,6 +210,7 @@ abstract class FavouritesDao {
ListSortOrder.UNREAD -> "IFNULL((SELECT percent FROM history WHERE history.manga_id = manga.manga_id), 0) ASC"
ListSortOrder.LAST_READ -> "IFNULL((SELECT updated_at FROM history WHERE history.manga_id = manga.manga_id), 0) DESC"
ListSortOrder.LONG_AGO_READ -> "IFNULL((SELECT updated_at FROM history WHERE history.manga_id = manga.manga_id), 0) ASC"
ListSortOrder.UPDATED -> "IFNULL((SELECT last_chapter_date FROM tracks WHERE tracks.manga_id = manga.manga_id), 0) DESC"
else -> throw IllegalArgumentException("Sort order $sortOrder is not supported")
}

1
app/src/main/kotlin/org/koitharu/kotatsu/history/data/HistoryDao.kt
View File

@@ -44,6 +44,7 @@ abstract class HistoryDao {
ListSortOrder.ALPHABETIC -> "manga.title"
ListSortOrder.ALPHABETIC_REVERSE -> "manga.title DESC"
ListSortOrder.NEW_CHAPTERS -> "IFNULL((SELECT chapters_new FROM tracks WHERE tracks.manga_id = manga.manga_id), 0) DESC"
ListSortOrder.UPDATED -> "IFNULL((SELECT last_chapter_date FROM tracks WHERE tracks.manga_id = manga.manga_id), 0) DESC"
else -> throw IllegalArgumentException("Sort order $order is not supported")
}

1
app/src/main/kotlin/org/koitharu/kotatsu/history/ui/HistoryListViewModel.kt
View File

@@ -198,6 +198,7 @@ class HistoryListViewModel @Inject constructor(
ListSortOrder.ALPHABETIC_REVERSE,
ListSortOrder.RELEVANCE,
ListSortOrder.NEW_CHAPTERS,
ListSortOrder.UPDATED,
ListSortOrder.RATING -> null
}
}

3
app/src/main/kotlin/org/koitharu/kotatsu/list/domain/ListSortOrder.kt
View File

@@ -20,6 +20,7 @@ enum class ListSortOrder(
NEW_CHAPTERS(R.string.new_chapters),
LAST_READ(R.string.last_read),
LONG_AGO_READ(R.string.long_ago_read),
UPDATED(R.string.updated),
;
fun isGroupingSupported() = this == LAST_READ || this == NEWEST || this == PROGRESS
@@ -36,6 +37,7 @@ enum class ListSortOrder(
ALPHABETIC,
ALPHABETIC_REVERSE,
NEW_CHAPTERS,
UPDATED,
)
val FAVORITES: Set<ListSortOrder> = EnumSet.of(
ALPHABETIC,
@@ -48,6 +50,7 @@ enum class ListSortOrder(
UNREAD,
LAST_READ,
LONG_AGO_READ,
UPDATED,
)
val SUGGESTIONS: Set<ListSortOrder> = EnumSet.of(RELEVANCE)