Draff/TachiyomiSY-Plus
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Cleanup group by tracking

Browse Source
This commit is contained in:
Jobobby04 2022-01-09 15:39:46 -05:00
parent e0c88fea19
commit 4aa9cc3851
3 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/src/main/java/eu/kanade/tachiyomi/data/library/LibraryUpdateService.kt
View File

@ -323,7 +323,7 @@ class LibraryUpdateService(
"not tracked" "not tracked"
} }
} }
trackManager.mapTrackingOrder(status, applicationContext) == trackingExtra (trackManager.trackMap[status] ?: TrackManager.OTHER) == trackingExtra
} }
} }
LibraryGroup.BY_SOURCE -> { LibraryGroup.BY_SOURCE -> {

26
app/src/main/java/eu/kanade/tachiyomi/data/track/TrackManager.kt
View File

@ -1,6 +1,7 @@
package eu.kanade.tachiyomi.data.track package eu.kanade.tachiyomi.data.track
import android.content.Context import android.content.Context
import eu.kanade.tachiyomi.R
import eu.kanade.tachiyomi.data.track.anilist.Anilist import eu.kanade.tachiyomi.data.track.anilist.Anilist
import eu.kanade.tachiyomi.data.track.bangumi.Bangumi import eu.kanade.tachiyomi.data.track.bangumi.Bangumi
import eu.kanade.tachiyomi.data.track.kitsu.Kitsu import eu.kanade.tachiyomi.data.track.kitsu.Kitsu
@ -25,8 +26,8 @@ class TrackManager(context: Context) {
// SY --> // SY -->
const val READING = 1 const val READING = 1
const val REREADING = 2 const val REPEATING = 2
const val PLANTOREAD = 3 const val PLAN_TO_READ = 3
const val PAUSED = 4 const val PAUSED = 4
const val COMPLETED = 5 const val COMPLETED = 5
const val DROPPED = 6 const val DROPPED = 6
@ -55,18 +56,15 @@ class TrackManager(context: Context) {
fun hasLoggedServices() = services.any { it.isLogged } fun hasLoggedServices() = services.any { it.isLogged }
// SY --> // SY -->
fun mapTrackingOrder(status: String, context: Context): Int { val trackMap by lazy {
with(context) { mapOf(
return when (status) { context.getString(R.string.reading) to READING,
getString(eu.kanade.tachiyomi.R.string.reading), getString(eu.kanade.tachiyomi.R.string.currently_reading) -> READING context.getString(R.string.repeating) to REPEATING,
getString(eu.kanade.tachiyomi.R.string.repeating) -> REREADING context.getString(R.string.plan_to_read) to PLAN_TO_READ,
getString(eu.kanade.tachiyomi.R.string.plan_to_read), getString(eu.kanade.tachiyomi.R.string.want_to_read) -> PLANTOREAD context.getString(R.string.paused) to PAUSED,
getString(eu.kanade.tachiyomi.R.string.on_hold), getString(eu.kanade.tachiyomi.R.string.paused) -> PAUSED context.getString(R.string.completed) to COMPLETED,
getString(eu.kanade.tachiyomi.R.string.completed) -> COMPLETED context.getString(R.string.dropped) to DROPPED
getString(eu.kanade.tachiyomi.R.string.dropped) -> DROPPED )
else -> OTHER
}
}
} }
// SY <-- // SY <--
} }

4
app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryPresenter.kt
View File

@ -866,7 +866,9 @@ class LibraryPresenter(
"not tracked" "not tracked"
} }
} }
val group = grouping.find { it.first == trackManager.mapTrackingOrder(status, context).toString() } val group = grouping.find { (_, statusInt) ->
statusInt == (trackManager.trackMap[status] ?: TrackManager.OTHER)
}
if (group != null) { if (group != null) {
map.getOrPut(group.second) { mutableListOf() } += libraryItem map.getOrPut(group.second) { mutableListOf() } += libraryItem
} else { } else {