From 79641fec67f1174f677352267a4e55fc4ceec053 Mon Sep 17 00:00:00 2001
From: tom5079 <tom5079@naver.com>
Date: Sun, 9 Jun 2019 15:30:01 +0900
Subject: [PATCH] Bug fixed Added kakaotalk contact

---
 app/build.gradle                                         | 2 +-
 app/release/output.json                                  | 1 +
 app/src/main/java/xyz/quaver/pupil/MainActivity.kt       | 3 +++
 .../main/java/xyz/quaver/pupil/util/GalleryDownloader.kt | 9 ++-------
 app/src/main/res/drawable/ic_message.xml                 | 8 ++++++++
 app/src/main/res/drawable/ic_numeric.xml                 | 8 ++++++++
 app/src/main/res/menu/activity_main_drawer.xml           | 3 +++
 app/src/main/res/values-ja/strings.xml                   | 1 +
 app/src/main/res/values-ko/strings.xml                   | 1 +
 app/src/main/res/values/strings.xml                      | 2 ++
 10 files changed, 30 insertions(+), 8 deletions(-)
 create mode 100644 app/release/output.json
 create mode 100644 app/src/main/res/drawable/ic_message.xml
 create mode 100644 app/src/main/res/drawable/ic_numeric.xml

diff --git a/app/build.gradle b/app/build.gradle
index 0c68795c..da8a39ab 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -10,7 +10,7 @@ android {
         minSdkVersion 16
         targetSdkVersion 28
         versionCode 15
-        versionName "3.0"
+        versionName "2.8"
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }
     buildTypes {
diff --git a/app/release/output.json b/app/release/output.json
new file mode 100644
index 00000000..456cc06e
--- /dev/null
+++ b/app/release/output.json
@@ -0,0 +1 @@
+[{"outputType":{"type":"APK"},"apkData":{"type":"MAIN","splits":[],"versionCode":15,"versionName":"2.8","enabled":true,"outputFile":"app-release.apk","fullName":"release","baseName":"release"},"path":"app-release.apk","properties":{}}]
\ No newline at end of file
diff --git a/app/src/main/java/xyz/quaver/pupil/MainActivity.kt b/app/src/main/java/xyz/quaver/pupil/MainActivity.kt
index 024641a3..1933c54e 100644
--- a/app/src/main/java/xyz/quaver/pupil/MainActivity.kt
+++ b/app/src/main/java/xyz/quaver/pupil/MainActivity.kt
@@ -331,6 +331,9 @@ class MainActivity : AppCompatActivity() {
                     R.id.main_drawer_email -> {
                         startActivity(Intent(Intent.ACTION_VIEW, Uri.parse(getString(R.string.email))))
                     }
+                    R.id.main_drawer_kakaotalk -> {
+                        startActivity(Intent(Intent.ACTION_VIEW, Uri.parse(getString(R.string.kakaotalk))))
+                    }
                 }
             }
 
diff --git a/app/src/main/java/xyz/quaver/pupil/util/GalleryDownloader.kt b/app/src/main/java/xyz/quaver/pupil/util/GalleryDownloader.kt
index 5a5835c1..f4e08369 100644
--- a/app/src/main/java/xyz/quaver/pupil/util/GalleryDownloader.kt
+++ b/app/src/main/java/xyz/quaver/pupil/util/GalleryDownloader.kt
@@ -44,15 +44,10 @@ class GalleryDownloader(
                 field = true
                 notificationManager.notify(galleryBlock.id, notificationBuilder.build())
 
-                val data = File(Environment.getExternalStorageDirectory(), "Pupil/${galleryBlock.id} ${galleryBlock.title}").let {
-                    when {
-                        it.exists() -> it
-                        else -> File(Environment.getExternalStorageDirectory(), "Pupil/${galleryBlock.id}")
-                    }
-                }
+                val data = getCachedGallery(this, galleryBlock.id)
                 val cache = File(cacheDir, "imageCache/${galleryBlock.id}")
 
-                if (cache.exists() && !data.exists()) {
+                if (File(cache, "images").exists() && !data.exists()) {
                     cache.copyRecursively(data, true)
                     cache.deleteRecursively()
                 }
diff --git a/app/src/main/res/drawable/ic_message.xml b/app/src/main/res/drawable/ic_message.xml
new file mode 100644
index 00000000..9536776c
--- /dev/null
+++ b/app/src/main/res/drawable/ic_message.xml
@@ -0,0 +1,8 @@
+<!-- drawable/message.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="#000" android:pathData="M20,2H4A2,2 0 0,0 2,4V22L6,18H20A2,2 0 0,0 22,16V4C22,2.89 21.1,2 20,2Z" />
+</vector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/ic_numeric.xml b/app/src/main/res/drawable/ic_numeric.xml
new file mode 100644
index 00000000..fc54c34a
--- /dev/null
+++ b/app/src/main/res/drawable/ic_numeric.xml
@@ -0,0 +1,8 @@
+<!-- drawable/numeric.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="#000" android:pathData="M4,17V9H2V7H6V17H4M22,15C22,16.11 21.1,17 20,17H16V15H20V13H18V11H20V9H16V7H20A2,2 0 0,1 22,9V10.5A1.5,1.5 0 0,1 20.5,12A1.5,1.5 0 0,1 22,13.5V15M14,15V17H8V13C8,11.89 8.9,11 10,11H12V9H8V7H12A2,2 0 0,1 14,9V11C14,12.11 13.1,13 12,13H10V15H14Z" />
+</vector>
\ No newline at end of file
diff --git a/app/src/main/res/menu/activity_main_drawer.xml b/app/src/main/res/menu/activity_main_drawer.xml
index 3959e386..36ce34a9 100644
--- a/app/src/main/res/menu/activity_main_drawer.xml
+++ b/app/src/main/res/menu/activity_main_drawer.xml
@@ -34,6 +34,9 @@
             <item android:id="@+id/main_drawer_email"
                 android:title="@string/main_drawer_group_contact_email"
                 android:icon="@drawable/ic_email"/>
+            <item android:id="@+id/main_drawer_kakaotalk"
+                android:title="@string/main_drawer_grouop_contact_kakaotalk"
+                android:icon="@drawable/ic_message"/>
         </menu>
     </item>
 
diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml
index c84b9fd9..8e7dd7d0 100644
--- a/app/src/main/res/values-ja/strings.xml
+++ b/app/src/main/res/values-ja/strings.xml
@@ -65,4 +65,5 @@
     <string name="main_open_gallery_by_id">ギャラリー番号で見る</string>
     <string name="main_open_gallery_by_id_error">エラーが発生しました</string>
     <string name="settings_storage">ストレージ</string>
+    <string name="main_drawer_grouop_contact_kakaotalk">カカオトーク</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 fbf6f3f9..0b99f608 100644
--- a/app/src/main/res/values-ko/strings.xml
+++ b/app/src/main/res/values-ko/strings.xml
@@ -65,4 +65,5 @@
     <string name="main_open_gallery_by_id">갤러리 번호로 열기</string>
     <string name="main_open_gallery_by_id_error">갤러리를 찾지 못했습니다</string>
     <string name="settings_storage">저장 공간</string>
+    <string name="main_drawer_grouop_contact_kakaotalk">카카오톡 오픈채팅방</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 ab85c2bd..2cc8d514 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -9,6 +9,7 @@
     <string name="help" translatable="false">http://bit.ly/2Z7lNZE</string>
     <string name="github" translatable="false">https://github.com/tom5079/Pupil-issue/issues/new/choose</string>
     <string name="email" translatable="false">mailto:pupil.hentai@gmail.com</string>
+    <string name="kakaotalk" translatable="false">https://open.kakao.com/o/gvNrncsb</string>
 
     <string name="main_settings" translatable="false">Settings</string>
     <string name="galleryblock_thumbnail_description" translatable="false">Thumbnail</string>
@@ -42,6 +43,7 @@
     <string name="main_drawer_group_contact_homepage">Visit homepage</string>
     <string name="main_drawer_group_contact_github">Visit github</string>
     <string name="main_drawer_group_contact_email">Email me!</string>
+    <string name="main_drawer_grouop_contact_kakaotalk">Kakaotalk</string>
 
     <string name="main_jump_title">Jump to page</string>
     <string name="main_jump_message">Current page: %1$d\nMaximum page: %2$d</string>