mirrors/aniyomi
1
0
Fork 0
mirror of https://github.com/aniyomiorg/aniyomi.git synced 2024-11-22 12:48:15 +03:00
Code Issues Projects Releases Packages Wiki Activity

fix anime tracker & airing sort

Browse source
This commit is contained in:
LuftVerbot 2023-11-26 15:18:03 +01:00
parent eafc64aed0
commit 2b9fe5c389
2 changed files with 9 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
app/src/main/java/eu/kanade/presentation/library/anime/AnimeLibrarySettingsDialog.kt
View file

@ -149,6 +149,13 @@ private fun ColumnScope.SortPage(
val sortingMode = category.sort.type val sortingMode = category.sort.type
val sortDescending = !category.sort.isAscending val sortDescending = !category.sort.isAscending
val trackerSortOption =
if (screenModel.trackers.isEmpty()) {
emptyList()
} else {
listOf(R.string.action_sort_tracker_score to AnimeLibrarySort.Type.TrackerMean)
}
listOf( listOf(
R.string.action_sort_alpha to AnimeLibrarySort.Type.Alphabetical, R.string.action_sort_alpha to AnimeLibrarySort.Type.Alphabetical,
R.string.action_sort_total_episodes to AnimeLibrarySort.Type.TotalEpisodes, R.string.action_sort_total_episodes to AnimeLibrarySort.Type.TotalEpisodes,
@ -159,7 +166,7 @@ private fun ColumnScope.SortPage(
R.string.action_sort_episode_fetch_date to AnimeLibrarySort.Type.EpisodeFetchDate, R.string.action_sort_episode_fetch_date to AnimeLibrarySort.Type.EpisodeFetchDate,
R.string.action_sort_date_added to AnimeLibrarySort.Type.DateAdded, R.string.action_sort_date_added to AnimeLibrarySort.Type.DateAdded,
R.string.action_sort_airing_time to AnimeLibrarySort.Type.AiringTime, R.string.action_sort_airing_time to AnimeLibrarySort.Type.AiringTime,
).map { (titleRes, mode) -> ).plus(trackerSortOption).map { (titleRes, mode) ->
SortItem( SortItem(
label = stringResource(titleRes), label = stringResource(titleRes),
sortDescending = sortDescending.takeIf { sortingMode == mode }, sortDescending = sortDescending.takeIf { sortingMode == mode },

2
domain/src/main/java/tachiyomi/domain/library/anime/model/AnimeLibrarySortMode.kt
View file

@ -33,7 +33,7 @@ data class AnimeLibrarySort(
data object EpisodeFetchDate : Type(0b00011000) data object EpisodeFetchDate : Type(0b00011000)
data object DateAdded : Type(0b00011100) data object DateAdded : Type(0b00011100)
data object TrackerMean : Type(0b000100000) data object TrackerMean : Type(0b000100000)
data object AiringTime : Type(0b00100000) data object AiringTime : Type(0b00110000)
companion object { companion object {
fun valueOf(flag: Long): Type { fun valueOf(flag: Long): Type {