fix: 优化了默认的阅读菜单样式

app/src/main/java/io/legado/app/data/repository/ReadSettingsRepository.kt

@@ -362,7 +362,7 @@ class ReadSettingsRepository(
             textBottomJustify = compatDsValue(Keys.TextBottomJustify, true),
             adaptSpecialStyle = compatDsValue(Keys.AdaptSpecialStyle, true),
             useZhLayout = compatDsValue(Keys.UseZhLayout, false),
-            showBrightnessView = compatDsValue(Keys.ShowBrightnessView, "1"),
+            showBrightnessView = compatDsValue(Keys.ShowBrightnessView, "0"),
             brightnessVwPos = compatDsValue(Keys.BrightnessVwPos, "1"),
             readBrightness = compatDsValue(Keys.ReadBrightness, 100),
             brightnessAuto = compatDsValue(Keys.BrightnessAuto, false),
@@ -396,7 +396,7 @@ class ReadSettingsRepository(
             comicStyleSelect = compatDsValue(Keys.ComicStyleSelect, readStyleSelect),
             shareLayout = compatDsValue(Keys.ShareLayout, false),
             readBarStyleFollowPage = compatDsValue(Keys.ReadBarStyleFollowPage, false),
-            readBarStyle = compatDsValue(Keys.ReadBarStyle, 0),
+            readBarStyle = compatDsValue(Keys.ReadBarStyle, 1),
             clickActionTL = compatDsValue(Keys.ClickActionTL, 2),
             clickActionTC = compatDsValue(Keys.ClickActionTC, 2),
             clickActionTR = compatDsValue(Keys.ClickActionTR, 1),
@@ -416,35 +416,38 @@ class ReadSettingsRepository(
             readMenuTextColor = compatDsValue(Keys.ReadMenuTextColor, 0),
             readMenuTextColorNight = compatDsValue(Keys.ReadMenuTextColorNight, 0),
             readMenuColorMode = compatDsValue(Keys.ReadMenuColorMode, 1),
-            readMenuIconShowText = compatDsValue(Keys.ReadMenuIconShowText, true),
+            readMenuIconShowText = compatDsValue(Keys.ReadMenuIconShowText, false),
             readMenuIconStyle = compatDsValue(Keys.ReadMenuIconStyle, 0),
             titleBarIconStyle = compatDsValue(Keys.TitleBarIconStyle, 0),
             readMenuIconItemsPerRow = compatDsValue(Keys.ReadMenuIconItemsPerRow, 5),
             readMenuIconRowCount = compatDsValue(Keys.ReadMenuIconRowCount, 1),
             readMenuBottomCornerRadius = compatDsValue(Keys.ReadMenuBottomCornerRadius, 0),
-            readMenuFloatingBottomBar = compatDsValue(Keys.ReadMenuFloatingBottomBar, false),
+            readMenuFloatingBottomBar = compatDsValue(Keys.ReadMenuFloatingBottomBar, true),
             readMenuTopBarBlurMode = compatDsValue(Keys.ReadMenuTopBarBlurMode, ReadMenuBlurMode.None),
             readMenuBottomBarBlurMode = compatDsValue(Keys.ReadMenuBottomBarBlurMode, ReadMenuBlurMode.None),
             readMenuTopBarLiquidGlassButtons = compatDsValue(Keys.ReadMenuTopBarLiquidGlassButtons, false),
             readMenuTopBarTitleCapsule = compatDsValue(Keys.ReadMenuTopBarTitleCapsule, false),
             readMenuBottomBarLiquidGlassButtons = compatDsValue(Keys.ReadMenuBottomBarLiquidGlassButtons, false),
-            readMenuTopBarBlurStyle = compatDsValue(Keys.ReadMenuTopBarBlurStyle, ReadMenuBlurStyle.Progressive),
+            readMenuTopBarBlurStyle = compatDsValue(
+                Keys.ReadMenuTopBarBlurStyle,
+                ReadMenuBlurStyle.Solid
+            ),
             readMenuBottomBarBlurStyle = compatDsValue(Keys.ReadMenuBottomBarBlurStyle, ReadMenuBlurStyle.Solid),
             readMenuBlurRadius = compatDsValue(Keys.ReadMenuBlurRadius, 24),
-            readMenuBlurAlpha = compatDsValue(Keys.ReadMenuBlurAlpha, 60),
+            readMenuBlurAlpha = compatDsValue(Keys.ReadMenuBlurAlpha, 100),
             readMenuBlurColor = compatDsValue(Keys.ReadMenuBlurColor, 0),
             readMenuBlurColorNight = compatDsValue(Keys.ReadMenuBlurColorNight, 0),
             readMenuPaletteStyle = compatDsValue(Keys.ReadMenuPaletteStyle, ""),
             readMenuLensRadius = compatDsValue(Keys.ReadMenuLensRadius, 24f),
-            readMenuBorderWidth = compatDsValue(Keys.ReadMenuBorderWidth, 0),
+            readMenuBorderWidth = compatDsValue(Keys.ReadMenuBorderWidth, 1),
             readMenuBorderColor = compatDsValue(Keys.ReadMenuBorderColor, 0),
             readMenuBorderColorNight = compatDsValue(Keys.ReadMenuBorderColorNight, 0),
             readMenuCustomIcons = compatDsValue(Keys.ReadMenuCustomIcons, ""),
             titleBarCustomIcons = compatDsValue(Keys.TitleBarCustomIcons, ""),
-            titleBarIconPosition = compatDsValue(Keys.TitleBarIconPosition, 0),
+            titleBarIconPosition = compatDsValue(Keys.TitleBarIconPosition, 3),
             showTitleBarIcons = compatDsValue(Keys.ShowTitleBarIcons, false),
             chineseConverterType = compatDsValue(Keys.ChineseConverterType, 0),
-            showMenuIcon = compatDsValue(Keys.ShowMenuIcon, true),
+            showMenuIcon = compatDsValue(Keys.ShowMenuIcon, false),
         )
     }
 

app/src/main/java/io/legado/app/domain/model/settings/ReadSettings.kt

@@ -17,7 +17,7 @@ data class ReadSettings(
     val textBottomJustify: Boolean = true,
     val adaptSpecialStyle: Boolean = true,
     val useZhLayout: Boolean = false,
-    val showBrightnessView: String = "1",
+    val showBrightnessView: String = "0",
     val brightnessVwPos: String = "1",
     val readBrightness: Int = 100,
     val brightnessAuto: Boolean = false,
@@ -51,7 +51,7 @@ data class ReadSettings(
     val comicStyleSelect: Int = 0,
     val shareLayout: Boolean = false,
     val readBarStyleFollowPage: Boolean = false,
-    val readBarStyle: Int = 0,
+    val readBarStyle: Int = 1,
     val clickActionTL: Int = 2,
     val clickActionTC: Int = 2,
     val clickActionTR: Int = 1,
@@ -71,34 +71,34 @@ data class ReadSettings(
     val readMenuTextColor: Int = 0,
     val readMenuTextColorNight: Int = 0,
     val readMenuColorMode: Int = 1,
-    val readMenuIconShowText: Boolean = true,
+    val readMenuIconShowText: Boolean = false,
     val readMenuIconStyle: Int = 0,
     val titleBarIconStyle: Int = 0,
     val readMenuIconItemsPerRow: Int = 5,
     val readMenuIconRowCount: Int = 1,
     val readMenuBottomCornerRadius: Int = 0,
-    val readMenuFloatingBottomBar: Boolean = false,
+    val readMenuFloatingBottomBar: Boolean = true,
     val readMenuTopBarBlurMode: Int = ReadMenuBlurMode.None,
     val readMenuBottomBarBlurMode: Int = ReadMenuBlurMode.None,
     val readMenuTopBarLiquidGlassButtons: Boolean = false,
     val readMenuTopBarTitleCapsule: Boolean = false,
     val readMenuBottomBarLiquidGlassButtons: Boolean = false,
-    val readMenuTopBarBlurStyle: Int = ReadMenuBlurStyle.Progressive,
+    val readMenuTopBarBlurStyle: Int = ReadMenuBlurStyle.Solid,
     val readMenuBottomBarBlurStyle: Int = ReadMenuBlurStyle.Solid,
     val readMenuBlurRadius: Int = 24,
-    val readMenuBlurAlpha: Int = 60,
+    val readMenuBlurAlpha: Int = 100,
     val readMenuBlurColor: Int = 0,
     val readMenuBlurColorNight: Int = 0,
     val readMenuPaletteStyle: String = "",
     val readMenuLensRadius: Float = 24f,
-    val readMenuBorderWidth: Int = 0,
+    val readMenuBorderWidth: Int = 1,
     val readMenuBorderColor: Int = 0,
     val readMenuBorderColorNight: Int = 0,
     val readMenuCustomIcons: String = "",
     val titleBarCustomIcons: String = "",
-    val titleBarIconPosition: Int = 0,
+    val titleBarIconPosition: Int = 3,
     val showTitleBarIcons: Boolean = true,
     val chineseConverterType: Int = 0,
-    val showMenuIcon: Boolean = true,
+    val showMenuIcon: Boolean = false,
 )
 

app/src/main/java/io/legado/app/help/config/AppConfig.kt

@@ -542,7 +542,7 @@ object AppConfig {
         }
 
     var readBarStyle: Int
-        get() = appCtx.getPrefInt(PreferKey.readBarStyle, 0)
+        get() = appCtx.getPrefInt(PreferKey.readBarStyle, 1)
         set(value) {
             appCtx.putPrefInt(PreferKey.readBarStyle, value.coerceIn(0, 2))
         }

app/src/main/java/io/legado/app/help/config/ReadBookConfig.kt

@@ -210,9 +210,9 @@ object ReadBookConfig {
     var hideStatusBar by prefDelegate(PreferKey.hideStatusBar, false)
     var hideNavigationBar by prefDelegate(PreferKey.hideNavigationBar, false)
     var useZhLayout by prefDelegate(PreferKey.useZhLayout, false)
-    var readMenuIconShowText by prefDelegate(PreferKey.readMenuIconShowText, true)
-    var showMenuIcon by prefDelegate(PreferKey.showMenuIcon, true)
-    var readMenuFloatingBottomBar by prefDelegate(PreferKey.readMenuFloatingBottomBar, false)
+    var readMenuIconShowText by prefDelegate(PreferKey.readMenuIconShowText, false)
+    var showMenuIcon by prefDelegate(PreferKey.showMenuIcon, false)
+    var readMenuFloatingBottomBar by prefDelegate(PreferKey.readMenuFloatingBottomBar, true)
     var readMenuTopBarLiquidGlassButtons by prefDelegate(PreferKey.readMenuTopBarLiquidGlassButtons, false)
     var readMenuTopBarTitleCapsule by prefDelegate(PreferKey.readMenuTopBarTitleCapsule, false)
     var readMenuBottomBarLiquidGlassButtons by prefDelegate(PreferKey.readMenuBottomBarLiquidGlassButtons, false)
@@ -222,7 +222,7 @@ object ReadBookConfig {
     var readMenuTextColorNight by prefDelegate(PreferKey.readMenuTextColorNight, 0)
     var showTitleBarIcons by prefDelegate(PreferKey.showTitleBarIcons, true)
     var readSliderMode by prefDelegate(PreferKey.readSliderMode, "0")
-    var showBrightnessView by prefDelegate(PreferKey.showBrightnessView, "1")
+    var showBrightnessView by prefDelegate(PreferKey.showBrightnessView, "0")
     var brightnessVwPos by prefDelegate(PreferKey.brightnessVwPos, "1")
     var readBrightness by prefDelegate(PreferKey.brightness, 100)
     var brightnessAuto by prefDelegate(PreferKey.brightnessAuto, false)
@@ -245,16 +245,20 @@ object ReadBookConfig {
     var readMenuBottomCornerRadius by clampedPrefDelegate(PreferKey.readMenuBottomCornerRadius, 0, 0..32)
     var readMenuTopBarBlurMode by clampedPrefDelegate(PreferKey.readMenuTopBarBlurMode, ReadMenuBlurMode.None, 0..2)
     var readMenuBottomBarBlurMode by clampedPrefDelegate(PreferKey.readMenuBottomBarBlurMode, ReadMenuBlurMode.None, 0..2)
-    var readMenuTopBarBlurStyle by clampedPrefDelegate(PreferKey.readMenuTopBarBlurStyle, ReadMenuBlurStyle.Progressive, 0..1)
+    var readMenuTopBarBlurStyle by clampedPrefDelegate(
+        PreferKey.readMenuTopBarBlurStyle,
+        ReadMenuBlurStyle.Solid,
+        0..1
+    )
     var readMenuBottomBarBlurStyle by clampedPrefDelegate(PreferKey.readMenuBottomBarBlurStyle, ReadMenuBlurStyle.Solid, 0..1)
     var readMenuBlurRadius by clampedPrefDelegate(PreferKey.readMenuBlurRadius, 24, 0..32)
-    var readMenuBlurAlpha by clampedPrefDelegate(PreferKey.readMenuBlurAlpha, 60, 0..100)
+    var readMenuBlurAlpha by clampedPrefDelegate(PreferKey.readMenuBlurAlpha, 100, 0..100)
     var readMenuBlurColor by prefDelegate(PreferKey.readMenuBlurColor, 0)
     var readMenuBlurColorNight by prefDelegate(PreferKey.readMenuBlurColorNight, 0)
     var readMenuPaletteStyle: String = ""
     var readMenuLensRadius by clampedPrefDelegate(PreferKey.readMenuLensRadius, 24f, 0f..48f)
-    var readMenuBorderWidth by clampedPrefDelegate(PreferKey.readMenuBorderWidth, 0, 0..4)
-    var titleBarIconPosition by clampedPrefDelegate(PreferKey.titleBarIconPosition, 0, 0..3)
+    var readMenuBorderWidth by clampedPrefDelegate(PreferKey.readMenuBorderWidth, 1, 0..4)
+    var titleBarIconPosition by clampedPrefDelegate(PreferKey.titleBarIconPosition, 3, 0..3)
 
     // endregion
 

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

@@ -9,13 +9,13 @@ import io.legado.app.data.entities.Book
 import io.legado.app.data.entities.BookChapter
 import io.legado.app.data.entities.BookProgress
 import io.legado.app.data.entities.BookSource
-import io.legado.app.data.entities.ReplaceRule
 import io.legado.app.data.entities.Bookmark
 import io.legado.app.data.entities.HighlightRule
 import io.legado.app.data.entities.HttpTTS
+import io.legado.app.data.entities.ReplaceRule
 import io.legado.app.data.repository.ReadAloudSettingsRepository
-import io.legado.app.ui.book.read.page.entities.TextChapter
 import io.legado.app.domain.model.readaloud.SpeechRoleType
+import io.legado.app.ui.book.read.page.entities.TextChapter
 import io.legado.app.ui.book.read.page.entities.TextPage
 import io.legado.app.ui.book.read.page.entities.TextPos
 import io.legado.app.ui.book.searchContent.SearchResult
@@ -362,18 +362,18 @@ data class ContentProcessItemUi(
 
 @Stable
 data class ReadMenuConfig(
-    val titleBarIconPosition: Int = 0,
+    val titleBarIconPosition: Int = 3,
     val showTitleBarIcons: Boolean = false,
-    val readMenuFloatingBottomBar: Boolean = false,
+    val readMenuFloatingBottomBar: Boolean = true,
     val readMenuBottomCornerRadius: Int = 0,
     val readMenuIconItemsPerRow: Int = 5,
     val readMenuIconRowCount: Int = 1,
-    val readMenuBorderWidth: Int = 0,
+    val readMenuBorderWidth: Int = 1,
     val readMenuBorderColor: Int = 0,
     val readMenuBorderColorNight: Int = 0,
     val readMenuTextColor: Int = 0,
     val readMenuTextColorNight: Int = 0,
-    val readMenuBlurAlpha: Int = 60,
+    val readMenuBlurAlpha: Int = 100,
     val readMenuBlurColor: Int = 0,
     val readMenuBlurColorNight: Int = 0,
     val readMenuPaletteStyle: String = "",
@@ -384,21 +384,21 @@ data class ReadMenuConfig(
     val readMenuTopBarLiquidGlassButtons: Boolean = false,
     val readMenuTopBarTitleCapsule: Boolean = false,
     val readMenuBottomBarLiquidGlassButtons: Boolean = false,
-    val readMenuTopBarBlurStyle: Int = ReadMenuBlurStyle.Progressive,
+    val readMenuTopBarBlurStyle: Int = ReadMenuBlurStyle.Solid,
     val readMenuBottomBarBlurStyle: Int = ReadMenuBlurStyle.Solid,
     val readMenuIconStyle: Int = 0,
     val titleBarIconStyle: Int = 0,
-    val readMenuIconShowText: Boolean = true,
+    val readMenuIconShowText: Boolean = false,
     val readSliderMode: String = "0",
     val titleBarCustomIcons: ImmutableMap<String, String> = persistentMapOf(),
     val readMenuCustomIcons: ImmutableMap<String, String> = persistentMapOf(),
     val titleBarButtons: ImmutableList<ReadBookButtonConfigItem> = persistentListOf(),
     val bottomBarButtons: ImmutableList<ReadBookButtonConfigItem> = persistentListOf(),
-    val showBrightnessView: String = "1",
+    val showBrightnessView: String = "0",
     val brightnessVwPos: String = "1",
     val readBrightness: Int = 100,
     val brightnessAuto: Boolean = false,
-    val showMenuIcon: Boolean = true,
+    val showMenuIcon: Boolean = false,
 )
 
 @Immutable

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

@@ -19,7 +19,6 @@ import io.legado.app.constant.BookType
 import io.legado.app.constant.EventBus
 import io.legado.app.constant.PreferKey
 import io.legado.app.constant.ReadMenuBlurMode
-import io.legado.app.domain.model.readaloud.ReadAloudSessionStatus
 import io.legado.app.data.appDb
 import io.legado.app.data.entities.AiPromptPreset
 import io.legado.app.data.entities.Book
@@ -30,23 +29,24 @@ import io.legado.app.data.entities.Bookmark
 import io.legado.app.data.entities.HighlightRule
 import io.legado.app.data.entities.HttpTTS
 import io.legado.app.data.local.preferences.LocalPreferencesKeys
-import io.legado.app.data.repository.SettingsRepository
 import io.legado.app.data.repository.HighlightRuleRepository
 import io.legado.app.data.repository.ReadAloudSettingsRepository
 import io.legado.app.data.repository.ReadBookStyleConfigRepository
-import io.legado.app.data.repository.ReplaceRuleRepository
 import io.legado.app.data.repository.ReadPreferences
 import io.legado.app.data.repository.ReadSettingsRepository
+import io.legado.app.data.repository.ReplaceRuleRepository
+import io.legado.app.data.repository.SettingsRepository
 import io.legado.app.data.repository.UploadRepository
-import io.legado.app.domain.gateway.BookContentProcessGateway
 import io.legado.app.domain.gateway.AiArtifactGateway
-import io.legado.app.domain.gateway.AiPromptPresetGateway
 import io.legado.app.domain.gateway.AiProfileGateway
-import io.legado.app.domain.model.TextProcessAction
-import io.legado.app.domain.model.TextProcessAnchor
+import io.legado.app.domain.gateway.AiPromptPresetGateway
+import io.legado.app.domain.gateway.BookContentProcessGateway
 import io.legado.app.domain.model.AiTaskType
 import io.legado.app.domain.model.PlaybackTimer
 import io.legado.app.domain.model.ReadingProgress
+import io.legado.app.domain.model.TextProcessAction
+import io.legado.app.domain.model.TextProcessAnchor
+import io.legado.app.domain.model.readaloud.ReadAloudSessionStatus
 import io.legado.app.domain.model.readaloud.ReadAloudVoice
 import io.legado.app.domain.model.readaloud.VoiceCatalogEntry
 import io.legado.app.domain.usecase.AiTextFactoryUseCase
@@ -137,7 +137,6 @@ import kotlinx.coroutines.flow.collect
 import kotlinx.coroutines.flow.first
 import kotlinx.coroutines.flow.flow
 import kotlinx.coroutines.flow.onCompletion
-import org.json.JSONObject
 import kotlinx.coroutines.flow.onEach
 import kotlinx.coroutines.flow.onEmpty
 import kotlinx.coroutines.flow.onStart
@@ -6294,8 +6293,8 @@ private const val AI_REWRITE_REFERENCE_MAX_EXCERPTS = 6
 private const val AI_REWRITE_REFERENCE_EXCERPT_CHARS = 600
 private val DEFAULT_ENABLED_BUTTON_IDS = setOf(
     "search",
-    "auto_page",
     "catalog",
+    "addBookmark",
     "read_aloud",
     "setting",
 )

app/src/main/java/io/legado/app/ui/config/readConfig/ReadConfigContract.kt

@@ -10,14 +10,14 @@ data class ReadConfigUiState(
     val hideNavigationBar: Boolean = false,
     val paddingDisplayCutouts: Boolean = false,
     val titleBarMode: String = "1",
-    val readMenuBlurAlpha: Int = 60,
+    val readMenuBlurAlpha: Int = 100,
     val readBodyToLh: Boolean = true,
     val defaultSourceChangeAll: Boolean = true,
     val textFullJustify: Boolean = true,
     val textBottomJustify: Boolean = true,
     val adaptSpecialStyle: Boolean = true,
     val useZhLayout: Boolean = false,
-    val showBrightnessView: String = "1",
+    val showBrightnessView: String = "0",
     val brightnessVwPos: String = "1",
     val brightnessAuto: Boolean = false,
     val useUnderline: Boolean = false,
@@ -44,7 +44,7 @@ data class ReadConfigUiState(
     val autoReadSpeed: Int = 10,
     val prevKeys: String = "",
     val nextKeys: String = "",
-    val showMenuIcon: Boolean = true,
+    val showMenuIcon: Boolean = false,
     val activeSheet: ReadConfigSheet? = null,
 )
 

app/src/main/java/io/legado/app/ui/config/readConfig/ReadMenuConfig.kt

@@ -27,7 +27,7 @@ object ReadMenuConfig {
 
     var readBarStyle by prefDelegate(
         PreferKey.readBarStyle,
-        0
+        1
     )
 
     var progressBarBehavior by prefDelegate(
@@ -57,7 +57,7 @@ object ReadMenuConfig {
 
     var showMenuIcon by prefDelegate(
         PreferKey.showMenuIcon,
-        true
+        false
     )
 
     // --- 点击区域配置 ---