Update README.md

App built
Possible build time optimization
2020-10-13 23:47:56 +09:00 · 2020-10-13 23:40:53 +09:00 · 2020-10-13 23:34:28 +09:00 · 2020-10-13 23:34:16 +09:00 · 2020-10-13 23:05:34 +09:00 · 2020-10-13 22:59:29 +09:00
62 changed files with 1350 additions and 6800 deletions
--- a/.idea/compiler.xml
+++ b/.idea/compiler.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="CompilerConfiguration">
+    <bytecodeTargetLevel target="1.8" />
+  </component>
+</project>
--- a/.idea/gradle.xml
+++ b/.idea/gradle.xml
@@ -14,6 +14,7 @@
          </set>
        </option>
        <option name="resolveModulePerSourceSet" value="false" />
+        <option name="useQualifiedModuleNames" value="true" />
      </GradleProjectSettings>
    </option>
  </component>
--- a/.idea/jarRepositories.xml
+++ b/.idea/jarRepositories.xml
@@ -61,5 +61,15 @@
      <option name="name" value="MavenLocal" />
      <option name="url" value="file:/$USER_HOME$/.m2/repository" />
    </remote-repository>
+    <remote-repository>
+      <option name="id" value="maven3" />
+      <option name="name" value="maven3" />
+      <option name="url" value="https://dl.bintray.com/tom5079/maven" />
+    </remote-repository>
+    <remote-repository>
+      <option name="id" value="maven3" />
+      <option name="name" value="maven3" />
+      <option name="url" value="http://dl.bintray.com/piasy/maven" />
+    </remote-repository>
  </component>
 </project>
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" project-jdk-name="1.8" project-jdk-type="JavaSDK">
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" default="true" project-jdk-name="1.8" project-jdk-type="JavaSDK">
    <output url="file://$PROJECT_DIR$/build/classes" />
  </component>
  <component name="ProjectType">
--- a/README.md
+++ b/README.md
@@ -1,18 +1,12 @@
-# Pupil
-
 ![Banner](https://github.com/tom5079/Pupil/blob/gh-pages/assets/images/pupil-banner.png?raw=true)
 *Pupil, Hitomi.la viewer for Android*  

+![](https://img.shields.io/github/downloads/tom5079/Pupil/total)  
+[![](https://img.shields.io/github/downloads/tom5079/Pupil/5.1.5/Pupil-v5.1.5.apk?color=%234fc3f7&label=DOWNLOAD%20APP&style=for-the-badge)](https://github.com/tom5079/Pupil/releases/download/5.1.5/Pupil-v5.1.5.apk)  
 [![](https://discordapp.com/api/guilds/610452916612104194/embed.png?style=banner2)](https://discord.gg/Stj4b5v)  

-# Screenshot
-![Main Screen](https://github.com/tom5079/Pupil/blob/gh-pages/assets/images/main-screenshot.png?raw=true)
-*Main Screen*
-
-![Reader Screen](https://github.com/tom5079/Pupil/blob/gh-pages/assets/images/reader-screenshot.png?raw=true)
-*Reader Screen*
-
-Images are censored to be SFW
+# Features
+![Main Screen](https://github.com/tom5079/Pupil/blob/gh-pages/assets/images/main-screenshot.jpg?raw=true)

 # Installation

@@ -26,4 +20,7 @@ or Build app yourself

 # Contribution

-Any kind of contribution is appriciated. Feel free to leave PR! 
+Any kind of contribution is appriciated. Feel free to leave PR!
+
+## Tag Translation
+Head over to [tags branch](https://github.com/tom5079/Pupil/tree/tags)
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -1,27 +1,44 @@
-apply plugin: 'com.android.application'
-apply plugin: 'kotlin-android'
-apply plugin: 'kotlin-kapt'
-apply plugin: 'kotlin-android-extensions'
-apply plugin: 'kotlinx-serialization'
-apply plugin: 'com.google.android.gms.oss-licenses-plugin'
+apply plugin: "com.android.application"
+apply plugin: "kotlin-android"
+apply plugin: "kotlin-kapt"
+apply plugin: "kotlin-android-extensions"
+apply plugin: "kotlinx-serialization"
+apply plugin: "com.google.android.gms.oss-licenses-plugin"

 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: 'com.google.firebase.crashlytics'
-    apply plugin: 'com.google.firebase.firebase-perf'
+    apply plugin: "com.google.gms.google-services"
+    apply plugin: "com.google.firebase.crashlytics"
+    apply plugin: "com.google.firebase.firebase-perf"
 } else {
    logger.lifecycle("Firebase Disabled")
 }

+ext {
+    okhttp_version = "3.12.12"
+}
+
+configurations {
+    all {
+        resolutionStrategy {
+            eachDependency { DependencyResolveDetails details ->
+                if (details.requested.group == "com.squareup.okhttp3" && details.requested.name == "okhttp") {
+                    // OkHttp drops support before 5.0 since 3.13.0
+                    details.useVersion okhttp_version
+                }
+            }
+        }
+    }
+}
+
 android {
    compileSdkVersion 30
    defaultConfig {
        applicationId "xyz.quaver.pupil"
        minSdkVersion 16
        targetSdkVersion 30
-        versionCode 59
-        versionName "5.0.3-hotfix2"
+        versionCode 63
+        versionName "5.1.5"
        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
        vectorDrawables.useSupportLibrary = true
    }
@@ -34,8 +51,7 @@ android {
            applicationIdSuffix ".debug"
            versionNameSuffix "-DEBUG"

-            buildConfigField('Boolean', 'CENSOR', 'false')
-            proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
+            proguardFiles getDefaultProguardFile("proguard-android-optimize.txt"), "proguard-rules.pro"

            ext.enableCrashlytics = false
            ext.alwaysUpdateBuildId = false
@@ -44,73 +60,77 @@ android {
            minifyEnabled true
            shrinkResources true

-            buildConfigField('Boolean', 'CENSOR', 'false')
-            proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
+            proguardFiles getDefaultProguardFile("proguard-android-optimize.txt"), "proguard-rules.pro"
        }
    }
    kotlinOptions {
        jvmTarget = JavaVersion.VERSION_1_8.toString()
-        freeCompilerArgs += '-Xuse-experimental=kotlin.Experimental'
+        freeCompilerArgs += "-Xuse-experimental=kotlin.Experimental"
    }
    compileOptions {
        sourceCompatibility JavaVersion.VERSION_1_8
        targetCompatibility JavaVersion.VERSION_1_8
    }
-    buildToolsVersion = '29.0.3'
+    buildToolsVersion = "29.0.3"
 }

 dependencies {
-    implementation fileTree(dir: 'libs', include: ['*.jar', '*.aar'])
+    implementation fileTree(dir: "libs", include: ["*.jar", "*.aar"])
    implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8"
-    implementation "org.jetbrains.kotlinx:kotlinx-coroutines-core:1.3.9"
    implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:1.3.9"
-    //implementation "org.jetbrains.kotlinx:kotlinx-serialization-core:1.0.0-RC"
-    implementation 'androidx.appcompat:appcompat:1.2.0'
-    implementation "androidx.activity:activity-ktx:1.2.0-alpha08"
-    implementation 'androidx.fragment:fragment-ktx:1.3.0-alpha08'
-    implementation 'androidx.preference:preference:1.1.1'
-    implementation 'androidx.constraintlayout:constraintlayout:2.0.1'
-    implementation 'androidx.gridlayout:gridlayout:1.0.0'
+    implementation "org.jetbrains.kotlinx:kotlinx-serialization-json:1.0.0-RC2"
+    
+    implementation "androidx.appcompat:appcompat:1.2.0"
+    implementation "androidx.activity:activity-ktx:1.2.0-beta01"
+    implementation "androidx.fragment:fragment-ktx:1.3.0-beta01"
+    implementation "androidx.preference:preference-ktx:1.1.1"
+    implementation "androidx.constraintlayout:constraintlayout:2.0.2"
+    implementation "androidx.gridlayout:gridlayout:1.0.0"
    implementation "androidx.biometric:biometric:1.0.1"
+    implementation "androidx.work:work-runtime-ktx:2.4.0"
+
    implementation "com.daimajia.swipelayout:library:1.2.0@aar"
-    implementation 'com.google.android.material:material:1.3.0-alpha02'
-    implementation 'com.google.firebase:firebase-core:17.5.0'
-    implementation 'com.google.firebase:firebase-analytics:17.5.0'
-    implementation 'com.google.firebase:firebase-crashlytics:17.2.1'
-    implementation 'com.google.firebase:firebase-perf:19.0.8'
-    implementation 'com.google.android.gms:play-services-oss-licenses:17.0.0'
-    implementation 'com.google.android.gms:play-services-mlkit-face-detection:16.1.1'
-    implementation 'com.github.arimorty:floatingsearchview:2.1.1'
-    implementation 'com.github.clans:fab:1.6.4'
-    //implementation 'com.quiph.ui:recyclerviewfastscroller:0.2.1'
+
+    implementation "com.google.android.material:material:1.3.0-alpha03"
+
+    implementation "com.google.firebase:firebase-core:17.5.1"
+    implementation "com.google.firebase:firebase-analytics:17.6.0"
+    implementation "com.google.firebase:firebase-crashlytics:17.2.2"
+    implementation "com.google.firebase:firebase-perf:19.0.9"
+
+    implementation "com.google.android.gms:play-services-oss-licenses:17.0.0"
+    implementation "com.google.android.gms:play-services-mlkit-face-detection:16.1.1"
+
+    implementation "com.github.clans:fab:1.6.4"
+
+    //implementation "com.quiph.ui:recyclerviewfastscroller:0.2.1"
+
+    implementation 'com.github.piasy:BigImageViewer:1.6.7'
+    implementation 'com.github.piasy:FrescoImageLoader:1.6.7'
+    implementation 'com.github.piasy:FrescoImageViewFactory:1.6.7'
+
    //noinspection GradleDependency
-    implementation 'com.squareup.okhttp3:okhttp:3.12.12'
-    implementation 'com.github.bumptech.glide:glide:4.11.0'
-    implementation ("com.github.bumptech.glide:okhttp3-integration:4.11.0") {
-        transitive = false
-    }
-    implementation 'com.github.bumptech.glide:annotations:4.11.0'
-    annotationProcessor 'com.github.bumptech.glide:compiler:4.11.0'
-    kapt 'com.github.bumptech.glide:compiler:4.11.0'
-    implementation ("com.github.bumptech.glide:recyclerview-integration:4.11.0") {
-        transitive = false
-    }
-    implementation 'com.tbuonomo.andrui:viewpagerdotsindicator:4.1.2'
-    implementation 'com.gu:option:1.3'
-    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 "com.squareup.okhttp3:okhttp:$okhttp_version"
+
+    implementation "com.tbuonomo.andrui:viewpagerdotsindicator:4.1.2"
+
+    implementation "net.rdrei.android.dirchooser:library:3.2@aar"
+    implementation "com.gu:option:1.3"
+
+    implementation "com.andrognito.patternlockview:patternlockview:1.0.0"
+    //implementation "com.andrognito.pinlockview:pinlockview:2.1.0"
+
    implementation "ru.noties.markwon:core:3.1.0"
-    implementation ("xyz.quaver:libpupil:1.6") {
-        exclude group: 'org.jetbrains.kotlinx', module: 'kotlinx-serialization-core-jvm'
-    }
-    implementation "xyz.quaver:documentfilex:0.2.15"
-    testImplementation 'junit:junit:4.13'
-    androidTestImplementation 'androidx.test.ext:junit:1.1.2'
-    androidTestImplementation 'androidx.test:rules:1.3.0'
-    androidTestImplementation 'androidx.test:runner:1.3.0'
-    androidTestImplementation 'androidx.test.espresso:espresso-core:3.3.0'
+
+    implementation "xyz.quaver:libpupil:1.7.2"
+    implementation "xyz.quaver:documentfilex:0.4-alpha02"
+    implementation "xyz.quaver:floatingsearchview:1.0.7"
+
+    testImplementation "junit:junit:4.13"
+    androidTestImplementation "androidx.test.ext:junit:1.1.2"
+    androidTestImplementation "androidx.test:rules:1.3.0"
+    androidTestImplementation "androidx.test:runner:1.3.0"
+    androidTestImplementation "androidx.test.espresso:espresso-core:3.3.0"
 }

 androidExtensions {
--- a/app/libs/kotlinx-serialization-core-1.0.0-RC.jar
+++ b/app/libs/kotlinx-serialization-core-1.0.0-RC.jar
--- a/app/libs/recyclerviewfastscroller-release.aar
+++ b/app/libs/recyclerviewfastscroller-release.aar
--- a/app/proguard-rules.pro
+++ b/app/proguard-rules.pro
@@ -22,21 +22,6 @@

 -dontobfuscate

-keep public class * implements com.bumptech.glide.module.GlideModule
-keep class * extends com.bumptech.glide.module.AppGlideModule {
- <init>(...);
-}
-keep public enum com.bumptech.glide.load.ImageHeaderParser$** {
-  **[] $VALUES;
-  public *;
-}
-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
-
 -keepattributes *Annotation*, InnerClasses
 -dontnote kotlinx.serialization.SerializationKt
 -keep,includedescriptorclasses class xyz.quaver.**$$serializer { *; } # <-- change package name to your app's
@@ -47,5 +32,4 @@
    kotlinx.serialization.KSerializer serializer(...);
 }
 -keep class xyz.quaver.pupil.ui.fragment.ManageFavoritesFragment
-keep class xyz.quaver.pupil.ui.fragment.ManageStorageFragment
-keep class xyz.quaver.pupil.util.Preferences
+-keep class xyz.quaver.pupil.ui.fragment.ManageStorageFragment
--- a/app/release/output-metadata.json
+++ b/app/release/output-metadata.json
@@ -1,19 +1,17 @@
 {
-  "version": 1,
+  "version": 2,
  "artifactType": {
    "type": "APK",
    "kind": "Directory"
  },
  "applicationId": "xyz.quaver.pupil",
-  "variantName": "release",
+  "variantName": "processReleaseResources",
  "elements": [
    {
      "type": "SINGLE",
      "filters": [],
-      "properties": [],
-      "versionCode": 59,
-      "versionName": "5.0.3-hotfix2",
-      "enabled": true,
+      "versionCode": 63,
+      "versionName": "5.1.5",
      "outputFile": "app-release.apk"
    }
  ]
--- a/app/src/main/java/xyz/quaver/pupil/Pupil.kt
+++ b/app/src/main/java/xyz/quaver/pupil/Pupil.kt
@@ -26,14 +26,13 @@ import android.os.Build
 import androidx.appcompat.app.AppCompatDelegate
 import androidx.core.content.ContextCompat
 import androidx.preference.PreferenceManager
+import com.github.piasy.biv.BigImageViewer
+import com.github.piasy.biv.loader.fresco.FrescoImageLoader
 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 kotlinx.coroutines.CoroutineScope
-import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.launch
 import okhttp3.Interceptor
 import okhttp3.OkHttpClient
 import okhttp3.Response
@@ -113,25 +112,16 @@ class Pupil : Application() {
            Preferences.remove("download_folder")
        }

+        if (!Preferences["reset_secure", false]) {
+            Preferences["security_mode"] = false
+            Preferences["reset_secure"] = true
+        }
+
        histories = SavedSet(File(ContextCompat.getDataDir(this), "histories.json"), 0)
        favorites = SavedSet(File(ContextCompat.getDataDir(this), "favorites.json"), 0)
        favoriteTags = SavedSet(File(ContextCompat.getDataDir(this), "favorites_tags.json"), Tag.parse(""))
        searchHistory = SavedSet(File(ContextCompat.getDataDir(this), "search_histories.json"), "")

-        if (Preferences["new_history"]) {
-            CoroutineScope(Dispatchers.IO).launch {
-                histories.reversed().let {
-                    histories.clear()
-                    histories.addAll(it)
-                }
-                favorites.reversed().let {
-                    favorites.clear()
-                    favorites.addAll(it)
-                }
-            }
-            Preferences["new_history"] = true
-        }
-
        if (BuildConfig.DEBUG)
            FirebaseAnalytics.getInstance(this).setAnalyticsCollectionEnabled(false)

@@ -143,6 +133,8 @@ class Pupil : Application() {
            e.printStackTrace()
        }

+        BigImageViewer.initialize(FrescoImageLoader.with(this))
+
        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
            val manager = getSystemService(Context.NOTIFICATION_SERVICE) as NotificationManager

--- a/app/src/main/java/xyz/quaver/pupil/PupilGlideModule.kt
+++ b/app/src/main/java/xyz/quaver/pupil/PupilGlideModule.kt
@@ -1,41 +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
-
-import android.content.Context
-import com.bumptech.glide.Glide
-import com.bumptech.glide.Registry
-import com.bumptech.glide.annotation.GlideModule
-import com.bumptech.glide.integration.okhttp3.OkHttpUrlLoader
-import com.bumptech.glide.load.model.GlideUrl
-import com.bumptech.glide.module.AppGlideModule
-import java.io.InputStream
-
-@GlideModule
-class PupilGlideModule : AppGlideModule() {
-
-    override fun registerComponents(context: Context, glide: Glide, registry: Registry) {
-        registry.append(
-            GlideUrl::class.java,
-            InputStream::class.java,
-            OkHttpUrlLoader.Factory(client)
-        )
-    }
-
-}
--- a/app/src/main/java/xyz/quaver/pupil/adapters/GalleryBlockAdapter.kt
+++ b/app/src/main/java/xyz/quaver/pupil/adapters/GalleryBlockAdapter.kt
@@ -27,40 +27,30 @@ import android.view.View
 import android.view.ViewGroup
 import android.widget.LinearLayout
 import androidx.cardview.widget.CardView
+import androidx.core.content.ContextCompat
 import androidx.recyclerview.widget.RecyclerView
-import androidx.swiperefreshlayout.widget.CircularProgressDrawable
 import androidx.vectordrawable.graphics.drawable.Animatable2Compat
 import androidx.vectordrawable.graphics.drawable.AnimatedVectorDrawableCompat
-import com.bumptech.glide.RequestManager
-import com.bumptech.glide.load.DataSource
-import com.bumptech.glide.load.engine.DiskCacheStrategy
-import com.bumptech.glide.load.engine.GlideException
-import com.bumptech.glide.request.RequestListener
-import com.bumptech.glide.request.target.Target
 import com.daimajia.swipe.SwipeLayout
 import com.daimajia.swipe.adapters.RecyclerSwipeAdapter
 import com.daimajia.swipe.interfaces.SwipeAdapterInterface
+import com.github.piasy.biv.loader.ImageLoader
 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 kotlinx.coroutines.*
+import xyz.quaver.hitomi.getGallery
 import xyz.quaver.hitomi.getReader
 import xyz.quaver.io.util.getChild
-import xyz.quaver.pupil.BuildConfig
 import xyz.quaver.pupil.R
+import xyz.quaver.pupil.favoriteTags
 import xyz.quaver.pupil.favorites
 import xyz.quaver.pupil.types.Tag
-import xyz.quaver.pupil.ui.view.TagChip
 import xyz.quaver.pupil.util.Preferences
 import xyz.quaver.pupil.util.downloader.Cache
 import xyz.quaver.pupil.util.downloader.DownloadManager
 import xyz.quaver.pupil.util.wordCapitalize
-import java.util.*
-import kotlin.collections.ArrayList
-import kotlin.concurrent.schedule
+import java.io.File

-class GalleryBlockAdapter(private val glide: RequestManager, private val galleries: List<Int>) : RecyclerSwipeAdapter<RecyclerView.ViewHolder>(), SwipeAdapterInterface {
+class GalleryBlockAdapter(private val galleries: List<Int>) : RecyclerSwipeAdapter<RecyclerView.ViewHolder>(), SwipeAdapterInterface {

    enum class ViewType {
        NEXT,
@@ -68,18 +58,26 @@ class GalleryBlockAdapter(private val glide: RequestManager, private val galleri
        PREV
    }

-    val timer = Timer()
-
-    var isThin = false
+    var updateAll = true
+    var thin: Boolean = Preferences["thin"]

    inner class GalleryViewHolder(val view: View) : RecyclerView.ViewHolder(view) {
-        var timerTask: TimerTask? = null
+        private var galleryID: Int = 0

-        private fun updateProgress(context: Context, galleryID: Int) {
+        init {
+            CoroutineScope(Dispatchers.Main).launch {
+                while (updateAll) {
+                    updateProgress(view.context)
+                    delay(1000)
+                }
+            }
+        }
+
+        private fun updateProgress(context: Context) {
            val cache = Cache.getInstance(context, galleryID)

            CoroutineScope(Dispatchers.Main).launch {
-                if (cache.metadata.reader == null || Preferences["cache_disable"]) {
+                if (cache.metadata.reader == null) {
                    view.galleryblock_progressbar_layout.visibility = View.GONE
                    view.galleryblock_progress_complete.visibility = View.INVISIBLE
                    return@launch
@@ -88,7 +86,7 @@ class GalleryBlockAdapter(private val glide: RequestManager, private val galleri
                with(view.galleryblock_progressbar) {
                    val imageList = cache.metadata.imageList!!

-                    progress = imageList.filterNotNull().size
+                    progress = imageList.count { it != null }
                    max = imageList.size

                    with(view.galleryblock_progressbar_layout) {
@@ -96,7 +94,7 @@ class GalleryBlockAdapter(private val glide: RequestManager, private val galleri
                            visibility = View.VISIBLE
                    }

-                    if (progress == max) {
+                    if (!imageList.contains(null)) {
                        val downloadManager = DownloadManager.getInstance(context)

                        if (completeFlag.get(galleryID, false)) {
@@ -128,9 +126,14 @@ class GalleryBlockAdapter(private val glide: RequestManager, private val galleri
        }

        fun bind(galleryID: Int) {
+            this.galleryID = galleryID
+            updateProgress(view.context)
+
            val cache = Cache.getInstance(view.context, galleryID)

-            val galleryBlock = cache.metadata.galleryBlock ?: return
+            val galleryBlock = runBlocking {
+                cache.getGalleryBlock()
+            } ?: return

            with(view) {
                val resources = context.resources
@@ -143,63 +146,61 @@ class GalleryBlockAdapter(private val glide: RequestManager, private val galleri
                val artists = galleryBlock.artists
                val series = galleryBlock.series

-                if (isThin)
-                    galleryblock_thumbnail.layoutParams.width = context.resources.getDimensionPixelSize(
-                        R.dimen.galleryblock_thumbnail_thin
-                    )
-
-                galleryblock_thumbnail.setImageDrawable(CircularProgressDrawable(context).also {
-                    it.start()
-                })
-
-                CoroutineScope(Dispatchers.IO).launch {
-                    val thumbnail = cache.getThumbnail()
-
-                    glide
-                        .load(thumbnail)
-                        .skipMemoryCache(true)
-                        .diskCacheStrategy(DiskCacheStrategy.NONE)
-                        .error(R.drawable.image_broken_variant)
-                        .listener(object: RequestListener<Drawable> {
-                            override fun onLoadFailed(
-                                e: GlideException?,
-                                model: Any?,
-                                target: Target<Drawable>?,
-                                isFirstResource: Boolean
-                            ): Boolean {
-                                Cache.getInstance(context, galleryID).let {
-                                    it.cacheFolder.getChild(".thumbnail").let { if (it.exists()) it.delete() }
-                                    it.downloadFolder?.getChild(".thumbnail")?.let { if (it.exists()) it.delete() }
-                                }
-                                return false
-                            }
-
-                            override fun onResourceReady(
-                                resource: Drawable?,
-                                model: Any?,
-                                target: Target<Drawable>?,
-                                dataSource: DataSource?,
-                                isFirstResource: Boolean
-                            ): Boolean = false
-                        })
-                        .apply {
-                            if (BuildConfig.CENSOR)
-                                override(5, 8)
-                        }.let { launch(Dispatchers.Main) { it.into(galleryblock_thumbnail) } }
-                }
-
-                if (timerTask == null)
-                    timerTask = timer.schedule(0, 1000) {
-                        updateProgress(context, galleryID)
+                galleryblock_thumbnail.apply {
+                    setOnClickListener {
+                        view.performClick()
                    }
+                    setOnLongClickListener {
+                        view.performLongClick()
+                    }
+                    setFailureImage(ContextCompat.getDrawable(context, R.drawable.image_broken_variant))
+                    setImageLoaderCallback(object: ImageLoader.Callback {
+                        override fun onFail(error: Exception?) {
+                            Cache.getInstance(context, galleryID).let { cache ->
+                                cache.cacheFolder.getChild(".thumbnail").let { if (it.exists()) it.delete() }
+                                cache.downloadFolder?.getChild(".thumbnail")?.let { if (it.exists()) it.delete() }
+                            }
+                        }
+
+                        override fun onCacheHit(imageType: Int, image: File?) {}
+                        override fun onCacheMiss(imageType: Int, image: File?) {}
+                        override fun onFinish() {}
+                        override fun onProgress(progress: Int) {}
+                        override fun onStart() {}
+                        override fun onSuccess(image: File?) {}
+                    })
+                    ssiv?.recycle()
+                    CoroutineScope(Dispatchers.IO).launch {
+                        cache.getThumbnail().let { launch(Dispatchers.Main) {
+                            showImage(it)
+                        } }
+                    }
+                }

                galleryblock_title.text = galleryBlock.title
                with(galleryblock_artist) {
-                    text = artists.joinToString(", ") { it.wordCapitalize() }
+                    text = artists.joinToString { it.wordCapitalize() }
                    visibility = when {
                        artists.isNotEmpty() -> View.VISIBLE
                        else -> View.GONE
                    }
+
+                    CoroutineScope(Dispatchers.IO).launch {
+                        val gallery = runCatching {
+                            getGallery(galleryID)
+                        }.getOrNull()
+
+                        if (gallery?.groups?.isNotEmpty() != true)
+                            return@launch
+
+                        launch(Dispatchers.Main) {
+                            text = context.getString(
+                                R.string.galleryblock_artist_with_group,
+                                artists.joinToString { it.wordCapitalize() },
+                                gallery.groups.joinToString { it.wordCapitalize() }
+                            )
+                        }
+                    }
                }
                with(galleryblock_series) {
                    text =
@@ -221,16 +222,37 @@ class GalleryBlockAdapter(private val glide: RequestManager, private val galleri
                    }
                }

-                galleryblock_tag_group.removeAllViews()
-                CoroutineScope(Dispatchers.Default).launch {
-                    galleryBlock.relatedTags.map {
-                        TagChip(context, Tag.parse(it)).apply {
-                            setOnClickListener { view ->
-                                for (callback in onChipClickedHandler)
-                                    callback.invoke((view as TagChip).tag)
-                            }
+                with(galleryblock_tag_group) {
+                    onClickListener = {
+                        onChipClickedHandler.forEach { callback ->
+                            callback.invoke(it)
                        }
-                    }.let { launch(Dispatchers.Main) { it.forEach { galleryblock_tag_group.addView(it) } } }
+                    }
+
+                    tags.clear()
+
+                    CoroutineScope(Dispatchers.IO).launch {
+                        tags.addAll(
+                            galleryBlock.relatedTags.sortedBy {
+                                val tag = Tag.parse(it)
+
+                                if (favoriteTags.contains(tag))
+                                    -1
+                                else
+                                    when(Tag.parse(it).area) {
+                                        "female" -> 0
+                                        "male" -> 1
+                                        else -> 2
+                                    }
+                            }.map {
+                                Tag.parse(it)
+                            }
+                        )
+
+                        launch(Dispatchers.Main) {
+                            refresh()
+                        }
+                    }
                }

                galleryblock_id.text = galleryBlock.id.toString()
@@ -273,9 +295,7 @@ class GalleryBlockAdapter(private val glide: RequestManager, private val galleri


                // Make some views invisible to make it thinner
-                if (isThin) {
-                    galleryblock_language.visibility = View.GONE
-                    galleryblock_type.visibility = View.GONE
+                if (thin) {
                    galleryblock_tag_group.visibility = View.GONE
                }
            }
@@ -370,15 +390,6 @@ class GalleryBlockAdapter(private val glide: RequestManager, private val galleri
        }
    }

-    override fun onViewDetachedFromWindow(holder: RecyclerView.ViewHolder) {
-        super.onViewDetachedFromWindow(holder)
-
-        if (holder is GalleryViewHolder) {
-            holder.timerTask?.cancel()
-            holder.timerTask = null
-        }
-    }
-
    override fun getItemCount() =
        galleries.size +
        (if (showNext) 1 else 0) +
--- a/app/src/main/java/xyz/quaver/pupil/adapters/ReaderAdapter.kt
+++ b/app/src/main/java/xyz/quaver/pupil/adapters/ReaderAdapter.kt
@@ -18,57 +18,94 @@

 package xyz.quaver.pupil.adapters

-import android.graphics.drawable.Drawable
+import android.content.Context
+import android.graphics.DiscretePathEffect
+import android.graphics.drawable.Animatable
+import android.net.Uri
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
+import android.widget.ImageView
 import androidx.constraintlayout.widget.ConstraintLayout
+import androidx.core.content.ContextCompat
+import androidx.core.view.updateLayoutParams
 import androidx.recyclerview.widget.RecyclerView
-import com.bumptech.glide.Glide
-import com.bumptech.glide.load.DataSource
-import com.bumptech.glide.load.engine.DiskCacheStrategy
-import com.bumptech.glide.load.engine.GlideException
-import com.bumptech.glide.load.model.GlideUrl
-import com.bumptech.glide.load.model.LazyHeaders
-import com.bumptech.glide.request.RequestListener
-import com.bumptech.glide.request.target.Target
+import com.davemorrissey.labs.subscaleview.SubsamplingScaleImageView
+import com.facebook.drawee.backends.pipeline.Fresco
+import com.facebook.drawee.controller.BaseControllerListener
+import com.facebook.drawee.drawable.ScalingUtils
+import com.facebook.drawee.interfaces.DraweeController
+import com.facebook.drawee.view.SimpleDraweeView
+import com.facebook.imagepipeline.image.ImageInfo
+import com.github.piasy.biv.view.BigImageView
+import com.github.piasy.biv.view.ImageShownCallback
+import com.github.piasy.biv.view.ImageViewFactory
 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 kotlinx.coroutines.*
 import xyz.quaver.hitomi.Reader
-import xyz.quaver.hitomi.getReferer
-import xyz.quaver.hitomi.imageUrlFromImage
-import xyz.quaver.hiyobi.createImgList
-import xyz.quaver.pupil.BuildConfig
 import xyz.quaver.pupil.R
-import xyz.quaver.pupil.services.DownloadService
 import xyz.quaver.pupil.ui.ReaderActivity
-import xyz.quaver.pupil.util.Preferences
 import xyz.quaver.pupil.util.downloader.Cache
-import java.util.*
-import kotlin.concurrent.schedule
+import java.io.File
 import kotlin.math.roundToInt

-class ReaderAdapter(private val activity: ReaderActivity,
-                    private val galleryID: Int) : RecyclerView.Adapter<ReaderAdapter.ViewHolder>() {
+class ReaderAdapter(
+    private val activity: ReaderActivity,
+    private val galleryID: Int
+) : RecyclerView.Adapter<ReaderAdapter.ViewHolder>() {

    var reader: Reader? = null
-    val timer = Timer()
-
-    private val glide = Glide.with(activity)

    var isFullScreen = false

-    var onItemClickListener : ((Int) -> (Unit))? = null
+    var onItemClickListener : (() -> (Unit))? = null

-    class ViewHolder(val view: View) : RecyclerView.ViewHolder(view)
+    class ViewHolder(val view: View) : RecyclerView.ViewHolder(view) {
+        fun clear() {
+            view.image.mainView.let {
+                when (it) {
+                    is SubsamplingScaleImageView ->
+                        it.recycle()
+                    is SimpleDraweeView ->
+                        it.controller = null
+                }
+            }
+        }
+    }

    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): ViewHolder {
        return LayoutInflater.from(parent.context).inflate(
            R.layout.item_reader, parent, false
        ).let {
+            with(it) {
+                image.setImageViewFactory(FrescoImageViewFactory().apply {
+                    updateView = { imageInfo ->
+                        it.image.updateLayoutParams<ConstraintLayout.LayoutParams> {
+                            dimensionRatio = "${imageInfo.width}:${imageInfo.height}"
+                        }
+                    }
+                })
+                image.setImageShownCallback(object : ImageShownCallback {
+                    override fun onMainImageShown() {
+                        it.image.mainView.let { v ->
+                            when (v) {
+                                is SubsamplingScaleImageView ->
+                                    if (!isFullScreen) it.image.layoutParams.height = ViewGroup.LayoutParams.WRAP_CONTENT
+                            }
+                        }
+                    }
+
+                    override fun onThumbnailShown() {}
+                })
+                image.setFailureImage(ContextCompat.getDrawable(context, R.drawable.image_broken_variant))
+                image.setOnClickListener {
+                    this.performClick()
+                }
+                setOnClickListener {
+                    onItemClickListener?.invoke()
+                }
+            }
+
            ViewHolder(it)
        }
    }
@@ -80,126 +117,134 @@ class ReaderAdapter(private val activity: ReaderActivity,
        if (cache == null)
            cache = Cache.getInstance(holder.view.context, galleryID)

-        if (isFullScreen) {
-            holder.view.layoutParams.height = ConstraintLayout.LayoutParams.MATCH_PARENT
+        if (!isFullScreen) {
+            holder.view.setBackgroundResource(R.drawable.reader_item_boundary)
+            holder.view.image.updateLayoutParams<ConstraintLayout.LayoutParams> {
+                height = 0
+                dimensionRatio =
+                    "${reader!!.galleryInfo.files[position].width}:${reader!!.galleryInfo.files[position].height}"
+            }
        } else {
-            holder.view.layoutParams.height = ConstraintLayout.LayoutParams.WRAP_CONTENT
-
-            (holder.view.progress_layout.layoutParams as ConstraintLayout.LayoutParams)
-                .dimensionRatio = "${reader!!.galleryInfo.files[position].width}:${reader!!.galleryInfo.files[position].height}"
-        }
-
-        holder.view.image.setOnPhotoTapListener { _, _, _ ->
-            onItemClickListener?.invoke(position)
-        }
-
-        holder.view.setOnClickListener {
-            onItemClickListener?.invoke(position)
+            holder.view.layoutParams.height = ViewGroup.LayoutParams.MATCH_PARENT
+            holder.view.image.updateLayoutParams<ConstraintLayout.LayoutParams> {
+                height = ConstraintLayout.LayoutParams.MATCH_PARENT
+                dimensionRatio = null
+            }
+            holder.view.background = null
        }

        holder.view.reader_index.text = (position+1).toString()

-        if (Preferences["cache_disable"]) {
-            val lowQuality: Boolean = Preferences["low_quality"]
+        val image = cache!!.getImage(position)
+        val progress = activity.downloader?.progress?.get(galleryID)?.get(position)

-            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)
-                else -> null
-            }
-            holder.view.image.post {
-                glide
-                    .load(url!!)
-                    .diskCacheStrategy(DiskCacheStrategy.NONE)
-                    .skipMemoryCache(false)
-                    .error(R.drawable.image_broken_variant)
-                    .apply {
-                        if (BuildConfig.CENSOR)
-                            override(5, 8)
-                        else
-                            override(
-                                holder.view.context.resources.displayMetrics.widthPixels,
-                                holder.view.context.resources.getDimensionPixelSize(R.dimen.reader_max_height)
-                            )
-                    }
-                    .error(R.drawable.image_broken_variant)
-                    .into(holder.view.image)
-            }
+        if (progress?.isInfinite() == true && image != null) {
+            holder.view.progress_group.visibility = View.INVISIBLE
+            holder.view.image.showImage(image.uri)
        } else {
-            val image = cache!!.getImage(position)
-            val progress = activity.downloader?.progress?.get(galleryID)?.get(position)
+            holder.view.progress_group.visibility = View.VISIBLE
+            holder.view.reader_item_progressbar.progress =
+                if (progress?.isInfinite() == true)
+                    100
+                else
+                    progress?.roundToInt() ?: 0

-            if (progress?.isInfinite() == true && image != null) {
-                holder.view.reader_item_progressbar.visibility = View.INVISIBLE
+            holder.clear()

-                CoroutineScope(Dispatchers.IO).launch {
-                    glide
-                        .load(image.uri)
-                        .diskCacheStrategy(DiskCacheStrategy.NONE)
-                        .skipMemoryCache(true)
-                        .apply {
-                            if (BuildConfig.CENSOR)
-                                override(5, 8)
-                            else
-                                override(
-                                    holder.view.context.resources.displayMetrics.widthPixels,
-                                    holder.view.context.resources.getDimensionPixelSize(R.dimen.reader_max_height)
-                                )
-                        }
-                        .error(R.drawable.image_broken_variant)
-                        .listener(object: RequestListener<Drawable> {
-                            override fun onLoadFailed(
-                                e: GlideException?,
-                                model: Any?,
-                                target: Target<Drawable>?,
-                                isFirstResource: Boolean
-                            ): Boolean {
-                                cache!!.metadata.imageList?.set(position, null)
-                                image.delete()
-                                DownloadService.cancel(holder.view.context, galleryID)
-                                DownloadService.download(holder.view.context, galleryID, true)
-                                return true
-                            }
-
-                            override fun onResourceReady(
-                                resource: Drawable?,
-                                model: Any?,
-                                target: Target<Drawable>?,
-                                dataSource: DataSource?,
-                                isFirstResource: Boolean
-                            ) = false
-                        }).let { launch(Dispatchers.Main) { it.into(holder.view.image) } }
-                }
-            } else {
-                holder.view.reader_item_progressbar.visibility = View.VISIBLE
-
-                glide.clear(holder.view.image)
-
-                holder.view.reader_item_progressbar.progress =
-                    if (progress?.isInfinite() == true)
-                        100
-                    else
-                        progress?.roundToInt() ?: 0
-
-                holder.view.image.setImageDrawable(null)
-
-                timer.schedule(1000) {
-                    CoroutineScope(Dispatchers.Main).launch {
-                        notifyItemChanged(position)
-                    }
-                }
+            CoroutineScope(Dispatchers.Main).launch {
+                delay(1000)
+                notifyItemChanged(position)
            }
        }
    }

    override fun getItemCount() = reader?.galleryInfo?.files?.size ?: 0

+    override fun onViewRecycled(holder: ViewHolder) {
+        holder.clear()
+    }
+
+}
+
+class FrescoImageViewFactory : ImageViewFactory() {
+    var updateView: ((ImageInfo) -> Unit)? = null
+
+    override fun createAnimatedImageView(
+        context: Context, imageType: Int,
+        initScaleType: Int
+    ): View {
+        val view = SimpleDraweeView(context)
+        view.hierarchy.actualImageScaleType = scaleType(initScaleType)
+        return view
+    }
+
+    override fun loadAnimatedContent(
+        view: View, imageType: Int,
+        imageFile: File
+    ) {
+        if (view is SimpleDraweeView) {
+            val controller: DraweeController = Fresco.newDraweeControllerBuilder()
+                .setUri(Uri.parse("file://" + imageFile.absolutePath))
+                .setAutoPlayAnimations(true)
+                .setControllerListener(object: BaseControllerListener<ImageInfo>() {
+                    override fun onIntermediateImageSet(id: String?, imageInfo: ImageInfo?) {
+                        imageInfo?.let { updateView?.invoke(it) }
+                    }
+
+                    override fun onFinalImageSet(id: String?, imageInfo: ImageInfo?, animatable: Animatable?) {
+                        imageInfo?.let { updateView?.invoke(it) }
+                    }
+                })
+                .build()
+            view.controller = controller
+        }
+    }
+
+    override fun createThumbnailView(
+        context: Context,
+        scaleType: ImageView.ScaleType, willLoadFromNetwork: Boolean
+    ): View {
+        return if (willLoadFromNetwork) {
+            val thumbnailView = SimpleDraweeView(context)
+            thumbnailView.hierarchy.actualImageScaleType = scaleType(scaleType)
+            thumbnailView
+        } else {
+            super.createThumbnailView(context, scaleType, false)
+        }
+    }
+
+    override fun loadThumbnailContent(view: View, thumbnail: Uri) {
+        if (view is SimpleDraweeView) {
+            val controller: DraweeController = Fresco.newDraweeControllerBuilder()
+                .setUri(thumbnail)
+                .build()
+            view.controller = controller
+        }
+    }
+
+    private fun scaleType(value: Int): ScalingUtils.ScaleType {
+        return when (value) {
+            BigImageView.INIT_SCALE_TYPE_CENTER -> ScalingUtils.ScaleType.CENTER
+            BigImageView.INIT_SCALE_TYPE_CENTER_CROP -> ScalingUtils.ScaleType.CENTER_CROP
+            BigImageView.INIT_SCALE_TYPE_CENTER_INSIDE -> ScalingUtils.ScaleType.CENTER_INSIDE
+            BigImageView.INIT_SCALE_TYPE_FIT_END -> ScalingUtils.ScaleType.FIT_END
+            BigImageView.INIT_SCALE_TYPE_FIT_START -> ScalingUtils.ScaleType.FIT_START
+            BigImageView.INIT_SCALE_TYPE_FIT_XY -> ScalingUtils.ScaleType.FIT_XY
+            BigImageView.INIT_SCALE_TYPE_FIT_CENTER -> ScalingUtils.ScaleType.FIT_CENTER
+            else -> ScalingUtils.ScaleType.FIT_CENTER
+        }
+    }
+
+    private fun scaleType(scaleType: ImageView.ScaleType): ScalingUtils.ScaleType {
+        return when (scaleType) {
+            ImageView.ScaleType.CENTER -> ScalingUtils.ScaleType.CENTER
+            ImageView.ScaleType.CENTER_CROP -> ScalingUtils.ScaleType.CENTER_CROP
+            ImageView.ScaleType.CENTER_INSIDE -> ScalingUtils.ScaleType.CENTER_INSIDE
+            ImageView.ScaleType.FIT_END -> ScalingUtils.ScaleType.FIT_END
+            ImageView.ScaleType.FIT_START -> ScalingUtils.ScaleType.FIT_START
+            ImageView.ScaleType.FIT_XY -> ScalingUtils.ScaleType.FIT_XY
+            ImageView.ScaleType.FIT_CENTER -> ScalingUtils.ScaleType.FIT_CENTER
+            else -> ScalingUtils.ScaleType.FIT_CENTER
+        }
+    }
 }
--- a/app/src/main/java/xyz/quaver/pupil/adapters/ThumbnailAdapter.kt
+++ b/app/src/main/java/xyz/quaver/pupil/adapters/ThumbnailAdapter.kt
@@ -18,32 +18,35 @@

 package xyz.quaver.pupil.adapters

+import android.net.Uri
 import android.view.ViewGroup
-import android.widget.ImageView
+import androidx.core.content.ContextCompat
 import androidx.recyclerview.widget.RecyclerView
-import com.bumptech.glide.RequestManager
-import com.bumptech.glide.load.engine.DiskCacheStrategy
-import xyz.quaver.pupil.BuildConfig
+import com.github.piasy.biv.view.BigImageView
+import xyz.quaver.pupil.R

-class ThumbnailAdapter(private val glide: RequestManager, var thumbnails: List<String>) : RecyclerView.Adapter<ThumbnailAdapter.ViewHolder>() {
+class ThumbnailAdapter(var thumbnails: List<String>) : RecyclerView.Adapter<ThumbnailAdapter.ViewHolder>() {

-    class ViewHolder(val view: ImageView) : RecyclerView.ViewHolder(view)
+    class ViewHolder(val view: BigImageView) : RecyclerView.ViewHolder(view) {
+        fun clear() {
+            view.ssiv?.recycle()
+        }
+    }

    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): ViewHolder {
-        return ViewHolder(ImageView(parent.context))
+        return ViewHolder(BigImageView(parent.context).apply {
+            setFailureImage(ContextCompat.getDrawable(context, R.drawable.image_broken_variant))
+        })
    }

    override fun onBindViewHolder(holder: ViewHolder, position: Int) {
-        glide
-            .load(thumbnails[position])
-            .diskCacheStrategy(DiskCacheStrategy.NONE)
-            .apply {
-                if (BuildConfig.CENSOR)
-                    override(5, 8)
-            }
-            .into(holder.view)
+        holder.view.showImage(Uri.parse(thumbnails[position]))
    }

    override fun getItemCount() = thumbnails.size

+    override fun onViewRecycled(holder: ViewHolder) {
+        holder.clear()
+    }
+
 }
--- a/app/src/main/java/xyz/quaver/pupil/adapters/ThumbnailPageAdapter.kt
+++ b/app/src/main/java/xyz/quaver/pupil/adapters/ThumbnailPageAdapter.kt
@@ -21,17 +21,19 @@ package xyz.quaver.pupil.adapters
 import android.view.ViewGroup
 import androidx.recyclerview.widget.GridLayoutManager
 import androidx.recyclerview.widget.RecyclerView
-import com.bumptech.glide.RequestManager
 import kotlin.math.min

-class ThumbnailPageAdapter(private val glide: RequestManager, private val thumbnails: List<String>) : RecyclerView.Adapter<ThumbnailPageAdapter.ViewHolder>() {
+class ThumbnailPageAdapter(private val thumbnails: List<String>) : RecyclerView.Adapter<ThumbnailPageAdapter.ViewHolder>() {

    class ViewHolder(val view: RecyclerView) : RecyclerView.ViewHolder(view)

    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): ViewHolder {
        return ViewHolder(RecyclerView(parent.context).apply {
-            layoutManager = GridLayoutManager(parent.context, 3)
-            adapter = ThumbnailAdapter(glide, listOf())
+            val layoutManager = GridLayoutManager(parent.context, 3)
+            val adapter = ThumbnailAdapter(listOf())
+
+            this.layoutManager = layoutManager
+            this.adapter = adapter
            layoutParams = ViewGroup.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.MATCH_PARENT)
        })
    }
@@ -41,7 +43,7 @@ class ThumbnailPageAdapter(private val glide: RequestManager, private val thumbn
            thumbnails = this@ThumbnailPageAdapter.thumbnails.slice(9*position until min(9*position+9, this@ThumbnailPageAdapter.thumbnails.size))
            notifyDataSetChanged()

-            holder.view.layoutManager?.scrollToPosition(itemCount-1)
+            (holder.view.layoutManager as GridLayoutManager).scrollToPosition(8)
        }
    }

--- a/app/src/main/java/xyz/quaver/pupil/services/DownloadService.kt
+++ b/app/src/main/java/xyz/quaver/pupil/services/DownloadService.kt
@@ -23,12 +23,10 @@ import android.app.PendingIntent
 import android.app.Service
 import android.content.Context
 import android.content.Intent
-import android.util.SparseArray
 import androidx.core.app.NotificationCompat
 import androidx.core.app.NotificationManagerCompat
 import androidx.core.app.TaskStackBuilder
 import androidx.core.content.ContextCompat
-import com.google.firebase.crashlytics.FirebaseCrashlytics
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.Job
@@ -38,18 +36,19 @@ import okhttp3.Callback
 import okhttp3.Response
 import okhttp3.ResponseBody
 import okio.*
-import xyz.quaver.pupil.PupilInterceptor
-import xyz.quaver.pupil.R
-import xyz.quaver.pupil.client
-import xyz.quaver.pupil.interceptors
+import xyz.quaver.pupil.*
 import xyz.quaver.pupil.ui.ReaderActivity
-import xyz.quaver.pupil.util.Preferences
+import xyz.quaver.pupil.util.cleanCache
 import xyz.quaver.pupil.util.downloader.Cache
 import xyz.quaver.pupil.util.downloader.DownloadManager
 import xyz.quaver.pupil.util.ellipsize
 import xyz.quaver.pupil.util.normalizeID
 import xyz.quaver.pupil.util.requestBuilders
 import java.io.IOException
+import java.util.*
+import java.util.concurrent.ConcurrentHashMap
+import kotlin.math.ceil
+import kotlin.math.log10

 private typealias ProgressListener = (DownloadService.Tag, Long, Long, Boolean) -> Unit
 class DownloadService : Service() {
@@ -68,7 +67,7 @@ class DownloadService : Service() {
            .setOngoing(true)
    }

-    private val notification = SparseArray<NotificationCompat.Builder?>()
+    private val notification = ConcurrentHashMap<Int, NotificationCompat.Builder?>()

    private fun initNotification(galleryID: Int) {
        val intent = Intent(this, ReaderActivity::class.java)
@@ -89,7 +88,7 @@ class DownloadService : Service() {
                    PendingIntent.FLAG_UPDATE_CURRENT),
            ).build()

-        notification.put(galleryID, NotificationCompat.Builder(this, "download").apply {
+        notification[galleryID] = NotificationCompat.Builder(this, "download").apply {
            setContentTitle(getString(R.string.reader_loading))
            setContentText(getString(R.string.reader_notification_text))
            setSmallIcon(R.drawable.ic_notification)
@@ -97,7 +96,7 @@ class DownloadService : Service() {
            addAction(action)
            setProgress(0, 0, true)
            setOngoing(true)
-        })
+        }

        notify(galleryID)
    }
@@ -122,7 +121,7 @@ class DownloadService : Service() {
                .setProgress(max, progress, false)
                .setContentText("$progress/$max")

-        if (DownloadManager.getInstance(this).getDownloadFolder(galleryID) != null)
+        if (DownloadManager.getInstance(this).getDownloadFolder(galleryID) != null || galleryID == priority)
            notification.let { notificationManager.notify(galleryID, it.build()) }
        else
            notificationManager.cancel(galleryID)
@@ -196,7 +195,8 @@ class DownloadService : Service() {
    *  0 <= value < 100 -> Download in progress
    *  Float.POSITIVE_INFINITY -> Download completed
    */
-    val progress = SparseArray<MutableList<Float>?>()
+    val progress = ConcurrentHashMap<Int, MutableList<Float>>()
+    var priority = 0

    fun isCompleted(galleryID: Int) = progress[galleryID]?.toList()?.all { it == Float.POSITIVE_INFINITY } == true

@@ -218,10 +218,11 @@ class DownloadService : Service() {

            kotlin.runCatching {
                val image = response.also { if (it.code() != 200) throw IOException() }.body()?.use { it.bytes() } ?: throw Exception()
+                val padding = ceil(progress[galleryID]?.size?.let { log10(it.toFloat()) } ?: 0F).toInt()

                CoroutineScope(Dispatchers.IO).launch {
                    kotlin.runCatching {
-                        Cache.getInstance(this@DownloadService, galleryID).putImage(index, "$index.$ext", image)
+                        Cache.getInstance(this@DownloadService, galleryID).putImage(index, "${index.toString().padStart(padding, '0')}.$ext", image)
                    }.onSuccess {
                        progress[galleryID]?.set(index, Float.POSITIVE_INFINITY)
                        notify(galleryID)
@@ -287,14 +288,16 @@ class DownloadService : Service() {
    fun delete(galleryID: Int, startId: Int? = null) = CoroutineScope(Dispatchers.IO).launch {
        cancel(galleryID)
        DownloadManager.getInstance(this@DownloadService).deleteDownloadFolder(galleryID)
-        Cache.delete(galleryID)
+        Cache.delete(this@DownloadService, galleryID)

        startId?.let { stopSelf(it) }
    }

    fun download(galleryID: Int, priority: Boolean = false, startId: Int? = null): Job = CoroutineScope(Dispatchers.IO).launch {
-        if (progress.indexOfKey(galleryID) >= 0)
-            cancel(galleryID)
+        if (DownloadManager.getInstance(this@DownloadService).isDownloading(galleryID))
+            return@launch
+
+        cleanCache(this@DownloadService)

        val cache = Cache.getInstance(this@DownloadService, galleryID)

@@ -305,33 +308,15 @@ class DownloadService : Service() {
        // Gallery doesn't exist
        if (reader == null) {
            delete(galleryID)
-            progress.put(galleryID, null)
+            progress[galleryID] = mutableListOf()
            return@launch
        }

-        progress.put(galleryID, MutableList(reader.galleryInfo.files.size) { 0F })
+        histories.add(galleryID)

-        FirebaseCrashlytics.getInstance().log(
-            """
-                GALLERYID: $galleryID
-                CACHE: ${cache.findFile(".metadata")}
-                PATTERN: ${Preferences["download_folder_name", ""]}
-                READER ID: ${reader.galleryInfo.id}
-                READER SIZE: ${reader.galleryInfo.files.size}
-                CACHE READER ID: ${cache.metadata.reader?.galleryInfo?.id}}
-                CACHE READER SIZE: ${cache.metadata.reader?.galleryInfo?.files?.size}
-            """.trimIndent()
-        )
+        progress[galleryID] = MutableList(reader.galleryInfo.files.size) { 0F }

        cache.metadata.imageList?.let {
-            if (progress[galleryID]?.size != it.size) {
-                cache.metadata.imageList?.filterNotNull()?.forEach { file ->
-                    cache.findFile(file)?.delete()
-                }
-                cache.metadata.imageList = MutableList(reader.galleryInfo.files.size) { null }
-                return@let
-            }
-
            it.forEachIndexed { index, image ->
                progress[galleryID]?.set(index, if (image != null) Float.POSITIVE_INFINITY else 0F)
            }
@@ -362,7 +347,7 @@ class DownloadService : Service() {
        }

        reader.requestBuilders.forEachIndexed { index, it ->
-            if (progress[galleryID]?.get(index)?.isInfinite() != true) {
+            if (progress[galleryID]?.get(index)?.isInfinite() == false) {
                val request = it.tag(Tag(galleryID, index, startId)).build()
                client.newCall(request).enqueue(callback)
            }
--- a/app/src/main/java/xyz/quaver/pupil/types/Suggestions.kt
+++ b/app/src/main/java/xyz/quaver/pupil/types/Suggestions.kt
@@ -18,36 +18,33 @@

 package xyz.quaver.pupil.types

-import com.arlib.floatingsearchview.suggestions.model.SearchSuggestion
+import kotlinx.android.parcel.IgnoredOnParcel
 import kotlinx.android.parcel.Parcelize
+import xyz.quaver.floatingsearchview.suggestions.model.SearchSuggestion
 import xyz.quaver.hitomi.Suggestion
+import xyz.quaver.pupil.util.translations

@Parcelize
 data class TagSuggestion(val s: String, val t: Int, val u: String, val n: String) : SearchSuggestion {
    constructor(s: Suggestion) : this(s.s, s.t, s.u, s.n)

-    override fun getBody(): String {
-        return s
-    }
+    @IgnoredOnParcel
+    override val body =
+        if (translations[s] != null)
+            "${translations[s]} ($s)"
+        else
+            s
 }

@Parcelize
-class Suggestion(val str: String) : SearchSuggestion {
-    override fun getBody() = str
-}
+class Suggestion(override val body: String) : SearchSuggestion

@Parcelize
-class NoResultSuggestion(val str: String) : SearchSuggestion {
-    override fun getBody() = str
-}
+class NoResultSuggestion(override val body: String) : SearchSuggestion

@Parcelize
-class LoadingSuggestion(val str: String) : SearchSuggestion {
-    override fun getBody() = str
-}
+class LoadingSuggestion(override val body: String) : SearchSuggestion

@Parcelize
@Suppress("PARCELABLE_PRIMARY_CONSTRUCTOR_IS_EMPTY")
-class FavoriteHistorySwitch(private val body: String) : SearchSuggestion {
-    override fun getBody() = body
-}
+class FavoriteHistorySwitch(override val body: String) : SearchSuggestion
--- a/app/src/main/java/xyz/quaver/pupil/ui/BaseActivity.kt
+++ b/app/src/main/java/xyz/quaver/pupil/ui/BaseActivity.kt
@@ -23,6 +23,7 @@ import android.content.Intent
 import android.os.Bundle
 import android.os.PersistableBundle
 import android.view.WindowManager
+import androidx.activity.result.contract.ActivityResultContracts
 import androidx.annotation.CallSuper
 import androidx.appcompat.app.AppCompatActivity
 import xyz.quaver.pupil.R
@@ -34,6 +35,13 @@ open class BaseActivity : AppCompatActivity() {

    private var locked: Boolean = true

+    private val lockLauncher = registerForActivityResult(ActivityResultContracts.StartActivityForResult()) {
+        if (it.resultCode == Activity.RESULT_OK)
+            locked = false
+        else
+            finish()
+    }
+
    @CallSuper
    override fun onCreate(savedInstanceState: Bundle?, persistentState: PersistableBundle?) {
        super.onCreate(savedInstanceState, persistentState)
@@ -53,20 +61,7 @@ open class BaseActivity : AppCompatActivity() {
            window.clearFlags(WindowManager.LayoutParams.FLAG_SECURE)

        if (locked)
-            startActivityForResult(Intent(this, LockActivity::class.java), R.id.request_lock.normalizeID())
-    }
-
-    @CallSuper
-    override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?) {
-        when(requestCode) {
-            R.id.request_lock.normalizeID() -> {
-                if (resultCode == Activity.RESULT_OK)
-                    locked = false
-                else
-                    finish()
-            }
-            else -> super.onActivityResult(requestCode, resultCode, data)
-        }
+            lockLauncher.launch(Intent(this, LockActivity::class.java))
    }

 }
--- a/app/src/main/java/xyz/quaver/pupil/ui/MainActivity.kt
+++ b/app/src/main/java/xyz/quaver/pupil/ui/MainActivity.kt
@@ -23,17 +23,19 @@ import android.content.Intent
 import android.net.Uri
 import android.os.Bundle
 import android.text.InputType
-import android.view.*
-import android.widget.*
+import android.text.util.Linkify
+import android.view.KeyEvent
+import android.view.MenuItem
+import android.view.MotionEvent
+import android.view.View
+import android.widget.EditText
+import android.widget.ImageView
+import android.widget.LinearLayout
+import android.widget.TextView
 import androidx.appcompat.app.AlertDialog
 import androidx.appcompat.app.AppCompatDelegate
 import androidx.cardview.widget.CardView
 import androidx.core.view.GravityCompat
-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.google.android.material.appbar.AppBarLayout
 import com.google.android.material.navigation.NavigationView
 import com.google.android.material.snackbar.Snackbar
@@ -41,6 +43,10 @@ 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 xyz.quaver.floatingsearchview.FloatingSearchView
+import xyz.quaver.floatingsearchview.suggestions.model.SearchSuggestion
+import xyz.quaver.floatingsearchview.util.view.MenuView
+import xyz.quaver.floatingsearchview.util.view.SearchInputView
 import xyz.quaver.hitomi.doSearch
 import xyz.quaver.hitomi.getGalleryIDsFromNozomi
 import xyz.quaver.hitomi.getSuggestionsForQuery
@@ -50,9 +56,13 @@ import xyz.quaver.pupil.services.DownloadService
 import xyz.quaver.pupil.types.*
 import xyz.quaver.pupil.ui.dialog.DownloadLocationDialogFragment
 import xyz.quaver.pupil.ui.dialog.GalleryDialog
-import xyz.quaver.pupil.util.*
+import xyz.quaver.pupil.util.ItemClickSupport
+import xyz.quaver.pupil.util.Preferences
+import xyz.quaver.pupil.util.checkUpdate
 import xyz.quaver.pupil.util.downloader.Cache
 import xyz.quaver.pupil.util.downloader.DownloadManager
+import xyz.quaver.pupil.util.restore
+import java.util.regex.Pattern
 import kotlin.math.abs
 import kotlin.math.ceil
 import kotlin.math.min
@@ -60,7 +70,6 @@ import kotlin.math.roundToInt

 class MainActivity :
    BaseActivity(),
-    FloatingSearchView.OnMenuItemClickListener,
    NavigationView.OnNavigationItemSelectedListener
 {

@@ -96,7 +105,6 @@ class MainActivity :
    private var loadingJob: Job? = null
    private var currentPage = 0

-
    override fun onCreate(savedInstanceState: Bundle?) {
        AppCompatDelegate.setCompatVectorFromResourcesEnabled(true)
        super.onCreate(savedInstanceState)
@@ -141,7 +149,7 @@ class MainActivity :
    override fun onDestroy() {
        super.onDestroy()

-        (main_recyclerview?.adapter as? GalleryBlockAdapter)?.timer?.cancel()
+        (main_recyclerview?.adapter as? GalleryBlockAdapter)?.updateAll = false
    }

    override fun onKeyDown(keyCode: Int, event: KeyEvent?): Boolean {
@@ -181,20 +189,6 @@ class MainActivity :
        }
    }

-    override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?) {
-        when(requestCode) {
-            R.id.request_settings.normalizeID() -> {
-                runOnUiThread {
-                    cancelFetch()
-                    clearGalleries()
-                    fetchGalleries(query, sortMode)
-                    loadBlocks()
-                }
-            }
-            else -> super.onActivityResult(requestCode, resultCode, data)
-        }
-    }
-
    private fun initView() {
        var prevP1 = 0
        main_appbar_layout.addOnOffsetChangedListener(
@@ -213,6 +207,8 @@ class MainActivity :
            }
        )

+        Linkify.addLinks(main_noresult, Pattern.compile(getString(R.string.https_text)), null, null, { _, _ -> getString(R.string.https) })
+
        //NavigationView
        main_nav_view.setNavigationItemSelectedListener(this)

@@ -262,11 +258,7 @@ class MainActivity :
                    if (it?.isEmpty() == false) {
                        val galleryID = it.random()

-                        GalleryDialog(
-                            this@MainActivity,
-                            Glide.with(this@MainActivity),
-                            galleryID
-                        ).apply {
+                        GalleryDialog(this@MainActivity, galleryID).apply {
                            onChipClickedHandler.add {
                                runOnUiThread {
                                    query = it.toQuery()
@@ -297,12 +289,22 @@ class MainActivity :
                    setTitle(R.string.main_open_gallery_by_id)

                    setPositiveButton(android.R.string.ok) { _, _ ->
-                            val galleryID = editText.text.toString().toIntOrNull() ?: return@setPositiveButton
-                            val intent = Intent(this@MainActivity, ReaderActivity::class.java).apply {
-                                putExtra("galleryID", galleryID)
-                            }
+                        val galleryID = editText.text.toString().toIntOrNull() ?: return@setPositiveButton

-                            startActivity(intent)
+                        GalleryDialog(this@MainActivity, galleryID).apply {
+                            onChipClickedHandler.add {
+                                runOnUiThread {
+                                    query = it.toQuery()
+                                    currentPage = 0
+
+                                    cancelFetch()
+                                    clearGalleries()
+                                    fetchGalleries(query, sortMode)
+                                    loadBlocks()
+                                }
+                                dismiss()
+                            }
+                        }.show()
                    }
                }.show()
            }
@@ -317,7 +319,7 @@ class MainActivity :
    @SuppressLint("ClickableViewAccessibility")
    private fun setupRecyclerView() {
        with(main_recyclerview) {
-            adapter = GalleryBlockAdapter(Glide.with(this@MainActivity), galleries).apply {
+            adapter = GalleryBlockAdapter(galleries).apply {
                onChipClickedHandler.add {
                    runOnUiThread {
                        query = it.toQuery()
@@ -331,16 +333,13 @@ class MainActivity :
                }
                onDownloadClickedHandler = { position ->
                    val galleryID = galleries[position]
-                    if (Preferences["cache_disable"])
-                        Toast.makeText(context, R.string.settings_download_when_cache_disable_warning, Toast.LENGTH_SHORT).show()
+
+                    if (DownloadManager.getInstance(context).isDownloading(galleryID)) {     //download in progress
+                        DownloadService.cancel(this@MainActivity, galleryID)
+                    }
                    else {
-                        if (DownloadManager.getInstance(context).isDownloading(galleryID)) {     //download in progress
-                            DownloadService.cancel(this@MainActivity, galleryID)
-                        }
-                        else {
-                            DownloadManager.getInstance(context).addDownloadFolder(galleryID)
-                            DownloadService.download(this@MainActivity, galleryID)
-                        }
+                        DownloadManager.getInstance(context).addDownloadFolder(galleryID)
+                        DownloadService.download(this@MainActivity, galleryID)
                    }

                    closeAllItems()
@@ -381,13 +380,9 @@ class MainActivity :
                    if (v !is CardView)
                        return@listener false

-                    val galleryID = galleries[position]
+                    val galleryID = galleries.getOrNull(position) ?: return@listener true

-                    GalleryDialog(
-                        this@MainActivity,
-                        Glide.with(this@MainActivity),
-                        galleryID
-                    ).apply {
+                    GalleryDialog(this@MainActivity, galleryID).apply {
                        onChipClickedHandler.add {
                            runOnUiThread {
                                query = it.toQuery()
@@ -620,14 +615,14 @@ class MainActivity :
            else -> {
                searchHistory.map {
                    Suggestion(it)
-                }.takeLast(20) + FavoriteHistorySwitch(getString(R.string.search_show_tags))
+                }.takeLast(10) + FavoriteHistorySwitch(getString(R.string.search_show_tags))
            }
        }.reversed()

    private var suggestionJob : Job? = null
    private fun setupSearchBar() {
-        with(main_searchview as FloatingSearchViewDayNight) {
-            setOnLeftMenuClickListener(object: FloatingSearchView.OnLeftMenuClickListener {
+        with(main_searchview as xyz.quaver.pupil.ui.view.FloatingSearchView) {
+            onMenuStatusChangeListener = object: FloatingSearchView.OnMenuStatusChangeListener {
                override fun onMenuOpened() {
                    (this@MainActivity.main_recyclerview.adapter as GalleryBlockAdapter).closeAllItems()
                }
@@ -635,7 +630,15 @@ class MainActivity :
                override fun onMenuClosed() {
                    //Do Nothing
                }
-            })
+            }
+
+            post {
+                findViewById<MenuView>(R.id.menu_view).menuItems.firstOrNull {
+                    (it as MenuItem).itemId == R.id.main_menu_thin
+                }?.let {
+                    (it as MenuItem).isChecked = Preferences["thin"]
+                }
+            }

            onHistoryDeleteClickedListener = {
                searchHistory.remove(it)
@@ -646,9 +649,11 @@ class MainActivity :
                swapSuggestions(defaultSuggestions)
            }

-            setOnMenuItemClickListener(this@MainActivity)
+            onMenuItemClickListener = {
+                onActionMenuItemSelected(it)
+            }

-            setOnQueryChangeListener { _, query ->
+            onQueryChangeListener = lambda@{ _, query ->
                this@MainActivity.query = query

                suggestionJob?.cancel()
@@ -656,12 +661,14 @@ class MainActivity :
                if (query.isEmpty() or query.endsWith(' ')) {
                    swapSuggestions(defaultSuggestions)

-                    return@setOnQueryChangeListener
+                    return@lambda
                }

                swapSuggestions(listOf(LoadingSuggestion(getText(R.string.reader_loading).toString())))

-                val currentQuery = query.split(" ").last().replace('_', ' ')
+                val currentQuery = query.split(" ").last()
+                    .replace(Regex("^-"), "")
+                    .replace('_', ' ')

                suggestionJob = CoroutineScope(Dispatchers.IO).launch {
                    val suggestions = kotlin.runCatching {
@@ -682,7 +689,7 @@ class MainActivity :
                }
            }

-            setOnFocusChangeListener(object: FloatingSearchView.OnFocusChangeListener {
+            onFocusChangeListener = object: FloatingSearchView.OnFocusChangeListener {
                override fun onFocus() {
                    if (query.isEmpty() or query.endsWith(' '))
                        swapSuggestions(defaultSuggestions)
@@ -699,19 +706,24 @@ class MainActivity :
                        loadBlocks()
                    }
                }
-            })
+            }

            attachNavigationDrawerToMenuButton(main_drawer_layout)
        }
    }

-    override fun onActionMenuItemSelected(item: MenuItem?) {
+    fun onActionMenuItemSelected(item: MenuItem?) {
        when(item?.itemId) {
-            R.id.main_menu_settings -> startActivityForResult(Intent(this@MainActivity, SettingsActivity::class.java), R.id.request_settings.normalizeID())
+            R.id.main_menu_settings -> startActivity(Intent(this@MainActivity, SettingsActivity::class.java))
            R.id.main_menu_thin -> {
+                val thin = !item.isChecked
+
+                item.isChecked = thin
                main_recyclerview.apply {
                    (adapter as GalleryBlockAdapter).apply {
-                        isThin = !isThin
+                        this.thin = thin
+
+                        Preferences["thin"] = thin
                    }

                    adapter = adapter       // Force to redraw
@@ -969,14 +981,4 @@ class MainActivity :
            }
        }
    }
-
-    override fun onLowMemory() {
-        super.onLowMemory()
-        Glide.get(this).onLowMemory()
-    }
-
-    override fun onTrimMemory(level: Int) {
-        super.onTrimMemory(level)
-        Glide.get(this).onTrimMemory(level)
-    }
 }
--- a/app/src/main/java/xyz/quaver/pupil/ui/ReaderActivity.kt
+++ b/app/src/main/java/xyz/quaver/pupil/ui/ReaderActivity.kt
@@ -33,17 +33,14 @@ import android.view.animation.Animation
 import android.view.animation.AnticipateInterpolator
 import android.view.animation.OvershootInterpolator
 import android.view.animation.TranslateAnimation
-import android.widget.Toast
 import androidx.activity.result.contract.ActivityResultContracts
 import androidx.appcompat.app.AlertDialog
 import androidx.core.content.ContextCompat
-import androidx.preference.PreferenceManager
 import androidx.recyclerview.widget.LinearLayoutManager
 import androidx.recyclerview.widget.PagerSnapHelper
 import androidx.recyclerview.widget.RecyclerView
 import androidx.vectordrawable.graphics.drawable.Animatable2Compat
 import androidx.vectordrawable.graphics.drawable.AnimatedVectorDrawableCompat
-import com.bumptech.glide.Glide
 import com.google.android.material.snackbar.Snackbar
 import com.google.firebase.crashlytics.FirebaseCrashlytics
 import com.google.mlkit.vision.face.Face
@@ -60,7 +57,6 @@ import xyz.quaver.Code
 import xyz.quaver.pupil.R
 import xyz.quaver.pupil.adapters.ReaderAdapter
 import xyz.quaver.pupil.favorites
-import xyz.quaver.pupil.histories
 import xyz.quaver.pupil.services.DownloadService
 import xyz.quaver.pupil.util.Preferences
 import xyz.quaver.pupil.util.camera
@@ -68,8 +64,6 @@ import xyz.quaver.pupil.util.closeCamera
 import xyz.quaver.pupil.util.downloader.Cache
 import xyz.quaver.pupil.util.downloader.DownloadManager
 import xyz.quaver.pupil.util.startCamera
-import java.util.*
-import kotlin.concurrent.schedule

 class ReaderActivity : BaseActivity() {

@@ -88,7 +82,12 @@ class ReaderActivity : BaseActivity() {
    var downloader: DownloadService? = null
    private val conn = object: ServiceConnection {
        override fun onServiceConnected(name: ComponentName?, service: IBinder?) {
-            downloader = (service as DownloadService.Binder).service
+            downloader = (service as DownloadService.Binder).service.also {
+                it.priority = 0
+
+                if (!it.progress.containsKey(galleryID))
+                    DownloadService.download(this@ReaderActivity, galleryID, true)
+            }
        }

        override fun onServiceDisconnected(name: ComponentName?) {
@@ -96,7 +95,6 @@ class ReaderActivity : BaseActivity() {
        }
    }

-    private val timer = Timer()
    private val snapHelper = PagerSnapHelper()
    private var menu: Menu? = null

@@ -118,7 +116,6 @@ class ReaderActivity : BaseActivity() {

    private var cameraEnabled = false
    private var eyeType: Eye? = null
-    private var eyeCount: Int = 0
    private var eyeTime: Long = 0L

    override fun onCreate(savedInstanceState: Bundle?) {
@@ -137,38 +134,7 @@ class ReaderActivity : BaseActivity() {
            return
        }

-        if (Preferences["cache_disable"]) {
-            reader_download_progressbar.visibility = View.GONE
-            CoroutineScope(Dispatchers.IO).launch {
-                val reader = cache.getReader()
-
-                launch(Dispatchers.Main) initDownloader@{
-                    if (reader == null) {
-                        Snackbar
-                            .make(reader_layout, R.string.reader_failed_to_find_gallery, Snackbar.LENGTH_INDEFINITE)
-                            .show()
-                        return@initDownloader
-                    }
-
-                    histories.add(galleryID)
-                    (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()
-
+        initDownloadListener()
        initView()
    }

@@ -248,6 +214,8 @@ class ReaderActivity : BaseActivity() {
    override fun onResume() {
        super.onResume()

+        bindService(Intent(this, DownloadService::class.java), conn, BIND_AUTO_CREATE)
+
        if (cameraEnabled)
            startCamera(this, cameraCallback)
    }
@@ -255,19 +223,20 @@ class ReaderActivity : BaseActivity() {
    override fun onPause() {
        super.onPause()
        closeCamera()
+
+        if (downloader != null)
+            unbindService(conn)
+
+        downloader?.priority = galleryID
    }

    override fun onDestroy() {
        super.onDestroy()

-        timer.cancel()
-        (reader_recyclerview?.adapter as? ReaderAdapter)?.timer?.cancel()
+        update = false

        if (!DownloadManager.getInstance(this).isDownloading(galleryID))
            DownloadService.cancel(this, galleryID)
-
-        if (downloader != null)
-            unbindService(conn)
    }

    override fun onBackPressed() {
@@ -302,47 +271,51 @@ class ReaderActivity : BaseActivity() {
        }
    }

-    private fun initDownloader() {
-        DownloadService.download(this, galleryID, true)
-        bindService(Intent(this, DownloadService::class.java), conn, BIND_AUTO_CREATE)
+    private var update = true
+    private fun initDownloadListener() {
+        CoroutineScope(Dispatchers.Main).launch {
+            while (update) {
+                delay(1000)

-        timer.schedule(1000, 1000) {
-            val downloader = downloader ?: return@schedule
+                val downloader = downloader ?: continue

-            if (downloader.progress.indexOfKey(galleryID) < 0)  //loading
-                return@schedule
+                if (!downloader.progress.containsKey(galleryID))  //loading
+                    continue

-            if (downloader.progress[galleryID] == null) {      //Gallery not found
-                timer.cancel()
-                Snackbar
-                    .make(reader_layout, R.string.reader_failed_to_find_gallery, Snackbar.LENGTH_INDEFINITE)
-                    .show()
-            }
+                if (downloader.progress[galleryID]?.isEmpty() == true) {      //Gallery not found
+                    update = false
+                    Snackbar
+                        .make(reader_layout, R.string.reader_failed_to_find_gallery, Snackbar.LENGTH_INDEFINITE)
+                        .show()

-            histories.add(galleryID)
+                    return@launch
+                }

-            runOnUiThread {
                reader_download_progressbar.max = reader_recyclerview.adapter?.itemCount ?: 0
-                reader_download_progressbar.progress = downloader.progress[galleryID]?.count { it.isInfinite() } ?: 0
+                reader_download_progressbar.progress =
+                    downloader.progress[galleryID]?.count { it.isInfinite() } ?: 0

                if (title == getString(R.string.reader_loading)) {
                    val reader = cache.metadata.reader

                    if (reader != null) {
-                        with (reader_recyclerview.adapter as ReaderAdapter) {
+                        with(reader_recyclerview.adapter as ReaderAdapter) {
                            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_menu_page_indicator)?.title =
+                            "$currentPage/${reader.galleryInfo.files.size}"

-                        menu?.findItem(R.id.reader_type)?.icon = ContextCompat.getDrawable(this@ReaderActivity,
+                        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
-                            })
+                            }
+                        )
                    }
                }

@@ -395,19 +368,15 @@ class ReaderActivity : BaseActivity() {
            animateDownloadFAB(DownloadManager.getInstance(this@ReaderActivity).getDownloadFolder(galleryID) != null) //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 {
-                    val downloadManager = DownloadManager.getInstance(this@ReaderActivity)
+                val downloadManager = DownloadManager.getInstance(this@ReaderActivity)

-                    if (downloadManager.isDownloading(galleryID)) {
-                        downloadManager.deleteDownloadFolder(galleryID)
-                        animateDownloadFAB(false)
-                    } else {
-                        downloadManager.addDownloadFolder(galleryID)
-                        DownloadService.download(context, galleryID, true)
-                        animateDownloadFAB(true)
-                    }
+                if (downloadManager.isDownloading(galleryID)) {
+                    downloadManager.deleteDownloadFolder(galleryID)
+                    animateDownloadFAB(false)
+                } else {
+                    downloadManager.addDownloadFolder(galleryID)
+                    DownloadService.download(context, galleryID, true)
+                    animateDownloadFAB(true)
                }
            }
        }
@@ -564,28 +533,23 @@ class ReaderActivity : BaseActivity() {
            // Both closed / opened
            !left.xor(right) -> {
                eyeType = null
-                eyeCount = 0
                eyeTime = 0L
            }
            !left -> {
                if (eyeType != Eye.LEFT) {
                    eyeType = Eye.LEFT
-                    eyeCount = 0
                    eyeTime = System.currentTimeMillis()
                }
-                eyeCount++
            }
            !right -> {
                if (eyeType != Eye.RIGHT) {
                    eyeType = Eye.RIGHT
-                    eyeCount = 0
                    eyeTime = System.currentTimeMillis()
                }
-                eyeCount++
            }
        }

-        if (eyeCount > 3 && System.currentTimeMillis() - eyeTime > 500) {
+        if (eyeType != null && System.currentTimeMillis() - eyeTime > 100) {
            (this@ReaderActivity.reader_recyclerview.layoutManager as LinearLayoutManager).let {
                it.scrollToPositionWithOffset(when(eyeType!!) {
                    Eye.RIGHT -> {
@@ -597,9 +561,7 @@ class ReaderActivity : BaseActivity() {
                }, 0)
            }

-            eyeType = null
-            eyeCount = 0
-            eyeTime = 0L
+            eyeTime = System.currentTimeMillis() + 500
        }
    }

@@ -643,14 +605,4 @@ class ReaderActivity : BaseActivity() {
            }
        }
    }
-
-    override fun onLowMemory() {
-        super.onLowMemory()
-        Glide.get(this).onLowMemory()
-    }
-
-    override fun onTrimMemory(level: Int) {
-        super.onTrimMemory(level)
-        Glide.get(this).onTrimMemory(level)
-    }
 }
--- a/app/src/main/java/xyz/quaver/pupil/ui/SettingsActivity.kt
+++ b/app/src/main/java/xyz/quaver/pupil/ui/SettingsActivity.kt
@@ -18,24 +18,10 @@

 package xyz.quaver.pupil.ui

-import android.annotation.SuppressLint
-import android.app.Activity
-import android.content.Intent
-import android.content.pm.PackageManager
 import android.os.Bundle
 import android.view.MenuItem
-import android.view.WindowManager
-import androidx.appcompat.app.AppCompatActivity
-import com.google.android.material.snackbar.Snackbar
-import kotlinx.serialization.decodeFromString
-import kotlinx.serialization.json.Json
 import xyz.quaver.pupil.R
-import xyz.quaver.pupil.favorites
-import xyz.quaver.pupil.ui.fragment.LockSettingsFragment
 import xyz.quaver.pupil.ui.fragment.SettingsFragment
-import xyz.quaver.pupil.util.Preferences
-import xyz.quaver.pupil.util.normalizeID
-import java.nio.charset.Charset

 class SettingsActivity : BaseActivity() {

@@ -56,19 +42,4 @@ class SettingsActivity : BaseActivity() {

        return true
    }
-
-    @SuppressLint("InlinedApi")
-    override fun onRequestPermissionsResult(requestCode: Int, permissions: Array<out String>, grantResults: IntArray) {
-        when (requestCode) {
-            R.id.request_write_permission_and_saf.normalizeID() -> {
-                if (grantResults.firstOrNull() == PackageManager.PERMISSION_GRANTED) {
-                    val intent = Intent(Intent.ACTION_OPEN_DOCUMENT_TREE).apply {
-                        putExtra("android.content.extra.SHOW_ADVANCED", true)
-                    }
-
-                    startActivityForResult(intent, R.id.request_download_folder.normalizeID())
-                }
-            }
-        }
-    }
 }
--- a/app/src/main/java/xyz/quaver/pupil/ui/dialog/DownloadFolderNameDialogFragment.kt
+++ b/app/src/main/java/xyz/quaver/pupil/ui/dialog/DownloadFolderNameDialogFragment.kt
@@ -39,7 +39,7 @@ class DownloadFolderNameDialogFragment : DialogFragment() {

    @SuppressLint("InflateParams")
    private fun build(): View {
-        val galleryID = Cache.instances.let { if (it.size() == 0) 1199708 else it.keyAt((0 until it.size()).random()) }
+        val galleryID = Cache.instances.let { if (it.size == 0) 1199708 else it.keys.elementAt((0 until it.size).random()) }
        val galleryBlock = runBlocking {
            Cache.getInstance(requireContext(), galleryID).getGalleryBlock()
        }
--- a/app/src/main/java/xyz/quaver/pupil/ui/dialog/DownloadLocationDialogFragment.kt
+++ b/app/src/main/java/xyz/quaver/pupil/ui/dialog/DownloadLocationDialogFragment.kt
@@ -26,26 +26,87 @@ import android.os.Build
 import android.os.Bundle
 import android.view.View
 import android.widget.LinearLayout
+import androidx.activity.result.contract.ActivityResultContracts
 import androidx.appcompat.app.AlertDialog
 import androidx.core.content.ContextCompat
 import androidx.core.net.toUri
 import androidx.fragment.app.DialogFragment
 import com.google.android.material.snackbar.Snackbar
+import kotlinx.android.synthetic.main.dialog_download_folder_name.view.*
 import kotlinx.android.synthetic.main.item_download_folder.view.*
 import net.rdrei.android.dirchooser.DirectoryChooserActivity
 import net.rdrei.android.dirchooser.DirectoryChooserConfig
 import xyz.quaver.io.FileX
+import xyz.quaver.io.util.toFile
 import xyz.quaver.pupil.R
 import xyz.quaver.pupil.util.Preferences
 import xyz.quaver.pupil.util.byteToString
 import xyz.quaver.pupil.util.downloader.DownloadManager
 import xyz.quaver.pupil.util.migrate
-import xyz.quaver.pupil.util.normalizeID
 import java.io.File

 class DownloadLocationDialogFragment : DialogFragment() {
    private val entries = mutableMapOf<File?, View>()

+    private val requestDownloadFolderLauncher = registerForActivityResult(ActivityResultContracts.StartActivityForResult()) {
+        if (it.resultCode == Activity.RESULT_OK) {
+            val activity = activity ?: return@registerForActivityResult
+            val context = context ?: return@registerForActivityResult
+            val dialog = dialog ?: return@registerForActivityResult
+
+            it.data?.data?.also { uri ->
+                val takeFlags: Int =
+                    activity.intent.flags and
+                            (Intent.FLAG_GRANT_READ_URI_PERMISSION or Intent.FLAG_GRANT_WRITE_URI_PERMISSION)
+
+                if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.KITKAT)
+                    context.contentResolver.takePersistableUriPermission(uri, takeFlags)
+
+                if (kotlin.runCatching { FileX(context, uri).canWrite() }.getOrDefault(false)) {
+                    entries[null]?.location_available?.text = uri.toFile(context)?.canonicalPath
+                    Preferences["download_folder"] = uri.toString()
+                } else {
+                    Snackbar.make(
+                        dialog.window!!.decorView.rootView,
+                        R.string.settings_download_folder_not_writable,
+                        Snackbar.LENGTH_LONG
+                    ).show()
+
+                    val downloadFolder = DownloadManager.getInstance(context).downloadFolder.canonicalPath
+                    val key = entries.keys.firstOrNull { it?.canonicalPath == downloadFolder }
+                    entries[key]!!.button.isChecked = true
+                    if (key == null) entries[key]!!.location_available.text = downloadFolder
+                }
+            }
+        }
+    }
+
+    private val requestDownloadFolderOldLauncher = registerForActivityResult(ActivityResultContracts.StartActivityForResult()) {
+        val context = context ?: return@registerForActivityResult
+        val dialog = dialog ?: return@registerForActivityResult
+
+        if (it.resultCode == DirectoryChooserActivity.RESULT_CODE_DIR_SELECTED) {
+            val directory = it.data?.getStringExtra(DirectoryChooserActivity.RESULT_SELECTED_DIR)!!
+
+            if (!File(directory).canWrite()) {
+                Snackbar.make(
+                    dialog.window!!.decorView.rootView,
+                    R.string.settings_download_folder_not_writable,
+                    Snackbar.LENGTH_LONG
+                ).show()
+
+                val downloadFolder = DownloadManager.getInstance(context).downloadFolder.canonicalPath
+                val key = entries.keys.firstOrNull { it?.canonicalPath == downloadFolder }
+                entries[key]!!.button.isChecked = true
+                if (key == null) entries[key]!!.location_available.text = downloadFolder
+            }
+            else {
+                entries[null]?.location_available?.text = directory
+                Preferences["download_folder"] = File(directory).toURI().toString()
+            }
+        }
+    }
+
    @SuppressLint("InflateParams")
    private fun build() : View? {
        val context = context ?: return null
@@ -90,7 +151,7 @@ class DownloadLocationDialogFragment : DialogFragment() {
                        putExtra("android.content.extra.SHOW_ADVANCED", true)
                    }

-                    startActivityForResult(intent, R.id.request_download_folder.normalizeID())
+                    requestDownloadFolderLauncher.launch(intent)
                } else {    // Can't use SAF on old Androids!
                    val config = DirectoryChooserConfig.builder()
                        .newDirectoryName("Pupil")
@@ -101,7 +162,7 @@ class DownloadLocationDialogFragment : DialogFragment() {
                        putExtra(DirectoryChooserActivity.EXTRA_CONFIG, config)
                    }

-                    startActivityForResult(intent, R.id.request_download_folder_old.normalizeID())
+                    requestDownloadFolderOldLauncher.launch(intent)
                }
            }
            entries[null] = this
@@ -132,65 +193,4 @@ class DownloadLocationDialogFragment : DialogFragment() {

        return builder.create()
    }
-
-    override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?) {
-        when (requestCode) {
-            R.id.request_download_folder.normalizeID() -> {
-                if (resultCode == Activity.RESULT_OK) {
-                    val activity = activity ?: return
-                    val context = context ?: return
-                    val dialog = dialog ?: return
-
-                    data?.data?.also { uri ->
-                        val takeFlags: Int =
-                            activity.intent.flags and
-                                    (Intent.FLAG_GRANT_READ_URI_PERMISSION or Intent.FLAG_GRANT_WRITE_URI_PERMISSION)
-
-                        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.KITKAT)
-                            context.contentResolver.takePersistableUriPermission(uri, takeFlags)
-
-                        if (kotlin.runCatching { FileX(context, uri).canWrite() }.getOrDefault(false))
-                            Preferences["download_folder"] = uri.toString()
-                        else {
-                            Snackbar.make(
-                                dialog.window!!.decorView.rootView,
-                                R.string.settings_download_folder_not_writable,
-                                Snackbar.LENGTH_LONG
-                            ).show()
-
-                            val downloadFolder = DownloadManager.getInstance(context).downloadFolder.canonicalPath
-                            val key = entries.keys.firstOrNull { it?.canonicalPath == downloadFolder }
-                            entries[key]!!.button.isChecked = true
-                            if (key == null) entries[key]!!.location_available.text = downloadFolder
-                        }
-                    }
-                }
-            }
-            R.id.request_download_folder_old.normalizeID() -> {
-                val context = context ?: return
-                val dialog = dialog ?: return
-
-                if (resultCode == DirectoryChooserActivity.RESULT_CODE_DIR_SELECTED) {
-                    val directory = data?.getStringExtra(DirectoryChooserActivity.RESULT_SELECTED_DIR)!!
-
-                    if (!File(directory).canWrite()) {
-                        Snackbar.make(
-                            dialog.window!!.decorView.rootView,
-                            R.string.settings_download_folder_not_writable,
-                            Snackbar.LENGTH_LONG
-                        ).show()
-
-                        val downloadFolder = DownloadManager.getInstance(context).downloadFolder.canonicalPath
-                        val key = entries.keys.firstOrNull { it?.canonicalPath == downloadFolder }
-                        entries[key]!!.button.isChecked = true
-                        if (key == null) entries[key]!!.location_available.text = downloadFolder
-                    }
-                    else
-                        Preferences["download_folder"] = File(directory).toURI().toString()
-                }
-            }
-            else -> super.onActivityResult(requestCode, resultCode, data)
-        }
-    }
-
 }
--- a/app/src/main/java/xyz/quaver/pupil/ui/dialog/GalleryDialog.kt
+++ b/app/src/main/java/xyz/quaver/pupil/ui/dialog/GalleryDialog.kt
@@ -20,16 +20,17 @@ package xyz.quaver.pupil.ui.dialog

 import android.content.Context
 import android.content.Intent
+import android.net.Uri
 import android.os.Bundle
 import android.view.LayoutInflater
 import android.view.View
+import android.view.ViewGroup
 import android.widget.LinearLayout.LayoutParams
 import androidx.appcompat.app.AlertDialog
 import androidx.core.content.ContextCompat
 import androidx.recyclerview.widget.LinearLayoutManager
 import androidx.recyclerview.widget.RecyclerView
 import androidx.viewpager2.widget.ViewPager2
-import com.bumptech.glide.RequestManager
 import com.google.android.material.snackbar.Snackbar
 import kotlinx.android.synthetic.main.dialog_gallery.*
 import kotlinx.android.synthetic.main.dialog_gallery_details.view.*
@@ -41,10 +42,10 @@ import kotlinx.coroutines.launch
 import kotlinx.coroutines.withContext
 import xyz.quaver.hitomi.Gallery
 import xyz.quaver.hitomi.getGallery
-import xyz.quaver.pupil.BuildConfig
 import xyz.quaver.pupil.R
 import xyz.quaver.pupil.adapters.GalleryBlockAdapter
 import xyz.quaver.pupil.adapters.ThumbnailPageAdapter
+import xyz.quaver.pupil.favoriteTags
 import xyz.quaver.pupil.histories
 import xyz.quaver.pupil.types.Tag
 import xyz.quaver.pupil.ui.ReaderActivity
@@ -52,8 +53,10 @@ import xyz.quaver.pupil.ui.view.TagChip
 import xyz.quaver.pupil.util.ItemClickSupport
 import xyz.quaver.pupil.util.downloader.Cache
 import xyz.quaver.pupil.util.wordCapitalize
+import java.util.*
+import kotlin.collections.ArrayList

-class GalleryDialog(context: Context, private val glide: RequestManager, private val galleryID: Int) : AlertDialog(context) {
+class GalleryDialog(context: Context, private val galleryID: Int) : AlertDialog(context) {

    val onChipClickedHandler = ArrayList<((Tag) -> (Unit))>()

@@ -74,7 +77,6 @@ class GalleryDialog(context: Context, private val glide: RequestManager, private
                context.startActivity(Intent(context, ReaderActivity::class.java).apply {
                    putExtra("galleryID", galleryID)
                })
-                histories.add(galleryID)
            }
        }

@@ -104,19 +106,19 @@ class GalleryDialog(context: Context, private val glide: RequestManager, private
                        }
                    }

-                    glide
-                        .load(gallery.cover)
-                        .apply {
-                            if (BuildConfig.CENSOR)
-                                override(5, 8)
-                        }.into(gallery_cover)
+                    gallery_cover.showImage(Uri.parse(gallery.cover))

                    addDetails(gallery)
                    addThumbnails(gallery)
                    addRelated(gallery)
                }
            } catch (e: Exception) {
-                Snackbar.make(gallery_layout, R.string.unable_to_connect, Snackbar.LENGTH_INDEFINITE).show()
+                Snackbar.make(gallery_layout, R.string.unable_to_connect, Snackbar.LENGTH_INDEFINITE).apply {
+                    if (Locale.getDefault().language == "ko")
+                        setAction(context.getText(R.string.https_text)) {
+                            context.startActivity(Intent(Intent.ACTION_VIEW, Uri.parse(context.getString(R.string.https))))
+                        }
+                }.show()
            }
        }
    }
@@ -141,7 +143,18 @@ class GalleryDialog(context: Context, private val glide: RequestManager, private
                    listOf(gallery.language).map { Tag("language", it) },
                    gallery.series.map { Tag("series", it) },
                    gallery.characters.map { Tag("character", it) },
-                    gallery.tags.map {
+                    gallery.tags.sortedBy {
+                        val tag = Tag.parse(it)
+
+                        if (favoriteTags.contains(tag))
+                            -1
+                        else
+                            when(Tag.parse(it).area) {
+                                "female" -> 0
+                                "male" -> 1
+                                else -> 2
+                            }
+                    }.map {
                        Tag.parse(it).let { tag ->
                            when {
                                tag.area != null -> tag
@@ -183,7 +196,8 @@ class GalleryDialog(context: Context, private val glide: RequestManager, private
            gallery_details.setText(R.string.gallery_thumbnails)

            val pager = ViewPager2(context).apply {
-                adapter = ThumbnailPageAdapter(glide, gallery.thumbnails)
+                adapter = ThumbnailPageAdapter(gallery.thumbnails)
+                layoutParams = ViewGroup.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, LayoutParams.WRAP_CONTENT)
            }

            gallery_details_contents.addView(
@@ -203,7 +217,7 @@ class GalleryDialog(context: Context, private val glide: RequestManager, private
        val inflater = LayoutInflater.from(context)
        val galleries = ArrayList<Int>()

-        val adapter = GalleryBlockAdapter(glide, galleries).apply {
+        val adapter = GalleryBlockAdapter(galleries).apply {
            onChipClickedHandler.add { tag ->
                this@GalleryDialog.onChipClickedHandler.forEach { handler ->
                    handler.invoke(tag)
@@ -223,14 +237,9 @@ class GalleryDialog(context: Context, private val glide: RequestManager, private
                        context.startActivity(Intent(context, ReaderActivity::class.java).apply {
                            putExtra("galleryID", galleries[position])
                        })
-                        histories.add(galleries[position])
                    }
                    onItemLongClickListener = { _, position, _ ->
-                        GalleryDialog(
-                            context,
-                            glide,
-                            galleries[position]
-                        ).apply {
+                        GalleryDialog(context, galleries[position]).apply {
                            onChipClickedHandler.add { tag ->
                                this@GalleryDialog.onChipClickedHandler.forEach { it.invoke(tag) }
                            }
--- a/app/src/main/java/xyz/quaver/pupil/ui/dialog/ProxyDialog.kt
+++ b/app/src/main/java/xyz/quaver/pupil/ui/dialog/ProxyDialog.kt
@@ -44,8 +44,7 @@ import java.net.Proxy
 class ProxyDialog(context: Context) : AlertDialog(context) {

    override fun onCreate(savedInstanceState: Bundle?) {
-        setContentView(build())
-        window?.attributes?.width = ViewGroup.LayoutParams.MATCH_PARENT
+        setView(build())

        super.onCreate(savedInstanceState)
    }
--- a/app/src/main/java/xyz/quaver/pupil/ui/fragment/ManageStorageFragment.kt
+++ b/app/src/main/java/xyz/quaver/pupil/ui/fragment/ManageStorageFragment.kt
@@ -31,6 +31,7 @@ import xyz.quaver.io.util.deleteRecursively
 import xyz.quaver.pupil.R
 import xyz.quaver.pupil.histories
 import xyz.quaver.pupil.util.byteToString
+import xyz.quaver.pupil.util.downloader.Cache
 import xyz.quaver.pupil.util.downloader.DownloadManager
 import java.io.File

@@ -61,6 +62,8 @@ class ManageStorageFragment : PreferenceFragmentCompat(), Preference.OnPreferenc
                            if (dir.exists())
                                dir.deleteRecursively()

+                            Cache.instances.clear()
+
                            summary = context.getString(R.string.settings_storage_usage, byteToString(0))
                            CoroutineScope(Dispatchers.IO).launch {
                                var size = 0L
--- a/app/src/main/java/xyz/quaver/pupil/ui/fragment/SettingsFragment.kt
+++ b/app/src/main/java/xyz/quaver/pupil/ui/fragment/SettingsFragment.kt
@@ -21,26 +21,25 @@ package xyz.quaver.pupil.ui.fragment
 import android.app.Activity
 import android.content.*
 import android.os.Bundle
+import android.os.LocaleList
 import android.widget.Toast
+import androidx.activity.result.contract.ActivityResultContracts
 import androidx.appcompat.app.AppCompatDelegate
-import androidx.preference.Preference
-import androidx.preference.PreferenceCategory
-import androidx.preference.PreferenceFragmentCompat
-import androidx.preference.SwitchPreferenceCompat
+import androidx.core.os.LocaleListCompat
+import androidx.preference.*
 import com.google.android.gms.oss.licenses.OssLicensesMenuActivity
-import com.google.android.material.snackbar.Snackbar
-import kotlinx.serialization.decodeFromString
-import kotlinx.serialization.json.Json
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.launch
 import xyz.quaver.io.FileX
 import xyz.quaver.io.util.getChild
 import xyz.quaver.pupil.R
-import xyz.quaver.pupil.favorites
 import xyz.quaver.pupil.ui.LockActivity
 import xyz.quaver.pupil.ui.SettingsActivity
 import xyz.quaver.pupil.ui.dialog.*
 import xyz.quaver.pupil.util.*
 import xyz.quaver.pupil.util.downloader.DownloadManager
-import java.nio.charset.Charset
+import java.util.*

 class SettingsFragment :
    PreferenceFragmentCompat(),
@@ -48,6 +47,16 @@ class SettingsFragment :
    Preference.OnPreferenceChangeListener,
    SharedPreferences.OnSharedPreferenceChangeListener {

+    private val lockLauncher = registerForActivityResult(ActivityResultContracts.StartActivityForResult()) {
+        if (it.resultCode == Activity.RESULT_OK) {
+            parentFragmentManager
+                .beginTransaction()
+                .replace(R.id.settings, LockSettingsFragment())
+                .addToBackStack("Lock")
+                .commitAllowingStateLoss()
+        }
+    }
+
    override fun onResume() {
        super.onResume()

@@ -89,7 +98,7 @@ class SettingsFragment :
                    val intent = Intent(requireContext(), LockActivity::class.java).apply {
                        putExtra("force", true)
                    }
-                    startActivityForResult(intent, R.id.request_lock.normalizeID())
+                    lockLauncher.launch(intent)
                }
                "mirrors" -> {
                    MirrorDialog(requireContext())
@@ -117,6 +126,9 @@ class SettingsFragment :
            this ?: return false

            when (key) {
+                "tag_language" -> {
+                    updateTranslations()
+                }
                "nomedia" -> {
                    val create = (newValue as? Boolean) ?: return false

@@ -237,6 +249,25 @@ class SettingsFragment :

                            onPreferenceClickListener = this@SettingsFragment
                        }
+                        "tag_language" -> {
+                            this as ListPreference
+
+                            isEnabled = false
+
+                            CoroutineScope(Dispatchers.IO).launch {
+                                val languages = getAvailableLanguages().distinct().toTypedArray()
+
+                                entries = languages.map { Locale(it).let { loc -> loc.getDisplayLanguage(loc) } }.toTypedArray()
+                                entryValues = languages
+
+                                launch(Dispatchers.Main) {
+                                    isEnabled = true
+                                }
+                            }
+
+                            onPreferenceChangeListener = this@SettingsFragment
+
+                        }
                        "mirrors" -> {
                            onPreferenceClickListener = this@SettingsFragment
                        }
@@ -267,19 +298,4 @@ class SettingsFragment :
            }
        }
    }
-
-    override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?) {
-        when(requestCode) {
-            R.id.request_lock.normalizeID() -> {
-                if (resultCode == Activity.RESULT_OK) {
-                    parentFragmentManager
-                        .beginTransaction()
-                        .replace(R.id.settings, LockSettingsFragment())
-                        .addToBackStack("Lock")
-                        .commitAllowingStateLoss()
-                }
-            }
-            else -> super.onActivityResult(requestCode, resultCode, data)
-        }
-    }
 }
--- a/app/src/main/java/com/arlib/floatingsearchview/FloatingSearchViewDayNight.kt
+++ b/app/src/main/java/com/arlib/floatingsearchview/FloatingSearchViewDayNight.kt
@@ -16,7 +16,7 @@
 *     along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */

-package com.arlib.floatingsearchview
+package xyz.quaver.pupil.ui.view

 import android.content.Context
 import android.graphics.PorterDuff
@@ -36,32 +36,34 @@ import androidx.core.content.ContextCompat
 import androidx.core.content.res.ResourcesCompat
 import androidx.swiperefreshlayout.widget.CircularProgressDrawable
 import androidx.vectordrawable.graphics.drawable.AnimatedVectorDrawableCompat
-import com.arlib.floatingsearchview.suggestions.SearchSuggestionsAdapter
-import com.arlib.floatingsearchview.suggestions.model.SearchSuggestion
-import com.arlib.floatingsearchview.util.view.SearchInputView
+import xyz.quaver.floatingsearchview.FloatingSearchView
+import xyz.quaver.floatingsearchview.suggestions.model.SearchSuggestion
+import xyz.quaver.floatingsearchview.util.MenuPopupHelper
+import xyz.quaver.floatingsearchview.util.view.MenuView
+import xyz.quaver.floatingsearchview.util.view.SearchInputView
 import xyz.quaver.pupil.R
 import xyz.quaver.pupil.favoriteTags
 import xyz.quaver.pupil.types.*
 import java.util.*

-class FloatingSearchViewDayNight @JvmOverloads constructor(context: Context, attrs: AttributeSet? = null) :
+class FloatingSearchView @JvmOverloads constructor(context: Context, attrs: AttributeSet? = null) :
    FloatingSearchView(context, attrs),
    FloatingSearchView.OnSearchListener,
-    SearchSuggestionsAdapter.OnBindSuggestionCallback,
    TextWatcher
 {
-
    private val searchInputView = findViewById<SearchInputView>(R.id.search_bar_text)

    var onHistoryDeleteClickedListener: ((String) -> Unit)? = null
    var onFavoriteHistorySwitchClickListener: (() -> Unit)? = null

    init {
-        searchInputView.imeOptions = EditorInfo.IME_FLAG_NO_EXTRACT_UI
+        searchInputView.imeOptions = EditorInfo.IME_FLAG_NO_EXTRACT_UI or searchInputView.imeOptions

        searchInputView.addTextChangedListener(this)
-        setOnSearchListener(this)
-        setOnBindSuggestionCallback(this)
+        onSearchListener = this
+        onBindSuggestionCallback = { a, b, c, d, e ->
+            onBindSuggestion(a, b, c, d, e)
+        }
    }

    override fun beforeTextChanged(s: CharSequence?, start: Int, count: Int, after: Int) {
@@ -83,7 +85,7 @@ class FloatingSearchViewDayNight @JvmOverloads constructor(context: Context, att
        when (searchSuggestion) {
            is TagSuggestion -> {
                val tag = "${searchSuggestion.n}:${searchSuggestion.s.replace(Regex("\\s"), "_")}"
-                with(searchInputView.text) {
+                with(searchInputView.text!!) {
                    delete(if (lastIndexOf(' ') == -1) 0 else lastIndexOf(' ') + 1, length)

                    if (!this.contains(tag))
@@ -91,9 +93,9 @@ class FloatingSearchViewDayNight @JvmOverloads constructor(context: Context, att
                }
            }
            is Suggestion -> {
-                with(searchInputView.text) {
+                with(searchInputView.text!!) {
                    clear()
-                    append(searchSuggestion.str)
+                    append(searchSuggestion.body)
                }
            }
            is FavoriteHistorySwitch -> onFavoriteHistorySwitchClickListener?.invoke()
@@ -102,14 +104,14 @@ class FloatingSearchViewDayNight @JvmOverloads constructor(context: Context, att

    override fun onSearchAction(currentQuery: String?) {}

-    override fun onBindSuggestion(
+    fun onBindSuggestion(
        suggestionView: View?,
        leftIcon: ImageView?,
        textView: TextView?,
        item: SearchSuggestion?,
        itemPosition: Int
    ) {
-        when(item) {
+      when(item) {
            is TagSuggestion -> {
                val tag = "${item.n}:${item.s.replace(Regex("\\s"), "_")}"

@@ -162,9 +164,7 @@ class FloatingSearchViewDayNight @JvmOverloads constructor(context: Context, att
                    }
                }

-                if (item.t == -1) {
-                    textView?.text = item.s
-                } else {
+                if (item.t > 0) {
                    (suggestionView as? LinearLayout)?.let {
                        val count = it.findViewById<TextView>(R.id.count)
                        if (count == null)
@@ -199,7 +199,7 @@ class FloatingSearchViewDayNight @JvmOverloads constructor(context: Context, att
                    isClickable = true

                    setOnClickListener {
-                        onHistoryDeleteClickedListener?.invoke(item.str)
+                        onHistoryDeleteClickedListener?.invoke(item.body)
                    }
                }
            }
@@ -215,10 +215,4 @@ class FloatingSearchViewDayNight @JvmOverloads constructor(context: Context, att
            }
        }
    }
-
-    // hack to remove color attributes which should not be reused
-    override fun onSaveInstanceState(): Parcelable? {
-        super.onSaveInstanceState()
-        return null
-    }
-}
+}
--- a/app/src/main/java/xyz/quaver/pupil/ui/view/TagChip.kt
+++ b/app/src/main/java/xyz/quaver/pupil/ui/view/TagChip.kt
@@ -23,17 +23,19 @@ import android.content.Context
 import androidx.core.content.ContextCompat
 import com.google.android.material.chip.Chip
 import xyz.quaver.pupil.R
+import xyz.quaver.pupil.favoriteTags
 import xyz.quaver.pupil.types.Tag
+import xyz.quaver.pupil.util.translations
 import xyz.quaver.pupil.util.wordCapitalize

@SuppressLint("ViewConstructor")
-class TagChip(context: Context, tag: Tag) : Chip(context) {
+class TagChip(context: Context, _tag: Tag) : Chip(context) {

    val tag: Tag =
-        tag.let {
+        _tag.let {
            when {
                it.area != null -> it
-                else -> Tag("tag", tag.tag)
+                else -> Tag("tag", _tag.tag)
            }
        }

@@ -44,23 +46,52 @@ class TagChip(context: Context, tag: Tag) : Chip(context) {
    }.toMap()

    init {
-        chipIcon = when(tag.area) {
+        when(tag.area) {
            "male" -> {
                setChipBackgroundColorResource(R.color.material_blue_700)
                setTextColor(ContextCompat.getColor(context, android.R.color.white))
-                ContextCompat.getDrawable(context, R.drawable.gender_male_white)
+                setCloseIconTintResource(android.R.color.white)
+                chipIcon = ContextCompat.getDrawable(context, R.drawable.gender_male_white)
            }
            "female" -> {
                setChipBackgroundColorResource(R.color.material_pink_600)
                setTextColor(ContextCompat.getColor(context, android.R.color.white))
-                ContextCompat.getDrawable(context, R.drawable.gender_female_white)
+                setCloseIconTintResource(android.R.color.white)
+                chipIcon = ContextCompat.getDrawable(context, R.drawable.gender_female_white)
+            }
+        }
+
+        if (favoriteTags.contains(tag))
+            setChipBackgroundColorResource(R.color.material_orange_500)
+
+        isCloseIconVisible = true
+        closeIcon = ContextCompat.getDrawable(context,
+            if (favoriteTags.contains(tag))
+                R.drawable.ic_star_filled
+            else
+                R.drawable.ic_star_empty
+        )
+
+        setOnCloseIconClickListener {
+            if (favoriteTags.contains(tag)) {
+                favoriteTags.remove(tag)
+                closeIcon = ContextCompat.getDrawable(context, R.drawable.ic_star_empty)
+
+                when(tag.area) {
+                    "male" -> setChipBackgroundColorResource(R.color.material_blue_700)
+                    "female" -> setChipBackgroundColorResource(R.color.material_pink_600)
+                    else -> chipBackgroundColor = null
+                }
+            } else {
+                favoriteTags.add(tag)
+                closeIcon = ContextCompat.getDrawable(context, R.drawable.ic_star_filled)
+                setChipBackgroundColorResource(R.color.material_orange_500)
            }
-            else -> null
        }

        text = when (tag.area) {
            "language" -> languages[tag.tag]
-            else -> tag.tag.wordCapitalize()
+            else -> (translations[tag.tag] ?: tag.tag).wordCapitalize()
        }

        setEnsureMinTouchTargetSize(false)
--- a/app/src/main/java/xyz/quaver/pupil/ui/view/TagChipGroup.kt
+++ b/app/src/main/java/xyz/quaver/pupil/ui/view/TagChipGroup.kt
@@ -0,0 +1,101 @@
+/*
+ *     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.view
+
+import android.content.Context
+import android.content.res.TypedArray
+import android.util.AttributeSet
+import android.util.Log
+import com.google.android.material.chip.Chip
+import com.google.android.material.chip.ChipGroup
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.async
+import kotlinx.coroutines.launch
+import xyz.quaver.pupil.R
+import xyz.quaver.pupil.types.Tag
+import xyz.quaver.pupil.types.Tags
+
+class TagChipGroup @JvmOverloads constructor(context: Context, attr: AttributeSet? = null, attrStyle: Int = R.attr.chipGroupStyle, val tags: Tags = Tags()) : ChipGroup(context, attr, attrStyle), MutableSet<Tag> by tags {
+
+    object Defaults {
+        val maxChipSize = 10
+    }
+
+    var maxChipSize: Int = Defaults.maxChipSize
+        set(value) {
+            field = value
+
+            refresh()
+        }
+
+    private val moreView = Chip(context).apply {
+        text = "…"
+
+        setEnsureMinTouchTargetSize(false)
+
+        setOnClickListener {
+            removeView(this)
+
+            for (i in maxChipSize until tags.size) {
+                val tag = tags.elementAt(i)
+
+                addView(TagChip(context, tag).apply {
+                    setOnClickListener {
+                        onClickListener?.invoke(tag)
+                    }
+                })
+            }
+        }
+    }
+
+    var onClickListener: ((Tag) -> Unit)? = null
+
+    private fun applyAttributes(attr: TypedArray) {
+        maxChipSize = attr.getInt(R.styleable.TagChipGroup_maxTag, Defaults.maxChipSize)
+    }
+
+    fun refresh() {
+        this.removeAllViews()
+
+        CoroutineScope(Dispatchers.Main).launch {
+            tags.take(maxChipSize).map {
+                CoroutineScope(Dispatchers.Default).async {
+                    TagChip(context, it).apply {
+                        setOnClickListener {
+                            onClickListener?.invoke(this.tag)
+                        }
+                    }
+                }
+            }.forEach {
+                addView(it.await())
+            }
+
+            if (maxChipSize > 0 && tags.size > maxChipSize && parent == null)
+                addView(moreView)
+        }
+    }
+
+    init {
+        applyAttributes(context.obtainStyledAttributes(attr, R.styleable.TagChipGroup))
+
+        refresh()
+    }
+
+}
--- a/app/src/main/java/xyz/quaver/pupil/util/SavedSet.kt
+++ b/app/src/main/java/xyz/quaver/pupil/util/SavedSet.kt
@@ -22,8 +22,9 @@ import kotlinx.serialization.*
 import kotlinx.serialization.builtins.ListSerializer
 import kotlinx.serialization.json.Json
 import java.io.File
+import java.util.*

-class SavedSet <T: Any> (private val file: File, private val any: T, private val set: MutableSet<T> = mutableSetOf()) : MutableSet<T> by set {
+class SavedSet <T: Any> (private val file: File, private val any: T, private val set: MutableSet<T> = Collections.synchronizedSet(mutableSetOf())) : MutableSet<T> by set {

    @Suppress("UNCHECKED_CAST")
    @OptIn(ExperimentalSerializationApi::class)
--- a/app/src/main/java/xyz/quaver/pupil/util/SetLineOverlap.kt
+++ b/app/src/main/java/xyz/quaver/pupil/util/SetLineOverlap.kt
@@ -1,37 +0,0 @@
-package xyz.quaver.pupil.util
-
-import android.graphics.Paint
-import android.text.style.LineHeightSpan
-
-class SetLineOverlap(private val overlap: Boolean) : LineHeightSpan {
-    companion object {
-        private var originalBottom = 15
-        private var originalDescent = 13
-        private var overlapSaved = false
-    }
-
-    override fun chooseHeight(
-        text: CharSequence?,
-        start: Int,
-        end: Int,
-        spanstartv: Int,
-        lineHeight: Int,
-        fm: Paint.FontMetricsInt?
-    ) {
-        fm ?: return
-
-        if (overlap) {
-            if (overlapSaved) {
-                originalBottom = fm.bottom
-                originalDescent = fm.descent
-                overlapSaved = true
-            }
-            fm.bottom += fm.top
-            fm.descent += fm.top
-        } else {
-            fm.bottom = originalBottom
-            fm.descent = originalDescent
-            overlapSaved = false
-        }
-    }
-}
--- a/app/src/main/java/xyz/quaver/pupil/util/downloader/Cache.kt
+++ b/app/src/main/java/xyz/quaver/pupil/util/downloader/Cache.kt
@@ -20,10 +20,12 @@ package xyz.quaver.pupil.util.downloader

 import android.content.Context
 import android.content.ContextWrapper
-import android.util.SparseArray
+import android.net.Uri
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
+import kotlinx.coroutines.sync.Mutex
+import kotlinx.coroutines.sync.withLock
 import kotlinx.coroutines.withContext
 import kotlinx.serialization.Serializable
 import kotlinx.serialization.decodeFromString
@@ -37,7 +39,9 @@ import xyz.quaver.io.FileX
 import xyz.quaver.io.util.*
 import xyz.quaver.pupil.client
 import xyz.quaver.pupil.util.Preferences
+import java.io.File
 import java.io.IOException
+import java.util.concurrent.ConcurrentHashMap

@Serializable
 data class Metadata(
@@ -51,7 +55,7 @@ data class Metadata(
 class Cache private constructor(context: Context, val galleryID: Int) : ContextWrapper(context) {

    companion object {
-        val instances = SparseArray<Cache>()
+        val instances = ConcurrentHashMap<Int, Cache>()

        fun getInstance(context: Context, galleryID: Int) =
            instances[galleryID] ?: synchronized(this) {
@@ -59,9 +63,9 @@ class Cache private constructor(context: Context, val galleryID: Int) : ContextW
            }

        @Synchronized
-        fun delete(galleryID: Int) {
-            instances[galleryID]?.cacheFolder?.deleteRecursively()
-            instances.delete(galleryID)
+        fun delete(context: Context, galleryID: Int) {
+            File(context.cacheDir, "imageCache/$galleryID").deleteRecursively()
+            instances.remove(galleryID)
        }
    }

@@ -131,8 +135,8 @@ class Cache private constructor(context: Context, val galleryID: Int) : ContextW
    }

    @Suppress("BlockingMethodInNonBlockingContext")
-    suspend fun getThumbnail(): ByteArray? =
-        findFile(".thumbnail")?.readBytes()
+    suspend fun getThumbnail(): Uri =
+        findFile(".thumbnail")?.uri
            ?: getGalleryBlock()?.thumbnails?.firstOrNull()?.let { withContext(Dispatchers.IO) {
                kotlin.runCatching {
                    val request = Request.Builder()
@@ -140,10 +144,15 @@ class Cache private constructor(context: Context, val galleryID: Int) : ContextW
                        .build()

                    client.newCall(request).execute().also { if (it.code() != 200) throw IOException() }.body()?.use { it.bytes() }
-                }.getOrNull()?.also { kotlin.run {
-                    cacheFolder.getChild(".thumbnail").writeBytes(it)
-                } }
-            } }
+                }.getOrNull()?.let { thumbnail -> kotlin.runCatching {
+                    cacheFolder.getChild(".thumbnail").also {
+                        if (!it.exists())
+                            it.createNewFile()
+
+                        it.writeBytes(thumbnail)
+                    }
+                }.getOrNull()?.uri }
+            } } ?: Uri.EMPTY

    suspend fun getReader(): Reader? {
        val mirrors = Preferences.get<String>("mirrors").let { if (it.isEmpty()) emptyList() else it.split('>') }
@@ -185,64 +194,76 @@ class Cache private constructor(context: Context, val galleryID: Int) : ContextW
    }

    fun getImage(index: Int): FileX? =
-        metadata.imageList?.get(index)?.let { findFile(it) }
+        metadata.imageList?.getOrNull(index)?.let { findFile(it) }

    @Suppress("BlockingMethodInNonBlockingContext")
    fun putImage(index: Int, fileName: String, data: ByteArray) {
        val file = cacheFolder.getChild(fileName)

-        file.createNewFile()
+        if (!file.exists())
+            file.createNewFile()
        file.writeBytes(data)
        setMetadata { metadata -> metadata.imageList!![index] = fileName }
    }

+    private val lock = ConcurrentHashMap<Int, Mutex>()
    @Suppress("BlockingMethodInNonBlockingContext")
    fun moveToDownload() = CoroutineScope(Dispatchers.IO).launch {
        val downloadFolder = downloadFolder ?: return@launch

-        if (downloadFolder.getChild(".metadata").exists())
+        if (lock[galleryID]?.isLocked == true)
            return@launch

-        metadata.imageList?.forEach { imageName ->
-            imageName ?: return@forEach
-            val target = downloadFolder.getChild(imageName)
-            val source = cacheFolder.getChild(imageName)
+        (lock[galleryID] ?: Mutex().also { lock[galleryID] = it }).withLock {
+            val cacheMetadata = cacheFolder.getChild(".metadata")
+            val downloadMetadata = downloadFolder.getChild(".metadata")

-            if (!source.exists() || target.exists())
-                return@forEach
+            if (!cacheMetadata.exists())
+                return@launch

-            kotlin.runCatching {
-                target.createNewFile()
-                target.outputStream()?.use { target -> source.inputStream()?.use { source ->
-                    source.copyTo(target)
-                } }
+            if (cacheMetadata.exists()) {
+                kotlin.runCatching {
+                    if (!downloadMetadata.exists())
+                        downloadMetadata.createNewFile()
+
+                    downloadMetadata.writeText(Json.encodeToString(metadata))
+                }
            }
-        }

-        val cacheThumbnail = cacheFolder.getChild(".thumbnail")
-        val downloadThumbnail = downloadFolder.getChild(".thumbnail")
+            val cacheThumbnail = cacheFolder.getChild(".thumbnail")
+            val downloadThumbnail = downloadFolder.getChild(".thumbnail")

-        if (cacheThumbnail.exists() && !downloadThumbnail.exists()) {
-            kotlin.runCatching {
-                downloadThumbnail.createNewFile()
-                downloadThumbnail.outputStream()?.use { target -> cacheThumbnail.inputStream()?.use { source ->
-                    source.copyTo(target)
-                } }
-                cacheThumbnail.delete()
+            if (cacheThumbnail.exists()) {
+                kotlin.runCatching {
+                    if (!downloadThumbnail.exists())
+                        downloadThumbnail.createNewFile()
+
+                    downloadThumbnail.outputStream()?.use { target -> target.channel.truncate(0L); cacheThumbnail.inputStream()?.use { source ->
+                        source.copyTo(target)
+                    } }
+                    cacheThumbnail.delete()
+                }
            }
-        }

-        val cacheMetadata = cacheFolder.getChild(".metadata")
-        val downloadMetadata = downloadFolder.getChild(".metadata")
+            metadata.imageList?.forEach { imageName ->
+                imageName ?: return@forEach
+                val target = downloadFolder.getChild(imageName)
+                val source = cacheFolder.getChild(imageName)

-        if (cacheMetadata.exists() && !downloadMetadata.exists()) {
-            kotlin.runCatching {
-                downloadMetadata.createNewFile()
-                downloadMetadata.writeText(Json.encodeToString(metadata))
-                cacheMetadata.delete()
+                if (!source.exists())
+                    return@forEach
+
+                kotlin.runCatching {
+                    if (!target.exists())
+                        target.createNewFile()
+
+                    target.outputStream()?.use { target -> target.channel.truncate(0L); source.inputStream()?.use { source ->
+                        source.copyTo(target)
+                    } }
+                }
            }
-        }

-        cacheFolder.delete()
+            cacheFolder.deleteRecursively()
+        }
    }
 }
--- a/app/src/main/java/xyz/quaver/pupil/util/file.kt
+++ b/app/src/main/java/xyz/quaver/pupil/util/file.kt
@@ -19,35 +19,47 @@
 package xyz.quaver.pupil.util

 import android.content.Context
-import android.os.storage.StorageManager
-import androidx.core.content.ContextCompat
-import androidx.core.net.toUri
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.launch
+import kotlinx.coroutines.sync.Mutex
+import kotlinx.coroutines.sync.withLock
+import xyz.quaver.pupil.histories
+import xyz.quaver.pupil.util.downloader.Cache
+import xyz.quaver.pupil.util.downloader.DownloadManager
 import java.io.File
-import java.io.FileOutputStream
-import java.lang.reflect.Array
-import java.net.URL

-@Suppress("DEPRECATION")
-@Deprecated("Use downloader.Cache instead")
-fun getCachedGallery(context: Context, galleryID: Int) =
-    File(getDownloadDirectory(context), galleryID.toString()).let {
-        if (it.exists())
-            it
-        else
-            File(context.cacheDir, "imageCache/$galleryID")
+val mutex = Mutex()
+fun cleanCache(context: Context) = CoroutineScope(Dispatchers.IO).launch {
+    if (mutex.isLocked) return@launch
+
+    mutex.withLock {
+        val cacheFolder = File(context.cacheDir, "imageCache")
+        val downloadManager = DownloadManager.getInstance(context)
+
+        val limit = (Preferences.get<String>("cache_limit").toLongOrNull() ?: 0L)*1024*1024*1024
+
+        if (limit == 0L) return@withLock
+
+        val cacheSize = {
+            var size = 0L
+
+            cacheFolder.walk().forEach {
+                size += it.length()
+            }
+
+            size
+        }
+
+        if (cacheSize.invoke() > limit)
+            while (cacheSize.invoke() > limit/2) {
+                val caches = cacheFolder.list() ?: return@withLock
+
+                (histories.toList().firstOrNull {
+                    caches.contains(it.toString()) && !downloadManager.isDownloading(it)
+                } ?: return@withLock).let {
+                    Cache.delete(context, it)
+                }
+            }
    }
-
-@Suppress("DEPRECATION")
-@Deprecated("Use downloader.Cache instead")
-fun getDownloadDirectory(context: Context) =
-    Preferences.get<String>("dl_location").let {
-        if (it.isNotEmpty() && !it.startsWith("content"))
-            File(it)
-        else
-            context.getExternalFilesDir(null)!!
-    }
-
-@Suppress("DEPRECATION")
-@Deprecated("Use FileX instead")
-fun File.isParentOf(another: File) =
-    another.absolutePath.startsWith(this.absolutePath)
+}
--- a/app/src/main/java/xyz/quaver/pupil/util/misc.kt
+++ b/app/src/main/java/xyz/quaver/pupil/util/misc.kt
@@ -23,6 +23,9 @@ import android.content.Context
 import android.content.Intent
 import android.os.Build
 import androidx.core.content.ContextCompat
+import kotlinx.serialization.json.JsonElement
+import kotlinx.serialization.json.jsonArray
+import kotlinx.serialization.json.jsonObject
 import okhttp3.OkHttpClient
 import okhttp3.Request
 import xyz.quaver.Code
@@ -93,14 +96,14 @@ fun GalleryBlock.formatDownloadFolder(): String =
        formatMap.entries.fold(it) { str, (k, v) ->
            str.replace(k, v.invoke(this), true)
        }
-    }.replace(Regex("""[*\\|"?><:/]"""), "")
+    }.replace(Regex("""[*\\|"?><:/]"""), "").ellipsize(127)

 fun GalleryBlock.formatDownloadFolderTest(format: String): String =
    format.let {
        formatMap.entries.fold(it) { str, (k, v) ->
            str.replace(k, v.invoke(this), true)
        }
-    }.replace(Regex("""[*\\|"?><:/]"""), "")
+    }.replace(Regex("""[*\\|"?><:/]"""), "").ellipsize(127)

 val Reader.requestBuilders: List<Request.Builder>
    get() {
@@ -128,4 +131,10 @@ fun String.ellipsize(n: Int): String =
    if (this.length > n)
        this.slice(0 until n) + "…"
    else
-        this
+        this
+
+operator fun JsonElement.get(index: Int) =
+    this.jsonArray[index]
+
+operator fun JsonElement.get(tag: String) =
+    this.jsonObject[tag]
--- a/app/src/main/java/xyz/quaver/pupil/util/translation.kt
+++ b/app/src/main/java/xyz/quaver/pupil/util/translation.kt
@@ -0,0 +1,66 @@
+/*
+ *     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.util
+
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.launch
+import kotlinx.serialization.decodeFromString
+import kotlinx.serialization.json.Json
+import kotlinx.serialization.json.jsonArray
+import kotlinx.serialization.json.jsonPrimitive
+import okhttp3.Request
+import xyz.quaver.pupil.client
+import java.io.IOException
+import java.util.*
+
+private val filesURL = "https://api.github.com/repos/tom5079/Pupil/git/trees/tags"
+private val contentURL = "https://raw.githubusercontent.com/tom5079/Pupil/tags/"
+
+var translations: Map<String, String> = run {
+    updateTranslations()
+    emptyMap()
+}
+    private set
+
+@Suppress("BlockingMethodInNonBlockingContext")
+fun updateTranslations() = CoroutineScope(Dispatchers.IO).launch {
+    translations = emptyMap()
+    translations = Json.decodeFromString<Map<String, String>>(client.newCall(
+        Request.Builder()
+            .url(contentURL + "${Preferences["tag_language", ""]}.json")
+            .build()
+    ).execute().also { if (it.code() != 200) return@launch }.body()?.use { it.string() } ?: return@launch).filterValues { it.isNotEmpty() }
+}
+
+fun getAvailableLanguages(): List<String> {
+    val languages = Locale.getISOLanguages()
+
+    val json = Json.parseToJsonElement(client.newCall(
+        Request.Builder()
+            .url(filesURL)
+            .build()
+    ).execute().also { if (it.code() != 200) throw IOException() }.body()?.use { it.string() } ?: return emptyList())
+
+    return listOf("en") + (json["tree"]?.jsonArray?.mapNotNull {
+        val name = it["path"]?.jsonPrimitive?.content?.takeWhile { c -> c != '.' }
+
+        languages.firstOrNull { code -> code.equals(name, ignoreCase = true) }
+    } ?: emptyList())
+}
--- a/app/src/main/java/xyz/quaver/pupil/util/update.kt
+++ b/app/src/main/java/xyz/quaver/pupil/util/update.kt
@@ -27,13 +27,11 @@ import android.content.Intent
 import android.content.IntentFilter
 import android.net.Uri
 import android.util.Base64
-import android.util.Log
 import android.webkit.URLUtil
 import androidx.appcompat.app.AlertDialog
 import androidx.core.app.NotificationCompat
 import androidx.core.app.NotificationManagerCompat
 import androidx.preference.PreferenceManager
-import com.google.firebase.crashlytics.FirebaseCrashlytics
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.Job
@@ -52,7 +50,9 @@ import xyz.quaver.hitomi.getGalleryBlock
 import xyz.quaver.hitomi.getReader
 import xyz.quaver.io.FileX
 import xyz.quaver.io.util.getChild
-import xyz.quaver.io.util.*
+import xyz.quaver.io.util.readText
+import xyz.quaver.io.util.writeBytes
+import xyz.quaver.io.util.writeText
 import xyz.quaver.pupil.BuildConfig
 import xyz.quaver.pupil.R
 import xyz.quaver.pupil.client
@@ -160,7 +160,6 @@ fun checkUpdate(context: Context, force: Boolean = false) {
            val msg = extractReleaseNote(update, Locale.getDefault())
            setMessage(Markwon.create(context).toMarkdown(msg))
            setPositiveButton(android.R.string.ok) { _, _ ->
-
                val downloadManager = context.getSystemService(Context.DOWNLOAD_SERVICE) as DownloadManager

                //Cancel any download queued before
@@ -314,7 +313,7 @@ fun xyz.quaver.pupil.util.downloader.DownloadManager.migrate() {
                )

                synchronized(Cache) {
-                    Cache.delete(galleryID)
+                    Cache.delete(this@migrate, galleryID)
                }
                downloadFolderMap[galleryID] = folder.name

--- a/app/src/main/res/drawable/reader_item_boundary.xml
+++ b/app/src/main/res/drawable/reader_item_boundary.xml
@@ -4,7 +4,7 @@
    <item android:bottom="1dp" android:left="1dp" android:right="1dp" android:top="1dp">
        <shape android:shape="rectangle">
            <stroke android:width="1dp" android:color="#555555"/>
-            <solid android:color="@color/transparent"/>
+            <solid android:color="@android:color/transparent"/>
        </shape>
    </item>
 </layer-list>
--- a/app/src/main/res/drawable/sort_variant.xml
+++ b/app/src/main/res/drawable/sort_variant.xml
@@ -0,0 +1,8 @@
+<!-- drawable/sort_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="#000" android:pathData="M3,13H15V11H3M3,6V8H21V6M3,18H9V16H3V18Z" />
+</vector>
--- a/app/src/main/res/layout-v23/activity_main_content.xml
+++ b/app/src/main/res/layout-v23/activity_main_content.xml
@@ -1,152 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-  ~     Pupil, Hitomi.la viewer for Android
-  ~     Copyright (C) 2019  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/>.
-  -->
-
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    tools:context=".ui.MainActivity">
-
-    <androidx.coordinatorlayout.widget.CoordinatorLayout
-        android:layout_width="match_parent"
-        android:layout_height="match_parent">
-
-        <com.google.android.material.appbar.AppBarLayout
-            android:id="@+id/main_appbar_layout"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:background="@color/transparent"
-            android:visibility="invisible"
-            app:layout_constraintTop_toTopOf="parent"
-            app:layout_constraintLeft_toLeftOf="parent">
-
-            <View
-                android:layout_width="match_parent"
-                android:layout_height="64dp"
-                android:visibility="invisible"
-                android:background="@color/transparent"
-                app:layout_scrollFlags="scroll|enterAlways"
-                app:layout_behavior="@string/appbar_scrolling_view_behavior"/>
-
-        </com.google.android.material.appbar.AppBarLayout>
-
-        <androidx.core.widget.ContentLoadingProgressBar
-            style="?android:attr/progressBarStyle"
-            android:id="@+id/main_progressbar"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_gravity="center"
-            android:indeterminate="true"/>
-
-        <TextView
-            android:id="@+id/main_noresult"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_gravity="center"
-            android:text="@string/main_no_result"
-            android:visibility="invisible"/>
-
-        <com.qtalk.recyclerviewfastscroller.RecyclerViewFastScroller
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            app:handleDrawable="@drawable/thumb"
-            app:handleHasFixedSize="true"
-            app:handleHeight="72dp"
-            app:handleWidth="24dp"
-            app:disableTrack="true"
-            app:hideHandleAfter="1000"
-            app:trackMarginStart="64dp"
-            app:addLastItemPadding="true"
-            app:popupDrawable="@color/transparent">
-
-            <androidx.recyclerview.widget.RecyclerView
-                android:id="@+id/main_recyclerview"
-                android:layout_width="match_parent"
-                android:layout_height="match_parent"
-                android:paddingTop="64dp"
-                android:clipToPadding="false"
-                app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"/>
-
-        </com.qtalk.recyclerviewfastscroller.RecyclerViewFastScroller>
-
-        <com.github.clans.fab.FloatingActionMenu
-                android:id="@+id/main_fab"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_gravity="bottom|end"
-                android:layout_margin="16dp"
-                app:menu_colorNormal="@color/colorAccent">
-
-            <com.github.clans.fab.FloatingActionButton
-                android:id="@+id/main_fab_cancel"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                app:fab_label="@string/main_fab_cancel"
-                app:fab_size="mini"/>
-
-            <com.github.clans.fab.FloatingActionButton
-                android:id="@+id/main_fab_jump"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                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"
-                android:layout_height="wrap_content"
-                app:fab_label="@string/main_open_gallery_by_id"
-                app:fab_size="mini"/>
-
-        </com.github.clans.fab.FloatingActionMenu>
-
-    </androidx.coordinatorlayout.widget.CoordinatorLayout>
-
-    <com.arlib.floatingsearchview.FloatingSearchViewDayNight
-        android:id="@+id/main_searchview"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        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"
-        app:floatingSearch_searchHint="@string/search_hint"
-        app:floatingSearch_suggestionsListAnimDuration="250"
-        app:floatingSearch_showSearchKey="true"
-        app:floatingSearch_leftActionMode="showHamburger"
-        app:floatingSearch_menu="@menu/main"
-        app:floatingSearch_dismissOnOutsideTouch="true"
-        app:floatingSearch_close_search_on_keyboard_dismiss="true"
-        tools:ignore="NewApi" />
-
-</RelativeLayout>
--- a/app/src/main/res/layout/activity_main_content.xml
+++ b/app/src/main/res/layout/activity_main_content.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
  ~     Pupil, Hitomi.la viewer for Android
-  ~     Copyright (C) 2019  tom5079
+  ~     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
@@ -32,7 +32,7 @@
            android:id="@+id/main_appbar_layout"
            android:layout_width="match_parent"
            android:layout_height="wrap_content"
-            android:background="@color/transparent"
+            android:background="@android:color/transparent"
            android:visibility="invisible"
            app:layout_constraintTop_toTopOf="parent"
            app:layout_constraintLeft_toLeftOf="parent">
@@ -41,12 +41,35 @@
                android:layout_width="match_parent"
                android:layout_height="64dp"
                android:visibility="invisible"
-                android:background="@color/transparent"
+                android:background="@android:color/transparent"
                app:layout_scrollFlags="scroll|enterAlways"
                app:layout_behavior="@string/appbar_scrolling_view_behavior"/>

        </com.google.android.material.appbar.AppBarLayout>

+        <com.qtalk.recyclerviewfastscroller.RecyclerViewFastScroller
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            app:handleDrawable="@drawable/thumb"
+            app:handleHasFixedSize="true"
+            app:handleHeight="72dp"
+            app:handleWidth="24dp"
+            app:disableTrack="true"
+            app:hideHandleAfter="1000"
+            app:trackMarginStart="64dp"
+            app:addLastItemPadding="true"
+            app:popupDrawable="@android:color/transparent">
+
+            <androidx.recyclerview.widget.RecyclerView
+                android:id="@+id/main_recyclerview"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:paddingTop="64dp"
+                android:clipToPadding="false"
+                app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"/>
+
+        </com.qtalk.recyclerviewfastscroller.RecyclerViewFastScroller>
+
        <androidx.core.widget.ContentLoadingProgressBar
            style="?android:attr/progressBarStyle"
            android:id="@+id/main_progressbar"
@@ -60,32 +83,11 @@
            android:layout_width="wrap_content"
            android:layout_height="wrap_content"
            android:layout_gravity="center"
+            android:gravity="center"
            android:text="@string/main_no_result"
+            android:linksClickable="true"
            android:visibility="invisible"/>

-        <com.qtalk.recyclerviewfastscroller.RecyclerViewFastScroller
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            app:handleDrawable="@drawable/thumb"
-            app:handleHasFixedSize="true"
-            app:handleHeight="72dp"
-            app:handleWidth="24dp"
-            app:disableTrack="true"
-            app:hideHandleAfter="1000"
-            app:trackMarginStart="64dp"
-            app:addLastItemPadding="true"
-            app:popupDrawable="@color/transparent">
-
-            <androidx.recyclerview.widget.RecyclerView
-                android:id="@+id/main_recyclerview"
-                android:layout_width="match_parent"
-                android:layout_height="match_parent"
-                android:paddingTop="64dp"
-                android:clipToPadding="false"
-                app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"/>
-
-        </com.qtalk.recyclerviewfastscroller.RecyclerViewFastScroller>
-
        <com.github.clans.fab.FloatingActionMenu
                android:id="@+id/main_fab"
                android:layout_width="wrap_content"
@@ -126,21 +128,20 @@

    </androidx.coordinatorlayout.widget.CoordinatorLayout>

-    <com.arlib.floatingsearchview.FloatingSearchViewDayNight
+    <xyz.quaver.pupil.ui.view.FloatingSearchView
        android:id="@+id/main_searchview"
        android:layout_width="match_parent"
        android:layout_height="match_parent"
-        app:floatingSearch_suggestionRightIconColor="@color/material_orange_500"
-        app:floatingSearch_searchBarMarginLeft="8dp"
-        app:floatingSearch_searchBarMarginRight="8dp"
-        app:floatingSearch_searchBarMarginTop="8dp"
-        app:floatingSearch_searchHint="@string/search_hint"
-        app:floatingSearch_suggestionsListAnimDuration="250"
-        app:floatingSearch_showSearchKey="true"
-        app:floatingSearch_leftActionMode="showHamburger"
-        app:floatingSearch_menu="@menu/main"
-        app:floatingSearch_dismissOnOutsideTouch="true"
-        app:floatingSearch_close_search_on_keyboard_dismiss="true"
+        app:searchBarMarginLeft="6dp"
+        app:searchBarMarginRight="6dp"
+        app:searchBarMarginTop="6dp"
+        app:searchHint="@string/search_hint"
+        app:suggestionAnimDuration="250"
+        app:showSearchKey="true"
+        app:leftActionMode="showHamburger"
+        app:menu="@menu/main"
+        app:dismissOnOutsideTouch="true"
+        app:close_search_on_keyboard_dismiss="false"
        tools:ignore="NewApi" />

 </RelativeLayout>
--- a/app/src/main/res/layout/activity_reader.xml
+++ b/app/src/main/res/layout/activity_reader.xml
@@ -23,7 +23,7 @@
    xmlns:tools="http://schemas.android.com/tools"
    android:layout_width="match_parent"
    android:layout_height="match_parent"
-    android:background="@color/dark_gray"
+    android:background="@android:color/darker_gray"
    tools:context=".ui.ReaderActivity">

    <com.qtalk.recyclerviewfastscroller.RecyclerViewFastScroller
@@ -37,7 +37,7 @@
        app:hideHandleAfter="1000"
        app:handleHasFixedSize="true"
        app:addLastItemPadding="true"
-        app:popupDrawable="@color/transparent">
+        app:popupDrawable="@android:color/transparent">

        <androidx.recyclerview.widget.RecyclerView
            android:id="@+id/reader_recyclerview"
--- a/app/src/main/res/layout/dialog_gallery.xml
+++ b/app/src/main/res/layout/dialog_gallery.xml
@@ -40,7 +40,7 @@
                android:layout_height="wrap_content"
                android:padding="8dp">

-                <ImageView
+                <com.github.piasy.biv.view.BigImageView
                    android:id="@+id/gallery_cover"
                    android:layout_width="150dp"
                    android:layout_height="wrap_content"
--- a/app/src/main/res/layout/item_galleryblock.xml
+++ b/app/src/main/res/layout/item_galleryblock.xml
@@ -107,15 +107,17 @@

 			</FrameLayout>

-			<ImageView
+			<com.github.piasy.biv.view.BigImageView
 				android:id="@+id/galleryblock_thumbnail"
 				android:layout_width="150dp"
-				android:layout_height="wrap_content"
+				android:layout_height="0dp"
 				android:contentDescription="@string/galleryblock_thumbnail_description"
 				android:adjustViewBounds="true"
+				app:layout_constraintHeight_default="spread"
+				app:layout_constraintHeight_min="200dp"
 				app:layout_constraintLeft_toLeftOf="parent"
 				app:layout_constraintTop_toBottomOf="@id/galleryblock_progressbar_layout"
-				app:layout_constraintBottom_toBottomOf="@id/barrier"/>
+				app:layout_constraintBottom_toTopOf="@id/barrier"/>

 			<TextView
 				style="@style/TextAppearance.AppCompat.Headline"
@@ -164,14 +166,7 @@
 				app:layout_constraintTop_toBottomOf="@id/galleryblock_type"
 				app:layout_constraintLeft_toRightOf="@id/galleryblock_thumbnail" />

-			<androidx.constraintlayout.widget.Barrier
-				android:id="@+id/padding"
-				android:layout_width="wrap_content"
-				android:layout_height="wrap_content"
-				app:barrierDirection="bottom"
-				app:constraint_referenced_ids="galleryblock_language"/>
-
-			<com.google.android.material.chip.ChipGroup
+			<xyz.quaver.pupil.ui.view.TagChipGroup
 				android:id="@+id/galleryblock_tag_group"
 				android:layout_width="0dp"
 				android:layout_height="wrap_content"
@@ -179,7 +174,7 @@
 				android:layout_marginTop="16dp"
 				android:layout_marginBottom="16dp"
 				app:chipSpacing="4dp"
-				app:layout_constraintTop_toBottomOf="@id/padding"
+				app:layout_constraintTop_toBottomOf="@id/galleryblock_language"
 				app:layout_constraintLeft_toRightOf="@id/galleryblock_thumbnail"
 				app:layout_constraintRight_toRightOf="parent"/>

@@ -188,13 +183,13 @@
 				android:layout_width="wrap_content"
 				android:layout_height="wrap_content"
 				app:barrierDirection="bottom"
-				app:constraint_referenced_ids="galleryblock_thumbnail,galleryblock_tag_group"/>
+				app:constraint_referenced_ids="galleryblock_thumbnail, galleryblock_tag_group"/>

 			<View
 				android:id="@+id/divider"
 				android:layout_width="match_parent"
 				android:layout_height="1dp"
-				android:background="@color/light_gray"
+				android:background="?android:attr/listDivider"
 				app:layout_constraintTop_toBottomOf="@id/barrier"
 				android:layout_margin="8dp"/>

@@ -217,8 +212,8 @@
 				android:layout_marginBottom="8dp"
 				app:layout_constraintTop_toBottomOf="@id/divider"
 				app:layout_constraintBottom_toBottomOf="parent"
-				app:layout_constraintLeft_toRightOf="parent"
-				app:layout_constraintRight_toLeftOf="parent" />
+				app:layout_constraintLeft_toLeftOf="parent"
+				app:layout_constraintRight_toRightOf="parent" />

 			<ImageView
 				android:id="@+id/galleryblock_favorite"
--- a/app/src/main/res/layout/item_reader.xml
+++ b/app/src/main/res/layout/item_reader.xml
@@ -21,47 +21,51 @@
    xmlns:app="http://schemas.android.com/apk/res-auto"
    android:layout_width="match_parent"
    android:layout_height="wrap_content"
-    app:layout_constraintHeight_max="2000dp"
-    app:layout_constraintTop_toTopOf="parent"
-    app:layout_constraintBottom_toBottomOf="parent"
-    android:paddingBottom="8dp"
+    android:layout_marginBottom="8dp"
    android:background="@drawable/reader_item_boundary">
+    
+    <androidx.constraintlayout.widget.Guideline
+        android:id="@+id/guideline_center_vertical"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:orientation="horizontal"
+        app:layout_constraintGuide_percent="0.5"/>

-    <LinearLayout
-        android:id="@+id/progress_layout"
+    <ProgressBar
+        android:id="@+id/reader_item_progressbar"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        style="?android:progressBarStyleHorizontal"
+        android:indeterminate="false"
+        android:progress="0"
+        android:max="100"
+        android:visibility="visible"
+        app:layout_constraintBottom_toTopOf="@id/guideline_center_vertical"
+        app:layout_constraintLeft_toLeftOf="parent"
+        app:layout_constraintRight_toRightOf="parent"/>
+
+    <TextView
+        android:id="@+id/reader_index"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        app:layout_constraintTop_toBottomOf="@id/guideline_center_vertical"
+        app:layout_constraintLeft_toLeftOf="@id/reader_item_progressbar"
+        app:layout_constraintRight_toRightOf="@id/reader_item_progressbar"
+        style="@style/TextAppearance.AppCompat.Caption"/>
+    
+    <androidx.constraintlayout.widget.Group
+        android:id="@+id/progress_group"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:visibility="visible"
+        app:constraint_referenced_ids="reader_item_progressbar, reader_index"/>
+
+    <com.github.piasy.biv.view.BigImageView
+        android:id="@+id/image"
        android:layout_width="match_parent"
        android:layout_height="0dp"
-        app:layout_constraintTop_toTopOf="parent"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintEnd_toEndOf="parent"
-        android:gravity="center"
-        android:orientation="vertical">
-
-        <ProgressBar
-            android:id="@+id/reader_item_progressbar"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            style="?android:progressBarStyleHorizontal"
-            android:indeterminate="false"
-            android:progress="0"
-            android:max="100"
-            android:visibility="visible"/>
-
-        <TextView
-            android:id="@+id/reader_index"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            style="@style/TextAppearance.AppCompat.Caption"/>
-
-    </LinearLayout>
-
-    <com.github.chrisbanes.photoview.PhotoView
-        android:id="@+id/image"
-        android:adjustViewBounds="true"
-        android:scaleType="fitCenter"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
+        app:initScaleType="fitCenter"
+        app:optimizeDisplay="true"
        app:layout_constraintTop_toTopOf="parent"
        app:layout_constraintBottom_toBottomOf="parent"/>

--- a/app/src/main/res/menu/main.xml
+++ b/app/src/main/res/menu/main.xml
@@ -20,10 +20,10 @@
 <menu xmlns:android="http://schemas.android.com/apk/res/android"
 	xmlns:app="http://schemas.android.com/apk/res-auto">

-	<item android:id="@+id/main_menu_thin"
-		android:title="@string/main_menu_thin"/>
-
-	<item android:title="@string/main_menu_sort">
+	<item android:id="@+id/sort"
+		android:title="@string/main_menu_sort"
+		android:icon="@drawable/sort_variant"
+		app:showAsAction="ifRoom">
 		<menu>
 			<group android:checkableBehavior="single">
 				<item android:id="@+id/main_menu_sort_newest"
@@ -41,4 +41,9 @@
 		android:title="@string/main_settings"
 		app:showAsAction="always"/>

+	<item android:id="@+id/main_menu_thin"
+		android:title="@string/main_menu_thin"
+		app:showAsAction="never"
+		android:checkable="true"/>
+
 </menu>
--- a/app/src/main/res/values-ja/strings.xml
+++ b/app/src/main/res/values-ja/strings.xml
@@ -127,8 +127,6 @@
    <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_fab_retry">リトライ</string>
@@ -152,4 +150,8 @@
    <string name="camera_denied">カメラ権限が拒否されているため、まばたき検知使用できません</string>
    <string name="no_camera">この機器には前面カメラが装着されていません</string>
    <string name="error">エラー</string>
+    <string name="settings_cache_limit">キャッシュサイズ制限</string>
+    <string name="settings_cache_unlimited">制限なし</string>
+    <string name="settings_tag_language">タグ言語</string>
+    <string name="settings_tag_language_message">Githubにて翻訳に参加できます</string>
 </resources>
--- a/app/src/main/res/values-ko/strings.xml
+++ b/app/src/main/res/values-ko/strings.xml
@@ -12,10 +12,10 @@
    <string name="settings_galleries_per_page">한 번에 로드할 갤러리 수</string>
    <string name="settings_search_title">검색 설정</string>
    <string name="settings_title">설정</string>
-    <string name="update_notification_description">apk 다운로드중&#8230;</string>
+    <string name="update_notification_description">업데이트 다운로드중&#8230;</string>
    <string name="update_title">업데이트가 있습니다!</string>
    <string name="warning">경고</string>
-    <string name="main_no_result">결과 없음</string>
+    <string name="main_no_result">결과 없음\n해결법</string>
    <string name="settings_miscellaneous_title">기타</string>
    <string name="settings_clear_history">기록 삭제</string>
    <string name="settings_clear_history_alert_message">기록을 삭제하시겠습니까?</string>
@@ -114,7 +114,7 @@
    <string name="proxy_dialog_error">잘못된 값</string>
    <string name="proxy_dialog_addr_hint">서버 주소</string>
    <string name="proxy_dialog_server">서버</string>
-    <string name="main_menu_thin">간단히 보기 모드</string>
+    <string name="main_menu_thin">간단히 보기</string>
    <string name="main_fab_cancel">다운로드 모두 취소</string>
    <string name="channel_update">업데이트</string>
    <string name="channel_update_description">업데이트 진행상황 표시</string>
@@ -127,8 +127,6 @@
    <string name="settings_lock_fingerprint_prompt">Pupil 지문 인식™</string>
    <string name="settings_lock_fingerprint_prompt_subtitle">힘세고 강한 지문 인식</string>
    <string name="default_query_dialog_filter_loli">판사님 저는 페도가 아닙니다</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_fab_retry">재시도</string>
@@ -152,4 +150,8 @@
    <string name="camera_denied">카메라 권한이 거부되었기 때문에 눈 깜빡임 감지가 불가능합니다</string>
    <string name="no_camera">이 장치에는 전면 카메라가 없습니다</string>
    <string name="error">오류</string>
+    <string name="settings_cache_limit">캐시 크기 제한</string>
+    <string name="settings_cache_unlimited">무제한</string>
+    <string name="settings_tag_language">태그 언어</string>
+    <string name="settings_tag_language_message">Github에서 번역에 참여하세요</string>
 </resources>
--- a/app/src/main/res/values/arrays.xml
+++ b/app/src/main/res/values/arrays.xml
@@ -2,6 +2,7 @@
 <resources>

    <string-array name="settings_galleries_per_page">
+        <item>5</item>
        <item>10</item>
        <item>25</item>
        <item>50</item>
@@ -58,4 +59,24 @@
        <item>SOCKS</item>
    </string-array>

+    <string-array name="cache_size">
+        <item>0</item>
+        <item>1</item>
+        <item>2</item>
+        <item>4</item>
+        <item>8</item>
+        <item>16</item>
+        <item>32</item>
+    </string-array>
+
+    <string-array name="cache_size_text">
+        <item>@string/settings_cache_unlimited</item>
+        <item>1G</item>
+        <item>2G</item>
+        <item>4G</item>
+        <item>8G</item>
+        <item>16G</item>
+        <item>32G</item>
+    </string-array>
+
 </resources>
--- a/app/src/main/res/values/attr.xml
+++ b/app/src/main/res/values/attr.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/>.
+  -->
+
+<resources>
+    <declare-styleable name="TagChipGroup">
+        <attr name="maxTag" format="integer"/>
+    </declare-styleable>
+</resources>
--- a/app/src/main/res/values/dimen.xml
+++ b/app/src/main/res/values/dimen.xml
@@ -1,13 +1,15 @@
 <?xml version="1.0" encoding="utf-8"?>
-<resources>
+<resources xmlns:tools="http://schemas.android.com/tools">

 	<dimen name="activity_horizontal_margin">16dp</dimen>
 	<dimen name="activity_vertical_margin">16dp</dimen>

 	<dimen name="galleryblock_thumbnail_thin">100dp</dimen>

-	<dimen name="reader_max_height">2000dp</dimen>
+	<dimen name="reader_max_height" tools:ignore="PxUsage">2000px</dimen>

 	<dimen name="thumb_width">24dp</dimen>
 	<dimen name="thumb_height">72dp</dimen>
+
+	<dimen name="thumbnail_page_height">300dp</dimen>
 </resources>
--- a/app/src/main/res/values/ids.xml
+++ b/app/src/main/res/values/ids.xml
@@ -1,13 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
    <item name="item_click_support" type="id" />
-    <item name="request_settings" type="id" />
-    <item name="request_lock" type="id" />
-    <item name="request_restore" type="id" />
-
-    <item name="request_download_folder" type="id" />
-    <item name="request_download_folder_old" type="id" />
-    <item name="request_write_permission_and_saf" type="id" />

    <item name="notification_id_update" type="id" />
    <item name="notification_id_import" type="id" />
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -9,6 +9,10 @@
    <string name="email" translatable="false">mailto:pupil.hentai@gmail.com</string>
    <string name="discord" translatable="false">https://discord.gg/Stj4b5v</string>

+    <!-- Korean only -->
+    <string name="https_text" translatable="false">해결법</string>
+    <string name="https" translatable="false">https://bit.ly/34dUBwy</string>
+
    <string name="backup_url" translatable="false">http://ix.io/</string>

    <string name="main_settings" translatable="false">Settings</string>
@@ -17,6 +21,8 @@
    <string name="reader_imageview_description" translatable="false">Content ImageView</string>
    <string name="page_indicator_placeholder" translatable="false">-/-</string>

+    <string name="galleryblock_artist_with_group" translatable="false">%s (%s)</string>
+
    <!-- Translate needed down here -->

    <string name="warning">Warning</string>
@@ -50,7 +56,7 @@
    <string name="main_drawer_group_contact_email">Email me!</string>
    <string name="main_drawer_grouop_contact_discord">Discord</string>

-    <string name="main_menu_thin">Toggle Thin Mode</string>
+    <string name="main_menu_thin">Thin Mode</string>

    <string name="main_menu_sort">Sort</string>
    <string name="main_menu_sort_newest">Newest</string>
@@ -155,8 +161,9 @@
    <string name="settings_download_folder_available">%s available</string>
    <string name="settings_download_folder_custom">Custom Location</string>
    <string name="settings_download_folder_not_writable">This folder is not writable. Please select another folder.</string>
-    <string name="settings_cache_disable">Disable Cache</string>
-    <string name="settings_download_when_cache_disable_warning">Download is disabled when the cache is disabled</string>
+    <string name="settings_cache_limit">Cache Limit</string>
+    <string name="settings_cache_unlimited">Unlimited</string>
+    <string name="settings_nomedia_title">Hide image from gallery</string>
    <string name="settings_low_quality">Low quality images</string>
    <string name="settings_low_quality_summary">Load low quality images to improve load speed and data usage</string>

@@ -168,6 +175,8 @@
    <!-- SETTINGS/MISCELLANEOUS -->

    <string name="settings_miscellaneous_title">Miscellaneous</string>
+    <string name="settings_tag_language">Tag Language</string>
+    <string name="settings_tag_language_message">Participate in translation on Github</string>
    <string name="settings_mirror_summary">Load images from mirrors</string>
    <string name="settings_proxy_title">Proxy</string>
    <string name="settings_rtl">Turn pages Right-to-Left</string>
@@ -175,7 +184,6 @@
    <string name="settings_security_mode_summary">Enable security mode to make the screen invisible on recent app window</string>
    <string name="settings_dark_mode_title">Dark mode</string>
    <string name="settings_dark_mode_summary">Protect yourself against light attacks!</string>
-    <string name="settings_nomedia_title">Hide image from gallery</string>
    <string name="settings_import_old_galleries">Import old galleries</string>
    <string name="settings_user_id">User ID</string>
    <string name="settings_user_id_toast">User ID is copied to clipboard</string>
--- a/app/src/main/res/xml/root_preferences.xml
+++ b/app/src/main/res/xml/root_preferences.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<PreferenceScreen
-    xmlns:app="http://schemas.android.com/apk/res-auto">
+<PreferenceScreen xmlns:app="http://schemas.android.com/apk/res-auto">

    <Preference
        app:key="app_version"
@@ -44,9 +43,13 @@
            app:key="download_folder"
            app:title="@string/settings_download_folder"/>

-        <SwitchPreferenceCompat
-            app:key="cache_disable"
-            app:title="@string/settings_cache_disable"/>
+        <ListPreference
+            app:key="cache_limit"
+            app:title="@string/settings_cache_limit"
+            app:entries="@array/cache_size_text"
+            app:entryValues="@array/cache_size"
+            app:defaultValue="8"
+            app:useSimpleSummaryProvider="true"/>

        <SwitchPreferenceCompat
            app:key="nomedia"
@@ -72,6 +75,12 @@
    <PreferenceCategory
        app:title="@string/settings_miscellaneous_title">

+        <ListPreference
+            app:key="tag_language"
+            app:title="@string/settings_tag_language"
+            app:defaultValue="en"
+            app:useSimpleSummaryProvider="true"/>
+
        <Preference
            app:key="mirrors"
            app:title="@string/settings_mirror_title"
--- a/build.gradle
+++ b/build.gradle
@@ -6,25 +6,26 @@ buildscript {
        jcenter()
    }
    dependencies {
-        classpath 'com.android.tools.build:gradle:4.0.1'
+        classpath 'com.android.tools.build:gradle:4.1.0'
        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
        classpath "org.jetbrains.kotlin:kotlin-android-extensions:$kotlin_version"
        classpath "org.jetbrains.kotlin:kotlin-serialization:$kotlin_version"
-        classpath 'com.google.gms:google-services:4.3.3'
+        classpath "com.google.gms:google-services:4.3.3"
        // NOTE: Do not place your application dependencies here; they belong
        // in the individual module build.gradle files
-        classpath 'com.google.firebase:firebase-crashlytics-gradle:2.2.1'
-        classpath 'com.google.firebase:perf-plugin:1.3.1'
-        classpath 'com.google.android.gms:oss-licenses-plugin:0.10.2'
+        classpath "com.google.firebase:firebase-crashlytics-gradle:2.3.0"
+        classpath "com.google.firebase:perf-plugin:1.3.2"
+        classpath "com.google.android.gms:oss-licenses-plugin:0.10.2"
    }
 }

 allprojects {
    repositories {
+        maven { url  "http://dl.bintray.com/piasy/maven" }
        google()
        jcenter()
        maven { url "https://jitpack.io" }
-        maven { url 'https://guardian.github.com/maven/repo-releases' }
+        maven { url "https://guardian.github.com/maven/repo-releases" }
    }
 }

--- a/dependencies.txt
+++ b/dependencies.txt
--- a/gradle.properties
+++ b/gradle.properties
@@ -15,6 +15,7 @@ org.gradle.jvmargs=-Xmx2048M -Dkotlin.daemon.jvm.options\="-Xmx2048M"
 org.gradle.parallel=true
 org.gradle.daemon=true
 org.gradle.configureondemand=true
+org.gradle.caching=true
 kotlin.code.style=official
 android.enableJetifier=true
 android.useAndroidX=true
--- a/gradle/wrapper/gradle-wrapper.jar
+++ b/gradle/wrapper/gradle-wrapper.jar
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Thu Jun 18 15:48:09 KST 2020
+#Tue Oct 13 22:37:11 KST 2020
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.1.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.5-all.zip
--- a/51
+++ b/51
@@ -1,5 +1,21 @@
 #!/usr/bin/env sh

+#
+# Copyright 2015 the original author or authors.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      https://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
 ##############################################################################
 ##
 ##  Gradle start up script for UN*X
@@ -28,7 +44,7 @@ APP_NAME="Gradle"
 APP_BASE_NAME=`basename "$0"`

 # Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-DEFAULT_JVM_OPTS=""
+DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'

 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD="maximum"
@@ -109,8 +125,8 @@ if $darwin; then
    GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
 fi

-# For Cygwin, switch paths to Windows format before running java
-if $cygwin ; then
+# For Cygwin or MSYS, switch paths to Windows format before running java
+if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then
    APP_HOME=`cygpath --path --mixed "$APP_HOME"`
    CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
    JAVACMD=`cygpath --unix "$JAVACMD"`
@@ -138,19 +154,19 @@ if $cygwin ; then
        else
            eval `echo args$i`="\"$arg\""
        fi
-        i=$((i+1))
+        i=`expr $i + 1`
    done
    case $i in
-        (0) set -- ;;
-        (1) set -- "$args0" ;;
-        (2) set -- "$args0" "$args1" ;;
-        (3) set -- "$args0" "$args1" "$args2" ;;
-        (4) set -- "$args0" "$args1" "$args2" "$args3" ;;
-        (5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
-        (6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
-        (7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
-        (8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
-        (9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
+        0) set -- ;;
+        1) set -- "$args0" ;;
+        2) set -- "$args0" "$args1" ;;
+        3) set -- "$args0" "$args1" "$args2" ;;
+        4) set -- "$args0" "$args1" "$args2" "$args3" ;;
+        5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
+        6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
+        7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
+        8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
+        9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
    esac
 fi

@@ -159,14 +175,9 @@ save () {
    for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
    echo " "
 }
-APP_ARGS=$(save "$@")
+APP_ARGS=`save "$@"`

 # Collect all arguments for the java command, following the shell quoting and substitution rules
 eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS"

-# by default we should be in the correct project dir, but when run from Finder on Mac, the cwd is wrong
-if [ "$(uname)" = "Darwin" ] && [ "$HOME" = "$PWD" ]; then
-  cd "$(dirname "$0")"
-fi
-
 exec "$JAVACMD" "$@"
--- a/gradlew.bat
+++ b/gradlew.bat
@@ -1,3 +1,19 @@
+@rem
+@rem Copyright 2015 the original author or authors.
+@rem
+@rem Licensed under the Apache License, Version 2.0 (the "License");
+@rem you may not use this file except in compliance with the License.
+@rem You may obtain a copy of the License at
+@rem
+@rem      https://www.apache.org/licenses/LICENSE-2.0
+@rem
+@rem Unless required by applicable law or agreed to in writing, software
+@rem distributed under the License is distributed on an "AS IS" BASIS,
+@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+@rem See the License for the specific language governing permissions and
+@rem limitations under the License.
+@rem
+
@if "%DEBUG%" == "" @echo off
@rem ##########################################################################
@rem
@@ -14,7 +30,7 @@ set APP_BASE_NAME=%~n0
 set APP_HOME=%DIRNAME%

@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-set DEFAULT_JVM_OPTS=
+set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m"

@rem Find java.exe
 if defined JAVA_HOME goto findJavaFromJavaHome
Author	SHA1	Message	Date
tom5079	09779a0710	Update README.md	2020-10-13 23:47:56 +09:00
tom5079	e82c6ef866	App built Possible build time optimization	2020-10-13 23:40:53 +09:00
tom5079	861ae9be64	Merge remote-tracking branch 'origin/dev' into dev	2020-10-13 23:34:28 +09:00
tom5079	96108bc1ec	Improves Scroll Jitter	2020-10-13 23:34:16 +09:00
tom5079	016f217db0	Merge pull request #108 from klx7007/patch-1 Fix FloatingSearchView imeOptions to only affect keyboard visibility	2020-10-13 23:05:34 +09:00
tom5079	0688294f18	Dependency update Support non external storage document Uris Support non external storage document Uris	2020-10-13 22:59:29 +09:00
klx7007	9ad008255d	FloatingSearchView imeOptions 수정 imeOption을 덮어씌워서 search할때 키보드만 숨겨짐	2020-10-13 22:58:13 +09:00
tom5079	4c5a862dd6	Update README.md	2020-10-13 17:57:19 +09:00
tom5079	b165a2308f	Merge remote-tracking branch 'origin/master' into master	2020-10-13 17:13:10 +09:00
tom5079	8757b08cd2	Fixed pagecount not showing up	2020-10-13 17:12:53 +09:00
tom5079	3800543fba	Update README.md	2020-10-13 13:59:02 +09:00
tom5079	02ef60c818	Update README.md	2020-10-13 13:57:23 +09:00
tom5079	88f3b30266	Merge branch 'dev' into master	2020-10-13 13:52:34 +09:00
tom5079	9203dc0112	Tag translation	2020-10-13 13:51:53 +09:00
tom5079	4c683bec68	Dependency update Fixes concurrentmodificationexception	2020-10-13 08:34:04 +09:00
tom5079	0cfd1eb453	Update README.md	2020-10-04 23:05:30 +09:00
tom5079	19744dab37	Merge remote-tracking branch 'origin/master' into master	2020-10-04 23:04:30 +09:00
tom5079	12d58e5aa7	Don't cancel download onPause	2020-10-04 23:04:12 +09:00
tom5079	e46dd37a26	Update README.md	2020-10-04 22:47:45 +09:00
tom5079	49c3ebc36b	Concurrency issue fixed Don't cancel download onPause Limit folder length to 127 characters	2020-10-04 22:44:31 +09:00
tom5079	11e9bc2235	Added five entries per page option	2020-10-04 20:39:33 +09:00
tom5079	3029b3bf0e	Update README.md	2020-10-03 20:20:41 +09:00
tom5079	9a6c6f67ce	Merge branch 'dev' into master	2020-10-03 20:18:53 +09:00
tom5079	a6ed0baef2	Fix auto cache cleanup	2020-10-03 20:18:20 +09:00
tom5079	d3b43d80da	Update README.md	2020-10-03 10:06:17 +09:00
tom5079	46d4316d49	Merge remote-tracking branch 'origin/master' into master	2020-10-03 10:05:30 +09:00
tom5079	ade2864351	Fix auto cache cleanup	2020-10-03 10:03:57 +09:00
tom5079	365fc56e9d	Update README.md	2020-10-02 13:09:46 +09:00
tom5079	54a5cd21ea	Merge branch 'dev' into master	2020-10-02 13:00:02 +09:00
tom5079	38c0399b09	App built	2020-10-02 12:59:32 +09:00
tom5079	2b67858453	Auto cache clean	2020-10-02 12:51:59 +09:00
tom5079	87fdbdbb6e	Open GalleryDialog first instead of opening Reader directly	2020-10-02 00:19:56 +09:00
tom5079	bab77a4116	(KO) Added support link	2020-10-02 00:13:34 +09:00
tom5079	d20756ab96	Reset security mode	2020-10-01 22:51:52 +09:00
tom5079	dc75a753c3	Minimum thumbnail height	2020-10-01 22:46:03 +09:00
tom5079	4712d47903	Show 10 tags maximum	2020-10-01 22:20:49 +09:00
tom5079	c5561801e1	Add group name to GalleryBlock	2020-10-01 21:32:42 +09:00
tom5079	5c259fa07a	Dependency update Fixed duplicated download file Better download progress update handling TODO: Add group name to GalleryBlock	2020-10-01 21:24:32 +09:00
tom5079	60e8b18702	Update README.md	2020-09-29 16:53:15 +09:00
tom5079	a8317824a9	Merge remote-tracking branch 'origin/master' into master	2020-09-27 21:40:32 +09:00
tom5079	0c3c78cc72	Fixed app crashing when loading thumbnail	2020-09-27 21:40:22 +09:00
tom5079	cfd4a8faac	Update README.md	2020-09-27 21:39:05 +09:00
tom5079	7f3fb0db0d	Update README.md	2020-09-27 20:30:47 +09:00
tom5079	385d3f0d1b	Update README.md	2020-09-27 20:29:50 +09:00
tom5079	8fa6bd12a2	Update README.md	2020-09-27 20:27:29 +09:00
tom5079	57c2004e46	Update README.md	2020-09-27 20:21:45 +09:00
tom5079	c6b069bbfb	Update README.md	2020-09-27 20:19:53 +09:00
tom5079	c18bffd08f	Fixed app crashing when thumbnail is null	2020-09-27 20:18:04 +09:00
tom5079	47ec181439	Fixed app crashing when thumbnail is null	2020-09-27 20:15:43 +09:00
tom5079	90ad40b1b7	Update README.md	2020-09-27 19:32:18 +09:00
tom5079	4d3f20cf98	Update README.md	2020-09-27 19:31:30 +09:00
tom5079	86df9d52bc	Update README.md	2020-09-27 19:15:46 +09:00
tom5079	1bd025e070	Fixed ProxyDialog not showing up	2020-09-27 15:09:19 +09:00
tom5079	86ee239c71	App built	2020-09-27 14:39:47 +09:00
tom5079	27d0c01e1f	Don't refresh onResume	2020-09-27 14:37:16 +09:00
tom5079	7a9507be01	Somewhat working	2020-09-27 14:29:02 +09:00
tom5079	1490035893	Does not work	2020-09-27 10:04:26 +09:00
tom5079	a6afcb0ed0	Consistent usage of quotation marks	2020-09-26 22:41:51 +09:00
tom5079	ea7e8584cb	Consistent usage of quotation marks	2020-09-26 22:36:48 +09:00
tom5079	608c6e6a1d	App built	2020-09-26 21:01:36 +09:00
tom5079	bb2c91145f	Dependency update	2020-09-26 20:58:46 +09:00
tom5079	db074df0f7	Fixed Download Concurrency issue Fixed image not showing up after reader is paused and resumed	2020-09-26 11:07:35 +09:00
tom5079	f7c45df9a6	Tag favorite bug fix	2020-09-26 09:36:20 +09:00
tom5079	44e3d16cd6	Merge branch 'dev' into master	2020-09-26 09:08:29 +09:00
tom5079	a973cdfe0b	Download Bug fix Added favorite to TagChip Improved eyeblink recognition	2020-09-26 09:07:52 +09:00
tom5079	fca42c79a8	Updated startActivityForResult to launchers	2020-09-25 15:39:07 +09:00
tom5079	f236775599	Bug fix Remember thin mode preference TagChip favorites	2020-09-25 15:17:05 +09:00
tom5079	360decd37c	FloatingSearchView migration	2020-09-16 14:31:45 +09:00