Update snapshot

This commit is contained in:
GG Bond authored and Vladimir Dostoyevskiy committed 2023-11-30 11:01:11 +08:00
1 parent 086db7572d
commit f383594050
6 files changed
+17 -28

No files matched your search

+1 -1
View File
@@ -281,7 +281,7 @@ configurations.all {
resolutionStrategy {
// Workaround IME won't show again once hidden.
// Google issue-tracker link?
force("androidx.compose.ui:ui-text-android:1.6.0-beta02")
force("androidx.compose.ui:ui-text-android:1.6.0-alpha08")
exclude("androidx.navigation", "navigation-compose")
}
}
@@ -32,17 +32,16 @@ import androidx.compose.material.icons.filled.NewLabel
import androidx.compose.material.icons.filled.Pause
import androidx.compose.material.icons.filled.PlayArrow
import androidx.compose.material.icons.filled.Settings
import androidx.compose.material3.DismissDirection
import androidx.compose.material3.DismissValue
import androidx.compose.material3.DropdownMenu
import androidx.compose.material3.DropdownMenuItem
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.Text
import androidx.compose.material3.TopAppBar
import androidx.compose.material3.rememberDismissState
import androidx.compose.material3.rememberSwipeToDismissState
import androidx.compose.runtime.Composable
import androidx.compose.runtime.getValue
import androidx.compose.runtime.mutableStateListOf
@@ -236,9 +235,9 @@ fun DownloadsScreen(navigator: DestinationsNavigator) {
)
}
items(labelsList, key = { it.label }) { (item) ->
val dismissState = rememberDismissState(
val dismissState = rememberSwipeToDismissState(
confirmValueChange = {
if (it == DismissValue.DismissedToStart) {
if (it == SwipeToDismissValue.EndToStart) {
coroutineScope.launch {
DownloadManager.deleteLabel(item)
label = ""
@@ -251,7 +250,6 @@ fun DownloadsScreen(navigator: DestinationsNavigator) {
SwipeToDismissBox2(
state = dismissState,
backgroundContent = {},
directions = setOf(DismissDirection.EndToStart),
) {
val elevation by animateDpAsState(
if (isDragging) {
@@ -40,8 +40,6 @@ import androidx.compose.material.icons.filled.ImageSearch
import androidx.compose.material.icons.filled.Refresh
import androidx.compose.material.icons.filled.Translate
import androidx.compose.material.icons.outlined.Bookmarks
import androidx.compose.material3.DismissDirection
import androidx.compose.material3.DismissValue
import androidx.compose.material3.ElevatedCard
import androidx.compose.material3.HorizontalDivider
import androidx.compose.material3.Icon
@@ -50,10 +48,11 @@ import androidx.compose.material3.LeadingIconTab
import androidx.compose.material3.ListItem
import androidx.compose.material3.MaterialTheme
import androidx.compose.material3.PrimaryTabRow
import androidx.compose.material3.SwipeToDismissValue
import androidx.compose.material3.Text
import androidx.compose.material3.TopAppBar
import androidx.compose.material3.pulltorefresh.rememberPullToRefreshState
import androidx.compose.material3.rememberDismissState
import androidx.compose.material3.rememberSwipeToDismissState
import androidx.compose.material3.windowsizeclass.WindowWidthSizeClass
import androidx.compose.material3.windowsizeclass.calculateWindowSizeClass
import androidx.compose.runtime.Composable
@@ -437,9 +436,9 @@ fun GalleryListScreen(lub: ListUrlBuilder, navigator: DestinationsNavigator) {
}
items(quickSearchList, key = { it.id!! }) { item ->
ReorderableItem(reorderableLazyListState, key = item.id!!) { isDragging ->
val dismissState = rememberDismissState(
val dismissState = rememberSwipeToDismissState(
confirmValueChange = {
if (it == DismissValue.DismissedToStart) {
if (it == SwipeToDismissValue.EndToStart) {
quickSearchList.remove(item)
coroutineScope.launchIO {
EhDB.deleteQuickSearch(item)
@@ -451,7 +450,6 @@ fun GalleryListScreen(lub: ListUrlBuilder, navigator: DestinationsNavigator) {
SwipeToDismissBox2(
state = dismissState,
backgroundContent = {},
directions = setOf(DismissDirection.EndToStart),
) {
val elevation by animateDpAsState(
if (isDragging) {
@@ -10,16 +10,15 @@ import androidx.compose.foundation.layout.padding
import androidx.compose.material.icons.Icons
import androidx.compose.material.icons.filled.ClearAll
import androidx.compose.material.icons.filled.Menu
import androidx.compose.material3.DismissDirection
import androidx.compose.material3.DismissValue
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.Text
import androidx.compose.material3.TopAppBar
import androidx.compose.material3.TopAppBarDefaults
import androidx.compose.material3.rememberDismissState
import androidx.compose.material3.rememberSwipeToDismissState
import androidx.compose.runtime.Composable
import androidx.compose.runtime.getValue
import androidx.compose.runtime.rememberCoroutineScope
@@ -110,9 +109,9 @@ fun HistoryScreen(navigator: DestinationsNavigator) {
) { index ->
val info = historyData[index]
if (info != null) {
val dismissState = rememberDismissState(
val dismissState = rememberSwipeToDismissState(
confirmValueChange = {
if (it == DismissValue.DismissedToStart) {
if (it == SwipeToDismissValue.EndToStart) {
coroutineScope.launchIO {
EhDB.deleteHistoryInfo(info)
}
@@ -124,7 +123,6 @@ fun HistoryScreen(navigator: DestinationsNavigator) {
state = dismissState,
backgroundContent = {},
modifier = Modifier.animateItemPlacement(),
directions = setOf(DismissDirection.EndToStart),
) {
GalleryInfoListItem(
onClick = {
@@ -1,9 +1,8 @@
package com.hippo.ehviewer.ui.tools
import androidx.compose.foundation.layout.RowScope
import androidx.compose.material3.DismissDirection
import androidx.compose.material3.DismissState
import androidx.compose.material3.SwipeToDismissBox
import androidx.compose.material3.SwipeToDismissState
import androidx.compose.runtime.Composable
import androidx.compose.runtime.CompositionLocalProvider
import androidx.compose.ui.Modifier
@@ -12,13 +11,9 @@ import com.hippo.ehviewer.Settings
@Composable
fun SwipeToDismissBox2(
state: DismissState,
state: SwipeToDismissState,
backgroundContent: @Composable RowScope.() -> Unit,
modifier: Modifier = Modifier,
directions: Set<DismissDirection> = setOf(
DismissDirection.EndToStart,
DismissDirection.StartToEnd,
),
content: @Composable RowScope.() -> Unit,
) {
val viewConfiguration = LocalViewConfiguration.current
@@ -27,7 +22,7 @@ fun SwipeToDismissBox2(
state = state,
backgroundContent = backgroundContent,
modifier = modifier,
directions = directions,
enableDismissFromStartToEnd = false,
) {
CompositionLocalProvider(LocalViewConfiguration provides viewConfiguration) {
content()
+1 -1
View File
@@ -15,7 +15,7 @@ dependencyResolutionManagement {
maven("https://jcenter.bintray.com")
maven("https://jitpack.io")
maven("https://androidx.dev/storage/compose-compiler/repository/")
maven("https://androidx.dev/snapshots/builds/11154540/artifacts/repository")
maven("https://androidx.dev/snapshots/builds/11158760/artifacts/repository")
}
}