Fixed bug for older devices

Hoping that the viewer crashing bug is fixed
Version 2.11

app/build.gradle

@@ -12,10 +12,11 @@ android {
         applicationId "xyz.quaver.pupil"
         minSdkVersion 16
         targetSdkVersion 29
-        versionCode 17
+        versionCode 19
-        versionName "2.10-alpha"
+        versionName "2.11"
         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 'com.andrognito.patternlockview:patternlockview:1.0.0'
-    implementation 'androidx.lifecycle:lifecycle-extensions:2.0.0'
+    implementation "ru.noties.markwon:core:${markwonVersion}"
-    implementation 'androidx.lifecycle:lifecycle-viewmodel-ktx:2.0.0'
     testImplementation 'junit:junit:4.12'
     androidTestImplementation 'androidx.test.ext:junit:1.1.1'
     androidTestImplementation 'androidx.test:rules:1.2.0'

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":18,"versionName":"2.10.1","enabled":true,"outputFile":"app-release.apk","fullName":"release","baseName":"release"},"path":"app-release.apk","properties":{}}]

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

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"

app/src/main/java/xyz/quaver/pupil/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()
     }
 
 }

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 {
+                    setImageResource(if (favorites.contains(galleryBlock.id)) R.drawable.ic_star_filled else R.drawable.ic_star_empty)
-                        isChecked = favorites.contains(galleryBlock.id)
-                    }
                     setOnClickListener {
                         when {
-                            isChecked -> favorites.add(galleryBlock.id)
+                            favorites.contains(galleryBlock.id) -> {
-                            else -> favorites.remove(galleryBlock.id)
+                                favorites.remove(galleryBlock.id)
-                        }
+
-                    }
+                                setImageResource(R.drawable.ic_star_empty)
-                    setOnCheckedChangeListener { _, isChecked ->
+                            }
-                        when {
+                            else -> {
-                            isChecked -> (background as Animatable).start()
+                                favorites.add(galleryBlock.id)
-                            else -> background = AnimatedVectorDrawableCompat.create(context, R.drawable.avd_star)
+
+                                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()
+                                })
+                            }
                         }
                     }
                 }

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,19 +25,49 @@ 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 /
+            val (reqWidth, reqHeight) = context.resources.displayMetrics.let {
-                    context.resources.displayMetrics.widthPixels
+                Pair(it.widthPixels, it.heightPixels)
+            }
+
+            options.inSampleSize = calculateInSampleSize(options, reqWidth, reqHeight)
+
+            options.inPreferredConfig = Bitmap.Config.RGB_565
 
             options.inJustDecodeBounds = false
 
             val image = BitmapFactory.decodeFile(images[position], options)
 
+            Log.d("Pupil", image.byteCount.toString())
+            Log.d("Pupil", "${image.width}x${image.height}")
+            Log.d("Pupil", "deviceWidth ${context.resources.displayMetrics.widthPixels}")
+
             setImageBitmap(image)
         }
     }

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

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

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

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)
 

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)

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")
 }

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>

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"
+xmlns:android="http://schemas.android.com/apk/res/android"
-    android:name="vector"
+android:name="vector"
-    android:width="24dp"
+android:width="24dp"
-    android:height="24dp"
+android:height="24dp"
-    android:viewportWidth="24"
+android:viewportWidth="24"
-    android:viewportHeight="24">
+android:viewportHeight="24"
-    <path
+android:tintMode="multiply">
-        android:name="path_1"
+<path
-        android:pathData="M 0 12 L 24 12"
+    android:name="path_1"
-        android:fillColor="#000"
+    android:pathData="M 0 12 L 24 12"
-        android:strokeColor="#b9f6ca"
+    android:fillColor="#000"
-        android:strokeWidth="24"/>
+    android:strokeColor="#b9f6ca"
-    <path
+    android:strokeWidth="24"/>
-        android:name="path"
+<path
-        android:pathData="M 0 12 L 24 12"
+    android:name="path"
-        android:fillColor="#000"
+    android:pathData="M 0 12 L 24 12"
-        android:strokeColor="#00c853"
+    android:fillColor="#000"
-        android:strokeWidth="24"/>
+    android:strokeColor="#00c853"
+    android:strokeWidth="24"/>
 </vector>

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>

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>

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"/>
 

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"/>
 

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"
+				app:srcCompat="@drawable/ic_star_empty"
-				android:backgroundTint="@color/material_orange_500"
+				app:backgroundTint="@color/material_orange_500"/>
-				android:text=""
-				android:textOn=""
-				android:textOff=""/>
 
 		</LinearLayout>
 

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"/>
 

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"/>
 

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>

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>

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>

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

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