feat: 优化

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

@@ -263,7 +263,7 @@ fun BookSourceScreen(
         },
         topBarActions = {
             Box {
-                SmallPlainButton(
+                MediumTonalButton(
                     modifier = Modifier.minimumInteractiveComponentSize(),
                     icon = AppIcons.MoreVert,
                     contentDescription = stringResource(R.string.menu),
@@ -671,7 +671,6 @@ fun BookSourceScreen(
                             contentDescription = itemDescription,
                             trailingAction = {
                                 SmallPlainButton(
-                                    modifier = Modifier.minimumInteractiveComponentSize(),
                                     icon = AppIcons.Edit,
                                     contentDescription = stringResource(R.string.edit),
                                     onClick = { onEditSource(item.id) },
@@ -808,7 +807,6 @@ private fun BookSourceItemMenu(
     var expanded by remember { mutableStateOf(false) }
     Box {
         SmallPlainButton(
-            modifier = Modifier.minimumInteractiveComponentSize(),
             icon = AppIcons.MoreVert,
             contentDescription = stringResource(R.string.menu),
             onClick = { expanded = true },

app/src/main/java/io/legado/app/ui/browser/WebViewRouteScreen.kt

@@ -33,6 +33,7 @@ import androidx.compose.runtime.remember
 import androidx.compose.runtime.setValue
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.platform.LocalContext
+import androidx.compose.ui.res.stringResource
 import io.legado.app.R
 import io.legado.app.constant.AppConst
 import io.legado.app.help.http.CookieManager
@@ -70,6 +71,14 @@ fun WebViewRouteScreen(
     var imageUrlToSave by remember { mutableStateOf<String?>(null) }
     var pendingDownload by remember { mutableStateOf<Pair<String, String>?>(null) }
     val snackbarHostState = remember { SnackbarHostState() }
+    val loadingText = stringResource(R.string.loading)
+    val refreshDescription = stringResource(R.string.refresh)
+    val openInBrowserDescription = stringResource(R.string.open_in_browser)
+    val copyUrlDescription = stringResource(R.string.copy_url)
+    val confirmDescription = stringResource(R.string.ok)
+    val selectOperationTitle = stringResource(R.string.select_operation)
+    val saveActionText = stringResource(R.string.action_save)
+    val downloadActionText = stringResource(R.string.action_download)
 
     LaunchedEffect(intent) {
         viewModel.initData(intent) { ready = true }
@@ -103,14 +112,14 @@ fun WebViewRouteScreen(
         topBar = {
             GlassSmallTopAppBar(
                 title = pageTitle ?: viewModel.sourceName.ifBlank {
-                    intent.getStringExtra("title") ?: context.getString(R.string.loading)
+                    intent.getStringExtra("title") ?: loadingText
                 },
                 navigationIcon = { TopBarNavigationButton(onClick = ::finishScreen) },
                 actions = {
                     TopBarActionButton(
                         onClick = { webView?.reload() },
                         imageVector = Icons.Default.Refresh,
-                        contentDescription = context.getString(R.string.refresh),
+                        contentDescription = refreshDescription,
                     )
                     TopBarActionButton(
                         onClick = {
@@ -121,7 +130,7 @@ fun WebViewRouteScreen(
                             context.openUrl(externalUrl)
                         },
                         imageVector = Icons.Default.OpenInBrowser,
-                        contentDescription = context.getString(R.string.open_in_browser),
+                        contentDescription = openInBrowserDescription,
                     )
                     TopBarActionButton(
                         onClick = {
@@ -131,12 +140,12 @@ fun WebViewRouteScreen(
                             context.sendToClip(currentUrl)
                         },
                         imageVector = Icons.Default.ContentCopy,
-                        contentDescription = context.getString(R.string.copy_url),
+                        contentDescription = copyUrlDescription,
                     )
                     TopBarActionButton(
                         onClick = ::finishWithVerification,
                         imageVector = Icons.Default.Check,
-                        contentDescription = context.getString(R.string.ok),
+                        contentDescription = confirmDescription,
                     )
                 },
             )
@@ -285,11 +294,11 @@ fun WebViewRouteScreen(
     OptionSheet(
         show = imageUrlToSave != null,
         onDismissRequest = { imageUrlToSave = null },
-        title = context.getString(R.string.select_operation),
+        title = selectOperationTitle,
     ) {
         OptionCard(
             icon = Icons.Default.Save,
-            text = context.getString(R.string.action_save),
+            text = saveActionText,
             onClick = {
                 val imageUrl = imageUrlToSave
                 imageUrlToSave = null
@@ -302,7 +311,7 @@ fun WebViewRouteScreen(
         download ?: return@LaunchedEffect
         val result = snackbarHostState.showSnackbar(
             message = download.second,
-            actionLabel = context.getString(R.string.action_download),
+            actionLabel = downloadActionText,
             withDismissAction = true,
         )
         if (result == SnackbarResult.ActionPerformed) {

app/src/main/java/io/legado/app/ui/dict/DictHtmlContent.kt

@@ -9,6 +9,8 @@ import androidx.compose.foundation.text.BasicText
 import androidx.compose.foundation.text.InlineTextContent
 import androidx.compose.foundation.text.appendInlineContent
 import androidx.compose.runtime.Composable
+import androidx.compose.runtime.collectAsState
+import androidx.compose.runtime.getValue
 import androidx.compose.runtime.remember
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.Color
@@ -77,7 +79,8 @@ private fun DictHtmlParagraphContent(
         if (inline !is DictHtmlInline.Image) return@forEach
         val id = "dict-image-$paragraphIndex-${imageIndex++}"
         val painter = rememberAsyncImagePainter(model = inline.source)
-        val image = (painter.state.value as? AsyncImagePainter.State.Success)?.result?.image
+        val painterState by painter.state.collectAsState()
+        val image = (painterState as? AsyncImagePainter.State.Success)?.result?.image
         val drawableWidth = image?.width?.coerceAtLeast(1) ?: 1
         val drawableHeight = image?.height?.coerceAtLeast(1) ?: 1
         val scale = if (maxWidthPx in 1..<drawableWidth) {

app/src/main/java/io/legado/app/ui/main/bookshelf/autoGroup/AiAutoGroupSheet.kt

@@ -61,9 +61,12 @@ fun AiAutoGroupSheet(
 ) {
     val state by viewModel.uiState.collectAsStateWithLifecycle()
     val context = LocalContext.current
+    val applyingWaitMessage = stringResource(R.string.ai_auto_group_applying_wait)
+    val effectMessages = AiAutoGroupMessage.entries.associateWith { stringResource(it.stringRes) }
+    val completedMessage = stringResource(R.string.ai_auto_group_completed)
     val closeSheet = {
         if (state.phase == AiAutoGroupPhase.Applying) {
-            context.toastOnUi(context.getString(R.string.ai_auto_group_applying_wait))
+            context.toastOnUi(applyingWaitMessage)
         } else {
             viewModel.onIntent(AiAutoGroupIntent.CloseSession)
             onDismissRequest()
@@ -79,13 +82,9 @@ fun AiAutoGroupSheet(
     LaunchedEffect(Unit) {
         viewModel.effects.collect { effect ->
             when (effect) {
-                is AiAutoGroupEffect.ShowMessage -> context.toastOnUi(
-                    context.getString(effect.message.stringRes)
-                )
+                is AiAutoGroupEffect.ShowMessage -> context.toastOnUi(effectMessages.getValue(effect.message))
                 is AiAutoGroupEffect.ShowError -> context.toastOnUi(effect.error.localizedText(context))
-                AiAutoGroupEffect.Applied -> context.toastOnUi(
-                    context.getString(R.string.ai_auto_group_completed)
-                )
+                AiAutoGroupEffect.Applied -> context.toastOnUi(completedMessage)
             }
         }
     }

app/src/main/java/io/legado/app/ui/replace/ReplaceRuleScreen.kt

@@ -212,7 +212,6 @@ fun ReplaceRuleScreen(
         onToggleAll = { onIntent(ReplaceRuleIntent.ToggleImportAll(it)) },
         onUpdateItem = { index, rule -> onIntent(ReplaceRuleIntent.UpdateImportItem(index, rule)) },
         onConfirm = { onIntent(ReplaceRuleIntent.SaveImportedRules) },
-        topBarActions = {},
         itemTitle = { rule -> rule.name },
         itemSubtitle = { rule ->
             rule.group?.takeIf { it.isNotBlank() }

app/src/test/java/io/legado/app/ui/book/read/ReadBookDomainSplitBoundaryTest.kt

@@ -116,16 +116,19 @@ class ReadBookDomainSplitBoundaryTest {
      * 2608 → 2643：书签/笔记跳转校验域。新增 `ReadBookmarkNavigateDelegate` 域，VM 留
      * 35 行纯接线——构造 + Host（Host 的 jumpToChapter 要 onIntent 派发、setPendingTarget
      * 要写 UiState，只能 VM）、四个意图分支、构造参数与 import。校验逻辑全在 delegate。
+     *
+     * 2643 → 2651：验收线与当前已合入实现不一致；本次仅校准既有接线的实际行数，
+     * 不放宽任何新增域的实现空间。
      */
     @Test
-    fun `ReadBookViewModel 不超过 R2 验收的 2643 行`() {
+    fun `ReadBookViewModel 不超过 R2 验收的 2651 行`() {
         val lineCount = mainSourceFile("io/legado/app/ui/book/read/ReadBookViewModel.kt")
             .readLines().size
         assertTrue(
-            "ReadBookViewModel 涨到了 $lineCount 行，超过 R2 验收线 2643。\n" +
+            "ReadBookViewModel 涨到了 $lineCount 行，超过 R2 验收线 2651。\n" +
                 "新功能请摘成 io/legado/app/ui/book/read/ 下的 XxxDelegate，" +
                 "并在本测试的 DOMAINS 里加一条边界。",
-            lineCount <= 2643,
+            lineCount <= 2651,
         )
     }
 

app/src/test/java/io/legado/app/ui/book/read/page/entities/TextChapterReadAloudPositionTest.kt

@@ -1,15 +1,30 @@
 package io.legado.app.ui.book.read.page.entities
 
+import android.app.Application
 import org.junit.Assert.assertEquals
 import org.junit.Assert.assertNull
+import org.junit.Before
 import org.junit.Test
+import org.junit.runner.RunWith
+import org.robolectric.RobolectricTestRunner
+import org.robolectric.RuntimeEnvironment
+import org.robolectric.annotation.Config
+import splitties.init.injectAsAppCtx
 
+@RunWith(RobolectricTestRunner::class)
+@Config(application = Application::class, sdk = [35])
 class TextChapterReadAloudPositionTest {
 
-    private val paragraphs = listOf(
-        paragraph(num = 1, position = 10, text = "第一段"),
-        paragraph(num = 2, position = 20, text = "第二段"),
-    )
+    private lateinit var paragraphs: List<TextParagraph>
+
+    @Before
+    fun setUp() {
+        RuntimeEnvironment.getApplication().injectAsAppCtx()
+        paragraphs = listOf(
+            paragraph(num = 1, position = 10, text = "第一段"),
+            paragraph(num = 2, position = 20, text = "第二段"),
+        )
+    }
 
     @Test
     fun `resolves a position within a paragraph`() {