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 @@
+
+
+
+
\ 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 @@
+
+
+
+
\ 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 @@
+
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 @@
ギャラリー番号で見る
エラーが発生しました
ストレージ
+ カカオトーク
\ 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 @@
갤러리 번호로 열기
갤러리를 찾지 못했습니다
저장 공간
+ 카카오톡 오픈채팅방
\ 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 @@
http://bit.ly/2Z7lNZE
https://github.com/tom5079/Pupil-issue/issues/new/choose
mailto:pupil.hentai@gmail.com
+ https://open.kakao.com/o/gvNrncsb
Settings
Thumbnail
@@ -42,6 +43,7 @@
Visit homepage
Visit github
Email me!
+ Kakaotalk
Jump to page
Current page: %1$d\nMaximum page: %2$d