diff --git a/app/build.gradle b/app/build.gradle
index 76304c9d..b2f4b9aa 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -9,8 +9,8 @@ android {
applicationId "xyz.quaver.pupil"
minSdkVersion 16
targetSdkVersion 28
- versionCode 8
- versionName "2.2"
+ versionCode 11
+ versionName "2.5.2"
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
}
buildTypes {
@@ -35,7 +35,7 @@ dependencies {
implementation "org.jetbrains.kotlinx:kotlinx-serialization-runtime:0.11.0"
implementation 'androidx.appcompat:appcompat:1.0.2'
implementation 'androidx.constraintlayout:constraintlayout:1.1.3'
- implementation 'androidx.preference:preference:1.1.0-alpha05'
+ implementation 'androidx.preference:preference:1.1.0-beta01'
implementation 'com.google.android.material:material:1.0.0'
implementation 'com.github.arimorty:floatingsearchview:2.1.1'
implementation 'com.github.deano2390:MaterialShowcaseView:1.3.4'
@@ -47,9 +47,9 @@ dependencies {
transitive = true
}
testImplementation 'junit:junit:4.12'
- androidTestImplementation 'androidx.test.ext:junit:1.1.0'
- androidTestImplementation 'androidx.test:runner:1.1.1'
- androidTestImplementation 'androidx.test.espresso:espresso-core:3.1.1'
+ androidTestImplementation 'androidx.test.ext:junit:1.1.1'
+ androidTestImplementation 'androidx.test:runner:1.2.0'
+ androidTestImplementation 'androidx.test.espresso:espresso-core:3.2.0'
implementation project(path: ':libpupil')
}
diff --git a/app/src/main/java/xyz/quaver/pupil/ReaderActivity.kt b/app/src/main/java/xyz/quaver/pupil/ReaderActivity.kt
index 57cc02cd..1f4c9abb 100644
--- a/app/src/main/java/xyz/quaver/pupil/ReaderActivity.kt
+++ b/app/src/main/java/xyz/quaver/pupil/ReaderActivity.kt
@@ -2,7 +2,6 @@ package xyz.quaver.pupil
import android.graphics.drawable.Drawable
import android.os.Bundle
-import android.os.Environment
import android.view.*
import androidx.appcompat.app.AlertDialog
import androidx.appcompat.app.AppCompatActivity
@@ -27,11 +26,6 @@ import xyz.quaver.hitomi.GalleryBlock
import xyz.quaver.pupil.adapters.ReaderAdapter
import xyz.quaver.pupil.util.GalleryDownloader
import xyz.quaver.pupil.util.ItemClickSupport
-import java.io.File
-import java.io.FileInputStream
-import java.io.FileOutputStream
-import java.util.zip.ZipEntry
-import java.util.zip.ZipOutputStream
class ReaderActivity : AppCompatActivity() {
@@ -169,7 +163,7 @@ class ReaderActivity : AppCompatActivity() {
onProgressHandler = {
CoroutineScope(Dispatchers.Main).launch {
reader_progressbar.progress = it
- menu?.findItem(R.id.reader_menu_use_hiyobi)?.isVisible = true
+ menu?.findItem(R.id.reader_menu_use_hiyobi)?.isVisible = downloader.useHiyobi
}
}
onDownloadedHandler = {
diff --git a/app/src/main/java/xyz/quaver/pupil/adapters/GalleryBlockAdapter.kt b/app/src/main/java/xyz/quaver/pupil/adapters/GalleryBlockAdapter.kt
index ed8aa83d..183c90d9 100644
--- a/app/src/main/java/xyz/quaver/pupil/adapters/GalleryBlockAdapter.kt
+++ b/app/src/main/java/xyz/quaver/pupil/adapters/GalleryBlockAdapter.kt
@@ -1,13 +1,11 @@
package xyz.quaver.pupil.adapters
import android.graphics.BitmapFactory
-import android.util.Log
import android.util.SparseBooleanArray
import android.view.LayoutInflater
import android.view.View
import android.view.ViewGroup
import android.widget.LinearLayout
-import android.widget.RelativeLayout
import androidx.cardview.widget.CardView
import androidx.core.content.ContextCompat
import androidx.recyclerview.widget.RecyclerView
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 bf47ee0d..985096f2 100644
--- a/app/src/main/java/xyz/quaver/pupil/util/GalleryDownloader.kt
+++ b/app/src/main/java/xyz/quaver/pupil/util/GalleryDownloader.kt
@@ -5,7 +5,6 @@ import android.content.Context
import android.content.ContextWrapper
import android.content.Intent
import android.os.Environment
-import android.util.Log
import android.util.SparseArray
import androidx.core.app.NotificationCompat
import androidx.core.app.NotificationManagerCompat
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index d8232b53..f925497f 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -5,7 +5,7 @@
Pupil-v(\\d+\\.)+\\d+\\.apk
https://tom5079.github.io/Pupil
- https://tom5079.github.io/Pupil/2019/06/02/manual-kr.html
+ https://tom5079.github.io/Pupil/2019/06/06/manual-kr.html
https://github.com/tom5079/Pupil-issue/issues/new/choose
mailto:pupil.hentai@gmail.com
diff --git a/libpupil/src/main/java/xyz/quaver/hitomi/download.kt b/libpupil/src/main/java/xyz/quaver/hitomi/download.kt
deleted file mode 100644
index df73e902..00000000
--- a/libpupil/src/main/java/xyz/quaver/hitomi/download.kt
+++ /dev/null
@@ -1,3 +0,0 @@
-package xyz.quaver.hitomi
-
-//download.js
\ No newline at end of file