Draff/TachiyomiSY-Plus
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Bump dependencies

Browse Source 
(cherry picked from commit 99378ddf2001ad5b3fab85893a7d59a5415c4a4c)

# Conflicts:
#	app/src/main/java/eu/kanade/presentation/browse/components/BrowseSourceComfortableGrid.kt
#	app/src/main/java/eu/kanade/presentation/browse/components/BrowseSourceCompactGrid.kt
#	app/src/main/java/eu/kanade/presentation/browse/components/BrowseSourceList.kt
This commit is contained in:
arkon 2023-05-03 14:09:52 -04:00 committed by Jobobby04
parent 782b6dec02
commit 4bb617d7ef
5 changed files with 33 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
app/src/main/java/eu/kanade/presentation/browse/components/BrowseSourceComfortableGrid.kt
View File

@ -15,6 +15,7 @@ import androidx.compose.ui.res.stringResource
import androidx.compose.ui.unit.dp import androidx.compose.ui.unit.dp
import androidx.paging.LoadState import androidx.paging.LoadState
import androidx.paging.compose.LazyPagingItems import androidx.paging.compose.LazyPagingItems
import androidx.paging.compose.itemKey
import eu.kanade.presentation.library.components.CommonMangaItemDefaults import eu.kanade.presentation.library.components.CommonMangaItemDefaults
import eu.kanade.presentation.library.components.MangaComfortableGridItem import eu.kanade.presentation.library.components.MangaComfortableGridItem
import eu.kanade.tachiyomi.R import eu.kanade.tachiyomi.R
@ -46,12 +47,18 @@ fun BrowseSourceComfortableGrid(
} }
} }
items(mangaList.itemCount) { index -> items(
count = mangaList.itemCount,
// SY -->
key = mangaList.itemKey { it.value.first.id },
// SY <--
) { index ->
// SY --> // SY -->
val pair by mangaList[index]?.collectAsState() ?: return@items val pair by mangaList[index]?.collectAsState() ?: return@items
val manga = pair.first val manga = pair.first
val metadata = pair.second val metadata = pair.second
// SY <-- // SY <--
BrowseSourceComfortableGridItem( BrowseSourceComfortableGridItem(
manga = manga, manga = manga,
// SY --> // SY -->

9
app/src/main/java/eu/kanade/presentation/browse/components/BrowseSourceCompactGrid.kt
View File

@ -15,6 +15,7 @@ import androidx.compose.ui.res.stringResource
import androidx.compose.ui.unit.dp import androidx.compose.ui.unit.dp
import androidx.paging.LoadState import androidx.paging.LoadState
import androidx.paging.compose.LazyPagingItems import androidx.paging.compose.LazyPagingItems
import androidx.paging.compose.itemKey
import eu.kanade.presentation.library.components.CommonMangaItemDefaults import eu.kanade.presentation.library.components.CommonMangaItemDefaults
import eu.kanade.presentation.library.components.MangaCompactGridItem import eu.kanade.presentation.library.components.MangaCompactGridItem
import eu.kanade.tachiyomi.R import eu.kanade.tachiyomi.R
@ -46,12 +47,18 @@ fun BrowseSourceCompactGrid(
} }
} }
items(mangaList.itemCount) { index -> items(
count = mangaList.itemCount,
// SY -->
key = mangaList.itemKey { it.value.first.id },
// SY <--
) { index ->
// SY --> // SY -->
val pair by mangaList[index]?.collectAsState() ?: return@items val pair by mangaList[index]?.collectAsState() ?: return@items
val manga = pair.first val manga = pair.first
val metadata = pair.second val metadata = pair.second
// SY <-- // SY <--
BrowseSourceCompactGridItem( BrowseSourceCompactGridItem(
manga = manga, manga = manga,
// SY --> // SY -->

12
app/src/main/java/eu/kanade/presentation/browse/components/BrowseSourceEHentaiList.kt
View File

@ -30,7 +30,7 @@ import androidx.compose.ui.unit.dp
import androidx.compose.ui.unit.sp import androidx.compose.ui.unit.sp
import androidx.paging.LoadState import androidx.paging.LoadState
import androidx.paging.compose.LazyPagingItems import androidx.paging.compose.LazyPagingItems
import androidx.paging.compose.items import androidx.paging.compose.itemKey
import com.gowtham.ratingbar.RatingBar import com.gowtham.ratingbar.RatingBar
import com.gowtham.ratingbar.RatingBarConfig import com.gowtham.ratingbar.RatingBarConfig
import eu.kanade.presentation.manga.components.MangaCover import eu.kanade.presentation.manga.components.MangaCover
@ -66,12 +66,14 @@ fun BrowseSourceEHentaiList(
} }
} }
items(mangaList) { initialManga -> items(
val pair by initialManga?.collectAsState() ?: return@items count = mangaList.itemCount,
key = mangaList.itemKey { it.value.first.id },
) { index ->
val pair by mangaList[index]?.collectAsState() ?: return@items
val manga = pair.first val manga = pair.first
// SY -->
val metadata = pair.second val metadata = pair.second
// SY <--
BrowseSourceEHentaiListItem( BrowseSourceEHentaiListItem(
manga = manga, manga = manga,
// SY --> // SY -->

12
app/src/main/java/eu/kanade/presentation/browse/components/BrowseSourceList.kt
View File

@ -11,7 +11,7 @@ import androidx.compose.ui.res.stringResource
import androidx.compose.ui.unit.dp import androidx.compose.ui.unit.dp
import androidx.paging.LoadState import androidx.paging.LoadState
import androidx.paging.compose.LazyPagingItems import androidx.paging.compose.LazyPagingItems
import androidx.paging.compose.items import androidx.paging.compose.itemKey
import eu.kanade.presentation.library.components.CommonMangaItemDefaults import eu.kanade.presentation.library.components.CommonMangaItemDefaults
import eu.kanade.presentation.library.components.MangaListItem import eu.kanade.presentation.library.components.MangaListItem
import eu.kanade.tachiyomi.R import eu.kanade.tachiyomi.R
@ -40,10 +40,14 @@ fun BrowseSourceList(
} }
} }
items(mangaList) { mangaflow -> items(
mangaflow ?: return@items count = mangaList.itemCount,
// SY --> // SY -->
val pair by mangaflow.collectAsState() key = mangaList.itemKey { it.value.first.id },
// SY <--
) { index ->
// SY -->
val pair by mangaList[index]?.collectAsState() ?: return@items
val manga = pair.first val manga = pair.first
val metadata = pair.second val metadata = pair.second
// SY <-- // SY <--

4
gradle/androidx.versions.toml
View File

@ -15,7 +15,7 @@ splashscreen = "androidx.core:core-splashscreen:1.0.0-alpha02"
recyclerview = "androidx.recyclerview:recyclerview:1.3.0" recyclerview = "androidx.recyclerview:recyclerview:1.3.0"
viewpager = "androidx.viewpager:viewpager:1.1.0-alpha01" viewpager = "androidx.viewpager:viewpager:1.1.0-alpha01"
glance = "androidx.glance:glance-appwidget:1.0.0-alpha03" glance = "androidx.glance:glance-appwidget:1.0.0-alpha03"
profileinstaller = "androidx.profileinstaller:profileinstaller:1.3.0" profileinstaller = "androidx.profileinstaller:profileinstaller:1.3.1"
lifecycle-common = { module = "androidx.lifecycle:lifecycle-common", version.ref = "lifecycle_version" } lifecycle-common = { module = "androidx.lifecycle:lifecycle-common", version.ref = "lifecycle_version" }
lifecycle-process = { module = "androidx.lifecycle:lifecycle-process", version.ref = "lifecycle_version" } lifecycle-process = { module = "androidx.lifecycle:lifecycle-process", version.ref = "lifecycle_version" }
@ -25,7 +25,7 @@ work-runtime = "androidx.work:work-runtime-ktx:2.8.1"
guava = "com.google.guava:guava:31.1-android" guava = "com.google.guava:guava:31.1-android"
paging-runtime = "androidx.paging:paging-runtime:3.1.1" paging-runtime = "androidx.paging:paging-runtime:3.1.1"
paging-compose = "androidx.paging:paging-compose:1.0.0-alpha18" paging-compose = "androidx.paging:paging-compose:1.0.0-alpha19"
benchmark-macro = "androidx.benchmark:benchmark-macro-junit4:1.2.0-alpha13" benchmark-macro = "androidx.benchmark:benchmark-macro-junit4:1.2.0-alpha13"
test-ext = "androidx.test.ext:junit-ktx:1.1.5" test-ext = "androidx.test.ext:junit-ktx:1.1.5"