From 60d9d1d7e5966a2c1a42790036107159c10a9c5e Mon Sep 17 00:00:00 2001 From: Horis <8674809+821938089@users.noreply.github.com> Date: Fri, 19 Dec 2025 11:23:33 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/io/legado/app/constant/PreferKey.kt | 2 +- .../java/io/legado/app/help/config/AppConfig.kt | 6 +++--- .../legado/app/ui/book/manga/ReadMangaActivity.kt | 15 +++++++-------- .../ui/book/source/manage/BookSourceActivity.kt | 10 +++++----- app/src/main/res/menu/book_manga.xml | 4 ++-- app/src/main/res/menu/book_source.xml | 4 ++-- app/src/main/res/values-es-rES/strings.xml | 4 ++-- app/src/main/res/values-ja-rJP/strings.xml | 4 ++-- app/src/main/res/values-pt-rBR/strings.xml | 4 ++-- app/src/main/res/values-vi/strings.xml | 4 ++-- app/src/main/res/values-zh-rHK/strings.xml | 4 ++-- app/src/main/res/values-zh-rTW/strings.xml | 4 ++-- app/src/main/res/values-zh/strings.xml | 4 ++-- app/src/main/res/values/strings.xml | 4 ++-- 14 files changed, 36 insertions(+), 37 deletions(-) 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 b0be01a5b..ff72b0bb2 100644 --- a/app/src/main/java/io/legado/app/constant/PreferKey.kt +++ b/app/src/main/java/io/legado/app/constant/PreferKey.kt @@ -104,7 +104,7 @@ object PreferKey { const val mangaColorFilter = "mangaColorFilter" const val enableMangaEInk = "enableMangaEInk" const val mangaEInkThreshold = "mangaEInkThreshold" - const val disableHorizontalAnimator = "disableHorizontalAnimator" + const val disableHorizontalPageSnap = "disableHorizontalPageSnap" const val enableMangaGray = "enableMangaGray" 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 0ebb2f42e..a1334bc65 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 @@ -684,10 +684,10 @@ object AppConfig : SharedPreferences.OnSharedPreferenceChangeListener { appCtx.putPrefInt(PreferKey.mangaEInkThreshold, value) } - var disableHorizontalAnimator - get() = appCtx.getPrefBoolean(PreferKey.disableHorizontalAnimator, false) + var disableHorizontalPageSnap + get() = appCtx.getPrefBoolean(PreferKey.disableHorizontalPageSnap, false) set(value) { - appCtx.putPrefBoolean(PreferKey.disableHorizontalAnimator, value) + appCtx.putPrefBoolean(PreferKey.disableHorizontalPageSnap, value) } var enableMangaGray 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 c7c4c4690..ae8bcf7aa 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 @@ -542,7 +542,7 @@ class ReadMangaActivity : VMBaseActivity { item.isChecked = !item.isChecked AppConfig.enableMangaHorizontalScroll = item.isChecked - mMenu?.findItem(R.id.menu_disable_horizontal_animation)?.isVisible = item.isChecked + mMenu?.findItem(R.id.menu_disable_horizontal_page_snap)?.isVisible = item.isChecked setHorizontalScroll(item.isChecked) mAdapter.notifyDataSetChanged() } @@ -586,9 +586,9 @@ class ReadMangaActivity : VMBaseActivity { + R.id.menu_disable_horizontal_page_snap -> { item.isChecked = !item.isChecked - AppConfig.disableHorizontalAnimator = item.isChecked + AppConfig.disableHorizontalPageSnap = item.isChecked if (item.isChecked) { mPagerSnapHelper.attachToRecyclerView(null) } else { @@ -659,7 +659,7 @@ class ReadMangaActivity : VMBaseActivity() private val qrResult = registerForActivityResult(QrCodeResult()) { it ?: return@registerForActivityResult @@ -254,9 +254,9 @@ class BookSourceActivity : VMBaseActivity { + R.id.menu_group_sources_by_domain -> { item.isChecked = !item.isChecked - showDuplicationSource = item.isChecked + groupSourcesByDomain = item.isChecked adapter.showSourceHost = item.isChecked upBookSource(searchView.query?.toString()) } @@ -332,7 +332,7 @@ class BookSourceActivity : VMBaseActivity hostMap.clear() - if (showDuplicationSource) { + if (groupSourcesByDomain) { data.sortedWith( compareBy { getSourceHost(it.bookSourceUrl) == "#" } .thenBy { getSourceHost(it.bookSourceUrl) } @@ -386,7 +386,7 @@ class BookSourceActivity : VMBaseActivity adapter.setItems(data, adapter.diffItemCallback, !Debug.isChecking) itemTouchCallback.isCanDrag = - sort == BookSourceSort.Default && !showDuplicationSource + sort == BookSourceSort.Default && !groupSourcesByDomain delay(500) } } diff --git a/app/src/main/res/menu/book_manga.xml b/app/src/main/res/menu/book_manga.xml index 2c7020f0d..7eef25d70 100644 --- a/app/src/main/res/menu/book_manga.xml +++ b/app/src/main/res/menu/book_manga.xml @@ -72,11 +72,11 @@ app:showAsAction="never" /> 阅读需要读取手机状态实现来电期间暂停朗读功能 耳机按键启动朗读 通过耳机按键来启动朗读 - 显示重复书源 + 按域名分组显示 主题配置 漫画浏览 禁用漫画缩放 @@ -1219,7 +1219,7 @@ 墨水屏 墨水屏设置 阈值 - 禁用水平滚动动画 + 禁用水平翻页效果 开启图片灰色 是否确认开始缓存? 自动检查新备份 diff --git a/app/src/main/res/values-ja-rJP/strings.xml b/app/src/main/res/values-ja-rJP/strings.xml index 97f4ddb08..4a365fdca 100644 --- a/app/src/main/res/values-ja-rJP/strings.xml +++ b/app/src/main/res/values-ja-rJP/strings.xml @@ -1188,7 +1188,7 @@ 阅读需要读取手机状态实现来电期间暂停朗读功能 耳机按键启动朗读 通过耳机按键来启动朗读 - 显示重复书源 + 按域名分组显示 主题配置 漫画浏览 禁用漫画缩放 @@ -1222,7 +1222,7 @@ 墨水屏 墨水屏设置 阈值 - 禁用水平滚动动画 + 禁用水平翻页效果 开启图片灰色 是否确认开始缓存? 自动检查新备份 diff --git a/app/src/main/res/values-pt-rBR/strings.xml b/app/src/main/res/values-pt-rBR/strings.xml index b36503081..33208017f 100644 --- a/app/src/main/res/values-pt-rBR/strings.xml +++ b/app/src/main/res/values-pt-rBR/strings.xml @@ -1188,7 +1188,7 @@ 阅读需要读取手机状态实现来电期间暂停朗读功能 耳机按键启动朗读 通过耳机按键来启动朗读 - 显示重复书源 + 按域名分组显示 主题配置 漫画浏览 禁用漫画缩放 @@ -1222,7 +1222,7 @@ 墨水屏 墨水屏设置 阈值 - 禁用水平滚动动画 + 禁用水平翻页效果 开启图片灰色 是否确认开始缓存? 自动检查新备份 diff --git a/app/src/main/res/values-vi/strings.xml b/app/src/main/res/values-vi/strings.xml index e214e20cd..1b89571a0 100644 --- a/app/src/main/res/values-vi/strings.xml +++ b/app/src/main/res/values-vi/strings.xml @@ -1178,7 +1178,7 @@ Đọc cần đọc trạng thái điện thoại để thực hiện chức năng tạm dừng đọc trong khi gọi Nút tai nghe bắt đầu đọc Bắt đầu đọc bằng nút tai nghe - Hiển thị nguồn sách trùng lặp + 按域名分组显示 Cấu hình chủ đề Duyệt manga Vô hiệu hóa thu phóng manga @@ -1212,7 +1212,7 @@ Màn hình mực Cài đặt màn hình mực Ngưỡng - Tắt hoạt ảnh cuộn ngang + 禁用水平翻页效果 Bật ảnh xám Chế độ phát 是否确认开始缓存? diff --git a/app/src/main/res/values-zh-rHK/strings.xml b/app/src/main/res/values-zh-rHK/strings.xml index 13ab7ed12..d7ae70171 100644 --- a/app/src/main/res/values-zh-rHK/strings.xml +++ b/app/src/main/res/values-zh-rHK/strings.xml @@ -1180,7 +1180,7 @@ 阅读需要读取手机状态实现来电期间暂停朗读功能 耳机按键启动朗读 通过耳机按键来启动朗读 - 显示重复书源 + 按域名分组显示 主题配置 漫画浏览 禁用漫画缩放 @@ -1217,7 +1217,7 @@ 墨水屏 墨水屏设置 阈值 - 禁用水平滚动动画 + 禁用水平翻页效果 开启图片灰色 是否确认开始缓存? 自动检查新备份 diff --git a/app/src/main/res/values-zh-rTW/strings.xml b/app/src/main/res/values-zh-rTW/strings.xml index ef48cfc09..3a98a452b 100644 --- a/app/src/main/res/values-zh-rTW/strings.xml +++ b/app/src/main/res/values-zh-rTW/strings.xml @@ -1182,7 +1182,7 @@ 阅读需要读取手机状态实现来电期间暂停朗读功能 耳机按键启动朗读 通过耳机按键来启动朗读 - 显示重复书源 + 按域名分组显示 主题配置 漫画浏览 禁用漫画缩放 @@ -1218,7 +1218,7 @@ 朗讀暫停/繼續 墨水屏 阈值 - 禁用水平滚动动画 + 禁用水平翻页效果 开启图片灰色 是否确认开始缓存? 自动检查新备份 diff --git a/app/src/main/res/values-zh/strings.xml b/app/src/main/res/values-zh/strings.xml index b50b366ea..4bfedd092 100644 --- a/app/src/main/res/values-zh/strings.xml +++ b/app/src/main/res/values-zh/strings.xml @@ -1187,7 +1187,7 @@ 阅读需要读取手机状态实现来电期间暂停朗读功能 耳机按键启动朗读 通过耳机按键来启动朗读 - 显示重复书源 + 按域名分组显示 主题配置 漫画浏览 禁用漫画缩放 @@ -1224,7 +1224,7 @@ 墨水屏 墨水屏设置 阈值 - 禁用水平滚动动画 + 禁用水平翻页效果 开启图片灰色 是否确认开始缓存? 自动检查新备份 diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 151b69565..ceac4910d 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -1188,7 +1188,7 @@ 阅读需要读取手机状态实现来电期间暂停朗读功能 耳机按键启动朗读 通过耳机按键来启动朗读 - 显示重复书源 + 按域名分组显示 主题配置 漫画浏览 禁用漫画缩放 @@ -1225,7 +1225,7 @@ 墨水屏 墨水屏设置 阈值 - 禁用水平滚动动画 + 禁用水平翻页效果 开启图片灰色 播放模式 是否确认开始缓存?