diff --git a/app/src/main/java/io/legado/app/constant/PreferKey.kt b/app/src/main/java/io/legado/app/constant/PreferKey.kt index 319dbc2d3..9d19ac3a0 100644 --- a/app/src/main/java/io/legado/app/constant/PreferKey.kt +++ b/app/src/main/java/io/legado/app/constant/PreferKey.kt @@ -217,4 +217,6 @@ object PreferKey { const val disableMangaScrollAnimation = "disableMangaScrollAnimation" const val disableMangaCrossFade = "disableMangaCrossFade" + + const val titleBarMode = "titleBarMode" } diff --git a/app/src/main/java/io/legado/app/help/config/AppConfig.kt b/app/src/main/java/io/legado/app/help/config/AppConfig.kt index 81788ee67..564f04e2f 100644 --- a/app/src/main/java/io/legado/app/help/config/AppConfig.kt +++ b/app/src/main/java/io/legado/app/help/config/AppConfig.kt @@ -734,6 +734,12 @@ object AppConfig : SharedPreferences.OnSharedPreferenceChangeListener { appCtx.putPrefBoolean(PreferKey.disableMangaCrossFade, value) } + var titleBarMode + get() = appCtx.getPrefString(PreferKey.titleBarMode, "1") + set(value) { + appCtx.putPrefString(PreferKey.titleBarMode, value) + } + //漫画预加载数量 var mangaPreDownloadNum get() = appCtx.getPrefInt(PreferKey.mangaPreDownloadNum, 10) diff --git a/app/src/main/java/io/legado/app/ui/book/read/ReadMenu.kt b/app/src/main/java/io/legado/app/ui/book/read/ReadMenu.kt index cc2d06323..57d6fe57c 100644 --- a/app/src/main/java/io/legado/app/ui/book/read/ReadMenu.kt +++ b/app/src/main/java/io/legado/app/ui/book/read/ReadMenu.kt @@ -259,6 +259,7 @@ class ReadMenu @JvmOverloads constructor( fun reset() { upColorConfig() initView() + upBookView() } fun refreshMenuColorFilter() { @@ -725,14 +726,33 @@ class ReadMenu @JvmOverloads constructor( fun upBookView() { val bookName = ReadBook.book?.name ?: "" - val isTablet = (resources.configuration.screenLayout and Configuration.SCREENLAYOUT_SIZE_MASK) >= Configuration.SCREENLAYOUT_SIZE_LARGE + val mode = AppConfig.titleBarMode?.toInt() - if (isTablet || resources.configuration.orientation == Configuration.ORIENTATION_LANDSCAPE) { - binding.titleBar.title = bookName - binding.tvBookName.gone() - } else { - binding.titleBar.title = " " - binding.tvBookName.text = bookName + when (mode) { + 0 -> { // 在应用栏上显示 + binding.titleBar.title = bookName + binding.llBook.visible() + binding.tvBookName.gone() + } + 1 -> { // 在独立行上显示 + binding.titleBar.title = " " + binding.tvBookName.text = bookName + binding.llBook.visible() + binding.tvBookName.visible() + } + 2 -> { // 仅显示标题 + binding.titleBar.title = bookName + binding.llBook.gone() + } + 3 -> { // 不显示 + binding.titleBar.title = " " + binding.llBook.gone() + } + else -> { + binding.titleBar.title = " " + binding.tvBookName.text = bookName + binding.llBook.visible() + } } ReadBook.curTextChapter?.let { @@ -743,14 +763,16 @@ class ReadMenu @JvmOverloads constructor( } else { binding.tvChapterUrl.gone() } + upSeekBar() binding.tvPre.isEnabled = ReadBook.durChapterIndex != 0 binding.tvNext.isEnabled = ReadBook.durChapterIndex != ReadBook.simulatedChapterSize - 1 - } ?: let { + } ?: run { binding.tvChapterUrl.gone() } } + fun upSeekBar() { //孩子们 土方法丑陋但有效 binding.seekReadPage.apply { diff --git a/app/src/main/java/io/legado/app/ui/book/read/config/MoreConfigDialog.kt b/app/src/main/java/io/legado/app/ui/book/read/config/MoreConfigDialog.kt index ba922796c..263d93fd5 100644 --- a/app/src/main/java/io/legado/app/ui/book/read/config/MoreConfigDialog.kt +++ b/app/src/main/java/io/legado/app/ui/book/read/config/MoreConfigDialog.kt @@ -89,7 +89,7 @@ class MoreConfigDialog : BaseBottomSheetDialogFragment(R.layout.dialog_more_conf } PreferKey.keepLight -> postEvent(key, true) - PreferKey.readSliderMode -> postEvent(EventBus.UPDATE_READ_ACTION_BAR, true) + PreferKey.readSliderMode, PreferKey.titleBarMode -> postEvent(EventBus.UPDATE_READ_ACTION_BAR, true) PreferKey.textSelectAble -> postEvent(key, getPrefBoolean(key)) PreferKey.screenOrientation -> { (activity as? ReadBookActivity)?.setOrientation() diff --git a/app/src/main/res/layout-land/view_read_menu.xml b/app/src/main/res/layout-land/view_read_menu.xml index f37d70614..9c5615c3a 100644 --- a/app/src/main/res/layout-land/view_read_menu.xml +++ b/app/src/main/res/layout-land/view_read_menu.xml @@ -25,6 +25,7 @@ app:layout_constraintTop_toTopOf="parent"> - 自动 在应用栏上显示 在独立行上显示 - - - - 不显示标题 - 不显示章节 - Disable title and chapter display + 仅显示标题 + 不显示 所有版本 diff --git a/app/src/main/res/values-zh/strings.xml b/app/src/main/res/values-zh/strings.xml index 52dbcbf07..9a6b35f78 100644 --- a/app/src/main/res/values-zh/strings.xml +++ b/app/src/main/res/values-zh/strings.xml @@ -1344,4 +1344,5 @@ 实线段长 空隙比例 线段高度 + 菜单标题显示方式 diff --git a/app/src/main/res/values/array_values.xml b/app/src/main/res/values/array_values.xml index 6865c969b..88a0850ee 100644 --- a/app/src/main/res/values/array_values.xml +++ b/app/src/main/res/values/array_values.xml @@ -102,12 +102,7 @@ 0 1 2 - - - - 0 - 1 - 2 + 3 \ No newline at end of file diff --git a/app/src/main/res/values/arrays.xml b/app/src/main/res/values/arrays.xml index 890a306eb..abd8627e6 100644 --- a/app/src/main/res/values/arrays.xml +++ b/app/src/main/res/values/arrays.xml @@ -96,9 +96,10 @@ - Auto Show in TopBar Show in another line + Only Chapter + Not show diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index cccc4f264..9eb4fb986 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -1345,4 +1345,5 @@ 实线段长 空隙比例 线段高度 + 菜单标题显示方式 diff --git a/app/src/main/res/xml/pref_config_read.xml b/app/src/main/res/xml/pref_config_read.xml index 0e2ce048b..7a9861808 100644 --- a/app/src/main/res/xml/pref_config_read.xml +++ b/app/src/main/res/xml/pref_config_read.xml @@ -42,11 +42,11 @@ app:isBottomBackground="true" />