Merge pull request #93 from tom5079/dev

Version 4.18.1

app/build.gradle

@@ -7,7 +7,7 @@ apply plugin: 'kotlinx-serialization'
 if (file("google-services.json").exists() && file("src/debug/google-services.json").exists()) {
     logger.lifecycle("Firebase Enabled")
     apply plugin: 'com.google.gms.google-services'
-    apply plugin: 'io.fabric'
+    apply plugin: 'com.google.firebase.crashlytics'
     apply plugin: 'com.google.firebase.firebase-perf'
 } else {
     logger.lifecycle("Firebase Disabled")
@@ -19,8 +19,8 @@ android {
         applicationId "xyz.quaver.pupil"
         minSdkVersion 16
         targetSdkVersion 29
-        versionCode 51
+        versionCode 54
-        versionName "4.15"
+        versionName "4.18.1"
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         multiDexEnabled true
         vectorDrawables.useSupportLibrary = true
@@ -50,25 +50,25 @@ android {
 }
 
 dependencies {
-    def markwonVersion = "3.0.1"
+    def markwonVersion = '3.1.0'
 
-    implementation fileTree(dir: 'libs', include: ['*.jar'])
+    implementation fileTree(dir: 'libs', include: ['*.jar', '*.aar'])
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version"
-    implementation "org.jetbrains.kotlin:kotlin-reflect:$kotlin_version"
+    implementation "org.jetbrains.kotlinx:kotlinx-coroutines-core:1.3.7"
-    implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-core:1.3.3'
+    implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:1.3.7"
-    implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-android:1.3.3'
+    implementation "org.jetbrains.kotlinx:kotlinx-serialization-runtime:0.20.0"
-    implementation "org.jetbrains.kotlinx:kotlinx-serialization-runtime:0.14.0"
     implementation 'androidx.appcompat:appcompat:1.1.0'
     implementation 'androidx.constraintlayout:constraintlayout:1.1.3'
-    implementation 'androidx.preference:preference:1.1.0'
+    implementation 'androidx.preference:preference:1.1.1'
     implementation 'androidx.gridlayout:gridlayout:1.0.0'
     implementation "androidx.biometric:biometric:1.0.1"
     implementation 'androidx.multidex:multidex:2.0.1'
     implementation "com.daimajia.swipelayout:library:1.2.0@aar"
-    implementation 'com.google.android.material:material:1.2.0-alpha05'
+    implementation 'com.google.android.material:material:1.3.0-alpha01'
-    implementation 'com.google.firebase:firebase-core:17.2.3'
+    implementation 'com.google.firebase:firebase-core:17.4.3'
-    implementation 'com.google.firebase:firebase-perf:19.0.5'
+    implementation 'com.google.firebase:firebase-analytics:17.4.3'
-    implementation 'com.crashlytics.sdk.android:crashlytics:2.10.1'
+    implementation 'com.google.firebase:firebase-crashlytics:17.1.0'
+    implementation 'com.google.firebase:firebase-perf:19.0.7'
     implementation 'com.github.arimorty:floatingsearchview:2.1.1'
     implementation 'com.github.clans:fab:1.6.4'
     implementation 'com.github.bumptech.glide:glide:4.11.0'
@@ -80,6 +80,7 @@ dependencies {
     implementation 'net.rdrei.android.dirchooser:library:3.2@aar'
     implementation 'com.github.chrisbanes:PhotoView:2.3.0'
     implementation 'com.andrognito.patternlockview:patternlockview:1.0.0'
+    //implementation 'com.andrognito.pinlockview:pinlockview:2.1.0'
     implementation "ru.noties.markwon:core:${markwonVersion}"
     testImplementation 'junit:junit:4.13'
     androidTestImplementation 'androidx.test.ext:junit:1.1.1'

app/proguard-rules.pro

@@ -33,3 +33,6 @@
 -keep class com.bumptech.glide.load.data.ParcelFileDescriptorRewinder$InternalRewinder {
   *** rewind();
 }
+
+-keep public class * extends com.bumptech.glide.module.AppGlideModule
+-keep class com.bumptech.glide.GeneratedAppGlideModuleImpl

app/release/output.json

@@ -1 +1,20 @@
-[{"outputType":{"type":"APK"},"apkData":{"type":"MAIN","splits":[],"versionCode":51,"versionName":"4.15","enabled":true,"outputFile":"app-release.apk","fullName":"release","baseName":"release","dirName":""},"path":"app-release.apk","properties":{}}]
+{
+  "version": 1,
+  "artifactType": {
+    "type": "APK",
+    "kind": "Directory"
+  },
+  "applicationId": "xyz.quaver.pupil",
+  "variantName": "release",
+  "elements": [
+    {
+      "type": "SINGLE",
+      "filters": [],
+      "properties": [],
+      "versionCode": 54,
+      "versionName": "54",
+      "enabled": true,
+      "outputFile": "app-release.apk"
+    }
+  ]
+}

app/src/main/AndroidManifest.xml

@@ -53,6 +53,61 @@
                 <category android:name="android.intent.category.DEFAULT" />
                 <category android:name="android.intent.category.BROWSABLE" />
 
+                <data
+                    android:host="hitomi.la"
+                    android:pathPrefix="/galleries"
+                    android:scheme="http" />
+            </intent-filter>
+            <intent-filter>
+                <action android:name="android.intent.action.VIEW" />
+
+                <category android:name="android.intent.category.DEFAULT" />
+                <category android:name="android.intent.category.BROWSABLE" />
+
+                <data
+                    android:host="hitomi.la"
+                    android:pathPrefix="/manga"
+                    android:scheme="http" />
+            </intent-filter>
+            <intent-filter>
+                <action android:name="android.intent.action.VIEW" />
+
+                <category android:name="android.intent.category.DEFAULT" />
+                <category android:name="android.intent.category.BROWSABLE" />
+
+                <data
+                    android:host="hitomi.la"
+                    android:pathPrefix="/doujinshi"
+                    android:scheme="http" />
+            </intent-filter>
+            <intent-filter>
+                <action android:name="android.intent.action.VIEW" />
+
+                <category android:name="android.intent.category.DEFAULT" />
+                <category android:name="android.intent.category.BROWSABLE" />
+
+                <data
+                    android:host="hitomi.la"
+                    android:pathPrefix="/cg"
+                    android:scheme="http" />
+            </intent-filter>
+            <intent-filter>
+                <action android:name="android.intent.action.VIEW" />
+
+                <category android:name="android.intent.category.DEFAULT" />
+                <category android:name="android.intent.category.BROWSABLE" />
+
+                <data
+                    android:host="hitomi.la"
+                    android:pathPrefix="/reader"
+                    android:scheme="http" />
+            </intent-filter>
+            <intent-filter>
+                <action android:name="android.intent.action.VIEW" />
+
+                <category android:name="android.intent.category.DEFAULT" />
+                <category android:name="android.intent.category.BROWSABLE" />
+
                 <data
                     android:host="hitomi.la"
                     android:pathPrefix="/galleries"
@@ -64,6 +119,61 @@
                 <category android:name="android.intent.category.DEFAULT" />
                 <category android:name="android.intent.category.BROWSABLE" />
 
+                <data
+                    android:host="hitomi.la"
+                    android:pathPrefix="/manga"
+                    android:scheme="https" />
+            </intent-filter>
+            <intent-filter>
+                <action android:name="android.intent.action.VIEW" />
+
+                <category android:name="android.intent.category.DEFAULT" />
+                <category android:name="android.intent.category.BROWSABLE" />
+
+                <data
+                    android:host="hitomi.la"
+                    android:pathPrefix="/doujinshi"
+                    android:scheme="https" />
+            </intent-filter>
+            <intent-filter>
+                <action android:name="android.intent.action.VIEW" />
+
+                <category android:name="android.intent.category.DEFAULT" />
+                <category android:name="android.intent.category.BROWSABLE" />
+
+                <data
+                    android:host="hitomi.la"
+                    android:pathPrefix="/cg"
+                    android:scheme="https" />
+            </intent-filter>
+            <intent-filter>
+                <action android:name="android.intent.action.VIEW" />
+
+                <category android:name="android.intent.category.DEFAULT" />
+                <category android:name="android.intent.category.BROWSABLE" />
+
+                <data
+                    android:host="hitomi.la"
+                    android:pathPrefix="/reader"
+                    android:scheme="https" />
+            </intent-filter>
+            <intent-filter>
+                <action android:name="android.intent.action.VIEW" />
+
+                <category android:name="android.intent.category.DEFAULT" />
+                <category android:name="android.intent.category.BROWSABLE" />
+
+                <data
+                    android:host="hiyobi.me"
+                    android:scheme="http"
+                    android:pathPrefix="/reader" />
+            </intent-filter>
+            <intent-filter>
+                <action android:name="android.intent.action.VIEW" />
+
+                <category android:name="android.intent.category.DEFAULT" />
+                <category android:name="android.intent.category.BROWSABLE" />
+
                 <data
                     android:host="hiyobi.me"
                     android:pathPrefix="/reader"
@@ -78,17 +188,6 @@
                 <data
                     android:host="e-hentai.org"
                     android:pathPrefix="/g"
-                    android:scheme="https" />
-            </intent-filter>
-            <intent-filter>
-                <action android:name="android.intent.action.VIEW" />
-
-                <category android:name="android.intent.category.DEFAULT" />
-                <category android:name="android.intent.category.BROWSABLE" />
-
-                <data
-                    android:host="hitomi.la"
-                    android:pathPrefix="/galleries"
                     android:scheme="http" />
             </intent-filter>
             <intent-filter>
@@ -97,21 +196,10 @@
                 <category android:name="android.intent.category.DEFAULT" />
                 <category android:name="android.intent.category.BROWSABLE" />
 
-                <data
-                    android:host="hiyobi.me"
-                    android:scheme="http"
-                    android:pathPrefix="/reader" />
-            </intent-filter>
-            <intent-filter>
-                <action android:name="android.intent.action.VIEW" />
-
-                <category android:name="android.intent.category.DEFAULT" />
-                <category android:name="android.intent.category.BROWSABLE" />
-
                 <data
                     android:host="e-hentai.org"
                     android:pathPrefix="/g"
-                    android:scheme="http" />
+                    android:scheme="https" />
             </intent-filter>
         </activity>
         <activity

app/src/main/java/com/arlib/floatingsearchview/FloatingSearchViewDayNight.kt

@@ -0,0 +1,35 @@
+/*
+ *     Pupil, Hitomi.la viewer for Android
+ *     Copyright (C) 2020  tom5079
+ *
+ *     This program is free software: you can redistribute it and/or modify
+ *     it under the terms of the GNU General Public License as published by
+ *     the Free Software Foundation, either version 3 of the License, or
+ *     (at your option) any later version.
+ *
+ *     This program is distributed in the hope that it will be useful,
+ *     but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *     GNU General Public License for more details.
+ *
+ *     You should have received a copy of the GNU General Public License
+ *     along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.arlib.floatingsearchview
+
+import android.content.Context
+import android.os.Parcelable
+import android.util.AttributeSet
+
+class FloatingSearchViewDayNight @JvmOverloads constructor(
+    context: Context,
+    attrs: AttributeSet? = null)
+    : FloatingSearchView(context, attrs) {
+
+    // hack to remove color attributes which should not be reused
+    override fun onSaveInstanceState(): Parcelable? {
+        super.onSaveInstanceState()
+        return null
+    }
+}

app/src/main/java/xyz/quaver/pupil/Pupil.kt

@@ -31,10 +31,12 @@ import com.google.android.gms.common.GooglePlayServicesNotAvailableException
 import com.google.android.gms.common.GooglePlayServicesRepairableException
 import com.google.android.gms.security.ProviderInstaller
 import com.google.firebase.analytics.FirebaseAnalytics
+import com.google.firebase.crashlytics.FirebaseCrashlytics
 import xyz.quaver.proxy
 import xyz.quaver.pupil.util.Histories
 import xyz.quaver.pupil.util.getProxy
 import java.io.File
+import java.util.*
 
 class Pupil : MultiDexApplication() {
 
@@ -48,6 +50,16 @@ class Pupil : MultiDexApplication() {
     override fun onCreate() {
         val preference = PreferenceManager.getDefaultSharedPreferences(this)
 
+        val userID =
+            if (preference.getString("user_id", "").isNullOrEmpty()) {
+                UUID.randomUUID().toString().also {
+                    preference.edit().putString("user_id", it).apply()
+                }
+            } else
+                preference.getString("user_id", "") ?: ""
+
+        FirebaseCrashlytics.getInstance().setUserId(userID)
+
         proxy = getProxy(this)
 
         try {
@@ -59,6 +71,13 @@ class Pupil : MultiDexApplication() {
             preference.edit().remove("dl_location").apply()
         }
 
+        if (!preference.getBoolean("low_quality_reset", false)) {
+            preference.edit()
+                .putBoolean("low_quality", true)
+                .putBoolean("low_quality_reset", true)
+                .apply()
+        }
+
         histories = Histories(File(ContextCompat.getDataDir(this), "histories.json"))
         favorites = Histories(File(ContextCompat.getDataDir(this), "favorites.json"))
 

app/src/main/java/xyz/quaver/pupil/adapters/GalleryBlockAdapter.kt

@@ -28,6 +28,7 @@ import android.view.ViewGroup
 import android.widget.LinearLayout
 import androidx.cardview.widget.CardView
 import androidx.core.content.ContextCompat
+import androidx.preference.PreferenceManager
 import androidx.recyclerview.widget.RecyclerView
 import androidx.swiperefreshlayout.widget.CircularProgressDrawable
 import androidx.vectordrawable.graphics.drawable.Animatable2Compat
@@ -42,7 +43,9 @@ import kotlinx.android.synthetic.main.item_galleryblock.view.*
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
+import kotlinx.coroutines.withContext
 import xyz.quaver.hitomi.GalleryBlock
+import xyz.quaver.hitomi.getReader
 import xyz.quaver.pupil.BuildConfig
 import xyz.quaver.pupil.Pupil
 import xyz.quaver.pupil.R
@@ -75,7 +78,7 @@ class GalleryBlockAdapter(private val glide: RequestManager, private val galleri
             val reader = Cache(context).getReaderOrNull(galleryID)
 
             CoroutineScope(Dispatchers.Main).launch {
-                if (reader == null) {
+                if (reader == null || PreferenceManager.getDefaultSharedPreferences(context).getBoolean("cache_disable", false)) {
                     view.galleryblock_progressbar.visibility = View.GONE
                     view.galleryblock_progress_complete.visibility = View.GONE
                     return@launch
@@ -218,12 +221,12 @@ class GalleryBlockAdapter(private val glide: RequestManager, private val galleri
                             "male" -> {
                                 setChipBackgroundColorResource(R.color.material_blue_700)
                                 setTextColor(ContextCompat.getColor(context, android.R.color.white))
-                                ContextCompat.getDrawable(context, R.drawable.ic_gender_male_white)
+                                ContextCompat.getDrawable(context, R.drawable.gender_male)
                             }
                             "female" -> {
                                 setChipBackgroundColorResource(R.color.material_pink_600)
                                 setTextColor(ContextCompat.getColor(context, android.R.color.white))
-                                ContextCompat.getDrawable(context, R.drawable.ic_gender_female_white)
+                                ContextCompat.getDrawable(context, R.drawable.gender_female)
                             }
                             else -> null
                         }
@@ -237,6 +240,15 @@ class GalleryBlockAdapter(private val glide: RequestManager, private val galleri
                 }
 
                 galleryblock_id.text = galleryBlock.id.toString()
+                galleryblock_pagecount.text = "-"
+                CoroutineScope(Dispatchers.IO).launch {
+                    val pageCount = kotlin.runCatching {
+                        getReader(galleryBlock.id).galleryInfo.files.size
+                    }.getOrNull() ?: return@launch
+                    withContext(Dispatchers.Main) {
+                        galleryblock_pagecount.text = context.getString(R.string.galleryblock_pagecount, pageCount)
+                    }
+                }
 
                 if (!::favorites.isInitialized)
                     favorites = (context.applicationContext as Pupil).favorites

app/src/main/java/xyz/quaver/pupil/adapters/MirrorAdapter.kt

@@ -18,6 +18,7 @@
 
 package xyz.quaver.pupil.adapters
 
+import android.annotation.SuppressLint
 import android.content.Context
 import android.view.LayoutInflater
 import android.view.MotionEvent
@@ -60,6 +61,7 @@ class MirrorAdapter(context: Context) : RecyclerView.Adapter<MirrorAdapter.ViewH
     var onStartDrag : ((ViewHolder) -> Unit)? = null
     var onItemMoved : ((List<String>) -> (Unit))? = null
 
+    @SuppressLint("ClickableViewAccessibility")
     override fun onBindViewHolder(holder: ViewHolder, position: Int) {
         with(holder.view) {
             mirror_name.text = mirrors[list.elementAt(position)]

app/src/main/java/xyz/quaver/pupil/adapters/ReaderAdapter.kt

@@ -22,16 +22,26 @@ import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
 import androidx.constraintlayout.widget.ConstraintLayout
+import androidx.preference.PreferenceManager
 import androidx.recyclerview.widget.RecyclerView
 import com.bumptech.glide.RequestManager
 import com.bumptech.glide.load.engine.DiskCacheStrategy
-import com.crashlytics.android.Crashlytics
+import com.bumptech.glide.load.model.GlideUrl
-import io.fabric.sdk.android.Fabric
+import com.bumptech.glide.load.model.LazyHeaders
+import com.google.android.material.snackbar.Snackbar
+import com.google.firebase.crashlytics.FirebaseCrashlytics
+import kotlinx.android.synthetic.main.activity_reader.view.*
 import kotlinx.android.synthetic.main.item_reader.view.*
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
+import xyz.quaver.Code
 import xyz.quaver.hitomi.Reader
+import xyz.quaver.hitomi.getReferer
+import xyz.quaver.hitomi.imageUrlFromImage
+import xyz.quaver.hiyobi.cookie
+import xyz.quaver.hiyobi.createImgList
+import xyz.quaver.hiyobi.user_agent
 import xyz.quaver.pupil.R
 import xyz.quaver.pupil.util.download.Cache
 import xyz.quaver.pupil.util.download.DownloadWorker
@@ -51,6 +61,8 @@ class ReaderAdapter(private val glide: RequestManager,
 
     class ViewHolder(val view: View) : RecyclerView.ViewHolder(view)
 
+    var downloadWorker: DownloadWorker? = null
+
     override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): ViewHolder {
         return LayoutInflater.from(parent.context).inflate(
             R.layout.item_reader, parent, false
@@ -62,6 +74,9 @@ class ReaderAdapter(private val glide: RequestManager,
     override fun onBindViewHolder(holder: ViewHolder, position: Int) {
         holder.view as ConstraintLayout
 
+        if (downloadWorker == null)
+            downloadWorker = DownloadWorker.getInstance(holder.view.context)
+
         if (isFullScreen) {
             holder.view.layoutParams.height = RecyclerView.LayoutParams.MATCH_PARENT
             holder.view.container.layoutParams.height = ConstraintLayout.LayoutParams.MATCH_PARENT
@@ -83,15 +98,45 @@ class ReaderAdapter(private val glide: RequestManager,
 
         holder.view.reader_index.text = (position+1).toString()
 
-        val images = Cache(holder.view.context).getImage(galleryID, position)
+        val preferences = PreferenceManager.getDefaultSharedPreferences(holder.view.context)
-        val progress = DownloadWorker.getInstance(holder.view.context).progress[galleryID]?.get(position)
+        if (preferences.getBoolean("cache_disable", false)) {
+            val lowQuality = preferences.getBoolean("low_quality", false)
 
-        if (progress?.isInfinite() == true && images != null) {
+            val url = when (reader!!.code) {
+                Code.HITOMI ->
+                    GlideUrl(
+                        imageUrlFromImage(
+                            galleryID,
+                            reader!!.galleryInfo.files[position],
+                            !lowQuality
+                        )
+                    , LazyHeaders.Builder().addHeader("Referer", getReferer(galleryID)).build())
+                Code.HIYOBI ->
+                    GlideUrl(createImgList(galleryID, reader!!, lowQuality)[position].path, LazyHeaders.Builder()
+                        .addHeader("User-Agent", user_agent)
+                        .addHeader("Cookie", cookie)
+                        .build())
+                else -> null
+            }
+            holder.view.image.post {
+                glide
+                    .load(url!!)
+                    .diskCacheStrategy(DiskCacheStrategy.NONE)
+                    .skipMemoryCache(false)
+                    .fitCenter()
+                    .error(R.drawable.image_broken_variant)
+                    .into(holder.view.image)
+            }
+        } else {
+            val image = Cache(holder.view.context).getImage(galleryID, position)
+            val progress = downloadWorker!!.progress[galleryID]?.get(position)
+
+            if (progress?.isInfinite() == true && image != null) {
                 holder.view.reader_item_progressbar.visibility = View.INVISIBLE
 
                 holder.view.image.post {
                     glide
-                    .load(images)
+                        .load(image)
                         .diskCacheStrategy(DiskCacheStrategy.NONE)
                         .skipMemoryCache(true)
                         .fitCenter()
@@ -105,13 +150,22 @@ class ReaderAdapter(private val glide: RequestManager,
                 glide.clear(holder.view.image)
 
                 if (progress?.isNaN() == true) {
-                if (Fabric.isInitialized())
+                    FirebaseCrashlytics.getInstance().recordException(
-                    Crashlytics.logException(DownloadWorker.getInstance(holder.view.context).exception[galleryID]?.get(position))
+                        DownloadWorker.getInstance(holder.view.context).exception[galleryID]?.get(position)!!
+                    )
 
                     glide
                         .load(R.drawable.image_broken_variant)
                         .into(holder.view.image)
 
+                    Snackbar.make(holder.view.reader_layout, R.string.reader_error_retry, Snackbar.LENGTH_SHORT).apply {
+                        setAction(android.R.string.no) { }
+                        setAction(android.R.string.yes) {
+                            downloadWorker!!.cancel(galleryID)
+                            downloadWorker!!.queue.add(galleryID)
+                        }
+                    }.show()
+
                     return
                 } else {
                     holder.view.reader_item_progressbar.progress =
@@ -130,6 +184,7 @@ class ReaderAdapter(private val glide: RequestManager,
                 }
             }
         }
+    }
 
     override fun getItemCount() = reader?.galleryInfo?.files?.size ?: 0
 

app/src/main/java/xyz/quaver/pupil/ui/LockActivity.kt

@@ -21,62 +21,30 @@ package xyz.quaver.pupil.ui
 import android.app.Activity
 import android.app.AlertDialog
 import android.os.Bundle
+import android.view.animation.Animation
+import android.view.animation.AnimationUtils
 import androidx.appcompat.app.AppCompatActivity
+import androidx.biometric.BiometricManager
+import androidx.biometric.BiometricPrompt
+import androidx.core.content.ContextCompat
+import androidx.preference.PreferenceManager
 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.fragment_pin_lock.*
 import xyz.quaver.pupil.R
+import xyz.quaver.pupil.ui.fragment.PINLockFragment
 import xyz.quaver.pupil.ui.fragment.PatternLockFragment
 import xyz.quaver.pupil.util.Lock
 import xyz.quaver.pupil.util.LockManager
 
 class LockActivity : AppCompatActivity() {
 
-    override fun onCreate(savedInstanceState: Bundle?) {
+    private lateinit var lockManager: LockManager
-        super.onCreate(savedInstanceState)
+    private var mode: String? = null
-        setContentView(R.layout.activity_lock)
 
-        val lockManager = try {
+    private val patternLockFragment = PatternLockFragment().apply {
-            LockManager(this)
-        } catch (e: Exception) {
-            AlertDialog.Builder(this).apply {
-                setTitle(R.string.warning)
-                setMessage(R.string.lock_corrupted)
-                setPositiveButton(android.R.string.ok) { _, _ ->
-                    finish()
-                }
-            }.show()
-            return
-        }
-
-        val mode = intent.getStringExtra("mode")
-
-        lock_pattern.isEnabled = false
-        lock_pin.isEnabled = false
-        lock_fingerprint.isEnabled = false
-        lock_password.isEnabled = false
-
-        when(mode) {
-            null -> {
-                if (lockManager.isEmpty()) {
-                    setResult(RESULT_OK)
-                    finish()
-                    return
-                }
-            }
-            "add_lock" -> {
-                when(intent.getStringExtra("type")!!) {
-                    "pattern" -> {
-
-                    }
-                }
-            }
-        }
-
-        supportFragmentManager.beginTransaction().add(
-            R.id.lock_content,
-            PatternLockFragment().apply {
         var lastPass = ""
         onPatternDrawn = {
             when(mode) {
@@ -109,7 +77,191 @@ class LockActivity : AppCompatActivity() {
             }
         }
     }
+
+    private val pinLockFragment = PINLockFragment().apply {
+        var lastPass = ""
+        onPINEntered = {
+            when(mode) {
+                null -> {
+                    val result = lockManager.check(it)
+
+                    if (result == true) {
+                        setResult(Activity.RESULT_OK)
+                        finish()
+                    } else {
+                        indicator_dots.startAnimation(AnimationUtils.loadAnimation(context, R.anim.shake).apply {
+                            setAnimationListener(object: Animation.AnimationListener {
+                                override fun onAnimationEnd(animation: Animation?) {
+                                    pin_lock_view.resetPinLockView()
+                                    pin_lock_view.isEnabled = true
+                                }
+
+                                override fun onAnimationStart(animation: Animation?) {
+                                    pin_lock_view.isEnabled = false
+                                }
+
+                                override fun onAnimationRepeat(animation: Animation?) {
+                                    // Do Nothing
+                                }
+                            })
+                        })
+                    }
+                }
+                "add_lock" -> {
+                    if (lastPass.isEmpty()) {
+                        lastPass = it
+
+                        pin_lock_view.resetPinLockView()
+                        Snackbar.make(view!!, R.string.settings_lock_confirm, Snackbar.LENGTH_LONG).show()
+                    } else {
+                        if (lastPass == it) {
+                            LockManager(context!!).add(Lock.generate(Lock.Type.PIN, it))
+                            finish()
+                        } else {
+                            indicator_dots.startAnimation(AnimationUtils.loadAnimation(context, R.anim.shake).apply {
+                                setAnimationListener(object: Animation.AnimationListener {
+                                    override fun onAnimationEnd(animation: Animation?) {
+                                        pin_lock_view.resetPinLockView()
+                                        pin_lock_view.isEnabled = true
+                                    }
+
+                                    override fun onAnimationStart(animation: Animation?) {
+                                        pin_lock_view.isEnabled = false
+                                    }
+
+                                    override fun onAnimationRepeat(animation: Animation?) {
+                                        // Do Nothing
+                                    }
+                                })
+                            })
+                            lastPass = ""
+
+                            Snackbar.make(view!!, R.string.settings_lock_wrong_confirm, Snackbar.LENGTH_LONG).show()
+                        }
+                    }
+                }
+            }
+        }
+    }
+
+    private fun showBiometricPrompt() {
+        val promptInfo = BiometricPrompt.PromptInfo.Builder()
+            .setTitle(getText(R.string.settings_lock_fingerprint_prompt))
+            .setSubtitle(getText(R.string.settings_lock_fingerprint_prompt_subtitle))
+            .setNegativeButtonText(getText(android.R.string.cancel))
+            .setConfirmationRequired(false)
+            .build()
+
+        val biometricPrompt = BiometricPrompt(this, ContextCompat.getMainExecutor(this),
+            object : BiometricPrompt.AuthenticationCallback() {
+                override fun onAuthenticationSucceeded(
+                    result: BiometricPrompt.AuthenticationResult) {
+                    super.onAuthenticationSucceeded(result)
+                    setResult(RESULT_OK)
+                    finish()
+                    return
+                }
+            })
+
+        // Displays the "log in" prompt.
+        biometricPrompt.authenticate(promptInfo)
+    }
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        setContentView(R.layout.activity_lock)
+
+        lockManager = try {
+            LockManager(this)
+        } catch (e: Exception) {
+            AlertDialog.Builder(this).apply {
+                setTitle(R.string.warning)
+                setMessage(R.string.lock_corrupted)
+                setPositiveButton(android.R.string.ok) { _, _ ->
+                    finish()
+                }
+            }.show()
+            return
+        }
+
+        mode = intent.getStringExtra("mode")
+
+        when(mode) {
+            null -> {
+                if (lockManager.isEmpty()) {
+                    setResult(RESULT_OK)
+                    finish()
+                    return
+                }
+
+                if (
+                    PreferenceManager.getDefaultSharedPreferences(this).getBoolean("lock_fingerprint", false)
+                    && BiometricManager.from(this).canAuthenticate() == BiometricManager.BIOMETRIC_SUCCESS
+                ) {
+                    lock_fingerprint.apply {
+                        isEnabled = true
+                        setOnClickListener {
+                            showBiometricPrompt()
+                        }
+                    }
+                    showBiometricPrompt()
+                }
+
+                lock_pattern.apply {
+                    isEnabled = lockManager.contains(Lock.Type.PATTERN)
+                    setOnClickListener {
+                        supportFragmentManager.beginTransaction().replace(
+                            R.id.lock_content, patternLockFragment
                         ).commit()
                     }
+                }
+                lock_pin.apply {
+                    isEnabled = lockManager.contains(Lock.Type.PIN)
+                    setOnClickListener {
+                        supportFragmentManager.beginTransaction().replace(
+                            R.id.lock_content, pinLockFragment
+                        ).commit()
+                    }
+                }
+                lock_password.isEnabled = false
+
+                when (lockManager.locks!!.first().type) {
+                    Lock.Type.PIN -> {
+
+                        supportFragmentManager.beginTransaction().add(
+                            R.id.lock_content, pinLockFragment
+                        ).commit()
+                    }
+                    Lock.Type.PATTERN -> {
+                        supportFragmentManager.beginTransaction().add(
+                            R.id.lock_content, patternLockFragment
+                        ).commit()
+                    }
+                    else -> return
+                }
+            }
+            "add_lock" -> {
+                lock_pattern.isEnabled = false
+                lock_pin.isEnabled = false
+                lock_fingerprint.isEnabled = false
+                lock_password.isEnabled = false
+
+                when(intent.getStringExtra("type")!!) {
+                    "pattern" -> {
+                        lock_pattern.isEnabled = true
+                        supportFragmentManager.beginTransaction().add(
+                            R.id.lock_content, patternLockFragment
+                        ).commit()
+                    }
+                    "pin" -> {
+                        lock_pin.isEnabled = true
+                        supportFragmentManager.beginTransaction().add(
+                            R.id.lock_content, pinLockFragment
+                        ).commit()
+                    }
+                }
+            }
+        }
+    }
 
 }

app/src/main/java/xyz/quaver/pupil/ui/MainActivity.kt

@@ -18,6 +18,7 @@
 
 package xyz.quaver.pupil.ui
 
+import android.annotation.SuppressLint
 import android.app.Activity
 import android.content.Intent
 import android.graphics.drawable.Animatable
@@ -30,10 +31,7 @@ import android.view.MotionEvent
 import android.view.View
 import android.view.WindowManager
 import android.view.inputmethod.EditorInfo
-import android.widget.EditText
+import android.widget.*
-import android.widget.ImageView
-import android.widget.LinearLayout
-import android.widget.TextView
 import androidx.appcompat.app.AlertDialog
 import androidx.appcompat.app.AppCompatActivity
 import androidx.cardview.widget.CardView
@@ -43,16 +41,16 @@ import androidx.core.view.GravityCompat
 import androidx.preference.PreferenceManager
 import androidx.vectordrawable.graphics.drawable.AnimatedVectorDrawableCompat
 import com.arlib.floatingsearchview.FloatingSearchView
+import com.arlib.floatingsearchview.FloatingSearchViewDayNight
 import com.arlib.floatingsearchview.suggestions.model.SearchSuggestion
 import com.arlib.floatingsearchview.util.view.SearchInputView
 import com.bumptech.glide.Glide
-import com.crashlytics.android.Crashlytics
 import com.google.android.material.appbar.AppBarLayout
-import io.fabric.sdk.android.Fabric
+import com.google.firebase.crashlytics.FirebaseCrashlytics
 import kotlinx.android.synthetic.main.activity_main.*
 import kotlinx.android.synthetic.main.activity_main_content.*
 import kotlinx.coroutines.*
-import kotlinx.serialization.list
+import kotlinx.serialization.builtins.list
 import xyz.quaver.hitomi.GalleryBlock
 import xyz.quaver.hitomi.doSearch
 import xyz.quaver.hitomi.getGalleryIDsFromNozomi
@@ -367,6 +365,29 @@ class MainActivity : AppCompatActivity() {
             }
         }
 
+        with(main_fab_random) {
+            setImageResource(R.drawable.shuffle_variant)
+            setOnClickListener {
+                runBlocking {
+                    withTimeoutOrNull(100) {
+                        galleryIDs?.await()
+                    }
+                }.let {
+                    if (it?.isEmpty() == false) {
+                        val galleryID = it.random()
+
+                        val intent = Intent(this@MainActivity, ReaderActivity::class.java).apply {
+                            putExtra("galleryID", galleryID)
+                        }
+
+                        startActivity(intent)
+
+                        histories.add(galleryID)
+                    }
+                }
+            }
+        }
+
         with(main_fab_id) {
             setImageResource(R.drawable.numeric)
             setOnClickListener {
@@ -398,6 +419,7 @@ class MainActivity : AppCompatActivity() {
         loadBlocks()
     }
 
+    @SuppressLint("ClickableViewAccessibility")
     private fun setupRecyclerView() {
         with(main_recyclerview) {
             adapter = GalleryBlockAdapter(Glide.with(this@MainActivity), galleries).apply {
@@ -415,7 +437,9 @@ class MainActivity : AppCompatActivity() {
                 onDownloadClickedHandler = { position ->
                     val galleryID = galleries[position].id
                     val worker = DownloadWorker.getInstance(context)
-
+                    if (PreferenceManager.getDefaultSharedPreferences(context).getBoolean("cache_disable", false))
+                        Toast.makeText(context, R.string.settings_download_when_cache_disable_warning, Toast.LENGTH_SHORT).show()
+                    else {
                         if (Cache(context).isDownloading(galleryID))     //download in progress
                             worker.cancel(galleryID)
                         else {
@@ -423,6 +447,7 @@ class MainActivity : AppCompatActivity() {
 
                             worker.queue.add(galleryID)
                         }
+                    }
 
                     closeAllItems()
                 }
@@ -719,7 +744,7 @@ class MainActivity : AppCompatActivity() {
         })
         searchInputView.imeOptions = EditorInfo.IME_FLAG_NO_EXTRACT_UI
 
-        with(main_searchview as FloatingSearchView) {
+        with(main_searchview as FloatingSearchViewDayNight) {
             val favoritesFile = File(ContextCompat.getDataDir(context), "favorites_tags.json")
             val serializer = Tag.serializer().list
 
@@ -822,14 +847,14 @@ class MainActivity : AppCompatActivity() {
                     ResourcesCompat.getDrawable(
                         resources,
                         when(item.n) {
-                            "female" -> R.drawable.ic_gender_female
+                            "female" -> R.drawable.gender_female
-                            "male" -> R.drawable.ic_gender_male
+                            "male" -> R.drawable.gender_male
-                            "language" -> R.drawable.ic_translate
+                            "language" -> R.drawable.translate
-                            "group" -> R.drawable.ic_account_group
+                            "group" -> R.drawable.account_group
-                            "character" -> R.drawable.ic_account_star
+                            "character" -> R.drawable.account_star
-                            "series" -> R.drawable.ic_book_open
+                            "series" -> R.drawable.book_open
-                            "artist" -> R.drawable.ic_brush
+                            "artist" -> R.drawable.brush
-                            else -> R.drawable.ic_tag
+                            else -> R.drawable.tag
                         },
                         null)
                 )
@@ -1035,8 +1060,8 @@ class MainActivity : AppCompatActivity() {
                 }
             } catch (e: Exception) {
 
-                if (Fabric.isInitialized() && e.message != "No result")
+                if (e.message != "No result")
-                    Crashlytics.logException(e)
+                    FirebaseCrashlytics.getInstance().recordException(e)
 
                 withContext(Dispatchers.Main) {
                     main_noresult.visibility = View.VISIBLE

app/src/main/java/xyz/quaver/pupil/ui/ReaderActivity.kt

@@ -23,6 +23,7 @@ import android.graphics.drawable.Animatable
 import android.graphics.drawable.Drawable
 import android.os.Bundle
 import android.view.*
+import android.widget.Toast
 import androidx.appcompat.app.AlertDialog
 import androidx.appcompat.app.AppCompatActivity
 import androidx.core.content.ContextCompat
@@ -33,12 +34,14 @@ import androidx.recyclerview.widget.RecyclerView
 import androidx.vectordrawable.graphics.drawable.Animatable2Compat
 import androidx.vectordrawable.graphics.drawable.AnimatedVectorDrawableCompat
 import com.bumptech.glide.Glide
-import com.crashlytics.android.Crashlytics
 import com.google.android.material.snackbar.Snackbar
-import io.fabric.sdk.android.Fabric
+import com.google.firebase.crashlytics.FirebaseCrashlytics
 import kotlinx.android.synthetic.main.activity_reader.*
 import kotlinx.android.synthetic.main.activity_reader.view.*
 import kotlinx.android.synthetic.main.dialog_numberpicker.view.*
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.launch
 import xyz.quaver.Code
 import xyz.quaver.pupil.Pupil
 import xyz.quaver.pupil.R
@@ -91,8 +94,7 @@ class ReaderActivity : AppCompatActivity() {
 
         handleIntent(intent)
 
-        if (Fabric.isInitialized())
+        FirebaseCrashlytics.getInstance().setCustomKey("GalleryID", galleryID)
-            Crashlytics.setInt("GalleryID", galleryID)
 
         if (galleryID == 0) {
             onBackPressed()
@@ -100,6 +102,35 @@ class ReaderActivity : AppCompatActivity() {
         }
 
         initView()
+        if (PreferenceManager.getDefaultSharedPreferences(this).getBoolean("cache_disable", false)) {
+            reader_download_progressbar.visibility = View.GONE
+            CoroutineScope(Dispatchers.IO).launch {
+                val reader = Cache(this@ReaderActivity).getReader(galleryID)
+
+                launch(Dispatchers.Main) initDownloader@{
+                    if (reader == null) {
+                        Snackbar
+                            .make(reader_layout, R.string.reader_failed_to_find_gallery, Snackbar.LENGTH_INDEFINITE)
+                            .show()
+                        return@initDownloader
+                    }
+
+                    (reader_recyclerview.adapter as ReaderAdapter).apply {
+                        this.reader = reader
+                        notifyDataSetChanged()
+                    }
+                    title = reader.galleryInfo.title ?: ""
+                    menu?.findItem(R.id.reader_menu_page_indicator)?.title = "$currentPage/${reader.galleryInfo.files.size}"
+
+                    menu?.findItem(R.id.reader_type)?.icon = ContextCompat.getDrawable(this@ReaderActivity,
+                        when (reader.code) {
+                            Code.HITOMI -> R.drawable.hitomi
+                            Code.HIYOBI -> R.drawable.ic_hiyobi
+                            else -> android.R.color.transparent
+                        })
+                }
+            }
+        } else
             initDownloader()
     }
 
@@ -113,14 +144,12 @@ class ReaderActivity : AppCompatActivity() {
             val uri = intent.data
             val lastPathSegment = uri?.lastPathSegment
             if (uri != null && lastPathSegment != null) {
-                val nonNumber = Regex("[^-?0-9]+")
-
                 galleryID = when (uri.host) {
-                    "hitomi.la" -> lastPathSegment.replace(nonNumber, "").toInt()
+                    "hitomi.la" ->
-                    "히요비.asia" -> lastPathSegment.toInt()
+                        Regex("([0-9]+).html").find(lastPathSegment)?.groupValues?.get(1)?.toIntOrNull() ?: 0
-                    "xn--9w3b15m8vo.asia" -> lastPathSegment.toInt()
+                    "hiyobi.me" -> lastPathSegment.toInt()
                     "e-hentai.org" -> uri.pathSegments[1].toInt()
-                    else -> return
+                    else -> 0
                 }
             }
         } else {
@@ -325,6 +354,9 @@ class ReaderActivity : AppCompatActivity() {
             animateDownloadFAB(Cache(context).isDownloading(galleryID)) //If download in progress, animate button
 
             setOnClickListener {
+                if (PreferenceManager.getDefaultSharedPreferences(context).getBoolean("cache_disable", false))
+                    Toast.makeText(context, R.string.settings_download_when_cache_disable_warning, Toast.LENGTH_SHORT).show()
+                else {
                     if (Cache(context).isDownloading(galleryID)) {
                         Cache(context).setDownloading(galleryID, false)
 
@@ -335,6 +367,17 @@ class ReaderActivity : AppCompatActivity() {
                     }
                 }
             }
+        }
+
+        with(reader_fab_retry) {
+            setImageResource(R.drawable.refresh)
+            setOnClickListener {
+                DownloadWorker.getInstance(context).let {
+                    it.cancel(galleryID)
+                    it.queue.add(galleryID)
+                }
+            }
+        }
 
         with(reader_fab_fullscreen) {
             setImageResource(R.drawable.ic_fullscreen)

app/src/main/java/xyz/quaver/pupil/ui/SettingsActivity.kt

@@ -30,12 +30,12 @@ import androidx.appcompat.app.AppCompatActivity
 import androidx.preference.PreferenceManager
 import com.google.android.material.snackbar.Snackbar
 import kotlinx.android.synthetic.main.settings_activity.*
-import kotlinx.serialization.list
+import kotlinx.serialization.builtins.list
-import kotlinx.serialization.serializer
+import kotlinx.serialization.builtins.serializer
 import net.rdrei.android.dirchooser.DirectoryChooserActivity
 import xyz.quaver.pupil.Pupil
 import xyz.quaver.pupil.R
-import xyz.quaver.pupil.ui.fragment.LockFragment
+import xyz.quaver.pupil.ui.fragment.LockSettingsFragment
 import xyz.quaver.pupil.ui.fragment.SettingsFragment
 import xyz.quaver.pupil.util.*
 import java.io.File
@@ -84,7 +84,7 @@ class SettingsActivity : AppCompatActivity() {
                 if (resultCode == Activity.RESULT_OK) {
                     supportFragmentManager
                         .beginTransaction()
-                        .replace(R.id.settings, LockFragment())
+                        .replace(R.id.settings, LockSettingsFragment())
                         .addToBackStack("Lock")
                         .commitAllowingStateLoss()
                 }

app/src/main/java/xyz/quaver/pupil/ui/dialog/DefaultQueryDialog.kt

@@ -45,6 +45,7 @@ class DefaultQueryDialog(context : Context) : AlertDialog(context) {
 
     private val excludeBL = "-male:yaoi"
     private val excludeGuro = listOf("-female:guro", "-male:guro")
+    private val excludeLoli = listOf("-female:loli", "-male:shota")
 
     var onPositiveButtonClickListener : ((Tags) -> (Unit))? = null
 
@@ -68,6 +69,11 @@ class DefaultQueryDialog(context : Context) : AlertDialog(context) {
                     newTags.add(tag)
                 }
 
+            if (default_query_dialog_loli_checkbox.isChecked)
+                excludeLoli.forEach { tag ->
+                    newTags.add(tag)
+                }
+
             onPositiveButtonClickListener?.invoke(newTags)
         }
 
@@ -120,6 +126,14 @@ class DefaultQueryDialog(context : Context) : AlertDialog(context) {
                 }
         }
 
+        with(view.default_query_dialog_loli_checkbox) {
+            isChecked = excludeLoli.all { tags.contains(it) }
+            if (excludeLoli.all { tags.contains(it) })
+                excludeLoli.forEach {
+                    tags.remove(it)
+                }
+        }
+
         with(view.default_query_dialog_edittext) {
             setText(tags.toString(), android.widget.TextView.BufferType.EDITABLE)
             addTextChangedListener(object : TextWatcher {

app/src/main/java/xyz/quaver/pupil/ui/dialog/GalleryDialog.kt

@@ -18,7 +18,6 @@
 
 package xyz.quaver.pupil.ui.dialog
 
-import android.app.Activity
 import android.app.Dialog
 import android.content.Context
 import android.content.Intent
@@ -170,12 +169,12 @@ class GalleryDialog(context: Context, private val glide: RequestManager, private
                                     "male" -> {
                                         setChipBackgroundColorResource(R.color.material_blue_700)
                                         setTextColor(ContextCompat.getColor(context, android.R.color.white))
-                                        ContextCompat.getDrawable(context, R.drawable.ic_gender_male_white)
+                                        ContextCompat.getDrawable(context, R.drawable.gender_male)
                                     }
                                     "female" -> {
                                         setChipBackgroundColorResource(R.color.material_pink_600)
                                         setTextColor(ContextCompat.getColor(context, android.R.color.white))
-                                        ContextCompat.getDrawable(context, R.drawable.ic_gender_female_white)
+                                        ContextCompat.getDrawable(context, R.drawable.gender_female)
                                     }
                                     else -> null
                                 }

app/src/main/java/xyz/quaver/pupil/ui/fragment/LockFragment.kt

@@ -1,81 +0,0 @@
-/*
- *     Pupil, Hitomi.la viewer for Android
- *     Copyright (C) 2020  tom5079
- *
- *     This program is free software: you can redistribute it and/or modify
- *     it under the terms of the GNU General Public License as published by
- *     the Free Software Foundation, either version 3 of the License, or
- *     (at your option) any later version.
- *
- *     This program is distributed in the hope that it will be useful,
- *     but WITHOUT ANY WARRANTY; without even the implied warranty of
- *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *     GNU General Public License for more details.
- *
- *     You should have received a copy of the GNU General Public License
- *     along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-package xyz.quaver.pupil.ui.fragment
-
-import android.content.Intent
-import android.os.Bundle
-import androidx.appcompat.app.AlertDialog
-import androidx.preference.Preference
-import androidx.preference.PreferenceFragmentCompat
-import xyz.quaver.pupil.R
-import xyz.quaver.pupil.ui.LockActivity
-import xyz.quaver.pupil.util.Lock
-import xyz.quaver.pupil.util.LockManager
-
-class LockFragment : PreferenceFragmentCompat() {
-
-    override fun onResume() {
-        super.onResume()
-
-        val lockManager = LockManager(context!!)
-
-        findPreference<Preference>("lock_pattern")?.summary =
-            if (lockManager.contains(Lock.Type.PATTERN))
-                getString(R.string.settings_lock_enabled)
-            else
-                ""
-    }
-
-    override fun onCreatePreferences(savedInstanceState: Bundle?, rootKey: String?) {
-        setPreferencesFromResource(R.xml.lock_preferences, rootKey)
-
-        with(findPreference<Preference>("lock_pattern")) {
-            this!!
-
-            if (LockManager(context!!).contains(Lock.Type.PATTERN))
-                summary = getString(R.string.settings_lock_enabled)
-
-            onPreferenceClickListener = Preference.OnPreferenceClickListener {
-                val lockManager = LockManager(context!!)
-
-                if (lockManager.contains(Lock.Type.PATTERN)) {
-                    AlertDialog.Builder(context).apply {
-                        setTitle(R.string.warning)
-                        setMessage(R.string.settings_lock_remove_message)
-
-                        setPositiveButton(android.R.string.yes) { _, _ ->
-                            lockManager.remove(Lock.Type.PATTERN)
-                            onResume()
-                        }
-                        setNegativeButton(android.R.string.no) { _, _ -> }
-                    }.show()
-                } else {
-                    val intent = Intent(context, LockActivity::class.java).apply {
-                        putExtra("mode", "add_lock")
-                        putExtra("type", "pattern")
-                    }
-
-                    startActivity(intent)
-                }
-
-                true
-            }
-        }
-    }
-}

app/src/main/java/xyz/quaver/pupil/ui/fragment/LockSettingsFragment.kt

@@ -0,0 +1,147 @@
+/*
+ *     Pupil, Hitomi.la viewer for Android
+ *     Copyright (C) 2020  tom5079
+ *
+ *     This program is free software: you can redistribute it and/or modify
+ *     it under the terms of the GNU General Public License as published by
+ *     the Free Software Foundation, either version 3 of the License, or
+ *     (at your option) any later version.
+ *
+ *     This program is distributed in the hope that it will be useful,
+ *     but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *     GNU General Public License for more details.
+ *
+ *     You should have received a copy of the GNU General Public License
+ *     along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package xyz.quaver.pupil.ui.fragment
+
+import android.content.Intent
+import android.os.Bundle
+import android.widget.Toast
+import androidx.appcompat.app.AlertDialog
+import androidx.preference.Preference
+import androidx.preference.PreferenceFragmentCompat
+import androidx.preference.PreferenceManager
+import androidx.preference.SwitchPreferenceCompat
+import xyz.quaver.pupil.R
+import xyz.quaver.pupil.ui.LockActivity
+import xyz.quaver.pupil.util.Lock
+import xyz.quaver.pupil.util.LockManager
+
+class LockSettingsFragment :
+    PreferenceFragmentCompat() {
+
+    override fun onResume() {
+        super.onResume()
+
+        val lockManager = LockManager(requireContext())
+
+        findPreference<Preference>("lock_pattern")?.summary =
+            if (lockManager.contains(Lock.Type.PATTERN))
+                getString(R.string.settings_lock_enabled)
+            else
+                ""
+
+        findPreference<Preference>("lock_pin")?.summary =
+            if (lockManager.contains(Lock.Type.PIN))
+                getString(R.string.settings_lock_enabled)
+            else
+                ""
+
+        if (lockManager.isEmpty()) {
+            (findPreference<Preference>("lock_fingerprint") as SwitchPreferenceCompat).isChecked = false
+
+            PreferenceManager.getDefaultSharedPreferences(context).edit().putBoolean("lock_fingerprint", false).apply()
+        }
+    }
+
+    override fun onCreatePreferences(savedInstanceState: Bundle?, rootKey: String?) {
+        setPreferencesFromResource(R.xml.lock_preferences, rootKey)
+
+        with(findPreference<Preference>("lock_pattern")) {
+            this!!
+
+            if (LockManager(requireContext()).contains(Lock.Type.PATTERN))
+                summary = getString(R.string.settings_lock_enabled)
+
+            onPreferenceClickListener = Preference.OnPreferenceClickListener {
+                val lockManager = LockManager(requireContext())
+
+                if (lockManager.contains(Lock.Type.PATTERN)) {
+                    AlertDialog.Builder(requireContext()).apply {
+                        setTitle(R.string.warning)
+                        setMessage(R.string.settings_lock_remove_message)
+
+                        setPositiveButton(android.R.string.yes) { _, _ ->
+                            lockManager.remove(Lock.Type.PATTERN)
+                            onResume()
+                        }
+                        setNegativeButton(android.R.string.no) { _, _ -> }
+                    }.show()
+                } else {
+                    val intent = Intent(requireContext(), LockActivity::class.java).apply {
+                        putExtra("mode", "add_lock")
+                        putExtra("type", "pattern")
+                    }
+
+                    startActivity(intent)
+                }
+
+                true
+            }
+        }
+
+        with(findPreference<Preference>("lock_pin")) {
+            this!!
+
+            if (LockManager(requireContext()).contains(Lock.Type.PIN))
+                summary = getString(R.string.settings_lock_enabled)
+
+            onPreferenceClickListener = Preference.OnPreferenceClickListener {
+                val lockManager = LockManager(requireContext())
+
+                if (lockManager.contains(Lock.Type.PIN)) {
+                    AlertDialog.Builder(requireContext()).apply {
+                        setTitle(R.string.warning)
+                        setMessage(R.string.settings_lock_remove_message)
+
+                        setPositiveButton(android.R.string.yes) { _, _ ->
+                            lockManager.remove(Lock.Type.PIN)
+                            onResume()
+                        }
+                        setNegativeButton(android.R.string.no) { _, _ -> }
+                    }.show()
+                } else {
+                    val intent = Intent(requireContext(), LockActivity::class.java).apply {
+                        putExtra("mode", "add_lock")
+                        putExtra("type", "pin")
+                    }
+
+                    startActivity(intent)
+                }
+
+                true
+            }
+        }
+
+        with(findPreference<Preference>("lock_fingerprint")) {
+            this!!
+
+            setOnPreferenceChangeListener { _, newValue ->
+                this as SwitchPreferenceCompat
+
+                if (newValue == true && LockManager(requireContext()).isEmpty()) {
+                    isChecked = false
+
+                    Toast.makeText(requireContext(), R.string.settings_lock_fingerprint_without_lock, Toast.LENGTH_SHORT).show()
+                } else
+                    isChecked = newValue as Boolean
+
+                false
+            }
+        }
+    }
+}

app/src/main/java/xyz/quaver/pupil/ui/fragment/PINLockFragment.kt

@@ -0,0 +1,53 @@
+/*
+ *     Pupil, Hitomi.la viewer for Android
+ *     Copyright (C) 2020  tom5079
+ *
+ *     This program is free software: you can redistribute it and/or modify
+ *     it under the terms of the GNU General Public License as published by
+ *     the Free Software Foundation, either version 3 of the License, or
+ *     (at your option) any later version.
+ *
+ *     This program is distributed in the hope that it will be useful,
+ *     but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *     GNU General Public License for more details.
+ *
+ *     You should have received a copy of the GNU General Public License
+ *     along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package xyz.quaver.pupil.ui.fragment
+
+import android.os.Bundle
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import androidx.fragment.app.Fragment
+import com.andrognito.pinlockview.PinLockListener
+import kotlinx.android.synthetic.main.fragment_pin_lock.view.*
+import xyz.quaver.pupil.R
+
+class PINLockFragment : Fragment(), PinLockListener {
+
+    var onPINEntered: ((String) -> Unit)? = null
+
+    override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
+        return inflater.inflate(R.layout.fragment_pin_lock, container, false).apply {
+            pin_lock_view.attachIndicatorDots(indicator_dots)
+            pin_lock_view.setPinLockListener(this@PINLockFragment)
+        }
+    }
+
+    override fun onComplete(pin: String?) {
+        onPINEntered?.invoke(pin!!)
+    }
+
+    override fun onEmpty() {
+
+    }
+
+    override fun onPinChange(pinLength: Int, intermediatePin: String?) {
+
+    }
+
+}

app/src/main/java/xyz/quaver/pupil/ui/fragment/SettingsFragment.kt

@@ -19,11 +19,11 @@
 package xyz.quaver.pupil.ui.fragment
 
 import android.Manifest
-import android.content.Intent
+import android.content.*
-import android.content.SharedPreferences
 import android.content.pm.PackageManager
 import android.os.Build
 import android.os.Bundle
+import android.widget.Toast
 import androidx.appcompat.app.AlertDialog
 import androidx.appcompat.app.AppCompatDelegate
 import androidx.core.app.ActivityCompat
@@ -53,16 +53,12 @@ class SettingsFragment :
     Preference.OnPreferenceChangeListener,
     SharedPreferences.OnSharedPreferenceChangeListener {
 
-    override fun onCreate(savedInstanceState: Bundle?) {
+    lateinit var sharedPreference: SharedPreferences
-        super.onCreate(savedInstanceState)
-
-        PreferenceManager.getDefaultSharedPreferences(context).registerOnSharedPreferenceChangeListener(this)
-    }
 
     override fun onResume() {
         super.onResume()
 
-        val lockManager = LockManager(context!!)
+        val lockManager = LockManager(requireContext())
 
         findPreference<Preference>("app_lock")?.summary = if (lockManager.locks.isNullOrEmpty()) {
             getString(R.string.settings_lock_none)
@@ -92,9 +88,9 @@ class SettingsFragment :
                     checkUpdate(activity as SettingsActivity, true)
                 }
                 "delete_cache" -> {
-                    val dir = File(context.cacheDir, "imageCache")
+                    val dir = File(requireContext().cacheDir, "imageCache")
 
-                    AlertDialog.Builder(context).apply {
+                    AlertDialog.Builder(requireContext()).apply {
                         setTitle(R.string.warning)
                         setMessage(R.string.settings_clear_cache_alert_message)
                         setPositiveButton(android.R.string.yes) { _, _ ->
@@ -107,9 +103,9 @@ class SettingsFragment :
                     }.show()
                 }
                 "delete_downloads" -> {
-                    val dir = getDownloadDirectory(context)
+                    val dir = getDownloadDirectory(requireContext())
 
-                    AlertDialog.Builder(context).apply {
+                    AlertDialog.Builder(requireContext()).apply {
                         setTitle(R.string.warning)
                         setMessage(R.string.settings_clear_downloads_alert_message)
                         setPositiveButton(android.R.string.yes) { _, _ ->
@@ -122,9 +118,9 @@ class SettingsFragment :
                     }.show()
                 }
                 "clear_history" -> {
-                    val histories = (context.applicationContext as Pupil).histories
+                    val histories = (requireContext().applicationContext as Pupil).histories
 
-                    AlertDialog.Builder(context).apply {
+                    AlertDialog.Builder(requireContext()).apply {
                         setTitle(R.string.warning)
                         setMessage(R.string.settings_clear_history_alert_message)
                         setPositiveButton(android.R.string.yes) { _, _ ->
@@ -135,10 +131,10 @@ class SettingsFragment :
                     }.show()
                 }
                 "dl_location" -> {
-                    DownloadLocationDialog(activity!!).show()
+                    DownloadLocationDialog(requireActivity()).show()
                 }
                 "default_query" -> {
-                    DefaultQueryDialog(context).apply {
+                    DefaultQueryDialog(requireContext()).apply {
                         onPositiveButtonClickListener = { newTags ->
                             sharedPreferences.edit().putString("default_query", newTags.toString()).apply()
                             summary = newTags.toString()
@@ -146,20 +142,23 @@ class SettingsFragment :
                     }.show()
                 }
                 "app_lock" -> {
-                    val intent = Intent(context, LockActivity::class.java)
+                    val intent = Intent(requireContext(), LockActivity::class.java)
                     activity?.startActivityForResult(intent, REQUEST_LOCK)
                 }
                 "mirrors" -> {
-                    MirrorDialog(context)
+                    MirrorDialog(requireContext())
                         .show()
                 }
                 "proxy" -> {
-                    ProxyDialog(context)
+                    ProxyDialog(requireContext())
                         .show()
                 }
+                "nomedia" -> {
+                    File(getDownloadDirectory(context), ".nomedia").createNewFile()
+                }
                 "backup" -> {
-                    File(ContextCompat.getDataDir(context), "favorites.json").copyTo(
+                    File(ContextCompat.getDataDir(requireContext()), "favorites.json").copyTo(
-                        File(getDownloadDirectory(context), "favorites.json"),
+                        File(getDownloadDirectory(requireContext()), "favorites.json"),
                         true
                     )
 
@@ -177,8 +176,8 @@ class SettingsFragment :
                 "old_import_galleries" -> {
                     if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
 
-                        if (ContextCompat.checkSelfPermission(context, Manifest.permission.WRITE_EXTERNAL_STORAGE) != PackageManager.PERMISSION_GRANTED)
+                        if (ContextCompat.checkSelfPermission(requireContext(), Manifest.permission.WRITE_EXTERNAL_STORAGE) != PackageManager.PERMISSION_GRANTED)
-                            ActivityCompat.requestPermissions(activity!!, arrayOf(Manifest.permission.WRITE_EXTERNAL_STORAGE), REQUEST_WRITE_PERMISSION_AND_SAF)
+                            ActivityCompat.requestPermissions(requireActivity(), arrayOf(Manifest.permission.WRITE_EXTERNAL_STORAGE), REQUEST_WRITE_PERMISSION_AND_SAF)
                         else {
                             val intent = Intent(Intent.ACTION_OPEN_DOCUMENT_TREE).apply {
                                 putExtra("android.content.extra.SHOW_ADVANCED", true)
@@ -192,13 +191,19 @@ class SettingsFragment :
                             .allowNewDirectoryNameModification(true)
                             .build()
 
-                        val intent = Intent(context, DirectoryChooserActivity::class.java).apply {
+                        val intent = Intent(requireContext(), DirectoryChooserActivity::class.java).apply {
                             putExtra(DirectoryChooserActivity.EXTRA_CONFIG, config)
                         }
 
                         activity?.startActivityForResult(intent, REQUEST_IMPORT_OLD_GALLERIES_OLD)
                     }
                 }
+                "user_id" -> {
+                    (context.getSystemService(Context.CLIPBOARD_SERVICE) as ClipboardManager).setPrimaryClip(
+                        ClipData.newPlainText("user_id", sharedPreference.getString("user_id", ""))
+                    )
+                    Toast.makeText(context, R.string.settings_user_id_toast, Toast.LENGTH_SHORT).show()
+                }
                 else -> return false
             }
         }
@@ -232,10 +237,10 @@ class SettingsFragment :
 
             when (key) {
                 "proxy" -> {
-                    summary = getProxyInfo(context).type.name
+                    summary = getProxyInfo(requireContext()).type.name
                 }
                 "dl_location" -> {
-                    summary = getDownloadDirectory(context!!).canonicalPath
+                    summary = getDownloadDirectory(requireContext()).canonicalPath
                 }
             }
         }
@@ -244,6 +249,9 @@ class SettingsFragment :
     override fun onCreatePreferences(savedInstanceState: Bundle?, rootKey: String?) {
         setPreferencesFromResource(R.xml.root_preferences, rootKey)
 
+        sharedPreference = PreferenceManager.getDefaultSharedPreferences(requireContext())
+        sharedPreference.registerOnSharedPreferenceChangeListener(this)
+
         initPreferences()
     }
 
@@ -260,42 +268,42 @@ class SettingsFragment :
 
                     when (key) {
                         "app_version" -> {
-                            val manager = context.packageManager
+                            val manager = requireContext().packageManager
-                            val info = manager.getPackageInfo(context.packageName, 0)
+                            val info = manager.getPackageInfo(requireContext().packageName, 0)
-                            summary = context.getString(R.string.settings_app_version_description, info.versionName)
+                            summary = requireContext().getString(R.string.settings_app_version_description, info.versionName)
 
                             onPreferenceClickListener = this@SettingsFragment
                         }
                         "delete_cache" -> {
-                            val dir = File(context.cacheDir, "imageCache")
+                            val dir = File(requireContext().cacheDir, "imageCache")
                             summary = getDirSize(dir)
 
                             onPreferenceClickListener = this@SettingsFragment
                         }
                         "delete_downloads" -> {
-                            val dir = getDownloadDirectory(context)
+                            val dir = getDownloadDirectory(requireContext())
                             summary = getDirSize(dir)
 
                             onPreferenceClickListener = this@SettingsFragment
                         }
                         "clear_history" -> {
-                            val histories = (activity!!.application as Pupil).histories
+                            val histories = (requireActivity().application as Pupil).histories
                             summary = getString(R.string.settings_clear_history_summary, histories.size)
 
                             onPreferenceClickListener = this@SettingsFragment
                         }
                         "dl_location" -> {
-                            summary = getDownloadDirectory(context).canonicalPath
+                            summary = getDownloadDirectory(requireContext()).canonicalPath
 
                             onPreferenceClickListener = this@SettingsFragment
                         }
                         "default_query" -> {
-                            summary = PreferenceManager.getDefaultSharedPreferences(context).getString("default_query", "") ?: ""
+                            summary = sharedPreference.getString("default_query", "") ?: ""
 
                             onPreferenceClickListener = this@SettingsFragment
                         }
                         "app_lock" -> {
-                            val lockManager = LockManager(context)
+                            val lockManager = LockManager(requireContext())
                             summary =
                                 if (lockManager.locks.isNullOrEmpty()) {
                                     getString(R.string.settings_lock_none)
@@ -315,13 +323,16 @@ class SettingsFragment :
                             onPreferenceClickListener = this@SettingsFragment
                         }
                         "proxy" -> {
-                            summary = getProxyInfo(context).type.name
+                            summary = getProxyInfo(requireContext()).type.name
 
                             onPreferenceClickListener = this@SettingsFragment
                         }
                         "dark_mode" -> {
                             onPreferenceChangeListener = this@SettingsFragment
                         }
+                        "nomedia" -> {
+                            onPreferenceClickListener = this@SettingsFragment
+                        }
                         "backup" -> {
                             onPreferenceClickListener = this@SettingsFragment
                         }
@@ -331,6 +342,10 @@ class SettingsFragment :
                         "old_import_galleries" -> {
                             onPreferenceClickListener = this@SettingsFragment
                         }
+                        "user_id" -> {
+                            summary = sharedPreference.getString("user_id", "")
+                            onPreferenceClickListener = this@SettingsFragment
+                        }
                     }
 
                 }

app/src/main/java/xyz/quaver/pupil/util/download/Cache.kt

@@ -24,9 +24,8 @@ import android.util.Base64
 import android.util.Log
 import android.util.SparseArray
 import androidx.preference.PreferenceManager
-import com.crashlytics.android.Crashlytics
+import com.google.firebase.crashlytics.FirebaseCrashlytics
 import kotlinx.coroutines.*
-import kotlinx.io.InputStream
 import xyz.quaver.Code
 import xyz.quaver.hitomi.GalleryBlock
 import xyz.quaver.hitomi.Reader
@@ -35,10 +34,12 @@ import xyz.quaver.pupil.util.getCachedGallery
 import xyz.quaver.pupil.util.getDownloadDirectory
 import xyz.quaver.pupil.util.isParentOf
 import xyz.quaver.pupil.util.json
+import java.io.BufferedInputStream
 import java.io.File
 import java.io.FileOutputStream
+import java.io.InputStream
 import java.net.URL
-import java.util.concurrent.Executors
+import java.util.*
 import java.util.concurrent.locks.Lock
 import java.util.concurrent.locks.ReentrantLock
 
@@ -46,6 +47,7 @@ class Cache(context: Context) : ContextWrapper(context) {
 
     companion object {
         private val moving = mutableListOf<Int>()
+        private val readers = SparseArray<Reader?>()
     }
 
     private val locks = SparseArray<Lock>()
@@ -67,7 +69,7 @@ class Cache(context: Context) : ContextWrapper(context) {
     // Search in this order
     // Download -> Cache
     fun getCachedGallery(galleryID: Int) = getCachedGallery(this, galleryID).also {
-        if (!it.exists())
+        if (!it.exists() && !preference.getBoolean("cache_disable", false))
             it.mkdirs()
     }
 
@@ -87,6 +89,9 @@ class Cache(context: Context) : ContextWrapper(context) {
     }
 
     fun setCachedMetadata(galleryID: Int, metadata: Metadata) {
+        if (preference.getBoolean("cache_disable", false))
+            return
+
         val file = File(getCachedGallery(galleryID), ".metadata").also {
             if (!it.exists())
                 it.createNewFile()
@@ -98,6 +103,7 @@ class Cache(context: Context) : ContextWrapper(context) {
     suspend fun getThumbnail(galleryID: Int): String? {
         val metadata = Cache(this).getCachedMetadata(galleryID)
 
+        @Suppress("BlockingMethodInNonBlockingContext")
         val thumbnail = if (metadata?.thumbnail == null)
             withContext(Dispatchers.IO) {
                 val thumbnails = getGalleryBlock(galleryID)?.thumbnails
@@ -158,7 +164,7 @@ class Cache(context: Context) : ContextWrapper(context) {
     }
 
     fun getReaderOrNull(galleryID: Int): Reader? {
-        return getCachedMetadata(galleryID)?.reader
+        return readers[galleryID] ?: getCachedMetadata(galleryID)?.reader
     }
 
     suspend fun getReader(galleryID: Int): Reader? {
@@ -179,15 +185,21 @@ class Cache(context: Context) : ContextWrapper(context) {
                 it
         }
 
-        val reader = if (metadata?.reader == null) {
+        val reader =
-            CoroutineScope(Dispatchers.IO).async {
+            if (readers[galleryID] != null)
+                return readers[galleryID]
+            else if (metadata?.reader == null) {
                 var retval: Reader? = null
 
                 for (source in sources) {
                     retval = try {
+                        withContext(Dispatchers.IO) {
+                            withTimeoutOrNull(1000) {
                                     source.value.invoke()
+                            }
+                        }
                     } catch (e: Exception) {
-                        Crashlytics.logException(e)
+                        FirebaseCrashlytics.getInstance().recordException(e)
                         null
                     }
 
@@ -196,10 +208,11 @@ class Cache(context: Context) : ContextWrapper(context) {
                 }
 
                 retval
-            }.await() ?: return null
             } else
                 metadata.reader
 
+        readers.put(galleryID, reader)
+
         setCachedMetadata(
             galleryID,
             Metadata(Cache(this).getCachedMetadata(galleryID), readers = reader)
@@ -240,17 +253,29 @@ class Cache(context: Context) : ContextWrapper(context) {
 
 
     fun putImage(galleryID: Int, index: Int, ext: String, data: InputStream) {
+        if (preference.getBoolean("cache_disable", false))
+            return
+
         val cache = File(getCachedGallery(galleryID), "%05d.$ext".format(index)).also {
             if (!it.exists())
                 it.createNewFile()
         }
 
-        data.use {
+        try {
-            it.copyTo(FileOutputStream(cache))
+            BufferedInputStream(data).use { inputStream ->
+                FileOutputStream(cache).use { outputStream ->
+                    inputStream.copyTo(outputStream)
+                }
+            }
+        } catch (e: Exception) {
+            cache.delete()
         }
     }
 
     fun moveToDownload(galleryID: Int) {
+        if (preference.getBoolean("cache_disable", false))
+            return
+
         if (moving.contains(galleryID))
             return
 

app/src/main/java/xyz/quaver/pupil/util/download/DownloadWorker.kt

@@ -29,8 +29,7 @@ import androidx.core.app.NotificationCompat
 import androidx.core.app.NotificationManagerCompat
 import androidx.core.app.TaskStackBuilder
 import androidx.preference.PreferenceManager
-import com.crashlytics.android.Crashlytics
+import com.google.firebase.crashlytics.FirebaseCrashlytics
-import io.fabric.sdk.android.Fabric
 import kotlinx.coroutines.*
 import okhttp3.*
 import okio.*
@@ -46,11 +45,10 @@ import xyz.quaver.pupil.R
 import xyz.quaver.pupil.ui.ReaderActivity
 import java.io.File
 import java.io.IOException
-import java.util.concurrent.Executors
 import java.util.concurrent.LinkedBlockingQueue
 import java.util.concurrent.TimeUnit
 
-@UseExperimental(ExperimentalCoroutinesApi::class)
+@OptIn(ExperimentalCoroutinesApi::class)
 class DownloadWorker private constructor(context: Context) : ContextWrapper(context) {
 
     private val preferences : SharedPreferences = PreferenceManager.getDefaultSharedPreferences(this)
@@ -78,7 +76,7 @@ class DownloadWorker private constructor(context: Context) : ContextWrapper(cont
         private var bufferedSource : BufferedSource? = null
 
         override fun contentLength() = responseBody.contentLength()
-        override fun contentType() = responseBody.contentType() ?: null
+        override fun contentType() = responseBody.contentType()
 
         override fun source(): BufferedSource {
             if (bufferedSource == null)
@@ -152,11 +150,18 @@ class DownloadWorker private constructor(context: Context) : ContextWrapper(cont
 
     val interceptor = Interceptor { chain ->
         val request = chain.request()
-        val response = chain.proceed(request)
+        var response = chain.proceed(request)
+
+        var retry = 5
+        while (!response.isSuccessful && retry > 0) {
+            response = chain.proceed(request)
+            retry--
+        }
 
         response.newBuilder()
-            .body(ProgressResponseBody(request.tag(), response.body(), progressListener))
+            .body(response.body()?.let {
-            .build()
+                ProgressResponseBody(request.tag(), it, progressListener)
+            }).build()
     }
 
     val client =
@@ -164,7 +169,10 @@ class DownloadWorker private constructor(context: Context) : ContextWrapper(cont
             .connectTimeout(0, TimeUnit.SECONDS)
             .addInterceptor(interceptor)
             .readTimeout(0, TimeUnit.SECONDS)
-            .dispatcher(Dispatcher(Executors.newFixedThreadPool(4)))
+            .dispatcher(Dispatcher().apply {
+                maxRequests = 4
+                maxRequestsPerHost = 4
+            })
             .proxy(proxy)
             .build()
 
@@ -222,7 +230,7 @@ class DownloadWorker private constructor(context: Context) : ContextWrapper(cont
                         imageUrlFromImage(
                             galleryID,
                             reader.galleryInfo.files[index],
-                            lowQuality
+                            !lowQuality
                         )
                     )
                     addHeader("Referer", getReferer(galleryID))
@@ -240,6 +248,8 @@ class DownloadWorker private constructor(context: Context) : ContextWrapper(cont
         }.build()
 
         client.newCall(request).enqueue(callback)
+
+        Log.i("PUPILD", "DOWNLOADING ($galleryID, $index) from ${request.url()}")
     }
 
     private fun download(galleryID: Int) = CoroutineScope(Dispatchers.IO).launch {
@@ -285,8 +295,8 @@ class DownloadWorker private constructor(context: Context) : ContextWrapper(cont
             val callback = object : Callback {
                 override fun onFailure(call: Call, e: IOException) {
                     Log.i("PUPILD", "FAIL ${call.request().tag()} (${e.message})")
-                    if (Fabric.isInitialized() && e.message != "Canceled")
+                    if (e.message?.contains("cancel", true) != true)
-                        Crashlytics.logException(e)
+                        FirebaseCrashlytics.getInstance().recordException(e)
 
                     progress[galleryID]?.set(i, Float.NaN)
                     exception[galleryID]?.set(i, e)
@@ -312,7 +322,7 @@ class DownloadWorker private constructor(context: Context) : ContextWrapper(cont
 
                     try {
                         response.body().use {
-                            Cache(this@DownloadWorker).putImage(galleryID, i, ext, it.byteStream())
+                            Cache(this@DownloadWorker).putImage(galleryID, i, ext, it!!.byteStream())
                         }
                         progress[galleryID]?.set(i, Float.POSITIVE_INFINITY)
 

app/src/main/java/xyz/quaver/pupil/util/history.kt

@@ -18,13 +18,14 @@
 
 package xyz.quaver.pupil.util
 
-import kotlinx.serialization.list
+import kotlinx.serialization.KSerializer
-import kotlinx.serialization.serializer
+import kotlinx.serialization.builtins.list
+import kotlinx.serialization.builtins.serializer
 import java.io.File
 
 class Histories(private val file: File) : ArrayList<Int>() {
 
-    val serializer = Int.serializer().list
+    val serializer: KSerializer<List<Int>> = Int.serializer().list
 
     init {
         if (!file.exists())

app/src/main/java/xyz/quaver/pupil/util/lock.kt

@@ -22,9 +22,7 @@ import android.content.Context
 import android.content.ContextWrapper
 import androidx.core.content.ContextCompat
 import kotlinx.serialization.Serializable
-import kotlinx.serialization.json.Json
+import kotlinx.serialization.builtins.list
-import kotlinx.serialization.json.JsonConfiguration
-import kotlinx.serialization.list
 import java.io.File
 import java.security.MessageDigest
 

app/src/main/java/xyz/quaver/pupil/util/misc.kt

@@ -22,7 +22,7 @@ import android.annotation.SuppressLint
 import java.util.*
 import kotlin.collections.ArrayList
 
-@UseExperimental(ExperimentalStdlibApi::class)
+@OptIn(ExperimentalStdlibApi::class)
 fun String.wordCapitalize() : String {
     val result = ArrayList<String>()
 

app/src/main/java/xyz/quaver/pupil/util/proxy.kt

@@ -42,7 +42,7 @@ data class ProxyInfo(
     }
 
     fun authenticator() = Authenticator { _, response ->
-        val credential = Credentials.basic(username, password)
+        val credential = Credentials.basic(username ?: "", password ?: "")
 
         response.request().newBuilder()
             .header("Proxy-Authorization", credential)

app/src/main/java/xyz/quaver/pupil/util/update.kt

@@ -50,7 +50,6 @@ import java.io.File
 import java.io.IOException
 import java.net.URL
 import java.util.*
-import java.util.concurrent.Executors
 import java.util.concurrent.TimeUnit
 
 fun getReleases(url: String) : JsonArray {

app/src/main/res/anim/shake.xml

@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~     Pupil, Hitomi.la viewer for Android
+  ~     Copyright (C) 2020  tom5079
+  ~
+  ~     This program is free software: you can redistribute it and/or modify
+  ~     it under the terms of the GNU General Public License as published by
+  ~     the Free Software Foundation, either version 3 of the License, or
+  ~     (at your option) any later version.
+  ~
+  ~     This program is distributed in the hope that it will be useful,
+  ~     but WITHOUT ANY WARRANTY; without even the implied warranty of
+  ~     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  ~     GNU General Public License for more details.
+  ~
+  ~     You should have received a copy of the GNU General Public License
+  ~     along with this program.  If not, see <http://www.gnu.org/licenses/>.
+  -->
+
+<translate xmlns:android="http://schemas.android.com/apk/res/android"
+    android:duration="300"
+    android:fromXDelta="0"
+    android:interpolator="@anim/shake_cycle"
+    android:toXDelta="10" />

app/src/main/res/anim/shake_cycle.xml

@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~     Pupil, Hitomi.la viewer for Android
+  ~     Copyright (C) 2020  tom5079
+  ~
+  ~     This program is free software: you can redistribute it and/or modify
+  ~     it under the terms of the GNU General Public License as published by
+  ~     the Free Software Foundation, either version 3 of the License, or
+  ~     (at your option) any later version.
+  ~
+  ~     This program is distributed in the hope that it will be useful,
+  ~     but WITHOUT ANY WARRANTY; without even the implied warranty of
+  ~     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  ~     GNU General Public License for more details.
+  ~
+  ~     You should have received a copy of the GNU General Public License
+  ~     along with this program.  If not, see <http://www.gnu.org/licenses/>.
+  -->
+
+<cycleInterpolator xmlns:android="http://schemas.android.com/apk/res/android"
+    android:cycles="3" />

app/src/main/res/color/lock_fab.xml

@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~     Pupil, Hitomi.la viewer for Android
+  ~     Copyright (C) 2020  tom5079
+  ~
+  ~     This program is free software: you can redistribute it and/or modify
+  ~     it under the terms of the GNU General Public License as published by
+  ~     the Free Software Foundation, either version 3 of the License, or
+  ~     (at your option) any later version.
+  ~
+  ~     This program is distributed in the hope that it will be useful,
+  ~     but WITHOUT ANY WARRANTY; without even the implied warranty of
+  ~     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  ~     GNU General Public License for more details.
+  ~
+  ~     You should have received a copy of the GNU General Public License
+  ~     along with this program.  If not, see <http://www.gnu.org/licenses/>.
+  -->
+
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:state_enabled="false" android:color="@android:color/darker_gray"/>
+    <item android:color="@color/colorPrimary"/>
+</selector>

app/src/main/res/drawable/account_group.xml

@@ -0,0 +1,8 @@
+<!-- drawable/account_group.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="#fff" android:pathData="M12,5.5A3.5,3.5 0 0,1 15.5,9A3.5,3.5 0 0,1 12,12.5A3.5,3.5 0 0,1 8.5,9A3.5,3.5 0 0,1 12,5.5M5,8C5.56,8 6.08,8.15 6.53,8.42C6.38,9.85 6.8,11.27 7.66,12.38C7.16,13.34 6.16,14 5,14A3,3 0 0,1 2,11A3,3 0 0,1 5,8M19,8A3,3 0 0,1 22,11A3,3 0 0,1 19,14C17.84,14 16.84,13.34 16.34,12.38C17.2,11.27 17.62,9.85 17.47,8.42C17.92,8.15 18.44,8 19,8M5.5,18.25C5.5,16.18 8.41,14.5 12,14.5C15.59,14.5 18.5,16.18 18.5,18.25V20H5.5V18.25M0,20V18.5C0,17.11 1.89,15.94 4.45,15.6C3.86,16.28 3.5,17.22 3.5,18.25V20H0M24,20H20.5V18.25C20.5,17.22 20.14,16.28 19.55,15.6C22.11,15.94 24,17.11 24,18.5V20Z" />
+</vector>

app/src/main/res/drawable/account_star.xml

@@ -0,0 +1,8 @@
+<!-- drawable/account_star.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="#fff" android:pathData="M15,14C12.33,14 7,15.33 7,18V20H23V18C23,15.33 17.67,14 15,14M15,12A4,4 0 0,0 19,8A4,4 0 0,0 15,4A4,4 0 0,0 11,8A4,4 0 0,0 15,12M5,13.28L7.45,14.77L6.8,11.96L9,10.08L6.11,9.83L5,7.19L3.87,9.83L1,10.08L3.18,11.96L2.5,14.77L5,13.28Z" />
+</vector>

app/src/main/res/drawable/backspace_outline.xml

@@ -0,0 +1,8 @@
+<!-- drawable/backspace_outline.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="M19,15.59L17.59,17L14,13.41L10.41,17L9,15.59L12.59,12L9,8.41L10.41,7L14,10.59L17.59,7L19,8.41L15.41,12L19,15.59M22,3A2,2 0 0,1 24,5V19A2,2 0 0,1 22,21H7C6.31,21 5.77,20.64 5.41,20.11L0,12L5.41,3.88C5.77,3.35 6.31,3 7,3H22M22,5H7L2.28,12L7,19H22V5Z" />
+</vector>

app/src/main/res/drawable/book_open.xml

@@ -0,0 +1,8 @@
+<!-- drawable/book_open.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="#fff" android:pathData="M13,12H20V13.5H13M13,9.5H20V11H13M13,14.5H20V16H13M21,4H3A2,2 0 0,0 1,6V19A2,2 0 0,0 3,21H21A2,2 0 0,0 23,19V6A2,2 0 0,0 21,4M21,19H12V6H21" />
+</vector>

app/src/main/res/drawable/brush.xml

@@ -0,0 +1,8 @@
+<!-- drawable/brush.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="#fff" android:pathData="M20.71,4.63L19.37,3.29C19,2.9 18.35,2.9 17.96,3.29L9,12.25L11.75,15L20.71,6.04C21.1,5.65 21.1,5 20.71,4.63M7,14A3,3 0 0,0 4,17C4,18.31 2.84,19 2,19C2.92,20.22 4.5,21 6,21A4,4 0 0,0 10,17A3,3 0 0,0 7,14Z" />
+</vector>

app/src/main/res/drawable/fingerprint.xml

@@ -1,8 +1,10 @@
 <!-- drawable/fingerprint.xml -->
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
     android:height="24dp"
     android:width="24dp"
     android:viewportWidth="24"
     android:viewportHeight="24">
-    <path android:fillColor="#000" android:pathData="M17.81,4.47C17.73,4.47 17.65,4.45 17.58,4.41C15.66,3.42 14,3 12,3C10.03,3 8.15,3.47 6.44,4.41C6.2,4.54 5.9,4.45 5.76,4.21C5.63,3.97 5.72,3.66 5.96,3.53C7.82,2.5 9.86,2 12,2C14.14,2 16,2.47 18.04,3.5C18.29,3.65 18.38,3.95 18.25,4.19C18.16,4.37 18,4.47 17.81,4.47M3.5,9.72C3.4,9.72 3.3,9.69 3.21,9.63C3,9.47 2.93,9.16 3.09,8.93C4.08,7.53 5.34,6.43 6.84,5.66C10,4.04 14,4.03 17.15,5.65C18.65,6.42 19.91,7.5 20.9,8.9C21.06,9.12 21,9.44 20.78,9.6C20.55,9.76 20.24,9.71 20.08,9.5C19.18,8.22 18.04,7.23 16.69,6.54C13.82,5.07 10.15,5.07 7.29,6.55C5.93,7.25 4.79,8.25 3.89,9.5C3.81,9.65 3.66,9.72 3.5,9.72M9.75,21.79C9.62,21.79 9.5,21.74 9.4,21.64C8.53,20.77 8.06,20.21 7.39,19C6.7,17.77 6.34,16.27 6.34,14.66C6.34,11.69 8.88,9.27 12,9.27C15.12,9.27 17.66,11.69 17.66,14.66A0.5,0.5 0 0,1 17.16,15.16A0.5,0.5 0 0,1 16.66,14.66C16.66,12.24 14.57,10.27 12,10.27C9.43,10.27 7.34,12.24 7.34,14.66C7.34,16.1 7.66,17.43 8.27,18.5C8.91,19.66 9.35,20.15 10.12,20.93C10.31,21.13 10.31,21.44 10.12,21.64C10,21.74 9.88,21.79 9.75,21.79M16.92,19.94C15.73,19.94 14.68,19.64 13.82,19.05C12.33,18.04 11.44,16.4 11.44,14.66A0.5,0.5 0 0,1 11.94,14.16A0.5,0.5 0 0,1 12.44,14.66C12.44,16.07 13.16,17.4 14.38,18.22C15.09,18.7 15.92,18.93 16.92,18.93C17.16,18.93 17.56,18.9 17.96,18.83C18.23,18.78 18.5,18.96 18.54,19.24C18.59,19.5 18.41,19.77 18.13,19.82C17.56,19.93 17.06,19.94 16.92,19.94M14.91,22C14.87,22 14.82,22 14.78,22C13.19,21.54 12.15,20.95 11.06,19.88C9.66,18.5 8.89,16.64 8.89,14.66C8.89,13.04 10.27,11.72 11.97,11.72C13.67,11.72 15.05,13.04 15.05,14.66C15.05,15.73 16,16.6 17.13,16.6C18.28,16.6 19.21,15.73 19.21,14.66C19.21,10.89 15.96,7.83 11.96,7.83C9.12,7.83 6.5,9.41 5.35,11.86C4.96,12.67 4.76,13.62 4.76,14.66C4.76,15.44 4.83,16.67 5.43,18.27C5.53,18.53 5.4,18.82 5.14,18.91C4.88,19 4.59,18.87 4.5,18.62C4,17.31 3.77,16 3.77,14.66C3.77,13.46 4,12.37 4.45,11.42C5.78,8.63 8.73,6.82 11.96,6.82C16.5,6.82 20.21,10.33 20.21,14.65C20.21,16.27 18.83,17.59 17.13,17.59C15.43,17.59 14.05,16.27 14.05,14.65C14.05,13.58 13.12,12.71 11.97,12.71C10.82,12.71 9.89,13.58 9.89,14.65C9.89,16.36 10.55,17.96 11.76,19.16C12.71,20.1 13.62,20.62 15.03,21C15.3,21.08 15.45,21.36 15.38,21.62C15.33,21.85 15.12,22 14.91,22Z" />
+    <path android:fillColor="#fff" android:pathData="M17.81,4.47C17.73,4.47 17.65,4.45 17.58,4.41C15.66,3.42 14,3 12,3C10.03,3 8.15,3.47 6.44,4.41C6.2,4.54 5.9,4.45 5.76,4.21C5.63,3.97 5.72,3.66 5.96,3.53C7.82,2.5 9.86,2 12,2C14.14,2 16,2.47 18.04,3.5C18.29,3.65 18.38,3.95 18.25,4.19C18.16,4.37 18,4.47 17.81,4.47M3.5,9.72C3.4,9.72 3.3,9.69 3.21,9.63C3,9.47 2.93,9.16 3.09,8.93C4.08,7.53 5.34,6.43 6.84,5.66C10,4.04 14,4.03 17.15,5.65C18.65,6.42 19.91,7.5 20.9,8.9C21.06,9.12 21,9.44 20.78,9.6C20.55,9.76 20.24,9.71 20.08,9.5C19.18,8.22 18.04,7.23 16.69,6.54C13.82,5.07 10.15,5.07 7.29,6.55C5.93,7.25 4.79,8.25 3.89,9.5C3.81,9.65 3.66,9.72 3.5,9.72M9.75,21.79C9.62,21.79 9.5,21.74 9.4,21.64C8.53,20.77 8.06,20.21 7.39,19C6.7,17.77 6.34,16.27 6.34,14.66C6.34,11.69 8.88,9.27 12,9.27C15.12,9.27 17.66,11.69 17.66,14.66A0.5,0.5 0 0,1 17.16,15.16A0.5,0.5 0 0,1 16.66,14.66C16.66,12.24 14.57,10.27 12,10.27C9.43,10.27 7.34,12.24 7.34,14.66C7.34,16.1 7.66,17.43 8.27,18.5C8.91,19.66 9.35,20.15 10.12,20.93C10.31,21.13 10.31,21.44 10.12,21.64C10,21.74 9.88,21.79 9.75,21.79M16.92,19.94C15.73,19.94 14.68,19.64 13.82,19.05C12.33,18.04 11.44,16.4 11.44,14.66A0.5,0.5 0 0,1 11.94,14.16A0.5,0.5 0 0,1 12.44,14.66C12.44,16.07 13.16,17.4 14.38,18.22C15.09,18.7 15.92,18.93 16.92,18.93C17.16,18.93 17.56,18.9 17.96,18.83C18.23,18.78 18.5,18.96 18.54,19.24C18.59,19.5 18.41,19.77 18.13,19.82C17.56,19.93 17.06,19.94 16.92,19.94M14.91,22C14.87,22 14.82,22 14.78,22C13.19,21.54 12.15,20.95 11.06,19.88C9.66,18.5 8.89,16.64 8.89,14.66C8.89,13.04 10.27,11.72 11.97,11.72C13.67,11.72 15.05,13.04 15.05,14.66C15.05,15.73 16,16.6 17.13,16.6C18.28,16.6 19.21,15.73 19.21,14.66C19.21,10.89 15.96,7.83 11.96,7.83C9.12,7.83 6.5,9.41 5.35,11.86C4.96,12.67 4.76,13.62 4.76,14.66C4.76,15.44 4.83,16.67 5.43,18.27C5.53,18.53 5.4,18.82 5.14,18.91C4.88,19 4.59,18.87 4.5,18.62C4,17.31 3.77,16 3.77,14.66C3.77,13.46 4,12.37 4.45,11.42C5.78,8.63 8.73,6.82 11.96,6.82C16.5,6.82 20.21,10.33 20.21,14.65C20.21,16.27 18.83,17.59 17.13,17.59C15.43,17.59 14.05,16.27 14.05,14.65C14.05,13.58 13.12,12.71 11.97,12.71C10.82,12.71 9.89,13.58 9.89,14.65C9.89,16.36 10.55,17.96 11.76,19.16C12.71,20.1 13.62,20.62 15.03,21C15.3,21.08 15.45,21.36 15.38,21.62C15.33,21.85 15.12,22 14.91,22Z"
+        tools:ignore="VectorPath" />
 </vector>

app/src/main/res/drawable/gender_male.xml

@@ -1,4 +1,4 @@
-<!-- drawable/gender-male.xml -->
+<!-- drawable/gender_male.xml -->
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:height="24dp"
     android:width="24dp"

app/src/main/res/drawable/lastpass.xml

@@ -4,5 +4,5 @@
     android:width="24dp"
     android:viewportWidth="24"
     android:viewportHeight="24">
-    <path android:fillColor="#000" android:pathData="M14,12A2,2 0 0,1 16,10A2,2 0 0,1 18,12A2,2 0 0,1 16,14A2,2 0 0,1 14,12M8,12A2,2 0 0,1 10,10A2,2 0 0,1 12,12A2,2 0 0,1 10,14A2,2 0 0,1 8,12M2,12A2,2 0 0,1 4,10A2,2 0 0,1 6,12A2,2 0 0,1 4,14A2,2 0 0,1 2,12M22,5H20V19H22V5Z" />
+    <path android:fillColor="#fff" android:pathData="M14,12A2,2 0 0,1 16,10A2,2 0 0,1 18,12A2,2 0 0,1 16,14A2,2 0 0,1 14,12M8,12A2,2 0 0,1 10,10A2,2 0 0,1 12,12A2,2 0 0,1 10,14A2,2 0 0,1 8,12M2,12A2,2 0 0,1 4,10A2,2 0 0,1 6,12A2,2 0 0,1 4,14A2,2 0 0,1 2,12M22,5H20V19H22V5Z" />
 </vector>

app/src/main/res/drawable/lock_pattern.xml

@@ -4,5 +4,5 @@
     android:width="24dp"
     android:viewportWidth="24"
     android:viewportHeight="24">
-    <path android:fillColor="#000" android:pathData="M7,3A4,4 0 0,1 11,7C11,8.86 9.73,10.43 8,10.87V13.13C8.37,13.22 8.72,13.37 9.04,13.56L13.56,9.04C13.2,8.44 13,7.75 13,7A4,4 0 0,1 17,3A4,4 0 0,1 21,7A4,4 0 0,1 17,11C16.26,11 15.57,10.8 15,10.45L10.45,15C10.8,15.57 11,16.26 11,17A4,4 0 0,1 7,21A4,4 0 0,1 3,17C3,15.14 4.27,13.57 6,13.13V10.87C4.27,10.43 3,8.86 3,7A4,4 0 0,1 7,3M17,13A4,4 0 0,1 21,17A4,4 0 0,1 17,21A4,4 0 0,1 13,17A4,4 0 0,1 17,13M17,15A2,2 0 0,0 15,17A2,2 0 0,0 17,19A2,2 0 0,0 19,17A2,2 0 0,0 17,15Z" />
+    <path android:fillColor="#fff" android:pathData="M7,3A4,4 0 0,1 11,7C11,8.86 9.73,10.43 8,10.87V13.13C8.37,13.22 8.72,13.37 9.04,13.56L13.56,9.04C13.2,8.44 13,7.75 13,7A4,4 0 0,1 17,3A4,4 0 0,1 21,7A4,4 0 0,1 17,11C16.26,11 15.57,10.8 15,10.45L10.45,15C10.8,15.57 11,16.26 11,17A4,4 0 0,1 7,21A4,4 0 0,1 3,17C3,15.14 4.27,13.57 6,13.13V10.87C4.27,10.43 3,8.86 3,7A4,4 0 0,1 7,3M17,13A4,4 0 0,1 21,17A4,4 0 0,1 17,21A4,4 0 0,1 13,17A4,4 0 0,1 17,13M17,15A2,2 0 0,0 15,17A2,2 0 0,0 17,19A2,2 0 0,0 19,17A2,2 0 0,0 17,15Z" />
 </vector>

app/src/main/res/drawable/pin_filled.xml

@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~     Pupil, Hitomi.la viewer for Android
+  ~     Copyright (C) 2020  tom5079
+  ~
+  ~     This program is free software: you can redistribute it and/or modify
+  ~     it under the terms of the GNU General Public License as published by
+  ~     the Free Software Foundation, either version 3 of the License, or
+  ~     (at your option) any later version.
+  ~
+  ~     This program is distributed in the hope that it will be useful,
+  ~     but WITHOUT ANY WARRANTY; without even the implied warranty of
+  ~     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  ~     GNU General Public License for more details.
+  ~
+  ~     You should have received a copy of the GNU General Public License
+  ~     along with this program.  If not, see <http://www.gnu.org/licenses/>.
+  -->
+
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="oval">
+    <solid android:color="@color/colorAccent" />
+</shape>

app/src/main/res/drawable/refresh.xml

@@ -0,0 +1,8 @@
+<!-- drawable/refresh.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="#fff" android:pathData="M17.65,6.35C16.2,4.9 14.21,4 12,4A8,8 0 0,0 4,12A8,8 0 0,0 12,20C15.73,20 18.84,17.45 19.73,14H17.65C16.83,16.33 14.61,18 12,18A6,6 0 0,1 6,12A6,6 0 0,1 12,6C13.66,6 15.14,6.69 16.22,7.78L13,11H20V4L17.65,6.35Z" />
+</vector>

app/src/main/res/drawable/shuffle_variant.xml

@@ -0,0 +1,8 @@
+<!-- drawable/shuffle_variant.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="#fff" android:pathData="M17,3L22.25,7.5L17,12L22.25,16.5L17,21V18H14.26L11.44,15.18L13.56,13.06L15.5,15H17V12L17,9H15.5L6.5,18H2V15H5.26L14.26,6H17V3M2,6H6.5L9.32,8.82L7.2,10.94L5.26,9H2V6Z" />
+</vector>

app/src/main/res/drawable/tag.xml

@@ -0,0 +1,8 @@
+<!-- drawable/tag.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="#fff" android:pathData="M5.5,7A1.5,1.5 0 0,1 4,5.5A1.5,1.5 0 0,1 5.5,4A1.5,1.5 0 0,1 7,5.5A1.5,1.5 0 0,1 5.5,7M21.41,11.58L12.41,2.58C12.05,2.22 11.55,2 11,2H4C2.89,2 2,2.89 2,4V11C2,11.55 2.22,12.05 2.59,12.41L11.58,21.41C11.95,21.77 12.45,22 13,22C13.55,22 14.05,21.77 14.41,21.41L21.41,14.41C21.78,14.05 22,13.55 22,13C22,12.44 21.77,11.94 21.41,11.58Z" />
+</vector>

app/src/main/res/drawable/translate.xml

@@ -0,0 +1,8 @@
+<!-- drawable/translate.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="#fff" android:pathData="M12.87,15.07L10.33,12.56L10.36,12.53C12.1,10.59 13.34,8.36 14.07,6H17V4H10V2H8V4H1V6H12.17C11.5,7.92 10.44,9.75 9,11.35C8.07,10.32 7.3,9.19 6.69,8H4.69C5.42,9.63 6.42,11.17 7.67,12.56L2.58,17.58L4,19L9,14L12.11,17.11L12.87,15.07M18.5,10H16.5L12,22H14L15.12,19H19.87L21,22H23L18.5,10M15.88,17L17.5,12.67L19.12,17H15.88Z" />
+</vector>

app/src/main/res/layout/activity_lock.xml

@@ -36,7 +36,6 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_marginTop="16dp"
-        android:layout_marginBottom="32dp"
         android:gravity="center"
         app:layout_constraintTop_toBottomOf="@id/lock_content"
         app:layout_constraintBottom_toTopOf="@id/lock_button_layout">
@@ -46,9 +45,10 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             app:srcCompat="@drawable/fingerprint"
+            app:backgroundTint="@color/lock_fab"
             android:layout_marginLeft="8dp"
             android:layout_marginRight="8dp"
-            app:backgroundTint="@color/dark_gray"
+            app:tint="@null"
             app:fabSize="mini"/>
 
     </LinearLayout>
@@ -67,26 +67,29 @@
             android:id="@+id/lock_pattern"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
+            app:tint="@null"
             app:srcCompat="@drawable/lock_pattern"
-            app:backgroundTint="@color/colorPrimary"
+            app:backgroundTint="@color/lock_fab"
             app:fabSize="mini"/>
 
         <com.google.android.material.floatingactionbutton.FloatingActionButton
             android:id="@+id/lock_pin"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
+            app:tint="@null"
             app:srcCompat="@drawable/numeric"
+            app:backgroundTint="@color/lock_fab"
             android:layout_marginLeft="8dp"
             android:layout_marginRight="8dp"
-            app:backgroundTint="@color/dark_gray"
             app:fabSize="mini"/>
 
         <com.google.android.material.floatingactionbutton.FloatingActionButton
             android:id="@+id/lock_password"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
+            app:tint="@null"
             app:srcCompat="@drawable/lastpass"
-            app:backgroundTint="@color/dark_gray"
+            app:backgroundTint="@color/lock_fab"
             app:fabSize="mini"/>
 
     </LinearLayout>

app/src/main/res/layout/activity_main_content.xml

@@ -100,6 +100,13 @@
                 app:fab_label="@string/main_jump_title"
                 app:fab_size="mini"/>
 
+            <com.github.clans.fab.FloatingActionButton
+                android:id="@+id/main_fab_random"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                app:fab_label="@string/main_fab_random"
+                app:fab_size="mini"/>
+
             <com.github.clans.fab.FloatingActionButton
                 android:id="@+id/main_fab_id"
                 android:layout_width="wrap_content"
@@ -111,11 +118,17 @@
 
     </androidx.coordinatorlayout.widget.CoordinatorLayout>
 
-    <com.arlib.floatingsearchview.FloatingSearchView
+    <com.arlib.floatingsearchview.FloatingSearchViewDayNight
         android:id="@+id/main_searchview"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        app:floatingSearch_backgroundColor="?attr/colorSurface"
+        app:floatingSearch_backgroundColor="?android:attr/colorBackgroundFloating"
+        app:floatingSearch_leftActionColor="?attr/colorControlNormal"
+        app:floatingSearch_menuItemIconColor="?attr/colorControlNormal"
+        app:floatingSearch_actionMenuOverflowColor="?attr/colorControlNormal"
+        app:floatingSearch_clearBtnColor="?attr/colorControlNormal"
+        app:floatingSearch_viewTextColor="?android:attr/textColorPrimary"
+        app:floatingSearch_suggestionRightIconColor="@color/material_orange_500"
         app:floatingSearch_searchBarMarginLeft="8dp"
         app:floatingSearch_searchBarMarginRight="8dp"
         app:floatingSearch_searchBarMarginTop="8dp"
@@ -125,6 +138,7 @@
         app:floatingSearch_leftActionMode="showHamburger"
         app:floatingSearch_menu="@menu/main"
         app:floatingSearch_dismissOnOutsideTouch="true"
-        app:floatingSearch_close_search_on_keyboard_dismiss="true"/>
+        app:floatingSearch_close_search_on_keyboard_dismiss="true"
+        tools:ignore="NewApi" />
 
 </RelativeLayout>

app/src/main/res/layout/activity_reader.xml

@@ -75,6 +75,13 @@
             app:fab_label="@string/reader_fab_download"
             app:fab_size="mini"/>
 
+        <com.github.clans.fab.FloatingActionButton
+            android:id="@+id/reader_fab_retry"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            app:fab_label="@string/reader_fab_retry"
+            app:fab_size="mini"/>
+
         <com.github.clans.fab.FloatingActionButton
             android:id="@+id/reader_fab_fullscreen"
             android:layout_width="wrap_content"

app/src/main/res/layout/dialog_default_query.xml

@@ -107,4 +107,30 @@
 
     </LinearLayout>
 
+    <LinearLayout
+        android:id="@+id/default_query_dialog_loli_layout"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:orientation="horizontal"
+        android:paddingLeft="0dp"
+        android:paddingStart="0dp"
+        android:paddingEnd="8dp"
+        android:paddingRight="8dp"
+        app:layout_constraintTop_toBottomOf="@id/default_query_dialog_guro_layout"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintEnd_toEndOf="parent">
+
+        <TextView
+            android:layout_width="0dp"
+            android:layout_weight="1"
+            android:layout_height="wrap_content"
+            android:text="@string/default_query_dialog_filter_loli"/>
+
+        <CheckBox
+            android:id="@+id/default_query_dialog_loli_checkbox"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content" />
+
+    </LinearLayout>
+
 </androidx.constraintlayout.widget.ConstraintLayout>

app/src/main/res/layout/fragment_pin_lock.xml

@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~     Pupil, Hitomi.la viewer for Android
+  ~     Copyright (C) 2020  tom5079
+  ~
+  ~     This program is free software: you can redistribute it and/or modify
+  ~     it under the terms of the GNU General Public License as published by
+  ~     the Free Software Foundation, either version 3 of the License, or
+  ~     (at your option) any later version.
+  ~
+  ~     This program is distributed in the hope that it will be useful,
+  ~     but WITHOUT ANY WARRANTY; without even the implied warranty of
+  ~     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  ~     GNU General Public License for more details.
+  ~
+  ~     You should have received a copy of the GNU General Public License
+  ~     along with this program.  If not, see <http://www.gnu.org/licenses/>.
+  -->
+
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:paddingTop="100dp">
+
+    <com.andrognito.pinlockview.IndicatorDots
+        android:id="@+id/indicator_dots"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_gravity="center_horizontal|top"
+        app:dotFilledBackground="@drawable/pin_filled"/>
+
+    <com.andrognito.pinlockview.PinLockView
+        android:id="@+id/pin_lock_view"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        app:keypadTextColor="?android:attr/textColorPrimary"
+        android:layout_gravity="center_horizontal|bottom"
+        app:keypadDeleteButtonDrawable="@drawable/backspace_outline"
+        app:keypadShowDeleteButton="true"/>
+
+</FrameLayout>

app/src/main/res/layout/item_galleryblock.xml

@@ -197,7 +197,8 @@
 				android:paddingLeft="8dp"
 				android:paddingRight="8dp"
 				android:paddingBottom="8dp"
-				android:orientation="horizontal">
+				android:orientation="horizontal"
+				android:gravity="center_vertical">
 
 				<TextView
 					android:id="@+id/galleryblock_id"
@@ -209,6 +210,16 @@
 					android:layout_height="1dp"
 					android:layout_weight="1"/>
 
+				<TextView
+					android:id="@+id/galleryblock_pagecount"
+					android:layout_width="wrap_content"
+					android:layout_height="wrap_content"/>
+
+				<View
+					android:layout_width="0dp"
+					android:layout_height="1dp"
+					android:layout_weight="1"/>
+
 				<ImageView
 					android:id="@+id/galleryblock_favorite"
 					android:contentDescription="@string/app_name"

app/src/main/res/values-ja/strings.xml

@@ -99,7 +99,6 @@
     <string name="gallery_tags">タグ</string>
     <string name="gallery_thumbnails">サムネイル</string>
     <string name="gallery_related">おすすめ</string>
-    <string name="settings_nomedia_summary">イメージをギャラリーから見えなくする</string>
     <string name="settings_nomedia_title">イメージを隠す</string>
     <string name="reader_help">ヘルプ</string>
     <string name="main_delete">削除</string>
@@ -140,4 +139,15 @@
     <string name="import_old_galleries_folder_not_readable">フォルダを読めません</string>
     <string name="import_old_galleries_notification">旧ギャラリーインポート中…</string>
     <string name="import_old_galleries_notification_done">インポート完了</string>
+    <string name="main_fab_random">ランダムギャラリーを開く</string>
+    <string name="settings_lock_fingerprint_without_lock">予備のロックが設定されていないと指紋ロックは使用できません</string>
+    <string name="settings_lock_fingerprint_prompt">Pupil指紋ロック™</string>
+    <string name="settings_lock_fingerprint_prompt_subtitle">こうかはばつぐんだ!</string>
+    <string name="default_query_dialog_filter_loli">登場人物を全て18歳以上にする</string>
+    <string name="settings_cache_disable">キャッシュを使用しない</string>
+    <string name="settings_download_when_cache_disable_warning">キャッシュを使用しないため、ダウンロードできません</string>
+    <string name="settings_user_id">ユーザーID</string>
+    <string name="settings_user_id_toast">ユーザーIDをクリップボードにコピーしました</string>
+    <string name="reader_error_retry">ダウンロードエラーが発生しました。リトライしますか？</string>
+    <string name="reader_fab_retry">リトライ</string>
 </resources>