From e837c156fc7789cf0ebf1548b6eb8d3dadf41fd4 Mon Sep 17 00:00:00 2001 From: lhjgege <1079947827@qq.com> Date: Wed, 26 Mar 2025 17:45:11 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E7=A6=81=E7=94=A8=E6=BC=AB?= =?UTF-8?q?=E7=94=BB=E5=88=97=E8=A1=A8=E4=B8=AD=E6=A0=87=E9=A2=98=E6=98=BE?= =?UTF-8?q?=E7=A4=BA=20(#4880)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * 增加禁用漫画列表中标题显示 增加音量键上下翻页 * ... * ... --- .../java/io/legado/app/constant/PreferKey.kt | 1 + .../io/legado/app/help/config/AppConfig.kt | 7 +++++ .../app/ui/book/manga/ReadMangaActivity.kt | 27 ++++++++++++++++++- .../book/manga/recyclerview/MangaAdapter.kt | 10 +++++++ app/src/main/res/menu/book_manga.xml | 7 +++++ app/src/main/res/values-es-rES/strings.xml | 1 + app/src/main/res/values-ja-rJP/strings.xml | 1 + app/src/main/res/values-pt-rBR/strings.xml | 1 + app/src/main/res/values-vi/strings.xml | 1 + app/src/main/res/values-zh-rHK/strings.xml | 1 + app/src/main/res/values-zh-rTW/strings.xml | 1 + app/src/main/res/values-zh/strings.xml | 1 + app/src/main/res/values/strings.xml | 1 + 13 files changed, 59 insertions(+), 1 deletion(-) 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 4af17ea13..7ce58e32c 100644 --- a/app/src/main/java/io/legado/app/constant/PreferKey.kt +++ b/app/src/main/java/io/legado/app/constant/PreferKey.kt @@ -100,6 +100,7 @@ object PreferKey { const val mangaFooterConfig = "mangaFooterConfig" const val disableClickScroll = "disableClickScroll" const val enableMangaHorizontalScroll = "enableMangaHorizontalScroll" + const val hideMangaTitle = "hideMangaTitle" const val mangaColorFilter = "mangaColorFilter" const val autoRefresh = "auto_refresh" const val defaultToRead = "defaultToRead" 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 b56781e72..fd0d151bf 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 @@ -656,5 +656,12 @@ object AppConfig : SharedPreferences.OnSharedPreferenceChangeListener { set(value) { appCtx.putPrefString(PreferKey.mangaColorFilter, value) } + + //禁用漫画内标题 + var hideMangaTitle + get() = appCtx.getPrefBoolean(PreferKey.hideMangaTitle, false) + set(value) { + appCtx.putPrefBoolean(PreferKey.hideMangaTitle, value) + } } diff --git a/app/src/main/java/io/legado/app/ui/book/manga/ReadMangaActivity.kt b/app/src/main/java/io/legado/app/ui/book/manga/ReadMangaActivity.kt index 87404b3f3..539c7b377 100644 --- a/app/src/main/java/io/legado/app/ui/book/manga/ReadMangaActivity.kt +++ b/app/src/main/java/io/legado/app/ui/book/manga/ReadMangaActivity.kt @@ -189,7 +189,10 @@ class ReadMangaActivity : VMBaseActivity(AppConfig.mangaColorFilter).getOrNull() ?: MangaColorFilterConfig() - mAdapter.setMangaImageColorFilter(mangaColorFilter) + mAdapter.run { + setMangaImageColorFilter(mangaColorFilter) + setHideTitle(AppConfig.hideMangaTitle) + } setHorizontalScroll(AppConfig.enableMangaHorizontalScroll) binding.recyclerView.run { adapter = mAdapter @@ -560,6 +563,12 @@ class ReadMangaActivity : VMBaseActivity { + item.isChecked = !item.isChecked + AppConfig.hideMangaTitle = item.isChecked + mAdapter.setHideTitle(item.isChecked) + } } return super.onCompatOptionsItemSelected(item) } @@ -635,6 +644,7 @@ class ReadMangaActivity : VMBaseActivity { + scrollToPrev() + return true + } + + KeyEvent.KEYCODE_VOLUME_DOWN -> { + scrollToNext() + return true + } + } + return super.onKeyDown(keyCode, event) + } } \ No newline at end of file diff --git a/app/src/main/java/io/legado/app/ui/book/manga/recyclerview/MangaAdapter.kt b/app/src/main/java/io/legado/app/ui/book/manga/recyclerview/MangaAdapter.kt index f84fe2051..882738408 100644 --- a/app/src/main/java/io/legado/app/ui/book/manga/recyclerview/MangaAdapter.kt +++ b/app/src/main/java/io/legado/app/ui/book/manga/recyclerview/MangaAdapter.kt @@ -28,6 +28,7 @@ import io.legado.app.model.ReadManga import io.legado.app.ui.book.manga.config.MangaColorFilterConfig import io.legado.app.ui.book.manga.entities.MangaPage import io.legado.app.ui.book.manga.entities.ReaderLoading +import io.legado.app.ui.widget.anima.explosion_field.Utils class MangaAdapter(private val context: Context) : @@ -42,6 +43,7 @@ class MangaAdapter(private val context: Context) : } var isHorizontal = false + private var hideTitle = false private val mDiffCallback: DiffUtil.ItemCallback = object : DiffUtil.ItemCallback() { override fun areItemsTheSame(oldItem: Any, newItem: Any): Boolean { @@ -126,6 +128,9 @@ class MangaAdapter(private val context: Context) : fun onBind(item: ReaderLoading) { val message = item.mMessage binding.text.text = message + binding.root.updateLayoutParams { + height = if (hideTitle) 0 else Utils.dp2Px(96) + } } } @@ -238,4 +243,9 @@ class MangaAdapter(private val context: Context) : mConfig = config notifyItemRangeChanged(0, itemCount) } + + fun setHideTitle(hide: Boolean) { + this.hideTitle=hide + notifyItemRangeChanged(0, itemCount) + } } \ No newline at end of file diff --git a/app/src/main/res/menu/book_manga.xml b/app/src/main/res/menu/book_manga.xml index c8eb5a0a4..6a1a8b724 100644 --- a/app/src/main/res/menu/book_manga.xml +++ b/app/src/main/res/menu/book_manga.xml @@ -81,4 +81,11 @@ android:title="@string/manga_color_filter" app:showAsAction="never" /> + + diff --git a/app/src/main/res/values-es-rES/strings.xml b/app/src/main/res/values-es-rES/strings.xml index 418ed8ced..9f21ed9b9 100644 --- a/app/src/main/res/values-es-rES/strings.xml +++ b/app/src/main/res/values-es-rES/strings.xml @@ -1207,4 +1207,5 @@ 居中 水平滚动 滤镜 + 隐藏漫画列表标题 diff --git a/app/src/main/res/values-ja-rJP/strings.xml b/app/src/main/res/values-ja-rJP/strings.xml index 11d2c7c26..34ae5868d 100644 --- a/app/src/main/res/values-ja-rJP/strings.xml +++ b/app/src/main/res/values-ja-rJP/strings.xml @@ -1210,4 +1210,5 @@ 居中 水平滚动 滤镜 + 隐藏漫画列表标题 diff --git a/app/src/main/res/values-pt-rBR/strings.xml b/app/src/main/res/values-pt-rBR/strings.xml index b45c7a0f5..c24253951 100644 --- a/app/src/main/res/values-pt-rBR/strings.xml +++ b/app/src/main/res/values-pt-rBR/strings.xml @@ -1210,4 +1210,5 @@ 居中 水平滚动 滤镜 + 隐藏漫画列表标题 diff --git a/app/src/main/res/values-vi/strings.xml b/app/src/main/res/values-vi/strings.xml index ccdf7176b..fe4f4ec65 100644 --- a/app/src/main/res/values-vi/strings.xml +++ b/app/src/main/res/values-vi/strings.xml @@ -1206,4 +1206,5 @@ Còn 居中 水平滚动 滤镜 + 隐藏漫画列表标题 diff --git a/app/src/main/res/values-zh-rHK/strings.xml b/app/src/main/res/values-zh-rHK/strings.xml index ad5bef778..9c51be61d 100644 --- a/app/src/main/res/values-zh-rHK/strings.xml +++ b/app/src/main/res/values-zh-rHK/strings.xml @@ -1207,4 +1207,5 @@ 居中 水平滚动 滤镜 + 隐藏漫画列表标题 diff --git a/app/src/main/res/values-zh-rTW/strings.xml b/app/src/main/res/values-zh-rTW/strings.xml index 21c4d9fc4..626785d4e 100644 --- a/app/src/main/res/values-zh-rTW/strings.xml +++ b/app/src/main/res/values-zh-rTW/strings.xml @@ -1209,4 +1209,5 @@ 居中 水平滚动 滤镜 + 隐藏漫画列表标题 diff --git a/app/src/main/res/values-zh/strings.xml b/app/src/main/res/values-zh/strings.xml index fe1ed6c95..aeeeb598c 100644 --- a/app/src/main/res/values-zh/strings.xml +++ b/app/src/main/res/values-zh/strings.xml @@ -1209,4 +1209,5 @@ 居中 水平滚动 滤镜 + 隐藏漫画列表标题 diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index ba2376e83..4b1130462 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -1210,4 +1210,5 @@ 居中 水平滚动 滤镜 + 隐藏漫画列表标题