From 841c8a7a1512cdfbc1c7cb41263f7010be9e6808 Mon Sep 17 00:00:00 2001
From: tom5079 <tom5079@naver.com>
Date: Sun, 21 Jun 2020 18:12:46 +0900
Subject: [PATCH] Download Retry Button Added

---
 app/build.gradle                                       |  2 +-
 .../java/xyz/quaver/pupil/adapters/ReaderAdapter.kt    | 10 ++++++++++
 .../main/java/xyz/quaver/pupil/ui/ReaderActivity.kt    | 10 ++++++++++
 app/src/main/res/drawable/refresh.xml                  |  8 ++++++++
 app/src/main/res/layout/activity_reader.xml            |  7 +++++++
 app/src/main/res/values-ja/strings.xml                 |  2 ++
 app/src/main/res/values-ko/strings.xml                 |  2 ++
 app/src/main/res/values/strings.xml                    |  5 ++++-
 8 files changed, 44 insertions(+), 2 deletions(-)
 create mode 100644 app/src/main/res/drawable/refresh.xml

diff --git a/app/build.gradle b/app/build.gradle
index 7f83f0bf..415b38c7 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -20,7 +20,7 @@ android {
         minSdkVersion 16
         targetSdkVersion 29
         versionCode 53
-        versionName "4.18-alpha2"
+        versionName "4.18"
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         multiDexEnabled true
         vectorDrawables.useSupportLibrary = true
diff --git a/app/src/main/java/xyz/quaver/pupil/adapters/ReaderAdapter.kt b/app/src/main/java/xyz/quaver/pupil/adapters/ReaderAdapter.kt
index 5869043e..7baadcac 100644
--- a/app/src/main/java/xyz/quaver/pupil/adapters/ReaderAdapter.kt
+++ b/app/src/main/java/xyz/quaver/pupil/adapters/ReaderAdapter.kt
@@ -25,7 +25,9 @@ import androidx.constraintlayout.widget.ConstraintLayout
 import androidx.recyclerview.widget.RecyclerView
 import com.bumptech.glide.RequestManager
 import com.bumptech.glide.load.engine.DiskCacheStrategy
+import com.google.android.material.snackbar.Snackbar
 import com.google.firebase.crashlytics.FirebaseCrashlytics
+import kotlinx.android.synthetic.main.activity_reader.view.*
 import kotlinx.android.synthetic.main.item_reader.view.*
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
@@ -116,6 +118,14 @@ class ReaderAdapter(private val glide: RequestManager,
                     .load(R.drawable.image_broken_variant)
                     .into(holder.view.image)
 
+                Snackbar.make(holder.view.reader_layout, R.string.reader_error_retry, Snackbar.LENGTH_INDEFINITE).apply {
+                    setAction(android.R.string.no) { }
+                    setAction(android.R.string.yes) {
+                        downloadWorker!!.cancel(galleryID)
+                        downloadWorker!!.queue.add(galleryID)
+                    }
+                }.show()
+
                 return
             } else {
                 holder.view.reader_item_progressbar.progress =
diff --git a/app/src/main/java/xyz/quaver/pupil/ui/ReaderActivity.kt b/app/src/main/java/xyz/quaver/pupil/ui/ReaderActivity.kt
index 14306eea..7681698f 100644
--- a/app/src/main/java/xyz/quaver/pupil/ui/ReaderActivity.kt
+++ b/app/src/main/java/xyz/quaver/pupil/ui/ReaderActivity.kt
@@ -337,6 +337,16 @@ class ReaderActivity : AppCompatActivity() {
             }
         }
 
+        with(reader_fab_retry) {
+            setImageResource(R.drawable.refresh)
+            setOnClickListener {
+                DownloadWorker.getInstance(context).let {
+                    it.cancel(galleryID)
+                    it.queue.add(galleryID)
+                }
+            }
+        }
+
         with(reader_fab_fullscreen) {
             setImageResource(R.drawable.ic_fullscreen)
             setOnClickListener {
diff --git a/app/src/main/res/drawable/refresh.xml b/app/src/main/res/drawable/refresh.xml
new file mode 100644
index 00000000..cfa890d9
--- /dev/null
+++ b/app/src/main/res/drawable/refresh.xml
@@ -0,0 +1,8 @@
+<!-- drawable/refresh.xml -->
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:height="24dp"
+    android:width="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <path android:fillColor="#fff" android:pathData="M17.65,6.35C16.2,4.9 14.21,4 12,4A8,8 0 0,0 4,12A8,8 0 0,0 12,20C15.73,20 18.84,17.45 19.73,14H17.65C16.83,16.33 14.61,18 12,18A6,6 0 0,1 6,12A6,6 0 0,1 12,6C13.66,6 15.14,6.69 16.22,7.78L13,11H20V4L17.65,6.35Z" />
+</vector>
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_reader.xml b/app/src/main/res/layout/activity_reader.xml
index 303eb3bc..dba09170 100644
--- a/app/src/main/res/layout/activity_reader.xml
+++ b/app/src/main/res/layout/activity_reader.xml
@@ -75,6 +75,13 @@
             app:fab_label="@string/reader_fab_download"
             app:fab_size="mini"/>
 
+        <com.github.clans.fab.FloatingActionButton
+            android:id="@+id/reader_fab_retry"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            app:fab_label="@string/reader_fab_retry"
+            app:fab_size="mini"/>
+
         <com.github.clans.fab.FloatingActionButton
             android:id="@+id/reader_fab_fullscreen"
             android:layout_width="wrap_content"
diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml
index 067f2789..34dd3810 100644
--- a/app/src/main/res/values-ja/strings.xml
+++ b/app/src/main/res/values-ja/strings.xml
@@ -150,4 +150,6 @@
     <string name="apcjsa_option_message">(Korean only)</string>
     <string name="settings_user_id">ユーザーID</string>
     <string name="settings_user_id_toast">ユーザーIDをクリップボードにコピーしました</string>
+    <string name="reader_error_retry">ダウンロードエラーが発生しました。リトライしますか？</string>
+    <string name="reader_fab_retry">リトライ</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-ko/strings.xml b/app/src/main/res/values-ko/strings.xml
index d036521d..4db9f32a 100644
--- a/app/src/main/res/values-ko/strings.xml
+++ b/app/src/main/res/values-ko/strings.xml
@@ -150,4 +150,6 @@
     <string name="apcjsa_option_message">경찰서 정모 확률을 줄여보고자 캐시 비활성화/태그 필터를 추가하였습니다. 적용하시겠습니까?</string>
     <string name="settings_user_id">유저 ID</string>
     <string name="settings_user_id_toast">유저 ID를 클립보드에 복사했습니다</string>
+    <string name="reader_error_retry">다운로드 에러가 발생했습니다. 재시도 하시겠습니까?</string>
+    <string name="reader_fab_retry">재시도</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 7a2109f6..3028ed1a 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -116,13 +116,16 @@
 
     <string name="reader_loading">Loading</string>
     <string name="reader_go_to_page">Go to page</string>
-    <string name="reader_fab_fullscreen">Fullscreen</string>
+    <string name="reader_fab_fullscreen">Fullscreen</string>>
+    <string name="reader_fab_retry">Retry</string>
     <string name="reader_fab_download">Background download</string>
     <string name="reader_fab_download_cancel">Cancel background download</string>
     <string name="reader_notification_text">Downloading&#8230;</string>
     <string name="reader_notification_complete">Download complete</string>
     <string name="reader_notification_error">Download error</string>
 
+    <string name="reader_error_retry">Download Error occurred. Retry?</string>
+
     <string name="reader_help">Help</string>
 
     <!-- SETTINGS -->