From 6d78d9685027fa22333f7ae5e7256555d26bf958 Mon Sep 17 00:00:00 2001 From: AntsyLich <59261191+AntsyLich@users.noreply.github.com> Date: Mon, 2 Sep 2024 21:54:53 +0600 Subject: [PATCH] Add stable marker to Manga data class Co-authored-by: ivan <12537387+ivaniskandar@users.noreply.github.com> (cherry picked from commit 4ee31bfea5b6908e7131e2c46e4cb46155005abf) --- .../kanade/presentation/manga/MangaScreen.kt | 12 +-- .../manga/components/MangaCoverDialog.kt | 4 +- .../manga/components/MangaInfoHeader.kt | 85 +++++++++---------- .../kanade/tachiyomi/ui/manga/MangaScreen.kt | 2 +- domain/build.gradle.kts | 2 + .../tachiyomi/domain/manga/model/Manga.kt | 2 + gradle/libs.versions.toml | 1 + 7 files changed, 48 insertions(+), 60 deletions(-) diff --git a/app/src/main/java/eu/kanade/presentation/manga/MangaScreen.kt b/app/src/main/java/eu/kanade/presentation/manga/MangaScreen.kt index dfaa21755..d513343fa 100644 --- a/app/src/main/java/eu/kanade/presentation/manga/MangaScreen.kt +++ b/app/src/main/java/eu/kanade/presentation/manga/MangaScreen.kt @@ -561,13 +561,9 @@ private fun MangaScreenSmallImpl( MangaInfoBox( isTabletUi = false, appBarPadding = topPadding, - title = state.manga.title, - author = state.manga.author, - artist = state.manga.artist, + manga = state.manga, sourceName = remember { state.source.getNameForMangaInfo(state.mergedData?.sources) }, isStubSource = remember { state.source is StubSource }, - coverDataProvider = { state.manga }, - status = state.manga.status, onCoverClick = onCoverClicked, doSearch = onSearch, // KMK --> @@ -975,13 +971,9 @@ private fun MangaScreenLargeImpl( MangaInfoBox( isTabletUi = true, appBarPadding = contentPadding.calculateTopPadding(), - title = state.manga.title, - author = state.manga.author, - artist = state.manga.artist, + manga = state.manga, sourceName = remember { state.source.getNameForMangaInfo(state.mergedData?.sources) }, isStubSource = remember { state.source is StubSource }, - coverDataProvider = { state.manga }, - status = state.manga.status, onCoverClick = onCoverClicked, doSearch = onSearch, // KMK --> diff --git a/app/src/main/java/eu/kanade/presentation/manga/components/MangaCoverDialog.kt b/app/src/main/java/eu/kanade/presentation/manga/components/MangaCoverDialog.kt index 99fa04fcd..569c13e66 100644 --- a/app/src/main/java/eu/kanade/presentation/manga/components/MangaCoverDialog.kt +++ b/app/src/main/java/eu/kanade/presentation/manga/components/MangaCoverDialog.kt @@ -58,7 +58,7 @@ import tachiyomi.presentation.core.util.clickableNoIndication @Composable fun MangaCoverDialog( - coverDataProvider: () -> Manga, + manga: Manga, isCustomCover: Boolean, snackbarHostState: SnackbarHostState, onShareClick: () -> Unit, @@ -203,7 +203,7 @@ fun MangaCoverDialog( }, update = { view -> val request = ImageRequest.Builder(view.context) - .data(coverDataProvider()) + .data(manga) .size(Size.ORIGINAL) .memoryCachePolicy(CachePolicy.DISABLED) .target { image -> diff --git a/app/src/main/java/eu/kanade/presentation/manga/components/MangaInfoHeader.kt b/app/src/main/java/eu/kanade/presentation/manga/components/MangaInfoHeader.kt index 5a526dc07..3fa9abca5 100644 --- a/app/src/main/java/eu/kanade/presentation/manga/components/MangaInfoHeader.kt +++ b/app/src/main/java/eu/kanade/presentation/manga/components/MangaInfoHeader.kt @@ -74,6 +74,8 @@ import androidx.compose.ui.unit.Dp import androidx.compose.ui.unit.dp import androidx.compose.ui.unit.sp import coil3.compose.AsyncImage +import coil3.request.ImageRequest +import coil3.request.crossfade import eu.kanade.domain.ui.UiPreferences import eu.kanade.presentation.components.DropdownMenu import eu.kanade.tachiyomi.R @@ -105,13 +107,9 @@ private val whitespaceLineRegex = Regex("[\\r\\n]{2,}", setOf(RegexOption.MULTIL fun MangaInfoBox( isTabletUi: Boolean, appBarPadding: Dp, - title: String, - author: String?, - artist: String?, + manga: Manga, sourceName: String, isStubSource: Boolean, - coverDataProvider: () -> Manga, - status: Long, onCoverClick: () -> Unit, doSearch: (query: String, global: Boolean) -> Unit, modifier: Modifier = Modifier, @@ -128,7 +126,10 @@ fun MangaInfoBox( MaterialTheme.colorScheme.background, ) AsyncImage( - model = coverDataProvider(), + model = ImageRequest.Builder(LocalContext.current) + .data(manga) + .crossfade(true) + .build(), contentDescription = null, contentScale = ContentScale.Crop, modifier = Modifier @@ -157,15 +158,11 @@ fun MangaInfoBox( if (!isTabletUi) { MangaAndSourceTitlesSmall( appBarPadding = appBarPadding, - coverDataProvider = coverDataProvider, - onCoverClick = onCoverClick, - title = title, - doSearch = doSearch, - author = author, - artist = artist, - status = status, + manga = manga, sourceName = sourceName, isStubSource = isStubSource, + onCoverClick = onCoverClick, + doSearch = doSearch, // KMK --> librarySearch = librarySearch, onSourceClick = onSourceClick, @@ -175,15 +172,11 @@ fun MangaInfoBox( } else { MangaAndSourceTitlesLarge( appBarPadding = appBarPadding, - coverDataProvider = coverDataProvider, - onCoverClick = onCoverClick, - title = title, - doSearch = doSearch, - author = author, - artist = artist, - status = status, + manga = manga, sourceName = sourceName, isStubSource = isStubSource, + onCoverClick = onCoverClick, + doSearch = doSearch, // KMK --> librarySearch = librarySearch, onSourceClick = onSourceClick, @@ -436,15 +429,11 @@ fun ExpandableMangaDescription( @Composable private fun MangaAndSourceTitlesLarge( appBarPadding: Dp, - coverDataProvider: () -> Manga, - onCoverClick: () -> Unit, - title: String, - doSearch: (query: String, global: Boolean) -> Unit, - author: String?, - artist: String?, - status: Long, + manga: Manga, sourceName: String, isStubSource: Boolean, + onCoverClick: () -> Unit, + doSearch: (query: String, global: Boolean) -> Unit, // KMK --> librarySearch: (query: String) -> Unit, onSourceClick: () -> Unit, @@ -459,7 +448,10 @@ private fun MangaAndSourceTitlesLarge( ) { MangaCover.Book( modifier = Modifier.fillMaxWidth(0.65f), - data = coverDataProvider(), + data = ImageRequest.Builder(LocalContext.current) + .data(manga) + .crossfade(true) + .build(), contentDescription = stringResource(MR.strings.manga_cover), onClick = onCoverClick, // KMK --> @@ -468,13 +460,13 @@ private fun MangaAndSourceTitlesLarge( ) Spacer(modifier = Modifier.height(16.dp)) MangaContentInfo( - title = title, - doSearch = doSearch, - author = author, - artist = artist, - status = status, + title = manga.title, + author = manga.author, + artist = manga.artist, + status = manga.status, sourceName = sourceName, isStubSource = isStubSource, + doSearch = doSearch, textAlign = TextAlign.Center, // KMK --> librarySearch = librarySearch, @@ -487,15 +479,11 @@ private fun MangaAndSourceTitlesLarge( @Composable private fun MangaAndSourceTitlesSmall( appBarPadding: Dp, - coverDataProvider: () -> Manga, - onCoverClick: () -> Unit, - title: String, - doSearch: (query: String, global: Boolean) -> Unit, - author: String?, - artist: String?, - status: Long, + manga: Manga, sourceName: String, isStubSource: Boolean, + onCoverClick: () -> Unit, + doSearch: (query: String, global: Boolean) -> Unit, // KMK --> librarySearch: (query: String) -> Unit, onSourceClick: () -> Unit, @@ -513,7 +501,10 @@ private fun MangaAndSourceTitlesSmall( modifier = Modifier .sizeIn(maxWidth = 100.dp) .align(Alignment.Top), - data = coverDataProvider(), + data = ImageRequest.Builder(LocalContext.current) + .data(manga) + .crossfade(true) + .build(), contentDescription = stringResource(MR.strings.manga_cover), onClick = onCoverClick, // KMK --> @@ -524,13 +515,13 @@ private fun MangaAndSourceTitlesSmall( verticalArrangement = Arrangement.spacedBy(2.dp), ) { MangaContentInfo( - title = title, - doSearch = doSearch, - author = author, - artist = artist, - status = status, + title = manga.title, + author = manga.author, + artist = manga.artist, + status = manga.status, sourceName = sourceName, isStubSource = isStubSource, + doSearch = doSearch, // KMK --> librarySearch = librarySearch, onSourceClick = onSourceClick, @@ -544,12 +535,12 @@ private fun MangaAndSourceTitlesSmall( @Composable private fun ColumnScope.MangaContentInfo( title: String, - doSearch: (query: String, global: Boolean) -> Unit, author: String?, artist: String?, status: Long, sourceName: String, isStubSource: Boolean, + doSearch: (query: String, global: Boolean) -> Unit, textAlign: TextAlign? = LocalTextStyle.current.textAlign, // KMK --> librarySearch: (query: String) -> Unit, diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/manga/MangaScreen.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/manga/MangaScreen.kt index 60ca59d2f..f2613c083 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/manga/MangaScreen.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/manga/MangaScreen.kt @@ -492,7 +492,7 @@ class MangaScreen( ) // KMK <-- MangaCoverDialog( - coverDataProvider = { manga!! }, + manga = manga!!, snackbarHostState = sm.snackbarHostState, isCustomCover = remember(manga) { manga!!.hasCustomCover() }, onShareClick = { sm.shareCover(context) }, diff --git a/domain/build.gradle.kts b/domain/build.gradle.kts index f0226b0e3..df31aad72 100644 --- a/domain/build.gradle.kts +++ b/domain/build.gradle.kts @@ -25,6 +25,8 @@ dependencies { api(libs.sqldelight.android.paging) + compileOnly(libs.compose.stablemarker) + // SY --> implementation(libs.injekt.core) // SY <-- diff --git a/domain/src/main/java/tachiyomi/domain/manga/model/Manga.kt b/domain/src/main/java/tachiyomi/domain/manga/model/Manga.kt index dcdab1304..448ff8100 100644 --- a/domain/src/main/java/tachiyomi/domain/manga/model/Manga.kt +++ b/domain/src/main/java/tachiyomi/domain/manga/model/Manga.kt @@ -1,5 +1,6 @@ package tachiyomi.domain.manga.model +import androidx.compose.runtime.Immutable import eu.kanade.tachiyomi.source.model.UpdateStrategy import tachiyomi.core.common.preference.TriState import tachiyomi.domain.manga.interactor.GetCustomMangaInfo @@ -7,6 +8,7 @@ import uy.kohesive.injekt.injectLazy import java.io.Serializable import java.time.Instant +@Immutable data class Manga( val id: Long, val source: Long, diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index d5e8bb2e3..4e998f103 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -64,6 +64,7 @@ insetter = "dev.chrisbanes.insetter:insetter:0.6.1" compose-materialmotion = "io.github.fornewid:material-motion-compose-core:2.0.1" compose-webview = "io.github.kevinnzou:compose-webview:0.33.6" compose-grid = "io.woong.compose.grid:grid:1.2.2" +compose-stablemarker = "com.github.skydoves:compose-stable-marker:1.0.5" palette-ktx = "androidx.palette:palette-ktx:1.0.0" material-kolor = "com.materialkolor:material-kolor:1.7.0" haze = "dev.chrisbanes.haze:haze:0.7.3"