feat: 一些优化

app/src/main/java/io/legado/app/ui/book/group/GroupEditSheet.kt

@@ -35,7 +35,7 @@ import io.legado.app.ui.theme.LegadoTheme
 import io.legado.app.ui.widget.components.AppTextField
 import io.legado.app.ui.widget.components.alert.AppAlertDialog
 import io.legado.app.ui.widget.components.button.ConfirmDismissButtonsRow
-import io.legado.app.ui.widget.components.button.series.MediumPlainButton
+import io.legado.app.ui.widget.components.button.series.MediumTonalButton
 import io.legado.app.ui.widget.components.card.GlassCard
 import io.legado.app.ui.widget.components.image.cover.CoilBookCover
 import io.legado.app.ui.widget.components.modalBottomSheet.AppModalBottomSheet
@@ -336,7 +336,7 @@ fun GroupDeleteAction(
 ) {
     var showDeleteDialog by remember { mutableStateOf(false) }
 
-    MediumPlainButton(
+    MediumTonalButton(
         onClick = {
             showDeleteDialog = true
         },
@@ -369,7 +369,7 @@ fun GroupResetCoverAction(
     onCoverPathChange: (String?) -> Unit,
     viewModel: GroupViewModel = koinViewModel()
 ) {
-    MediumPlainButton(
+    MediumTonalButton(
         onClick = {
             if (group != null) {
                 viewModel.clearCover(group) {

app/src/main/java/io/legado/app/ui/book/info/BookInfoSheets.kt

@@ -72,7 +72,7 @@ import io.legado.app.ui.theme.LegadoTheme
 import io.legado.app.ui.widget.components.AppTextField
 import io.legado.app.ui.widget.components.EmptyMessage
 import io.legado.app.ui.widget.components.alert.AppAlertDialog
-import io.legado.app.ui.widget.components.button.series.MediumPlainButton
+import io.legado.app.ui.widget.components.button.series.MediumTonalButton
 import io.legado.app.ui.widget.components.button.series.SmallPlainButton
 import io.legado.app.ui.widget.components.card.GlassCard
 import io.legado.app.ui.widget.components.card.SelectionItemCard
@@ -146,14 +146,14 @@ fun GroupSelectSheet(
         onDismissRequest = onDismissRequest,
         title = stringResource(R.string.group_select),
         startAction = {
-            MediumPlainButton(
+            MediumTonalButton(
                 onClick = { showAddGroup = true },
                 icon = Icons.Default.Add,
                 contentDescription = stringResource(R.string.group_add)
             )
         },
         endAction = {
-            MediumPlainButton(
+            MediumTonalButton(
                 onClick = { onConfirm(selectedGroupId) },
                 icon = Icons.Default.Check,
                 contentDescription = stringResource(R.string.confirm)
@@ -240,7 +240,7 @@ fun ChangeCoverSheet(
         onDismissRequest = onDismissRequest,
         title = stringResource(R.string.change_cover_source),
         endAction = {
-            MediumPlainButton(
+            MediumTonalButton(
                 onClick = { viewModel.startOrStopSearch() },
                 icon = if (isSearching) Icons.Default.MoreVert else Icons.Default.Refresh,
                 contentDescription = stringResource(

app/src/main/java/io/legado/app/ui/book/manage/BookshelfManageScreen.kt

@@ -84,6 +84,7 @@ import io.legado.app.ui.widget.components.AppTextField
 import io.legado.app.ui.widget.components.FabMenuItem
 import io.legado.app.ui.widget.components.alert.AppAlertDialog
 import io.legado.app.ui.widget.components.button.series.SmallTonalButton
+import io.legado.app.ui.widget.components.button.series.MediumTonalButton
 import io.legado.app.ui.widget.components.card.GlassCard
 import io.legado.app.ui.widget.components.card.ReorderableSelectionItem
 import io.legado.app.ui.widget.components.card.SelectionItemCard
@@ -1324,12 +1325,12 @@ private fun BookSourcePickerSheet(
         onDismissRequest = onDismissRequest,
         title = title,
         endAction = {
-            SmallTonalButton(
+            MediumTonalButton(
                 onClick = {
                     onConfirm(selectedSources.mapNotNull { it.getBookSource() })
                 },
                 icon = Icons.Default.PlayArrow,
-                text = stringResource(android.R.string.ok)
+                contentDescription = stringResource(android.R.string.ok)
             )
         }
     ) {
@@ -1445,17 +1446,17 @@ private fun BatchChangePreviewSheet(
         onDismissRequest = onDismissRequest,
         title = "批量换源预览",
         startAction = {
-            SmallTonalButton(
+            MediumTonalButton(
                 onClick = onAddAllToShelf,
                 icon = Icons.Default.Add,
-                text = "新增全部"
+                contentDescription = stringResource(R.string.add)
             )
         },
         endAction = {
-            SmallTonalButton(
+            MediumTonalButton(
                 onClick = onMigrateAll,
                 icon = Icons.Default.PlayArrow,
-                text = "迁移全部"
+                contentDescription = stringResource(R.string.confirm)
             )
         }
     ) { items ->

app/src/main/java/io/legado/app/ui/book/read/sheet/ChangeChapterSourceSheet.kt

@@ -39,6 +39,7 @@ import io.legado.app.ui.theme.LegadoTheme
 import io.legado.app.ui.widget.components.AppTextField
 import io.legado.app.ui.widget.components.EmptyMessage
 import io.legado.app.ui.widget.components.button.series.MediumPlainButton
+import io.legado.app.ui.widget.components.button.series.MediumTonalButton
 import io.legado.app.ui.widget.components.card.SelectionItemCard
 import io.legado.app.ui.widget.components.menuItem.RoundDropdownMenu
 import io.legado.app.ui.widget.components.menuItem.RoundDropdownMenuItem
@@ -68,7 +69,7 @@ fun ChangeChapterSourceSheet(
         startAction = {
             if (!state.showToc) {
                 Box {
-                    MediumPlainButton(
+                    MediumTonalButton(
                         onClick = { showOptionsMenu = true },
                 icon = Icons.Default.MoreVert,
                 contentDescription = stringResource(R.string.more_menu)
@@ -116,14 +117,14 @@ fun ChangeChapterSourceSheet(
         endAction = {
             if (!state.showToc) {
                 Row(horizontalArrangement = Arrangement.spacedBy(4.dp)) {
-                    MediumPlainButton(
+                    MediumTonalButton(
                         onClick = { onIntent(ChangeChapterSourceIntent.StartStopSearch) },
                 icon = if (state.isSearching) Icons.Default.PauseCircleOutline else Icons.Default.Refresh,
                 contentDescription = stringResource(
                     if (state.isSearching) R.string.pause else R.string.refresh
                 ),
                     )
-                    MediumPlainButton(
+                    MediumTonalButton(
                         onClick = { showFilterSheet = true },
                 icon = Icons.Default.FilterList,
                 contentDescription = stringResource(R.string.screen)

app/src/main/java/io/legado/app/ui/book/read/sheet/HighlightRuleConfigSheet.kt

@@ -35,6 +35,7 @@ import io.legado.app.ui.book.read.ReadBookIntent
 import io.legado.app.ui.widget.components.TinySwitch
 import io.legado.app.ui.widget.components.alert.AppAlertDialog
 import io.legado.app.ui.widget.components.button.series.SmallTonalButton
+import io.legado.app.ui.widget.components.button.series.MediumTonalButton
 import io.legado.app.ui.widget.components.filePicker.FilePickerSheet
 import io.legado.app.ui.widget.components.importComponents.BatchImportDialog
 import io.legado.app.ui.widget.components.importComponents.SourceInputDialog
@@ -120,7 +121,7 @@ fun HighlightRuleConfigSheet(
         onDismissRequest = onDismissRequest,
         title = stringResource(R.string.highlight_rule_config),
         startAction = {
-            SmallTonalButton(
+            MediumTonalButton(
                 onClick = { onIntent(ReadBookIntent.AddHighlightRule) },
                 icon = Icons.Default.Add,
                 contentDescription = stringResource(R.string.add)
@@ -129,7 +130,7 @@ fun HighlightRuleConfigSheet(
         endAction = {
             var expanded by remember { mutableStateOf(false) }
             Box {
-                SmallTonalButton(
+                MediumTonalButton(
                     onClick = { expanded = true },
                     icon = Icons.Default.MoreVert,
                     contentDescription = stringResource(R.string.more_menu)

app/src/main/java/io/legado/app/ui/book/read/sheet/HighlightRuleEditSheet.kt

@@ -55,6 +55,7 @@ import io.legado.app.ui.widget.components.FontFolderState
 import io.legado.app.ui.widget.components.FontSelectSheet
 import io.legado.app.ui.widget.components.SectionTitle
 import io.legado.app.ui.widget.components.card.NormalCard
+import io.legado.app.ui.widget.components.button.series.MediumTonalButton
 import io.legado.app.ui.widget.components.dialog.ColorPickerSheet
 import io.legado.app.ui.widget.components.modalBottomSheet.AppModalBottomSheet
 import io.legado.app.ui.widget.components.settingItem.TinyClickableSettingItem
@@ -196,44 +197,43 @@ fun HighlightRuleEditSheet(
         onDismissRequest = onDismissRequest,
         title = stringResource(titleRes),
         endAction = {
-            androidx.compose.material3.IconButton(onClick = {
-                if (pattern.isNotBlank()) {
-                    val result = runCatching { Regex(pattern) }
-                    if (result.isFailure) {
-                        patternError = result.exceptionOrNull()?.message
-                        return@IconButton
+            MediumTonalButton(
+                onClick = {
+                    if (pattern.isNotBlank()) {
+                        val result = runCatching { Regex(pattern) }
+                        if (result.isFailure) {
+                            patternError = result.exceptionOrNull()?.message
+                            return@MediumTonalButton
+                        }
                     }
-                }
-                patternError = null
-                onSave(
-                    HighlightRule(
-                        id = initial.id,
-                        name = name,
-                        pattern = pattern,
-                        sampleText = sampleText,
-                        targetScope = targetScope,
-                        enabled = enabled,
-                        position = initial.position,
-                        textColor = if (hasTextColor) textColor else null,
-                        bgColor = if (hasBgColor) bgColor else null,
-                        underlineMode = if (hasUnderline) underlineMode else 0,
-                        underlineColor = if (hasUnderlineColor && hasUnderline) underlineColor else null,
-                        underlineWidth = underlineWidth,
-                        underlineOffset = underlineOffset,
-                        underlineSvgPath = underlineSvgPath.ifBlank { null },
-                        bgImage = if (hasBgImage) bgImage.ifBlank { null } else null,
-                        bgImageFit = bgImageFit,
-                        bgImageScale = bgImageScale,
-                        configName = if (configNames.isEmpty()) null else configNames.toList().toJsonArray(),
-                        fontPath = if (hasFont) fontPath.ifBlank { null } else null,
+                    patternError = null
+                    onSave(
+                        HighlightRule(
+                            id = initial.id,
+                            name = name,
+                            pattern = pattern,
+                            sampleText = sampleText,
+                            targetScope = targetScope,
+                            enabled = enabled,
+                            position = initial.position,
+                            textColor = if (hasTextColor) textColor else null,
+                            bgColor = if (hasBgColor) bgColor else null,
+                            underlineMode = if (hasUnderline) underlineMode else 0,
+                            underlineColor = if (hasUnderlineColor && hasUnderline) underlineColor else null,
+                            underlineWidth = underlineWidth,
+                            underlineOffset = underlineOffset,
+                            underlineSvgPath = underlineSvgPath.ifBlank { null },
+                            bgImage = if (hasBgImage) bgImage.ifBlank { null } else null,
+                            bgImageFit = bgImageFit,
+                            bgImageScale = bgImageScale,
+                            configName = if (configNames.isEmpty()) null else configNames.toList().toJsonArray(),
+                            fontPath = if (hasFont) fontPath.ifBlank { null } else null,
+                        )
                     )
-                )
-            }) {
-                androidx.compose.material3.Icon(
-                    Icons.Default.Done,
-                    contentDescription = stringResource(R.string.save),
-                )
-            }
+                },
+                icon = Icons.Default.Done,
+                contentDescription = stringResource(R.string.save),
+            )
         },
     ) {
         Column(

app/src/main/java/io/legado/app/ui/book/read/sheet/ReadAloudConfigContent.kt

@@ -42,6 +42,7 @@ import io.legado.app.ui.book.readaloud.player.ReadAloudPlayerUiState
 import io.legado.app.ui.widget.components.AppTextField
 import io.legado.app.ui.widget.components.alert.AppAlertDialog
 import io.legado.app.ui.widget.components.button.series.SmallTonalButton
+import io.legado.app.ui.widget.components.button.series.MediumTonalButton
 import io.legado.app.ui.widget.components.filePicker.FilePickerSheet
 import io.legado.app.ui.widget.components.importComponents.BatchImportDialog
 import io.legado.app.ui.widget.components.importComponents.SourceInputDialog
@@ -343,7 +344,7 @@ fun SpeakEngineConfigSheet(
         onDismissRequest = onDismissRequest,
         title = stringResource(R.string.read_aloud_default_engine),
         startAction = {
-            SmallTonalButton(
+            MediumTonalButton(
                 onClick = { onIntent(ReadBookIntent.EditHttpTts()) },
                 icon = Icons.Default.Add,
                 contentDescription = stringResource(R.string.add)
@@ -352,7 +353,7 @@ fun SpeakEngineConfigSheet(
         endAction = {
             var expanded by remember { mutableStateOf(false) }
             Box {
-                SmallTonalButton(
+                MediumTonalButton(
                     onClick = { expanded = true },
                     icon = Icons.Default.MoreVert,
                     contentDescription = stringResource(R.string.more_menu)
@@ -460,7 +461,7 @@ fun HttpTtsEditSheet(
         startAction = {
             var expanded by remember { mutableStateOf(false) }
             Box {
-                SmallTonalButton(
+                MediumTonalButton(
                     onClick = { expanded = true },
                     icon = Icons.Default.MoreVert,
                     contentDescription = stringResource(R.string.more_menu)
@@ -504,7 +505,7 @@ fun HttpTtsEditSheet(
             }
         },
         endAction = {
-            SmallTonalButton(
+            MediumTonalButton(
                 icon = Icons.Default.Save,
                 contentDescription = stringResource(R.string.save),
                 onClick = {

app/src/main/java/io/legado/app/ui/book/read/sheet/TextSelectMenuConfigSheet.kt

@@ -46,7 +46,7 @@ import coil.compose.AsyncImage
 import io.legado.app.R
 import io.legado.app.ui.book.read.ActionMenuItem
 import io.legado.app.ui.theme.LegadoTheme
-import io.legado.app.ui.widget.components.button.series.SmallTonalButton
+import io.legado.app.ui.widget.components.button.series.MediumTonalButton
 import io.legado.app.ui.widget.components.card.NormalCard
 import io.legado.app.ui.widget.components.modalBottomSheet.AppModalBottomSheet
 import io.legado.app.ui.widget.components.reorderAccessibility
@@ -125,7 +125,7 @@ fun TextSelectMenuConfigSheet(
         onDismissRequest = onDismissRequest,
         title = stringResource(R.string.edit_select_menu),
         endAction = {
-            SmallTonalButton(
+            MediumTonalButton(
                 onClick = {
                     onSaved(draftItems)
                     onDismissRequest()

app/src/main/java/io/legado/app/ui/book/search/ScopeSelectSheet.kt

@@ -25,7 +25,7 @@ import io.legado.app.R
 import io.legado.app.data.entities.BookSourcePart
 import io.legado.app.ui.theme.LegadoTheme
 import io.legado.app.ui.widget.components.SearchBar
-import io.legado.app.ui.widget.components.button.series.MediumPlainButton
+import io.legado.app.ui.widget.components.button.series.MediumTonalButton
 import io.legado.app.ui.widget.components.card.SelectionItemCard
 import io.legado.app.ui.widget.components.icon.AppIcons
 import io.legado.app.ui.widget.components.modalBottomSheet.AppModalBottomSheet
@@ -91,7 +91,7 @@ fun ScopeSelectSheet(
         title = title,
         startAction = onConfirm?.let {
             {
-                MediumPlainButton(
+                MediumTonalButton(
                     onClick = it,
                     icon = AppIcons.Settings,
                     contentDescription = stringResource(R.string.book_source_manage),
@@ -100,7 +100,7 @@ fun ScopeSelectSheet(
         },
         endAction = onApplyScope?.let {
             {
-                MediumPlainButton(
+                MediumTonalButton(
                     onClick = {
                         applyDraftSelection()
                         onDismissRequest()

app/src/main/java/io/legado/app/ui/config/coverConfig/CoverAlbumManageScreen.kt

@@ -53,6 +53,7 @@ import io.legado.app.ui.widget.components.AppTextField
 import io.legado.app.ui.widget.components.alert.AppAlertDialog
 import io.legado.app.ui.widget.components.button.AppIconButton
 import io.legado.app.ui.widget.components.button.series.SmallPlainButton
+import io.legado.app.ui.widget.components.button.series.MediumTonalButton
 import io.legado.app.ui.widget.components.card.GlassCard
 import io.legado.app.ui.widget.components.card.NormalCard
 import io.legado.app.ui.widget.components.icon.AppIcon
@@ -309,10 +310,10 @@ private fun CoverAlbumEditorSheet(
         onDismissRequest = onDismissRequest,
         title = album?.name,
         endAction = {
-            SmallPlainButton(
+            MediumTonalButton(
                 onClick = { onAddImages(isDark) },
                 icon = Icons.Default.Add,
-                text = stringResource(R.string.cover_album_add_images),
+                contentDescription = stringResource(R.string.cover_album_add_images),
             )
         },
     ) {

app/src/main/java/io/legado/app/ui/config/coverConfig/CoverAlbumSelectSheet.kt

@@ -25,7 +25,7 @@ import androidx.compose.ui.unit.dp
 import coil.compose.AsyncImage
 import io.legado.app.R
 import io.legado.app.ui.theme.LegadoTheme
-import io.legado.app.ui.widget.components.button.series.SmallPlainButton
+import io.legado.app.ui.widget.components.button.series.MediumTonalButton
 import io.legado.app.ui.widget.components.card.NormalCard
 import io.legado.app.ui.widget.components.icon.AppIcon
 import io.legado.app.ui.widget.components.modalBottomSheet.AppModalBottomSheet
@@ -45,7 +45,7 @@ fun CoverAlbumSelectSheet(
         onDismissRequest = onDismissRequest,
         title = stringResource(R.string.select_cover_album),
         endAction = {
-            SmallPlainButton(
+            MediumTonalButton(
                 onClick = onManage,
                 icon = Icons.Default.Settings,
                 contentDescription = stringResource(R.string.manage_cover_albums),

app/src/main/java/io/legado/app/ui/config/coverConfig/CoverRuleConfigSheet.kt

@@ -16,7 +16,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.AppTextField
-import io.legado.app.ui.widget.components.button.series.MediumPlainButton
+import io.legado.app.ui.widget.components.button.series.MediumTonalButton
 import io.legado.app.ui.widget.components.checkBox.CheckboxItem
 import io.legado.app.ui.widget.components.modalBottomSheet.AppModalBottomSheet
 
@@ -33,7 +33,7 @@ fun CoverRuleConfigSheet(
         onDismissRequest = onDismissRequest,
         title = stringResource(R.string.cover_rule),
         startAction = {
-            MediumPlainButton(
+            MediumTonalButton(
             icon = Icons.Default.SettingsBackupRestore,
             contentDescription = stringResource(R.string.restore_default),
                 onClick = {
@@ -42,7 +42,7 @@ fun CoverRuleConfigSheet(
             )
         },
         endAction = {
-            MediumPlainButton(
+            MediumTonalButton(
             icon = Icons.Default.Save,
             contentDescription = stringResource(R.string.save),
                 onClick = {

app/src/main/java/io/legado/app/ui/config/otherConfig/DirectLinkUploadBottomSheet.kt

@@ -32,7 +32,7 @@ import io.legado.app.ui.theme.LegadoTheme
 import io.legado.app.ui.widget.components.AppTextField
 import io.legado.app.ui.widget.components.alert.AppAlertDialog
 import io.legado.app.ui.widget.components.button.ConfirmDismissButtonsRow
-import io.legado.app.ui.widget.components.button.series.MediumPlainButton
+import io.legado.app.ui.widget.components.button.series.MediumTonalButton
 import io.legado.app.ui.widget.components.checkBox.CheckboxItem
 import io.legado.app.ui.widget.components.menuItem.RoundDropdownMenu
 import io.legado.app.ui.widget.components.menuItem.RoundDropdownMenuItem
@@ -59,7 +59,7 @@ fun DirectLinkUploadBottomSheet(
         show = show,
         title = stringResource(R.string.direct_link_upload_config),
         startAction = {
-            MediumPlainButton(
+            MediumTonalButton(
                 onClick = {
                     onIntent(OtherConfigIntent.TestDirectLinkRule)
                 },
@@ -69,7 +69,7 @@ fun DirectLinkUploadBottomSheet(
         },
         endAction = {
             Box {
-                MediumPlainButton(
+                MediumTonalButton(
                     onClick = { showMenu = true },
                 icon = Icons.Default.MoreVert,
                 contentDescription = stringResource(R.string.more_menu)

app/src/main/java/io/legado/app/ui/config/themeConfig/LabelColorManageSheet.kt

@@ -28,7 +28,7 @@ import androidx.core.graphics.ColorUtils
 import io.legado.app.R
 import io.legado.app.help.config.TagColorGenerator
 import io.legado.app.ui.theme.LegadoTheme
-import io.legado.app.ui.widget.components.button.series.MediumOutlinedButton
+import io.legado.app.ui.widget.components.button.series.MediumTonalButton
 import io.legado.app.ui.widget.components.button.series.SmallPlainButton
 import io.legado.app.ui.widget.components.card.NormalCard
 import io.legado.app.ui.widget.components.card.TextCard
@@ -57,7 +57,7 @@ fun LabelColorManageSheet(
         onDismissRequest = onDismissRequest,
         title = stringResource(R.string.theme_config_manage_label_colors),
         startAction = {
-            MediumOutlinedButton(
+            MediumTonalButton(
                 onClick = {
                     val baseColor = if (themeColor != 0) Color(themeColor) else primaryColor
                     val generatedColors = TagColorGenerator.generateTagColors(baseColor)
@@ -70,7 +70,7 @@ fun LabelColorManageSheet(
             )
         },
         endAction = {
-            MediumOutlinedButton(
+            MediumTonalButton(
                 onClick = {
                     tagColors.add(TagColorPair(0, 0))
                     editingIndex = tagColors.size - 1

app/src/main/java/io/legado/app/ui/config/themeConfig/ThemeConfigScreen.kt

@@ -72,6 +72,7 @@ import io.legado.app.ui.widget.components.FontSelectSheet
 import io.legado.app.ui.widget.components.SplicedColumnGroup
 import io.legado.app.ui.widget.components.alert.AppAlertDialog
 import io.legado.app.ui.widget.components.button.series.SmallPlainButton
+import io.legado.app.ui.widget.components.button.series.MediumTonalButton
 import io.legado.app.ui.widget.components.card.GlassCard
 import io.legado.app.ui.widget.components.dialog.ColorPickerSheet
 import io.legado.app.ui.widget.components.dialog.TimePickerDialog
@@ -941,7 +942,7 @@ fun ThemeConfigScreen(
         onSelectFont = { onIntent(ThemeConfigIntent.SelectAppFont(it)) },
         onOpenFolderPicker = { onIntent(ThemeConfigIntent.RequestFontFolder) },
         startAction = {
-            SmallPlainButton(
+            MediumTonalButton(
                 icon = Icons.Default.Delete,
                 contentDescription = stringResource(R.string.clear),
                 onClick = {

app/src/main/java/io/legado/app/ui/config/themeManage/EditThemeSheet.kt

@@ -31,7 +31,7 @@ import androidx.compose.ui.unit.dp
 import io.legado.app.R
 import io.legado.app.domain.model.settings.ThemeExportData
 import io.legado.app.ui.widget.components.AppTextField
-import io.legado.app.ui.widget.components.button.series.MediumPlainButton
+import io.legado.app.ui.widget.components.button.series.MediumTonalButton
 import io.legado.app.ui.widget.components.dialog.ColorPickerSheet
 import io.legado.app.ui.widget.components.modalBottomSheet.AppModalBottomSheet
 import io.legado.app.ui.widget.components.settingItem.CompactClickableSettingItem
@@ -60,7 +60,7 @@ fun EditThemeSheet(
         onDismissRequest = onDismissRequest,
         title = stringResource(R.string.theme_manage_edit_theme),
         endAction = {
-            MediumPlainButton(
+            MediumTonalButton(
                 onClick = {
                     if (name.isNotBlank()) {
                         onSave(name, data)

app/src/main/java/io/legado/app/ui/highlightTagRule/HighlightTagRuleEditSheet.kt

@@ -34,7 +34,7 @@ import io.legado.app.ui.theme.LegadoTheme
 import io.legado.app.ui.widget.components.AppFloatingActionButton
 import io.legado.app.ui.widget.components.AppTextField
 import io.legado.app.ui.widget.components.AdaptiveSwitch
-import io.legado.app.ui.widget.components.button.series.MediumPlainButton
+import io.legado.app.ui.widget.components.button.series.MediumTonalButton
 import io.legado.app.ui.widget.components.menuItem.RoundDropdownMenu
 import io.legado.app.ui.widget.components.menuItem.RoundDropdownMenuItem
 import io.legado.app.ui.widget.components.modalBottomSheet.AppModalBottomSheet
@@ -79,7 +79,7 @@ fun HighlightTagRuleEditSheet(
             stringResource(R.string.highlight_tag_edit_rule)
         },
         startAction = {
-            MediumPlainButton(
+            MediumTonalButton(
                 onClick = onDismissRequest,
                 icon = Icons.Default.Close,
                 contentDescription = stringResource(R.string.close),
@@ -87,7 +87,7 @@ fun HighlightTagRuleEditSheet(
         },
         endAction = {
             Box {
-                MediumPlainButton(
+                MediumTonalButton(
                     onClick = { showMenu = true },
                     icon = Icons.Default.MoreVert,
                     contentDescription = stringResource(R.string.more_menu)

app/src/main/java/io/legado/app/ui/main/bookshelf/GroupManageSheet.kt

@@ -38,7 +38,7 @@ import io.legado.app.ui.tagGroupRule.TagGroupRuleEditSheet
 import io.legado.app.ui.tagGroupRule.TagGroupRuleIntent
 import io.legado.app.ui.tagGroupRule.TagGroupRuleViewModel
 import io.legado.app.ui.theme.LegadoTheme
-import io.legado.app.ui.widget.components.button.series.SmallPlainButton
+import io.legado.app.ui.widget.components.button.series.MediumTonalButton
 import io.legado.app.ui.widget.components.card.ReorderableSelectionItem
 import io.legado.app.ui.widget.components.menuItem.RoundDropdownMenu
 import io.legado.app.ui.widget.components.menuItem.RoundDropdownMenuItem
@@ -119,7 +119,7 @@ fun GroupManageSheet(
             if (!isEditing) {
                 Box {
                     var showMenu by remember { mutableStateOf(false) }
-                    SmallPlainButton(
+                    MediumTonalButton(
                         onClick = { showMenu = true },
                         icon = Icons.Default.Add,
                         contentDescription = stringResource(R.string.add),

app/src/main/java/io/legado/app/ui/main/homepage/HomepageModuleManageSheet.kt

@@ -38,7 +38,7 @@ import io.legado.app.ui.main.homepage.manage.SetListPage
 import io.legado.app.ui.main.homepage.manage.SourceBrowseDetailPage
 import io.legado.app.ui.widget.components.AppTextField
 import io.legado.app.ui.widget.components.alert.AppAlertDialog
-import io.legado.app.ui.widget.components.button.series.SmallPlainButton
+import io.legado.app.ui.widget.components.button.series.MediumTonalButton
 import io.legado.app.ui.widget.components.icon.AppIcon
 import io.legado.app.ui.widget.components.menuItem.RoundDropdownMenu
 import io.legado.app.ui.widget.components.menuItem.RoundDropdownMenuItem
@@ -131,13 +131,13 @@ fun <T> HomepageModuleManageSheet(
         },
         startAction = {
             if (showCustomSetAddModules) {
-                SmallPlainButton(
+                MediumTonalButton(
                         onClick = { showCustomSetAddModules = false },
                         icon = Icons.AutoMirrored.Filled.ArrowBack,
                         contentDescription = stringResource(R.string.back)
                 )
             } else if (browsingSourceUrl != null || showSourceBrowser) {
-                SmallPlainButton(
+                MediumTonalButton(
                     onClick = {
                         if (browsingDetail) browsingDetail = false
                         else if (showSourceBrowser) showSourceBrowser = false
@@ -147,7 +147,7 @@ fun <T> HomepageModuleManageSheet(
                         contentDescription = stringResource(R.string.back)
                 )
             } else if (selectingSetUrl != null) {
-                SmallPlainButton(
+                MediumTonalButton(
                         onClick = { selectingSetUrl = null },
                         icon = Icons.AutoMirrored.Filled.ArrowBack,
                         contentDescription = stringResource(R.string.back)
@@ -161,7 +161,7 @@ fun <T> HomepageModuleManageSheet(
                 supportsMultipleKinds &&
                 selectedKindTitles.isNotEmpty()
             ) {
-                SmallPlainButton(
+                MediumTonalButton(
                         onClick = { showAddKindGroupDialog = true },
                         icon = Icons.Default.Check,
                         contentDescription = stringResource(R.string.confirm)
@@ -169,7 +169,7 @@ fun <T> HomepageModuleManageSheet(
             } else if ((showSourceBrowser || browsingSourceUrl != null) && !browsingDetail) {
                 var expanded by remember { mutableStateOf(false) }
                 Box {
-                    SmallPlainButton(
+                    MediumTonalButton(
                         onClick = { expanded = true },
                         icon = Icons.Default.FilterList,
                         contentDescription = stringResource(R.string.screen)

app/src/main/java/io/legado/app/ui/rss/article/RssSortScreen.kt

@@ -54,8 +54,7 @@ import io.legado.app.ui.widget.components.AppScaffold
 import io.legado.app.ui.widget.components.AppTextField
 import io.legado.app.ui.widget.components.EmptyMessage
 import io.legado.app.ui.widget.components.SearchBar
-import io.legado.app.ui.widget.components.button.series.MediumPlainButton
-import io.legado.app.ui.widget.components.button.series.SmallPlainButton
+import io.legado.app.ui.widget.components.button.series.MediumTonalButton
 import io.legado.app.ui.widget.components.button.series.SmallToggleButton
 import io.legado.app.ui.widget.components.button.series.ToggleStyle
 import io.legado.app.ui.widget.components.card.GlassCard
@@ -372,7 +371,7 @@ private fun RssSearchSheet(
         onDismissRequest = onDismissRequest,
         title = stringResource(R.string.search),
         endAction = {
-            SmallPlainButton(
+            MediumTonalButton(
                 onClick = { onSearch(query) },
                 icon = AppIcons.Search,
                 contentDescription = stringResource(R.string.search)
@@ -402,7 +401,7 @@ private fun RssReadRecordSheet(
         onDismissRequest = onDismissRequest,
         title = stringResource(R.string.read_record),
         endAction = {
-            SmallPlainButton(
+            MediumTonalButton(
                 onClick = onClear,
                 icon = Icons.Default.CleaningServices,
                 contentDescription = stringResource(R.string.clear)
@@ -463,7 +462,7 @@ private fun RssSourceVariableSheet(
         onDismissRequest = onDismissRequest,
         title = state?.title,
         endAction = {
-            MediumPlainButton(
+            MediumTonalButton(
                 onClick = { onSave(variable) },
                 icon = Icons.Default.Done,
                 contentDescription = stringResource(R.string.ok)

app/src/main/java/io/legado/app/ui/rss/read/RssReadRouteScreen.kt

@@ -60,7 +60,7 @@ import io.legado.app.ui.theme.responsiveHazeEffect
 import io.legado.app.ui.widget.components.AppScaffold
 import io.legado.app.ui.widget.components.AppTextField
 import io.legado.app.ui.widget.components.button.ConfirmDismissButtonsRow
-import io.legado.app.ui.widget.components.button.series.SmallPlainButton
+import io.legado.app.ui.widget.components.button.series.MediumTonalButton
 import io.legado.app.ui.widget.components.menuItem.MenuItemIcon
 import io.legado.app.ui.widget.components.menuItem.RoundDropdownMenu
 import io.legado.app.ui.widget.components.menuItem.RoundDropdownMenuItem
@@ -473,7 +473,7 @@ private fun FavoriteEditSheet(
         onDismissRequest = onDismissRequest,
         title = stringResource(R.string.favorite),
         endAction = {
-            SmallPlainButton(
+            MediumTonalButton(
                 onClick = onDelete,
                 icon = Icons.Default.CleaningServices,
                 contentDescription = stringResource(R.string.delete)

app/src/main/java/io/legado/app/ui/tagGroupRule/TagGroupRuleEditSheet.kt

@@ -30,7 +30,7 @@ import io.legado.app.data.entities.TagGroupRule
 import io.legado.app.ui.theme.LegadoTheme
 import io.legado.app.ui.widget.components.AppFloatingActionButton
 import io.legado.app.ui.widget.components.AppTextField
-import io.legado.app.ui.widget.components.button.series.MediumPlainButton
+import io.legado.app.ui.widget.components.button.series.MediumTonalButton
 import io.legado.app.ui.widget.components.menuItem.RoundDropdownMenu
 import io.legado.app.ui.widget.components.menuItem.RoundDropdownMenuItem
 import io.legado.app.ui.widget.components.modalBottomSheet.AppModalBottomSheet
@@ -71,7 +71,7 @@ fun TagGroupRuleEditSheet(
             stringResource(R.string.tag_group_edit_rule)
         },
         startAction = {
-            MediumPlainButton(
+            MediumTonalButton(
                 onClick = onDismissRequest,
                 icon = Icons.Default.Close,
                 contentDescription = stringResource(R.string.close),
@@ -79,7 +79,7 @@ fun TagGroupRuleEditSheet(
         },
         endAction = {
             Box {
-                MediumPlainButton(
+                MediumTonalButton(
                     onClick = { showMenu = true },
                     icon = Icons.Default.MoreVert,
                     contentDescription = stringResource(R.string.more_menu)

app/src/main/java/io/legado/app/ui/widget/components/FontSelectSheet.kt

@@ -17,7 +17,7 @@ import androidx.compose.ui.res.stringResource
 import androidx.core.net.toUri
 import androidx.documentfile.provider.DocumentFile
 import io.legado.app.R
-import io.legado.app.ui.widget.components.button.series.SmallPlainButton
+import io.legado.app.ui.widget.components.button.series.MediumTonalButton
 import io.legado.app.ui.widget.components.modalBottomSheet.AppModalBottomSheet
 import io.legado.app.utils.FileDoc
 import io.legado.app.utils.isContentScheme
@@ -76,7 +76,7 @@ fun FontSelectSheet(
                         )
                     }
                 }
-                SmallPlainButton(
+                MediumTonalButton(
                     onClick = { showTypefaceMenu = true },
                     icon = Icons.Default.TextFields,
                     contentDescription = stringResource(R.string.select_font),
@@ -84,7 +84,7 @@ fun FontSelectSheet(
             }
         },
         endAction = {
-            SmallPlainButton(
+            MediumTonalButton(
                 onClick = onOpenFolderPicker,
                 icon = folderIcon,
                 contentDescription = folderContentDescription

app/src/main/java/io/legado/app/ui/widget/components/bookmark/BookmarkEditSheet.kt

@@ -21,7 +21,7 @@ import io.legado.app.R
 import io.legado.app.data.entities.Bookmark
 import io.legado.app.ui.widget.components.AppTextFieldSurface
 import io.legado.app.ui.widget.components.alert.AppAlertDialog
-import io.legado.app.ui.widget.components.button.series.SmallTonalButton
+import io.legado.app.ui.widget.components.button.series.MediumTonalButton
 import io.legado.app.ui.widget.components.icon.AppIcons
 import io.legado.app.ui.widget.components.modalBottomSheet.AppModalBottomSheet
 
@@ -43,14 +43,14 @@ fun BookmarkEditSheet(
         onDismissRequest = onDismiss,
         title = bookmark.chapterName,
         startAction = {
-            SmallTonalButton(
+            MediumTonalButton(
                 onClick = { showDeleteConfirmDialog = true },
                 icon = AppIcons.Delete,
                 contentDescription = stringResource(R.string.delete)
             )
         },
         endAction = {
-            SmallTonalButton(
+            MediumTonalButton(
                 onClick = {
                     val newBookmark = bookmark.apply {
                         this.bookText = bookText

app/src/main/java/io/legado/app/ui/widget/components/changeSource/ChangeSourceSheet.kt

@@ -54,6 +54,7 @@ import io.legado.app.ui.widget.components.AppTextField
 import io.legado.app.ui.widget.components.EmptyMessage
 import io.legado.app.ui.widget.components.alert.AppAlertDialog
 import io.legado.app.ui.widget.components.button.series.MediumPlainButton
+import io.legado.app.ui.widget.components.button.series.MediumTonalButton
 import io.legado.app.ui.widget.components.card.SelectionItemCard
 import io.legado.app.ui.widget.components.menuItem.RoundDropdownMenu
 import io.legado.app.ui.widget.components.menuItem.RoundDropdownMenuItem
@@ -219,7 +220,7 @@ fun ChangeSourceSheet(
         startAction = {
             Row(horizontalArrangement = Arrangement.spacedBy(4.dp)) {
                 Box {
-                    MediumPlainButton(
+                    MediumTonalButton(
                         onClick = { showOptionsMenu = true },
                 icon = Icons.Default.MoreVert,
                 contentDescription = stringResource(R.string.more_menu)
@@ -269,7 +270,7 @@ fun ChangeSourceSheet(
                         )
                     }
                 }
-                MediumPlainButton(
+                MediumTonalButton(
                     onClick = { showMigrationOptions = true },
                     icon = Icons.Outlined.Settings,
                     contentDescription = stringResource(R.string.setting)
@@ -278,12 +279,12 @@ fun ChangeSourceSheet(
         },
         endAction = {
             Row(horizontalArrangement = Arrangement.spacedBy(4.dp)) {
-                MediumPlainButton(
+                MediumTonalButton(
                     onClick = { viewModel.startOrStopSearch() },
                     icon = if (isSearching) Icons.Default.PauseCircleOutline else Icons.Default.Refresh,
                     contentDescription = stringResource(if (isSearching) R.string.pause else R.string.refresh),
                 )
-                MediumPlainButton(
+                MediumTonalButton(
                     onClick = { showFilterSheet = true },
                     icon = Icons.Default.FilterList,
                     contentDescription = stringResource(R.string.screen)

app/src/main/java/io/legado/app/ui/widget/components/explore/ExploreKindSelectSheet.kt

@@ -31,7 +31,7 @@ import io.legado.app.ui.theme.LegadoTheme
 import io.legado.app.ui.theme.ThemeResolver
 import io.legado.app.ui.widget.components.SearchBar
 import io.legado.app.ui.widget.components.modalBottomSheet.AppModalBottomSheet
-import io.legado.app.ui.widget.components.topbar.TopBarActionButton
+import io.legado.app.ui.widget.components.button.series.MediumTonalButton
 import org.koin.compose.koinInject
 
 @OptIn(ExperimentalMaterial3Api::class)
@@ -77,13 +77,13 @@ fun ExploreKindSelectSheet(
         onDismissRequest = onDismissRequest,
         endAction = {
             if (multiple && selectedTitles.isNotEmpty()) {
-                TopBarActionButton(
+                MediumTonalButton(
                     onClick = {
                         val selectedKinds = kinds.filter { it.title in selectedTitles }
                         onSelected(selectedKinds)
                         onDismissRequest()
                     },
-                    imageVector = Icons.Default.Check,
+                    icon = Icons.Default.Check,
                     contentDescription = stringResource(R.string.confirm)
                 )
             }

app/src/main/java/io/legado/app/ui/widget/components/heatmap/HeatmapCalendarComponents.kt

@@ -42,7 +42,7 @@ import androidx.compose.ui.unit.sp
 import androidx.compose.ui.res.stringResource
 import io.legado.app.R
 import io.legado.app.ui.theme.LegadoTheme
-import io.legado.app.ui.widget.components.button.series.MediumOutlinedButton
+import io.legado.app.ui.widget.components.button.series.MediumTonalButton
 import io.legado.app.ui.widget.components.button.series.MediumToggleButton
 import io.legado.app.ui.widget.components.text.AppText
 import io.legado.app.utils.formatReadDuration
@@ -80,7 +80,7 @@ fun HeatmapCalendarStartAction(
 fun HeatmapCalendarEndAction(
     onClearDate: () -> Unit
 ) {
-    MediumOutlinedButton(
+    MediumTonalButton(
         onClick = onClearDate,
         icon = Icons.Outlined.Delete,
         contentDescription = stringResource(R.string.clear),

app/src/main/java/io/legado/app/ui/widget/components/log/AppLogSheet.kt

@@ -23,7 +23,7 @@ import io.legado.app.R
 import io.legado.app.constant.AppLog
 import io.legado.app.ui.theme.LegadoTheme
 import io.legado.app.ui.widget.components.EmptyMessage
-import io.legado.app.ui.widget.components.button.series.MediumPlainButton
+import io.legado.app.ui.widget.components.button.series.MediumTonalButton
 import io.legado.app.ui.widget.components.modalBottomSheet.AppModalBottomSheet
 import io.legado.app.ui.widget.components.text.AppText
 import io.legado.app.utils.LogUtils
@@ -49,7 +49,7 @@ fun AppLogSheet(
         onDismissRequest = onDismissRequest,
         title = stringResource(R.string.log),
         endAction = {
-            MediumPlainButton(
+            MediumTonalButton(
                 onClick = {
                     clearAllLogs()
                     logs = emptyList()

app/src/main/java/io/legado/app/ui/widget/components/log/CrashLogSheet.kt

@@ -18,6 +18,7 @@ import androidx.compose.ui.unit.dp
 import io.legado.app.R
 import io.legado.app.ui.theme.LegadoTheme
 import io.legado.app.ui.widget.components.EmptyMessage
+import io.legado.app.ui.widget.components.button.series.MediumTonalButton
 import io.legado.app.ui.widget.components.modalBottomSheet.AppModalBottomSheet
 import io.legado.app.ui.widget.components.text.AppText
 import io.legado.app.utils.FileDoc
@@ -35,9 +36,11 @@ fun CrashLogSheet(
         show = show,
         onDismissRequest = onDismissRequest,
         endAction = {
-            IconButton(onClick = onClear) {
-                Icon(Icons.Default.DeleteSweep, contentDescription = stringResource(R.string.clear))
-            }
+            MediumTonalButton(
+                onClick = onClear,
+                icon = Icons.Default.DeleteSweep,
+                contentDescription = stringResource(R.string.clear)
+            )
         },
         title = stringResource(R.string.crash_log),
     ) {

app/src/main/java/io/legado/app/ui/widget/components/rules/RuleEditSheet.kt

@@ -35,7 +35,7 @@ import io.legado.app.ui.theme.LegadoTheme
 import io.legado.app.ui.widget.components.AppFloatingActionButton
 import io.legado.app.ui.widget.components.AppTextField
 import io.legado.app.ui.widget.components.text.AppText
-import io.legado.app.ui.widget.components.button.series.MediumPlainButton
+import io.legado.app.ui.widget.components.button.series.MediumTonalButton
 import io.legado.app.ui.widget.components.menuItem.RoundDropdownMenu
 import io.legado.app.ui.widget.components.menuItem.RoundDropdownMenuItem
 import io.legado.app.ui.widget.components.modalBottomSheet.AppModalBottomSheet
@@ -142,7 +142,7 @@ fun <T> RuleEditSheet(
     AppModalBottomSheet(
         title = title,
         startAction = {
-            MediumPlainButton(
+            MediumTonalButton(
                 onClick = onDismissRequest,
                 icon = Icons.Default.Close,
                 contentDescription = stringResource(R.string.close),
@@ -150,7 +150,7 @@ fun <T> RuleEditSheet(
         },
         endAction = {
             Box{
-                MediumPlainButton(
+                MediumTonalButton(
                     onClick = { showMenu = true },
                     icon = Icons.Default.MoreVert,
                     contentDescription = stringResource(R.string.more_menu)