diff --git a/app/src/main/java/eu/kanade/tachiyomi/source/model/SManga.kt b/app/src/main/java/eu/kanade/tachiyomi/source/model/SManga.kt index 15093c263..098bcf6ba 100755 --- a/app/src/main/java/eu/kanade/tachiyomi/source/model/SManga.kt +++ b/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 - - // SY --> Mangadex specific statuses - const val PUBLICATION_COMPLETE = 61 - const val CANCELLED = 62 - const val HIATUS = 63 - // SY <-- + const val PUBLISHING_FINISHED = 4 + const val CANCELLED = 5 + const val ON_HIATUS = 6 fun create(): SManga { return SMangaImpl() 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 5ae870da8..71ee2671d 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 @@ -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.PUBLICATION_COMPLETE.toString(), SManga.PUBLICATION_COMPLETE, context.getString(R.string.publication_complete)) + grouping += Triple(SManga.ON_HIATUS.toString(), SManga.ON_HIATUS, context.getString(R.string.on_hiatus)) + 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)) } diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/manga/EditMangaDialog.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/manga/EditMangaDialog.kt index e4eabea60..1b9637946 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/manga/EditMangaDialog.kt +++ b/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.hiatus, - R.string.cancelled + R.string.publishing_finished, + 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.HIATUS -> 5 - SManga.CANCELLED -> 6 + SManga.PUBLISHING_FINISHED, 61 -> 4 + SManga.CANCELLED, 62 -> 5 + 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 - 5 -> SManga.HIATUS - 6 -> SManga.CANCELLED + 4 -> SManga.PUBLISHING_FINISHED + 5 -> SManga.CANCELLED + 6 -> SManga.ON_HIATUS else -> null } }, diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/manga/info/MangaInfoHeaderAdapter.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/manga/info/MangaInfoHeaderAdapter.kt index ba2a3eb32..aea4671ef 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/manga/info/MangaInfoHeaderAdapter.kt +++ b/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.HIATUS -> R.drawable.ic_status_hiatus_24dp to R.string.hiatus - SManga.PUBLICATION_COMPLETE -> R.drawable.ic_status_publication_complete_24dp to R.string.publication_complete - SManga.CANCELLED -> R.drawable.ic_status_cancelled_24dp to R.string.cancelled - // SY <-- + SManga.PUBLISHING_FINISHED, 61 -> R.drawable.ic_done_24dp to R.string.publishing_finished + SManga.CANCELLED, 62 -> R.drawable.ic_close_24dp to R.string.cancelled + SManga.ON_HIATUS, 63 -> R.drawable.ic_pause_24dp to R.string.on_hiatus else -> R.drawable.ic_status_unknown_24dp to R.string.unknown } binding.mangaStatusIcon.setImageResource(statusDrawable) diff --git a/app/src/main/java/exh/md/handlers/ApiMangaParser.kt b/app/src/main/java/exh/md/handlers/ApiMangaParser.kt index eebdf6a51..3eeafc653 100644 --- a/app/src/main/java/exh/md/handlers/ApiMangaParser.kt +++ b/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 } diff --git a/app/src/main/res/drawable/ic_status_cancelled_24dp.xml b/app/src/main/res/drawable/ic_status_cancelled_24dp.xml deleted file mode 100644 index 9b27c26c3..000000000 --- a/app/src/main/res/drawable/ic_status_cancelled_24dp.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - diff --git a/app/src/main/res/drawable/ic_status_hiatus_24dp.xml b/app/src/main/res/drawable/ic_status_hiatus_24dp.xml deleted file mode 100644 index 2ffb66b3c..000000000 --- a/app/src/main/res/drawable/ic_status_hiatus_24dp.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - diff --git a/app/src/main/res/drawable/ic_status_publication_complete_24dp.xml b/app/src/main/res/drawable/ic_status_publication_complete_24dp.xml deleted file mode 100644 index f4f2c1d78..000000000 --- a/app/src/main/res/drawable/ic_status_publication_complete_24dp.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - diff --git a/app/src/main/res/values-fr/strings_sy.xml b/app/src/main/res/values-fr/strings_sy.xml index 552fcfdff..1fc3fae12 100644 --- a/app/src/main/res/values-fr/strings_sy.xml +++ b/app/src/main/res/values-fr/strings_sy.xml @@ -247,11 +247,6 @@ Fusionner Fusionner avec une autre - - Hiatus - Annulé - Publication terminée - Réinitialiser les Tags Ajouter un Tag diff --git a/app/src/main/res/values-in/strings_sy.xml b/app/src/main/res/values-in/strings_sy.xml index 381f8d795..62edcb4ca 100644 --- a/app/src/main/res/values-in/strings_sy.xml +++ b/app/src/main/res/values-in/strings_sy.xml @@ -324,11 +324,6 @@ Manga ini sudah tergabung dengan manga saat ini! Manga gabungan ini adalah duplikat! - - Hiatus - Dibatalkan - Publikasi Selesai - Reset Tagar Tambah Tagar diff --git a/app/src/main/res/values-pt-rBR/strings_sy.xml b/app/src/main/res/values-pt-rBR/strings_sy.xml index a426a2a26..ad9575c3f 100644 --- a/app/src/main/res/values-pt-rBR/strings_sy.xml +++ b/app/src/main/res/values-pt-rBR/strings_sy.xml @@ -304,11 +304,6 @@ Juntar Juntar Com Outra - - Hiato - Cancelado - Publicação Finalizada - Redefinir Tags Adicionar Tag diff --git a/app/src/main/res/values-ru/strings_sy.xml b/app/src/main/res/values-ru/strings_sy.xml index 8b2e04d4f..05572ee87 100644 --- a/app/src/main/res/values-ru/strings_sy.xml +++ b/app/src/main/res/values-ru/strings_sy.xml @@ -324,11 +324,6 @@ Эта серия, уже слита с текущей серией! Эта слитая серия является дубликатом! - - На паузе - Отменено - Публикация завершена - Сбросить тэги Добавить тэг diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index c908417b5..4b55c7eb1 100755 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -561,6 +561,9 @@ Unknown author Unknown status Licensed + Publishing finished + Cancelled + On hiatus Add to library In library Remove from library diff --git a/app/src/main/res/values/strings_sy.xml b/app/src/main/res/values/strings_sy.xml index 6552eb73e..0cf0fefd2 100644 --- a/app/src/main/res/values/strings_sy.xml +++ b/app/src/main/res/values/strings_sy.xml @@ -324,11 +324,6 @@ This manga is already merged with the current manga! This merged manga is a duplicate! - - Hiatus - Cancelled - Publication Complete - Reset Tags Add Tag