Fixed app crashing when thumbnail is null

Fixed image not showing up after reader is paused and resumed

.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>

README.md

@@ -1,18 +1,11 @@
-# Pupil
-
 ![Banner](https://github.com/tom5079/Pupil/blob/gh-pages/assets/images/pupil-banner.png?raw=true)
 *Pupil, Hitomi.la viewer for Android*  
 
+![Download](https://img.shields.io/github/downloads/tom5079/Pupil/latest/Pupil-v5.1.1-hotfix1.apk?color=%234fc3f7&label=DOWNLOAD%20APP&style=for-the-badge)  
 [![](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 +19,4 @@ 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!

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"
+        versionCode 61
+        versionName "5.1.1-hotfix2"
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         vectorDrawables.useSupportLibrary = true
     }
@@ -34,8 +51,8 @@ android {
             applicationIdSuffix ".debug"
             versionNameSuffix "-DEBUG"
 
-            buildConfigField('Boolean', 'CENSOR', 'false')
-            proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
+            buildConfigField("Boolean", "CENSOR", "false")
+            proguardFiles getDefaultProguardFile("proguard-android-optimize.txt"), "proguard-rules.pro"
 
             ext.enableCrashlytics = false
             ext.alwaysUpdateBuildId = false
@@ -44,73 +61,78 @@ android {
             minifyEnabled true
             shrinkResources true
 
-            buildConfigField('Boolean', 'CENSOR', 'false')
-            proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
+            buildConfigField("Boolean", "CENSOR", "false")
+            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 "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-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 "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 "androidx.biometric:biometric:1.0.1"
+
     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-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.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:libpupil:1.7.2"
     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:floatingsearchview:1.0.5"
+
+    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 {

app/release/output-metadata.json

@@ -11,8 +11,8 @@
       "type": "SINGLE",
       "filters": [],
       "properties": [],
-      "versionCode": 59,
-      "versionName": "5.0.3",
+      "versionCode": 61,
+      "versionName": "5.1.1-hotfix2",
       "enabled": true,
       "outputFile": "app-release.apk"
     }

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
@@ -118,20 +117,6 @@ class Pupil : Application() {
         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 +128,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
 

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

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

@@ -20,35 +20,28 @@ package xyz.quaver.pupil.adapters
 
 import android.content.Context
 import android.graphics.drawable.Drawable
-import android.util.Log
+import android.net.Uri
 import android.util.SparseBooleanArray
 import android.view.LayoutInflater
 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.android.synthetic.main.item_reader.view.*
+import kotlinx.coroutines.*
 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
@@ -56,11 +49,9 @@ 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 +59,17 @@ class GalleryBlockAdapter(private val glide: RequestManager, private val galleri
         PREV
     }
 
-    val timer = Timer()
-
-    var isThin = false
+    var update = true
+    var thin: Boolean = Preferences["thin"]
 
     inner class GalleryViewHolder(val view: View) : RecyclerView.ViewHolder(view) {
-        var timerTask: TimerTask? = null
+        var updateJob: Job? = null
 
         private fun updateProgress(context: Context, galleryID: Int) {
             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 +78,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 +86,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)) {
@@ -143,54 +133,41 @@ 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
+                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 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) } }
+                        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 {
+                        showImage(cache.getThumbnail() ?: Uri.EMPTY)
+                    }
                 }
 
-                if (timerTask == null)
-                    timerTask = timer.schedule(0, 1000) {
-                        updateProgress(context, galleryID)
+                if (updateJob == null)
+                    updateJob = CoroutineScope(Dispatchers.Main).launch {
+                        while (update) {
+                            updateProgress(context, galleryID)
+                            delay(1000)
+                        }
                     }
 
                 galleryblock_title.text = galleryBlock.title
@@ -223,7 +200,18 @@ class GalleryBlockAdapter(private val glide: RequestManager, private val galleri
 
                 galleryblock_tag_group.removeAllViews()
                 CoroutineScope(Dispatchers.Default).launch {
-                    galleryBlock.relatedTags.map {
+                    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 {
                         TagChip(context, Tag.parse(it)).apply {
                             setOnClickListener { view ->
                                 for (callback in onChipClickedHandler)
@@ -273,7 +261,7 @@ class GalleryBlockAdapter(private val glide: RequestManager, private val galleri
 
 
                 // Make some views invisible to make it thinner
-                if (isThin) {
+                if (thin) {
                     galleryblock_language.visibility = View.GONE
                     galleryblock_type.visibility = View.GONE
                     galleryblock_tag_group.visibility = View.GONE
@@ -374,8 +362,8 @@ class GalleryBlockAdapter(private val glide: RequestManager, private val galleri
         super.onViewDetachedFromWindow(holder)
 
         if (holder is GalleryViewHolder) {
-            holder.timerTask?.cancel()
-            holder.timerTask = null
+            holder.updateJob?.cancel()
+            holder.updateJob = null
         }
     }
 

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

@@ -18,57 +18,87 @@
 
 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.ssiv?.recycle()
+        }
+    }
 
     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 +110,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
+        }
+    }
 }

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()
+    }
+
 }

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

app/src/main/java/xyz/quaver/pupil/services/DownloadService.kt

@@ -23,7 +23,6 @@ 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
@@ -43,13 +42,15 @@ import xyz.quaver.pupil.R
 import xyz.quaver.pupil.client
 import xyz.quaver.pupil.interceptors
 import xyz.quaver.pupil.ui.ReaderActivity
-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.ellipsize
 import xyz.quaver.pupil.util.normalizeID
 import xyz.quaver.pupil.util.requestBuilders
 import java.io.IOException
+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 +69,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)
@@ -196,7 +197,7 @@ 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>>()
 
     fun isCompleted(galleryID: Int) = progress[galleryID]?.toList()?.all { it == Float.POSITIVE_INFINITY } == true
 
@@ -218,10 +219,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)
@@ -293,7 +295,7 @@ class DownloadService : Service() {
     }
 
     fun download(galleryID: Int, priority: Boolean = false, startId: Int? = null): Job = CoroutineScope(Dispatchers.IO).launch {
-        if (progress.indexOfKey(galleryID) >= 0)
+        if (progress.containsKey(galleryID))
             cancel(galleryID)
 
         val cache = Cache.getInstance(this@DownloadService, galleryID)
@@ -305,33 +307,13 @@ 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 })
-
-        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 +344,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)
             }

app/src/main/java/xyz/quaver/pupil/types/Suggestions.kt

@@ -18,36 +18,28 @@
 
 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
 
 @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 = 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

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

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

@@ -23,17 +23,15 @@ import android.content.Intent
 import android.net.Uri
 import android.os.Bundle
 import android.text.InputType
-import android.view.*
+import android.view.KeyEvent
+import android.view.MenuItem
+import android.view.MotionEvent
+import android.view.View
 import android.widget.*
 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 +39,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 +52,12 @@ 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 kotlin.math.abs
 import kotlin.math.ceil
 import kotlin.math.min
@@ -60,7 +65,6 @@ import kotlin.math.roundToInt
 
 class MainActivity :
     BaseActivity(),
-    FloatingSearchView.OnMenuItemClickListener,
     NavigationView.OnNavigationItemSelectedListener
 {
 
@@ -96,7 +100,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 +144,7 @@ class MainActivity :
     override fun onDestroy() {
         super.onDestroy()
 
-        (main_recyclerview?.adapter as? GalleryBlockAdapter)?.timer?.cancel()
+        (main_recyclerview?.adapter as? GalleryBlockAdapter)?.update = false
     }
 
     override fun onKeyDown(keyCode: Int, event: KeyEvent?): Boolean {
@@ -181,20 +184,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(
@@ -262,11 +251,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()
@@ -317,7 +302,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 +316,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()
@@ -383,11 +365,7 @@ class MainActivity :
 
                     val galleryID = galleries[position]
 
-                    GalleryDialog(
-                        this@MainActivity,
-                        Glide.with(this@MainActivity),
-                        galleryID
-                    ).apply {
+                    GalleryDialog(this@MainActivity, galleryID).apply {
                         onChipClickedHandler.add {
                             runOnUiThread {
                                 query = it.toQuery()
@@ -620,14 +598,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 +613,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 +632,11 @@ class MainActivity :
                 swapSuggestions(defaultSuggestions)
             }
 
-            setOnMenuItemClickListener(this@MainActivity)
+            onMenuItemClickListener = {
+                onActionMenuItemSelected(it)
+            }
 
-            setOnQueryChangeListener { _, query ->
+            onQueryChangeListener = lambda@{ _, query ->
                 this@MainActivity.query = query
 
                 suggestionJob?.cancel()
@@ -656,12 +644,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 +672,7 @@ class MainActivity :
                 }
             }
 
-            setOnFocusChangeListener(object: FloatingSearchView.OnFocusChangeListener {
+            onFocusChangeListener = object: FloatingSearchView.OnFocusChangeListener {
                 override fun onFocus() {
                     if (query.isEmpty() or query.endsWith(' '))
                         swapSuggestions(defaultSuggestions)
@@ -699,19 +689,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 +964,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)
-    }
 }

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

@@ -43,7 +43,6 @@ 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
@@ -82,18 +81,16 @@ class ReaderActivity : BaseActivity() {
         field = value
 
         (reader_recyclerview.adapter as ReaderAdapter).isFullScreen = value
-
-        reader_progressbar.visibility = when {
-            value -> View.VISIBLE
-            else -> View.GONE
-        }
     }
 
     private lateinit var cache: Cache
     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 {
+                if (!it.progress.containsKey(galleryID))
+                    DownloadService.download(this@ReaderActivity, galleryID, true)
+            }
         }
 
         override fun onServiceDisconnected(name: ComponentName?) {
@@ -101,7 +98,6 @@ class ReaderActivity : BaseActivity() {
         }
     }
 
-    private val timer = Timer()
     private val snapHelper = PagerSnapHelper()
     private var menu: Menu? = null
 
@@ -123,7 +119,7 @@ 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?) {
         super.onCreate(savedInstanceState)
@@ -141,38 +137,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()
     }
 
@@ -252,6 +217,8 @@ class ReaderActivity : BaseActivity() {
     override fun onResume() {
         super.onResume()
 
+        bindService(Intent(this, DownloadService::class.java), conn, BIND_AUTO_CREATE)
+
         if (cameraEnabled)
             startCamera(this, cameraCallback)
     }
@@ -259,19 +226,18 @@ class ReaderActivity : BaseActivity() {
     override fun onPause() {
         super.onPause()
         closeCamera()
+
+        if (downloader != null)
+            unbindService(conn)
+
+        if (!DownloadManager.getInstance(this).isDownloading(galleryID))
+            DownloadService.cancel(this, galleryID)
     }
 
     override fun onDestroy() {
         super.onDestroy()
 
-        timer.cancel()
-        (reader_recyclerview?.adapter as? ReaderAdapter)?.timer?.cancel()
-
-        if (!DownloadManager.getInstance(this).isDownloading(galleryID))
-            DownloadService.cancel(this, galleryID)
-
-        if (downloader != null)
-            unbindService(conn)
+        update = false
     }
 
     override fun onBackPressed() {
@@ -306,48 +272,53 @@ 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
+                }
+
+                histories.add(galleryID)
 
-            runOnUiThread {
                 reader_download_progressbar.max = reader_recyclerview.adapter?.itemCount ?: 0
-                reader_download_progressbar.progress = downloader.progress[galleryID]?.count { it.isInfinite() } ?: 0
-                reader_progressbar.max = reader_recyclerview.adapter?.itemCount ?: 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
-                            })
+                            }
+                        )
                     }
                 }
 
@@ -391,7 +362,7 @@ class ReaderActivity : BaseActivity() {
                         return
                     currentPage = layoutManager.findFirstVisibleItemPosition()+1
                     menu?.findItem(R.id.reader_menu_page_indicator)?.title = "$currentPage/${recyclerView.adapter!!.itemCount}"
-                    this@ReaderActivity.reader_progressbar.progress = currentPage
+
                 }
             })
         }
@@ -400,19 +371,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)
                 }
             }
         }
@@ -492,17 +459,6 @@ class ReaderActivity : BaseActivity() {
         } else {
             snapHelper.attachToRecyclerView(reader_recyclerview)
             reader_recyclerview.layoutManager = LinearLayoutManager(this, LinearLayoutManager.HORIZONTAL, Preferences["rtl", false])
-
-            if (Preferences["rtl", false])
-                with(reader_progressbar) {
-                    scaleX = -1F
-                    translationX = 1F
-                }
-            else
-                with(reader_progressbar) {
-                    scaleX = 0F
-                    translationX = 0F
-                }
         }
 
         (reader_recyclerview.layoutManager as LinearLayoutManager).scrollToPositionWithOffset(currentPage-1, 0)
@@ -580,25 +536,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) {
+        if (eyeType != null && System.currentTimeMillis() - eyeTime > 100) {
             (this@ReaderActivity.reader_recyclerview.layoutManager as LinearLayoutManager).let {
                 it.scrollToPositionWithOffset(when(eyeType!!) {
                     Eye.RIGHT -> {
@@ -610,8 +564,7 @@ class ReaderActivity : BaseActivity() {
                 }, 0)
             }
 
-            eyeType = null
-            eyeCount = 0
+            eyeTime = System.currentTimeMillis() + 500
         }
     }
 
@@ -655,14 +608,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)
-    }
 }

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

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

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

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.*
@@ -45,6 +46,7 @@ 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
@@ -53,7 +55,7 @@ import xyz.quaver.pupil.util.ItemClickSupport
 import xyz.quaver.pupil.util.downloader.Cache
 import xyz.quaver.pupil.util.wordCapitalize
 
-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))>()
 
@@ -104,12 +106,7 @@ 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)
@@ -141,7 +138,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 +191,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 +212,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)
@@ -226,11 +235,7 @@ class GalleryDialog(context: Context, private val glide: RequestManager, private
                         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) }
                             }

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

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

@@ -22,25 +22,21 @@ import android.app.Activity
 import android.content.*
 import android.os.Bundle
 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 com.google.android.gms.oss.licenses.OssLicensesMenuActivity
-import com.google.android.material.snackbar.Snackbar
-import kotlinx.serialization.decodeFromString
-import kotlinx.serialization.json.Json
 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
 
 class SettingsFragment :
     PreferenceFragmentCompat(),
@@ -48,6 +44,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 +95,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())
@@ -267,19 +273,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)
-        }
-    }
 }

app/src/main/java/xyz/quaver/pupil/ui/view/FloatingSearchView.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,21 +36,21 @@ 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
@@ -60,8 +60,10 @@ class FloatingSearchViewDayNight @JvmOverloads constructor(context: Context, att
         searchInputView.imeOptions = EditorInfo.IME_FLAG_NO_EXTRACT_UI
 
         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) {
@@ -82,15 +84,18 @@ class FloatingSearchViewDayNight @JvmOverloads constructor(context: Context, att
     override fun onSuggestionClicked(searchSuggestion: SearchSuggestion?) {
         when (searchSuggestion) {
             is TagSuggestion -> {
-                with(searchInputView.text) {
-                    delete(if (lastIndexOf(' ') == -1) 0 else lastIndexOf(' ')+1, length)
-                    append("${searchSuggestion.n}:${searchSuggestion.s.replace(Regex("\\s"), "_")} ")
+                val tag = "${searchSuggestion.n}:${searchSuggestion.s.replace(Regex("\\s"), "_")}"
+                with(searchInputView.text!!) {
+                    delete(if (lastIndexOf(' ') == -1) 0 else lastIndexOf(' ') + 1, length)
+
+                    if (!this.contains(tag))
+                        append("$tag ")
                 }
             }
             is Suggestion -> {
-                with(searchInputView.text) {
+                with(searchInputView.text!!) {
                     clear()
-                    append(searchSuggestion.str)
+                    append(searchSuggestion.body)
                 }
             }
             is FavoriteHistorySwitch -> onFavoriteHistorySwitchClickListener?.invoke()
@@ -99,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"), "_")}"
 
@@ -196,7 +201,7 @@ class FloatingSearchViewDayNight @JvmOverloads constructor(context: Context, att
                     isClickable = true
 
                     setOnClickListener {
-                        onHistoryDeleteClickedListener?.invoke(item.str)
+                        onHistoryDeleteClickedListener?.invoke(item.body)
                     }
                 }
             }
@@ -212,10 +217,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
-    }
 }

app/src/main/java/xyz/quaver/pupil/ui/view/TagChip.kt

@@ -23,17 +23,18 @@ 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.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,18 +45,47 @@ 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) {

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

@@ -59,6 +59,8 @@ class SavedSet <T: Any> (private val file: File, private val any: T, private val
     override fun add(element: T): Boolean {
         load()
 
+        set.remove(element)
+
         return set.add(element).also {
             save()
         }
@@ -67,6 +69,8 @@ class SavedSet <T: Any> (private val file: File, private val any: T, private val
     override fun addAll(elements: Collection<T>): Boolean {
         load()
 
+        set.removeAll(elements)
+
         return set.addAll(elements).also {
             save()
         }

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

@@ -20,7 +20,7 @@ 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
@@ -38,6 +38,7 @@ import xyz.quaver.io.util.*
 import xyz.quaver.pupil.client
 import xyz.quaver.pupil.util.Preferences
 import java.io.IOException
+import java.util.concurrent.ConcurrentHashMap
 
 @Serializable
 data class Metadata(
@@ -51,7 +52,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) {
@@ -61,7 +62,7 @@ class Cache private constructor(context: Context, val galleryID: Int) : ContextW
         @Synchronized
         fun delete(galleryID: Int) {
             instances[galleryID]?.cacheFolder?.deleteRecursively()
-            instances.delete(galleryID)
+            instances.remove(galleryID)
         }
     }
 
@@ -131,8 +132,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,9 +141,9 @@ 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 { it.writeBytes(thumbnail) }
+                }.getOrNull()?.uri }
             } }
 
     suspend fun getReader(): Reader? {
@@ -200,9 +201,36 @@ class Cache private constructor(context: Context, val galleryID: Int) : ContextW
     fun moveToDownload() = CoroutineScope(Dispatchers.IO).launch {
         val downloadFolder = downloadFolder ?: return@launch
 
-        if (downloadFolder.getChild(".metadata").exists())
+        val cacheMetadata = cacheFolder.getChild(".metadata")
+        val downloadMetadata = downloadFolder.getChild(".metadata")
+
+        if (downloadMetadata.exists() || !cacheMetadata.exists())
             return@launch
 
+        if (cacheMetadata.exists()) {
+            kotlin.runCatching {
+                downloadMetadata.createNewFile()
+                downloadMetadata.writeText(Json.encodeToString(metadata))
+
+                cacheMetadata.delete()
+            }
+        }
+
+        val cacheThumbnail = cacheFolder.getChild(".thumbnail")
+        val downloadThumbnail = downloadFolder.getChild(".thumbnail")
+
+        if (cacheThumbnail.exists() && !downloadThumbnail.exists()) {
+            kotlin.runCatching {
+                if (!downloadThumbnail.exists())
+                    downloadThumbnail.createNewFile()
+
+                downloadThumbnail.outputStream()?.use { target -> cacheThumbnail.inputStream()?.use { source ->
+                    source.copyTo(target)
+                } }
+                cacheThumbnail.delete()
+            }
+        }
+
         metadata.imageList?.forEach { imageName ->
             imageName ?: return@forEach
             val target = downloadFolder.getChild(imageName)
@@ -212,37 +240,13 @@ class Cache private constructor(context: Context, val galleryID: Int) : ContextW
                 return@forEach
 
             kotlin.runCatching {
-                target.createNewFile()
+                if (!target.exists())
+                    target.createNewFile()
+
                 target.outputStream()?.use { target -> source.inputStream()?.use { source ->
                     source.copyTo(target)
                 } }
             }
         }
-
-        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()
-            }
-        }
-
-        val cacheMetadata = cacheFolder.getChild(".metadata")
-        val downloadMetadata = downloadFolder.getChild(".metadata")
-
-        if (cacheMetadata.exists() && !downloadMetadata.exists()) {
-            kotlin.runCatching {
-                downloadMetadata.createNewFile()
-                downloadMetadata.writeText(Json.encodeToString(metadata))
-                cacheMetadata.delete()
-            }
-        }
-
-        cacheFolder.delete()
     }
 }

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

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>

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>

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>

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,7 +41,7 @@
                 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"/>
 
@@ -74,7 +74,7 @@
             app:hideHandleAfter="1000"
             app:trackMarginStart="64dp"
             app:addLastItemPadding="true"
-            app:popupDrawable="@color/transparent">
+            app:popupDrawable="@android:color/transparent">
 
             <androidx.recyclerview.widget.RecyclerView
                 android:id="@+id/main_recyclerview"
@@ -126,21 +126,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>

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"
@@ -55,28 +55,11 @@
         android:layout_gravity="center_horizontal"
         android:layout_margin="8dp"/>
 
-    <LinearLayout
+    <ProgressBar
+        android:id="@+id/reader_download_progressbar"
+        style="@style/Widget.AppCompat.ProgressBar.Horizontal"
         android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:orientation="vertical">
-
-        <ProgressBar
-            android:id="@+id/reader_download_progressbar"
-            style="@style/Widget.AppCompat.ProgressBar.Horizontal"
-            android:layout_width="match_parent"
-            android:layout_height="4dp"
-            android:layout_gravity="center"/>
-
-        <ProgressBar
-            android:id="@+id/reader_progressbar"
-            style="@style/Widget.AppCompat.ProgressBar.Horizontal"
-            android:layout_width="match_parent"
-            android:layout_height="4dp"
-            android:progressTint="@color/material_green_a700"
-            tools:ignore="UnusedAttribute"
-            android:visibility="gone"/>
-
-    </LinearLayout>
+        android:layout_height="4dp"/>
     
     <com.github.clans.fab.FloatingActionMenu
         android:id="@+id/reader_fab"

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"

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

@@ -107,10 +107,10 @@
 
 			</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_constraintLeft_toLeftOf="parent"
@@ -162,16 +162,14 @@
 				android:layout_marginLeft="8dp"
 				android:layout_marginBottom="8dp"
 				app:layout_constraintTop_toBottomOf="@id/galleryblock_type"
-				app:layout_constraintBottom_toTopOf="@id/galleryblock_padding"
 				app:layout_constraintLeft_toRightOf="@id/galleryblock_thumbnail" />
 
-			<View
-				android:id="@+id/galleryblock_padding"
-				android:layout_width="0dp"
-				android:layout_height="0dp"
-				app:layout_constraintRight_toRightOf="parent"
-				app:layout_constraintTop_toBottomOf="@id/galleryblock_language"
-				app:layout_constraintBottom_toTopOf="@id/galleryblock_tag_group"/>
+			<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
 				android:id="@+id/galleryblock_tag_group"
@@ -181,7 +179,7 @@
 				android:layout_marginTop="16dp"
 				android:layout_marginBottom="16dp"
 				app:chipSpacing="4dp"
-				app:layout_constraintTop_toBottomOf="@id/galleryblock_padding"
+				app:layout_constraintTop_toBottomOf="@id/padding"
 				app:layout_constraintLeft_toRightOf="@id/galleryblock_thumbnail"
 				app:layout_constraintRight_toRightOf="parent"/>
 
@@ -190,13 +188,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_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"/>
 

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

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>

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>

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

@@ -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>

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>

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

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

@@ -50,7 +50,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 +155,6 @@
     <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_low_quality">Low quality images</string>
     <string name="settings_low_quality_summary">Load low quality images to improve load speed and data usage</string>
 

app/src/main/res/xml/root_preferences.xml

@@ -44,10 +44,6 @@
             app:key="download_folder"
             app:title="@string/settings_download_folder"/>
 
-        <SwitchPreferenceCompat
-            app:key="cache_disable"
-            app:title="@string/settings_cache_disable"/>
-
         <SwitchPreferenceCompat
             app:key="nomedia"
             app:title="@string/settings_nomedia_title"/>

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.0.1"
         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.1"
+        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" }
     }
 }