From 462e0257a9fbcd482c4709ea30eb634c45923f4b Mon Sep 17 00:00:00 2001
From: FooIbar <118464521+FooIbar@users.noreply.github.com>
Date: Mon, 26 Dec 2022 16:06:33 +0800
Subject: [PATCH] Save images to download location by default

---
 .../kanade/tachiyomi/ui/reader/ReaderActivity.kt  |  2 +-
 .../kanade/tachiyomi/ui/reader/ReaderPageSheet.kt |  9 +++++++++
 app/src/main/res/layout/reader_page_sheet.xml     | 15 +++++++++++++++
 app/src/main/res/values-zh-rCN/strings.xml        |  1 +
 app/src/main/res/values-zh-rHK/strings.xml        |  1 +
 app/src/main/res/values-zh-rTW/strings.xml        |  1 +
 app/src/main/res/values/strings.xml               |  1 +
 7 files changed, 29 insertions(+), 1 deletion(-)

diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/reader/ReaderActivity.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/reader/ReaderActivity.kt
index ca8bb65aa..d96a65ebf 100644
--- a/app/src/main/java/eu/kanade/tachiyomi/ui/reader/ReaderActivity.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/ui/reader/ReaderActivity.kt
@@ -422,7 +422,7 @@ class ReaderActivity : EhActivity() {
         }
     }
 
-    private fun saveImage(page: Int) {
+    fun saveImage(page: Int) {
         if (null == mGalleryProvider) {
             return
         }
diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/reader/ReaderPageSheet.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/reader/ReaderPageSheet.kt
index 159153466..862f1724c 100644
--- a/app/src/main/java/eu/kanade/tachiyomi/ui/reader/ReaderPageSheet.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/ui/reader/ReaderPageSheet.kt
@@ -21,6 +21,7 @@ class ReaderPageSheet(
 
         binding.share.setOnClickListener { share() }
         binding.save.setOnClickListener { save() }
+        binding.saveTo.setOnClickListener { saveTo() }
 
         return binding.root
     }
@@ -37,6 +38,14 @@ class ReaderPageSheet(
      * Saves the image of this page on external storage.
      */
     private fun save() {
+        activity.saveImage(page.index)
+        dismiss()
+    }
+
+    /**
+     * Saves the image of this page to a custom location on external storage.
+     */
+    private fun saveTo() {
         activity.saveImageTo(page.index)
         dismiss()
     }
diff --git a/app/src/main/res/layout/reader_page_sheet.xml b/app/src/main/res/layout/reader_page_sheet.xml
index d05820108..e1ca6127e 100644
--- a/app/src/main/res/layout/reader_page_sheet.xml
+++ b/app/src/main/res/layout/reader_page_sheet.xml
@@ -35,4 +35,19 @@
         app:drawableStartCompat="@drawable/ic_save_24dp"
         app:drawableTint="?attr/colorOnBackground" />
 
+    <TextView
+        android:id="@+id/save_to"
+        android:layout_width="match_parent"
+        android:layout_height="56dp"
+        android:drawablePadding="32dp"
+        android:gravity="center_vertical"
+        android:clickable="true"
+        android:focusable="true"
+        android:paddingHorizontal="16dp"
+        android:foreground="?attr/selectableItemBackground"
+        android:text="@string/action_save_to"
+        android:textColor="?attr/colorOnBackground"
+        app:drawableStartCompat="@drawable/ic_save_24dp"
+        app:drawableTint="?attr/colorOnBackground" />
+
 </LinearLayout>
diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml
index 29b8664f5..b388d8105 100755
--- a/app/src/main/res/values-zh-rCN/strings.xml
+++ b/app/src/main/res/values-zh-rCN/strings.xml
@@ -590,6 +590,7 @@
     <string name="action_retry">重试</string>
     <string name="action_share">分享</string>
     <string name="action_save">保存</string>
+    <string name="action_save_to">保存到&#8230;</string>
     <string name="pref_category_general">通用</string>
     <string name="pref_fullscreen">全屏</string>
     <string name="pref_page_transitions">页面过渡动画</string>
diff --git a/app/src/main/res/values-zh-rHK/strings.xml b/app/src/main/res/values-zh-rHK/strings.xml
index 105b8112a..22fb3e730 100755
--- a/app/src/main/res/values-zh-rHK/strings.xml
+++ b/app/src/main/res/values-zh-rHK/strings.xml
@@ -522,6 +522,7 @@
     <string name="action_retry">重試</string>
     <string name="action_share">分享</string>
     <string name="action_save">儲存</string>
+    <string name="action_save_to">儲存到&#8230;</string>
     <string name="pref_category_general">一般</string>
     <string name="pref_fullscreen">全螢幕</string>
     <string name="pref_show_page_number">顯示頁碼</string>
diff --git a/app/src/main/res/values-zh-rTW/strings.xml b/app/src/main/res/values-zh-rTW/strings.xml
index 6955d8ad6..5faa66d7a 100644
--- a/app/src/main/res/values-zh-rTW/strings.xml
+++ b/app/src/main/res/values-zh-rTW/strings.xml
@@ -584,6 +584,7 @@
     <string name="action_retry">重試</string>
     <string name="action_share">分享</string>
     <string name="action_save">儲存</string>
+    <string name="action_save_to">儲存到&#8230;</string>
     <string name="pref_category_general">一般</string>
     <string name="pref_fullscreen">全螢幕</string>
     <string name="pref_show_page_number">顯示頁碼</string>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index ecd140fa1..6ba7a3a6e 100755
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -733,6 +733,7 @@
     <string name="custom_filter">Custom filter</string>
     <string name="action_share">Share</string>
     <string name="action_save">Save</string>
+    <string name="action_save_to">Save to&#8230;</string>
     <string name="pref_category_for_this_series">For this series</string>
     <!-- Tachiyomi Reader End-->
 </resources>