From 74795d05e82637de9a5f2ba592de7b5f03da7760 Mon Sep 17 00:00:00 2001
From: HapeLee <1321903405@qq.com>
Date: Sat, 10 Jan 2026 03:02:30 +0800
Subject: [PATCH] =?UTF-8?q?[=E4=BC=98=E5=8C=96]=20=E4=BC=98=E5=8C=96?=
 =?UTF-8?q?=E4=BA=86Compose=E7=95=8C=E9=9D=A2=E4=B8=8BModalBottomSheet?=
 =?UTF-8?q?=E7=9A=84=E5=8F=AF=E8=AF=BB=E6=80=A7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../io/legado/app/ui/book/bookmark/AllBookmarkScreen.kt     | 4 ++--
 .../main/java/io/legado/app/ui/replace/ReplaceRuleScreen.kt | 4 ++--
 .../widget/components/importComponents/ImportComponents.kt  | 6 +++---
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/app/src/main/java/io/legado/app/ui/book/bookmark/AllBookmarkScreen.kt b/app/src/main/java/io/legado/app/ui/book/bookmark/AllBookmarkScreen.kt
index afd4e7f33..0a1bb72e1 100644
--- a/app/src/main/java/io/legado/app/ui/book/bookmark/AllBookmarkScreen.kt
+++ b/app/src/main/java/io/legado/app/ui/book/bookmark/AllBookmarkScreen.kt
@@ -42,7 +42,6 @@ import androidx.compose.material3.Icon
 import androidx.compose.material3.IconButton
 import androidx.compose.material3.MaterialTheme
 import androidx.compose.material3.MediumFlexibleTopAppBar
-import androidx.compose.material3.ModalBottomSheet
 import androidx.compose.material3.OutlinedButton
 import androidx.compose.material3.OutlinedTextField
 import androidx.compose.material3.Scaffold
@@ -72,6 +71,7 @@ import io.legado.app.ui.widget.components.EmptyMessageView
 import io.legado.app.ui.widget.components.SearchBarSection
 import io.legado.app.ui.widget.components.lazylist.FastScrollLazyColumn
 import io.legado.app.ui.widget.components.lazylist.Scroller
+import io.legado.app.ui.widget.components.modalBottomSheet.GlobalModalBottomSheet
 import org.koin.androidx.compose.koinViewModel
 
 @OptIn(ExperimentalMaterial3Api::class, ExperimentalFoundationApi::class,
@@ -390,7 +390,7 @@ fun BookmarkEditSheet(
     var bookText by remember { mutableStateOf(bookmark.bookText) }
     var content by remember { mutableStateOf(bookmark.content) }
 
-    ModalBottomSheet(
+    GlobalModalBottomSheet(
         onDismissRequest = onDismiss,
         sheetState = sheetState
     ) {
diff --git a/app/src/main/java/io/legado/app/ui/replace/ReplaceRuleScreen.kt b/app/src/main/java/io/legado/app/ui/replace/ReplaceRuleScreen.kt
index e11d42343..f9c251f5e 100644
--- a/app/src/main/java/io/legado/app/ui/replace/ReplaceRuleScreen.kt
+++ b/app/src/main/java/io/legado/app/ui/replace/ReplaceRuleScreen.kt
@@ -63,7 +63,6 @@ import androidx.compose.material3.ListItemDefaults
 import androidx.compose.material3.LoadingIndicator
 import androidx.compose.material3.MaterialTheme
 import androidx.compose.material3.MediumFlexibleTopAppBar
-import androidx.compose.material3.ModalBottomSheet
 import androidx.compose.material3.OutlinedButton
 import androidx.compose.material3.OutlinedTextField
 import androidx.compose.material3.PlainTooltip
@@ -128,6 +127,7 @@ import io.legado.app.ui.widget.components.importComponents.BaseImportUiState
 import io.legado.app.ui.widget.components.importComponents.BatchImportDialog
 import io.legado.app.ui.widget.components.importComponents.SourceInputDialog
 import io.legado.app.ui.widget.components.lazylist.FastScrollLazyColumn
+import io.legado.app.ui.widget.components.modalBottomSheet.GlobalModalBottomSheet
 import kotlinx.coroutines.coroutineScope
 import kotlinx.coroutines.launch
 import org.koin.androidx.compose.koinViewModel
@@ -833,7 +833,7 @@ private fun GroupManageBottomSheet(
     var editingGroup by remember { mutableStateOf<String?>(null) }
     var updatedGroupName by remember { mutableStateOf("") }
 
-    ModalBottomSheet(
+    GlobalModalBottomSheet(
         onDismissRequest = onDismissRequest,
         sheetState = sheetState
     ) {
diff --git a/app/src/main/java/io/legado/app/ui/widget/components/importComponents/ImportComponents.kt b/app/src/main/java/io/legado/app/ui/widget/components/importComponents/ImportComponents.kt
index ae52694dd..6e6af0856 100644
--- a/app/src/main/java/io/legado/app/ui/widget/components/importComponents/ImportComponents.kt
+++ b/app/src/main/java/io/legado/app/ui/widget/components/importComponents/ImportComponents.kt
@@ -36,7 +36,6 @@ import androidx.compose.material3.IconButton
 import androidx.compose.material3.ListItem
 import androidx.compose.material3.ListItemDefaults
 import androidx.compose.material3.MaterialTheme
-import androidx.compose.material3.ModalBottomSheet
 import androidx.compose.material3.OutlinedButton
 import androidx.compose.material3.OutlinedTextField
 import androidx.compose.material3.OutlinedToggleButton
@@ -62,6 +61,7 @@ import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.unit.dp
 import io.legado.app.R
 import io.legado.app.ui.widget.components.AnimatedText
+import io.legado.app.ui.widget.components.modalBottomSheet.GlobalModalBottomSheet
 import kotlinx.coroutines.launch
 
 @Composable
@@ -137,10 +137,10 @@ fun <T> BatchImportDialog(
     val selectedCount = importState.items.count { it.isSelected }
     val totalCount = importState.items.size
 
-    ModalBottomSheet(
+    GlobalModalBottomSheet(
         onDismissRequest = onDismissRequest,
         sheetState = sheetState,
-        containerColor = MaterialTheme.colorScheme.surfaceContainer
+        containerColor = { it.surfaceContainer }
     ) {
         Scaffold(
             modifier = Modifier