HapeLee пре 9 месеци
родитељ
комит
acdaa60bd5

+ 2 - 2
app/src/main/java/io/legado/app/ui/book/readRecord/ReadRecordScreen.kt

@@ -349,7 +349,7 @@ fun LazyListScope.renderListByMode(
                         modifier = Modifier.animateItem(),
                         modifier = Modifier.animateItem(),
                         startAction = SwipeAction(
                         startAction = SwipeAction(
                             icon = Icons.Default.Delete,
                             icon = Icons.Default.Delete,
-                            background = MaterialTheme.colorScheme.errorContainer,
+                            background = MaterialTheme.colorScheme.error,
                             onSwipe = {
                             onSwipe = {
                                 onConfirmDelete { viewModel.deleteDetail(detail) }
                                 onConfirmDelete { viewModel.deleteDetail(detail) }
                             }
                             }
@@ -372,7 +372,7 @@ fun LazyListScope.renderListByMode(
                         modifier = Modifier.animateItem(),
                         modifier = Modifier.animateItem(),
                         startAction = SwipeAction(
                         startAction = SwipeAction(
                             icon = Icons.Default.Delete,
                             icon = Icons.Default.Delete,
-                            background = MaterialTheme.colorScheme.onErrorContainer,
+                            background = MaterialTheme.colorScheme.error,
                             onSwipe = {
                             onSwipe = {
                                 onConfirmDelete { viewModel.deleteSession(session) }
                                 onConfirmDelete { viewModel.deleteSession(session) }
                             }
                             }

+ 6 - 3
app/src/main/java/io/legado/app/ui/widget/components/card/SelectionItemCard.kt

@@ -22,6 +22,7 @@ import androidx.compose.foundation.lazy.LazyItemScope
 import androidx.compose.material.icons.Icons
 import androidx.compose.material.icons.Icons
 import androidx.compose.material.icons.filled.Edit
 import androidx.compose.material.icons.filled.Edit
 import androidx.compose.material.icons.filled.MoreVert
 import androidx.compose.material.icons.filled.MoreVert
+import androidx.compose.material3.CardDefaults
 import androidx.compose.material3.Checkbox
 import androidx.compose.material3.Checkbox
 import androidx.compose.material3.DropdownMenu
 import androidx.compose.material3.DropdownMenu
 import androidx.compose.material3.ListItem
 import androidx.compose.material3.ListItem
@@ -37,11 +38,11 @@ import androidx.compose.runtime.setValue
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.draw.scale
 import androidx.compose.ui.draw.scale
-import androidx.compose.ui.draw.shadow
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.hapticfeedback.HapticFeedbackType
 import androidx.compose.ui.hapticfeedback.HapticFeedbackType
 import androidx.compose.ui.platform.LocalHapticFeedback
 import androidx.compose.ui.platform.LocalHapticFeedback
 import androidx.compose.ui.text.style.TextOverflow
 import androidx.compose.ui.text.style.TextOverflow
+import androidx.compose.ui.unit.Dp
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.zIndex
 import androidx.compose.ui.zIndex
 import io.legado.app.ui.widget.components.button.SmallIconButton
 import io.legado.app.ui.widget.components.button.SmallIconButton
@@ -56,6 +57,7 @@ fun SelectionItemCard(
     isEnabled: Boolean = true,
     isEnabled: Boolean = true,
     isSelected: Boolean = false,
     isSelected: Boolean = false,
     inSelectionMode: Boolean = false,
     inSelectionMode: Boolean = false,
+    elevation: Dp = 0.dp,
     onToggleSelection: () -> Unit = {},
     onToggleSelection: () -> Unit = {},
     onEnabledChange: ((Boolean) -> Unit)? = null,
     onEnabledChange: ((Boolean) -> Unit)? = null,
     onClickEdit: (() -> Unit)? = null,
     onClickEdit: (() -> Unit)? = null,
@@ -79,7 +81,8 @@ fun SelectionItemCard(
             .padding(horizontal = 16.dp)
             .padding(horizontal = 16.dp)
             .fillMaxWidth(),
             .fillMaxWidth(),
         shape = MaterialTheme.shapes.medium,
         shape = MaterialTheme.shapes.medium,
-        color = containerColor
+        color = containerColor,
+        elevation = CardDefaults.cardElevation(defaultElevation = elevation)
     ) {
     ) {
         Row(
         Row(
             modifier = Modifier
             modifier = Modifier
@@ -201,6 +204,7 @@ fun LazyItemScope.ReorderableSelectionItem(
             isEnabled = isEnabled,
             isEnabled = isEnabled,
             isSelected = isSelected,
             isSelected = isSelected,
             inSelectionMode = inSelectionMode,
             inSelectionMode = inSelectionMode,
+            elevation = elevation,
             onToggleSelection = onToggleSelection,
             onToggleSelection = onToggleSelection,
             onEnabledChange = onEnabledChange,
             onEnabledChange = onEnabledChange,
             onClickEdit = onClickEdit,
             onClickEdit = onClickEdit,
@@ -208,7 +212,6 @@ fun LazyItemScope.ReorderableSelectionItem(
             dropdownContent = dropdownContent,
             dropdownContent = dropdownContent,
             modifier = modifier
             modifier = modifier
                 .zIndex(if (isDragging) 1f else 0f)
                 .zIndex(if (isDragging) 1f else 0f)
-                .shadow(elevation, MaterialTheme.shapes.medium)
                 .then(
                 .then(
                     if (canReorder && !inSelectionMode) {
                     if (canReorder && !inSelectionMode) {
                         Modifier.longPressDraggableHandle(
                         Modifier.longPressDraggableHandle(