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>

.idea/vcs.xml

@@ -2,6 +2,5 @@
 <project version="4">
   <component name="VcsDirectoryMappings">
     <mapping directory="" vcs="Git" />
-    <mapping directory="$PROJECT_DIR$/gh-pages" vcs="Git" />
   </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
+# Features
-![Main Screen](https://github.com/tom5079/Pupil/blob/gh-pages/assets/images/main-screenshot.png?raw=true)
+![Main Screen](https://github.com/tom5079/Pupil/blob/gh-pages/assets/images/main-screenshot.jpg?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
 
 # Installation
 

app/build.gradle

@@ -1,27 +1,44 @@
-apply plugin: 'com.android.application'
+apply plugin: "com.android.application"
-apply plugin: 'kotlin-android'
+apply plugin: "kotlin-android"
-apply plugin: 'kotlin-kapt'
+apply plugin: "kotlin-kapt"
-apply plugin: 'kotlin-android-extensions'
+apply plugin: "kotlin-android-extensions"
-apply plugin: 'kotlinx-serialization'
+apply plugin: "kotlinx-serialization"
-apply plugin: 'com.google.android.gms.oss-licenses-plugin'
+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.gms.google-services"
-    apply plugin: 'com.google.firebase.crashlytics'
+    apply plugin: "com.google.firebase.crashlytics"
-    apply plugin: 'com.google.firebase.firebase-perf'
+    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 58
+        versionCode 61
-        versionName "5.0-hotfix2"
+        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')
+            buildConfigField("Boolean", "CENSOR", "false")
-            proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
+            proguardFiles getDefaultProguardFile("proguard-android-optimize.txt"), "proguard-rules.pro"
 
             ext.enableCrashlytics = false
             ext.alwaysUpdateBuildId = false
@@ -44,70 +61,78 @@ android {
             minifyEnabled true
             shrinkResources true
 
-            buildConfigField('Boolean', 'CENSOR', 'false')
+            buildConfigField("Boolean", "CENSOR", "false")
-            proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
+            proguardFiles getDefaultProguardFile("proguard-android-optimize.txt"), "proguard-rules.pro"
         }
     }
     kotlinOptions {
         jvmTarget = JavaVersion.VERSION_1_8.toString()
-        freeCompilerArgs += '-Xuse-experimental=kotlin.Experimental'
+        freeCompilerArgs += "-Xuse-experimental=kotlin.Experimental"
     }
     compileOptions {
         sourceCompatibility JavaVersion.VERSION_1_8
         targetCompatibility JavaVersion.VERSION_1_8
     }
-    buildToolsVersion = '29.0.3'
+    buildToolsVersion = "29.0.3"
 }
 
 dependencies {
-    implementation fileTree(dir: 'libs', include: ['*.jar', '*.aar'])
+    implementation fileTree(dir: "libs", include: ["*.jar", "*.aar"])
-    implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version"
+    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 "org.jetbrains.kotlinx:kotlinx-serialization-json:1.0.0-RC2"
-    implementation 'androidx.appcompat:appcompat:1.2.0'
+    
-    implementation 'androidx.constraintlayout:constraintlayout:2.0.1'
+    implementation "androidx.appcompat:appcompat:1.2.0"
-    implementation 'androidx.preference:preference:1.1.1'
+    implementation "androidx.activity:activity-ktx:1.2.0-alpha08"
-    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 'androidx.fragment:fragment-ktx:1.2.5'
+
     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.android.material:material:1.3.0-alpha02"
-    implementation 'com.google.firebase:firebase-analytics:17.5.0'
+
-    implementation 'com.google.firebase:firebase-crashlytics:17.2.1'
+    implementation "com.google.firebase:firebase-core:17.5.0"
-    implementation 'com.google.firebase:firebase-perf:19.0.8'
+    implementation "com.google.firebase:firebase-analytics:17.5.0"
-    implementation 'com.google.android.gms:play-services-oss-licenses:17.0.0'
+    implementation "com.google.firebase:firebase-crashlytics:17.2.1"
-    implementation 'com.github.arimorty:floatingsearchview:2.1.1'
+    implementation "com.google.firebase:firebase-perf:19.0.8"
-    implementation 'com.github.clans:fab:1.6.4'
+
-    //implementation 'com.quiph.ui:recyclerviewfastscroller:0.2.1'
+    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.squareup.okhttp3:okhttp:$okhttp_version"
-    implementation 'com.github.bumptech.glide:glide:4.11.0'
+
-    implementation ("com.github.bumptech.glide:okhttp3-integration:4.11.0") {
+    implementation "com.tbuonomo.andrui:viewpagerdotsindicator:4.1.2"
-        transitive = false
+
-    }
+    implementation "net.rdrei.android.dirchooser:library:3.2@aar"
-    implementation 'com.github.bumptech.glide:annotations:4.11.0'
+    implementation "com.gu:option:1.3"
-    annotationProcessor 'com.github.bumptech.glide:compiler:4.11.0'
+
-    kapt 'com.github.bumptech.glide:compiler:4.11.0'
+    implementation "com.andrognito.patternlockview:patternlockview:1.0.0"
-    implementation ("com.github.bumptech.glide:recyclerview-integration:4.11.0") {
+    //implementation "com.andrognito.pinlockview:pinlockview:2.1.0"
-        transitive = false
+
-    }
-    implementation 'com.tbuonomo.andrui:viewpagerdotsindicator:4.1.2'
-    implementation 'net.rdrei.android.dirchooser:library:3.2@aar'
-    implementation 'com.github.chrisbanes:PhotoView:2.3.0'
-    implementation 'com.andrognito.patternlockview:patternlockview:1.0.0'
-    //implementation 'com.andrognito.pinlockview:pinlockview:2.1.0'
     implementation "ru.noties.markwon:core:3.1.0"
-    implementation ("xyz.quaver:libpupil:1.5") {
+
-        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'
+    implementation "xyz.quaver:floatingsearchview:1.0.5"
-    androidTestImplementation 'androidx.test.ext:junit:1.1.2'
+
-    androidTestImplementation 'androidx.test:rules:1.3.0'
+    testImplementation "junit:junit:4.13"
-    androidTestImplementation 'androidx.test:runner:1.3.0'
+    androidTestImplementation "androidx.test.ext:junit:1.1.2"
-    androidTestImplementation 'androidx.test.espresso:espresso-core:3.3.0'
+    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": 58,
+      "versionCode": 61,
-      "versionName": "5.0-hotfix2",
+      "versionName": "5.1.1-hotfix2",
       "enabled": true,
       "outputFile": "app-release.apk"
     }

app/src/main/AndroidManifest.xml

@@ -6,10 +6,13 @@
     <uses-permission android:name="android.permission.INTERNET" />
     <uses-permission android:name="android.permission.REQUEST_INSTALL_PACKAGES" />
     <uses-permission android:name="android.permission.USE_BIOMETRIC" />
-    <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
+    <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" android:maxSdkVersion="21"/>
-    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
+    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" android:maxSdkVersion="21" />
     <uses-permission android:name="android.permission.FOREGROUND_SERVICE" />
+    <uses-permission android:name="android.permission.CAMERA" />
 
+    <uses-feature android:name="android.hardware.camera" android:required="false" />
+    <uses-feature android:name="android.hardware.camera.autofocus" android:required="false" />
 
     <application
         android:name=".Pupil"
@@ -24,6 +27,10 @@
         tools:replace="android:theme"
         tools:ignore="UnusedAttribute">
 
+        <meta-data
+            android:name="com.google.mlkit.vision.DEPENDENCIES"
+            android:value="face" />
+
         <provider
             android:authorities="${applicationId}.provider"
             android:name="androidx.core.content.FileProvider"

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
@@ -71,11 +70,9 @@ val client: OkHttpClient
 
 class Pupil : Application() {
 
-    init {
-        AppCompatDelegate.setCompatVectorFromResourcesEnabled(true)
-    }
-
     override fun onCreate() {
+        AppCompatDelegate.setCompatVectorFromResourcesEnabled(true)
+
         preferences = PreferenceManager.getDefaultSharedPreferences(this)
 
         val userID = Preferences["user_id", ""].let {  userID ->
@@ -120,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)
 
@@ -145,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,34 +20,28 @@ package xyz.quaver.pupil.adapters
 
 import android.content.Context
 import android.graphics.drawable.Drawable
+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.android.synthetic.main.item_reader.view.*
-import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.*
-import kotlinx.coroutines.launch
-import kotlinx.coroutines.withContext
 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
@@ -55,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 java.io.File
-import kotlin.collections.ArrayList
-import kotlin.concurrent.schedule
 
-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,
@@ -67,33 +59,34 @@ class GalleryBlockAdapter(private val glide: RequestManager, private val galleri
         PREV
     }
 
-    val timer = Timer()
+    var update = true
-
+    var thin: Boolean = Preferences["thin"]
-    var isThin = false
 
     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.visibility = View.GONE
+                    view.galleryblock_progressbar_layout.visibility = View.GONE
-                    view.galleryblock_progress_complete.visibility = View.GONE
+                    view.galleryblock_progress_complete.visibility = View.INVISIBLE
                     return@launch
                 }
 
                 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) {
                         if (visibility == View.GONE)
                             visibility = View.VISIBLE
+                    }
 
-                    if (progress == max) {
+                    if (!imageList.contains(null)) {
                         val downloadManager = DownloadManager.getInstance(context)
 
                         if (completeFlag.get(galleryID, false)) {
@@ -140,54 +133,41 @@ class GalleryBlockAdapter(private val glide: RequestManager, private val galleri
                 val artists = galleryBlock.artists
                 val series = galleryBlock.series
 
-                if (isThin)
+                galleryblock_thumbnail.apply {
-                    galleryblock_thumbnail.layoutParams.width = context.resources.getDimensionPixelSize(
+                    setOnClickListener {
-                        R.dimen.galleryblock_thumbnail_thin
+                        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() }
+                            }
+                        }
 
-                galleryblock_thumbnail.setImageDrawable(CircularProgressDrawable(context).also {
+                        override fun onCacheHit(imageType: Int, image: File?) {}
-                    it.start()
+                        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 {
-                    val thumbnail = cache.getThumbnail()
+                        showImage(cache.getThumbnail() ?: Uri.EMPTY)
-
-                    glide
-                        .load(thumbnail)
-                        .skipMemoryCache(true)
-                        .diskCacheStrategy(DiskCacheStrategy.NONE)
-                        .error(R.drawable.image_broken_variant)
-                        .listener(object: RequestListener<Drawable> {
-                            override fun onLoadFailed(
-                                e: GlideException?,
-                                model: Any?,
-                                target: Target<Drawable>?,
-                                isFirstResource: Boolean
-                            ): Boolean {
-                                Cache.getInstance(context, galleryID).let {
-                                    it.cacheFolder.getChild(".thumbnail").let { if (it.exists()) it.delete() }
-                                    it.downloadFolder?.getChild(".thumbnail")?.let { if (it.exists()) it.delete() }
                     }
-                                return false
                 }
 
-                            override fun onResourceReady(
+                if (updateJob == null)
-                                resource: Drawable?,
+                    updateJob = CoroutineScope(Dispatchers.Main).launch {
-                                model: Any?,
+                        while (update) {
-                                target: Target<Drawable>?,
-                                dataSource: DataSource?,
-                                isFirstResource: Boolean
-                            ): Boolean = false
-                        })
-                        .apply {
-                            if (BuildConfig.CENSOR)
-                                override(5, 8)
-                        }.let { launch(Dispatchers.Main) { it.into(galleryblock_thumbnail) } }
-                }
-
-                if (timerTask == null)
-                    timerTask = timer.schedule(0, 1000) {
                             updateProgress(context, galleryID)
+                            delay(1000)
+                        }
                     }
 
                 galleryblock_title.text = galleryBlock.title
@@ -219,13 +199,26 @@ class GalleryBlockAdapter(private val glide: RequestManager, private val galleri
                 }
 
                 galleryblock_tag_group.removeAllViews()
-                galleryBlock.relatedTags.forEach {
+                CoroutineScope(Dispatchers.Default).launch {
-                    galleryblock_tag_group.addView(TagChip(context, Tag.parse(it)).apply {
+                    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)
                                     callback.invoke((view as TagChip).tag)
                             }
-                    })
+                        }
+                    }.let { launch(Dispatchers.Main) { it.forEach { galleryblock_tag_group.addView(it) } } }
                 }
 
                 galleryblock_id.text = galleryBlock.id.toString()
@@ -268,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
@@ -369,8 +362,8 @@ class GalleryBlockAdapter(private val glide: RequestManager, private val galleri
         super.onViewDetachedFromWindow(holder)
 
         if (holder is GalleryViewHolder) {
-            holder.timerTask?.cancel()
+            holder.updateJob?.cancel()
-            holder.timerTask = null
+            holder.updateJob = null
         }
     }
 

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

@@ -18,58 +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.davemorrissey.labs.subscaleview.SubsamplingScaleImageView
-import com.bumptech.glide.load.DataSource
+import com.facebook.drawee.backends.pipeline.Fresco
-import com.bumptech.glide.load.engine.DiskCacheStrategy
+import com.facebook.drawee.controller.BaseControllerListener
-import com.bumptech.glide.load.engine.GlideException
+import com.facebook.drawee.drawable.ScalingUtils
-import com.bumptech.glide.load.model.GlideUrl
+import com.facebook.drawee.interfaces.DraweeController
-import com.bumptech.glide.load.model.LazyHeaders
+import com.facebook.drawee.view.SimpleDraweeView
-import com.bumptech.glide.request.RequestListener
+import com.facebook.imagepipeline.image.ImageInfo
-import com.bumptech.glide.request.target.Target
+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.*
-import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.launch
-import xyz.quaver.Code
 import xyz.quaver.hitomi.Reader
-import xyz.quaver.hitomi.getReferer
-import xyz.quaver.hitomi.imageUrlFromImage
-import xyz.quaver.hiyobi.createImgList
-import xyz.quaver.io.util.readBytes
-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 java.io.File
-import kotlin.concurrent.schedule
 import kotlin.math.roundToInt
 
-class ReaderAdapter(private val activity: ReaderActivity,
+class ReaderAdapter(
-                    private val galleryID: Int) : RecyclerView.Adapter<ReaderAdapter.ViewHolder>() {
+    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)
         }
     }
@@ -81,114 +110,134 @@ class ReaderAdapter(private val activity: ReaderActivity,
         if (cache == null)
             cache = Cache.getInstance(holder.view.context, galleryID)
 
-        if (isFullScreen) {
+        if (!isFullScreen) {
-            holder.view.layoutParams.height = RecyclerView.LayoutParams.MATCH_PARENT
+            holder.view.setBackgroundResource(R.drawable.reader_item_boundary)
-            holder.view.container.layoutParams.height = ConstraintLayout.LayoutParams.MATCH_PARENT
+            holder.view.image.updateLayoutParams<ConstraintLayout.LayoutParams> {
+                height = 0
+                dimensionRatio =
+                    "${reader!!.galleryInfo.files[position].width}:${reader!!.galleryInfo.files[position].height}"
+            }
         } else {
-            holder.view.layoutParams.height = RecyclerView.LayoutParams.WRAP_CONTENT
+            holder.view.layoutParams.height = ViewGroup.LayoutParams.MATCH_PARENT
-            holder.view.container.layoutParams.height = 0
+            holder.view.image.updateLayoutParams<ConstraintLayout.LayoutParams> {
-
+                height = ConstraintLayout.LayoutParams.MATCH_PARENT
-            (holder.view.container.layoutParams as ConstraintLayout.LayoutParams)
+                dimensionRatio = null
-                .dimensionRatio = "W,${reader!!.galleryInfo.files[position].width}:${reader!!.galleryInfo.files[position].height}"
             }
-
+            holder.view.background = null
-        holder.view.image.setOnPhotoTapListener { _, _, _ ->
-            onItemClickListener?.invoke(position)
-        }
-
-        holder.view.container.setOnClickListener {
-            onItemClickListener?.invoke(position)
         }
 
         holder.view.reader_index.text = (position+1).toString()
 
-        if (Preferences["cache_disable"]) {
-            val lowQuality: Boolean = Preferences["low_quality"]
-
-            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)
-                    .fitCenter()
-                    .apply {
-                        if (BuildConfig.CENSOR)
-                            override(5, 8)
-                    }
-                    .error(R.drawable.image_broken_variant)
-                    .into(holder.view.image)
-            }
-        } else {
         val image = cache!!.getImage(position)
         val progress = activity.downloader?.progress?.get(galleryID)?.get(position)
 
         if (progress?.isInfinite() == true && image != null) {
-                holder.view.reader_item_progressbar.visibility = View.INVISIBLE
+            holder.view.progress_group.visibility = View.INVISIBLE
-
+            holder.view.image.showImage(image.uri)
-                CoroutineScope(Dispatchers.IO).launch {
-                    glide
-                        .load(image.readBytes())
-                        .diskCacheStrategy(DiskCacheStrategy.NONE)
-                        .skipMemoryCache(true)
-                        .fitCenter()
-                        .apply {
-                            if (BuildConfig.CENSOR)
-                                override(5, 8)
-                        }
-                        .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
+            holder.view.progress_group.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)
+            holder.clear()
 
-                timer.schedule(1000) {
             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.github.piasy.biv.view.BigImageView
-import com.bumptech.glide.load.engine.DiskCacheStrategy
+import xyz.quaver.pupil.R
-import xyz.quaver.pupil.BuildConfig
 
-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
+        holder.view.showImage(Uri.parse(thumbnails[position]))
-            .load(thumbnails[position])
-            .diskCacheStrategy(DiskCacheStrategy.NONE)
-            .apply {
-                if (BuildConfig.CENSOR)
-                    override(5, 8)
-            }
-            .into(holder.view)
     }
 
     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)
+            val layoutManager = GridLayoutManager(parent.context, 3)
-            adapter = ThumbnailAdapter(glide, listOf())
+            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,11 +23,11 @@ import android.app.PendingIntent
 import android.app.Service
 import android.content.Context
 import android.content.Intent
-import android.util.SparseArray
 import androidx.core.app.NotificationCompat
 import androidx.core.app.NotificationManagerCompat
 import androidx.core.app.TaskStackBuilder
 import androidx.core.content.ContextCompat
+import com.google.firebase.crashlytics.FirebaseCrashlytics
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.Job
@@ -48,6 +48,9 @@ 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() {
@@ -66,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)
@@ -194,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
 
@@ -215,11 +218,12 @@ class DownloadService : Service() {
             val ext = call.request().url().encodedPath().split('.').last()
 
             kotlin.runCatching {
-                val image = response.body()?.use { it.bytes() } ?: throw Exception()
+                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)
@@ -291,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)
@@ -303,17 +307,23 @@ 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 })
+        progress[galleryID] = MutableList(reader.galleryInfo.files.size) { 0F }
 
-        cache.metadata.imageList?.forEachIndexed { index, image ->
+        cache.metadata.imageList?.let {
+            it.forEachIndexed { index, image ->
                 progress[galleryID]?.set(index, if (image != null) Float.POSITIVE_INFINITY else 0F)
             }
+        }
 
         if (isCompleted(galleryID)) {
+            if (DownloadManager.getInstance(this@DownloadService)
+                    .getDownloadFolder(galleryID) != null )
+                Cache.getInstance(this@DownloadService, galleryID).moveToDownload()
+
             notificationManager.cancel(galleryID)
             startId?.let { stopSelf(it) }
             return@launch
@@ -334,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 {
+    @IgnoredOnParcel
-        return s
+    override val body = s
-    }
 }
 
 @Parcelize
-class Suggestion(val str: String) : SearchSuggestion {
+class Suggestion(override val body: String) : SearchSuggestion
-    override fun getBody() = str
-}
 
 @Parcelize
-class NoResultSuggestion(val str: String) : SearchSuggestion {
+class NoResultSuggestion(override val body: String) : SearchSuggestion
-    override fun getBody() = str
-}
 
 @Parcelize
-class LoadingSuggestion(val str: String) : SearchSuggestion {
+class LoadingSuggestion(override val body: String) : SearchSuggestion
-    override fun getBody() = str
-}
 
 @Parcelize
 @Suppress("PARCELABLE_PRIMARY_CONSTRUCTOR_IS_EMPTY")
-class FavoriteHistorySwitch(private val body: String) : SearchSuggestion {
+class FavoriteHistorySwitch(override val body: String) : SearchSuggestion
-    override fun getBody() = body
-}

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())
+            lockLauncher.launch(Intent(this, LockActivity::class.java))
-    }
-
-    @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)
-        }
     }
 
 }

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

@@ -39,10 +39,10 @@ import xyz.quaver.pupil.util.Lock
 import xyz.quaver.pupil.util.LockManager
 import xyz.quaver.pupil.util.Preferences
 
+private var lastUnlocked = 0L
 class LockActivity : AppCompatActivity() {
 
     private lateinit var lockManager: LockManager
-    private var lastUnlocked = 0L
     private var mode: String? = null
 
     private val patternLockFragment = PatternLockFragment().apply {

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

@@ -23,16 +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
@@ -40,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
@@ -49,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
@@ -59,7 +65,6 @@ import kotlin.math.roundToInt
 
 class MainActivity :
     BaseActivity(),
-    FloatingSearchView.OnMenuItemClickListener,
     NavigationView.OnNavigationItemSelectedListener
 {
 
@@ -95,9 +100,10 @@ class MainActivity :
     private var loadingJob: Job? = null
     private var currentPage = 0
 
-
     override fun onCreate(savedInstanceState: Bundle?) {
+        AppCompatDelegate.setCompatVectorFromResourcesEnabled(true)
         super.onCreate(savedInstanceState)
+        setContentView(R.layout.activity_main)
 
         if (intent.action == Intent.ACTION_VIEW) {
             intent.dataString?.let { url ->
@@ -111,8 +117,6 @@ class MainActivity :
             }
         }
 
-        setContentView(R.layout.activity_main)
-
         if (Preferences["download_folder", ""].isEmpty())
             DownloadLocationDialogFragment().show(supportFragmentManager, "Download Location Dialog")
 
@@ -140,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 {
@@ -180,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(
@@ -261,11 +251,7 @@ class MainActivity :
                     if (it?.isEmpty() == false) {
                         val galleryID = it.random()
 
-                        GalleryDialog(
+                        GalleryDialog(this@MainActivity, galleryID).apply {
-                            this@MainActivity,
-                            Glide.with(this@MainActivity),
-                            galleryID
-                        ).apply {
                             onChipClickedHandler.add {
                                 runOnUiThread {
                                     query = it.toQuery()
@@ -316,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()
@@ -330,9 +316,7 @@ 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()
-                    else {
                     if (DownloadManager.getInstance(context).isDownloading(galleryID)) {     //download in progress
                         DownloadService.cancel(this@MainActivity, galleryID)
                     }
@@ -340,7 +324,6 @@ class MainActivity :
                         DownloadManager.getInstance(context).addDownloadFolder(galleryID)
                         DownloadService.download(this@MainActivity, galleryID)
                     }
-                    }
 
                     closeAllItems()
                 }
@@ -382,11 +365,7 @@ class MainActivity :
 
                     val galleryID = galleries[position]
 
-                    GalleryDialog(
+                    GalleryDialog(this@MainActivity, galleryID).apply {
-                        this@MainActivity,
-                        Glide.with(this@MainActivity),
-                        galleryID
-                    ).apply {
                         onChipClickedHandler.add {
                             runOnUiThread {
                                 query = it.toQuery()
@@ -619,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) {
+        with(main_searchview as xyz.quaver.pupil.ui.view.FloatingSearchView) {
-            setOnLeftMenuClickListener(object: FloatingSearchView.OnLeftMenuClickListener {
+            onMenuStatusChangeListener = object: FloatingSearchView.OnMenuStatusChangeListener {
                 override fun onMenuOpened() {
                     (this@MainActivity.main_recyclerview.adapter as GalleryBlockAdapter).closeAllItems()
                 }
@@ -634,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)
@@ -645,9 +632,11 @@ class MainActivity :
                 swapSuggestions(defaultSuggestions)
             }
 
-            setOnMenuItemClickListener(this@MainActivity)
+            onMenuItemClickListener = {
+                onActionMenuItemSelected(it)
+            }
 
-            setOnQueryChangeListener { _, query ->
+            onQueryChangeListener = lambda@{ _, query ->
                 this@MainActivity.query = query
 
                 suggestionJob?.cancel()
@@ -655,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 {
@@ -681,7 +672,7 @@ class MainActivity :
                 }
             }
 
-            setOnFocusChangeListener(object: FloatingSearchView.OnFocusChangeListener {
+            onFocusChangeListener = object: FloatingSearchView.OnFocusChangeListener {
                 override fun onFocus() {
                     if (query.isEmpty() or query.endsWith(' '))
                         swapSuggestions(defaultSuggestions)
@@ -698,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
@@ -968,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

@@ -18,15 +18,23 @@
 
 package xyz.quaver.pupil.ui
 
+import android.Manifest
 import android.content.ComponentName
 import android.content.Intent
 import android.content.ServiceConnection
+import android.content.pm.PackageManager
 import android.graphics.drawable.Animatable
 import android.graphics.drawable.Drawable
+import android.os.Build
 import android.os.Bundle
 import android.os.IBinder
 import android.view.*
+import android.view.animation.Animation
+import android.view.animation.AnticipateInterpolator
+import android.view.animation.OvershootInterpolator
+import android.view.animation.TranslateAnimation
 import android.widget.Toast
+import androidx.activity.result.contract.ActivityResultContracts
 import androidx.appcompat.app.AlertDialog
 import androidx.core.content.ContextCompat
 import androidx.preference.PreferenceManager
@@ -35,14 +43,17 @@ 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
+import com.qtalk.recyclerviewfastscroller.RecyclerViewFastScroller
 import kotlinx.android.synthetic.main.activity_reader.*
 import kotlinx.android.synthetic.main.activity_reader.view.*
 import kotlinx.android.synthetic.main.dialog_numberpicker.view.*
+import kotlinx.android.synthetic.main.reader_eye_card.view.*
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.delay
 import kotlinx.coroutines.launch
 import xyz.quaver.Code
 import xyz.quaver.pupil.R
@@ -51,11 +62,13 @@ import xyz.quaver.pupil.favorites
 import xyz.quaver.pupil.histories
 import xyz.quaver.pupil.services.DownloadService
 import xyz.quaver.pupil.util.Preferences
+import xyz.quaver.pupil.util.camera
+import xyz.quaver.pupil.util.closeCamera
 import xyz.quaver.pupil.util.downloader.Cache
 import xyz.quaver.pupil.util.downloader.DownloadManager
+import xyz.quaver.pupil.util.startCamera
 import java.util.*
 import kotlin.concurrent.schedule
-import kotlin.concurrent.timer
 
 class ReaderActivity : BaseActivity() {
 
@@ -68,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?) {
@@ -87,13 +98,29 @@ class ReaderActivity : BaseActivity() {
         }
     }
 
-    private val timer = Timer()
-    private var autoTimer: Timer? = null
-
     private val snapHelper = PagerSnapHelper()
-
     private var menu: Menu? = null
 
+    private val requestPermissionLauncher = registerForActivityResult(ActivityResultContracts.RequestPermission()) { isGranted ->
+        if (isGranted)
+            toggleCamera()
+        else
+            AlertDialog.Builder(this)
+                .setTitle(R.string.error)
+                .setMessage(R.string.camera_denied)
+                .setPositiveButton(android.R.string.ok) { _, _ ->}
+                .show()
+    }
+
+    enum class Eye {
+        LEFT,
+        RIGHT
+    }
+
+    private var cameraEnabled = false
+    private var eyeType: Eye? = null
+    private var eyeTime: Long = 0L
+
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         setContentView(R.layout.activity_reader)
@@ -110,38 +137,7 @@ class ReaderActivity : BaseActivity() {
             return
         }
 
-        if (Preferences["cache_disable"]) {
+        initDownloadListener()
-            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()
-
         initView()
     }
 
@@ -218,17 +214,30 @@ class ReaderActivity : BaseActivity() {
         return true
     }
 
-    override fun onDestroy() {
+    override fun onResume() {
-        super.onDestroy()
+        super.onResume()
 
-        timer.cancel()
+        bindService(Intent(this, DownloadService::class.java), conn, BIND_AUTO_CREATE)
-        (reader_recyclerview?.adapter as? ReaderAdapter)?.timer?.cancel()
 
-        if (!DownloadManager.getInstance(this).isDownloading(galleryID))
+        if (cameraEnabled)
-            DownloadService.cancel(this, galleryID)
+            startCamera(this, cameraCallback)
+    }
+
+    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()
+
+        update = false
     }
 
     override fun onBackPressed() {
@@ -263,29 +272,31 @@ class ReaderActivity : BaseActivity() {
         }
     }
 
-    private fun initDownloader() {
+    private var update = true
-        DownloadService.download(this, galleryID, true)
+    private fun initDownloadListener() {
-        bindService(Intent(this, DownloadService::class.java), conn, BIND_AUTO_CREATE)
+        CoroutineScope(Dispatchers.Main).launch {
+            while (update) {
+                delay(1000)
 
-        timer.schedule(1000, 1000) {
+                val downloader = downloader ?: continue
-            val downloader = downloader ?: return@schedule
 
-            if (downloader.progress.indexOfKey(galleryID) < 0)  //loading
+                if (!downloader.progress.containsKey(galleryID))  //loading
-                return@schedule
+                    continue
 
-            if (downloader.progress[galleryID] == null) {      //Gallery not found
+                if (downloader.progress[galleryID]?.isEmpty() == true) {      //Gallery not found
-                timer.cancel()
+                    update = false
                     Snackbar
                         .make(reader_layout, R.string.reader_failed_to_find_gallery, Snackbar.LENGTH_INDEFINITE)
                         .show()
+
+                    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_download_progressbar.progress =
-                reader_progressbar.max = reader_recyclerview.adapter?.itemCount ?: 0
+                    downloader.progress[galleryID]?.count { it.isInfinite() } ?: 0
 
                 if (title == getString(R.string.reader_loading)) {
                     val reader = cache.metadata.reader
@@ -297,14 +308,17 @@ class ReaderActivity : BaseActivity() {
                         }
 
                         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
-                            })
+                            }
+                        )
                     }
                 }
 
@@ -348,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
+
                 }
             })
         }
@@ -357,9 +371,6 @@ 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)
 
                 if (downloadManager.isDownloading(galleryID)) {
@@ -367,40 +378,35 @@ class ReaderActivity : BaseActivity() {
                     animateDownloadFAB(false)
                 } else {
                     downloadManager.addDownloadFolder(galleryID)
+                    DownloadService.download(context, galleryID, true)
                     animateDownloadFAB(true)
                 }
             }
         }
-        }
 
         with(reader_fab_retry) {
             setImageResource(R.drawable.refresh)
             setOnClickListener {
-                downloader?.cancel(galleryID)
+                DownloadService.download(context, galleryID)
-                downloader?.download(galleryID)
             }
         }
 
         with(reader_fab_auto) {
-            setImageResource(R.drawable.clock_start)
+            setImageResource(R.drawable.eye_white)
             setOnClickListener {
-                if (autoTimer == null) {
+                when {
-                    autoTimer = timer(initialDelay = 10000L, period = 10000L) {
+                    ContextCompat.checkSelfPermission(context, Manifest.permission.CAMERA) == PackageManager.PERMISSION_GRANTED -> {
-                        CoroutineScope(Dispatchers.Main).launch {
+                        toggleCamera()
-                            with(this@ReaderActivity.reader_recyclerview) {
-                                val lastItem =
-                                    (layoutManager as LinearLayoutManager).findLastCompletelyVisibleItemPosition()
-
-                                if (lastItem < adapter!!.itemCount - 1)
-                                    (layoutManager as LinearLayoutManager).scrollToPosition(lastItem + 1)
                     }
+                    Build.VERSION.SDK_INT >= 23 && shouldShowRequestPermissionRationale(Manifest.permission.CAMERA) -> {
+                        AlertDialog.Builder(this@ReaderActivity)
+                            .setTitle(R.string.warning)
+                            .setMessage(R.string.camera_denied)
+                            .setPositiveButton(android.R.string.ok) { _, _ ->}
+                            .show()
                     }
-                    }
+                    else ->
-                    setImageResource(R.drawable.clock_end)
+                        requestPermissionLauncher.launch(Manifest.permission.CAMERA)
-                } else {
-                    autoTimer?.cancel()
-                    autoTimer = null
-                    setImageResource(R.drawable.clock_start)
                 }
             }
         }
@@ -422,10 +428,22 @@ class ReaderActivity : BaseActivity() {
                 flags = flags or WindowManager.LayoutParams.FLAG_FULLSCREEN
                 supportActionBar?.hide()
                 this@ReaderActivity.reader_fab.visibility = View.INVISIBLE
+                this@ReaderActivity.scroller.let {
+                    it.handleWidth = resources.getDimensionPixelSize(R.dimen.thumb_height)
+                    it.handleHeight = resources.getDimensionPixelSize(R.dimen.thumb_width)
+                    it.handleDrawable = ContextCompat.getDrawable(this@ReaderActivity, R.drawable.thumb_horizontal)
+                    it.fastScrollDirection = RecyclerViewFastScroller.FastScrollDirection.HORIZONTAL
+                }
             } else {
                 flags = flags and WindowManager.LayoutParams.FLAG_FULLSCREEN.inv()
                 supportActionBar?.show()
                 this@ReaderActivity.reader_fab.visibility = View.VISIBLE
+                this@ReaderActivity.scroller.let {
+                    it.handleWidth = resources.getDimensionPixelSize(R.dimen.thumb_width)
+                    it.handleHeight = resources.getDimensionPixelSize(R.dimen.thumb_height)
+                    it.handleDrawable = ContextCompat.getDrawable(this@ReaderActivity, R.drawable.thumb)
+                    it.fastScrollDirection = RecyclerViewFastScroller.FastScrollDirection.VERTICAL
+                }
             }
 
             window.attributes = this
@@ -475,13 +493,119 @@ class ReaderActivity : BaseActivity() {
         }
     }
 
-    override fun onLowMemory() {
+    val cameraCallback: (List<Face>) -> Unit = callback@{ faces ->
-        super.onLowMemory()
+        eye_card.dot.let {
-        Glide.get(this).onLowMemory()
+            it.visibility = View.VISIBLE
+            CoroutineScope(Dispatchers.Main).launch {
+                delay(50)
+                it.visibility = View.INVISIBLE
+            }
         }
 
-    override fun onTrimMemory(level: Int) {
+        if (faces.size != 1)
-        super.onTrimMemory(level)
+            ContextCompat.getDrawable(this, R.drawable.eye_off).let {
-        Glide.get(this).onTrimMemory(level)
+                with(eye_card) {
+                    left_eye.setImageDrawable(it)
+                    right_eye.setImageDrawable(it)
+                }
+
+                return@callback
+            }
+
+        val (left, right) = Pair(
+            faces[0].rightEyeOpenProbability?.let { it > 0.4 } == true,
+            faces[0].leftEyeOpenProbability?.let { it > 0.4 } == true
+        )
+
+        with(eye_card) {
+            left_eye.setImageDrawable(
+                ContextCompat.getDrawable(
+                    context,
+                    if (left) R.drawable.eye else R.drawable.eye_closed
+                )
+            )
+            right_eye.setImageDrawable(
+                ContextCompat.getDrawable(
+                    context,
+                    if (right) R.drawable.eye else R.drawable.eye_closed
+                )
+            )
+        }
+
+        when {
+            // Both closed / opened
+            !left.xor(right) -> {
+                eyeType = null
+                eyeTime = 0L
+            }
+            !left -> {
+                if (eyeType != Eye.LEFT) {
+                    eyeType = Eye.LEFT
+                    eyeTime = System.currentTimeMillis()
+                }
+            }
+            !right -> {
+                if (eyeType != Eye.RIGHT) {
+                    eyeType = Eye.RIGHT
+                    eyeTime = System.currentTimeMillis()
+                }
+            }
+        }
+
+        if (eyeType != null && System.currentTimeMillis() - eyeTime > 100) {
+            (this@ReaderActivity.reader_recyclerview.layoutManager as LinearLayoutManager).let {
+                it.scrollToPositionWithOffset(when(eyeType!!) {
+                    Eye.RIGHT -> {
+                        if (it.reverseLayout) currentPage - 2 else currentPage
+                    }
+                    Eye.LEFT -> {
+                        if (it.reverseLayout) currentPage else currentPage - 2
+                    }
+                }, 0)
+            }
+
+            eyeTime = System.currentTimeMillis() + 500
+        }
+    }
+
+    private fun toggleCamera() {
+        val eyes = this@ReaderActivity.eye_card
+        when (camera) {
+            null -> {
+                reader_fab_auto.labelText = getString(R.string.reader_fab_auto_cancel)
+                reader_fab_auto.setImageResource(R.drawable.eye_off_white)
+                eyes.apply {
+                    visibility = View.VISIBLE
+                    TranslateAnimation(0F, 0F, -100F, 0F).apply {
+                        duration = 500
+                        fillAfter = false
+                        interpolator = OvershootInterpolator()
+                    }.let { startAnimation(it) }
+                }
+                startCamera(this, cameraCallback)
+                cameraEnabled = true
+            }
+            else -> {
+                reader_fab_auto.labelText = getString(R.string.reader_fab_auto)
+                reader_fab_auto.setImageResource(R.drawable.eye_white)
+                eyes.apply {
+                    TranslateAnimation(0F, 0F, 0F, -100F).apply {
+                        duration = 500
+                        fillAfter = false
+                        interpolator = AnticipateInterpolator()
+                        setAnimationListener(object: Animation.AnimationListener {
+                            override fun onAnimationStart(p0: Animation?) {}
+                            override fun onAnimationRepeat(p0: Animation?) {}
+
+                            override fun onAnimationEnd(p0: Animation?) {
+                                eyes.visibility = View.GONE
+                            }
+                        })
+                    }.let { startAnimation(it) }
+                }
+                closeCamera()
+                cameraEnabled = false
+            }
+        }
     }
 }

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).canonicalPath
-                }
-            }
-            else -> super.onActivityResult(requestCode, resultCode, data)
-        }
-    }
-
 }

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

@@ -18,18 +18,19 @@
 
 package xyz.quaver.pupil.ui.dialog
 
-import android.app.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) : Dialog(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
+                    gallery_cover.showImage(Uri.parse(gallery.cover))
-                        .load(gallery.cover)
-                        .apply {
-                            if (BuildConfig.CENSOR)
-                                override(5, 8)
-                        }.into(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(
+                        GalleryDialog(context, galleries[position]).apply {
-                            context,
-                            glide,
-                            galleries[position]
-                        ).apply {
                             onChipClickedHandler.add { tag ->
                                 this@GalleryDialog.onChipClickedHandler.forEach { it.invoke(tag) }
                             }

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

@@ -27,6 +27,7 @@ import android.view.View
 import android.view.ViewGroup
 import android.widget.AdapterView
 import android.widget.ArrayAdapter
+import androidx.appcompat.app.AlertDialog
 import kotlinx.android.synthetic.main.dialog_proxy.view.*
 import kotlinx.serialization.encodeToString
 import kotlinx.serialization.json.Json
@@ -40,11 +41,10 @@ import xyz.quaver.pupil.util.getProxyInfo
 import xyz.quaver.pupil.util.proxyInfo
 import java.net.Proxy
 
-class ProxyDialog(context: Context) : Dialog(context) {
+class ProxyDialog(context: Context) : AlertDialog(context) {
 
     override fun onCreate(savedInstanceState: Bundle?) {
-        setContentView(build())
+        setView(build())
-        window?.attributes?.width = ViewGroup.LayoutParams.MATCH_PARENT
 
         super.onCreate(savedInstanceState)
     }

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

@@ -62,6 +62,11 @@ class ManageFavoritesFragment : PreferenceFragmentCompat() {
                 }
 
                 override fun onResponse(call: Call, response: Response) {
+                    if (response.code() != 200) {
+                        response.close()
+                        return
+                    }
+
                     Intent(Intent.ACTION_SEND).apply {
                         type = "text/plain"
                         putExtra(Intent.EXTRA_TEXT, response.body()?.use { it.string() }?.replace("\n", ""))

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 xyz.quaver.floatingsearchview.FloatingSearchView
-import com.arlib.floatingsearchview.suggestions.model.SearchSuggestion
+import xyz.quaver.floatingsearchview.suggestions.model.SearchSuggestion
-import com.arlib.floatingsearchview.util.view.SearchInputView
+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)
+        onSearchListener = this
-        setOnBindSuggestionCallback(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) {
+                val tag = "${searchSuggestion.n}:${searchSuggestion.s.replace(Regex("\\s"), "_")}"
+                with(searchInputView.text!!) {
                     delete(if (lastIndexOf(' ') == -1) 0 else lastIndexOf(' ') + 1, length)
-                    append("${searchSuggestion.n}:${searchSuggestion.s.replace(Regex("\\s"), "_")} ")
+
+                    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,7 +104,7 @@ class FloatingSearchViewDayNight @JvmOverloads constructor(context: Context, att
 
     override fun onSearchAction(currentQuery: String?) {}
 
-    override fun onBindSuggestion(
+    fun onBindSuggestion(
         suggestionView: View?,
         leftIcon: ImageView?,
         textView: TextView?,
@@ -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/camera.kt

@@ -0,0 +1,119 @@
+/*
+ *     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/>.
+ */
+
+@file:Suppress("DEPRECATION", "Recycle")
+
+package xyz.quaver.pupil.util
+
+import android.content.Context
+import android.content.pm.PackageManager
+import android.graphics.ImageFormat
+import android.graphics.SurfaceTexture
+import android.hardware.Camera
+import android.view.Surface
+import android.view.WindowManager
+import com.google.android.gms.tasks.Task
+import com.google.mlkit.vision.common.InputImage
+import com.google.mlkit.vision.face.Face
+import com.google.mlkit.vision.face.FaceDetection
+import com.google.mlkit.vision.face.FaceDetectorOptions
+
+/** Check if this device has a camera */
+private fun Context.checkCameraHardware() =
+    this.packageManager.hasSystemFeature(PackageManager.FEATURE_CAMERA)
+
+private fun openFrontCamera() : Pair<Camera?, Int> {
+    var camera: Camera? = null
+    var cameraID: Int = -1
+
+    val cameraInfo = Camera.CameraInfo()
+
+    for (i in 0 until Camera.getNumberOfCameras()) {
+        Camera.getCameraInfo(i, cameraInfo)
+        if (cameraInfo.facing == Camera.CameraInfo.CAMERA_FACING_FRONT)
+            runCatching { Camera.open(i) }.getOrNull()?.let { camera = it; cameraID = i }
+
+        if (camera != null) break
+    }
+
+    return Pair(camera, cameraID)
+}
+
+val orientations = mapOf(
+    Surface.ROTATION_0 to 0,
+    Surface.ROTATION_90 to 90,
+    Surface.ROTATION_180 to 180,
+    Surface.ROTATION_270 to 270,
+)
+
+private fun getRotation(context: Context, cameraID: Int): Int {
+    val cameraRotation = Camera.CameraInfo().also { Camera.getCameraInfo(cameraID, it) }.orientation
+    val rotation = orientations[(context.getSystemService(Context.WINDOW_SERVICE) as WindowManager).defaultDisplay.rotation] ?: error("")
+
+    return (cameraRotation + rotation) % 360
+}
+
+var camera: Camera? = null
+var surfaceTexture: SurfaceTexture? = null
+private val detector = FaceDetection.getClient(
+    FaceDetectorOptions.Builder()
+        .setClassificationMode(FaceDetectorOptions.CLASSIFICATION_MODE_ALL)
+        .build()
+)
+private var process: Task<List<Face>>? = null
+
+fun startCamera(context: Context, callback: (List<Face>) -> Unit) {
+    if (camera != null) closeCamera()
+
+    val cameraID = openFrontCamera().let { (cam, cameraID) ->
+        cam ?: return
+        camera = cam
+        cameraID
+    }
+
+    with (camera!!) {
+        parameters = parameters.apply {
+            setPreviewSize(640, 480)
+            previewFormat = ImageFormat.NV21
+        }
+
+        setPreviewTexture(surfaceTexture ?: SurfaceTexture(0).also {
+            surfaceTexture = it
+        })
+        startPreview()
+        setPreviewCallback { bytes, _ ->
+            if (process?.isComplete == false)
+                return@setPreviewCallback
+
+            val rotation = getRotation(context, cameraID)
+
+            val image = InputImage.fromByteArray(bytes, 640, 480, rotation, InputImage.IMAGE_FORMAT_NV21)
+            process = detector.process(image)
+                .addOnSuccessListener(callback)
+        }
+    }
+}
+
+fun closeCamera() {
+    camera?.setPreviewCallback(null)
+    camera?.stopPreview()
+    surfaceTexture?.release()
+    surfaceTexture = null
+    camera?.release()
+    camera = null
+}

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

@@ -1,297 +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.util.download
-
-import android.content.Context
-import android.content.ContextWrapper
-import android.util.Base64
-import android.util.SparseArray
-import androidx.preference.PreferenceManager
-import com.google.firebase.crashlytics.FirebaseCrashlytics
-import kotlinx.coroutines.*
-import kotlinx.serialization.decodeFromString
-import kotlinx.serialization.encodeToString
-import kotlinx.serialization.json.Json
-import xyz.quaver.Code
-import xyz.quaver.hitomi.GalleryBlock
-import xyz.quaver.hitomi.Reader
-import xyz.quaver.pupil.util.getCachedGallery
-import xyz.quaver.pupil.util.getDownloadDirectory
-import xyz.quaver.pupil.util.isParentOf
-import xyz.quaver.readBytes
-import java.io.BufferedInputStream
-import java.io.File
-import java.io.FileOutputStream
-import java.io.InputStream
-import java.net.URL
-
-@Suppress("DEPRECATION")
-@Deprecated("Use downloader.Cache instead")
-class Cache(context: Context) : ContextWrapper(context) {
-
-    companion object {
-        private val moving = mutableListOf<Int>()
-        private val readers = SparseArray<Reader?>()
-    }
-
-    private val preference = PreferenceManager.getDefaultSharedPreferences(this)
-
-    // Search in this order
-    // Download -> Cache
-    fun getCachedGallery(galleryID: Int) = getCachedGallery(this, galleryID).also {
-        if (!it.exists())
-            it.mkdirs()
-    }
-
-    fun getCachedMetadata(galleryID: Int) : Metadata? {
-        val file = File(getCachedGallery(galleryID), ".metadata")
-
-        if (!file.exists())
-            return null
-
-        return try {
-            Json.decodeFromString(file.readText())
-        } catch (e: Exception) {
-            //File corrupted
-            file.delete()
-            null
-        }
-    }
-
-    fun setCachedMetadata(galleryID: Int, metadata: Metadata) {
-        if (preference.getBoolean("cache_disable", false))
-            return
-
-        val file = File(getCachedGallery(galleryID), ".metadata").also {
-            if (!it.exists())
-                it.createNewFile()
-        }
-
-        file.writeText(Json.encodeToString(metadata))
-    }
-
-    suspend fun getThumbnail(galleryID: Int): String? {
-        val metadata = Cache(this).getCachedMetadata(galleryID)
-
-        @Suppress("BlockingMethodInNonBlockingContext")
-        val thumbnail = if (metadata?.thumbnail == null)
-            withContext(Dispatchers.IO) {
-                val thumbnail = getGalleryBlock(galleryID)?.thumbnails?.firstOrNull() ?: return@withContext null
-                try {
-                    val data = URL(thumbnail).readBytes().apply {
-                        if (isEmpty()) return@withContext null
-                    }
-                    Base64.encodeToString(data, Base64.DEFAULT)
-                } catch (e: Exception) {
-                    null
-                }
-            }
-        else
-            metadata.thumbnail
-
-        setCachedMetadata(
-            galleryID,
-            Metadata(Cache(this).getCachedMetadata(galleryID), thumbnail = thumbnail)
-        )
-
-        return thumbnail
-    }
-
-    suspend fun getGalleryBlock(galleryID: Int): GalleryBlock? {
-        val metadata = Cache(this).getCachedMetadata(galleryID)
-
-        val sources = listOf(
-            { xyz.quaver.hitomi.getGalleryBlock(galleryID) },
-            { xyz.quaver.hiyobi.getGalleryBlock(galleryID) }
-        )
-
-        val galleryBlock = if (metadata?.galleryBlock == null) {
-            withContext(Dispatchers.IO) {
-                var galleryBlock: GalleryBlock? = null
-
-                for (source in sources) {
-                    galleryBlock = try {
-                        source.invoke()
-                    } catch (e: Exception) {
-                        null
-                    }
-
-                    if (galleryBlock != null)
-                        break
-                }
-
-                galleryBlock
-            } ?: return null
-        }
-        else
-            metadata.galleryBlock
-
-        setCachedMetadata(
-            galleryID,
-            Metadata(Cache(this).getCachedMetadata(galleryID), galleryBlock = galleryBlock)
-        )
-
-        return galleryBlock
-    }
-
-    fun getReaderOrNull(galleryID: Int): Reader? {
-        return readers[galleryID] ?: getCachedMetadata(galleryID)?.reader
-    }
-
-    suspend fun getReader(galleryID: Int): Reader? {
-        val metadata = getCachedMetadata(galleryID)
-        val mirrors = preference.getString("mirrors", null)?.split('>') ?: listOf()
-
-        val sources = mapOf(
-            Code.HITOMI to { xyz.quaver.hitomi.getReader(galleryID) },
-            Code.HIYOBI to { xyz.quaver.hiyobi.getReader(galleryID) }
-        ).let {
-            if (mirrors.isNotEmpty())
-                it.toSortedMap{ o1, o2 ->
-                    mirrors.indexOf(o1.name) - mirrors.indexOf(o2.name)
-                }
-            else
-                it
-        }
-
-        val reader =
-            if (readers[galleryID] != null)
-                return readers[galleryID]
-            else if (metadata?.reader == null) {
-                var retval: Reader? = null
-
-                for (source in sources) {
-                    retval = try {
-                        withContext(Dispatchers.IO) {
-                            withTimeoutOrNull(1000) {
-                                source.value.invoke()
-                            }
-                        }
-                    } catch (e: Exception) {
-                        FirebaseCrashlytics.getInstance().recordException(e)
-                        null
-                    }
-
-                    if (retval != null)
-                        break
-                }
-
-                retval
-            } else
-                metadata.reader
-
-        readers.put(galleryID, reader)
-
-        setCachedMetadata(
-            galleryID,
-            Metadata(Cache(this).getCachedMetadata(galleryID), readers = reader)
-        )
-
-        return reader
-    }
-
-    val imageNameRegex = Regex("""^\d+\..+$""")
-    fun getImages(galleryID: Int): List<File?>? {
-        val gallery = getCachedGallery(galleryID)
-
-        return gallery.list { _, name ->
-            imageNameRegex.matches(name)
-        }?.map {
-            File(gallery, it)
-        }
-    }
-
-    val imageExtensions = listOf(
-        "png",
-        "jpg",
-        "webp",
-        "gif"
-    )
-    fun getImage(galleryID: Int, index: Int): File? {
-        val gallery = getCachedGallery(galleryID)
-
-        for (ext in imageExtensions) {
-            File(gallery, "%05d.$ext".format(index)).let {
-                if (it.exists())
-                    return it
-            }
-        }
-
-        return null
-    }
-
-
-    fun putImage(galleryID: Int, index: Int, ext: String, data: InputStream) {
-        if (preference.getBoolean("cache_disable", false))
-            return
-
-        val cache = File(getCachedGallery(galleryID), "%05d.$ext".format(index)).also {
-            if (!it.exists())
-                it.createNewFile()
-        }
-
-        try {
-            BufferedInputStream(data).use { inputStream ->
-                FileOutputStream(cache).use { outputStream ->
-                    inputStream.copyTo(outputStream)
-                }
-            }
-        } catch (e: Exception) {
-            cache.delete()
-        }
-    }
-
-    fun moveToDownload(galleryID: Int) {
-        if (preference.getBoolean("cache_disable", false))
-            return
-
-        if (moving.contains(galleryID))
-            return
-
-        CoroutineScope(Dispatchers.IO).launch {
-            val cache = getCachedGallery(galleryID).also {
-                if (!it.exists())
-                    return@launch
-            }
-            val download = File(getDownloadDirectory(this@Cache), galleryID.toString())
-
-            if (download.isParentOf(cache))
-                return@launch
-
-            FirebaseCrashlytics.getInstance().log("MOVING ${cache.canonicalPath} --> ${download.canonicalPath}")
-
-            cache.copyRecursively(download, true) { file, err ->
-                FirebaseCrashlytics.getInstance().log("MOVING ERROR ${file.canonicalPath} ${err.message}")
-                OnErrorAction.SKIP
-            }
-            FirebaseCrashlytics.getInstance().log("MOVED ${cache.canonicalPath}")
-
-            FirebaseCrashlytics.getInstance().log("DELETING ${cache.canonicalPath}")
-            cache.deleteRecursively()
-            FirebaseCrashlytics.getInstance().log("DELETED ${cache.canonicalPath}")
-        }
-    }
-
-    fun isDownloading(galleryID: Int) = getCachedMetadata(galleryID)?.isDownloading == true
-
-    fun setDownloading(galleryID: Int, isDownloading: Boolean) {
-        setCachedMetadata(galleryID, Metadata(getCachedMetadata(galleryID), isDownloading = isDownloading))
-    }
-
-}

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

@@ -1,383 +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.util.download
-
-import android.app.PendingIntent
-import android.content.Context
-import android.content.ContextWrapper
-import android.content.Intent
-import android.content.SharedPreferences
-import android.util.Log
-import android.util.SparseArray
-import androidx.core.app.NotificationCompat
-import androidx.core.app.NotificationManagerCompat
-import androidx.core.app.TaskStackBuilder
-import androidx.preference.PreferenceManager
-import com.google.firebase.crashlytics.FirebaseCrashlytics
-import kotlinx.coroutines.*
-import okhttp3.*
-import okio.*
-import xyz.quaver.Code
-import xyz.quaver.hitomi.Reader
-import xyz.quaver.hitomi.getReferer
-import xyz.quaver.hitomi.imageUrlFromImage
-import xyz.quaver.hiyobi.createImgList
-import xyz.quaver.pupil.R
-import xyz.quaver.pupil.client
-import xyz.quaver.pupil.interceptors
-import xyz.quaver.pupil.ui.ReaderActivity
-import java.io.File
-import java.io.IOException
-import java.util.concurrent.LinkedBlockingQueue
-
-@Suppress("DEPRECATION")
-@Deprecated("Use DownloadService instead")
-@OptIn(ExperimentalCoroutinesApi::class)
-class DownloadWorker private constructor(context: Context) : ContextWrapper(context) {
-
-    private val preferences : SharedPreferences = PreferenceManager.getDefaultSharedPreferences(this)
-
-    //region ProgressListener
-    @Suppress("UNCHECKED_CAST")
-    private val progressListener = object: ProgressListener {
-        override fun update(tag: Any?, bytesRead: Long, contentLength: Long, done: Boolean) {
-            val (galleryID, index) = (tag as? Pair<Int, Int>) ?: return
-
-            if (!done && progress[galleryID]?.get(index)?.isFinite() == true)
-                progress[galleryID]?.set(index, bytesRead * 100F / contentLength)
-        }
-    }
-
-    interface ProgressListener {
-        fun update(tag: Any?, bytesRead : Long, contentLength: Long, done: Boolean)
-    }
-
-    class ProgressResponseBody(
-        val tag: Any?,
-        val responseBody: ResponseBody,
-        val progressListener : ProgressListener
-    ) : ResponseBody() {
-        private var bufferedSource : BufferedSource? = null
-
-        override fun contentLength() = responseBody.contentLength()
-        override fun contentType() = responseBody.contentType()
-
-        override fun source(): BufferedSource {
-            if (bufferedSource == null)
-                bufferedSource = Okio.buffer(source(responseBody.source()))
-
-            return bufferedSource!!
-        }
-
-        private fun source(source: Source) = object: ForwardingSource(source) {
-            var totalBytesRead = 0L
-
-            override fun read(sink: Buffer, byteCount: Long): Long {
-                val bytesRead = super.read(sink, byteCount)
-
-                totalBytesRead += if (bytesRead == -1L) 0L else bytesRead
-                progressListener.update(tag, totalBytesRead, responseBody.contentLength(), bytesRead == -1L)
-
-                return bytesRead
-            }
-
-        }
-    }
-
-    init {
-        interceptors[Pair::class] =  { chain ->
-            val request = chain.request()
-            var response = chain.proceed(request)
-
-            var retry = 5
-            while (!response.isSuccessful && retry > 0) {
-                response = chain.proceed(request)
-                retry--
-            }
-
-            response.newBuilder()
-                .body(response.body()?.let {
-                    ProgressResponseBody(request.tag(), it, progressListener)
-                }).build()
-        }
-    }
-    //endregion
-
-    //region Singleton
-    companion object {
-
-        @Volatile private var instance: DownloadWorker? = null
-
-        fun getInstance(context: Context) =
-            instance ?: synchronized(this) {
-                instance ?: DownloadWorker(context).also { instance = it }
-            }
-    }
-    //endregion
-
-    val notificationManager = NotificationManagerCompat.from(context)
-
-    val queue = LinkedBlockingQueue<Int>()
-
-    /*
-    * KEY
-    *  primary galleryID
-    *  secondary index
-    * PRIMARY VALUE
-    *  MutableList -> Download in progress
-    *  null -> Loading / Gallery doesn't exist
-    * SECONDARY VALUE
-    *  0 <= value < 100 -> Download in progress
-    *  Float.POSITIVE_INFINITY -> Download completed
-    */
-    val progress = SparseArray<MutableList<Float>?>()
-    val notification = SparseArray<NotificationCompat.Builder?>()
-
-    private val loop = loop()
-    private val worker = SparseArray<Job?>()
-
-    fun stop() {
-        queue.clear()
-
-        loop.cancel()
-        for (i in 0 until worker.size()) {
-            val galleryID = worker.keyAt(i)
-
-            Cache(this@DownloadWorker).setDownloading(galleryID, false)
-            worker[galleryID]?.cancel()
-        }
-
-        client.dispatcher().queuedCalls().filter {
-            it.request().tag() is Pair<*, *>
-        }.forEach {
-            it.cancel()
-        }
-        client.dispatcher().runningCalls().filter {
-            it.request().tag() is Pair<*, *>
-        }.forEach {
-            it.cancel()
-        }
-
-        progress.clear()
-        notification.clear()
-        notificationManager.cancelAll()
-    }
-
-    fun cancel(galleryID: Int) {
-        queue.remove(galleryID)
-        worker[galleryID]?.cancel()
-
-        client.dispatcher().queuedCalls().filter {
-            ((it.request().tag() as Pair<*, *>).first as Int) == galleryID
-        }.forEach {
-            it.cancel()
-        }
-        client.dispatcher().runningCalls().filter {
-            ((it.request().tag() as Pair<*, *>).first as Int) == galleryID
-        }.forEach {
-            it.cancel()
-        }
-
-        progress.remove(galleryID)
-        notification.remove(galleryID)
-        notificationManager.cancel(galleryID)
-    }
-
-    fun isCompleted(galleryID: Int) = progress[galleryID]?.all { it.isInfinite() } == true
-
-    private fun queueDownload(galleryID: Int, reader: Reader, index: Int, callback: Callback) {
-        val lowQuality = preferences.getBoolean("low_quality", false)
-
-        val request = Request.Builder().apply {
-            when (reader.code) {
-                Code.HITOMI -> {
-                    url(
-                        imageUrlFromImage(
-                            galleryID,
-                            reader.galleryInfo.files[index],
-                            !lowQuality
-                        )
-                    )
-                    addHeader("Referer", getReferer(galleryID))
-                }
-                Code.HIYOBI -> {
-                    url(createImgList(galleryID, reader, lowQuality)[index].path)
-                }
-                else -> {
-                    //shouldn't be called anyway
-                }
-            }
-            tag(galleryID to index)
-        }.build()
-
-        client.newCall(request).enqueue(callback)
-    }
-
-    private fun download(galleryID: Int) = CoroutineScope(Dispatchers.IO).launch {
-        val reader = Cache(this@DownloadWorker).getReader(galleryID)
-
-        //gallery doesn't exist
-        if (reader == null) {
-            progress.put(galleryID, null)
-
-            Cache(this@DownloadWorker).setDownloading(galleryID, false)
-            return@launch
-        }
-
-        val cache = Cache(this@DownloadWorker).getImages(galleryID)
-
-        progress.put(galleryID, reader.galleryInfo.files.indices.map { index ->
-            if (cache?.firstOrNull { it?.nameWithoutExtension?.toIntOrNull()  == index } != null)
-                Float.POSITIVE_INFINITY
-            else
-                0F
-        }.toMutableList())
-
-        if (notification[galleryID] == null)
-            initNotification(galleryID)
-
-        notification[galleryID]?.setContentTitle(reader.galleryInfo.title)
-        notify(galleryID)
-
-        if (isCompleted(galleryID)) {
-            with(Cache(this@DownloadWorker)) {
-                if (isDownloading(galleryID)) {
-                    moveToDownload(galleryID)
-                    setDownloading(galleryID, false)
-                }
-            }
-
-            return@launch
-        }
-
-        for (i in reader.galleryInfo.files.indices) {
-            val callback = object : Callback {
-                override fun onFailure(call: Call, e: IOException) {
-                    if (e.message?.contains("cancel", true) != false)
-                        return
-
-                    cancel(galleryID)
-                    queue.add(galleryID)
-                }
-
-                override fun onResponse(call: Call, response: Response) {
-                    val ext = call.request().url().encodedPath().split('.').last()
-
-                    try {
-                        response.body()!!.use {
-                            Cache(this@DownloadWorker).putImage(galleryID, i, ext, it.byteStream())
-                        }
-                        progress[galleryID]?.set(i, Float.POSITIVE_INFINITY)
-
-                        notify(galleryID)
-
-                        CoroutineScope(Dispatchers.IO).launch {
-                            if (isCompleted(galleryID)) {
-                                with(Cache(this@DownloadWorker)) {
-                                    if (isDownloading(galleryID)) {
-                                        moveToDownload(galleryID)
-                                        setDownloading(galleryID, false)
-                                    }
-                                }
-                            }
-                        }
-                    } catch (e: Exception) {
-                        FirebaseCrashlytics.getInstance().apply {
-                            log("FAIL ON OK ${call.request().tag()} (${e.message})")
-                            setCustomKey("POS", "FAIL ON OK")
-                            recordException(e)
-                        }
-
-                        File(Cache(this@DownloadWorker).getCachedGallery(galleryID), "%05d.$ext".format(i)).delete()
-
-                        cancel(galleryID)
-                        queue.add(galleryID)
-                    }
-                }
-            }
-
-            if (progress[galleryID]?.get(i)?.isFinite() == true)
-                queueDownload(galleryID, reader, i, callback)
-        }
-    }
-
-    private fun notify(galleryID: Int) {
-        val max = progress[galleryID]?.size ?: 0
-        val progress = progress[galleryID]?.count { it.isInfinite() } ?: 0
-
-        if (isCompleted(galleryID)) {
-            notification[galleryID]
-                ?.setContentText(getString(R.string.reader_notification_complete))
-                ?.setSmallIcon(android.R.drawable.stat_sys_download_done)
-                ?.setProgress(0, 0, false)
-                ?.setOngoing(false)
-
-            notificationManager.cancel(galleryID)
-        } else
-            notification[galleryID]
-                ?.setProgress(max, progress, false)
-                ?.setContentText("$progress/$max")
-
-        if (Cache(this).isDownloading(galleryID) && notification[galleryID] != null)
-            notification[galleryID]?.let { notificationManager.notify(galleryID, it.build()) }
-        else
-            notificationManager.cancel(galleryID)
-    }
-
-    private fun initNotification(galleryID: Int) {
-        val intent = Intent(this, ReaderActivity::class.java).apply {
-            putExtra("galleryID", galleryID)
-        }
-        val pendingIntent = TaskStackBuilder.create(this).run {
-            addNextIntentWithParentStack(intent)
-            getPendingIntent(galleryID, PendingIntent.FLAG_UPDATE_CURRENT)
-        }
-
-        notification.put(galleryID, NotificationCompat.Builder(this, "download").apply {
-            setContentTitle(getString(R.string.reader_loading))
-            setContentText(getString(R.string.reader_notification_text))
-            setSmallIcon(android.R.drawable.stat_sys_download)                                  // had to use this because old android doesn't support VectorDrawable on Notification :P
-            setContentIntent(pendingIntent)
-            setProgress(0, 0, true)
-            setOngoing(true)
-        })
-    }
-
-    private fun loop() = CoroutineScope(Dispatchers.Default).launch {
-        while (true) {
-            if (queue.isEmpty())
-                continue
-
-            val galleryID = queue.peek() ?: continue
-
-            if (progress.indexOfKey(galleryID) >= 0)    // Gallery already downloading!
-                cancel(galleryID)
-
-            if (notification[galleryID] == null)
-                initNotification(galleryID)
-
-            if (Cache(this@DownloadWorker).isDownloading(galleryID))
-                notification[galleryID]?.let { notificationManager.notify(galleryID, it.build()) }
-
-            worker.put(galleryID, download(galleryID))
-            queue.poll()
-        }
-    }
-
-}

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

@@ -1,46 +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.util.download
-
-import kotlinx.serialization.Serializable
-import xyz.quaver.hitomi.GalleryBlock
-import xyz.quaver.hitomi.Reader
-
-@Suppress("DEPRECATION")
-@Deprecated("Use downloader.Cache.Metadata instead")
-@Serializable
-data class Metadata(
-    var thumbnail: String? = null,
-    var galleryBlock: GalleryBlock? = null,
-    var reader: Reader? = null,
-    var isDownloading: Boolean? = null
-) {
-    constructor(
-        metadata: Metadata?,
-        thumbnail: String? = null,
-        galleryBlock: GalleryBlock? = null,
-        readers: Reader? = null,
-        isDownloading: Boolean? = null
-    ) : this(
-        thumbnail ?: metadata?.thumbnail,
-        galleryBlock ?: metadata?.galleryBlock,
-        readers ?: metadata?.reader,
-        isDownloading ?: metadata?.isDownloading
-    )
-}

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
@@ -37,6 +37,8 @@ import xyz.quaver.io.FileX
 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(
@@ -50,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) {
@@ -60,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)
         }
     }
 
@@ -130,18 +132,18 @@ class Cache private constructor(context: Context, val galleryID: Int) : ContextW
     }
 
     @Suppress("BlockingMethodInNonBlockingContext")
-    suspend fun getThumbnail(): ByteArray? =
+    suspend fun getThumbnail(): Uri? =
-        findFile(".thumbnail")?.readBytes()
+        findFile(".thumbnail")?.uri
             ?: getGalleryBlock()?.thumbnails?.firstOrNull()?.let { withContext(Dispatchers.IO) {
                 kotlin.runCatching {
                     val request = Request.Builder()
                         .url(it)
                         .build()
 
-                    client.newCall(request).execute().body()?.use { it.bytes() }
+                    client.newCall(request).execute().also { if (it.code() != 200) throw IOException() }.body()?.use { it.bytes() }
-                }.getOrNull()?.also { kotlin.run {
+                }.getOrNull()?.let { thumbnail -> kotlin.runCatching {
-                    cacheFolder.getChild(".thumbnail").writeBytes(it)
+                    cacheFolder.getChild(".thumbnail").also { it.writeBytes(thumbnail) }
-                } }
+                }.getOrNull()?.uri }
             } }
 
     suspend fun getReader(): Reader? {
@@ -199,31 +201,52 @@ class Cache private constructor(context: Context, val galleryID: Int) : ContextW
     fun moveToDownload() = CoroutineScope(Dispatchers.IO).launch {
         val downloadFolder = downloadFolder ?: return@launch
 
-        metadata.imageList?.forEach { imageName ->
-            imageName ?: return@forEach
-            val target = downloadFolder.getChild(imageName)
-            val source = cacheFolder.getChild(imageName)
-
-            if (!source.exists())
-                return@forEach
-
-            kotlin.runCatching {
-                target.createNewFile()
-                source.readBytes()?.let { target.writeBytes(it) }
-            }
-        }
-
         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()
             }
         }
 
-        cacheFolder.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)
+            val source = cacheFolder.getChild(imageName)
+
+            if (!source.exists() || target.exists())
+                return@forEach
+
+            kotlin.runCatching {
+                if (!target.exists())
+                    target.createNewFile()
+
+                target.outputStream()?.use { target -> source.inputStream()?.use { source ->
+                    source.copyTo(target)
+                } }
+            }
+        }
     }
 }

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

@@ -104,7 +104,9 @@ class DownloadManager private constructor(context: Context) : ContextWrapper(con
 
         val folder = downloadFolder.getChild(name)
 
-        if (!folder.exists())
+        if (folder.exists())
+            return
+
         folder.mkdir()
 
         downloadFolderMap[galleryID] = folder.name

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

@@ -93,14 +93,14 @@ fun GalleryBlock.formatDownloadFolder(): String =
         formatMap.entries.fold(it) { str, (k, v) ->
             str.replace(k, v.invoke(this), true)
         }
-    }.replace("/", "")
+    }.replace(Regex("""[*\\|"?><:/]"""), "")
 
 fun GalleryBlock.formatDownloadFolderTest(format: String): String =
     format.let {
         formatMap.entries.fold(it) { str, (k, v) ->
             str.replace(k, v.invoke(this), true)
         }
-    }.replace("/", "")
+    }.replace(Regex("""[*\\|"?><:/]"""), "")
 
 val Reader.requestBuilders: List<Request.Builder>
     get() {

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
@@ -214,7 +213,7 @@ fun restore(url: String, onFailure: ((Throwable) -> Unit)? = null, onSuccess: ((
 
         override fun onResponse(call: Call, response: Response) {
             kotlin.runCatching {
-                Json.decodeFromString<List<Int>>(response.body().use { it?.string() } ?: "[]").let {
+                Json.decodeFromString<List<Int>>(response.also { if (it.code() != 200) throw IOException() }.body().use { it?.string() } ?: "[]").let {
                     favorites.addAll(it)
                     onSuccess?.invoke(it)
                 }

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

@@ -1,8 +1,4 @@
 <!--drawable/account_group.xml-->
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
+<vector xmlns:android="http://schemas.android.com/apk/res/android" android:height="24dp" android:width="24dp" android:viewportWidth="24" android:viewportHeight="24">
-    android:height="24dp"
+    <path android:fillColor="?attr/colorControlNormal" android:pathData="M12 5.5A3.5 3.5 0 0 1 15.5 9a3.5 3.5 0 0 1-3.5 3.5A3.5 3.5 0 0 1 8.5 9 3.5 3.5 0 0 1 12 5.5M5 8c0.56 0 1.08 0.15 1.53 0.42-0.15 1.43 0.27 2.85 1.13 3.96C7.16 13.34 6.16 14 5 14a3 3 0 0 1-3-3 3 3 0 0 1 3-3m14 0a3 3 0 0 1 3 3 3 3 0 0 1-3 3c-1.16 0-2.16-0.66-2.66-1.62 0.86-1.11 1.28-2.53 1.13-3.96C17.92 8.15 18.44 8 19 8M5.5 18.25c0-2.07 2.91-3.75 6.5-3.75s6.5 1.68 6.5 3.75V20h-13v-1.75M0 20v-1.5c0-1.39 1.89-2.56 4.45-2.9-0.59 0.68-0.95 1.62-0.95 2.65V20H0m24 0h-3.5v-1.75c0-1.03-0.36-1.97-0.95-2.65 2.56 0.34 4.45 1.51 4.45 2.9V20z"/>
-    android:width="24dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24">
-    <path android:fillColor="?attr/colorControlNormal" android:pathData="M12,5.5A3.5,3.5 0 0,1 15.5,9A3.5,3.5 0 0,1 12,12.5A3.5,3.5 0 0,1 8.5,9A3.5,3.5 0 0,1 12,5.5M5,8C5.56,8 6.08,8.15 6.53,8.42C6.38,9.85 6.8,11.27 7.66,12.38C7.16,13.34 6.16,14 5,14A3,3 0 0,1 2,11A3,3 0 0,1 5,8M19,8A3,3 0 0,1 22,11A3,3 0 0,1 19,14C17.84,14 16.84,13.34 16.34,12.38C17.2,11.27 17.62,9.85 17.47,8.42C17.92,8.15 18.44,8 19,8M5.5,18.25C5.5,16.18 8.41,14.5 12,14.5C15.59,14.5 18.5,16.18 18.5,18.25V20H5.5V18.25M0,20V18.5C0,17.11 1.89,15.94 4.45,15.6C3.86,16.28 3.5,17.22 3.5,18.25V20H0M24,20H20.5V18.25C20.5,17.22 20.14,16.28 19.55,15.6C22.11,15.94 24,17.11 24,18.5V20Z" />
 </vector>

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

@@ -1,8 +1,4 @@
 <!--drawable/account_star.xml-->
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
+<vector xmlns:android="http://schemas.android.com/apk/res/android" android:height="24dp" android:width="24dp" android:viewportWidth="24" android:viewportHeight="24">
-    android:height="24dp"
+    <path android:fillColor="?attr/colorControlNormal" android:pathData="M15 14c-2.67 0-8 1.33-8 4v2h16v-2c0-2.67-5.33-4-8-4m0-2a4 4 0 0 0 4-4 4 4 0 0 0-4-4 4 4 0 0 0-4 4 4 4 0 0 0 4 4M5 13.28l2.45 1.49-0.65-2.81L9 10.08 6.11 9.83 5 7.19 3.87 9.83 1 10.08l2.18 1.88-0.68 2.81L5 13.28z"/>
-    android:width="24dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24">
-    <path android:fillColor="?attr/colorControlNormal" android:pathData="M15,14C12.33,14 7,15.33 7,18V20H23V18C23,15.33 17.67,14 15,14M15,12A4,4 0 0,0 19,8A4,4 0 0,0 15,4A4,4 0 0,0 11,8A4,4 0 0,0 15,12M5,13.28L7.45,14.77L6.8,11.96L9,10.08L6.11,9.83L5,7.19L3.87,9.83L1,10.08L3.18,11.96L2.5,14.77L5,13.28Z" />
 </vector>

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

@@ -1,8 +1,4 @@
 <!--drawable/arrow_right.xml-->
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
+<vector xmlns:android="http://schemas.android.com/apk/res/android" android:height="24dp" android:width="24dp" android:viewportWidth="24" android:viewportHeight="24">
-    android:height="24dp"
+    <path android:fillColor="#fff" android:pathData="M4 11v2h12l-5.5 5.5 1.42 1.42L19.84 12l-7.92-7.92L10.5 5.5 16 11H4z"/>
-    android:width="24dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24">
-    <path android:fillColor="#fff" android:pathData="M4,11V13H16L10.5,18.5L11.92,19.92L19.84,12L11.92,4.08L10.5,5.5L16,11H4Z" />
 </vector>

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

@@ -1,37 +1,14 @@
-<animated-vector
+<animated-vector xmlns:android="http://schemas.android.com/apk/res/android" xmlns:aapt="http://schemas.android.com/aapt" xmlns:tools="http://schemas.android.com/tools" tools:ignore="newApi">
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:aapt="http://schemas.android.com/aapt"
-    xmlns:tools="http://schemas.android.com/tools"
-    tools:ignore="newApi">
     <aapt:attr name="android:drawable">
-        <vector
+        <vector android:name="vector" android:width="24dp" android:height="24dp" android:viewportWidth="24" android:viewportHeight="24">
-            android:name="vector"
+            <path android:name="path" android:pathData="M 12 15.39 L 8.24 17.66 L 9.23 13.38 L 5.91 10.5 L 10.29 10.13 L 12 6.09 L 13.71 10.13 L 18.09 10.5 L 14.77 13.38 L 15.76 17.66 M 22 9.24 L 14.81 8.63 L 12 2 L 9.19 8.63 L 2 9.24 L 7.45 13.97 L 5.82 21 L 12 17.27 L 18.18 21 L 16.54 13.97 L 22 9.24 Z" android:fillColor="@color/material_orange_500"/>
-            android:width="24dp"
+            <clip-path android:name="clip" android:pathData="M 2 21 L 2 21 L 22 21 L 22 21 Z"/>
-            android:height="24dp"
+            <path android:name="path_1" android:pathData="M 12 17.27 L 18.18 21 L 16.54 13.97 L 22 9.24 L 14.81 8.62 L 12 2 L 9.19 8.62 L 2 9.24 L 7.45 13.97 L 5.82 21 L 12 17.27 Z" android:fillColor="@color/material_orange_500"/>
-            android:viewportWidth="24"
-            android:viewportHeight="24">
-            <path
-                android:name="path"
-                android:pathData="M 12 15.39 L 8.24 17.66 L 9.23 13.38 L 5.91 10.5 L 10.29 10.13 L 12 6.09 L 13.71 10.13 L 18.09 10.5 L 14.77 13.38 L 15.76 17.66 M 22 9.24 L 14.81 8.63 L 12 2 L 9.19 8.63 L 2 9.24 L 7.45 13.97 L 5.82 21 L 12 17.27 L 18.18 21 L 16.54 13.97 L 22 9.24 Z"
-                android:fillColor="@color/material_orange_500"/>
-            <clip-path
-                android:name="clip"
-                android:pathData="M 2 21 L 2 21 L 22 21 L 22 21 Z"/>
-            <path
-                android:name="path_1"
-                android:pathData="M 12 17.27 L 18.18 21 L 16.54 13.97 L 22 9.24 L 14.81 8.62 L 12 2 L 9.19 8.62 L 2 9.24 L 7.45 13.97 L 5.82 21 L 12 17.27 Z"
-                android:fillColor="@color/material_orange_500"/>
         </vector>
     </aapt:attr>
     <target android:name="clip">
         <aapt:attr name="android:animation">
-            <objectAnimator
+            <objectAnimator android:propertyName="pathData" android:duration="500" android:valueFrom="M 2 21 L 2 21 L 22 21 L 22 21 Z" android:valueTo="M 2 2 L 2 21 L 22 21 L 22 2 Z" android:valueType="pathType" android:interpolator="@android:interpolator/fast_out_slow_in"/>
-                android:propertyName="pathData"
-                android:duration="500"
-                android:valueFrom="M 2 21 L 2 21 L 22 21 L 22 21 Z"
-                android:valueTo="M 2 2 L 2 21 L 22 21 L 22 2 Z"
-                android:valueType="pathType"
-                android:interpolator="@android:interpolator/fast_out_slow_in"/>
         </aapt:attr>
     </target>
 </animated-vector>

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

@@ -1,8 +1,4 @@
 <!--drawable/backspace_outline.xml-->
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
+<vector xmlns:android="http://schemas.android.com/apk/res/android" android:height="24dp" android:width="24dp" android:viewportWidth="24" android:viewportHeight="24">
-    android:height="24dp"
+    <path android:fillColor="#000" android:pathData="M19 15.59L17.59 17 14 13.41 10.41 17 9 15.59 12.59 12 9 8.41 10.41 7 14 10.59 17.59 7 19 8.41 15.41 12 19 15.59M22 3a2 2 0 0 1 2 2v14a2 2 0 0 1-2 2H7c-0.69 0-1.23-0.36-1.59-0.89L0 12l5.41-8.12C5.77 3.35 6.31 3 7 3h15m0 2H7l-4.72 7L7 19h15V5z"/>
-    android:width="24dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24">
-    <path android:fillColor="#000" android:pathData="M19,15.59L17.59,17L14,13.41L10.41,17L9,15.59L12.59,12L9,8.41L10.41,7L14,10.59L17.59,7L19,8.41L15.41,12L19,15.59M22,3A2,2 0 0,1 24,5V19A2,2 0 0,1 22,21H7C6.31,21 5.77,20.64 5.41,20.11L0,12L5.41,3.88C5.77,3.35 6.31,3 7,3H22M22,5H7L2.28,12L7,19H22V5Z" />
 </vector>

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

@@ -1,8 +1,4 @@
 <!--drawable/book_open.xml-->
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
+<vector xmlns:android="http://schemas.android.com/apk/res/android" android:height="24dp" android:width="24dp" android:viewportWidth="24" android:viewportHeight="24">
-    android:height="24dp"
+    <path android:fillColor="?attr/colorControlNormal" android:pathData="M13 12h7v1.5h-7m0-4h7V11h-7m0 3.5h7V16h-7m8-12H3a2 2 0 0 0-2 2v13a2 2 0 0 0 2 2h18a2 2 0 0 0 2-2V6a2 2 0 0 0-2-2m0 15h-9V6h9"/>
-    android:width="24dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24">
-    <path android:fillColor="?attr/colorControlNormal" android:pathData="M13,12H20V13.5H13M13,9.5H20V11H13M13,14.5H20V16H13M21,4H3A2,2 0 0,0 1,6V19A2,2 0 0,0 3,21H21A2,2 0 0,0 23,19V6A2,2 0 0,0 21,4M21,19H12V6H21" />
 </vector>

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

@@ -1,8 +1,4 @@
 <!--drawable/brush.xml-->
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
+<vector xmlns:android="http://schemas.android.com/apk/res/android" android:height="24dp" android:width="24dp" android:viewportWidth="24" android:viewportHeight="24">
-    android:height="24dp"
+    <path android:fillColor="?attr/colorControlNormal" android:pathData="M20.71 4.63l-1.34-1.34c-0.37-0.39-1.02-0.39-1.41 0L9 12.25 11.75 15l8.96-8.96c0.39-0.39 0.39-1.04 0-1.41M7 14a3 3 0 0 0-3 3c0 1.31-1.16 2-2 2 0.92 1.22 2.5 2 4 2a4 4 0 0 0 4-4 3 3 0 0 0-3-3z"/>
-    android:width="24dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24">
-    <path android:fillColor="?attr/colorControlNormal" android:pathData="M20.71,4.63L19.37,3.29C19,2.9 18.35,2.9 17.96,3.29L9,12.25L11.75,15L20.71,6.04C21.1,5.65 21.1,5 20.71,4.63M7,14A3,3 0 0,0 4,17C4,18.31 2.84,19 2,19C2.92,20.22 4.5,21 6,21A4,4 0 0,0 10,17A3,3 0 0,0 7,14Z" />
 </vector>

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

@@ -1,8 +1,4 @@
 <!--drawable/cancel.xml-->
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
+<vector xmlns:android="http://schemas.android.com/apk/res/android" android:height="24dp" android:width="24dp" android:viewportWidth="24" android:viewportHeight="24">
-    android:height="24dp"
+    <path android:fillColor="#fff" android:pathData="M12 2a10 10 0 0 1 10 10 10 10 0 0 1-10 10A10 10 0 0 1 2 12 10 10 0 0 1 12 2m0 2a8 8 0 0 0-8 8c0 1.85 0.63 3.55 1.68 4.91L16.91 5.68C15.55 4.63 13.85 4 12 4m0 16a8 8 0 0 0 8-8c0-1.85-0.63-3.55-1.68-4.91L7.09 18.32C8.45 19.37 10.15 20 12 20z"/>
-    android:width="24dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24">
-    <path android:fillColor="#fff" android:pathData="M12,2A10,10 0 0,1 22,12A10,10 0 0,1 12,22A10,10 0 0,1 2,12A10,10 0 0,1 12,2M12,4A8,8 0 0,0 4,12C4,13.85 4.63,15.55 5.68,16.91L16.91,5.68C15.55,4.63 13.85,4 12,4M12,20A8,8 0 0,0 20,12C20,10.15 19.37,8.45 18.32,7.09L7.09,18.32C8.45,19.37 10.15,20 12,20Z" />
 </vector>

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

@@ -1,8 +1,4 @@
 <!--drawable/clock_end.xml-->
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
+<vector xmlns:android="http://schemas.android.com/apk/res/android" android:height="24dp" android:width="24dp" android:viewportWidth="24" android:viewportHeight="24">
-    android:height="24dp"
+    <path android:fillColor="#fff" android:pathData="M12 1C8.14 1 5 4.14 5 8a7 7 0 0 0 7 7c3.86 0 7-3.13 7-7 0-3.86-3.14-7-7-7m0 2.15c2.67 0 4.85 2.17 4.85 4.85 0 2.68-2.18 4.85-4.85 4.85A4.85 4.85 0 0 1 7.15 8 4.85 4.85 0 0 1 12 3.15M11 5v3.69l3.19 1.84 0.75-1.3-2.44-1.41V5M15 16v3H3v2h12v3l4-4m0 0v4h2v-8h-2"/>
-    android:width="24dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24">
-    <path android:fillColor="#fff" android:pathData="M12,1C8.14,1 5,4.14 5,8A7,7 0 0,0 12,15C15.86,15 19,11.87 19,8C19,4.14 15.86,1 12,1M12,3.15C14.67,3.15 16.85,5.32 16.85,8C16.85,10.68 14.67,12.85 12,12.85A4.85,4.85 0 0,1 7.15,8A4.85,4.85 0 0,1 12,3.15M11,5V8.69L14.19,10.53L14.94,9.23L12.5,7.82V5M15,16V19H3V21H15V24L19,20M19,20V24H21V16H19" />
 </vector>

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

@@ -1,8 +1,4 @@
 <!--drawable/clock_start.xml-->
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
+<vector xmlns:android="http://schemas.android.com/apk/res/android" android:height="24dp" android:width="24dp" android:viewportWidth="24" android:viewportHeight="24">
-    android:height="24dp"
+    <path android:fillColor="#fff" android:pathData="M12 1C8.14 1 5 4.14 5 8a7 7 0 0 0 7 7c3.86 0 7-3.13 7-7 0-3.86-3.14-7-7-7m0 2.15c2.67 0 4.85 2.17 4.85 4.85 0 2.68-2.18 4.85-4.85 4.85A4.85 4.85 0 0 1 7.15 8 4.85 4.85 0 0 1 12 3.15M11 5v3.69l3.19 1.84 0.75-1.3-2.44-1.41V5M4 16v8h2v-3h12v3l4-4-4-4v3H6v-3"/>
-    android:width="24dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24">
-    <path android:fillColor="#fff" android:pathData="M12,1C8.14,1 5,4.14 5,8A7,7 0 0,0 12,15C15.86,15 19,11.87 19,8C19,4.14 15.86,1 12,1M12,3.15C14.67,3.15 16.85,5.32 16.85,8C16.85,10.68 14.67,12.85 12,12.85A4.85,4.85 0 0,1 7.15,8A4.85,4.85 0 0,1 12,3.15M11,5V8.69L14.19,10.53L14.94,9.23L12.5,7.82V5M4,16V24H6V21H18V24L22,20L18,16V19H6V16" />
 </vector>

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

@@ -1,8 +1,4 @@
 <!--drawable/close.xml-->
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
+<vector xmlns:android="http://schemas.android.com/apk/res/android" android:height="24dp" android:width="24dp" android:viewportWidth="24" android:viewportHeight="24">
-    android:height="24dp"
+    <path android:fillColor="?attr/colorControlNormal" android:pathData="M19 6.41L17.59 5 12 10.59 6.41 5 5 6.41 10.59 12 5 17.59 6.41 19 12 13.41 17.59 19 19 17.59 13.41 12 19 6.41z"/>
-    android:width="24dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24">
-    <path android:fillColor="?attr/colorControlNormal" android:pathData="M19,6.41L17.59,5L12,10.59L6.41,5L5,6.41L10.59,12L5,17.59L6.41,19L12,13.41L17.59,19L19,17.59L13.41,12L19,6.41Z" />
 </vector>

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

@@ -1,8 +1,4 @@
 <!--drawable/delete.xml-->
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
+<vector xmlns:android="http://schemas.android.com/apk/res/android" android:height="24dp" android:width="24dp" android:viewportWidth="24" android:viewportHeight="24">
-    android:height="24dp"
+    <path android:fillColor="?attr/colorControlNormal" android:pathData="M19 4h-3.5l-1-1h-5l-1 1H5v2h14M6 19a2 2 0 0 0 2 2h8a2 2 0 0 0 2-2V7H6v12z"/>
-    android:width="24dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24">
-    <path android:fillColor="?attr/colorControlNormal" android:pathData="M19,4H15.5L14.5,3H9.5L8.5,4H5V6H19M6,19A2,2 0 0,0 8,21H16A2,2 0 0,0 18,19V7H6V19Z" />
 </vector>

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

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

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

@@ -0,0 +1,8 @@
+<!-- drawable/eye.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="?attr/colorControlNormal" android:pathData="M12,9A3,3 0 0,0 9,12A3,3 0 0,0 12,15A3,3 0 0,0 15,12A3,3 0 0,0 12,9M12,17A5,5 0 0,1 7,12A5,5 0 0,1 12,7A5,5 0 0,1 17,12A5,5 0 0,1 12,17M12,4.5C7,4.5 2.73,7.61 1,12C2.73,16.39 7,19.5 12,19.5C17,19.5 21.27,16.39 23,12C21.27,7.61 17,4.5 12,4.5Z" />
+</vector>

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

@@ -0,0 +1,44 @@
+<!--
+  ~     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/>.
+  -->
+
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="22dp"
+    android:height="15dp"
+    android:viewportWidth="22"
+    android:viewportHeight="15">
+  <path
+      android:pathData="M21.61,5.4C14.21,13.39 7.16,13.37 0.43,5.32"
+      android:strokeWidth="1"
+      android:strokeColor="?attr/colorControlNormal"/>
+  <path
+      android:pathData="M1.32,9.8L3.03,7.8"
+      android:strokeWidth="1"
+      android:strokeColor="?attr/colorControlNormal"/>
+  <path
+      android:pathData="M5.14,12.37L6.16,10.37"
+      android:strokeWidth="1"
+      android:strokeColor="?attr/colorControlNormal"/>
+  <path
+      android:pathData="M16.27,12.37L15.25,10.37"
+      android:strokeWidth="1"
+      android:strokeColor="?attr/colorControlNormal"/>
+  <path
+      android:pathData="M18.78,7.8L20.49,9.8"
+      android:strokeWidth="1"
+      android:strokeColor="?attr/colorControlNormal"/>
+</vector>

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

@@ -0,0 +1,8 @@
+<!-- drawable/eye_off.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="?attr/colorControlNormal" android:pathData="M11.83,9L15,12.16C15,12.11 15,12.05 15,12A3,3 0 0,0 12,9C11.94,9 11.89,9 11.83,9M7.53,9.8L9.08,11.35C9.03,11.56 9,11.77 9,12A3,3 0 0,0 12,15C12.22,15 12.44,14.97 12.65,14.92L14.2,16.47C13.53,16.8 12.79,17 12,17A5,5 0 0,1 7,12C7,11.21 7.2,10.47 7.53,9.8M2,4.27L4.28,6.55L4.73,7C3.08,8.3 1.78,10 1,12C2.73,16.39 7,19.5 12,19.5C13.55,19.5 15.03,19.2 16.38,18.66L16.81,19.08L19.73,22L21,20.73L3.27,3M12,7A5,5 0 0,1 17,12C17,12.64 16.87,13.26 16.64,13.82L19.57,16.75C21.07,15.5 22.27,13.86 23,12C21.27,7.61 17,4.5 12,4.5C10.6,4.5 9.26,4.75 8,5.2L10.17,7.35C10.74,7.13 11.35,7 12,7Z" />
+</vector>

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

@@ -0,0 +1,8 @@
+<!-- drawable/eye_off.xml -->
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:height="24dp"
+    android:width="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <path android:fillColor="#fff" android:pathData="M11.83,9L15,12.16C15,12.11 15,12.05 15,12A3,3 0 0,0 12,9C11.94,9 11.89,9 11.83,9M7.53,9.8L9.08,11.35C9.03,11.56 9,11.77 9,12A3,3 0 0,0 12,15C12.22,15 12.44,14.97 12.65,14.92L14.2,16.47C13.53,16.8 12.79,17 12,17A5,5 0 0,1 7,12C7,11.21 7.2,10.47 7.53,9.8M2,4.27L4.28,6.55L4.73,7C3.08,8.3 1.78,10 1,12C2.73,16.39 7,19.5 12,19.5C13.55,19.5 15.03,19.2 16.38,18.66L16.81,19.08L19.73,22L21,20.73L3.27,3M12,7A5,5 0 0,1 17,12C17,12.64 16.87,13.26 16.64,13.82L19.57,16.75C21.07,15.5 22.27,13.86 23,12C21.27,7.61 17,4.5 12,4.5C10.6,4.5 9.26,4.75 8,5.2L10.17,7.35C10.74,7.13 11.35,7 12,7Z" />
+</vector>

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

@@ -0,0 +1,8 @@
+<!-- drawable/eye.xml -->
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:height="24dp"
+    android:width="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <path android:fillColor="#fff" android:pathData="M12,9A3,3 0 0,0 9,12A3,3 0 0,0 12,15A3,3 0 0,0 15,12A3,3 0 0,0 12,9M12,17A5,5 0 0,1 7,12A5,5 0 0,1 12,7A5,5 0 0,1 17,12A5,5 0 0,1 12,17M12,4.5C7,4.5 2.73,7.61 1,12C2.73,16.39 7,19.5 12,19.5C17,19.5 21.27,16.39 23,12C21.27,7.61 17,4.5 12,4.5Z" />
+</vector>

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

@@ -1,10 +1,4 @@
 <!--drawable/fingerprint.xml-->
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
+<vector xmlns:android="http://schemas.android.com/apk/res/android" xmlns:tools="http://schemas.android.com/tools" android:height="24dp" android:width="24dp" android:viewportWidth="24" android:viewportHeight="24">
-    xmlns:tools="http://schemas.android.com/tools"
+    <path android:fillColor="#fff" android:pathData="M17.81 4.47c-0.08 0-0.16-0.02-0.23-0.06C15.66 3.42 14 3 12 3c-1.97 0-3.85 0.47-5.56 1.41C6.2 4.54 5.9 4.45 5.76 4.21c-0.13-0.24-0.04-0.55 0.2-0.68C7.82 2.5 9.86 2 12 2s4 0.47 6.04 1.5c0.25 0.15 0.34 0.45 0.21 0.69-0.09 0.18-0.25 0.28-0.44 0.28M3.5 9.72c-0.1 0-0.2-0.03-0.29-0.09C3 9.47 2.93 9.16 3.09 8.93c0.99-1.4 2.25-2.5 3.75-3.27C10 4.04 14 4.03 17.15 5.65c1.5 0.77 2.76 1.85 3.75 3.25 0.16 0.22 0.1 0.54-0.12 0.7-0.23 0.16-0.54 0.11-0.7-0.1-0.9-1.28-2.04-2.27-3.39-2.96-2.87-1.47-6.54-1.47-9.4 0.01-1.36 0.7-2.5 1.7-3.4 2.95C3.81 9.65 3.66 9.72 3.5 9.72m6.25 12.07c-0.13 0-0.25-0.05-0.35-0.15-0.87-0.87-1.34-1.43-2.01-2.64-0.69-1.23-1.05-2.73-1.05-4.34 0-2.97 2.54-5.39 5.66-5.39s5.66 2.42 5.66 5.39a0.5 0.5 0 0 1-0.5 0.5 0.5 0.5 0 0 1-0.5-0.5c0-2.42-2.09-4.39-4.66-4.39-2.57 0-4.66 1.97-4.66 4.39 0 1.44 0.32 2.77 0.93 3.84 0.64 1.16 1.08 1.65 1.85 2.43 0.19 0.2 0.19 0.51 0 0.71-0.12 0.1-0.24 0.15-0.37 0.15m7.17-1.85c-1.19 0-2.24-0.3-3.1-0.89-1.49-1.01-2.38-2.65-2.38-4.39a0.5 0.5 0 0 1 0.5-0.5 0.5 0.5 0 0 1 0.5 0.5c0 1.41 0.72 2.74 1.94 3.56 0.71 0.48 1.54 0.71 2.54 0.71 0.24 0 0.64-0.03 1.04-0.1 0.27-0.05 0.54 0.13 0.58 0.41 0.05 0.26-0.13 0.53-0.41 0.58-0.57 0.11-1.07 0.12-1.21 0.12M14.91 22h-0.13c-1.59-0.46-2.63-1.05-3.72-2.12-1.4-1.38-2.17-3.24-2.17-5.22 0-1.62 1.38-2.94 3.08-2.94 1.7 0 3.08 1.32 3.08 2.94 0 1.07 0.95 1.94 2.08 1.94 1.15 0 2.08-0.87 2.08-1.94 0-3.77-3.25-6.83-7.25-6.83-2.84 0-5.46 1.58-6.61 4.03-0.39 0.81-0.59 1.76-0.59 2.8 0 0.78 0.07 2.01 0.67 3.61 0.1 0.26-0.03 0.55-0.29 0.64C4.88 19 4.59 18.87 4.5 18.62 4 17.31 3.77 16 3.77 14.66c0-1.2 0.23-2.29 0.68-3.24 1.33-2.79 4.28-4.6 7.51-4.6 4.54 0 8.25 3.51 8.25 7.83 0 1.62-1.38 2.94-3.08 2.94-1.7 0-3.08-1.32-3.08-2.94 0-1.07-0.93-1.94-2.08-1.94s-2.08 0.87-2.08 1.94c0 1.71 0.66 3.31 1.87 4.51 0.95 0.94 1.86 1.46 3.27 1.84 0.27 0.08 0.42 0.36 0.35 0.62-0.05 0.23-0.26 0.38-0.47 0.38z" tools:ignore="VectorPath"/>
-    android:height="24dp"
-    android:width="24dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24">
-    <path android:fillColor="#fff" android:pathData="M17.81,4.47C17.73,4.47 17.65,4.45 17.58,4.41C15.66,3.42 14,3 12,3C10.03,3 8.15,3.47 6.44,4.41C6.2,4.54 5.9,4.45 5.76,4.21C5.63,3.97 5.72,3.66 5.96,3.53C7.82,2.5 9.86,2 12,2C14.14,2 16,2.47 18.04,3.5C18.29,3.65 18.38,3.95 18.25,4.19C18.16,4.37 18,4.47 17.81,4.47M3.5,9.72C3.4,9.72 3.3,9.69 3.21,9.63C3,9.47 2.93,9.16 3.09,8.93C4.08,7.53 5.34,6.43 6.84,5.66C10,4.04 14,4.03 17.15,5.65C18.65,6.42 19.91,7.5 20.9,8.9C21.06,9.12 21,9.44 20.78,9.6C20.55,9.76 20.24,9.71 20.08,9.5C19.18,8.22 18.04,7.23 16.69,6.54C13.82,5.07 10.15,5.07 7.29,6.55C5.93,7.25 4.79,8.25 3.89,9.5C3.81,9.65 3.66,9.72 3.5,9.72M9.75,21.79C9.62,21.79 9.5,21.74 9.4,21.64C8.53,20.77 8.06,20.21 7.39,19C6.7,17.77 6.34,16.27 6.34,14.66C6.34,11.69 8.88,9.27 12,9.27C15.12,9.27 17.66,11.69 17.66,14.66A0.5,0.5 0 0,1 17.16,15.16A0.5,0.5 0 0,1 16.66,14.66C16.66,12.24 14.57,10.27 12,10.27C9.43,10.27 7.34,12.24 7.34,14.66C7.34,16.1 7.66,17.43 8.27,18.5C8.91,19.66 9.35,20.15 10.12,20.93C10.31,21.13 10.31,21.44 10.12,21.64C10,21.74 9.88,21.79 9.75,21.79M16.92,19.94C15.73,19.94 14.68,19.64 13.82,19.05C12.33,18.04 11.44,16.4 11.44,14.66A0.5,0.5 0 0,1 11.94,14.16A0.5,0.5 0 0,1 12.44,14.66C12.44,16.07 13.16,17.4 14.38,18.22C15.09,18.7 15.92,18.93 16.92,18.93C17.16,18.93 17.56,18.9 17.96,18.83C18.23,18.78 18.5,18.96 18.54,19.24C18.59,19.5 18.41,19.77 18.13,19.82C17.56,19.93 17.06,19.94 16.92,19.94M14.91,22C14.87,22 14.82,22 14.78,22C13.19,21.54 12.15,20.95 11.06,19.88C9.66,18.5 8.89,16.64 8.89,14.66C8.89,13.04 10.27,11.72 11.97,11.72C13.67,11.72 15.05,13.04 15.05,14.66C15.05,15.73 16,16.6 17.13,16.6C18.28,16.6 19.21,15.73 19.21,14.66C19.21,10.89 15.96,7.83 11.96,7.83C9.12,7.83 6.5,9.41 5.35,11.86C4.96,12.67 4.76,13.62 4.76,14.66C4.76,15.44 4.83,16.67 5.43,18.27C5.53,18.53 5.4,18.82 5.14,18.91C4.88,19 4.59,18.87 4.5,18.62C4,17.31 3.77,16 3.77,14.66C3.77,13.46 4,12.37 4.45,11.42C5.78,8.63 8.73,6.82 11.96,6.82C16.5,6.82 20.21,10.33 20.21,14.65C20.21,16.27 18.83,17.59 17.13,17.59C15.43,17.59 14.05,16.27 14.05,14.65C14.05,13.58 13.12,12.71 11.97,12.71C10.82,12.71 9.89,13.58 9.89,14.65C9.89,16.36 10.55,17.96 11.76,19.16C12.71,20.1 13.62,20.62 15.03,21C15.3,21.08 15.45,21.36 15.38,21.62C15.33,21.85 15.12,22 14.91,22Z"
-        tools:ignore="VectorPath" />
 </vector>

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

@@ -1,8 +1,4 @@
 <!--drawable/gender_female.xml-->
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
+<vector xmlns:android="http://schemas.android.com/apk/res/android" android:height="24dp" android:width="24dp" android:viewportWidth="24" android:viewportHeight="24">
-    android:height="24dp"
+    <path android:fillColor="?attr/colorControlNormal" android:pathData="M12 4a6 6 0 0 1 6 6c0 2.97-2.16 5.44-5 5.92V18h2v2h-2v2h-2v-2H9v-2h2v-2.08C8.16 15.44 6 12.97 6 10a6 6 0 0 1 6-6m0 2a4 4 0 0 0-4 4 4 4 0 0 0 4 4 4 4 0 0 0 4-4 4 4 0 0 0-4-4z"/>
-    android:width="24dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24">
-    <path android:fillColor="?attr/colorControlNormal" android:pathData="M12,4A6,6 0 0,1 18,10C18,12.97 15.84,15.44 13,15.92V18H15V20H13V22H11V20H9V18H11V15.92C8.16,15.44 6,12.97 6,10A6,6 0 0,1 12,4M12,6A4,4 0 0,0 8,10A4,4 0 0,0 12,14A4,4 0 0,0 16,10A4,4 0 0,0 12,6Z" />
 </vector>

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

@@ -1,8 +1,4 @@
 <!--drawable/gender_female.xml-->
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
+<vector xmlns:android="http://schemas.android.com/apk/res/android" android:height="24dp" android:width="24dp" android:viewportWidth="24" android:viewportHeight="24">
-    android:height="24dp"
+    <path android:fillColor="#FFF" android:pathData="M12 4a6 6 0 0 1 6 6c0 2.97-2.16 5.44-5 5.92V18h2v2h-2v2h-2v-2H9v-2h2v-2.08C8.16 15.44 6 12.97 6 10a6 6 0 0 1 6-6m0 2a4 4 0 0 0-4 4 4 4 0 0 0 4 4 4 4 0 0 0 4-4 4 4 0 0 0-4-4z"/>
-    android:width="24dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24">
-    <path android:fillColor="#FFF" android:pathData="M12,4A6,6 0 0,1 18,10C18,12.97 15.84,15.44 13,15.92V18H15V20H13V22H11V20H9V18H11V15.92C8.16,15.44 6,12.97 6,10A6,6 0 0,1 12,4M12,6A4,4 0 0,0 8,10A4,4 0 0,0 12,14A4,4 0 0,0 16,10A4,4 0 0,0 12,6Z" />
 </vector>

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

@@ -1,8 +1,4 @@
 <!--drawable/gender_male.xml-->
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
+<vector xmlns:android="http://schemas.android.com/apk/res/android" android:height="24dp" android:width="24dp" android:viewportWidth="24" android:viewportHeight="24">
-    android:height="24dp"
+    <path android:fillColor="?attr/colorControlNormal" android:pathData="M9 9c1.29 0 2.5 0.41 3.47 1.11L17.58 5H13V3h8v8h-2V6.41l-5.11 5.09c0.7 1 1.11 2.2 1.11 3.5a6 6 0 0 1-6 6 6 6 0 0 1-6-6 6 6 0 0 1 6-6m0 2a4 4 0 0 0-4 4 4 4 0 0 0 4 4 4 4 0 0 0 4-4 4 4 0 0 0-4-4z"/>
-    android:width="24dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24">
-    <path android:fillColor="?attr/colorControlNormal" android:pathData="M9,9C10.29,9 11.5,9.41 12.47,10.11L17.58,5H13V3H21V11H19V6.41L13.89,11.5C14.59,12.5 15,13.7 15,15A6,6 0 0,1 9,21A6,6 0 0,1 3,15A6,6 0 0,1 9,9M9,11A4,4 0 0,0 5,15A4,4 0 0,0 9,19A4,4 0 0,0 13,15A4,4 0 0,0 9,11Z" />
 </vector>

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

@@ -1,8 +1,4 @@
 <!--drawable/gender_male.xml-->
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
+<vector xmlns:android="http://schemas.android.com/apk/res/android" android:height="24dp" android:width="24dp" android:viewportWidth="24" android:viewportHeight="24">
-    android:height="24dp"
+    <path android:fillColor="#FFF" android:pathData="M9 9c1.29 0 2.5 0.41 3.47 1.11L17.58 5H13V3h8v8h-2V6.41l-5.11 5.09c0.7 1 1.11 2.2 1.11 3.5a6 6 0 0 1-6 6 6 6 0 0 1-6-6 6 6 0 0 1 6-6m0 2a4 4 0 0 0-4 4 4 4 0 0 0 4 4 4 4 0 0 0 4-4 4 4 0 0 0-4-4z"/>
-    android:width="24dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24">
-    <path android:fillColor="#FFF" android:pathData="M9,9C10.29,9 11.5,9.41 12.47,10.11L17.58,5H13V3H21V11H19V6.41L13.89,11.5C14.59,12.5 15,13.7 15,15A6,6 0 0,1 9,21A6,6 0 0,1 3,15A6,6 0 0,1 9,9M9,11A4,4 0 0,0 5,15A4,4 0 0,0 9,19A4,4 0 0,0 13,15A4,4 0 0,0 9,11Z" />
 </vector>

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

@@ -1,8 +1,4 @@
 <!--drawable/github-circle.xml-->
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
+<vector xmlns:android="http://schemas.android.com/apk/res/android" android:height="24dp" android:width="24dp" android:viewportWidth="24" android:viewportHeight="24">
-    android:height="24dp"
+    <path android:fillColor="#000" android:pathData="M12 2A10 10 0 0 0 2 12c0 4.42 2.87 8.17 6.84 9.5 0.5 0.08 0.66-0.23 0.66-0.5v-1.69c-2.77 0.6-3.36-1.34-3.36-1.34-0.46-1.16-1.11-1.47-1.11-1.47-0.91-0.62 0.07-0.6 0.07-0.6 1 0.07 1.53 1.03 1.53 1.03 0.87 1.52 2.34 1.07 2.91 0.83 0.09-0.65 0.35-1.09 0.63-1.34-2.22-0.25-4.55-1.11-4.55-4.92 0-1.11 0.38-2 1.03-2.71-0.1-0.25-0.45-1.29 0.1-2.64 0 0 0.84-0.27 2.75 1.02 0.79-0.22 1.65-0.33 2.5-0.33 0.85 0 1.71 0.11 2.5 0.33 1.91-1.29 2.75-1.02 2.75-1.02 0.55 1.35 0.2 2.39 0.1 2.64 0.65 0.71 1.03 1.6 1.03 2.71 0 3.82-2.34 4.66-4.57 4.91 0.36 0.31 0.69 0.92 0.69 1.85V21c0 0.27 0.16 0.59 0.67 0.5C19.14 20.16 22 16.42 22 12A10 10 0 0 0 12 2z"/>
-    android:width="24dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24">
-    <path android:fillColor="#000" android:pathData="M12,2A10,10 0 0,0 2,12C2,16.42 4.87,20.17 8.84,21.5C9.34,21.58 9.5,21.27 9.5,21C9.5,20.77 9.5,20.14 9.5,19.31C6.73,19.91 6.14,17.97 6.14,17.97C5.68,16.81 5.03,16.5 5.03,16.5C4.12,15.88 5.1,15.9 5.1,15.9C6.1,15.97 6.63,16.93 6.63,16.93C7.5,18.45 8.97,18 9.54,17.76C9.63,17.11 9.89,16.67 10.17,16.42C7.95,16.17 5.62,15.31 5.62,11.5C5.62,10.39 6,9.5 6.65,8.79C6.55,8.54 6.2,7.5 6.75,6.15C6.75,6.15 7.59,5.88 9.5,7.17C10.29,6.95 11.15,6.84 12,6.84C12.85,6.84 13.71,6.95 14.5,7.17C16.41,5.88 17.25,6.15 17.25,6.15C17.8,7.5 17.45,8.54 17.35,8.79C18,9.5 18.38,10.39 18.38,11.5C18.38,15.32 16.04,16.16 13.81,16.41C14.17,16.72 14.5,17.33 14.5,18.26C14.5,19.6 14.5,20.68 14.5,21C14.5,21.27 14.66,21.59 15.17,21.5C19.14,20.16 22,16.42 22,12A10,10 0 0,0 12,2Z" />
 </vector>

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

@@ -1,8 +1,4 @@
 <!--drawable/history.xml-->
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
+<vector xmlns:android="http://schemas.android.com/apk/res/android" android:height="24dp" android:width="24dp" android:viewportWidth="24" android:viewportHeight="24">
-    android:height="24dp"
+    <path android:fillColor="?attr/colorControlNormal" android:pathData="M13.5 8H12v5l4.28 2.54 0.72-1.21-3.5-2.08V8M13 3a9 9 0 0 0-9 9H1l3.96 4.03L9 12H6a7 7 0 0 1 7-7 7 7 0 0 1 7 7 7 7 0 0 1-7 7c-1.93 0-3.68-0.79-4.94-2.06l-1.42 1.42C8.27 20 10.5 21 13 21a9 9 0 0 0 9-9 9 9 0 0 0-9-9"/>
-    android:width="24dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24">
-    <path android:fillColor="?attr/colorControlNormal" android:pathData="M13.5,8H12V13L16.28,15.54L17,14.33L13.5,12.25V8M13,3A9,9 0 0,0 4,12H1L4.96,16.03L9,12H6A7,7 0 0,1 13,5A7,7 0 0,1 20,12A7,7 0 0,1 13,19C11.07,19 9.32,18.21 8.06,16.94L6.64,18.36C8.27,20 10.5,21 13,21A9,9 0 0,0 22,12A9,9 0 0,0 13,3" />
 </vector>

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

@@ -1,5 +1,3 @@
-<vector android:height="24dp"
+<vector android:height="24dp" android:viewportHeight="24.0" android:viewportWidth="24.0" android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
-    android:viewportHeight="24.0" android:viewportWidth="24.0"
+    <path android:fillColor="#fff" android:pathData="M19 9h-4V3H9v6H5l7 7 7-7zM5 18v2h14v-2H5z"/>
-    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillColor="#fff" android:pathData="M19,9h-4V3H9v6H5l7,7 7,-7zM5,18v2h14v-2H5z"/>
 </vector>

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

@@ -1,73 +1,18 @@
 <?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/>.-->
-  ~     Pupil, Hitomi.la viewer for Android
+<animated-vector xmlns:android="http://schemas.android.com/apk/res/android" xmlns:tools="http://schemas.android.com/tools" xmlns:aapt="http://schemas.android.com/aapt" tools:ignore="NewApi">
-  ~     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/>.
-  -->
-
-<animated-vector
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    xmlns:aapt="http://schemas.android.com/aapt"
-    tools:ignore="NewApi">
     <aapt:attr name="android:drawable">
-        <vector
+        <vector android:name="vector" android:width="24dp" android:height="24dp" android:viewportWidth="24" android:viewportHeight="24">
-            android:name="vector"
+            <path android:name="path" android:pathData="M 19 9 L 15 9 L 15 3 L 9 3 L 9 9 L 5 9 L 12 16 L 19 9 Z" android:fillColor="#fff" android:strokeWidth="1"/>
-            android:width="24dp"
+            <path android:name="path_2" android:pathData="M 5 19 L 19 19" android:fillColor="#fff" android:strokeColor="#fff" android:strokeWidth="2"/>
-            android:height="24dp"
-            android:viewportWidth="24"
-            android:viewportHeight="24">
-            <path
-                android:name="path"
-                android:pathData="M 19 9 L 15 9 L 15 3 L 9 3 L 9 9 L 5 9 L 12 16 L 19 9 Z"
-                android:fillColor="#fff"
-                android:strokeWidth="1"/>
-            <path
-                android:name="path_2"
-                android:pathData="M 5 19 L 19 19"
-                android:fillColor="#fff"
-                android:strokeColor="#fff"
-                android:strokeWidth="2"
-                android:strokeLineCap="butt"/>
         </vector>
     </aapt:attr>
     <target android:name="path_2">
         <aapt:attr name="android:animation">
             <set>
-                <objectAnimator
+                <objectAnimator android:propertyName="trimPathEnd" android:duration="500" android:valueFrom="0" android:valueTo="0.8" android:valueType="floatType" android:interpolator="@android:interpolator/fast_out_slow_in"/>
-                    android:propertyName="trimPathEnd"
+                <objectAnimator android:propertyName="trimPathStart" android:startOffset="500" android:duration="500" android:valueFrom="0" android:valueTo="0.8" android:valueType="floatType" android:interpolator="@android:interpolator/fast_out_slow_in"/>
-                    android:duration="500"
+                <objectAnimator android:propertyName="trimPathOffset" android:duration="1000" android:valueFrom="0" android:valueTo="0.2" android:valueType="floatType" android:interpolator="@android:interpolator/fast_out_slow_in"/>
-                    android:valueFrom="0"
-                    android:valueTo="0.8"
-                    android:valueType="floatType"
-                    android:interpolator="@android:interpolator/fast_out_slow_in"/>
-                <objectAnimator
-                    android:propertyName="trimPathStart"
-                    android:startOffset="500"
-                    android:duration="500"
-                    android:valueFrom="0"
-                    android:valueTo="0.8"
-                    android:valueType="floatType"
-                    android:interpolator="@android:interpolator/fast_out_slow_in"/>
-                <objectAnimator
-                    android:propertyName="trimPathOffset"
-                    android:duration="1000"
-                    android:valueFrom="0"
-                    android:valueTo="0.2"
-                    android:valueType="floatType"
-                    android:interpolator="@android:interpolator/fast_out_slow_in"/>
             </set>
         </aapt:attr>
     </target>

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

@@ -1,14 +1,4 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
+<vector xmlns:android="http://schemas.android.com/apk/res/android" android:width="24dp" android:height="24dp" android:viewportWidth="24.0" android:viewportHeight="24.0">
-        android:width="24dp"
+    <path android:fillColor="#fff" android:pathData="M18.4 10.6C16.55 8.99 14.15 8 11.5 8c-4.65 0-8.58 3.03-9.96 7.22L3.9 16c1.05-3.19 4.05-5.5 7.6-5.5 1.95 0 3.73 0.72 5.12 1.88L13 16h9V7l-3.6 3.6z"/>
-        android:height="24dp"
+    <path android:fillColor="#fff" android:pathData="M8.5 15a1.5 1.5 0 1 1 1.5 1.5A1.5 1.5 0 0 1 8.5 15z"/>
-        android:viewportWidth="24.0"
-        android:viewportHeight="24.0">
-    <path
-        android:fillColor="#fff"
-        android:pathData="M18.4,10.6C16.55,8.99 14.15,8 11.5,8c-4.65,0 -8.58,3.03 -9.96,7.22L3.9,16c1.05,-3.19 4.05,-5.5 7.6,-5.5 1.95,0 3.73,0.72 5.12,1.88L13,16h9V7l-3.6,3.6z"/>
-    <path
-        android:fillColor="#fff"
-        android:pathData="M8.5,15
-        a1.5,1.5 0 1,1 1.5,1.5
-        a1.5,1.5 0 0,1 -1.5,-1.5 Z"/>
 </vector>

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

@@ -1,8 +1,4 @@
 <!--drawable/message.xml-->
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
+<vector xmlns:android="http://schemas.android.com/apk/res/android" android:height="24dp" android:width="24dp" android:viewportWidth="24" android:viewportHeight="24">
-    android:height="24dp"
+    <path android:fillColor="#000" android:pathData="M20 2H4a2 2 0 0 0-2 2v18l4-4h14a2 2 0 0 0 2-2V4c0-1.11-0.9-2-2-2z"/>
-    android:width="24dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24">
-    <path android:fillColor="#000" android:pathData="M20,2H4A2,2 0 0,0 2,4V22L6,18H20A2,2 0 0,0 22,16V4C22,2.89 21.1,2 20,2Z" />
 </vector>

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

@@ -1,9 +1,3 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
+<vector xmlns:android="http://schemas.android.com/apk/res/android" android:width="24dp" android:height="24dp" android:viewportWidth="24.0" android:viewportHeight="24.0">
-        android:width="24dp"
+    <path android:fillColor="#FF000000" android:pathData="M10 6L8.59 7.41 13.17 12l-4.58 4.59L10 18l6-6z"/>
-        android:height="24dp"
-        android:viewportWidth="24.0"
-        android:viewportHeight="24.0">
-    <path
-        android:fillColor="#FF000000"
-        android:pathData="M10,6L8.59,7.41 13.17,12l-4.58,4.59L10,18l6,-6z"/>
 </vector>

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

@@ -1,22 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<vector
+<vector xmlns:android="http://schemas.android.com/apk/res/android" android:name="vector" android:width="24dp" android:height="24dp" android:viewportWidth="24" android:viewportHeight="24" android:tintMode="multiply">
-xmlns:android="http://schemas.android.com/apk/res/android"
+    <path android:name="path_1" android:pathData="M 0 12 L 24 12" android:fillColor="#000" android:strokeColor="#b9f6ca" android:strokeWidth="24"/>
-android:name="vector"
+    <path android:name="path" android:pathData="M 0 12 L 24 12" android:fillColor="#000" android:strokeColor="#00c853" android:strokeWidth="24"/>
-android:width="24dp"
-android:height="24dp"
-android:viewportWidth="24"
-android:viewportHeight="24"
-android:tintMode="multiply">
-<path
-    android:name="path_1"
-    android:pathData="M 0 12 L 24 12"
-    android:fillColor="#000"
-    android:strokeColor="#b9f6ca"
-    android:strokeWidth="24"/>
-<path
-    android:name="path"
-    android:pathData="M 0 12 L 24 12"
-    android:fillColor="#000"
-    android:strokeColor="#00c853"
-    android:strokeWidth="24"/>
 </vector>

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

@@ -1,22 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<vector
+<vector xmlns:android="http://schemas.android.com/apk/res/android" android:name="vector" android:width="24dp" android:height="24dp" android:viewportWidth="24" android:viewportHeight="24" android:tintMode="multiply">
-xmlns:android="http://schemas.android.com/apk/res/android"
+    <path android:name="path_1" android:pathData="M 0 12 L 24 12" android:fillColor="#000" android:strokeColor="#80d8ff" android:strokeWidth="24"/>
-android:name="vector"
+    <path android:name="path" android:pathData="M 0 12 L 24 12" android:fillColor="#000" android:strokeColor="#0091ea" android:strokeWidth="24"/>
-android:width="24dp"
-android:height="24dp"
-android:viewportWidth="24"
-android:viewportHeight="24"
-android:tintMode="multiply">
-<path
-    android:name="path_1"
-    android:pathData="M 0 12 L 24 12"
-    android:fillColor="#000"
-    android:strokeColor="#80d8ff"
-    android:strokeWidth="24"/>
-<path
-    android:name="path"
-    android:pathData="M 0 12 L 24 12"
-    android:fillColor="#000"
-    android:strokeColor="#0091ea"
-    android:strokeWidth="24"/>
 </vector>

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

@@ -1,38 +1,13 @@
-<animated-vector xmlns:android="http://schemas.android.com/apk/res/android"
+<animated-vector xmlns:android="http://schemas.android.com/apk/res/android" xmlns:tools="http://schemas.android.com/tools" xmlns:aapt="http://schemas.android.com/aapt" tools:ignore="NewApi">
-    xmlns:tools="http://schemas.android.com/tools"
-    xmlns:aapt="http://schemas.android.com/aapt"
-    tools:ignore="NewApi">
     <aapt:attr name="android:drawable">
-        <vector
+        <vector android:name="vector" android:width="24dp" android:height="24dp" android:viewportWidth="24" android:viewportHeight="24" android:tintMode="multiply">
-            android:name="vector"
+            <path android:name="path_1" android:pathData="M 0 12 L 24 12" android:fillColor="#000" android:strokeColor="#b9f6ca" android:strokeWidth="24"/>
-            android:width="24dp"
+            <path android:name="path" android:pathData="M 0 12 L 24 12" android:fillColor="#000" android:strokeColor="#00c853" android:strokeWidth="24"/>
-            android:height="24dp"
-            android:viewportWidth="24"
-            android:viewportHeight="24"
-            android:tintMode="multiply">
-            <path
-                android:name="path_1"
-                android:pathData="M 0 12 L 24 12"
-                android:fillColor="#000"
-                android:strokeColor="#b9f6ca"
-                android:strokeWidth="24"/>
-            <path
-                android:name="path"
-                android:pathData="M 0 12 L 24 12"
-                android:fillColor="#000"
-                android:strokeColor="#00c853"
-                android:strokeWidth="24"/>
         </vector>
     </aapt:attr>
     <target android:name="path">
         <aapt:attr name="android:animation">
-            <objectAnimator
+            <objectAnimator android:propertyName="trimPathEnd" android:duration="1000" android:valueFrom="0" android:valueTo="1" android:valueType="floatType" android:interpolator="@android:interpolator/fast_out_slow_in"/>
-                android:propertyName="trimPathEnd"
-                android:duration="1000"
-                android:valueFrom="0"
-                android:valueTo="1"
-                android:valueType="floatType"
-                android:interpolator="@android:interpolator/fast_out_slow_in"/>
         </aapt:attr>
     </target>
 </animated-vector>

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

@@ -1,38 +1,13 @@
-<animated-vector xmlns:android="http://schemas.android.com/apk/res/android"
+<animated-vector xmlns:android="http://schemas.android.com/apk/res/android" xmlns:tools="http://schemas.android.com/tools" xmlns:aapt="http://schemas.android.com/aapt" tools:ignore="NewApi">
-    xmlns:tools="http://schemas.android.com/tools"
-    xmlns:aapt="http://schemas.android.com/aapt"
-    tools:ignore="NewApi">
     <aapt:attr name="android:drawable">
-        <vector
+        <vector android:name="vector" android:width="24dp" android:height="24dp" android:viewportWidth="24" android:viewportHeight="24" android:tintMode="multiply">
-            android:name="vector"
+            <path android:name="path_1" android:pathData="M 0 12 L 24 12" android:fillColor="#000" android:strokeColor="#80d8ff" android:strokeWidth="24"/>
-            android:width="24dp"
+            <path android:name="path" android:pathData="M 0 12 L 24 12" android:fillColor="#000" android:strokeColor="#0091ea" android:strokeWidth="24"/>
-            android:height="24dp"
-            android:viewportWidth="24"
-            android:viewportHeight="24"
-            android:tintMode="multiply">
-            <path
-                android:name="path_1"
-                android:pathData="M 0 12 L 24 12"
-                android:fillColor="#000"
-                android:strokeColor="#80d8ff"
-                android:strokeWidth="24"/>
-            <path
-                android:name="path"
-                android:pathData="M 0 12 L 24 12"
-                android:fillColor="#000"
-                android:strokeColor="#0091ea"
-                android:strokeWidth="24"/>
         </vector>
     </aapt:attr>
     <target android:name="path">
         <aapt:attr name="android:animation">
-            <objectAnimator
+            <objectAnimator android:propertyName="trimPathEnd" android:duration="1000" android:valueFrom="0" android:valueTo="1" android:valueType="floatType" android:interpolator="@android:interpolator/fast_out_slow_in"/>
-                android:propertyName="trimPathEnd"
-                android:duration="1000"
-                android:valueFrom="0"
-                android:valueTo="1"
-                android:valueType="floatType"
-                android:interpolator="@android:interpolator/fast_out_slow_in"/>
         </aapt:attr>
     </target>
 </animated-vector>

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

@@ -1,4 +1,3 @@
-<vector android:height="24dp" android:width="24dp"
+<vector android:height="24dp" android:width="24dp" android:viewportHeight="24.0" android:viewportWidth="24.0" xmlns:android="http://schemas.android.com/apk/res/android">
-    android:viewportHeight="24.0" android:viewportWidth="24.0" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="@color/material_orange_500" android:pathData="M12 15.39l-3.76 2.27 0.99-4.28-3.32-2.88 4.38-0.37L12 6.09l1.71 4.04 4.38 0.37-3.32 2.88 0.99 4.28M22 9.24l-7.19-0.61L12 2 9.19 8.63 2 9.24l5.45 4.73L5.82 21 12 17.27 18.18 21l-1.64-7.03L22 9.24z"/>
-    <path android:fillColor="@color/material_orange_500" android:pathData="M 12 15.39 L 8.24 17.66 L 9.23 13.38 L 5.91 10.5 L 10.29 10.13 L 12 6.09 L 13.71 10.13 L 18.09 10.5 L 14.77 13.38 L 15.76 17.66 M 22 9.24 L 14.81 8.63 L 12 2 L 9.19 8.63 L 2 9.24 L 7.45 13.97 L 5.82 21 L 12 17.27 L 18.18 21 L 16.54 13.97 L 22 9.24 Z"/>
 </vector>

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

@@ -1,4 +1,3 @@
-<vector android:height="24dp" android:width="24dp"
+<vector android:height="24dp" android:width="24dp" android:viewportHeight="24.0" android:viewportWidth="24.0" xmlns:android="http://schemas.android.com/apk/res/android">
-    android:viewportHeight="24.0" android:viewportWidth="24.0" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="@color/material_orange_500" android:pathData="M12 17.27L18.18 21l-1.64-7.03L22 9.24l-7.19-0.62L12 2 9.19 8.62 2 9.24l5.45 4.73L5.82 21 12 17.27z"/>
-    <path android:fillColor="@color/material_orange_500" android:pathData="M 12 17.27 L 18.18 21 L 16.54 13.97 L 22 9.24 L 14.81 8.62 L 12 2 L 9.19 8.62 L 2 9.24 L 7.45 13.97 L 5.82 21 L 12 17.27 Z"/>
 </vector>

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

@@ -0,0 +1,30 @@
+<!--
+  ~     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/>.
+  -->
+
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="640"
+    android:viewportHeight="640">
+  <path
+      android:pathData="M640,320C640,496.61 496.61,640 320,640C143.39,640 0,496.61 0,320C0,143.38 143.39,0 320,0C496.61,0 640,143.38 640,320Z"
+      android:fillColor="#4ec1f5"/>
+  <path
+      android:pathData="M420,320C420,375.19 375.19,420 320,420C264.81,420 220,375.19 220,320C220,264.81 264.81,220 320,220C375.19,220 420,264.81 420,320Z"
+      android:fillColor="#1d1d1d"/>
+</vector>

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

@@ -0,0 +1,30 @@
+<!--
+  ~     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/>.
+  -->
+
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="640"
+    android:viewportHeight="640">
+  <path
+      android:pathData="M640,320C640,496.61 496.61,640 320,640C143.39,640 0,496.61 0,320C0,143.38 143.39,0 320,0C496.61,0 640,143.38 640,320Z"
+      android:fillColor="@color/colorAccent"/>
+  <path
+      android:pathData="M420,320C420,375.19 375.19,420 320,420C264.81,420 220,375.19 220,320C220,264.81 264.81,220 320,220C375.19,220 420,264.81 420,320Z"
+      android:fillColor="#1d1d1d"/>
+</vector>

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

@@ -1,8 +1,4 @@
 <!--drawable/image_broken_variant.xml-->
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
+<vector xmlns:android="http://schemas.android.com/apk/res/android" android:height="24dp" android:width="24dp" android:viewportWidth="24" android:viewportHeight="24">
-    android:height="24dp"
+    <path android:fillColor="#000" android:pathData="M21 5v6.59l-3-3.01-4 4.01-4-4-4 4-3-3.01V5a2 2 0 0 1 2-2h14a2 2 0 0 1 2 2m-3 6.42l3 3.01V19a2 2 0 0 1-2 2H5a2 2 0 0 1-2-2v-6.58l3 2.99 4-4 4 4"/>
-    android:width="24dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24">
-    <path android:fillColor="#000" android:pathData="M21,5V11.59L18,8.58L14,12.59L10,8.59L6,12.59L3,9.58V5A2,2 0 0,1 5,3H19A2,2 0 0,1 21,5M18,11.42L21,14.43V19A2,2 0 0,1 19,21H5A2,2 0 0,1 3,19V12.42L6,15.41L10,11.41L14,15.41" />
 </vector>

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

@@ -1,8 +1,4 @@
 <!--drawable/lastpass.xml-->
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
+<vector xmlns:android="http://schemas.android.com/apk/res/android" android:height="24dp" android:width="24dp" android:viewportWidth="24" android:viewportHeight="24">
-    android:height="24dp"
+    <path android:fillColor="#fff" android:pathData="M14 12a2 2 0 0 1 2-2 2 2 0 0 1 2 2 2 2 0 0 1-2 2 2 2 0 0 1-2-2m-6 0a2 2 0 0 1 2-2 2 2 0 0 1 2 2 2 2 0 0 1-2 2 2 2 0 0 1-2-2m-6 0a2 2 0 0 1 2-2 2 2 0 0 1 2 2 2 2 0 0 1-2 2 2 2 0 0 1-2-2m20-7h-2v14h2V5z"/>
-    android:width="24dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24">
-    <path android:fillColor="#fff" android:pathData="M14,12A2,2 0 0,1 16,10A2,2 0 0,1 18,12A2,2 0 0,1 16,14A2,2 0 0,1 14,12M8,12A2,2 0 0,1 10,10A2,2 0 0,1 12,12A2,2 0 0,1 10,14A2,2 0 0,1 8,12M2,12A2,2 0 0,1 4,10A2,2 0 0,1 6,12A2,2 0 0,1 4,14A2,2 0 0,1 2,12M22,5H20V19H22V5Z" />
 </vector>

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

@@ -1,8 +1,4 @@
 <!--drawable/lock_pattern.xml-->
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
+<vector xmlns:android="http://schemas.android.com/apk/res/android" android:height="24dp" android:width="24dp" android:viewportWidth="24" android:viewportHeight="24">
-    android:height="24dp"
+    <path android:fillColor="#fff" android:pathData="M7 3a4 4 0 0 1 4 4c0 1.86-1.27 3.43-3 3.87v2.26c0.37 0.09 0.72 0.24 1.04 0.43l4.52-4.52C13.2 8.44 13 7.75 13 7a4 4 0 0 1 4-4 4 4 0 0 1 4 4 4 4 0 0 1-4 4c-0.74 0-1.43-0.2-2-0.55L10.45 15C10.8 15.57 11 16.26 11 17a4 4 0 0 1-4 4 4 4 0 0 1-4-4c0-1.86 1.27-3.43 3-3.87v-2.26C4.27 10.43 3 8.86 3 7a4 4 0 0 1 4-4m10 10a4 4 0 0 1 4 4 4 4 0 0 1-4 4 4 4 0 0 1-4-4 4 4 0 0 1 4-4m0 2a2 2 0 0 0-2 2 2 2 0 0 0 2 2 2 2 0 0 0 2-2 2 2 0 0 0-2-2z"/>
-    android:width="24dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24">
-    <path android:fillColor="#fff" android:pathData="M7,3A4,4 0 0,1 11,7C11,8.86 9.73,10.43 8,10.87V13.13C8.37,13.22 8.72,13.37 9.04,13.56L13.56,9.04C13.2,8.44 13,7.75 13,7A4,4 0 0,1 17,3A4,4 0 0,1 21,7A4,4 0 0,1 17,11C16.26,11 15.57,10.8 15,10.45L10.45,15C10.8,15.57 11,16.26 11,17A4,4 0 0,1 7,21A4,4 0 0,1 3,17C3,15.14 4.27,13.57 6,13.13V10.87C4.27,10.43 3,8.86 3,7A4,4 0 0,1 7,3M17,13A4,4 0 0,1 21,17A4,4 0 0,1 17,21A4,4 0 0,1 13,17A4,4 0 0,1 17,13M17,15A2,2 0 0,0 15,17A2,2 0 0,0 17,19A2,2 0 0,0 19,17A2,2 0 0,0 17,15Z" />
 </vector>

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

@@ -1,8 +1,4 @@
 <!--drawable/menu.xml-->
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
+<vector xmlns:android="http://schemas.android.com/apk/res/android" android:height="24dp" android:width="24dp" android:viewportWidth="24" android:viewportHeight="24">
-    android:height="24dp"
+    <path android:fillColor="?attr/colorControlNormal" android:pathData="M3 6h18v2H3V6m0 5h18v2H3v-2m0 5h18v2H3v-2z"/>
-    android:width="24dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24">
-    <path android:fillColor="#fff" android:pathData="M3,6H21V8H3V6M3,11H21V13H3V11M3,16H21V18H3V16Z" />
 </vector>

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

@@ -1,8 +1,4 @@
 <!--drawable/numeric.xml-->
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
+<vector xmlns:android="http://schemas.android.com/apk/res/android" android:height="24dp" android:width="24dp" android:viewportWidth="24" android:viewportHeight="24">
-    android:height="24dp"
+    <path android:fillColor="#fff" android:pathData="M4 17V9H2V7h4v10H4m18-2c0 1.11-0.9 2-2 2h-4v-2h4v-2h-2v-2h2V9h-4V7h4a2 2 0 0 1 2 2v1.5a1.5 1.5 0 0 1-1.5 1.5 1.5 1.5 0 0 1 1.5 1.5V15m-8 0v2H8v-4c0-1.11 0.9-2 2-2h2V9H8V7h4a2 2 0 0 1 2 2v2c0 1.11-0.9 2-2 2h-2v2h4z"/>
-    android:width="24dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24">
-    <path android:fillColor="#fff" android:pathData="M4,17V9H2V7H6V17H4M22,15C22,16.11 21.1,17 20,17H16V15H20V13H18V11H20V9H16V7H20A2,2 0 0,1 22,9V10.5A1.5,1.5 0 0,1 20.5,12A1.5,1.5 0 0,1 22,13.5V15M14,15V17H8V13C8,11.89 8.9,11 10,11H12V9H8V7H12A2,2 0 0,1 14,9V11C14,12.11 13.1,13 12,13H10V15H14Z" />
 </vector>

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

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

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

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

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

@@ -1,8 +1,4 @@
 <!--drawable/refresh.xml-->
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
+<vector xmlns:android="http://schemas.android.com/apk/res/android" android:height="24dp" android:width="24dp" android:viewportWidth="24" android:viewportHeight="24">
-    android:height="24dp"
+    <path android:fillColor="#fff" android:pathData="M17.65 6.35C16.2 4.9 14.21 4 12 4a8 8 0 0 0-8 8 8 8 0 0 0 8 8c3.73 0 6.84-2.55 7.73-6h-2.08c-0.82 2.33-3.04 4-5.65 4a6 6 0 0 1-6-6 6 6 0 0 1 6-6c1.66 0 3.14 0.69 4.22 1.78L13 11h7V4l-2.35 2.35z"/>
-    android:width="24dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24">
-    <path android:fillColor="#fff" android:pathData="M17.65,6.35C16.2,4.9 14.21,4 12,4A8,8 0 0,0 4,12A8,8 0 0,0 12,20C15.73,20 18.84,17.45 19.73,14H17.65C16.83,16.33 14.61,18 12,18A6,6 0 0,1 6,12A6,6 0 0,1 12,6C13.66,6 15.14,6.69 16.22,7.78L13,11H20V4L17.65,6.35Z" />
 </vector>

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

@@ -1,8 +1,4 @@
 <!--drawable/shuffle_variant.xml-->
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
+<vector xmlns:android="http://schemas.android.com/apk/res/android" android:height="24dp" android:width="24dp" android:viewportWidth="24" android:viewportHeight="24">
-    android:height="24dp"
+    <path android:fillColor="#fff" android:pathData="M17 3l5.25 4.5L17 12l5.25 4.5L17 21v-3h-2.74l-2.82-2.82 2.12-2.12L15.5 15H17V9h-1.5l-9 9H2v-3h3.26l9-9H17V3M2 6h4.5l2.82 2.82-2.12 2.12L5.26 9H2V6z"/>
-    android:width="24dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24">
-    <path android:fillColor="#fff" android:pathData="M17,3L22.25,7.5L17,12L22.25,16.5L17,21V18H14.26L11.44,15.18L13.56,13.06L15.5,15H17V12L17,9H15.5L6.5,18H2V15H5.26L14.26,6H17V3M2,6H6.5L9.32,8.82L7.2,10.94L5.26,9H2V6Z" />
 </vector>

app/src/main/res/drawable/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/drawable/swap_horizontal.xml

@@ -1,8 +1,4 @@
 <!--drawable/swap_horizontal.xml-->
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
+<vector xmlns:android="http://schemas.android.com/apk/res/android" android:height="24dp" android:width="24dp" android:viewportWidth="24" android:viewportHeight="24">
-    android:height="24dp"
+    <path android:fillColor="?attr/colorControlNormal" android:pathData="M21 9l-4-4v3h-7v2h7v3M7 11l-4 4 4 4v-3h7v-2H7v-3z"/>
-    android:width="24dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24">
-    <path android:fillColor="?attr/colorControlNormal" android:pathData="M21,9L17,5V8H10V10H17V13M7,11L3,15L7,19V16H14V14H7V11Z" />
 </vector>

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

@@ -1,8 +1,4 @@
 <!--drawable/tag.xml-->
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
+<vector xmlns:android="http://schemas.android.com/apk/res/android" android:height="24dp" android:width="24dp" android:viewportWidth="24" android:viewportHeight="24">
-    android:height="24dp"
+    <path android:fillColor="?attr/colorControlNormal" android:pathData="M5.5 7A1.5 1.5 0 0 1 4 5.5 1.5 1.5 0 0 1 5.5 4 1.5 1.5 0 0 1 7 5.5 1.5 1.5 0 0 1 5.5 7m15.91 4.58l-9-9C12.05 2.22 11.55 2 11 2H4C2.89 2 2 2.89 2 4v7c0 0.55 0.22 1.05 0.59 1.41l8.99 9C11.95 21.77 12.45 22 13 22c0.55 0 1.05-0.23 1.41-0.59l7-7C21.78 14.05 22 13.55 22 13c0-0.56-0.23-1.06-0.59-1.42z"/>
-    android:width="24dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24">
-    <path android:fillColor="?attr/colorControlNormal" android:pathData="M5.5,7A1.5,1.5 0 0,1 4,5.5A1.5,1.5 0 0,1 5.5,4A1.5,1.5 0 0,1 7,5.5A1.5,1.5 0 0,1 5.5,7M21.41,11.58L12.41,2.58C12.05,2.22 11.55,2 11,2H4C2.89,2 2,2.89 2,4V11C2,11.55 2.22,12.05 2.59,12.41L11.58,21.41C11.95,21.77 12.45,22 13,22C13.55,22 14.05,21.77 14.41,21.41L21.41,14.41C21.78,14.05 22,13.55 22,13C22,12.44 21.77,11.94 21.41,11.58Z" />
 </vector>

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

@@ -1,34 +1,5 @@
-<?xml version="1.0" encoding="utf-8"?>
+<!--~ Pupil, Hitomi.la viewer for Android ~ Copyright (C) 2020 tom5079 ~ ~ This program is free software: you can redistribute it and/or modify ~ it under the terms of the GNU General Public License as published by ~ the Free Software Foundation, either version 3 of the License, or ~ (at your option) any later version. ~ ~ This program is distributed in the hope that it will be useful, ~ but WITHOUT ANY WARRANTY; without even the implied warranty of ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ~ GNU General Public License for more details. ~ ~ You should have received a copy of the GNU General Public License ~ along with this program. If not, see <http://www.gnu.org/licenses/>.-->
-<!--
+<vector xmlns:android="http://schemas.android.com/apk/res/android" android:width="24dp" android:height="72dp" android:viewportWidth="64" android:viewportHeight="192">
-  ~     Pupil, Hitomi.la viewer for Android
+    <path android:pathData="M36 0h1l1 1h3l1 1h1l1 1h2l1 1h1l1 1h1l1 1 1 1 1 1 1 1h1v1l1 1 1 1 1 1v1l1 1 1 1v1l1 1v2l1 1v1l1 1v3l1 1v138l-1 1v3l-1 1v1l-1 1v2l-1 1v1l-1 1v1l-1 1-1 1-1 1-1 1v1h-1l-1 1-1 1-1 1-1 1h-1l-1 1h-1l-1 1h-2l-1 1h-1l-1 1h-3l-1 1H27l-1-1h-3l-1-1h-1l-1-1h-2l-1-1h-1l-1-1h-1l-1-1-1-1-1-1-1-1H9v-1l-1-1-1-1-1-1v-1l-1-1-1-1v-1l-1-1v-2l-1-1v-1l-1-1v-3l-1-1V27l1-1v-3l1-1v-1l1-1v-2l1-1v-1l1-1v-1l1-1 1-1 1-1 1-1V9h1l1-1 1-1 1-1 1-1h1l1-1h1l1-1h2l1-1h1l1-1h3l1-1h9z" android:fillColor="#4fc3f7"/>
-  ~     Copyright (C) 2020  tom5079
+    <path android:fillColor="#FF000000" android:pathData="M42 80L32 70 22 80m20 32l-10 10-10-10" android:strokeWidth="2" android:fillAlpha="0" android:strokeColor="#000"/>
-  ~
+</vector>
-  ~     This program is free software: you can redistribute it and/or modify
-  ~     it under the terms of the GNU General Public License as published by
-  ~     the Free Software Foundation, either version 3 of the License, or
-  ~     (at your option) any later version.
-  ~
-  ~     This program is distributed in the hope that it will be useful,
-  ~     but WITHOUT ANY WARRANTY; without even the implied warranty of
-  ~     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  ~     GNU General Public License for more details.
-  ~
-  ~     You should have received a copy of the GNU General Public License
-  ~     along with this program.  If not, see <http://www.gnu.org/licenses/>.
-  -->
-
-<shape xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shape="rectangle">
-
-    <corners
-        android:topLeftRadius="44dp"
-        android:topRightRadius="44dp"
-        android:bottomLeftRadius="44dp" />
-
-    <padding
-        android:paddingLeft="22dp"
-        android:paddingRight="22dp" />
-
-    <solid android:color="@color/colorPrimary" />
-
-</shape>

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

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

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

@@ -0,0 +1,5 @@
+<!--~ 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/>.-->
+<vector xmlns:android="http://schemas.android.com/apk/res/android" android:width="72dp" android:height="24dp" android:viewportWidth="192" android:viewportHeight="64">
+    <path android:pathData="M29 64h-2l-1-1h-3l-1-1h-1l-1-1h-2l-1-1h-1l-1-1h-1l-1-1-1-1-1-1-1-1H9v-1l-1-1-1-1-1-1-1-1v-1l-1-1v-1l-1-1v-2l-1-1v-1l-1-1v-3l-1-1V27l1-1v-3l1-1v-1l1-1v-2l1-1v-1l1-1v-1l1-1 1-1 1-1 1-1V9h1l1-1 1-1 1-1 1-1h1l1-1h1l1-1h2l1-1h1l1-1h3l1-1h138l1 1h3l1 1h1l1 1h2l1 1h1l1 1h1l1 1 1 1 1 1 1 1h1v1l1 1 1 1 1 1 1 1v1l1 1v1l1 1v2l1 1v1l1 1v3l1 1v10l-1 1v3l-1 1v1l-1 1v2l-1 1v1l-1 1v1l-1 1-1 1-1 1-1 1v1h-1l-1 1-1 1-1 1-1 1h-1l-1 1h-1l-1 1h-2l-1 1h-1l-1 1h-3l-1 1H29z" android:fillColor="#4fc3f7"/>
+    <path android:fillColor="#FF000000" android:pathData="M80 42L70 32l10-10m32 20l10-10-10-10" android:strokeWidth="2" android:fillAlpha="0" android:strokeColor="#000"/>
+</vector>

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

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

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

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

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

@@ -1,8 +1,4 @@
 <!--drawable/translate.xml-->
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
+<vector xmlns:android="http://schemas.android.com/apk/res/android" android:height="24dp" android:width="24dp" android:viewportWidth="24" android:viewportHeight="24">
-    android:height="24dp"
+    <path android:fillColor="?attr/colorControlNormal" android:pathData="M12.87 15.07l-2.54-2.51 0.03-0.03c1.74-1.94 2.98-4.17 3.71-6.53H17V4h-7V2H8v2H1v2h11.17C11.5 7.92 10.44 9.75 9 11.35 8.07 10.32 7.3 9.19 6.69 8h-2c0.73 1.63 1.73 3.17 2.98 4.56l-5.09 5.02L4 19l5-5 3.11 3.11 0.76-2.04M18.5 10h-2L12 22h2l1.12-3h4.75L21 22h2l-4.5-12m-2.62 7l1.62-4.33L19.12 17h-3.24z"/>
-    android:width="24dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24">
-    <path android:fillColor="?attr/colorControlNormal" android:pathData="M12.87,15.07L10.33,12.56L10.36,12.53C12.1,10.59 13.34,8.36 14.07,6H17V4H10V2H8V4H1V6H12.17C11.5,7.92 10.44,9.75 9,11.35C8.07,10.32 7.3,9.19 6.69,8H4.69C5.42,9.63 6.42,11.17 7.67,12.56L2.58,17.58L4,19L9,14L12.11,17.11L12.87,15.07M18.5,10H16.5L12,22H14L15.12,19H19.87L21,22H23L18.5,10M15.88,17L17.5,12.67L19.12,17H15.88Z" />
 </vector>

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

@@ -1,146 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-  ~     Pupil, Hitomi.la viewer for Android
-  ~     Copyright (C) 2020  tom5079
-  ~
-  ~     This program is free software: you can redistribute it and/or modify
-  ~     it under the terms of the GNU General Public License as published by
-  ~     the Free Software Foundation, either version 3 of the License, or
-  ~     (at your option) any later version.
-  ~
-  ~     This program is distributed in the hope that it will be useful,
-  ~     but WITHOUT ANY WARRANTY; without even the implied warranty of
-  ~     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  ~     GNU General Public License for more details.
-  ~
-  ~     You should have received a copy of the GNU General Public License
-  ~     along with this program.  If not, see <http://www.gnu.org/licenses/>.
-  -->
-
-<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:handleHeight="100dp"
-            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"/>
 
@@ -66,9 +66,15 @@
         <com.qtalk.recyclerviewfastscroller.RecyclerViewFastScroller
             android:layout_width="match_parent"
             android:layout_height="match_parent"
-            app:handleHeight="100dp"
+            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">
+            app:popupDrawable="@android:color/transparent">
 
             <androidx.recyclerview.widget.RecyclerView
                 android:id="@+id/main_recyclerview"
@@ -120,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:searchBarMarginLeft="6dp"
-        app:floatingSearch_searchBarMarginLeft="8dp"
+        app:searchBarMarginRight="6dp"
-        app:floatingSearch_searchBarMarginRight="8dp"
+        app:searchBarMarginTop="6dp"
-        app:floatingSearch_searchBarMarginTop="8dp"
+        app:searchHint="@string/search_hint"
-        app:floatingSearch_searchHint="@string/search_hint"
+        app:suggestionAnimDuration="250"
-        app:floatingSearch_suggestionsListAnimDuration="250"
+        app:showSearchKey="true"
-        app:floatingSearch_showSearchKey="true"
+        app:leftActionMode="showHamburger"
-        app:floatingSearch_leftActionMode="showHamburger"
+        app:menu="@menu/main"
-        app:floatingSearch_menu="@menu/main"
+        app:dismissOnOutsideTouch="true"
-        app:floatingSearch_dismissOnOutsideTouch="true"
+        app:close_search_on_keyboard_dismiss="false"
-        app:floatingSearch_close_search_on_keyboard_dismiss="true"
         tools:ignore="NewApi" />
 
 </RelativeLayout>

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

@@ -23,15 +23,21 @@
     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
+        android:id="@+id/scroller"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        app:handleHeight="100dp"
+        app:handleDrawable="@drawable/thumb"
+        app:handleHeight="72dp"
+        app:handleWidth="24dp"
+        app:disableTrack="true"
+        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"
@@ -41,28 +47,19 @@
 
     </com.qtalk.recyclerviewfastscroller.RecyclerViewFastScroller>
 
-    <LinearLayout
+    <include layout="@layout/reader_eye_card"
-        android:layout_width="match_parent"
+        android:id="@+id/eye_card"
+        android:visibility="gone"
         android:layout_height="wrap_content"
-        android:orientation="vertical">
+        android:layout_width="wrap_content"
+        android:layout_gravity="center_horizontal"
+        android:layout_margin="8dp"/>
 
     <ProgressBar
         android:id="@+id/reader_download_progressbar"
         style="@style/Widget.AppCompat.ProgressBar.Horizontal"
         android:layout_width="match_parent"
-            android:layout_height="4dp"
+        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>
     
     <com.github.clans.fab.FloatingActionMenu
         android:id="@+id/reader_fab"
@@ -76,6 +73,7 @@
             android:id="@+id/reader_fab_download"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
+            app:srcCompat="@drawable/ic_download"
             app:fab_label="@string/reader_fab_download"
             app:fab_size="mini"/>
 
@@ -83,6 +81,7 @@
             android:id="@+id/reader_fab_retry"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
+            app:srcCompat="@drawable/refresh"
             app:fab_label="@string/reader_fab_retry"
             app:fab_size="mini"/>
 
@@ -90,6 +89,7 @@
             android:id="@+id/reader_fab_auto"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
+            app:srcCompat="@drawable/eye_white"
             app:fab_label="@string/reader_fab_auto"
             app:fab_size="mini"/>
 
@@ -97,6 +97,7 @@
             android:id="@+id/reader_fab_fullscreen"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
+            app:srcCompat="@drawable/ic_fullscreen"
             app:fab_label="@string/reader_fab_fullscreen"
             app:fab_size="mini"/>
 

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

@@ -25,7 +25,8 @@
 	android:layout_height="wrap_content"
 	android:layout_margin="8dp"
 	app:cardCornerRadius="8dp"
-	android:clipChildren="true">
+	android:clipChildren="true"
+	tools:ignore="RtlHardcoded">
 
 	<com.daimajia.swipe.SwipeLayout
 		android:id="@+id/galleryblock_swipe_layout"
@@ -48,7 +49,7 @@
 				android:background="@android:color/holo_blue_dark"
 				android:textColor="@android:color/white"
 				android:text="@string/main_download"
-				android:foreground="?attr/selectableItemBackground"
+				android:foreground="?android:attr/selectableItemBackground"
 				android:focusable="true"
 				android:clickable="true"
 				tools:ignore="UnusedAttribute" />
@@ -63,34 +64,37 @@
 				android:background="@android:color/holo_red_dark"
 				android:textColor="@android:color/white"
 				android:text="@string/main_delete"
-				android:foreground="?attr/selectableItemBackground"
+				android:foreground="?android:attr/selectableItemBackground"
 				android:focusable="true"
 				android:clickable="true"
 				tools:ignore="UnusedAttribute" />
 
 		</LinearLayout>
 
-		<LinearLayout
+		<androidx.constraintlayout.widget.ConstraintLayout
 			android:id="@+id/galleryblock_primary"
 			android:layout_width="match_parent"
 			android:layout_height="wrap_content"
-			android:orientation="vertical"
+			android:background="?android:attr/selectableItemBackground"
-			android:foreground="?attr/selectableItemBackground"
 			android:focusable="true"
-			android:clickable="true"
+			android:clickable="true">
-			tools:ignore="UnusedAttribute">
 
-			<androidx.constraintlayout.widget.ConstraintLayout
+			<FrameLayout
-				android:layout_width="match_parent"
+				android:id="@+id/galleryblock_progressbar_layout"
-				android:layout_height="wrap_content">
-
-				<ProgressBar
-					style="@style/Widget.AppCompat.ProgressBar.Horizontal"
-					android:id="@+id/galleryblock_progressbar"
 				android:layout_width="match_parent"
 				android:layout_height="4dp"
 				android:visibility="gone"
-					app:layout_constraintTop_toTopOf="parent"/>
+				app:layout_constraintTop_toTopOf="parent">
+
+				<androidx.core.widget.ContentLoadingProgressBar
+					style="?android:attr/progressBarStyleHorizontal"
+					android:id="@+id/galleryblock_progressbar"
+					android:layout_width="match_parent"
+					android:layout_height="wrap_content"
+					android:layout_marginBottom="-4dp"
+					android:layout_marginTop="-4dp"
+					android:progress="50"
+					android:layout_gravity="center_vertical"/>
 
 				<ImageView
 					android:id="@+id/galleryblock_progress_complete"
@@ -101,15 +105,17 @@
 					android:contentDescription="@string/reader_imageview_description"
 					app:layout_constraintTop_toTopOf="parent"/>
 
-				<ImageView
+			</FrameLayout>
+
+			<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"
-					app:layout_constraintTop_toBottomOf="@id/galleryblock_progressbar"
+				app:layout_constraintTop_toBottomOf="@id/galleryblock_progressbar_layout"
-					app:layout_constraintBottom_toBottomOf="parent"/>
+				app:layout_constraintBottom_toBottomOf="@id/barrier"/>
 
 			<TextView
 				style="@style/TextAppearance.AppCompat.Headline"
@@ -117,18 +123,16 @@
 				android:layout_width="0dp"
 				android:layout_height="wrap_content"
 				android:layout_marginTop="8dp"
-					android:layout_marginStart="8dp"
 				android:layout_marginLeft="8dp"
 				app:layout_constraintLeft_toRightOf="@id/galleryblock_thumbnail"
 				app:layout_constraintRight_toRightOf="parent"
-					app:layout_constraintTop_toTopOf="parent"/>
+				app:layout_constraintTop_toBottomOf="@id/galleryblock_progressbar_layout"/>
 
 			<TextView
 				style="@style/TextAppearance.AppCompat.Medium"
 				android:id="@+id/galleryblock_artist"
 				android:layout_width="0dp"
 				android:layout_height="wrap_content"
-					android:layout_marginStart="8dp"
 				android:layout_marginLeft="8dp"
 				app:layout_constraintLeft_toRightOf="@id/galleryblock_thumbnail"
 				app:layout_constraintRight_toRightOf="parent"
@@ -138,101 +142,98 @@
 				android:id="@+id/galleryblock_series"
 				android:layout_width="0dp"
 				android:layout_height="wrap_content"
-					android:layout_marginStart="8dp"
 				android:layout_marginLeft="8dp"
 				app:layout_constraintTop_toBottomOf="@id/galleryblock_artist"
-					app:layout_constraintStart_toEndOf="@id/galleryblock_thumbnail"
+				app:layout_constraintLeft_toRightOf="@id/galleryblock_thumbnail"
-					app:layout_constraintEnd_toEndOf="parent"/>
+				app:layout_constraintRight_toRightOf="parent"/>
 
 			<TextView
 				android:id="@+id/galleryblock_type"
 				android:layout_width="wrap_content"
 				android:layout_height="wrap_content"
-					android:layout_marginStart="8dp"
 				android:layout_marginLeft="8dp"
 				app:layout_constraintTop_toBottomOf="@id/galleryblock_series"
-					app:layout_constraintStart_toEndOf="@id/galleryblock_thumbnail" />
+				app:layout_constraintLeft_toRightOf="@id/galleryblock_thumbnail" />
 
 			<TextView
 				android:id="@+id/galleryblock_language"
 				android:layout_width="wrap_content"
 				android:layout_height="wrap_content"
-					android:layout_marginStart="8dp"
 				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" />
-					app:layout_constraintStart_toEndOf="@id/galleryblock_thumbnail" />
 
-				<View
+			<androidx.constraintlayout.widget.Barrier
-					android:id="@+id/galleryblock_padding"
+				android:id="@+id/padding"
-					android:layout_width="0dp"
+				android:layout_width="wrap_content"
-					android:layout_height="0dp"
+				android:layout_height="wrap_content"
-					app:layout_constraintEnd_toEndOf="parent"
+				app:barrierDirection="bottom"
-					app:layout_constraintTop_toBottomOf="@id/galleryblock_language"
+				app:constraint_referenced_ids="galleryblock_language"/>
-					app:layout_constraintBottom_toTopOf="@id/galleryblock_tag_group"/>
 
 			<com.google.android.material.chip.ChipGroup
 				android:id="@+id/galleryblock_tag_group"
 				android:layout_width="0dp"
 				android:layout_height="wrap_content"
 				android:layout_marginLeft="8dp"
-					android:layout_marginStart="8dp"
 				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"
+				app:layout_constraintRight_toRightOf="parent"/>
-					app:layout_constraintBottom_toBottomOf="parent"/>
 
-			</androidx.constraintlayout.widget.ConstraintLayout>
+			<androidx.constraintlayout.widget.Barrier
+				android:id="@+id/barrier"
+				android:layout_width="wrap_content"
+				android:layout_height="wrap_content"
+				app:barrierDirection="bottom"
+				app:constraint_referenced_ids="galleryblock_tag_group"/>
 
 			<View
+				android:id="@+id/divider"
 				android:layout_width="match_parent"
 				android:layout_height="1dp"
-				android:layout_margin="8dp"
+				android:background="?android:attr/listDivider"
-				android:background="@android:color/darker_gray"/>
+				app:layout_constraintTop_toBottomOf="@id/barrier"
-
+				android:layout_margin="8dp"/>
-			<LinearLayout
-				android:layout_width="match_parent"
-				android:layout_height="wrap_content"
-				android:paddingLeft="8dp"
-				android:paddingRight="8dp"
-				android:paddingBottom="8dp"
-				android:orientation="horizontal"
-				android:gravity="center_vertical">
 
 			<TextView
 				android:id="@+id/galleryblock_id"
 				android:layout_width="wrap_content"
-					android:layout_height="wrap_content"/>
+				android:layout_height="wrap_content"
-
+				android:layout_marginLeft="8dp"
-				<View
+				android:layout_marginTop="8dp"
-					android:layout_width="0dp"
+				android:layout_marginBottom="8dp"
-					android:layout_height="1dp"
+				app:layout_constraintTop_toBottomOf="@id/divider"
-					android:layout_weight="1"/>
+				app:layout_constraintBottom_toBottomOf="parent"
+				app:layout_constraintLeft_toLeftOf="parent"/>
 
 			<TextView
 				android:id="@+id/galleryblock_pagecount"
 				android:layout_width="wrap_content"
-					android:layout_height="wrap_content"/>
+				android:layout_height="wrap_content"
-
+				android:layout_marginTop="8dp"
-				<View
+				android:layout_marginBottom="8dp"
-					android:layout_width="0dp"
+				app:layout_constraintTop_toBottomOf="@id/divider"
-					android:layout_height="1dp"
+				app:layout_constraintBottom_toBottomOf="parent"
-					android:layout_weight="1"/>
+				app:layout_constraintLeft_toRightOf="parent"
+				app:layout_constraintRight_toLeftOf="parent" />
 
 			<ImageView
 				android:id="@+id/galleryblock_favorite"
 				android:contentDescription="@string/app_name"
 				android:layout_width="32dp"
 				android:layout_height="32dp"
-					app:srcCompat="@drawable/ic_star_empty"/>
+				android:layout_marginRight="8dp"
+				android:layout_marginTop="8dp"
+				android:layout_marginBottom="8dp"
+				app:srcCompat="@drawable/ic_star_empty"
+				app:layout_constraintTop_toBottomOf="@id/divider"
+				app:layout_constraintBottom_toBottomOf="parent"
+				app:layout_constraintRight_toRightOf="parent" />
 
-			</LinearLayout>
+		</androidx.constraintlayout.widget.ConstraintLayout>
-
-		</LinearLayout>
 
 	</com.daimajia.swipe.SwipeLayout>
 

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

@@ -42,7 +42,6 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         app:srcCompat="@drawable/menu"
-        app:tint="?attr/colorControlNormal"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintTop_toTopOf="parent"
         app:layout_constraintBottom_toBottomOf="parent"