Bump dependencies

(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
2023-05-03 14:09:52 -04:00
parent 782b6dec02
commit 4bb617d7ef
5 changed files with 33 additions and 13 deletions
@@ -15,6 +15,7 @@ import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.unit.dp
 import androidx.paging.LoadState
 import androidx.paging.compose.LazyPagingItems
+import androidx.paging.compose.itemKey
 import eu.kanade.presentation.library.components.CommonMangaItemDefaults
 import eu.kanade.presentation.library.components.MangaComfortableGridItem
 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 -->
            val pair by mangaList[index]?.collectAsState() ?: return@items
            val manga = pair.first
            val metadata = pair.second
            // SY <--
+
            BrowseSourceComfortableGridItem(
                manga = manga,
                // SY -->
@@ -15,6 +15,7 @@ import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.unit.dp
 import androidx.paging.LoadState
 import androidx.paging.compose.LazyPagingItems
+import androidx.paging.compose.itemKey
 import eu.kanade.presentation.library.components.CommonMangaItemDefaults
 import eu.kanade.presentation.library.components.MangaCompactGridItem
 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 -->
            val pair by mangaList[index]?.collectAsState() ?: return@items
            val manga = pair.first
            val metadata = pair.second
            // SY <--
+
            BrowseSourceCompactGridItem(
                manga = manga,
                // SY -->
@@ -30,7 +30,7 @@ import androidx.compose.ui.unit.dp
 import androidx.compose.ui.unit.sp
 import androidx.paging.LoadState
 import androidx.paging.compose.LazyPagingItems
-import androidx.paging.compose.items
+import androidx.paging.compose.itemKey
 import com.gowtham.ratingbar.RatingBar
 import com.gowtham.ratingbar.RatingBarConfig
 import eu.kanade.presentation.manga.components.MangaCover
@@ -66,12 +66,14 @@ fun BrowseSourceEHentaiList(
            }
        }

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

-        items(mangaList) { mangaflow ->
-            mangaflow ?: return@items
+        items(
+            count = mangaList.itemCount,
            // 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 metadata = pair.second
            // SY <--