From 81d72edbf0c09f79350d8cef6ebbc5b3c61b2e1d Mon Sep 17 00:00:00 2001 From: GG Bond Date: Tue, 12 Dec 2023 15:45:51 +0800 Subject: [PATCH] Update compose snapshot --- .../com/hippo/ehviewer/ui/screen/DownloadsScreen.kt | 8 ++++---- .../com/hippo/ehviewer/ui/screen/GalleryListScreen.kt | 8 ++++---- .../kotlin/com/hippo/ehviewer/ui/screen/HistoryScreen.kt | 8 ++++---- .../com/hippo/ehviewer/ui/tools/SwipeToDismissBox2.kt | 4 ++-- settings.gradle.kts | 2 +- 5 files changed, 15 insertions(+), 15 deletions(-) diff --git a/app/src/main/kotlin/com/hippo/ehviewer/ui/screen/DownloadsScreen.kt b/app/src/main/kotlin/com/hippo/ehviewer/ui/screen/DownloadsScreen.kt index e0b3e5503..13416d551 100644 --- a/app/src/main/kotlin/com/hippo/ehviewer/ui/screen/DownloadsScreen.kt +++ b/app/src/main/kotlin/com/hippo/ehviewer/ui/screen/DownloadsScreen.kt @@ -38,10 +38,10 @@ import androidx.compose.material3.Icon import androidx.compose.material3.IconButton import androidx.compose.material3.ListItem import androidx.compose.material3.MaterialTheme -import androidx.compose.material3.SwipeToDismissValue +import androidx.compose.material3.SwipeToDismissBoxValue import androidx.compose.material3.Text import androidx.compose.material3.TopAppBar -import androidx.compose.material3.rememberSwipeToDismissState +import androidx.compose.material3.rememberSwipeToDismissBoxState import androidx.compose.runtime.Composable import androidx.compose.runtime.getValue import androidx.compose.runtime.mutableStateListOf @@ -235,9 +235,9 @@ fun DownloadsScreen(navigator: DestinationsNavigator) { ) } items(labelsList, key = { it.label }) { (item) -> - val dismissState = rememberSwipeToDismissState( + val dismissState = rememberSwipeToDismissBoxState( confirmValueChange = { - if (it == SwipeToDismissValue.EndToStart) { + if (it == SwipeToDismissBoxValue.EndToStart) { coroutineScope.launch { DownloadManager.deleteLabel(item) label = "" diff --git a/app/src/main/kotlin/com/hippo/ehviewer/ui/screen/GalleryListScreen.kt b/app/src/main/kotlin/com/hippo/ehviewer/ui/screen/GalleryListScreen.kt index d0ac60cd7..c077013ae 100644 --- a/app/src/main/kotlin/com/hippo/ehviewer/ui/screen/GalleryListScreen.kt +++ b/app/src/main/kotlin/com/hippo/ehviewer/ui/screen/GalleryListScreen.kt @@ -43,11 +43,11 @@ import androidx.compose.material3.Icon import androidx.compose.material3.IconButton import androidx.compose.material3.ListItem import androidx.compose.material3.MaterialTheme -import androidx.compose.material3.SwipeToDismissValue +import androidx.compose.material3.SwipeToDismissBoxValue import androidx.compose.material3.Text import androidx.compose.material3.TopAppBar import androidx.compose.material3.pulltorefresh.rememberPullToRefreshState -import androidx.compose.material3.rememberSwipeToDismissState +import androidx.compose.material3.rememberSwipeToDismissBoxState import androidx.compose.runtime.Composable import androidx.compose.runtime.LaunchedEffect import androidx.compose.runtime.Stable @@ -428,9 +428,9 @@ fun GalleryListScreen(lub: ListUrlBuilder, navigator: DestinationsNavigator) { } items(quickSearchList, key = { it.id!! }) { item -> ReorderableItem(reorderableLazyListState, key = item.id!!) { isDragging -> - val dismissState = rememberSwipeToDismissState( + val dismissState = rememberSwipeToDismissBoxState( confirmValueChange = { - if (it == SwipeToDismissValue.EndToStart) { + if (it == SwipeToDismissBoxValue.EndToStart) { quickSearchList.remove(item) coroutineScope.launchIO { EhDB.deleteQuickSearch(item) diff --git a/app/src/main/kotlin/com/hippo/ehviewer/ui/screen/HistoryScreen.kt b/app/src/main/kotlin/com/hippo/ehviewer/ui/screen/HistoryScreen.kt index e1acb5d93..0bc9804fb 100644 --- a/app/src/main/kotlin/com/hippo/ehviewer/ui/screen/HistoryScreen.kt +++ b/app/src/main/kotlin/com/hippo/ehviewer/ui/screen/HistoryScreen.kt @@ -14,11 +14,11 @@ import androidx.compose.material3.Icon import androidx.compose.material3.IconButton import androidx.compose.material3.MaterialTheme import androidx.compose.material3.Scaffold -import androidx.compose.material3.SwipeToDismissValue +import androidx.compose.material3.SwipeToDismissBoxValue import androidx.compose.material3.Text import androidx.compose.material3.TopAppBar import androidx.compose.material3.TopAppBarDefaults -import androidx.compose.material3.rememberSwipeToDismissState +import androidx.compose.material3.rememberSwipeToDismissBoxState import androidx.compose.runtime.Composable import androidx.compose.runtime.getValue import androidx.compose.runtime.rememberCoroutineScope @@ -111,9 +111,9 @@ fun HistoryScreen(navigator: DestinationsNavigator) { ) { index -> val info = historyData[index] if (info != null) { - val dismissState = rememberSwipeToDismissState( + val dismissState = rememberSwipeToDismissBoxState( confirmValueChange = { - if (it == SwipeToDismissValue.EndToStart) { + if (it == SwipeToDismissBoxValue.EndToStart) { coroutineScope.launchIO { EhDB.deleteHistoryInfo(info) } diff --git a/app/src/main/kotlin/com/hippo/ehviewer/ui/tools/SwipeToDismissBox2.kt b/app/src/main/kotlin/com/hippo/ehviewer/ui/tools/SwipeToDismissBox2.kt index a3eaf2773..ca5eee512 100644 --- a/app/src/main/kotlin/com/hippo/ehviewer/ui/tools/SwipeToDismissBox2.kt +++ b/app/src/main/kotlin/com/hippo/ehviewer/ui/tools/SwipeToDismissBox2.kt @@ -2,7 +2,7 @@ package com.hippo.ehviewer.ui.tools import androidx.compose.foundation.layout.RowScope import androidx.compose.material3.SwipeToDismissBox -import androidx.compose.material3.SwipeToDismissState +import androidx.compose.material3.SwipeToDismissBoxState import androidx.compose.runtime.Composable import androidx.compose.runtime.CompositionLocalProvider import androidx.compose.ui.Modifier @@ -11,7 +11,7 @@ import com.hippo.ehviewer.Settings @Composable fun SwipeToDismissBox2( - state: SwipeToDismissState, + state: SwipeToDismissBoxState, backgroundContent: @Composable RowScope.() -> Unit, modifier: Modifier = Modifier, content: @Composable RowScope.() -> Unit, diff --git a/settings.gradle.kts b/settings.gradle.kts index 7091b67d4..d5a20e1dc 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -15,7 +15,7 @@ dependencyResolutionManagement { maven("https://oss.sonatype.org/content/repositories/snapshots") maven("https://jitpack.io") maven("https://androidx.dev/storage/compose-compiler/repository/") - maven("https://androidx.dev/snapshots/builds/11200095/artifacts/repository") + maven("https://androidx.dev/snapshots/builds/11206866/artifacts/repository") } }