From 5bcac0ffca65e7bbb800d242ef8fac66aba0024d Mon Sep 17 00:00:00 2001 From: Horis <8674809+821938089@users.noreply.github.com> Date: Sun, 2 Mar 2025 18:52:13 +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 --- .../java/io/legado/app/constant/PreferKey.kt | 8 ++--- .../io/legado/app/help/config/AppConfig.kt | 24 ++++++------- .../app/ui/book/manga/ReadMangaActivity.kt | 36 +++++++++---------- .../app/ui/book/manga/rv/WebtoonFrame.kt | 4 +-- .../ui/book/manga/rv/WebtoonRecyclerView.kt | 4 +-- .../searchContent/SearchContentActivity.kt | 8 ++--- app/src/main/res/layout/activity_manga.xml | 19 ++++++---- app/src/main/res/menu/book_manga.xml | 10 +++--- app/src/main/res/values-es-rES/strings.xml | 8 ++--- app/src/main/res/values-ja-rJP/strings.xml | 8 ++--- app/src/main/res/values-pt-rBR/strings.xml | 8 ++--- app/src/main/res/values-vi/strings.xml | 8 ++--- app/src/main/res/values-zh-rHK/strings.xml | 8 ++--- app/src/main/res/values-zh-rTW/strings.xml | 8 ++--- app/src/main/res/values-zh/strings.xml | 8 ++--- app/src/main/res/values/strings.xml | 8 ++--- 16 files changed, 90 insertions(+), 87 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 f11047ae9..8f652257c 100644 --- a/app/src/main/java/io/legado/app/constant/PreferKey.kt +++ b/app/src/main/java/io/legado/app/constant/PreferKey.kt @@ -98,9 +98,9 @@ object PreferKey { const val mangaPreDownloadNum = "mangaPreDownloadNum" const val mangaAutoPageSpeed = "mangaAutoPageSpeed" const val mangaFooterConfig = "mangaFooterConfig" - const val singlePageScrolling = "singlePageScrolling" - const val disableClickScroller = "disableClickScroller" - const val enableMangaHorizontalScroller="enableMangaHorizontalScroller" + const val singlePageScroll = "singlePageScroll" + const val disableClickScroll = "disableClickScroll" + const val enableMangaHorizontalScroll = "enableMangaHorizontalScroll" const val autoRefresh = "auto_refresh" const val defaultToRead = "defaultToRead" const val exportCharset = "exportCharset" @@ -160,7 +160,7 @@ object PreferKey { const val pauseReadAloudWhilePhoneCalls = "pauseReadAloudWhilePhoneCalls" const val readAloudByMediaButton = "readAloudByMediaButton" const val showMangaUi = "showMangaUi" - const val disableMangaScaling = "disableMangaScaling" + const val disableMangaScale = "disableMangaScale" const val cPrimary = "colorPrimary" const val cAccent = "colorAccent" 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 e25e2da8a..bef071b85 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 @@ -610,10 +610,10 @@ object AppConfig : SharedPreferences.OnSharedPreferenceChangeListener { get() = appCtx.getPrefBoolean(PreferKey.showMangaUi, true) //禁用漫画缩放 - var disableMangaScaling: Boolean - get() = appCtx.getPrefBoolean(PreferKey.disableMangaScaling, true) + var disableMangaScale: Boolean + get() = appCtx.getPrefBoolean(PreferKey.disableMangaScale, true) set(value) { - appCtx.putPrefBoolean(PreferKey.disableMangaScaling, value) + appCtx.putPrefBoolean(PreferKey.disableMangaScale, value) } //漫画预加载数量 @@ -624,17 +624,17 @@ object AppConfig : SharedPreferences.OnSharedPreferenceChangeListener { } //单页滚动 - var singlePageScrolling - get() = appCtx.getPrefBoolean(PreferKey.singlePageScrolling, false) + var singlePageScroll + get() = appCtx.getPrefBoolean(PreferKey.singlePageScroll, false) set(value) { - appCtx.putPrefBoolean(PreferKey.singlePageScrolling, value) + appCtx.putPrefBoolean(PreferKey.singlePageScroll, value) } //点击翻页 - var disableClickScroller - get() = appCtx.getPrefBoolean(PreferKey.disableClickScroller, false) + var disableClickScroll + get() = appCtx.getPrefBoolean(PreferKey.disableClickScroll, false) set(value) { - appCtx.putPrefBoolean(PreferKey.disableClickScroller, value) + appCtx.putPrefBoolean(PreferKey.disableClickScroll, value) } //漫画滚动速度 @@ -652,10 +652,10 @@ object AppConfig : SharedPreferences.OnSharedPreferenceChangeListener { } //漫画水平滚动 - var enableMangaHorizontalScroller - get() = appCtx.getPrefBoolean(PreferKey.enableMangaHorizontalScroller, false) + var enableMangaHorizontalScroll + get() = appCtx.getPrefBoolean(PreferKey.enableMangaHorizontalScroll, false) set(value) { - appCtx.putPrefBoolean(PreferKey.enableMangaHorizontalScroller, value) + appCtx.putPrefBoolean(PreferKey.enableMangaHorizontalScroll, 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 caeee5937..b2dc5c952 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 @@ -75,7 +75,7 @@ class ReadMangaActivity : VMBaseActivity() private val mLayoutManager by lazy { LinearLayoutManager( this@ReadMangaActivity, - if (AppConfig.enableMangaHorizontalScroller) LinearLayoutManager.HORIZONTAL else LinearLayoutManager.VERTICAL, + if (AppConfig.enableMangaHorizontalScroll) LinearLayoutManager.HORIZONTAL else LinearLayoutManager.VERTICAL, false ) } @@ -191,7 +191,7 @@ class ReadMangaActivity : VMBaseActivity() } private fun initRecyclerView() { - mAdapter.isHorizontal = AppConfig.enableMangaHorizontalScroller + mAdapter.isHorizontal = AppConfig.enableMangaHorizontalScroll binding.mRecyclerMange.run { adapter = mAdapter itemAnimator = null @@ -201,11 +201,11 @@ class ReadMangaActivity : VMBaseActivity() mLayoutManager.isItemPrefetchEnabled = true setItemViewCacheSize(AppConfig.preDownloadNum) singlePagerScroller( - AppConfig.singlePageScrolling, - AppConfig.enableMangaHorizontalScroller + AppConfig.singlePageScroll, + AppConfig.enableMangaHorizontalScroll ) - disabledClickScroller(AppConfig.disableClickScroller) - disableMangaScaling(AppConfig.disableMangaScaling) + disabledClickScroller(AppConfig.disableClickScroll) + disableMangaScaling(AppConfig.disableMangaScale) setPreScrollListener { _, dx, dy, position -> if ((dy > 0 || dx > 0) && position + 2 > mAdapter.getCurrentList().size - 3) { if (mAdapter.getCurrentList().last() is ReaderLoading) { @@ -487,19 +487,19 @@ class ReadMangaActivity : VMBaseActivity() R.id.menu_scroller_page -> { item.isChecked = !item.isChecked - AppConfig.singlePageScrolling = item.isChecked - singlePagerScroller(item.isChecked, AppConfig.enableMangaHorizontalScroller) + AppConfig.singlePageScroll = item.isChecked + singlePagerScroller(item.isChecked, AppConfig.enableMangaHorizontalScroll) } - R.id.menu_disable_manga_scaling -> { + R.id.menu_disable_manga_scale -> { item.isChecked = !item.isChecked - AppConfig.disableMangaScaling = item.isChecked + AppConfig.disableMangaScale = item.isChecked disableMangaScaling(item.isChecked) } R.id.menu_disable_click_scroller -> { item.isChecked = !item.isChecked - AppConfig.disableClickScroller = item.isChecked + AppConfig.disableClickScroll = item.isChecked disabledClickScroller(item.isChecked) } @@ -532,10 +532,10 @@ class ReadMangaActivity : VMBaseActivity() R.id.menu_enable_horizontal_scroller -> { item.isChecked = !item.isChecked - AppConfig.enableMangaHorizontalScroller = item.isChecked + AppConfig.enableMangaHorizontalScroll = item.isChecked mLayoutManager.orientation = if (item.isChecked) LinearLayoutManager.HORIZONTAL else LinearLayoutManager.VERTICAL - singlePagerScroller(AppConfig.singlePageScrolling, item.isChecked) + singlePagerScroller(AppConfig.singlePageScroll, item.isChecked) mAdapter.isHorizontal = item.isChecked mAdapter.notifyItemRangeChanged( ReadManga.durChapterPos.minus(2), @@ -615,17 +615,17 @@ class ReadMangaActivity : VMBaseActivity() this.mMenu = menu menu.findItem(R.id.menu_pre_manga_number).title = getString(R.string.pre_download_m, AppConfig.mangaPreDownloadNum) - menu.findItem(R.id.menu_scroller_page).isChecked = AppConfig.singlePageScrolling - menu.findItem(R.id.menu_disable_manga_scaling).isChecked = AppConfig.disableMangaScaling - menu.findItem(R.id.menu_disable_click_scroller).isChecked = AppConfig.disableClickScroller + menu.findItem(R.id.menu_scroller_page).isChecked = AppConfig.singlePageScroll + menu.findItem(R.id.menu_disable_manga_scale).isChecked = AppConfig.disableMangaScale + menu.findItem(R.id.menu_disable_click_scroller).isChecked = AppConfig.disableClickScroll menu.findItem(R.id.menu_manga_auto_page_speed).title = getString(R.string.manga_auto_page_speed, mMangaAutoPageSpeed) menu.findItem(R.id.menu_enable_horizontal_scroller).isChecked = - AppConfig.enableMangaHorizontalScroller + AppConfig.enableMangaHorizontalScroll } private fun disableMangaScaling(disable: Boolean) { - binding.webtoonFrame.disableMangaScaling = disable + binding.webtoonFrame.disableMangaScale = disable binding.mRecyclerMange.disableMangaScaling = disable if (disable) { binding.mRecyclerMange.resetZoom() diff --git a/app/src/main/java/io/legado/app/ui/book/manga/rv/WebtoonFrame.kt b/app/src/main/java/io/legado/app/ui/book/manga/rv/WebtoonFrame.kt index 5bdf8141a..9ef050cf6 100644 --- a/app/src/main/java/io/legado/app/ui/book/manga/rv/WebtoonFrame.kt +++ b/app/src/main/java/io/legado/app/ui/book/manga/rv/WebtoonFrame.kt @@ -28,13 +28,13 @@ class WebtoonFrame : FrameLayout { scaleDetector.isQuickScaleEnabled = value } - var disableMangaScaling = false + var disableMangaScale = false private val recycler: WebtoonRecyclerView? get() = getChildAt(0) as? WebtoonRecyclerView override fun dispatchTouchEvent(ev: MotionEvent): Boolean { - if (!disableMangaScaling) { + if (!disableMangaScale) { scaleDetector.onTouchEvent(ev) flingDetector.onTouchEvent(ev) val recyclerRect = Rect() diff --git a/app/src/main/java/io/legado/app/ui/book/manga/rv/WebtoonRecyclerView.kt b/app/src/main/java/io/legado/app/ui/book/manga/rv/WebtoonRecyclerView.kt index 4222ab4f3..5d02298c7 100644 --- a/app/src/main/java/io/legado/app/ui/book/manga/rv/WebtoonRecyclerView.kt +++ b/app/src/main/java/io/legado/app/ui/book/manga/rv/WebtoonRecyclerView.kt @@ -65,8 +65,8 @@ class WebtoonRecyclerView @JvmOverloads constructor( super.onMeasure(widthSpec, heightSpec) } - override fun dispatchTouchEvent(ev: MotionEvent?): Boolean { - detector.onTouchEvent(ev!!) + override fun dispatchTouchEvent(ev: MotionEvent): Boolean { + detector.onTouchEvent(ev) return super.dispatchTouchEvent(ev) } diff --git a/app/src/main/java/io/legado/app/ui/book/searchContent/SearchContentActivity.kt b/app/src/main/java/io/legado/app/ui/book/searchContent/SearchContentActivity.kt index c372f04d3..aa434d488 100644 --- a/app/src/main/java/io/legado/app/ui/book/searchContent/SearchContentActivity.kt +++ b/app/src/main/java/io/legado/app/ui/book/searchContent/SearchContentActivity.kt @@ -38,10 +38,8 @@ import io.legado.app.utils.shouldHideSoftInput import io.legado.app.utils.showSoftInput import io.legado.app.utils.viewbindingdelegate.viewBinding import io.legado.app.utils.visible -import kotlinx.coroutines.Deferred import kotlinx.coroutines.Dispatchers.IO import kotlinx.coroutines.Job -import kotlinx.coroutines.async import kotlinx.coroutines.ensureActive import kotlinx.coroutines.launch import kotlinx.coroutines.withContext @@ -60,7 +58,7 @@ class SearchContentActivity : } private var durChapterIndex = 0 private var searchJob: Job? = null - private var initJob: Deferred<*>? = null + private var initJob: Job? = null override fun onActivityCreated(savedInstanceState: Bundle?) { val bbg = bottomBackground @@ -183,7 +181,7 @@ class SearchContentActivity : } private fun initCacheFileNames(book: Book) { - initJob = lifecycleScope.async { + initJob = lifecycleScope.launch { withContext(IO) { viewModel.cacheChapterNames.addAll(BookHelp.getChapterFiles(book)) } @@ -214,7 +212,7 @@ class SearchContentActivity : binding.refreshProgressBar.isAutoLoading = true binding.fbStop.visible() searchJob = lifecycleScope.launch(IO) { - initJob?.await() + initJob?.join() kotlin.runCatching { appDb.bookChapterDao.getChapterList(viewModel.bookUrl).forEach { bookChapter -> ensureActive() diff --git a/app/src/main/res/layout/activity_manga.xml b/app/src/main/res/layout/activity_manga.xml index 4b3d2a5c4..9526d68f7 100644 --- a/app/src/main/res/layout/activity_manga.xml +++ b/app/src/main/res/layout/activity_manga.xml @@ -1,15 +1,21 @@ - - + android:layout_height="match_parent"> + + + + - - \ 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 632ba8b13..744ca288c 100644 --- a/app/src/main/res/menu/book_manga.xml +++ b/app/src/main/res/menu/book_manga.xml @@ -32,24 +32,24 @@ app:showAsAction="never" /> 显示重复书源 主题配置 漫画浏览 - 禁用漫画缩放 - 禁用点击翻页 - 开启自动翻页 + 禁用漫画缩放 + 禁用点击翻页 + 开启自动翻页 翻页速度 %s 秒 页脚配置 设置自动翻页速度 @@ -1205,5 +1205,5 @@ 页脚 靠左 居中 - 水平滚动 + 水平滚动 diff --git a/app/src/main/res/values-ja-rJP/strings.xml b/app/src/main/res/values-ja-rJP/strings.xml index d8dd7f9ad..b2901b70d 100644 --- a/app/src/main/res/values-ja-rJP/strings.xml +++ b/app/src/main/res/values-ja-rJP/strings.xml @@ -1186,9 +1186,9 @@ 显示重复书源 主题配置 漫画浏览 - 禁用漫画缩放 - 禁用点击翻页 - 开启自动翻页 + 禁用漫画缩放 + 禁用点击翻页 + 开启自动翻页 翻页速度 %s 秒 页脚配置 设置自动翻页速度 @@ -1208,5 +1208,5 @@ 页脚 靠左 居中 - 水平滚动 + 水平滚动 diff --git a/app/src/main/res/values-pt-rBR/strings.xml b/app/src/main/res/values-pt-rBR/strings.xml index a4d369118..f520e2899 100644 --- a/app/src/main/res/values-pt-rBR/strings.xml +++ b/app/src/main/res/values-pt-rBR/strings.xml @@ -1186,9 +1186,9 @@ 显示重复书源 主题配置 漫画浏览 - 禁用漫画缩放 - 禁用点击翻页 - 开启自动翻页 + 禁用漫画缩放 + 禁用点击翻页 + 开启自动翻页 翻页速度 %s 秒 页脚配置 设置自动翻页速度 @@ -1208,5 +1208,5 @@ 页脚 靠左 居中 - 水平滚动 + 水平滚动 diff --git a/app/src/main/res/values-vi/strings.xml b/app/src/main/res/values-vi/strings.xml index d64c2b4e0..da8011439 100644 --- a/app/src/main/res/values-vi/strings.xml +++ b/app/src/main/res/values-vi/strings.xml @@ -1182,9 +1182,9 @@ Còn 显示重复书源 主题配置 漫画浏览 - 禁用漫画缩放 - 禁用点击翻页 - 开启自动翻页 + 禁用漫画缩放 + 禁用点击翻页 + 开启自动翻页 翻页速度 %s 秒 页脚配置 设置自动翻页速度 @@ -1204,5 +1204,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 bd3304ab1..b35512345 100644 --- a/app/src/main/res/values-zh-rHK/strings.xml +++ b/app/src/main/res/values-zh-rHK/strings.xml @@ -1183,9 +1183,9 @@ 显示重复书源 主题配置 漫画浏览 - 禁用漫画缩放 - 禁用点击翻页 - 开启自动翻页 + 禁用漫画缩放 + 禁用点击翻页 + 开启自动翻页 翻页速度 %s 秒 页脚配置 设置自动翻页速度 @@ -1205,5 +1205,5 @@ 页脚 靠左 居中 - 水平滚动 + 水平滚动 diff --git a/app/src/main/res/values-zh-rTW/strings.xml b/app/src/main/res/values-zh-rTW/strings.xml index 96e569981..cb8b8b510 100644 --- a/app/src/main/res/values-zh-rTW/strings.xml +++ b/app/src/main/res/values-zh-rTW/strings.xml @@ -1185,9 +1185,9 @@ 显示重复书源 主题配置 漫画浏览 - 禁用漫画缩放 - 禁用点击翻页 - 开启自动翻页 + 禁用漫画缩放 + 禁用点击翻页 + 开启自动翻页 翻页速度 %s 秒 页脚配置 设置自动翻页速度 @@ -1207,5 +1207,5 @@ 页脚 靠左 居中 - 水平滚动 + 水平滚动 diff --git a/app/src/main/res/values-zh/strings.xml b/app/src/main/res/values-zh/strings.xml index 911300877..4b95728b2 100644 --- a/app/src/main/res/values-zh/strings.xml +++ b/app/src/main/res/values-zh/strings.xml @@ -1185,9 +1185,9 @@ 显示重复书源 主题配置 漫画浏览 - 禁用漫画缩放 - 禁用点击翻页 - 开启自动翻页 + 禁用漫画缩放 + 禁用点击翻页 + 开启自动翻页 翻页速度 %s 秒 页脚配置 设置自动翻页速度 @@ -1207,5 +1207,5 @@ 页脚 靠左 居中 - 水平滚动 + 水平滚动 diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 9c2279238..331e29f4a 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -1186,9 +1186,9 @@ 显示重复书源 主题配置 漫画浏览 - 禁用漫画缩放 - 禁用点击翻页 - 开启自动翻页 + 禁用漫画缩放 + 禁用点击翻页 + 开启自动翻页 翻页速度 %s 秒 页脚配置 设置自动翻页速度 @@ -1208,5 +1208,5 @@ 页脚 靠左 居中 - 水平滚动 + 水平滚动