From 4b84fb5ac52ac4fda7e74b729b9e6462c0ac0302 Mon Sep 17 00:00:00 2001
From: Jay <jays2kings@gmail.com>
Date: Mon, 20 Jan 2020 13:14:05 -0800
Subject: [PATCH] Tracker status naming edits

Cherry picked from ad8c69aa15e7c27879c2a528a45b0744f7e45197
---
 .../java/eu/kanade/tachiyomi/data/track/anilist/Anilist.kt  | 6 +++---
 .../main/java/eu/kanade/tachiyomi/data/track/kitsu/Kitsu.kt | 6 +++---
 app/src/main/res/values/strings.xml                         | 4 +++-
 3 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/app/src/main/java/eu/kanade/tachiyomi/data/track/anilist/Anilist.kt b/app/src/main/java/eu/kanade/tachiyomi/data/track/anilist/Anilist.kt
index 7af0c1ebe..a72c43a64 100644
--- a/app/src/main/java/eu/kanade/tachiyomi/data/track/anilist/Anilist.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/data/track/anilist/Anilist.kt
@@ -57,17 +57,17 @@ class Anilist(private val context: Context, id: Int) : TrackService(id) {
     override fun getLogoColor() = Color.rgb(18, 25, 35)
 
     override fun getStatusList(): List<Int> {
-        return listOf(READING, COMPLETED, PAUSED, DROPPED, PLANNING, REPEATING)
+        return listOf(READING, PLANNING, COMPLETED, REPEATING, PAUSED, DROPPED)
     }
 
     override fun getStatus(status: Int): String = with(context) {
         when (status) {
             READING -> getString(R.string.reading)
+            PLANNING -> getString(R.string.plan_to_read)
             COMPLETED -> getString(R.string.completed)
+            REPEATING -> getString(R.string.repeating)
             PAUSED -> getString(R.string.paused)
             DROPPED -> getString(R.string.dropped)
-            PLANNING -> getString(R.string.plan_to_read)
-            REPEATING -> getString(R.string.repeating)
             else -> ""
         }
     }
diff --git a/app/src/main/java/eu/kanade/tachiyomi/data/track/kitsu/Kitsu.kt b/app/src/main/java/eu/kanade/tachiyomi/data/track/kitsu/Kitsu.kt
index a6f49c401..4b4f8cbcf 100644
--- a/app/src/main/java/eu/kanade/tachiyomi/data/track/kitsu/Kitsu.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/data/track/kitsu/Kitsu.kt
@@ -42,16 +42,16 @@ class Kitsu(private val context: Context, id: Int) : TrackService(id) {
     }
 
     override fun getStatusList(): List<Int> {
-        return listOf(READING, COMPLETED, ON_HOLD, DROPPED, PLAN_TO_READ)
+        return listOf(READING, PLAN_TO_READ, COMPLETED, ON_HOLD, DROPPED)
     }
 
     override fun getStatus(status: Int): String = with(context) {
         when (status) {
-            READING -> getString(R.string.reading)
+            READING -> getString(R.string.currently_reading)
+            PLAN_TO_READ -> getString(R.string.want_to_read)
             COMPLETED -> getString(R.string.completed)
             ON_HOLD -> getString(R.string.on_hold)
             DROPPED -> getString(R.string.dropped)
-            PLAN_TO_READ -> getString(R.string.plan_to_read)
             else -> ""
         }
     }
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index bdf989e33..062dbc81b 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -407,12 +407,14 @@
     <!-- Tracking Screen -->
     <string name="manga_tracking_tab">Tracking</string>
     <string name="reading">Reading</string>
+    <string name="currently_reading">Currently Reading</string>
     <string name="completed">Completed</string>
     <string name="dropped">Dropped</string>
     <string name="on_hold">On hold</string>
     <string name="paused">Paused</string>
     <string name="plan_to_read">Plan to read</string>
-    <string name="repeating">Re-reading</string>
+    <string name="want_to_read">Want to Read</string>
+    <string name="repeating">Rereading</string>
     <string name="score">Score</string>
     <string name="title">Title</string>
     <string name="status">Status</string>