Merge pull request #12 from tom5079/development

Version 2.11.1
2019-06-23 23:33:23 +09:00
parent 449db97a2b 5bfc27835b
commit 0618d8c6f8
33 changed files with 200 additions and 234 deletions
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_7" project-jdk-name="1.8" project-jdk-type="JavaSDK">
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" project-jdk-name="1.8" project-jdk-type="JavaSDK">
    <output url="file://$PROJECT_DIR$/classes" />
  </component>
 </project>
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -12,10 +12,11 @@ android {
        applicationId "xyz.quaver.pupil"
        minSdkVersion 16
        targetSdkVersion 29
-        versionCode 17
-        versionName "2.10-alpha"
+        versionCode 20
+        versionName "2.11.1"
        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
        multiDexEnabled true
+        vectorDrawables.useSupportLibrary = true
    }
    buildTypes {
        release {
@@ -37,23 +38,22 @@ dependencies {
    implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-core:1.2.1'
    implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-android:1.2.1'
    implementation "org.jetbrains.kotlinx:kotlinx-serialization-runtime:0.11.0"
-    implementation 'com.android.support:multidex:1.0.3'
    implementation 'androidx.appcompat:appcompat:1.0.2'
    implementation 'androidx.constraintlayout:constraintlayout:1.1.3'
    implementation 'androidx.preference:preference:1.1.0-beta01'
+    implementation 'androidx.constraintlayout:constraintlayout:1.1.3'
+    implementation 'androidx.lifecycle:lifecycle-extensions:2.0.0'
+    implementation 'androidx.lifecycle:lifecycle-viewmodel-ktx:2.0.0'
+    implementation 'androidx.legacy:legacy-support-v4:1.0.0'
+    implementation 'com.android.support:multidex:1.0.3'
    implementation 'com.google.android.material:material:1.0.0'
    implementation 'com.google.firebase:firebase-core:17.0.0'
    implementation 'com.google.firebase:firebase-perf:18.0.1'
    implementation 'com.crashlytics.sdk.android:crashlytics:2.10.1'
    implementation 'com.github.arimorty:floatingsearchview:2.1.1'
-    implementation 'com.andrognito.patternlockview:patternlockview:1.0.0'
-    implementation 'androidx.appcompat:appcompat:1.0.2'
-    implementation 'androidx.constraintlayout:constraintlayout:1.1.3'
-    implementation "ru.noties.markwon:core:${markwonVersion}"
    implementation 'com.github.clans:fab:1.6.4'
-    implementation 'androidx.legacy:legacy-support-v4:1.0.0'
-    implementation 'androidx.lifecycle:lifecycle-extensions:2.0.0'
-    implementation 'androidx.lifecycle:lifecycle-viewmodel-ktx:2.0.0'
+    implementation 'com.andrognito.patternlockview:patternlockview:1.0.0'
+    implementation "ru.noties.markwon:core:${markwonVersion}"
    testImplementation 'junit:junit:4.12'
    androidTestImplementation 'androidx.test.ext:junit:1.1.1'
    androidTestImplementation 'androidx.test:rules:1.2.0'
--- a/app/release/output.json
+++ b/app/release/output.json
@@ -1 +1 @@
-[{"outputType":{"type":"APK"},"apkData":{"type":"MAIN","splits":[],"versionCode":17,"versionName":"2.9.1","enabled":true,"outputFile":"app-release.apk","fullName":"release","baseName":"release"},"path":"app-release.apk","properties":{}}]
+[{"outputType":{"type":"APK"},"apkData":{"type":"MAIN","splits":[],"versionCode":20,"versionName":"2.11.1","enabled":true,"outputFile":"app-release.apk","fullName":"release","baseName":"release"},"path":"app-release.apk","properties":{}}]
--- a/app/src/androidTest/java/xyz/quaver/pupil/ExampleInstrumentedTest.kt
+++ b/app/src/androidTest/java/xyz/quaver/pupil/ExampleInstrumentedTest.kt
@@ -9,6 +9,7 @@ import org.junit.Assert.assertEquals
 import org.junit.Rule
 import org.junit.Test
 import org.junit.runner.RunWith
+import xyz.quaver.hitomi.fetchNozomi
 import xyz.quaver.hiyobi.cookie
 import xyz.quaver.hiyobi.getReader
 import xyz.quaver.hiyobi.user_agent
@@ -29,6 +30,8 @@ class ExampleInstrumentedTest {
        // Context of the app under test.
        val appContext = InstrumentationRegistry.getInstrumentation().targetContext
        assertEquals("xyz.quaver.pupil", appContext.packageName)
+
+        Log.d("Pupil", fetchNozomi().first.size.toString())
    }

    @Test
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -6,7 +6,7 @@
    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />

    <application
-        android:name=".ui.Pupil"
+        android:name=".Pupil"
        android:allowBackup="true"
        android:fullBackupContent="true"
        android:icon="@mipmap/ic_launcher"
--- a/app/src/main/java/xyz/quaver/pupil/ui/Pupil.kt
+++ b/app/src/main/java/xyz/quaver/pupil/ui/Pupil.kt
@@ -1,14 +1,17 @@
-package xyz.quaver.pupil.ui
+package xyz.quaver.pupil

 import android.app.Notification
 import android.app.NotificationChannel
 import android.app.NotificationManager
 import android.content.Context
 import android.os.Build
+import androidx.appcompat.app.AppCompatDelegate
 import androidx.core.content.ContextCompat
 import androidx.multidex.MultiDexApplication
 import androidx.preference.PreferenceManager
-import xyz.quaver.pupil.R
+import com.google.android.gms.common.GooglePlayServicesNotAvailableException
+import com.google.android.gms.common.GooglePlayServicesRepairableException
+import com.google.android.gms.security.ProviderInstaller
 import xyz.quaver.pupil.util.Histories
 import java.io.File

@@ -18,6 +21,10 @@ class Pupil : MultiDexApplication() {
    lateinit var downloads: Histories
    lateinit var favorites: Histories

+    init {
+        AppCompatDelegate.setCompatVectorFromResourcesEnabled(true)
+    }
+
    override fun onCreate() {
        val preference = PreferenceManager.getDefaultSharedPreferences(this)

@@ -25,7 +32,13 @@ class Pupil : MultiDexApplication() {
        downloads = Histories(File(ContextCompat.getDataDir(this), "downloads.json"))
        favorites = Histories(File(ContextCompat.getDataDir(this), "favorites.json"))

-        super.onCreate()
+        try {
+            ProviderInstaller.installIfNeeded(this)
+        } catch (e: GooglePlayServicesRepairableException) {
+            e.printStackTrace()
+        } catch (e: GooglePlayServicesNotAvailableException) {
+            e.printStackTrace()
+        }

        if (!preference.getBoolean("channel_created", false)) {
            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
@@ -41,6 +54,8 @@ class Pupil : MultiDexApplication() {

            preference.edit().putBoolean("channel_created", true).apply()
        }
+
+        super.onCreate()
    }

 }
--- a/app/src/main/java/xyz/quaver/pupil/adapters/GalleryBlockAdapter.kt
+++ b/app/src/main/java/xyz/quaver/pupil/adapters/GalleryBlockAdapter.kt
@@ -2,7 +2,8 @@ package xyz.quaver.pupil.adapters

 import android.app.AlertDialog
 import android.graphics.BitmapFactory
-import android.graphics.drawable.Animatable
+import android.graphics.drawable.Drawable
+import android.util.Log
 import android.util.SparseBooleanArray
 import android.view.LayoutInflater
 import android.view.View
@@ -12,6 +13,7 @@ import android.widget.LinearLayout
 import androidx.cardview.widget.CardView
 import androidx.core.content.ContextCompat
 import androidx.recyclerview.widget.RecyclerView
+import androidx.vectordrawable.graphics.drawable.Animatable2Compat
 import androidx.vectordrawable.graphics.drawable.AnimatedVectorDrawableCompat
 import com.google.android.material.chip.Chip
 import kotlinx.android.synthetic.main.item_galleryblock.view.*
@@ -24,7 +26,7 @@ import kotlinx.serialization.json.JsonConfiguration
 import kotlinx.serialization.list
 import xyz.quaver.hitomi.GalleryBlock
 import xyz.quaver.hitomi.ReaderItem
-import xyz.quaver.pupil.ui.Pupil
+import xyz.quaver.pupil.Pupil
 import xyz.quaver.pupil.R
 import xyz.quaver.pupil.types.Tag
 import xyz.quaver.pupil.util.Histories
@@ -68,7 +70,7 @@ class GalleryBlockAdapter(private val galleries: List<Pair<GalleryBlock, Deferre

                    val bitmap = BitmapFactory.decodeFile(thumbnail.await())

-                    post {
+                    launch(Dispatchers.Main) {
                        galleryblock_thumbnail.setImageBitmap(bitmap)
                    }
                }
@@ -118,12 +120,12 @@ class GalleryBlockAdapter(private val galleries: List<Pair<GalleryBlock, Deferre
                                                visibility = View.VISIBLE
                                            }
                                        } else {
-                                            val drawable = AnimatedVectorDrawableCompat.create(context, R.drawable.ic_progressbar_complete)
                                            with(view.galleryblock_progress_complete) {
-                                                setImageDrawable(drawable)
+                                                setImageDrawable(AnimatedVectorDrawableCompat.create(context, R.drawable.ic_progressbar_complete).apply {
+                                                    this?.start()
+                                                })
                                                visibility = View.VISIBLE
                                            }
-                                            drawable?.start()
                                            completeFlag.put(galleryBlock.id, true)
                                        }
                                    } else
@@ -250,19 +252,28 @@ class GalleryBlockAdapter(private val galleries: List<Pair<GalleryBlock, Deferre
                    favorites = (context.applicationContext as Pupil).favorites

                with(galleryblock_favorite) {
-                    post {
-                        isChecked = favorites.contains(galleryBlock.id)
-                    }
+                    setImageResource(if (favorites.contains(galleryBlock.id)) R.drawable.ic_star_filled else R.drawable.ic_star_empty)
                    setOnClickListener {
                        when {
-                            isChecked -> favorites.add(galleryBlock.id)
-                            else -> favorites.remove(galleryBlock.id)
-                        }
-                    }
-                    setOnCheckedChangeListener { _, isChecked ->
-                        when {
-                            isChecked -> (background as Animatable).start()
-                            else -> background = AnimatedVectorDrawableCompat.create(context, R.drawable.avd_star)
+                            favorites.contains(galleryBlock.id) -> {
+                                favorites.remove(galleryBlock.id)
+
+                                setImageResource(R.drawable.ic_star_empty)
+                            }
+                            else -> {
+                                favorites.add(galleryBlock.id)
+
+                                setImageDrawable(AnimatedVectorDrawableCompat.create(context, R.drawable.avd_star).apply {
+                                    this ?: return@apply
+
+                                    registerAnimationCallback(object: Animatable2Compat.AnimationCallback() {
+                                        override fun onAnimationEnd(drawable: Drawable?) {
+                                            setImageResource(R.drawable.ic_star_filled)
+                                        }
+                                    })
+                                    start()
+                                })
+                            }
                        }
                    }
                }
--- a/app/src/main/java/xyz/quaver/pupil/adapters/ReaderAdapter.kt
+++ b/app/src/main/java/xyz/quaver/pupil/adapters/ReaderAdapter.kt
@@ -1,6 +1,8 @@
 package xyz.quaver.pupil.adapters

+import android.graphics.Bitmap
 import android.graphics.BitmapFactory
+import android.util.Log
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
@@ -10,6 +12,8 @@ import xyz.quaver.pupil.R

 class ReaderAdapter(private val images: List<String>) : RecyclerView.Adapter<ReaderAdapter.ViewHolder>() {

+    var isFullScreen = false
+
    class ViewHolder(val view: View) : RecyclerView.ViewHolder(view)

    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): ViewHolder {
@@ -21,14 +25,40 @@ class ReaderAdapter(private val images: List<String>) : RecyclerView.Adapter<Rea
    }

    override fun onBindViewHolder(holder: ViewHolder, position: Int) {
+
+        fun calculateInSampleSize(options: BitmapFactory.Options, reqWidth: Int, reqHeight: Int): Int {
+            // Raw height and width of image
+            val (height: Int, width: Int) = options.run { outHeight to outWidth }
+            var inSampleSize = 1
+
+            if (height > reqHeight || width > reqWidth) {
+
+                val halfHeight: Int = height / 2
+                val halfWidth: Int = width / 2
+
+                // Calculate the largest inSampleSize value that is a power of 2 and keeps both
+                // height and width larger than the requested height and width.
+                while (halfHeight / inSampleSize >= reqHeight && halfWidth / inSampleSize >= reqWidth) {
+                    inSampleSize *= 2
+                }
+            }
+
+            return inSampleSize
+        }
+
        with(holder.view as ImageView) {
            val options = BitmapFactory.Options()

            options.inJustDecodeBounds = true
            BitmapFactory.decodeFile(images[position], options)

-            options.inSampleSize = options.outWidth /
-                    context.resources.displayMetrics.widthPixels
+            val (reqWidth, reqHeight) = context.resources.displayMetrics.let {
+                Pair(it.widthPixels, it.heightPixels)
+            }
+
+            options.inSampleSize = calculateInSampleSize(options, reqWidth, reqHeight)
+
+            options.inPreferredConfig = Bitmap.Config.RGB_565

            options.inJustDecodeBounds = false

--- a/app/src/main/java/xyz/quaver/pupil/ui/LockActivity.kt
+++ b/app/src/main/java/xyz/quaver/pupil/ui/LockActivity.kt
@@ -1,14 +1,12 @@
 package xyz.quaver.pupil.ui

 import android.app.Activity
-import androidx.appcompat.app.AppCompatActivity
 import android.os.Bundle
-import android.widget.Toast
+import androidx.appcompat.app.AppCompatActivity
 import com.andrognito.patternlockview.PatternLockView
 import com.google.android.material.snackbar.Snackbar
 import kotlinx.android.synthetic.main.activity_lock.*
 import kotlinx.android.synthetic.main.fragment_pattern_lock.*
-import kotlinx.android.synthetic.main.settings_activity.*
 import xyz.quaver.pupil.R
 import xyz.quaver.pupil.util.Lock
 import xyz.quaver.pupil.util.LockManager
--- a/app/src/main/java/xyz/quaver/pupil/ui/MainActivity.kt
+++ b/app/src/main/java/xyz/quaver/pupil/ui/MainActivity.kt
@@ -42,6 +42,7 @@ import kotlinx.serialization.stringify
 import ru.noties.markwon.Markwon
 import xyz.quaver.hitomi.*
 import xyz.quaver.pupil.BuildConfig
+import xyz.quaver.pupil.Pupil
 import xyz.quaver.pupil.R
 import xyz.quaver.pupil.adapters.GalleryBlockAdapter
 import xyz.quaver.pupil.types.Tag
--- a/app/src/main/java/xyz/quaver/pupil/ui/ReaderActivity.kt
+++ b/app/src/main/java/xyz/quaver/pupil/ui/ReaderActivity.kt
@@ -28,6 +28,7 @@ import kotlinx.serialization.json.Json
 import kotlinx.serialization.json.JsonConfiguration
 import xyz.quaver.hitomi.GalleryBlock
 import xyz.quaver.hitomi.getGalleryBlock
+import xyz.quaver.pupil.Pupil
 import xyz.quaver.pupil.R
 import xyz.quaver.pupil.adapters.ReaderAdapter
 import xyz.quaver.pupil.util.GalleryDownloader
@@ -46,6 +47,8 @@ class ReaderActivity : AppCompatActivity() {
    set(value) {
        field = value

+        (reader_recyclerview.adapter as ReaderAdapter).isFullScreen = value
+
        reader_progressbar.visibility = when {
            value -> View.VISIBLE
            else -> View.GONE
--- a/app/src/main/java/xyz/quaver/pupil/ui/SettingsActivity.kt
+++ b/app/src/main/java/xyz/quaver/pupil/ui/SettingsActivity.kt
@@ -17,10 +17,12 @@ import androidx.preference.Preference
 import androidx.preference.PreferenceFragmentCompat
 import androidx.preference.PreferenceManager
 import kotlinx.android.synthetic.main.dialog_default_query.view.*
+import xyz.quaver.pupil.Pupil
 import xyz.quaver.pupil.R
 import xyz.quaver.pupil.types.Tags
 import xyz.quaver.pupil.util.Lock
 import xyz.quaver.pupil.util.LockManager
+import xyz.quaver.pupil.util.getDownloadDirectory
 import java.io.File

 class SettingsActivity : AppCompatActivity() {
@@ -133,7 +135,7 @@ class SettingsActivity : AppCompatActivity() {
            with(findPreference<Preference>("delete_downloads")) {
                this!!

-                val dir = context.getExternalFilesDir("Pupil") ?: return@with
+                val dir = getDownloadDirectory(context)!!

                summary = getDirSize(dir)

--- a/app/src/main/java/xyz/quaver/pupil/util/GalleryDownloader.kt
+++ b/app/src/main/java/xyz/quaver/pupil/util/GalleryDownloader.kt
@@ -4,7 +4,6 @@ import android.app.PendingIntent
 import android.content.Context
 import android.content.ContextWrapper
 import android.content.Intent
-import android.util.Log
 import android.util.SparseArray
 import androidx.core.app.NotificationCompat
 import androidx.core.app.NotificationManagerCompat
@@ -18,8 +17,8 @@ import kotlinx.serialization.list
 import xyz.quaver.hitomi.*
 import xyz.quaver.hiyobi.cookie
 import xyz.quaver.hiyobi.user_agent
-import xyz.quaver.pupil.ui.Pupil
 import xyz.quaver.pupil.R
+import xyz.quaver.pupil.Pupil
 import xyz.quaver.pupil.ui.ReaderActivity
 import java.io.File
 import java.io.FileOutputStream
@@ -218,7 +217,7 @@ class GalleryDownloader(
                if (download) {
                    File(cacheDir, "imageCache/${galleryBlock.id}").let {
                        if (it.exists()) {
-                            val target = File(getExternalFilesDir("Pupil"), galleryBlock.id.toString())
+                            val target = File(getDownloadDirectory(this@GalleryDownloader), galleryBlock.id.toString())

                            if (!target.exists())
                                target.mkdirs()
@@ -230,10 +229,10 @@ class GalleryDownloader(

                    notificationManager.notify(galleryBlock.id, notificationBuilder.build())

-                    onCompleteHandler?.invoke()
-
                    download = false
                }
+
+                onCompleteHandler?.invoke()
            }

            remove(galleryBlock.id)
--- a/app/src/main/java/xyz/quaver/pupil/util/file.kt
+++ b/app/src/main/java/xyz/quaver/pupil/util/file.kt
@@ -1,15 +1,24 @@
 package xyz.quaver.pupil.util

 import android.content.Context
+import android.os.Build
 import android.os.Environment
 import android.provider.MediaStore
+import androidx.core.content.ContextCompat
 import java.io.File

 fun getCachedGallery(context: Context, galleryID: Int): File {
-    return File(context.getExternalFilesDir("Pupil"), galleryID.toString()).let {
+    return File(getDownloadDirectory(context), galleryID.toString()).let {
        when {
            it.exists() -> it
            else -> File(context.cacheDir, "imageCache/$galleryID")
        }
    }
+}
+
+fun getDownloadDirectory(context: Context): File? {
+    return if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q)
+        context.getExternalFilesDir("Pupil")
+    else
+        File(Environment.getExternalStorageDirectory(), "Pupil")
 }
--- a/app/src/main/res/drawable-anydpi/ic_progressbar_complete.xml
+++ b/app/src/main/res/drawable-anydpi/ic_progressbar_complete.xml
@@ -1,18 +0,0 @@
-<animated-vector
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    xmlns:aapt="http://schemas.android.com/aapt"
-    android:drawable="@drawable/ic_progressbar"
-    tools:ignore="NewApi">
-    <target android:name="path">
-        <aapt:attr name="android:animation">
-            <objectAnimator
-                android:propertyName="trimPathEnd"
-                android:duration="1000"
-                android:valueFrom="0"
-                android:valueTo="1"
-                android:valueType="floatType"
-                android:interpolator="@android:interpolator/fast_out_slow_in"/>
-        </aapt:attr>
-    </target>
-</animated-vector>
--- a/app/src/main/res/drawable-v24/ic_launcher_foreground.xml
+++ b/app/src/main/res/drawable-v24/ic_launcher_foreground.xml
@@ -1,34 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-        xmlns:aapt="http://schemas.android.com/aapt"
-        android:width="108dp"
-        android:height="108dp"
-        android:viewportHeight="108"
-        android:viewportWidth="108">
-    <path
-            android:fillType="evenOdd"
-            android:pathData="M32,64C32,64 38.39,52.99 44.13,50.95C51.37,48.37 70.14,49.57 70.14,49.57L108.26,87.69L108,109.01L75.97,107.97L32,64Z"
-            android:strokeColor="#00000000"
-            android:strokeWidth="1">
-        <aapt:attr name="android:fillColor">
-            <gradient
-                    android:endX="78.5885"
-                    android:endY="90.9159"
-                    android:startX="48.7653"
-                    android:startY="61.0927"
-                    android:type="linear">
-                <item
-                        android:color="#44000000"
-                        android:offset="0.0"/>
-                <item
-                        android:color="#00000000"
-                        android:offset="1.0"/>
-            </gradient>
-        </aapt:attr>
-    </path>
-    <path
-            android:fillColor="#FFFFFF"
-            android:fillType="nonZero"
-            android:pathData="M66.94,46.02L66.94,46.02C72.44,50.07 76,56.61 76,64L32,64C32,56.61 35.56,50.11 40.98,46.06L36.18,41.19C35.45,40.45 35.45,39.3 36.18,38.56C36.91,37.81 38.05,37.81 38.78,38.56L44.25,44.05C47.18,42.57 50.48,41.71 54,41.71C57.48,41.71 60.78,42.57 63.68,44.05L69.11,38.56C69.84,37.81 70.98,37.81 71.71,38.56C72.44,39.3 72.44,40.45 71.71,41.19L66.94,46.02ZM62.94,56.92C64.08,56.92 65,56.01 65,54.88C65,53.76 64.08,52.85 62.94,52.85C61.8,52.85 60.88,53.76 60.88,54.88C60.88,56.01 61.8,56.92 62.94,56.92ZM45.06,56.92C46.2,56.92 47.13,56.01 47.13,54.88C47.13,53.76 46.2,52.85 45.06,52.85C43.92,52.85 43,53.76 43,54.88C43,56.01 43.92,56.92 45.06,56.92Z"
-            android:strokeColor="#00000000"
-            android:strokeWidth="1"/>
-</vector>
--- a/app/src/main/res/drawable/ic_launcher_background.xml
+++ b/app/src/main/res/drawable/ic_launcher_background.xml
@@ -1,74 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<vector
-        xmlns:android="http://schemas.android.com/apk/res/android"
-        android:height="108dp"
-        android:width="108dp"
-        android:viewportHeight="108"
-        android:viewportWidth="108">
-    <path android:fillColor="#008577"
-          android:pathData="M0,0h108v108h-108z"/>
-    <path android:fillColor="#00000000" android:pathData="M9,0L9,108"
-          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
-    <path android:fillColor="#00000000" android:pathData="M19,0L19,108"
-          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
-    <path android:fillColor="#00000000" android:pathData="M29,0L29,108"
-          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
-    <path android:fillColor="#00000000" android:pathData="M39,0L39,108"
-          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
-    <path android:fillColor="#00000000" android:pathData="M49,0L49,108"
-          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
-    <path android:fillColor="#00000000" android:pathData="M59,0L59,108"
-          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
-    <path android:fillColor="#00000000" android:pathData="M69,0L69,108"
-          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
-    <path android:fillColor="#00000000" android:pathData="M79,0L79,108"
-          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
-    <path android:fillColor="#00000000" android:pathData="M89,0L89,108"
-          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
-    <path android:fillColor="#00000000" android:pathData="M99,0L99,108"
-          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
-    <path android:fillColor="#00000000" android:pathData="M0,9L108,9"
-          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
-    <path android:fillColor="#00000000" android:pathData="M0,19L108,19"
-          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
-    <path android:fillColor="#00000000" android:pathData="M0,29L108,29"
-          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
-    <path android:fillColor="#00000000" android:pathData="M0,39L108,39"
-          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
-    <path android:fillColor="#00000000" android:pathData="M0,49L108,49"
-          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
-    <path android:fillColor="#00000000" android:pathData="M0,59L108,59"
-          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
-    <path android:fillColor="#00000000" android:pathData="M0,69L108,69"
-          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
-    <path android:fillColor="#00000000" android:pathData="M0,79L108,79"
-          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
-    <path android:fillColor="#00000000" android:pathData="M0,89L108,89"
-          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
-    <path android:fillColor="#00000000" android:pathData="M0,99L108,99"
-          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
-    <path android:fillColor="#00000000" android:pathData="M19,29L89,29"
-          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
-    <path android:fillColor="#00000000" android:pathData="M19,39L89,39"
-          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
-    <path android:fillColor="#00000000" android:pathData="M19,49L89,49"
-          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
-    <path android:fillColor="#00000000" android:pathData="M19,59L89,59"
-          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
-    <path android:fillColor="#00000000" android:pathData="M19,69L89,69"
-          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
-    <path android:fillColor="#00000000" android:pathData="M19,79L89,79"
-          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
-    <path android:fillColor="#00000000" android:pathData="M29,19L29,89"
-          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
-    <path android:fillColor="#00000000" android:pathData="M39,19L39,89"
-          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
-    <path android:fillColor="#00000000" android:pathData="M49,19L49,89"
-          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
-    <path android:fillColor="#00000000" android:pathData="M59,19L59,89"
-          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
-    <path android:fillColor="#00000000" android:pathData="M69,19L69,89"
-          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
-    <path android:fillColor="#00000000" android:pathData="M79,19L79,89"
-          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
-</vector>
--- a/app/src/main/res/drawable/ic_launcher_foreground.xml
+++ b/app/src/main/res/drawable/ic_launcher_foreground.xml
@@ -1,17 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="108dp"
-    android:height="108dp"
-    android:viewportWidth="341.33334"
-    android:viewportHeight="341.33334">
-  <group android:translateX="42.666668"
-      android:translateY="42.666668">
-    <path
-        android:pathData="M203,128C203,169.39 169.39,203 128,203C86.61,203 53,169.39 53,128C53,86.61 86.61,53 128,53C169.39,53 203,86.61 203,128Z"
-        android:fillColor="#4fc3f7"
-        android:fillAlpha="1"/>
-    <path
-        android:pathData="M156.12,128C156.12,143.52 143.52,156.13 128,156.13C112.48,156.13 99.88,143.52 99.88,128C99.88,112.48 112.48,99.88 128,99.88C143.52,99.88 156.12,112.48 156.12,128Z"
-        android:fillColor="#1d1d1d"
-        android:fillAlpha="1"/>
-  </group>
-</vector>
--- a/app/src/main/res/drawable/ic_progressbar.xml
+++ b/app/src/main/res/drawable/ic_progressbar.xml
@@ -1,21 +1,22 @@
 <?xml version="1.0" encoding="utf-8"?>
 <vector
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:name="vector"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24">
-    <path
-        android:name="path_1"
-        android:pathData="M 0 12 L 24 12"
-        android:fillColor="#000"
-        android:strokeColor="#b9f6ca"
-        android:strokeWidth="24"/>
-    <path
-        android:name="path"
-        android:pathData="M 0 12 L 24 12"
-        android:fillColor="#000"
-        android:strokeColor="#00c853"
-        android:strokeWidth="24"/>
+xmlns:android="http://schemas.android.com/apk/res/android"
+android:name="vector"
+android:width="24dp"
+android:height="24dp"
+android:viewportWidth="24"
+android:viewportHeight="24"
+android:tintMode="multiply">
+<path
+    android:name="path_1"
+    android:pathData="M 0 12 L 24 12"
+    android:fillColor="#000"
+    android:strokeColor="#b9f6ca"
+    android:strokeWidth="24"/>
+<path
+    android:name="path"
+    android:pathData="M 0 12 L 24 12"
+    android:fillColor="#000"
+    android:strokeColor="#00c853"
+    android:strokeWidth="24"/>
 </vector>
--- a/app/src/main/res/drawable/ic_progressbar_complete.xml
+++ b/app/src/main/res/drawable/ic_progressbar_complete.xml
@@ -0,0 +1,38 @@
+<animated-vector xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    xmlns:aapt="http://schemas.android.com/aapt"
+    tools:ignore="NewApi">
+    <aapt:attr name="android:drawable">
+        <vector
+            android:name="vector"
+            android:width="24dp"
+            android:height="24dp"
+            android:viewportWidth="24"
+            android:viewportHeight="24"
+            android:tintMode="multiply">
+            <path
+                android:name="path_1"
+                android:pathData="M 0 12 L 24 12"
+                android:fillColor="#000"
+                android:strokeColor="#b9f6ca"
+                android:strokeWidth="24"/>
+            <path
+                android:name="path"
+                android:pathData="M 0 12 L 24 12"
+                android:fillColor="#000"
+                android:strokeColor="#00c853"
+                android:strokeWidth="24"/>
+        </vector>
+    </aapt:attr>
+    <target android:name="path">
+        <aapt:attr name="android:animation">
+            <objectAnimator
+                android:propertyName="trimPathEnd"
+                android:duration="1000"
+                android:valueFrom="0"
+                android:valueTo="1"
+                android:valueType="floatType"
+                android:interpolator="@android:interpolator/fast_out_slow_in"/>
+        </aapt:attr>
+    </target>
+</animated-vector>
--- a/app/src/main/res/drawable/numeric.xml
+++ b/app/src/main/res/drawable/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>
--- a/app/src/main/res/layout/activity_lock.xml
+++ b/app/src/main/res/layout/activity_lock.xml
@@ -27,7 +27,7 @@
            android:id="@+id/lock_pattern"
            android:layout_width="wrap_content"
            android:layout_height="wrap_content"
-            android:src="@drawable/lock_pattern"
+            app:srcCompat="@drawable/lock_pattern"
            app:backgroundTint="@color/colorPrimary"
            app:fabSize="mini"/>

@@ -35,7 +35,7 @@
            android:id="@+id/lock_pin"
            android:layout_width="wrap_content"
            android:layout_height="wrap_content"
-            android:src="@drawable/numeric"
+            app:srcCompat="@drawable/numeric"
            android:layout_marginLeft="8dp"
            android:layout_marginRight="8dp"
            app:backgroundTint="@color/dark_gray"
@@ -45,7 +45,7 @@
            android:id="@+id/lock_fingerprint"
            android:layout_width="wrap_content"
            android:layout_height="wrap_content"
-            android:src="@drawable/fingerprint"
+            app:srcCompat="@drawable/fingerprint"
            android:layout_marginLeft="8dp"
            android:layout_marginRight="8dp"
            app:backgroundTint="@color/dark_gray"
@@ -55,7 +55,7 @@
            android:id="@+id/lock_password"
            android:layout_width="wrap_content"
            android:layout_height="wrap_content"
-            android:src="@drawable/lastpass"
+            app:srcCompat="@drawable/lastpass"
            app:backgroundTint="@color/dark_gray"
            app:fabSize="mini"/>

--- a/app/src/main/res/layout/activity_reader.xml
+++ b/app/src/main/res/layout/activity_reader.xml
@@ -55,7 +55,7 @@
            android:id="@+id/reader_fab_download"
            android:layout_width="wrap_content"
            android:layout_height="wrap_content"
-            android:src="@drawable/ic_downloading"
+            app:srcCompat="@drawable/ic_downloading"
            app:fab_label="@string/reader_fab_download"
            app:fab_size="mini"/>

@@ -63,7 +63,7 @@
            android:id="@+id/reader_fab_fullscreen"
            android:layout_width="wrap_content"
            android:layout_height="wrap_content"
-            android:src="@drawable/ic_fullscreen"
+            app:srcCompat="@drawable/ic_fullscreen"
            app:fab_label="@string/reader_fab_fullscreen"
            app:fab_size="mini"/>

--- a/app/src/main/res/layout/item_galleryblock.xml
+++ b/app/src/main/res/layout/item_galleryblock.xml
@@ -158,15 +158,13 @@
 				android:layout_height="1dp"
 				android:layout_weight="1"/>

-			<ToggleButton
+			<ImageView
 				android:id="@+id/galleryblock_favorite"
+				android:contentDescription="@string/app_name"
 				android:layout_width="32dp"
 				android:layout_height="32dp"
-				android:background="@drawable/avd_star"
-				android:backgroundTint="@color/material_orange_500"
-				android:text=""
-				android:textOn=""
-				android:textOff=""/>
+				app:srcCompat="@drawable/ic_star_empty"
+				app:backgroundTint="@color/material_orange_500"/>

 		</LinearLayout>

--- a/app/src/main/res/layout/item_next.xml
+++ b/app/src/main/res/layout/item_next.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
    android:layout_width="match_parent"
    android:layout_height="wrap_content"
    android:orientation="horizontal"
@@ -16,7 +17,7 @@
        android:layout_width="0dp"
        android:layout_height="match_parent"
        android:layout_weight="1"
-        android:src="@drawable/ic_navigate_next_black_24dp"
+        app:srcCompat="@drawable/ic_navigate_next_black_24dp"
        android:tint="@color/colorAccent"
        android:rotation="180"/>

--- a/app/src/main/res/layout/item_prev.xml
+++ b/app/src/main/res/layout/item_prev.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
    android:layout_width="match_parent"
    android:layout_height="wrap_content"
    android:orientation="horizontal"
@@ -16,7 +17,7 @@
        android:layout_width="0dp"
        android:layout_height="match_parent"
        android:layout_weight="1"
-        android:src="@drawable/ic_navigate_next_black_24dp"
+        app:srcCompat="@drawable/ic_navigate_next_black_24dp"
        android:tint="@color/colorAccent"
        android:rotation="180"/>

--- a/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
+++ b/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
-    <background android:drawable="@color/ic_launcher_background"/>
-    <foreground android:drawable="@drawable/ic_launcher_foreground"/>
-</adaptive-icon>
--- a/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml
+++ b/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
-    <background android:drawable="@color/ic_launcher_background"/>
-    <foreground android:drawable="@drawable/ic_launcher_foreground"/>
-</adaptive-icon>
--- a/app/src/main/res/values-ja/strings.xml
+++ b/app/src/main/res/values-ja/strings.xml
@@ -7,7 +7,7 @@
    <string name="main_search">検索</string>
    <string name="search_hint">ギャラリー検索</string>
    <string name="search_hint_with_page">ギャラリー検索</string>
-    <string name="settings_clear_image_cache">イメージキャッシュクリア</string>
+    <string name="settings_clear_cache">キャッシュクリア</string>
    <string name="settings_clear_cache_alert_message">キャッシュをクリアするとイメージのロード速度に影響を与えます。実行しますか？</string>
    <string name="settings_clear_summary">サイズ: %1$d%2$s</string>
    <string name="settings_default_query">デフォルトキーワード</string>
--- a/app/src/main/res/values-ko/strings.xml
+++ b/app/src/main/res/values-ko/strings.xml
@@ -6,7 +6,7 @@
    <string name="search_hint">갤러리 검색</string>
    <string name="search_hint_with_page">갤러리 검색</string>
    <string name="settings_default_query">기본 검색어</string>
-    <string name="settings_clear_image_cache">이미지 캐시 정리하기</string>
+    <string name="settings_clear_cache">캐시 정리하기</string>
    <string name="settings_clear_cache_alert_message">캐시를 정리하면 이미지 로딩속도가 느려질 수 있습니다. 계속하시겠습니까?</string>
    <string name="settings_clear_summary">사용량: %1$d%2$s</string>
    <string name="settings_galleries_per_page">한 번에 로드할 갤러리 수</string>
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -85,7 +85,7 @@
    <string name="settings_galleries_per_page">Galleries per page</string>
    <string name="settings_default_query">Default query</string>
    <string name="settings_storage">Storage</string>
-    <string name="settings_clear_image_cache">Clear image cache</string>
+    <string name="settings_clear_cache">Clear cache</string>
    <string name="settings_clear_cache_alert_message">Deleting cache can affect image loading speed. Do you want to continue?</string>
    <string name="settings_clear_summary">Currently using %1$d%2$s</string>
    <string name="settings_clear_downloads">Clear downloads</string>
--- a/app/src/main/res/xml/root_preferences.xml
+++ b/app/src/main/res/xml/root_preferences.xml
@@ -29,7 +29,7 @@
        app:title="@string/settings_storage">

        <Preference
-            app:title="Clear cache"
+            app:title="@string/settings_clear_cache"
            app:key="delete_cache"/>

        <Preference
--- a/libpupil/src/main/java/xyz/quaver/hitomi/galleryblock.kt
+++ b/libpupil/src/main/java/xyz/quaver/hitomi/galleryblock.kt
@@ -2,6 +2,7 @@ package xyz.quaver.hitomi

 import kotlinx.serialization.Serializable
 import org.jsoup.Jsoup
+import sun.rmi.runtime.Log
 import java.net.URL
 import java.net.URLDecoder
 import java.nio.ByteBuffer