admin/TachiyomiSY
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add new manga statuses

Browse Source 
To be exposed in extension-lib 1.3

(cherry picked from commit 375a27a93d)

# Conflicts:
#	app/src/main/java/eu/kanade/tachiyomi/ui/manga/info/MangaInfoHeaderAdapter.kt
This commit is contained in:
arkon
2022-01-08 15:39:45 -05:00
committed by Jobobby04
parent a6210baf70
commit 7cc14bb5d0
14 changed files with 23 additions and 77 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/src/main/java/eu/kanade/tachiyomi/source/model/SManga.kt
+3 -6
View File
@@ -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()
app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryPresenter.kt
+2 -2
View File
@@ -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))
}
app/src/main/java/eu/kanade/tachiyomi/ui/manga/EditMangaDialog.kt
+9 -9
View File
@@ -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
}
},
app/src/main/java/eu/kanade/tachiyomi/ui/manga/info/MangaInfoHeaderAdapter.kt
+3 -5
View File
@@ -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)
app/src/main/java/exh/md/handlers/ApiMangaParser.kt
+3 -3
View File
@@ -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
}