From c95c364c0ca279a1a1ee8a50a154daa295ad36b6 Mon Sep 17 00:00:00 2001 From: Ahmad Ansori Palembani Date: Wed, 31 Jul 2024 10:28:14 +0700 Subject: [PATCH] fix(about/license): Use Bundle --- .../ui/more/AboutLibraryLicenseController.kt | 15 ++++++++++----- .../tachiyomi/ui/more/AboutLicenseController.kt | 9 ++++++--- 2 files changed, 16 insertions(+), 8 deletions(-) diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/more/AboutLibraryLicenseController.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/more/AboutLibraryLicenseController.kt index 7128133e5a..ead8c7373e 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/more/AboutLibraryLicenseController.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/more/AboutLibraryLicenseController.kt @@ -1,5 +1,6 @@ package eu.kanade.tachiyomi.ui.more +import android.os.Bundle import androidx.compose.foundation.layout.Column import androidx.compose.foundation.layout.padding import androidx.compose.foundation.rememberScrollState @@ -22,13 +23,13 @@ import yokai.presentation.AppBarType import yokai.presentation.YokaiScaffold import yokai.presentation.component.ToolTipButton -class AboutLibraryLicenseController( - private val name: String, - private val website: String?, - private val license: String, -) : BaseComposeController() { +class AboutLibraryLicenseController(private val bundle: Bundle) : BaseComposeController(bundle) { @Composable override fun ScreenContent() { + val name = bundle.getString(LIBRARY_NAME) ?: throw RuntimeException("Missing library name") + val website = bundle.getString(LIBRARY_WEBSITE) + val license = bundle.getString(LIBRARY_LICENSE) ?: throw RuntimeException("Missing library license") + val uriHandler = LocalUriHandler.current YokaiScaffold( @@ -71,3 +72,7 @@ class AboutLibraryLicenseController( ) } } + +const val LIBRARY_NAME = "aboutLibraries__LibraryName" +const val LIBRARY_WEBSITE = "aboutLibraries__LibraryWebsite" +const val LIBRARY_LICENSE = "aboutLibraries__LibraryLicense" diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/more/AboutLicenseController.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/more/AboutLicenseController.kt index d0b13196a5..01a32aa77a 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/more/AboutLicenseController.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/more/AboutLicenseController.kt @@ -1,5 +1,6 @@ package eu.kanade.tachiyomi.ui.more +import android.os.Bundle import androidx.compose.foundation.layout.fillMaxSize import androidx.compose.material3.TopAppBarDefaults import androidx.compose.runtime.Composable @@ -28,9 +29,11 @@ class AboutLicenseController : BaseComposeController() { onLibraryClick = { router.pushController( AboutLibraryLicenseController( - it.name, - it.website, - it.licenses.firstOrNull()?.htmlReadyLicenseContent.orEmpty(), + Bundle().apply { + this.putString(LIBRARY_NAME, it.name) + it.website?.let { website -> this.putString(LIBRARY_WEBSITE, website) } + this.putString(LIBRARY_LICENSE, it.licenses.firstOrNull()?.htmlReadyLicenseContent.orEmpty()) + } ).withFadeTransaction(), ) }