From 24fa2c68974f89f7faa16c3187a3167cc5a038fe Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=85=B1=E5=A4=A9=E5=B0=8F=E7=A6=BD=E5=85=BD?= Date: Sun, 31 Dec 2023 20:56:57 +0800 Subject: [PATCH] Support turning off the click page turning gesture on the reading page MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 支持关闭阅读页点击翻页手势 --- changelog/v7.4.8+147.md | 2 ++ lib/src/l18n/en_US.dart | 1 + lib/src/l18n/ko_KR.dart | 1 + lib/src/l18n/pt_BR.dart | 5 +++-- lib/src/l18n/zh_CN.dart | 1 + lib/src/l18n/zh_TW.dart | 7 ++++--- lib/src/pages/read/read_page_logic.dart | 8 ++++++++ lib/src/pages/setting/read/setting_read_page.dart | 8 ++++++++ 8 files changed, 28 insertions(+), 5 deletions(-) diff --git a/changelog/v7.4.8+147.md b/changelog/v7.4.8+147.md index 7ce37e7c..41d450f8 100644 --- a/changelog/v7.4.8+147.md +++ b/changelog/v7.4.8+147.md @@ -5,6 +5,7 @@ - 单页和双列阅读方向下，支持鼠标滚轮翻页 - 桌面布局下，所有右侧页面支持侧键返回与esc返回 - 现在阅读页在滚动时会强制禁用点击翻页手势，防止误触 +- 支持关闭阅读页点击翻页手势 - 优化保存图片时的图片命名规则 - 优化解压归档时的icon显示 - 优化列表页部分UI展示，现在会显示画廊是否已下载 @@ -28,6 +29,7 @@ - In the single page and double column reading direction, support mouse wheel page turning - In the desktop layout, all right pages support side key return and esc return - Now the reading page will forcibly disable the click page turning gesture when scrolling to prevent misoperation +- Support turning off the click page turning gesture on the reading page - Optimize the toast message when canceling favorites - Optimize the image naming rules when saving images - Optimize the icon display when decompressing archives diff --git a/lib/src/l18n/en_US.dart b/lib/src/l18n/en_US.dart index 6f77e5d2..03fc9590 100644 --- a/lib/src/l18n/en_US.dart +++ b/lib/src/l18n/en_US.dart @@ -430,6 +430,7 @@ class en_US { 'enableBottomMenu': 'Enable Bottom Menu', 'reverseTurnPageDirection': 'Reverse Page Turning Direction', 'disableGestureWhenScrolling': 'Disable Gesture When Scrolling', + 'disablePageTurningOnTap': 'Disable Page Turning On Tap', 'turnPageMode': 'Turn Page Mode', 'turnPageModeHint': 'To next screen or next image', 'image': 'Image', diff --git a/lib/src/l18n/ko_KR.dart b/lib/src/l18n/ko_KR.dart index 5ce58b7e..78df9cad 100644 --- a/lib/src/l18n/ko_KR.dart +++ b/lib/src/l18n/ko_KR.dart @@ -430,6 +430,7 @@ class ko_KR { 'enableBottomMenu': 'Enable Bottom Menu', 'reverseTurnPageDirection': 'Reverse Page Turning Direction', 'disableGestureWhenScrolling': 'Disable Gesture When Scrolling', + 'disablePageTurningOnTap': 'Disable Page Turning On Tap', 'turnPageMode': '페이지 넘기기 모드', 'turnPageModeHint': '화면 기준 혹은 이미지 기준', 'image': '이미지 기준', diff --git a/lib/src/l18n/pt_BR.dart b/lib/src/l18n/pt_BR.dart index 4b5690e4..37b3d26e 100644 --- a/lib/src/l18n/pt_BR.dart +++ b/lib/src/l18n/pt_BR.dart @@ -429,6 +429,7 @@ class pt_BR { 'enableDoubleTapToScaleUp': 'Ativar toque duplo para aumentar a escala', 'enableTapDragToScaleUp': 'Enable Tap Drag to Scale up', 'disableGestureWhenScrolling': 'Disable Gesture When Scrolling', + 'disablePageTurningOnTap': 'Disable Page Turning On Tap', 'enableBottomMenu': 'Enable Bottom Menu', 'reverseTurnPageDirection': 'Reverse Page Turning Direction', 'turnPageMode': 'Modo de virar página', @@ -590,8 +591,8 @@ class pt_BR { 'downloadOriginalImageByDefault': 'Escolher imagem original por padrão', 'originalImage': 'Original', 'resampleImage': 'Redimensionada', - 'defaultGalleryGroup':'Default Gallery Group', - 'defaultArchiveGroup':'Default Archive Group', + 'defaultGalleryGroup': 'Default Gallery Group', + 'defaultArchiveGroup': 'Default Archive Group', 'never': 'Nunca', 'manual': 'Manual', 'always': 'Sempre', diff --git a/lib/src/l18n/zh_CN.dart b/lib/src/l18n/zh_CN.dart index 2711cb1c..710bd0e0 100644 --- a/lib/src/l18n/zh_CN.dart +++ b/lib/src/l18n/zh_CN.dart @@ -430,6 +430,7 @@ class zh_CN { 'enableBottomMenu': '开启底部菜单', 'reverseTurnPageDirection': '反转翻页方向', 'disableGestureWhenScrolling': '滚动时禁用手势', + 'disablePageTurningOnTap': '禁用点击翻页手势', 'turnPageMode': '翻页模式', 'turnPageModeHint': '移动至下一屏幕还是下一图片', 'image': '图片', diff --git a/lib/src/l18n/zh_TW.dart b/lib/src/l18n/zh_TW.dart index 55dd45e5..3914d8aa 100644 --- a/lib/src/l18n/zh_TW.dart +++ b/lib/src/l18n/zh_TW.dart @@ -428,7 +428,8 @@ class zh_TW { 'enableTapDragToScaleUp': '允許單擊後拖拽放大圖片', 'enableBottomMenu': '開啓底部菜單', 'reverseTurnPageDirection': '反轉翻頁方向', - 'disableGestureWhenScrolling': '滾動時禁用手勢', + 'disableGestureWhenScrolling': '滾動時禁用手勢', + 'disablePageTurningOnTap': '禁用點擊翻頁手勢', 'turnPageModeHint': '移動至下一螢幕還是下一圖片', 'image': '圖片', 'screen': '螢幕', @@ -587,8 +588,8 @@ class zh_TW { 'downloadOriginalImageByDefault': '默認選中下載原圖', 'originalImage': '原圖', 'resampleImage': '壓縮', - 'defaultGalleryGroup':'默認分組（下載）', - 'defaultArchiveGroup':'默認分組（歸檔）', + 'defaultGalleryGroup': '默認分組（下載）', + 'defaultArchiveGroup': '默認分組（歸檔）', 'never': '從不', 'manual': '手動', 'always': '總是', diff --git a/lib/src/pages/read/read_page_logic.dart b/lib/src/pages/read/read_page_logic.dart index 390fa950..6f236437 100644 --- a/lib/src/pages/read/read_page_logic.dart +++ b/lib/src/pages/read/read_page_logic.dart @@ -424,6 +424,10 @@ class ReadPageLogic extends GetxController { } void tapLeftRegion() { + if (ReadSetting.disablePageTurningOnTap.isTrue) { + return; + } + if (state.isScrolling) { return; } @@ -436,6 +440,10 @@ class ReadPageLogic extends GetxController { } void tapRightRegion() { + if (ReadSetting.disablePageTurningOnTap.isTrue) { + return; + } + if (state.isScrolling) { return; } diff --git a/lib/src/pages/setting/read/setting_read_page.dart b/lib/src/pages/setting/read/setting_read_page.dart index fff77df2..df091d84 100644 --- a/lib/src/pages/setting/read/setting_read_page.dart +++ b/lib/src/pages/setting/read/setting_read_page.dart @@ -36,6 +36,7 @@ class SettingReadPage extends StatelessWidget { _buildEnableTapDragToScaleUp().center(), _buildEnableBottomMenu().center(), _buildReverseTurnPageDirection().center(), + _buildDisableTurnPageOnTap().center(), if (GetPlatform.isDesktop) _buildUseThirdPartyViewer().center(), if (GetPlatform.isDesktop) _buildThirdPartyViewerPath().center(), if (GetPlatform.isMobile) _buildDeviceDirection().center(), @@ -191,6 +192,13 @@ class SettingReadPage extends StatelessWidget { ); } + Widget _buildDisableTurnPageOnTap() { + return ListTile( + title: Text('disablePageTurningOnTap'.tr), + trailing: Switch(value: ReadSetting.disablePageTurningOnTap.value, onChanged: ReadSetting.saveDisablePageTurningOnTap), + ); + } + Widget _buildDeviceDirection() { return ListTile( title: Text('deviceOrientation'.tr),