Merge remote-tracking branch 'origin/master'

# Conflicts: # app/src/main/assets/updateLog.md # app/src/main/res/values-es-rES/strings.xml # app/src/main/res/values-ja-rJP/strings.xml # app/src/main/res/values-pt-rBR/strings.xml # app/src/main/res/values-zh-rHK/strings.xml # app/src/main/res/values-zh-rTW/strings.xml # app/src/main/res/values-zh/strings.xml # app/src/main/res/values/strings.xml
2022-05-30 20:42:08 +08:00
parent ff8f06c578 e41a457c6b
commit bacfe8f3e2
24 changed files with 104 additions and 25 deletions
@@ -36,12 +36,19 @@
        android:title="@string/export_to_web_dav"
        android:checkable="true"
        app:showAsAction="never" />
+
    <item
        android:id="@+id/menu_export_no_chapter_name"
        android:title="@string/export_no_chapter_name"
        android:checkable="true"
        app:showAsAction="never" />

+    <item
+        android:id="@+id/menu_export_pics_file"
+        android:title="@string/export_pics_file"
+        android:checkable="true"
+        app:showAsAction="never" />
+
    <item
        android:id="@+id/menu_export_folder"
        android:title="@string/export_folder"
@@ -989,6 +989,8 @@
    <string name="download_book_fail">Download Fail</string>
    <string name="upload_to_remote">Upload</string>
    <string name="add_remote_book">WebDavBook</string>
-
+    <string name="bitmap_cache_size_summary">Current cache max size %1$s MB</string>
+    <string name="bitmap_cache_size">bitmap cache size</string>
+    <string name="export_pics_file">Export Picture Files</string>
    <!-- string end -->
 </resources>
@@ -992,6 +992,8 @@
    <string name="download_book_fail">Download Fail</string>
    <string name="upload_to_remote">Upload</string>
    <string name="add_remote_book">WebDavBook</string>
-
+    <string name="bitmap_cache_size_summary">Current cache max size %1$s MB</string>
+    <string name="bitmap_cache_size">bitmap cache size</string>
+    <string name="export_pics_file">Export Picture Files</string>
    <!-- string end -->
 </resources>
@@ -992,6 +992,8 @@
    <string name="download_book_fail">Download Fail</string>
    <string name="upload_to_remote">Upload</string>
    <string name="add_remote_book">WebDavBook</string>
-
+    <string name="bitmap_cache_size_summary">Current cache max size %1$s MB</string>
+    <string name="bitmap_cache_size">bitmap cache size</string>
+    <string name="export_pics_file">Export Picture Files</string>
    <!-- string end -->
 </resources>
@@ -989,6 +989,8 @@
    <string name="download_book_fail">Download Fail</string>
    <string name="upload_to_remote">Upload</string>
    <string name="add_remote_book">WebDav书籍</string>
-
+    <string name="bitmap_cache_size_summary">当前最大缓存 %1$s MB</string>
+    <string name="bitmap_cache_size">图片绘制缓存</string>
+    <string name="export_pics_file">TXT导出图片</string>
    <!-- string end -->
 </resources>
@@ -991,6 +991,8 @@
    <string name="download_book_fail">Download Fail</string>
    <string name="upload_to_remote">Upload</string>
    <string name="add_remote_book">WebDav书籍</string>
-
+    <string name="bitmap_cache_size_summary">当前最大缓存 %1$s MB</string>
+    <string name="bitmap_cache_size">图片绘制缓存</string>
+    <string name="export_pics_file">TXT导出图片</string>
    <!-- string end -->
 </resources>
@@ -991,6 +991,8 @@
    <string name="download_book_fail">Download Fail</string>
    <string name="upload_to_remote">上传WebDav</string>
    <string name="add_remote_book">WebDav书籍</string>
-
+    <string name="bitmap_cache_size_summary">当前最大缓存 %1$s MB</string>
+    <string name="bitmap_cache_size">图片绘制缓存</string>
+    <string name="export_pics_file">TXT导出图片</string>
    <!-- string end -->
 </resources>
@@ -992,6 +992,8 @@
    <string name="download_book_fail">Download Fail</string>
    <string name="upload_to_remote">Upload</string>
    <string name="add_remote_book">WebDavBook</string>
-
+    <string name="bitmap_cache_size_summary">Current cache max size %1$s MB</string>
+    <string name="bitmap_cache_size">bitmap cache size</string>
+    <string name="export_pics_file">Export Picture Files</string>
    <!-- string end -->
 </resources>
@@ -75,12 +75,18 @@
            android:key="Cronet"
            android:summary="@string/pref_cronet_summary"
            android:title="Cronet" />
+
        <io.legado.app.lib.prefs.SwitchPreference
            android:defaultValue="false"
            android:key="antiAlias"
            android:summary="@string/pref_anti_alias_summary"
            android:title="@string/anti_alias" />

+        <io.legado.app.lib.prefs.Preference
+            android:key="bitmapCacheSize"
+            android:summary="@string/bitmap_cache_size_summary"
+            android:title="@string/bitmap_cache_size" />
+
        <io.legado.app.lib.prefs.Preference
            android:key="preDownloadNum"
            android:summary="@string/pre_download_s"