Update parsers
This commit is contained in:
@@ -16,8 +16,8 @@ android {
|
|||||||
applicationId 'org.koitharu.kotatsu'
|
applicationId 'org.koitharu.kotatsu'
|
||||||
minSdk = 21
|
minSdk = 21
|
||||||
targetSdk = 34
|
targetSdk = 34
|
||||||
versionCode = 616
|
versionCode = 617
|
||||||
versionName = '6.6.6'
|
versionName = '6.6.7'
|
||||||
generatedDensities = []
|
generatedDensities = []
|
||||||
testInstrumentationRunner 'org.koitharu.kotatsu.HiltTestRunner'
|
testInstrumentationRunner 'org.koitharu.kotatsu.HiltTestRunner'
|
||||||
ksp {
|
ksp {
|
||||||
@@ -82,7 +82,7 @@ afterEvaluate {
|
|||||||
}
|
}
|
||||||
dependencies {
|
dependencies {
|
||||||
//noinspection GradleDependency
|
//noinspection GradleDependency
|
||||||
implementation('com.github.KotatsuApp:kotatsu-parsers:7c871edbca') {
|
implementation('com.github.KotatsuApp:kotatsu-parsers:57c9d26916') {
|
||||||
exclude group: 'org.json', module: 'json'
|
exclude group: 'org.json', module: 'json'
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -19,7 +19,8 @@ data class ParcelableChapter(
|
|||||||
MangaChapter(
|
MangaChapter(
|
||||||
id = parcel.readLong(),
|
id = parcel.readLong(),
|
||||||
name = parcel.readString().orEmpty(),
|
name = parcel.readString().orEmpty(),
|
||||||
number = parcel.readInt(),
|
number = parcel.readFloat(),
|
||||||
|
volume = parcel.readInt(),
|
||||||
url = parcel.readString().orEmpty(),
|
url = parcel.readString().orEmpty(),
|
||||||
scanlator = parcel.readString(),
|
scanlator = parcel.readString(),
|
||||||
uploadDate = parcel.readLong(),
|
uploadDate = parcel.readLong(),
|
||||||
@@ -31,7 +32,8 @@ data class ParcelableChapter(
|
|||||||
override fun ParcelableChapter.write(parcel: Parcel, flags: Int) = with(chapter) {
|
override fun ParcelableChapter.write(parcel: Parcel, flags: Int) = with(chapter) {
|
||||||
parcel.writeLong(id)
|
parcel.writeLong(id)
|
||||||
parcel.writeString(name)
|
parcel.writeString(name)
|
||||||
parcel.writeInt(number)
|
parcel.writeFloat(number)
|
||||||
|
parcel.writeInt(volume)
|
||||||
parcel.writeString(url)
|
parcel.writeString(url)
|
||||||
parcel.writeString(scanlator)
|
parcel.writeString(scanlator)
|
||||||
parcel.writeLong(uploadDate)
|
parcel.writeLong(uploadDate)
|
||||||
|
|||||||
@@ -306,7 +306,7 @@ class DownloadsViewModel @Inject constructor(
|
|||||||
return chapters.mapNotNullTo(ArrayList(size)) {
|
return chapters.mapNotNullTo(ArrayList(size)) {
|
||||||
if (chapterIds == null || it.id in chapterIds) {
|
if (chapterIds == null || it.id in chapterIds) {
|
||||||
DownloadChapter(
|
DownloadChapter(
|
||||||
number = it.number,
|
number = it.number.toInt(),
|
||||||
name = it.name,
|
name = it.name,
|
||||||
isDownloaded = it.id in localChapters,
|
isDownloaded = it.id in localChapters,
|
||||||
)
|
)
|
||||||
|
|||||||
@@ -100,6 +100,7 @@ sealed class LocalMangaInput(
|
|||||||
id = id,
|
id = id,
|
||||||
name = name,
|
name = name,
|
||||||
number = number,
|
number = number,
|
||||||
|
volume = volume,
|
||||||
url = url,
|
url = url,
|
||||||
scanlator = scanlator,
|
scanlator = scanlator,
|
||||||
uploadDate = uploadDate,
|
uploadDate = uploadDate,
|
||||||
|
|||||||
@@ -388,7 +388,7 @@ class ReaderViewModel @Inject constructor(
|
|||||||
mangaName = manga?.toManga()?.title,
|
mangaName = manga?.toManga()?.title,
|
||||||
branch = chapter?.branch,
|
branch = chapter?.branch,
|
||||||
chapterName = chapter?.name,
|
chapterName = chapter?.name,
|
||||||
chapterNumber = chapter?.number ?: 0,
|
chapterNumber = chapter?.number?.toInt() ?: 0,
|
||||||
chaptersTotal = manga?.chapters?.get(chapter?.branch)?.size ?: 0,
|
chaptersTotal = manga?.chapters?.get(chapter?.branch)?.size ?: 0,
|
||||||
totalPages = if (chapter != null) chaptersLoader.getPagesCount(chapter.id) else 0,
|
totalPages = if (chapter != null) chaptersLoader.getPagesCount(chapter.id) else 0,
|
||||||
currentPage = state?.page ?: 0,
|
currentPage = state?.page ?: 0,
|
||||||
|
|||||||
Reference in New Issue
Block a user