From 1be6c1a3eeea00572aebf4be5729251fe80c4672 Mon Sep 17 00:00:00 2001 From: Mend Renovate Date: Sun, 4 May 2025 18:28:12 +0200 Subject: [PATCH] Update dependency androidx.compose:compose-bom to v2025.04.01 (mihonapp/mihon#2040) Co-authored-by: AntsyLich <59261191+AntsyLich@users.noreply.github.com> Co-authored-by: Cuong-Tran (cherry picked from commit d721a4321bdc6fafdd32e7bfd451b61b2bdd66b7) --- .../components/LibraryUpdateErrorUiItem.kt | 12 ++++++------ gradle/compose.versions.toml | 2 +- .../presentation/core/components/AdaptiveSheet.kt | 2 +- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/app/src/main/java/eu/kanade/presentation/libraryUpdateError/components/LibraryUpdateErrorUiItem.kt b/app/src/main/java/eu/kanade/presentation/libraryUpdateError/components/LibraryUpdateErrorUiItem.kt index e05350612..2a1fa6cda 100644 --- a/app/src/main/java/eu/kanade/presentation/libraryUpdateError/components/LibraryUpdateErrorUiItem.kt +++ b/app/src/main/java/eu/kanade/presentation/libraryUpdateError/components/LibraryUpdateErrorUiItem.kt @@ -35,26 +35,26 @@ internal fun LazyListScope.libraryUpdateErrorUiItems( onClick: (LibraryUpdateErrorItem) -> Unit, onClickCover: (LibraryUpdateErrorItem) -> Unit, ) { - uiModels.forEach { - when (it) { + uiModels.forEach { uiModel -> + when (uiModel) { is LibraryUpdateErrorUiModel.Header -> { stickyHeader( - key = "$STICKY_HEADER_KEY_PREFIX-errorHeader-${it.hashCode()}", + key = "$STICKY_HEADER_KEY_PREFIX-errorHeader-${uiModel.hashCode()}", contentType = "header", ) { ListGroupHeader( modifier = Modifier.animateItemFastScroll(), - text = it.errorMessage, + text = uiModel.errorMessage, tonalElevation = 1.dp, ) } } is LibraryUpdateErrorUiModel.Item -> { item( - key = "error-${it.item.error.errorId}-${it.item.error.mangaId}", + key = "error-${uiModel.item.error.errorId}-${uiModel.item.error.mangaId}", contentType = "item", ) { - val libraryUpdateErrorItem = it.item + val libraryUpdateErrorItem = uiModel.item LibraryUpdateErrorUiItem( modifier = Modifier.animateItemFastScroll(), error = libraryUpdateErrorItem.error, diff --git a/gradle/compose.versions.toml b/gradle/compose.versions.toml index d4eec95c1..8ab3e526a 100644 --- a/gradle/compose.versions.toml +++ b/gradle/compose.versions.toml @@ -1,5 +1,5 @@ [versions] -compose-bom = "2025.04.00" +compose-bom = "2025.04.01" [libraries] activity = "androidx.activity:activity-compose:1.10.1" diff --git a/presentation-core/src/main/java/tachiyomi/presentation/core/components/AdaptiveSheet.kt b/presentation-core/src/main/java/tachiyomi/presentation/core/components/AdaptiveSheet.kt index 61e8be488..a33ad3a5b 100644 --- a/presentation-core/src/main/java/tachiyomi/presentation/core/components/AdaptiveSheet.kt +++ b/presentation-core/src/main/java/tachiyomi/presentation/core/components/AdaptiveSheet.kt @@ -227,7 +227,7 @@ private fun AnchoredDraggableState.preUpPostDownNestedScrollConnection( override suspend fun onPreFling(available: Velocity): Velocity { val toFling = available.toFloat() - return if (toFling < 0 && offset > anchors.minAnchor()) { + return if (toFling < 0 && offset > anchors.minPosition()) { onFling(toFling) // since we go to the anchor with tween settling, consume all for the best UX available