KotatsuApp
/
Kotatsu
2
0
Fork 0
Code Issues 124 Pull Requests Packages Projects Releases 163 Wiki Activity

Apply suggestions.

Browse Source
pull/421/head
Isira Seneviratne 3 years ago committed by Koitharu
parent 9a815f28fa
commit 46ab5af905
8 changed files with 20 additions and 20 deletions
Show Stats Download Patch File Download Diff File

16
app/src/main/kotlin/org/koitharu/kotatsu/core/model/parcelable/ParcelableManga.kt
Unescape Escape View File

@ -3,7 +3,6 @@ package org.koitharu.kotatsu.core.model.parcelable
import android.os.Parcel import android.os.Parcel
import android.os.Parcelable import android.os.Parcelable
import androidx.core.os.ParcelCompat import androidx.core.os.ParcelCompat
import kotlinx.parcelize.IgnoredOnParcel
import kotlinx.parcelize.Parceler import kotlinx.parcelize.Parceler
import kotlinx.parcelize.Parcelize import kotlinx.parcelize.Parcelize
import org.koitharu.kotatsu.core.util.ext.readParcelableCompat import org.koitharu.kotatsu.core.util.ext.readParcelableCompat
@ -17,7 +16,7 @@ private const val MAX_SAFE_CHAPTERS_COUNT = 24 // this is 100% safe
@Parcelize @Parcelize
data class ParcelableManga( data class ParcelableManga(
val manga: Manga, val manga: Manga,
@IgnoredOnParcel private val withChapters: Boolean = true, private val withChapters: Boolean,
) : Parcelable { ) : Parcelable {
companion object : Parceler<ParcelableManga> { companion object : Parceler<ParcelableManga> {
private fun Manga.writeToParcel(out: Parcel, flags: Int, withChapters: Boolean) { private fun Manga.writeToParcel(out: Parcel, flags: Int, withChapters: Boolean) {
@ -64,21 +63,22 @@ data class ParcelableManga(
override fun create(parcel: Parcel) = ParcelableManga( override fun create(parcel: Parcel) = ParcelableManga(
Manga( Manga(
id = parcel.readLong(), id = parcel.readLong(),
title = parcel.readString()!!, title = requireNotNull(parcel.readString()),
altTitle = parcel.readString(), altTitle = parcel.readString(),
url = parcel.readString()!!, url = requireNotNull(parcel.readString()),
publicUrl = parcel.readString()!!, publicUrl = requireNotNull(parcel.readString()),
rating = parcel.readFloat(), rating = parcel.readFloat(),
isNsfw = ParcelCompat.readBoolean(parcel), isNsfw = ParcelCompat.readBoolean(parcel),
coverUrl = parcel.readString()!!, coverUrl = requireNotNull(parcel.readString()),
largeCoverUrl = parcel.readString(), largeCoverUrl = parcel.readString(),
description = parcel.readString(), description = parcel.readString(),
tags = parcel.readParcelableCompat<ParcelableMangaTags>()!!.tags, tags = requireNotNull(parcel.readParcelableCompat<ParcelableMangaTags>()).tags,
state = parcel.readSerializableCompat(), state = parcel.readSerializableCompat(),
author = parcel.readString(), author = parcel.readString(),
chapters = parcel.readParcelableCompat<ParcelableMangaChapters>()?.chapters, chapters = parcel.readParcelableCompat<ParcelableMangaChapters>()?.chapters,
source = parcel.readSerializableCompat()!!, source = requireNotNull(parcel.readSerializableCompat()),
), ),
withChapters = true
) )
} }
} }

6
app/src/main/kotlin/org/koitharu/kotatsu/core/model/parcelable/ParcelableMangaChapters.kt
Unescape Escape View File

@ -11,13 +11,13 @@ import org.koitharu.kotatsu.parsers.model.MangaChapter
object MangaChapterParceler : Parceler<MangaChapter> { object MangaChapterParceler : Parceler<MangaChapter> {
override fun create(parcel: Parcel) = MangaChapter( override fun create(parcel: Parcel) = MangaChapter(
id = parcel.readLong(), id = parcel.readLong(),
name = parcel.readString()!!, name = requireNotNull(parcel.readString()),
number = parcel.readInt(), number = parcel.readInt(),
url = parcel.readString()!!, url = requireNotNull(parcel.readString()),
scanlator = parcel.readString(), scanlator = parcel.readString(),
uploadDate = parcel.readLong(), uploadDate = parcel.readLong(),
branch = parcel.readString(), branch = parcel.readString(),
source = parcel.readSerializableCompat()!!, source = requireNotNull(parcel.readSerializableCompat()),
) )
override fun MangaChapter.write(parcel: Parcel, flags: Int) { override fun MangaChapter.write(parcel: Parcel, flags: Int) {

4
app/src/main/kotlin/org/koitharu/kotatsu/core/model/parcelable/ParcelableMangaPage.kt
Unescape Escape View File

@ -11,9 +11,9 @@ import org.koitharu.kotatsu.parsers.model.MangaPage
object MangaPageParceler : Parceler<MangaPage> { object MangaPageParceler : Parceler<MangaPage> {
override fun create(parcel: Parcel) = MangaPage( override fun create(parcel: Parcel) = MangaPage(
id = parcel.readLong(), id = parcel.readLong(),
url = parcel.readString()!!, url = requireNotNull(parcel.readString()),
preview = parcel.readString(), preview = parcel.readString(),
source = parcel.readSerializableCompat()!!, source = requireNotNull(parcel.readSerializableCompat()),
) )
override fun MangaPage.write(parcel: Parcel, flags: Int) { override fun MangaPage.write(parcel: Parcel, flags: Int) {

6
app/src/main/kotlin/org/koitharu/kotatsu/core/model/parcelable/ParcelableMangaTags.kt
Unescape Escape View File

@ -10,9 +10,9 @@ import org.koitharu.kotatsu.parsers.model.MangaTag
object MangaTagParceler : Parceler<MangaTag> { object MangaTagParceler : Parceler<MangaTag> {
override fun create(parcel: Parcel) = MangaTag( override fun create(parcel: Parcel) = MangaTag(
title = parcel.readString()!!, title = requireNotNull(parcel.readString()),
key = parcel.readString()!!, key = requireNotNull(parcel.readString()),
source = parcel.readSerializableCompat()!!, source = requireNotNull(parcel.readSerializableCompat()),
) )
override fun MangaTag.write(parcel: Parcel, flags: Int) { override fun MangaTag.write(parcel: Parcel, flags: Int) {

2
app/src/main/kotlin/org/koitharu/kotatsu/details/ui/DetailsActivity.kt
Unescape Escape View File

@ -362,7 +362,7 @@ class DetailsActivity :
fun newIntent(context: Context, manga: Manga): Intent { fun newIntent(context: Context, manga: Manga): Intent {
return Intent(context, DetailsActivity::class.java) return Intent(context, DetailsActivity::class.java)
.putExtra(MangaIntent.KEY_MANGA, ParcelableManga(manga)) .putExtra(MangaIntent.KEY_MANGA, ParcelableManga(manga, withChapters = true))
} }
fun newIntent(context: Context, mangaId: Long): Intent { fun newIntent(context: Context, mangaId: Long): Intent {

2
app/src/main/kotlin/org/koitharu/kotatsu/reader/ui/ReaderActivity.kt
Unescape Escape View File

@ -405,7 +405,7 @@ class ReaderActivity :
.setAction(ACTION_MANGA_READ) .setAction(ACTION_MANGA_READ)
fun manga(manga: Manga) = apply { fun manga(manga: Manga) = apply {
intent.putExtra(MangaIntent.KEY_MANGA, ParcelableManga(manga)) intent.putExtra(MangaIntent.KEY_MANGA, ParcelableManga(manga, withChapters = true))
} }
fun mangaId(mangaId: Long) = apply { fun mangaId(mangaId: Long) = apply {

2
app/src/main/kotlin/org/koitharu/kotatsu/reader/ui/colorfilter/ColorFilterConfigActivity.kt
Unescape Escape View File

@ -152,7 +152,7 @@ class ColorFilterConfigActivity :
fun newIntent(context: Context, manga: Manga, page: MangaPage) = fun newIntent(context: Context, manga: Manga, page: MangaPage) =
Intent(context, ColorFilterConfigActivity::class.java) Intent(context, ColorFilterConfigActivity::class.java)
.putExtra(EXTRA_MANGA, ParcelableManga(manga, false)) .putExtra(EXTRA_MANGA, ParcelableManga(manga, withChapters = false))
.putExtra(EXTRA_PAGES, ParcelableMangaPage(page)) .putExtra(EXTRA_PAGES, ParcelableMangaPage(page))
} }
} }

2
app/src/main/kotlin/org/koitharu/kotatsu/reader/ui/thumbnails/PagesThumbnailsSheet.kt
Unescape Escape View File

@ -192,7 +192,7 @@ class PagesThumbnailsSheet :
fun show(fm: FragmentManager, manga: Manga, chapterId: Long, currentPage: Int = -1) { fun show(fm: FragmentManager, manga: Manga, chapterId: Long, currentPage: Int = -1) {
PagesThumbnailsSheet().withArgs(3) { PagesThumbnailsSheet().withArgs(3) {
putParcelable(ARG_MANGA, ParcelableManga(manga)) putParcelable(ARG_MANGA, ParcelableManga(manga, withChapters = true))
putLong(ARG_CHAPTER_ID, chapterId) putLong(ARG_CHAPTER_ID, chapterId)
putInt(ARG_CURRENT_PAGE, currentPage) putInt(ARG_CURRENT_PAGE, currentPage)
}.showDistinct(fm, TAG) }.showDistinct(fm, TAG)

Write Preview
Loading…
Cancel
Save