From fe06d2ad7eb921c46bfde5cbd969b26821190649 Mon Sep 17 00:00:00 2001
From: gedoor <gekunfei@live.com>
Date: Mon, 15 Nov 2021 20:47:24 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8F=8C=E9=A1=B5=E5=88=A4=E6=96=AD=E4=B8=BA?=
 =?UTF-8?q?=E5=B9=B3=E6=9D=BF=E6=97=B6=E4=B8=8D=E5=9C=A8=E5=88=A4=E6=96=AD?=
 =?UTF-8?q?=E5=BA=95=E5=92=8C=E9=AB=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../app/ui/book/read/page/provider/ChapterProvider.kt       | 2 +-
 app/src/main/java/io/legado/app/utils/ContextExtensions.kt  | 6 ++++++
 app/src/main/res/values-es-rES/strings.xml                  | 3 ++-
 app/src/main/res/values-ja-rJP/strings.xml                  | 3 ++-
 app/src/main/res/values-pt-rBR/strings.xml                  | 3 ++-
 app/src/main/res/values-zh-rHK/strings.xml                  | 3 ++-
 app/src/main/res/values-zh-rTW/strings.xml                  | 3 ++-
 app/src/main/res/values-zh/strings.xml                      | 3 ++-
 app/src/main/res/values/strings.xml                         | 3 ++-
 app/src/main/res/xml/pref_config_read.xml                   | 2 +-
 10 files changed, 22 insertions(+), 9 deletions(-)

diff --git a/app/src/main/java/io/legado/app/ui/book/read/page/provider/ChapterProvider.kt b/app/src/main/java/io/legado/app/ui/book/read/page/provider/ChapterProvider.kt
index 2e4f4713b..556f26df1 100644
--- a/app/src/main/java/io/legado/app/ui/book/read/page/provider/ChapterProvider.kt
+++ b/app/src/main/java/io/legado/app/ui/book/read/page/provider/ChapterProvider.kt
@@ -591,7 +591,7 @@ object ChapterProvider {
      * 更新绘制尺寸
      */
     fun upLayout() {
-        doublePage = viewWidth > viewHeight
+        doublePage = (viewWidth > viewHeight || appCtx.isPad)
                 && ReadBook.pageAnim() != 3
                 && AppConfig.doublePageHorizontal
         if (viewWidth > 0 && viewHeight > 0) {
diff --git a/app/src/main/java/io/legado/app/utils/ContextExtensions.kt b/app/src/main/java/io/legado/app/utils/ContextExtensions.kt
index 7d90fff72..d181da779 100644
--- a/app/src/main/java/io/legado/app/utils/ContextExtensions.kt
+++ b/app/src/main/java/io/legado/app/utils/ContextExtensions.kt
@@ -10,6 +10,7 @@ import android.app.Service
 import android.content.*
 import android.content.pm.PackageManager
 import android.content.res.ColorStateList
+import android.content.res.Configuration
 import android.graphics.Bitmap
 import android.graphics.drawable.Drawable
 import android.net.Uri
@@ -291,6 +292,11 @@ fun Context.openFileUri(uri: Uri, type: String? = null) {
     }
 }
 
+val Context.isPad: Boolean
+    get() {
+        return resources.configuration.screenLayout and Configuration.SCREENLAYOUT_SIZE_MASK >= Configuration.SCREENLAYOUT_SIZE_LARGE
+    }
+
 val Context.channel: String
     get() {
         try {
diff --git a/app/src/main/res/values-es-rES/strings.xml b/app/src/main/res/values-es-rES/strings.xml
index dd6a2d5e8..0173019c5 100644
--- a/app/src/main/res/values-es-rES/strings.xml
+++ b/app/src/main/res/values-es-rES/strings.xml
@@ -890,7 +890,7 @@
     <string name="disable_source">禁用源</string>
     <string name="delete_source">删除源</string>
     <string name="chapter_pay">购买</string>
-    <string name="double_page_horizontal">横屏双页</string>
+    <string name="double_page_horizontal">平板/横屏双页</string>
     <string name="open_in_browser">浏览器打开</string>
     <string name="copy_url">拷贝url</string>
     <string name="open_fun">打开方式</string>
@@ -905,5 +905,6 @@
     <string name="tts_speech_reduce">语速减</string>
     <string name="tts_speech_add">语速加</string>
     <string name="open_sys_dir_picker_error">打开系统文件夹选择器出错,自动打开应用文件夹选择器</string>
+    <string name="expand_text_menu">展开文本选择菜单</string>
 
 </resources>
diff --git a/app/src/main/res/values-ja-rJP/strings.xml b/app/src/main/res/values-ja-rJP/strings.xml
index 4ac6c352f..cdc494ae4 100644
--- a/app/src/main/res/values-ja-rJP/strings.xml
+++ b/app/src/main/res/values-ja-rJP/strings.xml
@@ -894,7 +894,7 @@
     <string name="disable_source">禁用源</string>
     <string name="delete_source">删除源</string>
     <string name="chapter_pay">购买</string>
-    <string name="double_page_horizontal">横屏双页</string>
+    <string name="double_page_horizontal">平板/横屏双页</string>
     <string name="open_in_browser">浏览器打开</string>
     <string name="copy_url">拷贝url</string>
     <string name="open_fun">打开方式</string>
@@ -909,5 +909,6 @@
     <string name="tts_speech_reduce">语速减</string>
     <string name="tts_speech_add">语速加</string>
     <string name="open_sys_dir_picker_error">打开系统文件夹选择器出错,自动打开应用文件夹选择器</string>
+    <string name="expand_text_menu">展开文本选择菜单</string>
 
 </resources>
diff --git a/app/src/main/res/values-pt-rBR/strings.xml b/app/src/main/res/values-pt-rBR/strings.xml
index ecc78d85d..e8c7e94d1 100644
--- a/app/src/main/res/values-pt-rBR/strings.xml
+++ b/app/src/main/res/values-pt-rBR/strings.xml
@@ -894,7 +894,7 @@
     <string name="disable_source">禁用源</string>
     <string name="delete_source">删除源</string>
     <string name="chapter_pay">购买</string>
-    <string name="double_page_horizontal">横屏双页</string>
+    <string name="double_page_horizontal">平板/横屏双页</string>
     <string name="open_in_browser">浏览器打开</string>
     <string name="copy_url">拷贝url</string>
     <string name="open_fun">打开方式</string>
@@ -909,5 +909,6 @@
     <string name="tts_speech_reduce">语速减</string>
     <string name="tts_speech_add">语速加</string>
     <string name="open_sys_dir_picker_error">打开系统文件夹选择器出错,自动打开应用文件夹选择器</string>
+    <string name="expand_text_menu">展开文本选择菜单</string>
 
 </resources>
diff --git a/app/src/main/res/values-zh-rHK/strings.xml b/app/src/main/res/values-zh-rHK/strings.xml
index 3ce737859..d8aeaec16 100644
--- a/app/src/main/res/values-zh-rHK/strings.xml
+++ b/app/src/main/res/values-zh-rHK/strings.xml
@@ -891,7 +891,7 @@
     <string name="disable_source">禁用源</string>
     <string name="delete_source">刪除源</string>
     <string name="chapter_pay">購買</string>
-    <string name="double_page_horizontal">橫屏雙頁</string>
+    <string name="double_page_horizontal">平板/橫屏雙頁</string>
     <string name="open_in_browser">瀏覽器打開</string>
     <string name="copy_url">複製url</string>
     <string name="open_fun">打開方式</string>
@@ -906,5 +906,6 @@
     <string name="tts_speech_reduce">語速减</string>
     <string name="tts_speech_add">語速加</string>
     <string name="open_sys_dir_picker_error">打开系统文件夹选择器出错,自动打开应用文件夹选择器</string>
+    <string name="expand_text_menu">展开文本选择菜单</string>
 
 </resources>
diff --git a/app/src/main/res/values-zh-rTW/strings.xml b/app/src/main/res/values-zh-rTW/strings.xml
index ed32c1f1e..bed8ce857 100644
--- a/app/src/main/res/values-zh-rTW/strings.xml
+++ b/app/src/main/res/values-zh-rTW/strings.xml
@@ -893,7 +893,7 @@
     <string name="disable_source">禁用源</string>
     <string name="delete_source">刪除源</string>
     <string name="chapter_pay">購買</string>
-    <string name="double_page_horizontal">橫屏雙頁</string>
+    <string name="double_page_horizontal">平板/橫屏雙頁</string>
     <string name="open_in_browser">瀏覽器打開</string>
     <string name="copy_url">複製url</string>
     <string name="open_fun">打開方式</string>
@@ -908,5 +908,6 @@
     <string name="tts_speech_reduce">語速减</string>
     <string name="tts_speech_add">語速加</string>
     <string name="open_sys_dir_picker_error">打开系统文件夹选择器出错,自动打开应用文件夹选择器</string>
+    <string name="expand_text_menu">展开文本选择菜单</string>
 
 </resources>
diff --git a/app/src/main/res/values-zh/strings.xml b/app/src/main/res/values-zh/strings.xml
index 776beec37..8f2b322a3 100644
--- a/app/src/main/res/values-zh/strings.xml
+++ b/app/src/main/res/values-zh/strings.xml
@@ -893,7 +893,7 @@
     <string name="disable_source">禁用源</string>
     <string name="delete_source">删除源</string>
     <string name="chapter_pay">购买</string>
-    <string name="double_page_horizontal">横屏双页</string>
+    <string name="double_page_horizontal">平板/横屏双页</string>
     <string name="open_in_browser">浏览器打开</string>
     <string name="copy_url">拷贝url</string>
     <string name="open_fun">打开方式</string>
@@ -908,5 +908,6 @@
     <string name="tts_speech_reduce">语速减</string>
     <string name="tts_speech_add">语速加</string>
     <string name="open_sys_dir_picker_error">打开系统文件夹选择器出错,自动打开应用文件夹选择器</string>
+    <string name="expand_text_menu">展开文本选择菜单</string>
 
 </resources>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index d32a0631b..608d691a2 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -894,7 +894,7 @@
     <string name="disable_source">disable source</string>
     <string name="delete_source">delete source</string>
     <string name="chapter_pay">pay</string>
-    <string name="double_page_horizontal">横屏双页</string>
+    <string name="double_page_horizontal">平板/横屏双页</string>
     <string name="open_in_browser">open in browser</string>
     <string name="copy_url">copy url</string>
     <string name="open_fun">open function</string>
@@ -909,5 +909,6 @@
     <string name="tts_speech_reduce">语速减</string>
     <string name="tts_speech_add">语速加</string>
     <string name="open_sys_dir_picker_error">打开系统文件夹选择器出错,自动打开应用文件夹选择器</string>
+    <string name="expand_text_menu">展开文本选择菜单</string>
 
 </resources>
diff --git a/app/src/main/res/xml/pref_config_read.xml b/app/src/main/res/xml/pref_config_read.xml
index 2ff1567be..7ad5985df 100644
--- a/app/src/main/res/xml/pref_config_read.xml
+++ b/app/src/main/res/xml/pref_config_read.xml
@@ -126,7 +126,7 @@
     <io.legado.app.ui.widget.prefs.SwitchPreference
         android:defaultValue="false"
         android:key="expandTextMenu"
-        android:title="展开文本选择菜单"
+        android:title="@string/expand_text_menu"
         app:iconSpaceReserved="false"
         app:isBottomBackground="true" />