Add new manga statuses

To be exposed in extension-lib 1.3

(cherry picked from commit 375a27a93d76292a47310e9544c895f517af35f9)

# Conflicts:
#	app/src/main/java/eu/kanade/tachiyomi/ui/manga/info/MangaInfoHeaderAdapter.kt

app/src/main/java/eu/kanade/tachiyomi/source/model/SManga.kt

@@ -87,12 +87,9 @@ interface SManga : Serializable {
         const val ONGOING = 1
         const val COMPLETED = 2
         const val LICENSED = 3
-
+        const val PUBLISHING_FINISHED = 4
-        // SY --> Mangadex specific statuses
+        const val CANCELLED = 5
-        const val PUBLICATION_COMPLETE = 61
+        const val ON_HIATUS = 6
-        const val CANCELLED = 62
-        const val HIATUS = 63
-        // SY <--
 
         fun create(): SManga {
             return SMangaImpl()

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

@@ -831,8 +831,8 @@ class LibraryPresenter(
                 grouping += Triple(SManga.ONGOING.toString(), SManga.ONGOING, context.getString(R.string.ongoing))
                 grouping += Triple(SManga.LICENSED.toString(), SManga.LICENSED, context.getString(R.string.licensed))
                 grouping += Triple(SManga.CANCELLED.toString(), SManga.CANCELLED, context.getString(R.string.cancelled))
-                grouping += Triple(SManga.HIATUS.toString(), SManga.HIATUS, context.getString(R.string.hiatus))
+                grouping += Triple(SManga.ON_HIATUS.toString(), SManga.ON_HIATUS, context.getString(R.string.on_hiatus))
-                grouping += Triple(SManga.PUBLICATION_COMPLETE.toString(), SManga.PUBLICATION_COMPLETE, context.getString(R.string.publication_complete))
+                grouping += Triple(SManga.PUBLISHING_FINISHED.toString(), SManga.PUBLISHING_FINISHED, context.getString(R.string.publishing_finished))
                 grouping += Triple(SManga.COMPLETED.toString(), SManga.COMPLETED, context.getString(R.string.completed))
                 grouping += Triple(SManga.UNKNOWN.toString(), SManga.UNKNOWN, context.getString(R.string.unknown))
             }

app/src/main/java/eu/kanade/tachiyomi/ui/manga/EditMangaDialog.kt

@@ -86,9 +86,9 @@ class EditMangaDialog : DialogController {
                 R.string.ongoing,
                 R.string.completed,
                 R.string.licensed,
-                R.string.publication_complete,
+                R.string.publishing_finished,
-                R.string.hiatus,
+                R.string.cancelled,
-                R.string.cancelled
+                R.string.on_hiatus,
             ).map { context.getString(it) }
         )
 
@@ -100,9 +100,9 @@ class EditMangaDialog : DialogController {
                     SManga.ONGOING -> 1
                     SManga.COMPLETED -> 2
                     SManga.LICENSED -> 3
-                    SManga.PUBLICATION_COMPLETE -> 4
+                    SManga.PUBLISHING_FINISHED, 61 -> 4
-                    SManga.HIATUS -> 5
+                    SManga.CANCELLED, 62 -> 5
-                    SManga.CANCELLED -> 6
+                    SManga.ON_HIATUS, 63 -> 6
                     else -> 0
                 }
             )
@@ -197,9 +197,9 @@ class EditMangaDialog : DialogController {
                     1 -> SManga.ONGOING
                     2 -> SManga.COMPLETED
                     3 -> SManga.LICENSED
-                    4 -> SManga.PUBLICATION_COMPLETE
+                    4 -> SManga.PUBLISHING_FINISHED
-                    5 -> SManga.HIATUS
+                    5 -> SManga.CANCELLED
-                    6 -> SManga.CANCELLED
+                    6 -> SManga.ON_HIATUS
                     else -> null
                 }
             },

app/src/main/java/eu/kanade/tachiyomi/ui/manga/info/MangaInfoHeaderAdapter.kt

@@ -345,11 +345,9 @@ class MangaInfoHeaderAdapter(
                 SManga.ONGOING -> R.drawable.ic_status_ongoing_24dp to R.string.ongoing
                 SManga.COMPLETED -> R.drawable.ic_status_completed_24dp to R.string.completed
                 SManga.LICENSED -> R.drawable.ic_status_licensed_24dp to R.string.licensed
-                // SY --> MangaDex specific statuses
+                SManga.PUBLISHING_FINISHED, 61 -> R.drawable.ic_done_24dp to R.string.publishing_finished
-                SManga.HIATUS -> R.drawable.ic_status_hiatus_24dp to R.string.hiatus
+                SManga.CANCELLED, 62 -> R.drawable.ic_close_24dp to R.string.cancelled
-                SManga.PUBLICATION_COMPLETE -> R.drawable.ic_status_publication_complete_24dp to R.string.publication_complete
+                SManga.ON_HIATUS, 63 -> R.drawable.ic_pause_24dp to R.string.on_hiatus
-                SManga.CANCELLED -> R.drawable.ic_status_cancelled_24dp to R.string.cancelled
-                // SY <--
                 else -> R.drawable.ic_status_unknown_24dp to R.string.unknown
             }
             binding.mangaStatusIcon.setImageResource(statusDrawable)

app/src/main/java/exh/md/handlers/ApiMangaParser.kt

@@ -111,7 +111,7 @@ class ApiMangaParser(
                 // val filteredChapters = filterChapterForChecking(networkApiManga)
 
                 val tempStatus = parseStatus(mangaAttributesDto.status)
-                val publishedOrCancelled = tempStatus == SManga.PUBLICATION_COMPLETE || tempStatus == SManga.CANCELLED
+                val publishedOrCancelled = tempStatus == SManga.PUBLISHING_FINISHED || tempStatus == SManga.CANCELLED
                 status = if (
                     mangaAttributesDto.lastChapter != null &&
                     publishedOrCancelled &&
@@ -170,9 +170,9 @@ class ApiMangaParser(
 
     private fun parseStatus(status: String?) = when (status) {
         "ongoing" -> SManga.ONGOING
-        "completed" -> SManga.PUBLICATION_COMPLETE
+        "completed" -> SManga.PUBLISHING_FINISHED
         "cancelled" -> SManga.CANCELLED
-        "hiatus" -> SManga.HIATUS
+        "hiatus" -> SManga.ON_HIATUS
         else -> SManga.UNKNOWN
     }
 

app/src/main/res/drawable/ic_status_cancelled_24dp.xml

@@ -1,9 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24">
-    <path
-        android:fillColor="@android:color/white"
-        android:pathData="M7,11v2h10v-2H7zM12,2C6.48,2 2,6.48 2,12s4.48,10 10,10s10,-4.48 10,-10S17.52,2 12,2zM12,20c-4.41,0 -8,-3.59 -8,-8s3.59,-8 8,-8s8,3.59 8,8S16.41,20 12,20z" />
-</vector>

app/src/main/res/drawable/ic_status_hiatus_24dp.xml

@@ -1,9 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24">
-    <path
-        android:fillColor="@android:color/white"
-        android:pathData="M6,19h4L10,5L6,5v14zM14,5v14h4L18,5h-4z" />
-</vector>

app/src/main/res/drawable/ic_status_publication_complete_24dp.xml

@@ -1,9 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24">
-    <path
-        android:fillColor="@android:color/white"
-        android:pathData="M9,16.2L4.8,12l-1.4,1.4L9,19 21,7l-1.4,-1.4L9,16.2z" />
-</vector>

app/src/main/res/values-fr/strings_sy.xml

@@ -247,11 +247,6 @@
     <string name="merge">Fusionner</string>
     <string name="merge_with_another_source">Fusionner avec une autre</string>
 
-    <!-- Manga info fragment -->
-    <string name="hiatus">Hiatus</string>
-    <string name="cancelled">Annulé</string>
-    <string name="publication_complete">Publication terminée</string>
-
     <!-- Manga Info Edit -->
     <string name="reset_tags">Réinitialiser les Tags</string>
     <string name="add_tag">Ajouter un Tag</string>

app/src/main/res/values-in/strings_sy.xml

@@ -324,11 +324,6 @@
     <string name="merged_already">Manga ini sudah tergabung dengan manga saat ini!</string>
     <string name="merge_duplicate">Manga gabungan ini adalah duplikat!</string>
 
-    <!-- Manga info fragment -->
-    <string name="hiatus">Hiatus</string>
-    <string name="cancelled">Dibatalkan</string>
-    <string name="publication_complete">Publikasi Selesai</string>
-
     <!-- Manga Info Edit -->
     <string name="reset_tags">Reset Tagar</string>
     <string name="add_tag">Tambah Tagar</string>

app/src/main/res/values-pt-rBR/strings_sy.xml

@@ -304,11 +304,6 @@
     <string name="merge">Juntar</string>
     <string name="merge_with_another_source">Juntar Com Outra</string>
 
-    <!-- Manga info fragment -->
-    <string name="hiatus">Hiato</string>
-    <string name="cancelled">Cancelado</string>
-    <string name="publication_complete">Publicação Finalizada</string>
-
     <!-- Manga Info Edit -->
     <string name="reset_tags">Redefinir Tags</string>
     <string name="add_tag">Adicionar Tag</string>

app/src/main/res/values-ru/strings_sy.xml

@@ -324,11 +324,6 @@
     <string name="merged_already">Эта серия, уже слита с текущей серией!</string>
     <string name="merge_duplicate">Эта слитая серия является дубликатом!</string>
 
-    <!-- Manga info fragment -->
-    <string name="hiatus">На паузе</string>
-    <string name="cancelled">Отменено</string>
-    <string name="publication_complete">Публикация завершена</string>
-
     <!-- Manga Info Edit -->
     <string name="reset_tags">Сбросить тэги</string>
     <string name="add_tag">Добавить тэг</string>

app/src/main/res/values/strings.xml

@@ -561,6 +561,9 @@
     <string name="unknown_author">Unknown author</string>
     <string name="unknown_status">Unknown status</string>
     <string name="licensed">Licensed</string>
+    <string name="publishing_finished">Publishing finished</string>
+    <string name="cancelled">Cancelled</string>
+    <string name="on_hiatus">On hiatus</string>
     <string name="add_to_library">Add to library</string>
     <string name="in_library">In library</string>
     <string name="remove_from_library">Remove from library</string>

app/src/main/res/values/strings_sy.xml

@@ -324,11 +324,6 @@
     <string name="merged_already">This manga is already merged with the current manga!</string>
     <string name="merge_duplicate">This merged manga is a duplicate!</string>
 
-    <!-- Manga info fragment -->
-    <string name="hiatus">Hiatus</string>
-    <string name="cancelled">Cancelled</string>
-    <string name="publication_complete">Publication Complete</string>
-
     <!-- Manga Info Edit -->
     <string name="reset_tags">Reset Tags</string>
     <string name="add_tag">Add Tag</string>