This commit is contained in:
Horis
2026-01-05 11:06:02 +08:00
parent 8a65be1d21
commit 60e2f3620c
12 changed files with 22 additions and 23 deletions
@@ -166,7 +166,7 @@ object PreferKey {
const val readAloudByMediaButton = "readAloudByMediaButton" const val readAloudByMediaButton = "readAloudByMediaButton"
const val showMangaUi = "showMangaUi" const val showMangaUi = "showMangaUi"
const val disableMangaScale = "disableMangaScale" const val disableMangaScale = "disableMangaScale"
const val comicDisablePageAnim = "comicDisablePageAnim" const val disableMangaPageAnim = "disableMangaPageAnim"
const val paddingDisplayCutouts = "paddingDisplayCutouts" const val paddingDisplayCutouts = "paddingDisplayCutouts"
const val autoCheckNewBackup = "autoCheckNewBackup" const val autoCheckNewBackup = "autoCheckNewBackup"
@@ -623,10 +623,10 @@ object AppConfig : SharedPreferences.OnSharedPreferenceChangeListener {
appCtx.putPrefBoolean(PreferKey.disableMangaScale, value) appCtx.putPrefBoolean(PreferKey.disableMangaScale, value)
} }
var comicDisablePageAnim: Boolean var disableMangaPageAnim: Boolean
get() = appCtx.getPrefBoolean(PreferKey.comicDisablePageAnim, false) get() = appCtx.getPrefBoolean(PreferKey.disableMangaPageAnim, false)
set(value) { set(value) {
appCtx.putPrefBoolean(PreferKey.comicDisablePageAnim, value) appCtx.putPrefBoolean(PreferKey.disableMangaPageAnim, value)
} }
//漫画预加载数量 //漫画预加载数量
@@ -596,9 +596,10 @@ class ReadMangaActivity : VMBaseActivity<ActivityMangaBinding, ReadMangaViewMode
} }
} }
R.id.menu_no_page_anim_comic -> { R.id.menu_disable_manga_page_anim -> {
item.isChecked = !item.isChecked item.isChecked = !item.isChecked
AppConfig.comicDisablePageAnim = item.isChecked mMenu?.findItem(R.id.menu_disable_horizontal_page_snap)?.isVisible = !item.isChecked
AppConfig.disableMangaPageAnim = item.isChecked
if (item.isChecked) { if (item.isChecked) {
mPagerSnapHelper.attachToRecyclerView(null) mPagerSnapHelper.attachToRecyclerView(null)
} else { } else {
@@ -671,7 +672,7 @@ class ReadMangaActivity : VMBaseActivity<ActivityMangaBinding, ReadMangaViewMode
mAdapter.isHorizontal = enable mAdapter.isHorizontal = enable
if (enable) { if (enable) {
if (!enableAutoScroll) { if (!enableAutoScroll) {
if (AppConfig.disableHorizontalPageSnap) { if (AppConfig.disableHorizontalPageSnap || AppConfig.disableMangaPageAnim) {
mPagerSnapHelper.attachToRecyclerView(null) mPagerSnapHelper.attachToRecyclerView(null)
} else { } else {
mPagerSnapHelper.attachToRecyclerView(binding.recyclerView) mPagerSnapHelper.attachToRecyclerView(binding.recyclerView)
@@ -698,10 +699,10 @@ class ReadMangaActivity : VMBaseActivity<ActivityMangaBinding, ReadMangaViewMode
menu.findItem(R.id.menu_epaper_manga).isChecked = AppConfig.enableMangaEInk menu.findItem(R.id.menu_epaper_manga).isChecked = AppConfig.enableMangaEInk
menu.findItem(R.id.menu_epaper_manga_setting).isVisible = AppConfig.enableMangaEInk menu.findItem(R.id.menu_epaper_manga_setting).isVisible = AppConfig.enableMangaEInk
menu.findItem(R.id.menu_disable_horizontal_page_snap).run { menu.findItem(R.id.menu_disable_horizontal_page_snap).run {
isVisible = AppConfig.enableMangaHorizontalScroll isVisible = AppConfig.enableMangaHorizontalScroll && !AppConfig.disableMangaPageAnim
isChecked = AppConfig.disableHorizontalPageSnap isChecked = AppConfig.disableHorizontalPageSnap || AppConfig.disableMangaPageAnim
} }
menu.findItem(R.id.menu_no_page_anim_comic).isChecked = AppConfig.comicDisablePageAnim menu.findItem(R.id.menu_disable_manga_page_anim).isChecked = AppConfig.disableMangaPageAnim
menu.findItem(R.id.menu_gray_manga).isChecked = AppConfig.enableMangaGray menu.findItem(R.id.menu_gray_manga).isChecked = AppConfig.enableMangaGray
} }
@@ -751,7 +752,7 @@ class ReadMangaActivity : VMBaseActivity<ActivityMangaBinding, ReadMangaViewMode
} }
dx *= direction dx *= direction
dy *= direction dy *= direction
if (AppConfig.comicDisablePageAnim) { if (AppConfig.disableMangaPageAnim) {
binding.recyclerView.scrollBy(dx, dy) binding.recyclerView.scrollBy(dx, dy)
} else { } else {
binding.recyclerView.smoothScrollBy(dx, dy) binding.recyclerView.smoothScrollBy(dx, dy)
+2 -2
View File
@@ -80,10 +80,10 @@
app:showAsAction="never" /> app:showAsAction="never" />
<item <item
android:id="@+id/menu_no_page_anim_comic" android:id="@+id/menu_disable_manga_page_anim"
android:checkable="true" android:checkable="true"
android:checked="false" android:checked="false"
android:title="@string/disable_page_anim_comic" android:title="@string/disable_manga_page_anim"
app:showAsAction="never" /> app:showAsAction="never" />
<item <item
+1 -1
View File
@@ -380,7 +380,7 @@
<string name="page_anim_simulation">Simulación</string> <string name="page_anim_simulation">Simulación</string>
<string name="page_anim_scroll">Desplazado</string> <string name="page_anim_scroll">Desplazado</string>
<string name="page_anim_none">Ninguno</string> <string name="page_anim_none">Ninguno</string>
<string name="disable_page_anim_comic">Desactivar animación de volteo</string> <string name="disable_manga_page_anim">Desactivar animación de volteo</string>
<string name="up_change_source_last_chapter_t">Actualiza el último capítulo después del cambio de fuente en segundo plano</string> <string name="up_change_source_last_chapter_t">Actualiza el último capítulo después del cambio de fuente en segundo plano</string>
<string name="up_change_source_last_chapter_s">si está habilitado, la actualización comenzará 1 minuto después de que se abra la aplicación</string> <string name="up_change_source_last_chapter_s">si está habilitado, la actualización comenzará 1 minuto después de que se abra la aplicación</string>
<string name="behavior_main_t">Ocultar automáticamente la barra de herramientas</string> <string name="behavior_main_t">Ocultar automáticamente la barra de herramientas</string>
+1 -1
View File
@@ -384,7 +384,7 @@
<string name="page_anim_simulation">Simulation</string> <string name="page_anim_simulation">Simulation</string>
<string name="page_anim_scroll">Scroll</string> <string name="page_anim_scroll">Scroll</string>
<string name="page_anim_none">None</string> <string name="page_anim_none">None</string>
<string name="disable_page_anim_comic">ページめくりアニメーションを無効にする</string> <string name="disable_manga_page_anim">ページめくりアニメーションを無効にする</string>
<string name="up_change_source_last_chapter_t">Update the latest chapter after changed origin in the background</string> <string name="up_change_source_last_chapter_t">Update the latest chapter after changed origin in the background</string>
<string name="up_change_source_last_chapter_s">if enabled,the update will start 1 minute later when the software is run</string> <string name="up_change_source_last_chapter_s">if enabled,the update will start 1 minute later when the software is run</string>
<string name="behavior_main_t">Auto hide ToolBar</string> <string name="behavior_main_t">Auto hide ToolBar</string>
+1 -1
View File
@@ -382,7 +382,7 @@
<string name="page_anim_simulation">Simulação</string> <string name="page_anim_simulation">Simulação</string>
<string name="page_anim_scroll">Deslizar</string> <string name="page_anim_scroll">Deslizar</string>
<string name="page_anim_none">Nenhum</string> <string name="page_anim_none">Nenhum</string>
<string name="disable_page_anim_comic">Desativar animação de virada</string> <string name="disable_manga_page_anim">Desativar animação de virada</string>
<string name="up_change_source_last_chapter_t">Atualizar o último capítulo após a alteração de origem em segundo plano</string> <string name="up_change_source_last_chapter_t">Atualizar o último capítulo após a alteração de origem em segundo plano</string>
<string name="up_change_source_last_chapter_s">se ativado, a atualização será iniciada 1 minuto depois o App for aberto</string> <string name="up_change_source_last_chapter_s">se ativado, a atualização será iniciada 1 minuto depois o App for aberto</string>
<string name="behavior_main_t">Auto esconder a barra de ferramentas</string> <string name="behavior_main_t">Auto esconder a barra de ferramentas</string>
+1 -1
View File
@@ -379,7 +379,7 @@
<string name="page_anim_simulation">Mô phỏng</string> <string name="page_anim_simulation">Mô phỏng</string>
<string name="page_anim_scroll">Cuộn</string> <string name="page_anim_scroll">Cuộn</string>
<string name="page_anim_none">Không có</string> <string name="page_anim_none">Không có</string>
<string name="disable_page_anim_comic">Tắt hiệu ứng lật trang</string> <string name="disable_manga_page_anim">Tắt hiệu ứng lật trang</string>
<string name="up_change_source_last_chapter_t">Cập nhật chương mới nhất sau khi đổi nguồn trong nền</string> <string name="up_change_source_last_chapter_t">Cập nhật chương mới nhất sau khi đổi nguồn trong nền</string>
<string name="up_change_source_last_chapter_s">Nếu được kích hoạt, cập nhật sẽ bắt đầu sau 1 phút khi phần mềm chạy</string> <string name="up_change_source_last_chapter_s">Nếu được kích hoạt, cập nhật sẽ bắt đầu sau 1 phút khi phần mềm chạy</string>
<string name="behavior_main_t">Tự động ẩn thanh công cụ</string> <string name="behavior_main_t">Tự động ẩn thanh công cụ</string>
+1 -1
View File
@@ -376,7 +376,7 @@
<string name="page_anim_simulation">仿真</string> <string name="page_anim_simulation">仿真</string>
<string name="page_anim_scroll">滾動</string> <string name="page_anim_scroll">滾動</string>
<string name="page_anim_none">無動畫</string> <string name="page_anim_none">無動畫</string>
<string name="disable_page_anim_comic">禁用翻頁動畫</string> <string name="disable_manga_page_anim">禁用翻頁動畫</string>
<string name="up_change_source_last_chapter_t">後台更新換源最新章節</string> <string name="up_change_source_last_chapter_t">後台更新換源最新章節</string>
<string name="up_change_source_last_chapter_s">開啟則會在軟件打開 1 分鐘後開始更新</string> <string name="up_change_source_last_chapter_s">開啟則會在軟件打開 1 分鐘後開始更新</string>
<string name="behavior_main_t">書架 ToolBar 自動隱藏</string> <string name="behavior_main_t">書架 ToolBar 自動隱藏</string>
+1 -1
View File
@@ -378,7 +378,7 @@
<string name="page_anim_simulation">模擬</string> <string name="page_anim_simulation">模擬</string>
<string name="page_anim_scroll">滾動</string> <string name="page_anim_scroll">滾動</string>
<string name="page_anim_none">無動畫</string> <string name="page_anim_none">無動畫</string>
<string name="disable_page_anim_comic">禁用翻頁動畫</string> <string name="disable_manga_page_anim">禁用翻頁動畫</string>
<string name="up_change_source_last_chapter_t">後台更新換源最新章節</string> <string name="up_change_source_last_chapter_t">後台更新換源最新章節</string>
<string name="up_change_source_last_chapter_s">開啟則會在軟體打開1分鐘後開始更新</string> <string name="up_change_source_last_chapter_s">開啟則會在軟體打開1分鐘後開始更新</string>
<string name="behavior_main_t">書架ToolBar自動隱藏</string> <string name="behavior_main_t">書架ToolBar自動隱藏</string>
+1 -2
View File
@@ -384,7 +384,7 @@
<string name="page_anim_simulation">仿真</string> <string name="page_anim_simulation">仿真</string>
<string name="page_anim_scroll">滚动</string> <string name="page_anim_scroll">滚动</string>
<string name="page_anim_none">无动画</string> <string name="page_anim_none">无动画</string>
<string name="disable_page_anim_comic">禁用翻页动画</string> <string name="disable_manga_page_anim">禁用翻页动画</string>
<string name="up_change_source_last_chapter_t">后台更新换源最新章节</string> <string name="up_change_source_last_chapter_t">后台更新换源最新章节</string>
<string name="up_change_source_last_chapter_s">开启则会在软件打开 1 分钟后开始更新</string> <string name="up_change_source_last_chapter_s">开启则会在软件打开 1 分钟后开始更新</string>
<string name="behavior_main_t">书架工具栏自动隐藏</string> <string name="behavior_main_t">书架工具栏自动隐藏</string>
@@ -1192,7 +1192,6 @@
<string name="theme_config">主题配置</string> <string name="theme_config">主题配置</string>
<string name="show_manga_ui">漫画浏览</string> <string name="show_manga_ui">漫画浏览</string>
<string name="disable_manga_scale">禁用漫画缩放</string> <string name="disable_manga_scale">禁用漫画缩放</string>
<string name="comic_no_anim">关闭动画</string>
<string name="disable_manga_click_scroll">禁用点击翻页</string> <string name="disable_manga_click_scroll">禁用点击翻页</string>
<string name="enable_auto_page_scroll">开启自动翻页</string> <string name="enable_auto_page_scroll">开启自动翻页</string>
<string name="manga_auto_page_speed">翻页速度 %s</string> <string name="manga_auto_page_speed">翻页速度 %s</string>
+1 -2
View File
@@ -208,7 +208,7 @@
<string name="click_turn_page">Tap screen to turn page</string> <string name="click_turn_page">Tap screen to turn page</string>
<string name="page_anim">Flip animation</string> <string name="page_anim">Flip animation</string>
<string name="book_page_anim">Flip animation (book)</string> <string name="book_page_anim">Flip animation (book)</string>
<string name="disable_page_anim_comic">Disable flip animation</string> <string name="disable_manga_page_anim">Disable flip animation</string>
<string name="keep_light">Keep screen awake</string> <string name="keep_light">Keep screen awake</string>
<string name="back">Back</string> <string name="back">Back</string>
<string name="menu">Menu</string> <string name="menu">Menu</string>
@@ -1193,7 +1193,6 @@
<string name="theme_config">主题配置</string> <string name="theme_config">主题配置</string>
<string name="show_manga_ui">漫画浏览</string> <string name="show_manga_ui">漫画浏览</string>
<string name="disable_manga_scale">禁用漫画缩放</string> <string name="disable_manga_scale">禁用漫画缩放</string>
<string name="comic_no_anim">Disable Anim</string>
<string name="disable_manga_click_scroll">禁用点击翻页</string> <string name="disable_manga_click_scroll">禁用点击翻页</string>
<string name="enable_auto_page_scroll">开启自动翻页</string> <string name="enable_auto_page_scroll">开启自动翻页</string>
<string name="manga_auto_page_speed">翻页速度 %s</string> <string name="manga_auto_page_speed">翻页速度 %s</string>