From 4aa9cc3851e8cb0d0942ad788b712f51cc64e23c Mon Sep 17 00:00:00 2001
From: Jobobby04 <jobobby04@users.noreply.github.com>
Date: Sun, 9 Jan 2022 15:39:46 -0500
Subject: [PATCH] Cleanup group by tracking

---
 .../data/library/LibraryUpdateService.kt      |  2 +-
 .../tachiyomi/data/track/TrackManager.kt      | 26 +++++++++----------
 .../tachiyomi/ui/library/LibraryPresenter.kt  |  4 ++-
 3 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/app/src/main/java/eu/kanade/tachiyomi/data/library/LibraryUpdateService.kt b/app/src/main/java/eu/kanade/tachiyomi/data/library/LibraryUpdateService.kt
index 20a85f307..33ebb8564 100755
--- a/app/src/main/java/eu/kanade/tachiyomi/data/library/LibraryUpdateService.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/data/library/LibraryUpdateService.kt
@@ -323,7 +323,7 @@ class LibraryUpdateService(
                                 "not tracked"
                             }
                         }
-                        trackManager.mapTrackingOrder(status, applicationContext) == trackingExtra
+                        (trackManager.trackMap[status] ?: TrackManager.OTHER) == trackingExtra
                     }
                 }
                 LibraryGroup.BY_SOURCE -> {
diff --git a/app/src/main/java/eu/kanade/tachiyomi/data/track/TrackManager.kt b/app/src/main/java/eu/kanade/tachiyomi/data/track/TrackManager.kt
index 044de4732..13333daeb 100755
--- a/app/src/main/java/eu/kanade/tachiyomi/data/track/TrackManager.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/data/track/TrackManager.kt
@@ -1,6 +1,7 @@
 package eu.kanade.tachiyomi.data.track
 
 import android.content.Context
+import eu.kanade.tachiyomi.R
 import eu.kanade.tachiyomi.data.track.anilist.Anilist
 import eu.kanade.tachiyomi.data.track.bangumi.Bangumi
 import eu.kanade.tachiyomi.data.track.kitsu.Kitsu
@@ -25,8 +26,8 @@ class TrackManager(context: Context) {
 
         // SY -->
         const val READING = 1
-        const val REREADING = 2
-        const val PLANTOREAD = 3
+        const val REPEATING = 2
+        const val PLAN_TO_READ = 3
         const val PAUSED = 4
         const val COMPLETED = 5
         const val DROPPED = 6
@@ -55,18 +56,15 @@ class TrackManager(context: Context) {
     fun hasLoggedServices() = services.any { it.isLogged }
 
     // SY -->
-    fun mapTrackingOrder(status: String, context: Context): Int {
-        with(context) {
-            return when (status) {
-                getString(eu.kanade.tachiyomi.R.string.reading), getString(eu.kanade.tachiyomi.R.string.currently_reading) -> READING
-                getString(eu.kanade.tachiyomi.R.string.repeating) -> REREADING
-                getString(eu.kanade.tachiyomi.R.string.plan_to_read), getString(eu.kanade.tachiyomi.R.string.want_to_read) -> PLANTOREAD
-                getString(eu.kanade.tachiyomi.R.string.on_hold), getString(eu.kanade.tachiyomi.R.string.paused) -> PAUSED
-                getString(eu.kanade.tachiyomi.R.string.completed) -> COMPLETED
-                getString(eu.kanade.tachiyomi.R.string.dropped) -> DROPPED
-                else -> OTHER
-            }
-        }
+    val trackMap by lazy {
+        mapOf(
+            context.getString(R.string.reading) to READING,
+            context.getString(R.string.repeating) to REPEATING,
+            context.getString(R.string.plan_to_read) to PLAN_TO_READ,
+            context.getString(R.string.paused) to PAUSED,
+            context.getString(R.string.completed) to COMPLETED,
+            context.getString(R.string.dropped) to DROPPED
+        )
     }
     // SY <--
 }
diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryPresenter.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryPresenter.kt
index 71ee2671d..036e3d5fb 100755
--- a/app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryPresenter.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryPresenter.kt
@@ -866,7 +866,9 @@ class LibraryPresenter(
                             "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) {
                         map.getOrPut(group.second) { mutableListOf() } += libraryItem
                     } else {