From 46ab5af9051f217b925ed52e51ca2b331c82cbd7 Mon Sep 17 00:00:00 2001 From: Isira Seneviratne Date: Sat, 1 Jul 2023 15:45:51 +0530 Subject: [PATCH] Apply suggestions. --- .../core/model/parcelable/ParcelableManga.kt | 16 ++++++++-------- .../model/parcelable/ParcelableMangaChapters.kt | 6 +++--- .../core/model/parcelable/ParcelableMangaPage.kt | 4 ++-- .../core/model/parcelable/ParcelableMangaTags.kt | 6 +++--- .../kotatsu/details/ui/DetailsActivity.kt | 2 +- .../koitharu/kotatsu/reader/ui/ReaderActivity.kt | 2 +- .../ui/colorfilter/ColorFilterConfigActivity.kt | 2 +- .../reader/ui/thumbnails/PagesThumbnailsSheet.kt | 2 +- 8 files changed, 20 insertions(+), 20 deletions(-) diff --git a/app/src/main/kotlin/org/koitharu/kotatsu/core/model/parcelable/ParcelableManga.kt b/app/src/main/kotlin/org/koitharu/kotatsu/core/model/parcelable/ParcelableManga.kt index 9a9399c94..81893cd4c 100644 --- a/app/src/main/kotlin/org/koitharu/kotatsu/core/model/parcelable/ParcelableManga.kt +++ b/app/src/main/kotlin/org/koitharu/kotatsu/core/model/parcelable/ParcelableManga.kt @@ -3,7 +3,6 @@ package org.koitharu.kotatsu.core.model.parcelable import android.os.Parcel import android.os.Parcelable import androidx.core.os.ParcelCompat -import kotlinx.parcelize.IgnoredOnParcel import kotlinx.parcelize.Parceler import kotlinx.parcelize.Parcelize 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 data class ParcelableManga( val manga: Manga, - @IgnoredOnParcel private val withChapters: Boolean = true, + private val withChapters: Boolean, ) : Parcelable { companion object : Parceler { private fun Manga.writeToParcel(out: Parcel, flags: Int, withChapters: Boolean) { @@ -64,21 +63,22 @@ data class ParcelableManga( override fun create(parcel: Parcel) = ParcelableManga( Manga( id = parcel.readLong(), - title = parcel.readString()!!, + title = requireNotNull(parcel.readString()), altTitle = parcel.readString(), - url = parcel.readString()!!, - publicUrl = parcel.readString()!!, + url = requireNotNull(parcel.readString()), + publicUrl = requireNotNull(parcel.readString()), rating = parcel.readFloat(), isNsfw = ParcelCompat.readBoolean(parcel), - coverUrl = parcel.readString()!!, + coverUrl = requireNotNull(parcel.readString()), largeCoverUrl = parcel.readString(), description = parcel.readString(), - tags = parcel.readParcelableCompat()!!.tags, + tags = requireNotNull(parcel.readParcelableCompat()).tags, state = parcel.readSerializableCompat(), author = parcel.readString(), chapters = parcel.readParcelableCompat()?.chapters, - source = parcel.readSerializableCompat()!!, + source = requireNotNull(parcel.readSerializableCompat()), ), + withChapters = true ) } } diff --git a/app/src/main/kotlin/org/koitharu/kotatsu/core/model/parcelable/ParcelableMangaChapters.kt b/app/src/main/kotlin/org/koitharu/kotatsu/core/model/parcelable/ParcelableMangaChapters.kt index 3aa622ba6..e080696cf 100644 --- a/app/src/main/kotlin/org/koitharu/kotatsu/core/model/parcelable/ParcelableMangaChapters.kt +++ b/app/src/main/kotlin/org/koitharu/kotatsu/core/model/parcelable/ParcelableMangaChapters.kt @@ -11,13 +11,13 @@ import org.koitharu.kotatsu.parsers.model.MangaChapter object MangaChapterParceler : Parceler { override fun create(parcel: Parcel) = MangaChapter( id = parcel.readLong(), - name = parcel.readString()!!, + name = requireNotNull(parcel.readString()), number = parcel.readInt(), - url = parcel.readString()!!, + url = requireNotNull(parcel.readString()), scanlator = parcel.readString(), uploadDate = parcel.readLong(), branch = parcel.readString(), - source = parcel.readSerializableCompat()!!, + source = requireNotNull(parcel.readSerializableCompat()), ) override fun MangaChapter.write(parcel: Parcel, flags: Int) { diff --git a/app/src/main/kotlin/org/koitharu/kotatsu/core/model/parcelable/ParcelableMangaPage.kt b/app/src/main/kotlin/org/koitharu/kotatsu/core/model/parcelable/ParcelableMangaPage.kt index 21b6d671a..eee936e84 100644 --- a/app/src/main/kotlin/org/koitharu/kotatsu/core/model/parcelable/ParcelableMangaPage.kt +++ b/app/src/main/kotlin/org/koitharu/kotatsu/core/model/parcelable/ParcelableMangaPage.kt @@ -11,9 +11,9 @@ import org.koitharu.kotatsu.parsers.model.MangaPage object MangaPageParceler : Parceler { override fun create(parcel: Parcel) = MangaPage( id = parcel.readLong(), - url = parcel.readString()!!, + url = requireNotNull(parcel.readString()), preview = parcel.readString(), - source = parcel.readSerializableCompat()!!, + source = requireNotNull(parcel.readSerializableCompat()), ) override fun MangaPage.write(parcel: Parcel, flags: Int) { diff --git a/app/src/main/kotlin/org/koitharu/kotatsu/core/model/parcelable/ParcelableMangaTags.kt b/app/src/main/kotlin/org/koitharu/kotatsu/core/model/parcelable/ParcelableMangaTags.kt index 1cd12b780..75640156a 100644 --- a/app/src/main/kotlin/org/koitharu/kotatsu/core/model/parcelable/ParcelableMangaTags.kt +++ b/app/src/main/kotlin/org/koitharu/kotatsu/core/model/parcelable/ParcelableMangaTags.kt @@ -10,9 +10,9 @@ import org.koitharu.kotatsu.parsers.model.MangaTag object MangaTagParceler : Parceler { override fun create(parcel: Parcel) = MangaTag( - title = parcel.readString()!!, - key = parcel.readString()!!, - source = parcel.readSerializableCompat()!!, + title = requireNotNull(parcel.readString()), + key = requireNotNull(parcel.readString()), + source = requireNotNull(parcel.readSerializableCompat()), ) override fun MangaTag.write(parcel: Parcel, flags: Int) { diff --git a/app/src/main/kotlin/org/koitharu/kotatsu/details/ui/DetailsActivity.kt b/app/src/main/kotlin/org/koitharu/kotatsu/details/ui/DetailsActivity.kt index 2c04da589..e41b998d2 100644 --- a/app/src/main/kotlin/org/koitharu/kotatsu/details/ui/DetailsActivity.kt +++ b/app/src/main/kotlin/org/koitharu/kotatsu/details/ui/DetailsActivity.kt @@ -362,7 +362,7 @@ class DetailsActivity : fun newIntent(context: Context, manga: Manga): Intent { 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 { diff --git a/app/src/main/kotlin/org/koitharu/kotatsu/reader/ui/ReaderActivity.kt b/app/src/main/kotlin/org/koitharu/kotatsu/reader/ui/ReaderActivity.kt index 7d330ff1a..63702d529 100644 --- a/app/src/main/kotlin/org/koitharu/kotatsu/reader/ui/ReaderActivity.kt +++ b/app/src/main/kotlin/org/koitharu/kotatsu/reader/ui/ReaderActivity.kt @@ -405,7 +405,7 @@ class ReaderActivity : .setAction(ACTION_MANGA_READ) 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 { diff --git a/app/src/main/kotlin/org/koitharu/kotatsu/reader/ui/colorfilter/ColorFilterConfigActivity.kt b/app/src/main/kotlin/org/koitharu/kotatsu/reader/ui/colorfilter/ColorFilterConfigActivity.kt index 68eaa3bc5..15a80a2a2 100644 --- a/app/src/main/kotlin/org/koitharu/kotatsu/reader/ui/colorfilter/ColorFilterConfigActivity.kt +++ b/app/src/main/kotlin/org/koitharu/kotatsu/reader/ui/colorfilter/ColorFilterConfigActivity.kt @@ -152,7 +152,7 @@ class ColorFilterConfigActivity : fun newIntent(context: Context, manga: Manga, page: MangaPage) = Intent(context, ColorFilterConfigActivity::class.java) - .putExtra(EXTRA_MANGA, ParcelableManga(manga, false)) + .putExtra(EXTRA_MANGA, ParcelableManga(manga, withChapters = false)) .putExtra(EXTRA_PAGES, ParcelableMangaPage(page)) } } diff --git a/app/src/main/kotlin/org/koitharu/kotatsu/reader/ui/thumbnails/PagesThumbnailsSheet.kt b/app/src/main/kotlin/org/koitharu/kotatsu/reader/ui/thumbnails/PagesThumbnailsSheet.kt index e25b3eed4..3beb79c7b 100644 --- a/app/src/main/kotlin/org/koitharu/kotatsu/reader/ui/thumbnails/PagesThumbnailsSheet.kt +++ b/app/src/main/kotlin/org/koitharu/kotatsu/reader/ui/thumbnails/PagesThumbnailsSheet.kt @@ -192,7 +192,7 @@ class PagesThumbnailsSheet : fun show(fm: FragmentManager, manga: Manga, chapterId: Long, currentPage: Int = -1) { PagesThumbnailsSheet().withArgs(3) { - putParcelable(ARG_MANGA, ParcelableManga(manga)) + putParcelable(ARG_MANGA, ParcelableManga(manga, withChapters = true)) putLong(ARG_CHAPTER_ID, chapterId) putInt(ARG_CURRENT_PAGE, currentPage) }.showDistinct(fm, TAG)