Merge pull request #93 from tom5079/dev

Version 4.18.1

.gitignore

@@ -16,4 +16,4 @@
 /gh-pages
 
 #Private files
-/app/google-services.json
+**/google-services.json

.idea/codeStyles/Project.xml

@@ -1,5 +1,6 @@
 <component name="ProjectCodeStyleConfiguration">
   <code_scheme name="Project" version="173">
+    <option name="RIGHT_MARGIN" value="120" />
     <JetCodeStyleSettings>
       <option name="CODE_STYLE_DEFAULTS" value="KOTLIN_OFFICIAL" />
     </JetCodeStyleSettings>
@@ -14,6 +15,7 @@
               <match>
                 <AND>
                   <NAME>xmlns:android</NAME>
+                  <XML_ATTRIBUTE />
                   <XML_NAMESPACE>^$</XML_NAMESPACE>
                 </AND>
               </match>
@@ -24,6 +26,7 @@
               <match>
                 <AND>
                   <NAME>xmlns:.*</NAME>
+                  <XML_ATTRIBUTE />
                   <XML_NAMESPACE>^$</XML_NAMESPACE>
                 </AND>
               </match>
@@ -35,6 +38,7 @@
               <match>
                 <AND>
                   <NAME>.*:id</NAME>
+                  <XML_ATTRIBUTE />
                   <XML_NAMESPACE>http://schemas.android.com/apk/res/android</XML_NAMESPACE>
                 </AND>
               </match>
@@ -45,6 +49,7 @@
               <match>
                 <AND>
                   <NAME>.*:name</NAME>
+                  <XML_ATTRIBUTE />
                   <XML_NAMESPACE>http://schemas.android.com/apk/res/android</XML_NAMESPACE>
                 </AND>
               </match>
@@ -55,6 +60,7 @@
               <match>
                 <AND>
                   <NAME>name</NAME>
+                  <XML_ATTRIBUTE />
                   <XML_NAMESPACE>^$</XML_NAMESPACE>
                 </AND>
               </match>
@@ -65,6 +71,7 @@
               <match>
                 <AND>
                   <NAME>style</NAME>
+                  <XML_ATTRIBUTE />
                   <XML_NAMESPACE>^$</XML_NAMESPACE>
                 </AND>
               </match>
@@ -75,6 +82,7 @@
               <match>
                 <AND>
                   <NAME>.*</NAME>
+                  <XML_ATTRIBUTE />
                   <XML_NAMESPACE>^$</XML_NAMESPACE>
                 </AND>
               </match>
@@ -86,6 +94,7 @@
               <match>
                 <AND>
                   <NAME>.*</NAME>
+                  <XML_ATTRIBUTE />
                   <XML_NAMESPACE>http://schemas.android.com/apk/res/android</XML_NAMESPACE>
                 </AND>
               </match>
@@ -97,6 +106,7 @@
               <match>
                 <AND>
                   <NAME>.*</NAME>
+                  <XML_ATTRIBUTE />
                   <XML_NAMESPACE>.*</XML_NAMESPACE>
                 </AND>
               </match>

.idea/gradle.xml

@@ -1,8 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
+  <component name="GradleMigrationSettings" migrationVersion="1" />
   <component name="GradleSettings">
     <option name="linkedExternalProjectsSettings">
       <GradleProjectSettings>
+        <option name="testRunner" value="PLATFORM" />
         <option name="distributionType" value="DEFAULT_WRAPPED" />
         <option name="externalProjectPath" value="$PROJECT_DIR$" />
         <option name="modules">

.idea/kotlinCodeInsightSettings.xml

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="KotlinCodeInsightWorkspaceSettings">
+    <option name="addUnambiguousImportsOnTheFly" value="true" />
+    <option name="optimizeImportsOnTheFly" value="true" />
+  </component>
+</project>

.idea/kotlinc.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="Kotlin2JvmCompilerArguments">
+    <option name="jvmTarget" value="1.8" />
+  </component>
+</project>

README.md

@@ -1,2 +1,30 @@
 # Pupil
-Hitomi.la viewer for Android
+
+![Banner](https://github.com/tom5079/Pupil/blob/gh-pages/assets/images/pupil-banner.png?raw=true)
+*Pupil, Hitomi.la viewer for Android*  
+
+[![](https://discordapp.com/api/guilds/610452916612104194/embed.png?style=banner2)](https://discord.gg/Stj4b5v)  
+I can speak English, Japanese and Korean. If you have any questions, head over to my discord server or DM me!
+
+# Screenshot
+![Main Screen](https://github.com/tom5079/Pupil/blob/gh-pages/assets/images/main-screenshot.png?raw=true)
+*Main Screen*
+
+![Reader Screen](https://github.com/tom5079/Pupil/blob/gh-pages/assets/images/reader-screenshot.png?raw=true)
+*Reader Screen*
+
+Images are censored to be SFW
+
+# Installation
+
+Go [Releases page](https://github.com/tom5079/Pupil/releases) and get latest version or  
+Visit [github page](https://tom5079.github.io/Pupil/) (only available in Korean)  
+or Build app yourself  
+
+# Manual
+
+[Manual](https://tom5079.github.io/Pupil/2019/06/06/manual-kr.html) is only available in Korean. Consider using translator.
+
+# Contribution
+
+Any kind of contribution is appriciated. Feel free to leave PR! 

app/build.gradle

@@ -3,9 +3,15 @@ apply plugin: 'kotlin-android'
 apply plugin: 'kotlin-kapt'
 apply plugin: 'kotlin-android-extensions'
 apply plugin: 'kotlinx-serialization'
-apply plugin: 'com.google.gms.google-services'
-apply plugin: 'io.fabric'
-apply plugin: 'com.google.firebase.firebase-perf'
+
+if (file("google-services.json").exists() && file("src/debug/google-services.json").exists()) {
+    logger.lifecycle("Firebase Enabled")
+    apply plugin: 'com.google.gms.google-services'
+    apply plugin: 'com.google.firebase.crashlytics'
+    apply plugin: 'com.google.firebase.firebase-perf'
+} else {
+    logger.lifecycle("Firebase Disabled")
+}
 
 android {
     compileSdkVersion 29
@@ -13,20 +19,24 @@ android {
         applicationId "xyz.quaver.pupil"
         minSdkVersion 16
         targetSdkVersion 29
-        versionCode 27
-        versionName "3.2-beta2"
+        versionCode 54
+        versionName "4.18.1"
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         multiDexEnabled true
         vectorDrawables.useSupportLibrary = true
     }
     buildTypes {
-        release {
-            minifyEnabled false
+        debug {
+            debuggable true
+            applicationIdSuffix ".debug"
+            versionNameSuffix "-DEBUG"
+
+            buildConfigField('Boolean', 'CENSOR', 'false')
             proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
         }
-        buildTypes.each {
-            it.buildConfigField('boolean', 'PRERELEASE', 'true')
-            it.buildConfigField('boolean', 'CENSOR', 'false')
+        release {
+            buildConfigField('Boolean', 'CENSOR', 'false')
+            proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
         }
     }
     kotlinOptions {
@@ -36,41 +46,43 @@ android {
         sourceCompatibility JavaVersion.VERSION_1_8
         targetCompatibility JavaVersion.VERSION_1_8
     }
+    buildToolsVersion = '29.0.3'
 }
 
 dependencies {
-    def markwonVersion = "3.0.1"
+    def markwonVersion = '3.1.0'
 
-    implementation fileTree(dir: 'libs', include: ['*.jar'])
+    implementation fileTree(dir: 'libs', include: ['*.jar', '*.aar'])
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version"
-    implementation "org.jetbrains.kotlin:kotlin-reflect:$kotlin_version"
-    implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-core:1.2.1'
-    implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-android:1.2.1'
-    implementation "org.jetbrains.kotlinx:kotlinx-serialization-runtime:0.11.0"
-    implementation 'androidx.appcompat:appcompat:1.0.2'
-    implementation 'androidx.constraintlayout:constraintlayout:1.1.3'
-    implementation 'androidx.preference:preference:1.1.0-rc01'
+    implementation "org.jetbrains.kotlinx:kotlinx-coroutines-core:1.3.7"
+    implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:1.3.7"
+    implementation "org.jetbrains.kotlinx:kotlinx-serialization-runtime:0.20.0"
+    implementation 'androidx.appcompat:appcompat:1.1.0'
     implementation 'androidx.constraintlayout:constraintlayout:1.1.3'
+    implementation 'androidx.preference:preference:1.1.1'
     implementation 'androidx.gridlayout:gridlayout:1.0.0'
-    implementation 'androidx.lifecycle:lifecycle-extensions:2.0.0'
-    implementation 'androidx.lifecycle:lifecycle-viewmodel-ktx:2.0.0'
-    implementation 'androidx.legacy:legacy-support-v4:1.0.0'
-    implementation 'com.android.support:multidex:1.0.3'
-    implementation 'com.google.android.material:material:1.1.0-alpha09'
-    implementation 'com.google.firebase:firebase-core:17.1.0'
-    implementation 'com.google.firebase:firebase-perf:19.0.0'
-    implementation 'com.crashlytics.sdk.android:crashlytics:2.10.1'
+    implementation "androidx.biometric:biometric:1.0.1"
+    implementation 'androidx.multidex:multidex:2.0.1'
+    implementation "com.daimajia.swipelayout:library:1.2.0@aar"
+    implementation 'com.google.android.material:material:1.3.0-alpha01'
+    implementation 'com.google.firebase:firebase-core:17.4.3'
+    implementation 'com.google.firebase:firebase-analytics:17.4.3'
+    implementation 'com.google.firebase:firebase-crashlytics:17.1.0'
+    implementation 'com.google.firebase:firebase-perf:19.0.7'
     implementation 'com.github.arimorty:floatingsearchview:2.1.1'
     implementation 'com.github.clans:fab:1.6.4'
-    implementation 'com.github.bumptech.glide:glide:4.9.0'
-    implementation ("com.github.bumptech.glide:recyclerview-integration:4.9.0") {
+    implementation 'com.github.bumptech.glide:glide:4.11.0'
+    annotationProcessor 'com.github.bumptech.glide:compiler:4.11.0'
+    kapt 'com.github.bumptech.glide:compiler:4.11.0'
+    implementation ("com.github.bumptech.glide:recyclerview-integration:4.11.0") {
         transitive = false
     }
+    implementation '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.jsibbold:zoomage:1.3.0'
+    //implementation 'com.andrognito.pinlockview:pinlockview:2.1.0'
     implementation "ru.noties.markwon:core:${markwonVersion}"
-    kapt 'com.github.bumptech.glide:compiler:4.9.0'
-    testImplementation 'junit:junit:4.12'
+    testImplementation 'junit:junit:4.13'
     androidTestImplementation 'androidx.test.ext:junit:1.1.1'
     androidTestImplementation 'androidx.test:rules:1.2.0'
     androidTestImplementation 'androidx.test:runner:1.2.0'

app/proguard-rules.pro

@@ -18,4 +18,21 @@
 
 # If you keep the line number information, uncomment this to
 # hide the original source file name.
-#-renamesourcefileattribute SourceFile
+#-renamesourcefileattribute SourceFile
+
+-dontobfuscate
+
+-keep public class * implements com.bumptech.glide.module.GlideModule
+-keep class * extends com.bumptech.glide.module.AppGlideModule {
+ <init>(...);
+}
+-keep public enum com.bumptech.glide.load.ImageHeaderParser$** {
+  **[] $VALUES;
+  public *;
+}
+-keep class com.bumptech.glide.load.data.ParcelFileDescriptorRewinder$InternalRewinder {
+  *** rewind();
+}
+
+-keep public class * extends com.bumptech.glide.module.AppGlideModule
+-keep class com.bumptech.glide.GeneratedAppGlideModuleImpl

app/release/output.json

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

app/src/androidTest/java/xyz/quaver/pupil/ExampleInstrumentedTest.kt

@@ -20,20 +20,22 @@
 
 package xyz.quaver.pupil
 
-import android.content.Intent
 import android.util.Log
+import androidx.core.content.ContextCompat
 import androidx.test.ext.junit.runners.AndroidJUnit4
 import androidx.test.platform.app.InstrumentationRegistry
 import androidx.test.rule.ActivityTestRule
-import org.junit.Assert.assertEquals
-import org.junit.Rule
+import kotlinx.coroutines.runBlocking
 import org.junit.Test
 import org.junit.runner.RunWith
-import xyz.quaver.hitomi.fetchNozomi
+import xyz.quaver.hitomi.getGalleryIDsFromNozomi
 import xyz.quaver.hiyobi.cookie
+import xyz.quaver.hiyobi.createImgList
 import xyz.quaver.hiyobi.getReader
 import xyz.quaver.hiyobi.user_agent
 import xyz.quaver.pupil.ui.LockActivity
+import xyz.quaver.pupil.util.download.Cache
+import xyz.quaver.pupil.util.download.DownloadWorker
 import java.net.URL
 import javax.net.ssl.HttpsURLConnection
 
@@ -49,9 +51,6 @@ class ExampleInstrumentedTest {
     fun useAppContext() {
         // Context of the app under test.
         val appContext = InstrumentationRegistry.getInstrumentation().targetContext
-        assertEquals("xyz.quaver.pupil", appContext.packageName)
-
-        Log.d("Pupil", fetchNozomi().first.size.toString())
     }
 
     @Test
@@ -59,18 +58,25 @@ class ExampleInstrumentedTest {
         val activityTestRule = ActivityTestRule(LockActivity::class.java)
         val appContext = InstrumentationRegistry.getInstrumentation().targetContext
 
-        activityTestRule.launchActivity(Intent())
+        ContextCompat.getExternalFilesDirs(appContext, null).forEachIndexed { index, file ->
+            Log.i("PUPILD", "$index: ${file?.absolutePath}")
+        }
+    }
 
-        while(true);
+    @Test
+    fun test_nozomi() {
+        val nozomi = getGalleryIDsFromNozomi(null, "index", "all")
+
+        Log.i("PUPILD", nozomi.size.toString())
     }
 
     @Test
     fun test_doSearch() {
-        val reader = getReader(1426382)
+        val reader = getReader( 1426382)
 
         val data: ByteArray
 
-        with(URL(reader.readerItems[0].url).openConnection() as HttpsURLConnection) {
+        with(URL(createImgList(1426382, reader)[0].path).openConnection() as HttpsURLConnection) {
             setRequestProperty("User-Agent", user_agent)
             setRequestProperty("Cookie", cookie)
 
@@ -79,4 +85,37 @@ class ExampleInstrumentedTest {
 
         Log.d("Pupil", data.size.toString())
     }
-}
+
+    @Test
+    fun test_downloadWorker() {
+        val context = InstrumentationRegistry.getInstrumentation().targetContext
+
+        val galleryID = 515515
+
+        val worker = DownloadWorker.getInstance(context)
+
+        worker.queue.add(galleryID)
+
+        while(worker.progress.indexOfKey(galleryID) < 0 || worker.progress[galleryID] != null) {
+            Log.i("PUPILD", worker.progress[galleryID]?.joinToString(" ") ?: "null")
+
+            if (worker.progress[galleryID]?.all { !it.isFinite() } == true)
+                break
+        }
+
+        Log.i("PUPILD", "DONE!!")
+    }
+
+    @Test
+    fun test_getReaderOrNull() {
+        val context = InstrumentationRegistry.getInstrumentation().targetContext
+
+        val galleryID = 1561552
+
+        runBlocking {
+            Log.i("PUPILD", Cache(context).getReader(galleryID)?.galleryInfo?.title ?: "null")
+        }
+
+        Log.i("PUPILD", Cache(context).getReaderOrNull(galleryID)?.galleryInfo?.title ?: "null")
+    }
+}

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

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

app/src/main/AndroidManifest.xml

@@ -1,11 +1,15 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
     package="xyz.quaver.pupil">
 
     <uses-permission android:name="android.permission.INTERNET" />
-    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"
-        android:maxSdkVersion="28"/>
-    <uses-permission android:name="android.permission.REQUEST_INSTALL_PACKAGES"/>
+    <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.WRITE_EXTERNAL_STORAGE"/>
+    <uses-permission android:name="android.permission.FOREGROUND_SERVICE"/>
+
 
     <application
         android:name=".Pupil"
@@ -15,9 +19,30 @@
         android:label="@string/app_name"
         android:roundIcon="@mipmap/ic_launcher_round"
         android:supportsRtl="true"
-        android:theme="@style/AppTheme">
+        android:theme="@style/AppTheme"
+        tools:replace="android:theme"
+        android:requestLegacyExternalStorage="true"
+        tools:ignore="UnusedAttribute">
 
-        <activity android:name=".ui.LockActivity"/>
+        <provider
+            android:authorities="${applicationId}.provider"
+            android:name="androidx.core.content.FileProvider"
+            android:exported="false"
+            android:grantUriPermissions="true">
+
+            <meta-data
+                android:name="android.support.FILE_PROVIDER_PATHS"
+                android:resource="@xml/file_paths" />
+
+        </provider>
+
+        <receiver android:name=".BroadcastReciever" android:exported="true">
+            <intent-filter>
+                <action android:name="android.intent.action.DOWNLOAD_COMPLETE"/>
+            </intent-filter>
+        </receiver>
+
+        <activity android:name=".ui.LockActivity" />
         <activity
             android:name=".ui.ReaderActivity"
             android:configChanges="keyboardHidden|orientation|screenSize"
@@ -31,7 +56,7 @@
                 <data
                     android:host="hitomi.la"
                     android:pathPrefix="/galleries"
-                    android:scheme="https" />
+                    android:scheme="http" />
             </intent-filter>
             <intent-filter>
                 <action android:name="android.intent.action.VIEW" />
@@ -40,31 +65,42 @@
                 <category android:name="android.intent.category.BROWSABLE" />
 
                 <data
-                    android:host="히요비.asia"
+                    android:host="hitomi.la"
+                    android:pathPrefix="/manga"
+                    android:scheme="http" />
+            </intent-filter>
+            <intent-filter>
+                <action android:name="android.intent.action.VIEW" />
+
+                <category android:name="android.intent.category.DEFAULT" />
+                <category android:name="android.intent.category.BROWSABLE" />
+
+                <data
+                    android:host="hitomi.la"
+                    android:pathPrefix="/doujinshi"
+                    android:scheme="http" />
+            </intent-filter>
+            <intent-filter>
+                <action android:name="android.intent.action.VIEW" />
+
+                <category android:name="android.intent.category.DEFAULT" />
+                <category android:name="android.intent.category.BROWSABLE" />
+
+                <data
+                    android:host="hitomi.la"
+                    android:pathPrefix="/cg"
+                    android:scheme="http" />
+            </intent-filter>
+            <intent-filter>
+                <action android:name="android.intent.action.VIEW" />
+
+                <category android:name="android.intent.category.DEFAULT" />
+                <category android:name="android.intent.category.BROWSABLE" />
+
+                <data
+                    android:host="hitomi.la"
                     android:pathPrefix="/reader"
-                    android:scheme="https" />
-            </intent-filter>
-            <intent-filter>
-                <action android:name="android.intent.action.VIEW" />
-
-                <category android:name="android.intent.category.DEFAULT" />
-                <category android:name="android.intent.category.BROWSABLE" />
-
-                <data
-                    android:host="xn--9w3b15m8vo.asia"
-                    android:pathPrefix="/reader"
-                    android:scheme="https" />
-            </intent-filter>
-            <intent-filter>
-                <action android:name="android.intent.action.VIEW" />
-
-                <category android:name="android.intent.category.DEFAULT" />
-                <category android:name="android.intent.category.BROWSABLE" />
-
-                <data
-                    android:host="e-hentai.org"
-                    android:pathPrefix="/g"
-                    android:scheme="https" />
+                    android:scheme="http" />
             </intent-filter>
             <intent-filter>
                 <action android:name="android.intent.action.VIEW" />
@@ -75,7 +111,7 @@
                 <data
                     android:host="hitomi.la"
                     android:pathPrefix="/galleries"
-                    android:scheme="http" />
+                    android:scheme="https" />
             </intent-filter>
             <intent-filter>
                 <action android:name="android.intent.action.VIEW" />
@@ -84,9 +120,9 @@
                 <category android:name="android.intent.category.BROWSABLE" />
 
                 <data
-                    android:host="히요비.asia"
-                    android:pathPrefix="/reader"
-                    android:scheme="http" />
+                    android:host="hitomi.la"
+                    android:pathPrefix="/manga"
+                    android:scheme="https" />
             </intent-filter>
             <intent-filter>
                 <action android:name="android.intent.action.VIEW" />
@@ -95,9 +131,53 @@
                 <category android:name="android.intent.category.BROWSABLE" />
 
                 <data
-                    android:host="xn--9w3b15m8vo.asia"
+                    android:host="hitomi.la"
+                    android:pathPrefix="/doujinshi"
+                    android:scheme="https" />
+            </intent-filter>
+            <intent-filter>
+                <action android:name="android.intent.action.VIEW" />
+
+                <category android:name="android.intent.category.DEFAULT" />
+                <category android:name="android.intent.category.BROWSABLE" />
+
+                <data
+                    android:host="hitomi.la"
+                    android:pathPrefix="/cg"
+                    android:scheme="https" />
+            </intent-filter>
+            <intent-filter>
+                <action android:name="android.intent.action.VIEW" />
+
+                <category android:name="android.intent.category.DEFAULT" />
+                <category android:name="android.intent.category.BROWSABLE" />
+
+                <data
+                    android:host="hitomi.la"
                     android:pathPrefix="/reader"
-                    android:scheme="http" />
+                    android:scheme="https" />
+            </intent-filter>
+            <intent-filter>
+                <action android:name="android.intent.action.VIEW" />
+
+                <category android:name="android.intent.category.DEFAULT" />
+                <category android:name="android.intent.category.BROWSABLE" />
+
+                <data
+                    android:host="hiyobi.me"
+                    android:scheme="http"
+                    android:pathPrefix="/reader" />
+            </intent-filter>
+            <intent-filter>
+                <action android:name="android.intent.action.VIEW" />
+
+                <category android:name="android.intent.category.DEFAULT" />
+                <category android:name="android.intent.category.BROWSABLE" />
+
+                <data
+                    android:host="hiyobi.me"
+                    android:pathPrefix="/reader"
+                    android:scheme="https" />
             </intent-filter>
             <intent-filter>
                 <action android:name="android.intent.action.VIEW" />
@@ -110,6 +190,17 @@
                     android:pathPrefix="/g"
                     android:scheme="http" />
             </intent-filter>
+            <intent-filter>
+                <action android:name="android.intent.action.VIEW" />
+
+                <category android:name="android.intent.category.DEFAULT" />
+                <category android:name="android.intent.category.BROWSABLE" />
+
+                <data
+                    android:host="e-hentai.org"
+                    android:pathPrefix="/g"
+                    android:scheme="https" />
+            </intent-filter>
         </activity>
         <activity
             android:name=".ui.SettingsActivity"
@@ -125,6 +216,7 @@
                 <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
         </activity>
+        <activity android:name="net.rdrei.android.dirchooser.DirectoryChooserActivity" />
     </application>
 
 </manifest>

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

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

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

@@ -0,0 +1,103 @@
+/*
+ *     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.app.DownloadManager
+import android.app.PendingIntent
+import android.content.BroadcastReceiver
+import android.content.Context
+import android.content.Intent
+import android.net.Uri
+import android.webkit.MimeTypeMap
+import androidx.core.app.NotificationCompat
+import androidx.core.app.NotificationManagerCompat
+import androidx.core.content.FileProvider
+import androidx.preference.PreferenceManager
+import xyz.quaver.pupil.util.NOTIFICATION_ID_UPDATE
+import xyz.quaver.pupil.util.cancelImport
+import java.io.File
+
+class BroadcastReciever : BroadcastReceiver() {
+
+    companion object {
+        const val ACTION_CANCEL_IMPORT = "ACTION_CANCEL_IMPORT"
+
+        const val EXTRA_IMPORT_NOTIFICATION_ID = "EXTRA_IMPORT_NOTIFICATION_ID"
+    }
+
+    override fun onReceive(context: Context?, intent: Intent?) {
+        context ?: return
+
+        when (intent?.action) {
+            DownloadManager.ACTION_DOWNLOAD_COMPLETE -> {
+
+                // Validate download
+
+                val preference = PreferenceManager.getDefaultSharedPreferences(context)
+                val downloadID = preference.getLong("update_download_id", -1)
+                val downloadManager = context.getSystemService(Context.DOWNLOAD_SERVICE) as DownloadManager
+
+                if (intent.getLongExtra(DownloadManager.EXTRA_DOWNLOAD_ID, -1) != downloadID)
+                    return
+
+                // Get target uri
+
+                val query = DownloadManager.Query()
+                    .setFilterById(downloadID)
+
+                val uri = downloadManager.query(query).use { cursor ->
+                    cursor.moveToFirst()
+
+                    cursor.getString(cursor.getColumnIndex(DownloadManager.COLUMN_LOCAL_URI)).let {
+                        val uri = Uri.parse(it)
+
+                        when (uri.scheme) {
+                            "file" ->
+                                FileProvider.getUriForFile(context, context.applicationContext.packageName + ".provider", File(uri.path!!))
+                            "content" -> uri
+                            else -> return
+                        }
+                    }
+                }
+
+                // Build Notification
+
+                val notificationManager = NotificationManagerCompat.from(context)
+
+                val pendingIntent = PendingIntent.getActivity(context, 0, Intent(Intent.ACTION_VIEW).apply {
+                    flags = Intent.FLAG_ACTIVITY_CLEAR_TOP or Intent.FLAG_GRANT_READ_URI_PERMISSION or Intent.FLAG_ACTIVITY_NEW_TASK
+                    setDataAndType(uri, MimeTypeMap.getSingleton().getMimeTypeFromExtension("apk"))
+                }, 0)
+
+                val notification = NotificationCompat.Builder(context, "update")
+                    .setSmallIcon(android.R.drawable.stat_sys_download_done)
+                    .setContentTitle(context.getText(R.string.update_download_completed))
+                    .setContentText(context.getText(R.string.update_download_completed_description))
+                    .setContentIntent(pendingIntent)
+                    .build()
+
+                notificationManager.notify(NOTIFICATION_ID_UPDATE, notification)
+            }
+            ACTION_CANCEL_IMPORT -> {
+                cancelImport = true
+            }
+        }
+    }
+
+}

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

@@ -30,13 +30,17 @@ import androidx.preference.PreferenceManager
 import com.google.android.gms.common.GooglePlayServicesNotAvailableException
 import com.google.android.gms.common.GooglePlayServicesRepairableException
 import com.google.android.gms.security.ProviderInstaller
+import com.google.firebase.analytics.FirebaseAnalytics
+import com.google.firebase.crashlytics.FirebaseCrashlytics
+import xyz.quaver.proxy
 import xyz.quaver.pupil.util.Histories
+import xyz.quaver.pupil.util.getProxy
 import java.io.File
+import java.util.*
 
 class Pupil : MultiDexApplication() {
 
     lateinit var histories: Histories
-    lateinit var downloads: Histories
     lateinit var favorites: Histories
 
     init {
@@ -46,10 +50,40 @@ class Pupil : MultiDexApplication() {
     override fun onCreate() {
         val preference = PreferenceManager.getDefaultSharedPreferences(this)
 
+        val userID =
+            if (preference.getString("user_id", "").isNullOrEmpty()) {
+                UUID.randomUUID().toString().also {
+                    preference.edit().putString("user_id", it).apply()
+                }
+            } else
+                preference.getString("user_id", "") ?: ""
+
+        FirebaseCrashlytics.getInstance().setUserId(userID)
+
+        proxy = getProxy(this)
+
+        try {
+            preference.getString("dl_location", null).also {
+                if (!File(it!!).canWrite())
+                    throw Exception()
+            }
+        } catch (e: Exception) {
+            preference.edit().remove("dl_location").apply()
+        }
+
+        if (!preference.getBoolean("low_quality_reset", false)) {
+            preference.edit()
+                .putBoolean("low_quality", true)
+                .putBoolean("low_quality_reset", true)
+                .apply()
+        }
+
         histories = Histories(File(ContextCompat.getDataDir(this), "histories.json"))
-        downloads = Histories(File(ContextCompat.getDataDir(this), "downloads.json"))
         favorites = Histories(File(ContextCompat.getDataDir(this), "favorites.json"))
 
+        if (BuildConfig.DEBUG)
+            FirebaseAnalytics.getInstance(this).setAnalyticsCollectionEnabled(false)
+
         try {
             ProviderInstaller.installIfNeeded(this)
         } catch (e: GooglePlayServicesRepairableException) {
@@ -58,21 +92,32 @@ class Pupil : MultiDexApplication() {
             e.printStackTrace()
         }
 
-        if (!preference.getBoolean("channel_created", false)) {
-            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
-                val manager = getSystemService(Context.NOTIFICATION_SERVICE) as NotificationManager
-                val channel = NotificationChannel("download", getString(R.string.channel_download), NotificationManager.IMPORTANCE_LOW).apply {
-                    description = getString(R.string.channel_download_description)
-                    enableLights(false)
-                    enableVibration(false)
-                    lockscreenVisibility = Notification.VISIBILITY_SECRET
-                }
-                manager.createNotificationChannel(channel)
-            }
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
+            val manager = getSystemService(Context.NOTIFICATION_SERVICE) as NotificationManager
 
-            preference.edit().putBoolean("channel_created", true).apply()
+            manager.createNotificationChannel(NotificationChannel("download", getString(R.string.channel_download), NotificationManager.IMPORTANCE_LOW).apply {
+                description = getString(R.string.channel_download_description)
+                enableLights(false)
+                enableVibration(false)
+                lockscreenVisibility = Notification.VISIBILITY_SECRET
+            })
+
+            manager.createNotificationChannel(NotificationChannel("update", getString(R.string.channel_update), NotificationManager.IMPORTANCE_HIGH).apply {
+                description = getString(R.string.channel_update_description)
+                enableLights(true)
+                enableVibration(true)
+                lockscreenVisibility = Notification.VISIBILITY_SECRET
+            })
+
+            manager.createNotificationChannel(NotificationChannel("import", getString(R.string.channel_update), NotificationManager.IMPORTANCE_HIGH).apply {
+                description = getString(R.string.channel_update_description)
+                enableLights(false)
+                enableVibration(false)
+                lockscreenVisibility = Notification.VISIBILITY_SECRET
+            })
         }
 
+        AppCompatDelegate.setCompatVectorFromResourcesEnabled(true)
         AppCompatDelegate.setDefaultNightMode(when (preference.getBoolean("dark_mode", false)) {
             true -> AppCompatDelegate.MODE_NIGHT_YES
             false -> AppCompatDelegate.MODE_NIGHT_NO

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

@@ -18,7 +18,9 @@
 
 package xyz.quaver.pupil.adapters
 
+import android.content.Context
 import android.graphics.drawable.Drawable
+import android.util.Base64
 import android.util.SparseBooleanArray
 import android.view.LayoutInflater
 import android.view.View
@@ -26,35 +28,36 @@ import android.view.ViewGroup
 import android.widget.LinearLayout
 import androidx.cardview.widget.CardView
 import androidx.core.content.ContextCompat
+import androidx.preference.PreferenceManager
 import androidx.recyclerview.widget.RecyclerView
+import androidx.swiperefreshlayout.widget.CircularProgressDrawable
 import androidx.vectordrawable.graphics.drawable.Animatable2Compat
 import androidx.vectordrawable.graphics.drawable.AnimatedVectorDrawableCompat
 import com.bumptech.glide.RequestManager
 import com.bumptech.glide.load.engine.DiskCacheStrategy
+import com.daimajia.swipe.SwipeLayout
+import com.daimajia.swipe.adapters.RecyclerSwipeAdapter
+import com.daimajia.swipe.interfaces.SwipeAdapterInterface
 import com.google.android.material.chip.Chip
 import kotlinx.android.synthetic.main.item_galleryblock.view.*
 import kotlinx.coroutines.CoroutineScope
-import kotlinx.coroutines.Deferred
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
-import kotlinx.serialization.json.Json
-import kotlinx.serialization.json.JsonConfiguration
+import kotlinx.coroutines.withContext
 import xyz.quaver.hitomi.GalleryBlock
-import xyz.quaver.hitomi.Reader
+import xyz.quaver.hitomi.getReader
 import xyz.quaver.pupil.BuildConfig
 import xyz.quaver.pupil.Pupil
 import xyz.quaver.pupil.R
 import xyz.quaver.pupil.types.Tag
 import xyz.quaver.pupil.util.Histories
-import xyz.quaver.pupil.util.getCachedGallery
+import xyz.quaver.pupil.util.download.Cache
 import xyz.quaver.pupil.util.wordCapitalize
-import java.io.File
 import java.util.*
 import kotlin.collections.ArrayList
-import kotlin.collections.HashMap
 import kotlin.concurrent.schedule
 
-class GalleryBlockAdapter(private val glide: RequestManager, private val galleries: List<Pair<GalleryBlock, Deferred<String>>>) : RecyclerView.Adapter<RecyclerView.ViewHolder>() {
+class GalleryBlockAdapter(private val glide: RequestManager, private val galleries: List<GalleryBlock>) : RecyclerSwipeAdapter<RecyclerView.ViewHolder>(), SwipeAdapterInterface {
 
     enum class ViewType {
         NEXT,
@@ -64,8 +67,54 @@ class GalleryBlockAdapter(private val glide: RequestManager, private val galleri
 
     private lateinit var favorites: Histories
 
-    inner class GalleryViewHolder(val view: CardView) : RecyclerView.ViewHolder(view) {
-        fun bind(item: Pair<GalleryBlock, Deferred<String>>) {
+    val timer = Timer()
+
+    var isThin = false
+
+    inner class GalleryViewHolder(val view: View) : RecyclerView.ViewHolder(view) {
+        var timerTask: TimerTask? = null
+
+        private fun updateProgress(context: Context, galleryID: Int) {
+            val reader = Cache(context).getReaderOrNull(galleryID)
+
+            CoroutineScope(Dispatchers.Main).launch {
+                if (reader == null || PreferenceManager.getDefaultSharedPreferences(context).getBoolean("cache_disable", false)) {
+                    view.galleryblock_progressbar.visibility = View.GONE
+                    view.galleryblock_progress_complete.visibility = View.GONE
+                    return@launch
+                }
+
+                with(view.galleryblock_progressbar) {
+
+                    progress = Cache(context).getImages(galleryID)?.size ?: 0
+
+                    if (visibility == View.GONE) {
+                        visibility = View.VISIBLE
+                        max = reader.galleryInfo.files.size
+                    }
+
+                    if (progress == max) {
+                        if (completeFlag.get(galleryID, false)) {
+                            with(view.galleryblock_progress_complete) {
+                                setImageResource(R.drawable.ic_progressbar)
+                                visibility = View.VISIBLE
+                            }
+                        } else {
+                            with(view.galleryblock_progress_complete) {
+                                setImageDrawable(AnimatedVectorDrawableCompat.create(context, R.drawable.ic_progressbar_complete).apply {
+                                    this?.start()
+                                })
+                                visibility = View.VISIBLE
+                            }
+                            completeFlag.put(galleryID, true)
+                        }
+                    } else
+                        view.galleryblock_progress_complete.visibility = View.INVISIBLE
+                }
+            }
+        }
+
+        fun bind(galleryBlock: GalleryBlock) {
             with(view) {
                 val resources = context.resources
                 val languages = resources.getStringArray(R.array.languages).map {
@@ -74,96 +123,62 @@ class GalleryBlockAdapter(private val glide: RequestManager, private val galleri
                     }
                 }.toMap()
 
-                val (galleryBlock: GalleryBlock, thumbnail: Deferred<String>) = item
-
                 val artists = galleryBlock.artists
                 val series = galleryBlock.series
 
-                CoroutineScope(Dispatchers.Main).launch {
-                    val cache = thumbnail.await()
+                if (isThin)
+                    galleryblock_thumbnail.layoutParams.width = context.resources.getDimensionPixelSize(
+                        R.dimen.galleryblock_thumbnail_thin
+                    )
+                galleryblock_thumbnail.setImageDrawable(CircularProgressDrawable(context).also {
+                    it.start()
+                })
 
-                    glide
-                        .load(cache)
-                        .skipMemoryCache(true)
-                        .diskCacheStrategy(DiskCacheStrategy.NONE)
-                        .error(R.drawable.image_broken_variant)
-                        .apply {
-                            if (BuildConfig.CENSOR)
-                                override(5, 8)
-                        }
-                        .into(galleryblock_thumbnail)
+                CoroutineScope(Dispatchers.Main).launch {
+                    val thumbnail = Cache(context).getThumbnail(galleryBlock.id).let {
+                        if (it != null)
+                            Base64.decode(it, Base64.DEFAULT)
+                        else
+                            null
+                    }
+
+                    galleryblock_thumbnail.post {
+                        glide
+                            .load(thumbnail)
+                            .skipMemoryCache(true)
+                            .diskCacheStrategy(DiskCacheStrategy.NONE)
+                            .error(R.drawable.image_broken_variant)
+                            .apply {
+                                if (BuildConfig.CENSOR)
+                                    override(5, 8)
+                            }
+                            .into(galleryblock_thumbnail)
+                    }
                 }
 
                 //Check cache
-                val readerCache = { File(getCachedGallery(context, galleryBlock.id), "reader.json") }
-                val imageCache = { File(getCachedGallery(context, galleryBlock.id), "images") }
+                val cache = Cache(context).getCachedGallery(galleryBlock.id)
+                val reader = Cache(context).getReaderOrNull(galleryBlock.id)
 
-                try {
-                   Json(JsonConfiguration.Stable)
-                        .parse(Reader.serializer(), readerCache.invoke().readText())
-                } catch(e: Exception) {
-                    readerCache.invoke().delete()
-                }
-
-                if (readerCache.invoke().exists()) {
-                    val reader = Json(JsonConfiguration.Stable)
-                        .parse(Reader.serializer(), readerCache.invoke().readText())
+                if (reader != null) {
+                    val count = cache.listFiles()?.count {
+                        Regex("^[0-9]+.+\$").matches(it.name)
+                    } ?: 0
 
                     with(galleryblock_progressbar) {
-                        max = reader.readerItems.size
-                        progress = imageCache.invoke().list()?.size ?: 0
+                        max = reader.galleryInfo.files.size
+                        progress = count
 
                         visibility = View.VISIBLE
                     }
-                } else {
+                } else
                     galleryblock_progressbar.visibility = View.GONE
-                }
 
-                if (refreshTasks[this@GalleryViewHolder] == null) {
-                    val refresh = Timer(false).schedule(0, 1000) {
-                        post {
-                            with(view.galleryblock_progressbar) {
-                                progress = imageCache.invoke().list()?.size ?: 0
-
-                                if (!readerCache.invoke().exists()) {
-                                    visibility = View.GONE
-                                    max = 0
-                                    progress = 0
-
-                                    view.galleryblock_progress_complete.visibility = View.INVISIBLE
-                                } else {
-                                    if (visibility == View.GONE) {
-                                        val reader = Json(JsonConfiguration.Stable)
-                                            .parse(Reader.serializer(), readerCache.invoke().readText())
-                                        max = reader.readerItems.size
-                                        visibility = View.VISIBLE
-                                    }
-
-                                    if (progress == max) {
-                                        if (completeFlag.get(galleryBlock.id, false)) {
-                                            with(view.galleryblock_progress_complete) {
-                                                setImageResource(R.drawable.ic_progressbar)
-                                                visibility = View.VISIBLE
-                                            }
-                                        } else {
-                                            with(view.galleryblock_progress_complete) {
-                                                setImageDrawable(AnimatedVectorDrawableCompat.create(context, R.drawable.ic_progressbar_complete).apply {
-                                                    this?.start()
-                                                })
-                                                visibility = View.VISIBLE
-                                            }
-                                            completeFlag.put(galleryBlock.id, true)
-                                        }
-                                    } else
-                                        view.galleryblock_progress_complete.visibility = View.INVISIBLE
-                                }
-                            }
-                        }
+                if (timerTask == null)
+                    timerTask = timer.schedule(0, 1000) {
+                        updateProgress(context, galleryBlock.id)
                     }
 
-                    refreshTasks[this@GalleryViewHolder] = refresh
-                }
-
                 galleryblock_title.text = galleryBlock.title
                 with(galleryblock_artist) {
                     text = artists.joinToString(", ") { it.wordCapitalize() }
@@ -206,16 +221,17 @@ class GalleryBlockAdapter(private val glide: RequestManager, private val galleri
                             "male" -> {
                                 setChipBackgroundColorResource(R.color.material_blue_700)
                                 setTextColor(ContextCompat.getColor(context, android.R.color.white))
-                                ContextCompat.getDrawable(context, R.drawable.ic_gender_male_white)
+                                ContextCompat.getDrawable(context, R.drawable.gender_male)
                             }
                             "female" -> {
                                 setChipBackgroundColorResource(R.color.material_pink_600)
                                 setTextColor(ContextCompat.getColor(context, android.R.color.white))
-                                ContextCompat.getDrawable(context, R.drawable.ic_gender_female_white)
+                                ContextCompat.getDrawable(context, R.drawable.gender_female)
                             }
                             else -> null
                         }
                         text = tag.tag.wordCapitalize()
+                        setEnsureMinTouchTargetSize(false)
                         setOnClickListener {
                             for (callback in onChipClickedHandler)
                                 callback.invoke(tag)
@@ -224,6 +240,15 @@ class GalleryBlockAdapter(private val glide: RequestManager, private val galleri
                 }
 
                 galleryblock_id.text = galleryBlock.id.toString()
+                galleryblock_pagecount.text = "-"
+                CoroutineScope(Dispatchers.IO).launch {
+                    val pageCount = kotlin.runCatching {
+                        getReader(galleryBlock.id).galleryInfo.files.size
+                    }.getOrNull() ?: return@launch
+                    withContext(Dispatchers.Main) {
+                        galleryblock_pagecount.text = context.getString(R.string.galleryblock_pagecount, pageCount)
+                    }
+                }
 
                 if (!::favorites.isInitialized)
                     favorites = (context.applicationContext as Pupil).favorites
@@ -254,6 +279,14 @@ class GalleryBlockAdapter(private val glide: RequestManager, private val galleri
                         }
                     }
                 }
+
+
+                // Make some views invisible to make it thinner
+                if (isThin) {
+                    galleryblock_language.visibility = View.GONE
+                    galleryblock_type.visibility = View.GONE
+                    galleryblock_tag_group.visibility = View.GONE
+                }
             }
         }
     }
@@ -272,10 +305,11 @@ class GalleryBlockAdapter(private val glide: RequestManager, private val galleri
         }
     }
 
-    private val refreshTasks = HashMap<GalleryViewHolder, TimerTask>()
     val completeFlag = SparseBooleanArray()
 
     val onChipClickedHandler = ArrayList<((Tag) -> Unit)>()
+    var onDownloadClickedHandler: ((Int) -> Unit)? = null
+    var onDeleteClickedHandler: ((Int) -> Unit)? = null
 
     var showNext = false
     var showPrev = false
@@ -301,18 +335,56 @@ class GalleryBlockAdapter(private val glide: RequestManager, private val galleri
     }
 
     override fun onBindViewHolder(holder: RecyclerView.ViewHolder, position: Int) {
-        if (holder is GalleryViewHolder)
-            holder.bind(galleries[position-(if (showPrev) 1 else 0)])
+        if (holder is GalleryViewHolder) {
+            val gallery = galleries[position-(if (showPrev) 1 else 0)]
+
+            holder.bind(gallery)
+
+            with(holder.view.galleryblock_primary) {
+                setOnClickListener {
+                    holder.view.performClick()
+                }
+                setOnLongClickListener {
+                    holder.view.performLongClick()
+                }
+            }
+
+            holder.view.galleryblock_download.setOnClickListener {
+                onDownloadClickedHandler?.invoke(position)
+            }
+
+            holder.view.galleryblock_delete.setOnClickListener {
+                onDeleteClickedHandler?.invoke(position)
+            }
+
+            mItemManger.bindView(holder.view, position)
+
+            holder.view.galleryblock_swipe_layout.addSwipeListener(object: SwipeLayout.SwipeListener {
+                override fun onStartOpen(layout: SwipeLayout?) {
+                    mItemManger.closeAllExcept(layout)
+
+                    holder.view.galleryblock_download.text =
+                        if (Cache(holder.view.context).isDownloading(gallery.id))
+                            holder.view.context.getString(android.R.string.cancel)
+                        else
+                            holder.view.context.getString(R.string.main_download)
+                }
+
+                override fun onClose(layout: SwipeLayout?) {}
+                override fun onHandRelease(layout: SwipeLayout?, xvel: Float, yvel: Float) {}
+                override fun onOpen(layout: SwipeLayout?) {}
+                override fun onStartClose(layout: SwipeLayout?) {}
+                override fun onUpdate(layout: SwipeLayout?, leftOffset: Int, topOffset: Int) {}
+            })
+        }
     }
 
     override fun onViewDetachedFromWindow(holder: RecyclerView.ViewHolder) {
         super.onViewDetachedFromWindow(holder)
 
         if (holder is GalleryViewHolder) {
-            val task = refreshTasks[holder] ?: return
-
-            task.cancel()
-            refreshTasks.remove(holder)
+            holder.timerTask?.cancel()
+            holder.timerTask = null
         }
     }
 
@@ -328,4 +400,6 @@ class GalleryBlockAdapter(private val glide: RequestManager, private val galleri
             else -> ViewType.GALLERY
         }.ordinal
     }
+
+    override fun getSwipeLayoutResourceId(position: Int) = R.id.galleryblock_swipe_layout
 }

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

@@ -0,0 +1,87 @@
+/*
+ *     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.adapters
+
+import android.annotation.SuppressLint
+import android.content.Context
+import android.view.LayoutInflater
+import android.view.MotionEvent
+import android.view.View
+import android.view.ViewGroup
+import androidx.preference.PreferenceManager
+import androidx.recyclerview.widget.RecyclerView
+import kotlinx.android.synthetic.main.item_mirrors.view.*
+import xyz.quaver.pupil.R
+import java.util.*
+
+class MirrorAdapter(context: Context) : RecyclerView.Adapter<MirrorAdapter.ViewHolder>() {
+
+    class ViewHolder(val view: View) : RecyclerView.ViewHolder(view)
+
+    val mirrors = context.resources.getStringArray(R.array.mirrors).map {
+        it.split('|').let { split ->
+            Pair(split.first(), split.last())
+        }
+    }.toMap()
+
+    val list = mirrors.keys.toMutableList().apply {
+        PreferenceManager.getDefaultSharedPreferences(context)
+            .getString("mirrors", "")!!
+            .split(">")
+            .reversed()
+            .forEach {
+                if (this.contains(it)) {
+                    this.remove(it)
+                    this.add(0, it)
+                }
+            }
+    }
+
+    val onItemMove : ((Int, Int) -> Unit) = { from, to ->
+        Collections.swap(list, from, to)
+        notifyItemMoved(from, to)
+        onItemMoved?.invoke(list)
+    }
+    var onStartDrag : ((ViewHolder) -> Unit)? = null
+    var onItemMoved : ((List<String>) -> (Unit))? = null
+
+    @SuppressLint("ClickableViewAccessibility")
+    override fun onBindViewHolder(holder: ViewHolder, position: Int) {
+        with(holder.view) {
+            mirror_name.text = mirrors[list.elementAt(position)]
+            mirror_button.setOnTouchListener { _, event ->
+                if (event.action == MotionEvent.ACTION_DOWN)
+                    onStartDrag?.invoke(holder)
+
+                true
+            }
+        }
+    }
+
+    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): ViewHolder {
+        return LayoutInflater.from(parent.context).inflate(
+            R.layout.item_mirrors, parent, false
+        ).let {
+            ViewHolder(it)
+        }
+    }
+
+    override fun getItemCount() = mirrors.size
+
+}

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

@@ -18,32 +18,51 @@
 
 package xyz.quaver.pupil.adapters
 
-import android.graphics.drawable.Drawable
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
-import android.widget.ImageView
+import androidx.constraintlayout.widget.ConstraintLayout
+import androidx.preference.PreferenceManager
 import androidx.recyclerview.widget.RecyclerView
 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 xyz.quaver.pupil.BuildConfig
+import com.bumptech.glide.load.model.GlideUrl
+import com.bumptech.glide.load.model.LazyHeaders
+import com.google.android.material.snackbar.Snackbar
+import com.google.firebase.crashlytics.FirebaseCrashlytics
+import kotlinx.android.synthetic.main.activity_reader.view.*
+import kotlinx.android.synthetic.main.item_reader.view.*
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.launch
+import xyz.quaver.Code
+import xyz.quaver.hitomi.Reader
+import xyz.quaver.hitomi.getReferer
+import xyz.quaver.hitomi.imageUrlFromImage
+import xyz.quaver.hiyobi.cookie
+import xyz.quaver.hiyobi.createImgList
+import xyz.quaver.hiyobi.user_agent
 import xyz.quaver.pupil.R
-import xyz.quaver.pupil.util.getCachedGallery
-import java.io.File
+import xyz.quaver.pupil.util.download.Cache
+import xyz.quaver.pupil.util.download.DownloadWorker
+import java.util.*
+import kotlin.concurrent.schedule
+import kotlin.math.roundToInt
 
 class ReaderAdapter(private val glide: RequestManager,
-                    private val galleryID: Int,
-                    private val images: List<String>) : RecyclerView.Adapter<ReaderAdapter.ViewHolder>() {
+                    private val galleryID: Int) : RecyclerView.Adapter<ReaderAdapter.ViewHolder>() {
+
+    var reader: Reader? = null
+    val timer = Timer()
 
     var isFullScreen = false
-    private var prev : Drawable? = null
+
+    var onItemClickListener : ((Int) -> (Unit))? = null
 
     class ViewHolder(val view: View) : RecyclerView.ViewHolder(view)
 
+    var downloadWorker: DownloadWorker? = null
+
     override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): ViewHolder {
         return LayoutInflater.from(parent.context).inflate(
             R.layout.item_reader, parent, false
@@ -53,43 +72,120 @@ class ReaderAdapter(private val glide: RequestManager,
     }
 
     override fun onBindViewHolder(holder: ViewHolder, position: Int) {
-        holder.view as ImageView
+        holder.view as ConstraintLayout
 
-        glide
-            .load(File(getCachedGallery(holder.view.context, galleryID), images[position]))
-            .dontTransform()
-            .diskCacheStrategy(DiskCacheStrategy.NONE)
-            .skipMemoryCache(true)
-            .error(R.drawable.image_broken_variant)
-            .apply {
-                if (BuildConfig.CENSOR)
-                    override(5, 8)
-                if (isFullScreen)
-                    placeholder(prev)
+        if (downloadWorker == null)
+            downloadWorker = DownloadWorker.getInstance(holder.view.context)
+
+        if (isFullScreen) {
+            holder.view.layoutParams.height = RecyclerView.LayoutParams.MATCH_PARENT
+            holder.view.container.layoutParams.height = ConstraintLayout.LayoutParams.MATCH_PARENT
+        } else {
+            holder.view.layoutParams.height = RecyclerView.LayoutParams.WRAP_CONTENT
+            holder.view.container.layoutParams.height = 0
+
+            (holder.view.container.layoutParams as ConstraintLayout.LayoutParams)
+                .dimensionRatio = "W,${reader!!.galleryInfo.files[position].width}:${reader!!.galleryInfo.files[position].height}"
+        }
+
+        holder.view.image.setOnPhotoTapListener { _, _, _ ->
+            onItemClickListener?.invoke(position)
+        }
+
+        holder.view.container.setOnClickListener {
+            onItemClickListener?.invoke(position)
+        }
+
+        holder.view.reader_index.text = (position+1).toString()
+
+        val preferences = PreferenceManager.getDefaultSharedPreferences(holder.view.context)
+        if (preferences.getBoolean("cache_disable", false)) {
+            val lowQuality = preferences.getBoolean("low_quality", false)
+
+            val url = when (reader!!.code) {
+                Code.HITOMI ->
+                    GlideUrl(
+                        imageUrlFromImage(
+                            galleryID,
+                            reader!!.galleryInfo.files[position],
+                            !lowQuality
+                        )
+                    , LazyHeaders.Builder().addHeader("Referer", getReferer(galleryID)).build())
+                Code.HIYOBI ->
+                    GlideUrl(createImgList(galleryID, reader!!, lowQuality)[position].path, LazyHeaders.Builder()
+                        .addHeader("User-Agent", user_agent)
+                        .addHeader("Cookie", cookie)
+                        .build())
+                else -> null
             }
-            .listener(object: RequestListener<Drawable> {
-                override fun onLoadFailed(
-                    e: GlideException?,
-                    model: Any?,
-                    target: Target<Drawable>?,
-                    isFirstResource: Boolean
-                ) = false
+            holder.view.image.post {
+                glide
+                    .load(url!!)
+                    .diskCacheStrategy(DiskCacheStrategy.NONE)
+                    .skipMemoryCache(false)
+                    .fitCenter()
+                    .error(R.drawable.image_broken_variant)
+                    .into(holder.view.image)
+            }
+        } else {
+            val image = Cache(holder.view.context).getImage(galleryID, position)
+            val progress = downloadWorker!!.progress[galleryID]?.get(position)
 
-                override fun onResourceReady(
-                    resource: Drawable?,
-                    model: Any?,
-                    target: Target<Drawable>?,
-                    dataSource: DataSource?,
-                    isFirstResource: Boolean
-                ): Boolean {
-                    prev = resource?.constantState?.newDrawable()?.mutate()
+            if (progress?.isInfinite() == true && image != null) {
+                holder.view.reader_item_progressbar.visibility = View.INVISIBLE
 
-                    return false
+                holder.view.image.post {
+                    glide
+                        .load(image)
+                        .diskCacheStrategy(DiskCacheStrategy.NONE)
+                        .skipMemoryCache(true)
+                        .fitCenter()
+                        .error(R.drawable.image_broken_variant)
+                        .into(holder.view.image)
                 }
-            })
-            .into(holder.view)
+
+            } else {
+                holder.view.reader_item_progressbar.visibility = View.VISIBLE
+
+                glide.clear(holder.view.image)
+
+                if (progress?.isNaN() == true) {
+                    FirebaseCrashlytics.getInstance().recordException(
+                        DownloadWorker.getInstance(holder.view.context).exception[galleryID]?.get(position)!!
+                    )
+
+                    glide
+                        .load(R.drawable.image_broken_variant)
+                        .into(holder.view.image)
+
+                    Snackbar.make(holder.view.reader_layout, R.string.reader_error_retry, Snackbar.LENGTH_SHORT).apply {
+                        setAction(android.R.string.no) { }
+                        setAction(android.R.string.yes) {
+                            downloadWorker!!.cancel(galleryID)
+                            downloadWorker!!.queue.add(galleryID)
+                        }
+                    }.show()
+
+                    return
+                } else {
+                    holder.view.reader_item_progressbar.progress =
+                        if (progress?.isInfinite() == true)
+                            100
+                        else
+                            progress?.roundToInt() ?: 0
+
+                    holder.view.image.setImageDrawable(null)
+                }
+
+                timer.schedule(1000) {
+                    CoroutineScope(Dispatchers.Main).launch {
+                        notifyItemChanged(position)
+                    }
+                }
+            }
+        }
     }
 
-    override fun getItemCount() = images.size
+    override fun getItemCount() = reader?.galleryInfo?.files?.size ?: 0
 
 }

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

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

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

@@ -18,66 +18,55 @@
 
 package xyz.quaver.pupil.ui
 
-import android.Manifest
+import android.annotation.SuppressLint
 import android.app.Activity
-import android.app.DownloadManager
-import android.content.BroadcastReceiver
-import android.content.Context
 import android.content.Intent
-import android.content.IntentFilter
 import android.graphics.drawable.Animatable
 import android.net.Uri
 import android.os.Bundle
-import android.os.Environment
 import android.text.*
 import android.text.style.AlignmentSpan
 import android.view.KeyEvent
 import android.view.MotionEvent
 import android.view.View
 import android.view.WindowManager
-import android.widget.EditText
-import android.widget.ImageView
-import android.widget.LinearLayout
-import android.widget.TextView
+import android.view.inputmethod.EditorInfo
+import android.widget.*
 import androidx.appcompat.app.AlertDialog
 import androidx.appcompat.app.AppCompatActivity
 import androidx.cardview.widget.CardView
-import androidx.core.app.ActivityCompat
 import androidx.core.content.ContextCompat
 import androidx.core.content.res.ResourcesCompat
 import androidx.core.view.GravityCompat
 import androidx.preference.PreferenceManager
 import androidx.vectordrawable.graphics.drawable.AnimatedVectorDrawableCompat
 import com.arlib.floatingsearchview.FloatingSearchView
+import com.arlib.floatingsearchview.FloatingSearchViewDayNight
 import com.arlib.floatingsearchview.suggestions.model.SearchSuggestion
 import com.arlib.floatingsearchview.util.view.SearchInputView
 import com.bumptech.glide.Glide
 import com.google.android.material.appbar.AppBarLayout
-import com.google.android.material.snackbar.Snackbar
+import com.google.firebase.crashlytics.FirebaseCrashlytics
 import kotlinx.android.synthetic.main.activity_main.*
 import kotlinx.android.synthetic.main.activity_main_content.*
 import kotlinx.coroutines.*
-import kotlinx.serialization.ImplicitReflectionSerializer
-import kotlinx.serialization.json.Json
-import kotlinx.serialization.json.JsonConfiguration
-import kotlinx.serialization.json.JsonObject
-import kotlinx.serialization.json.content
-import kotlinx.serialization.list
-import kotlinx.serialization.stringify
-import ru.noties.markwon.Markwon
-import xyz.quaver.hitomi.*
+import kotlinx.serialization.builtins.list
+import xyz.quaver.hitomi.GalleryBlock
+import xyz.quaver.hitomi.doSearch
+import xyz.quaver.hitomi.getGalleryIDsFromNozomi
+import xyz.quaver.hitomi.getSuggestionsForQuery
 import xyz.quaver.pupil.Pupil
 import xyz.quaver.pupil.R
 import xyz.quaver.pupil.adapters.GalleryBlockAdapter
 import xyz.quaver.pupil.types.Tag
 import xyz.quaver.pupil.types.TagSuggestion
 import xyz.quaver.pupil.types.Tags
+import xyz.quaver.pupil.ui.dialog.GalleryDialog
 import xyz.quaver.pupil.util.*
+import xyz.quaver.pupil.util.download.Cache
+import xyz.quaver.pupil.util.download.DownloadWorker
 import java.io.File
-import java.io.FileOutputStream
-import java.net.URL
 import java.util.*
-import javax.net.ssl.HttpsURLConnection
 import kotlin.collections.ArrayList
 import kotlin.math.abs
 import kotlin.math.ceil
@@ -98,7 +87,7 @@ class MainActivity : AppCompatActivity() {
         POPULAR
     }
 
-    private val galleries = ArrayList<Pair<GalleryBlock, Deferred<String>>>()
+    private val galleries = ArrayList<GalleryBlock>()
 
     private var query = ""
     set(value) {
@@ -121,7 +110,6 @@ class MainActivity : AppCompatActivity() {
     private var currentPage = 0
 
     private lateinit var histories: Histories
-    private lateinit var downloads: Histories
     private lateinit var favorites: Histories
 
     override fun onCreate(savedInstanceState: Bundle?) {
@@ -137,14 +125,13 @@ class MainActivity : AppCompatActivity() {
                     finish()
                 }
             }.show()
+
             return
         }
 
         if (lockManager.isNotEmpty())
             startActivityForResult(Intent(this, LockActivity::class.java), REQUEST_LOCK)
 
-        checkPermissions()
-
         val preference = PreferenceManager.getDefaultSharedPreferences(this)
 
         if (Locale.getDefault().language == "ko") {
@@ -161,13 +148,12 @@ class MainActivity : AppCompatActivity() {
 
         with(application as Pupil) {
             this@MainActivity.histories = histories
-            this@MainActivity.downloads = downloads
             this@MainActivity.favorites = favorites
         }
 
         setContentView(R.layout.activity_main)
 
-        checkUpdate()
+        checkUpdate(this)
 
         initView()
     }
@@ -187,6 +173,12 @@ class MainActivity : AppCompatActivity() {
         }
     }
 
+    override fun onDestroy() {
+        super.onDestroy()
+
+        (main_recyclerview?.adapter as? GalleryBlockAdapter)?.timer?.cancel()
+    }
+
     override fun onResume() {
         val preferences = PreferenceManager.getDefaultSharedPreferences(this)
 
@@ -202,7 +194,7 @@ class MainActivity : AppCompatActivity() {
 
     override fun onKeyDown(keyCode: Int, event: KeyEvent?): Boolean {
         val preference = PreferenceManager.getDefaultSharedPreferences(this)
-        val perPage = preference.getString("per_page", "25")!!.toInt()
+        val perPage = preference.getString("per_page", "25")!!.toIntOrNull() ?: 25
         val maxPage = ceil(totalItems / perPage.toDouble()).roundToInt()
 
         return when(keyCode) {
@@ -256,125 +248,6 @@ class MainActivity : AppCompatActivity() {
         }
     }
 
-    private fun checkUpdate() {
-
-        val preferences = PreferenceManager.getDefaultSharedPreferences(this)
-        val ignoreUpdateUntil = preferences.getLong("ignore_update_until", 0)
-
-        if (ignoreUpdateUntil > System.currentTimeMillis())
-            return
-
-        fun extractReleaseNote(update: JsonObject, locale: String) : String {
-            val markdown = update["body"]!!.content
-
-            val target = when(locale) {
-                "ko" -> "한국어"
-                "ja" -> "日本語"
-                else -> "English"
-            }
-
-            val releaseNote = Regex("^# Release Note.+$")
-            val language = Regex("^## $target$")
-            val end = Regex("^#.+$")
-
-            var releaseNoteFlag = false
-            var languageFlag = false
-
-            val result = StringBuilder()
-
-            for(line in markdown.lines()) {
-                if (releaseNote.matches(line)) {
-                    releaseNoteFlag = true
-                    continue
-                }
-
-                if (releaseNoteFlag) {
-                    if (language.matches(line)) {
-                        languageFlag = true
-                        continue
-                    }
-                }
-
-                if (languageFlag) {
-                    if (end.matches(line))
-                        break
-
-                    result.append(line+"\n")
-                }
-            }
-
-            return getString(R.string.update_release_note, update["tag_name"]?.content, result.toString())
-        }
-
-        CoroutineScope(Dispatchers.Default).launch {
-            val update =
-                checkUpdate(getString(R.string.release_url)) ?: return@launch
-
-            val (url, fileName) = getApkUrl(update) ?: return@launch
-            fileName ?: return@launch
-
-            val dialog = AlertDialog.Builder(this@MainActivity).apply {
-                setTitle(R.string.update_title)
-                val msg = extractReleaseNote(update, Locale.getDefault().language)
-                setMessage(Markwon.create(context).toMarkdown(msg))
-                setPositiveButton(android.R.string.yes) { _, _ ->
-                    if (!this@MainActivity.hasPermission(Manifest.permission.WRITE_EXTERNAL_STORAGE)) {
-                        AlertDialog.Builder(this@MainActivity).apply {
-                            setTitle(R.string.warning)
-                            setMessage(R.string.update_no_permission)
-                            setPositiveButton(android.R.string.ok) { _, _ -> }
-                        }.show()
-
-                        return@setPositiveButton
-                    }
-
-                    val request = DownloadManager.Request(Uri.parse(url)).apply {
-                        setDescription(getString(R.string.update_notification_description))
-                        setTitle(getString(R.string.app_name))
-                        setDestinationInExternalPublicDir(Environment.DIRECTORY_DOWNLOADS, fileName)
-                    }
-
-                    val manager = getSystemService(Context.DOWNLOAD_SERVICE) as DownloadManager
-                    val id = manager.enqueue(request)
-
-                    registerReceiver(object: BroadcastReceiver() {
-                        override fun onReceive(context: Context?, intent: Intent?) {
-                            try {
-                                val install = Intent(Intent.ACTION_VIEW).apply {
-                                    flags = Intent.FLAG_ACTIVITY_CLEAR_TOP or Intent.FLAG_GRANT_READ_URI_PERMISSION
-                                    setDataAndType(manager.getUriForDownloadedFile(id), manager.getMimeTypeForDownloadedFile(id))
-                                }
-
-                                startActivity(install)
-                                unregisterReceiver(this)
-                            } catch (e: Exception) {
-                                AlertDialog.Builder(this@MainActivity).apply {
-                                    setTitle(R.string.update_failed)
-                                    setMessage(R.string.update_failed_message)
-                                    setPositiveButton(android.R.string.ok) { _, _ -> }
-                                }.show()
-                            }
-                        }
-                    }, IntentFilter(DownloadManager.ACTION_DOWNLOAD_COMPLETE))
-                }
-                setNegativeButton(R.string.ignore_update) { _, _ ->
-                    preferences.edit()
-                        .putLong("ignore_update_until", System.currentTimeMillis() + 604800000)
-                        .apply()
-                }
-            }
-
-            launch(Dispatchers.Main) {
-                dialog.show()
-            }
-        }
-    }
-
-    private fun checkPermissions() {
-        if (this.hasPermission(Manifest.permission.WRITE_EXTERNAL_STORAGE))
-            ActivityCompat.requestPermissions(this, arrayOf(Manifest.permission.WRITE_EXTERNAL_STORAGE), 13489)
-    }
-
     private fun initView() {
         var prevP1 = 0
         main_appbar_layout.addOnOffsetChangedListener(
@@ -448,7 +321,7 @@ class MainActivity : AppCompatActivity() {
                         startActivity(Intent(Intent.ACTION_VIEW, Uri.parse(getString(R.string.email))))
                     }
                     R.id.main_drawer_kakaotalk -> {
-                        startActivity(Intent(Intent.ACTION_VIEW, Uri.parse(getString(R.string.kakaotalk))))
+                        startActivity(Intent(Intent.ACTION_VIEW, Uri.parse(getString(R.string.discord))))
                     }
                 }
             }
@@ -456,11 +329,18 @@ class MainActivity : AppCompatActivity() {
             true
         }
 
+        with(main_fab_cancel) {
+            setImageResource(R.drawable.cancel)
+            setOnClickListener {
+                DownloadWorker.getInstance(context).stop()
+            }
+        }
+
         with(main_fab_jump) {
             setImageResource(R.drawable.ic_jump)
             setOnClickListener {
                 val preference = PreferenceManager.getDefaultSharedPreferences(context)
-                val perPage = preference.getString("per_page", "25")!!.toInt()
+                val perPage = preference.getString("per_page", "25")!!.toIntOrNull() ?: 25
                 val editText = EditText(context)
 
                 AlertDialog.Builder(context).apply {
@@ -485,31 +365,49 @@ class MainActivity : AppCompatActivity() {
             }
         }
 
+        with(main_fab_random) {
+            setImageResource(R.drawable.shuffle_variant)
+            setOnClickListener {
+                runBlocking {
+                    withTimeoutOrNull(100) {
+                        galleryIDs?.await()
+                    }
+                }.let {
+                    if (it?.isEmpty() == false) {
+                        val galleryID = it.random()
+
+                        val intent = Intent(this@MainActivity, ReaderActivity::class.java).apply {
+                            putExtra("galleryID", galleryID)
+                        }
+
+                        startActivity(intent)
+
+                        histories.add(galleryID)
+                    }
+                }
+            }
+        }
+
         with(main_fab_id) {
             setImageResource(R.drawable.numeric)
             setOnClickListener {
-                val editText = EditText(context)
+                val editText = EditText(context).apply {
+                    inputType = InputType.TYPE_CLASS_NUMBER
+                }
 
                 AlertDialog.Builder(context).apply {
                     setView(editText)
                     setTitle(R.string.main_open_gallery_by_id)
 
                     setPositiveButton(android.R.string.ok) { _, _ ->
-                        CoroutineScope(Dispatchers.Default).launch {
-                            try {
-                                val intent = Intent(this@MainActivity, ReaderActivity::class.java)
-                                val gallery =
-                                    getGalleryBlock(editText.text.toString().toInt()) ?: throw Exception()
-                                intent.putExtra("galleryID", gallery.id)
-
-                                startActivity(intent)
-
-                                histories.add(gallery.id)
-                            } catch (e: Exception) {
-                                Snackbar.make(main_layout,
-                                    R.string.main_open_gallery_by_id_error, Snackbar.LENGTH_LONG).show()
+                            val galleryID = editText.text.toString().toIntOrNull() ?: return@setPositiveButton
+                            val intent = Intent(this@MainActivity, ReaderActivity::class.java).apply {
+                                putExtra("galleryID", galleryID)
                             }
-                        }
+
+                            startActivity(intent)
+
+                            histories.add(galleryID)
                     }
                 }.show()
             }
@@ -521,6 +419,7 @@ class MainActivity : AppCompatActivity() {
         loadBlocks()
     }
 
+    @SuppressLint("ClickableViewAccessibility")
     private fun setupRecyclerView() {
         with(main_recyclerview) {
             adapter = GalleryBlockAdapter(Glide.with(this@MainActivity), galleries).apply {
@@ -535,6 +434,47 @@ class MainActivity : AppCompatActivity() {
                         loadBlocks()
                     }
                 }
+                onDownloadClickedHandler = { position ->
+                    val galleryID = galleries[position].id
+                    val worker = DownloadWorker.getInstance(context)
+                    if (PreferenceManager.getDefaultSharedPreferences(context).getBoolean("cache_disable", false))
+                        Toast.makeText(context, R.string.settings_download_when_cache_disable_warning, Toast.LENGTH_SHORT).show()
+                    else {
+                        if (Cache(context).isDownloading(galleryID))     //download in progress
+                            worker.cancel(galleryID)
+                        else {
+                            Cache(context).setDownloading(galleryID, true)
+
+                            worker.queue.add(galleryID)
+                        }
+                    }
+
+                    closeAllItems()
+                }
+
+                onDeleteClickedHandler = { position ->
+                    val galleryID = galleries[position].id
+
+                    CoroutineScope(Dispatchers.Default).launch {
+                        DownloadWorker.getInstance(context).cancel(galleryID)
+
+                        Cache(context).getCachedGallery(galleryID).deleteRecursively()
+
+                        histories.remove(galleryID)
+
+                        if (this@MainActivity.mode != Mode.SEARCH)
+                            runOnUiThread {
+                                cancelFetch()
+                                clearGalleries()
+                                fetchGalleries(query, sortMode)
+                                loadBlocks()
+                            }
+
+                        completeFlag.put(galleryID, false)
+                    }
+
+                    closeAllItems()
+                }
             }
             ItemClickSupport.addTo(this)
                 .setOnItemClickListener { _, position, v ->
@@ -542,7 +482,7 @@ class MainActivity : AppCompatActivity() {
                         return@setOnItemClickListener
 
                     val intent = Intent(this@MainActivity, ReaderActivity::class.java)
-                    val gallery = galleries[position].first
+                    val gallery = galleries[position]
                     intent.putExtra("galleryID", gallery.id)
 
                     //TODO: Maybe sprinkling some transitions will be nice :D
@@ -554,9 +494,13 @@ class MainActivity : AppCompatActivity() {
                     if (v !is CardView)
                         return@setOnItemLongClickListener true
 
-                    val galleryID = galleries[position].first.id
+                    val galleryID = galleries[position].id
 
-                    GalleryDialog(this@MainActivity, galleryID).apply {
+                    GalleryDialog(
+                        this@MainActivity,
+                        Glide.with(this@MainActivity),
+                        galleryID
+                    ).apply {
                         onChipClickedHandler.add {
                             runOnUiThread {
                                 query = it.toQuery()
@@ -779,7 +723,6 @@ class MainActivity : AppCompatActivity() {
     }
 
     private var suggestionJob : Job? = null
-    @UseExperimental(ImplicitReflectionSerializer::class)
     private fun setupSearchBar() {
         val searchInputView = findViewById<SearchInputView>(R.id.search_bar_text)
         //Change upper case letters to lower case
@@ -799,20 +742,39 @@ class MainActivity : AppCompatActivity() {
                     s.replace(0, s.length, s.toString().toLowerCase(Locale.getDefault()))
             }
         })
+        searchInputView.imeOptions = EditorInfo.IME_FLAG_NO_EXTRACT_UI
 
-        with(main_searchview as FloatingSearchView) {
+        with(main_searchview as FloatingSearchViewDayNight) {
             val favoritesFile = File(ContextCompat.getDataDir(context), "favorites_tags.json")
-            val json = Json(JsonConfiguration.Stable)
             val serializer = Tag.serializer().list
 
             if (!favoritesFile.exists()) {
                 favoritesFile.createNewFile()
-                favoritesFile.writeText(json.stringify(Tags(listOf())))
+                favoritesFile.writeText(json.stringify(serializer, Tags(listOf())))
             }
 
+            setOnLeftMenuClickListener(object: FloatingSearchView.OnLeftMenuClickListener {
+                override fun onMenuOpened() {
+                    (this@MainActivity.main_recyclerview.adapter as GalleryBlockAdapter).closeAllItems()
+                }
+
+                override fun onMenuClosed() {
+                    //Do Nothing
+                }
+            })
+
             setOnMenuItemClickListener {
                 when(it.itemId) {
                     R.id.main_menu_settings -> startActivityForResult(Intent(this@MainActivity, SettingsActivity::class.java), REQUEST_SETTINGS)
+                    R.id.main_menu_thin -> {
+                        main_recyclerview.apply {
+                            (adapter as GalleryBlockAdapter).apply {
+                                isThin = !isThin
+                            }
+
+                            adapter = adapter       // Force to redraw
+                        }
+                    }
                     R.id.main_menu_sort_newest -> {
                         sortMode = SortMode.NEWEST
                         it.isChecked = true
@@ -885,14 +847,14 @@ class MainActivity : AppCompatActivity() {
                     ResourcesCompat.getDrawable(
                         resources,
                         when(item.n) {
-                            "female" -> R.drawable.ic_gender_female
-                            "male" -> R.drawable.ic_gender_male
-                            "language" -> R.drawable.ic_translate
-                            "group" -> R.drawable.ic_account_group
-                            "character" -> R.drawable.ic_account_star
-                            "series" -> R.drawable.ic_book_open
-                            "artist" -> R.drawable.ic_brush
-                            else -> R.drawable.ic_tag
+                            "female" -> R.drawable.gender_female
+                            "male" -> R.drawable.gender_male
+                            "language" -> R.drawable.translate
+                            "group" -> R.drawable.account_group
+                            "character" -> R.drawable.account_star
+                            "series" -> R.drawable.book_open
+                            "artist" -> R.drawable.brush
+                            else -> R.drawable.tag
                         },
                         null)
                 )
@@ -925,7 +887,7 @@ class MainActivity : AppCompatActivity() {
                             favorites.add(tag)
                         }
 
-                        favoritesFile.writeText(json.stringify(favorites))
+                        favoritesFile.writeText(json.stringify(serializer, favorites))
                     }
                 }
 
@@ -1024,52 +986,60 @@ class MainActivity : AppCompatActivity() {
                             when(sortMode) {
                                 SortMode.POPULAR -> getGalleryIDsFromNozomi(null, "popular", "all")
                                 else -> getGalleryIDsFromNozomi(null, "index", "all")
-                            }.apply {
-                                totalItems = size
+                            }.also {
+                                totalItems = it.size
                             }
                         }
-                        else -> doSearch("$defaultQuery $query", sortMode == SortMode.POPULAR).apply {
-                            totalItems = size
+                        else -> doSearch("$defaultQuery $query", sortMode == SortMode.POPULAR).also {
+                            totalItems = it.size
                         }
                     }
                 }
                 Mode.HISTORY -> {
                     when {
                         query.isEmpty() -> {
-                            histories.toList().apply {
-                                totalItems = size
+                            histories.toList().also {
+                                totalItems = it.size
                             }
                         }
                         else -> {
                             val result = doSearch(query).sorted()
-                            histories.filter { result.binarySearch(it) >= 0 }.apply {
-                                totalItems = size
+                            histories.filter { result.binarySearch(it) >= 0 }.also {
+                                totalItems = it.size
                             }
                         }
                     }
                 }
                 Mode.DOWNLOAD -> {
+                    val downloads = getDownloadDirectory(this@MainActivity).listFiles()?.filter { file ->
+                        file.isDirectory && file.name.toIntOrNull() != null
+                    }?.sortedByDescending {
+                        it.lastModified()
+                    }?.map {
+                        it.name.toInt()
+                    } ?: emptyList()
+
                     when {
-                        query.isEmpty() -> downloads.toList().apply {
-                            totalItems = size
+                        query.isEmpty() -> downloads.also {
+                            totalItems = it.size
                         }
                         else -> {
                             val result = doSearch(query).sorted()
-                            downloads.filter { result.binarySearch(it) >= 0 }.apply {
-                                totalItems = size
+                            downloads.filter { result.binarySearch(it) >= 0 }.also {
+                                totalItems = it.size
                             }
                         }
                     }
                 }
                 Mode.FAVORITE -> {
                     when {
-                        query.isEmpty() -> favorites.toList().apply {
-                            totalItems = size
+                        query.isEmpty() -> favorites.toList().also {
+                            totalItems = it.size
                         }
                         else -> {
                             val result = doSearch(query).sorted()
-                            favorites.filter { result.binarySearch(it) >= 0 }.apply {
-                                totalItems = size
+                            favorites.filter { result.binarySearch(it) >= 0 }.also {
+                                totalItems = it.size
                             }
                         }
                     }
@@ -1083,9 +1053,16 @@ class MainActivity : AppCompatActivity() {
         val perPage = preference.getString("per_page", "25")?.toInt() ?: 25
 
         loadingJob = CoroutineScope(Dispatchers.IO).launch {
-            val galleryIDs = galleryIDs?.await()
+            val galleryIDs = try {
+                galleryIDs!!.await().also {
+                    if (it.isEmpty())
+                        throw Exception("No result")
+                }
+            } catch (e: Exception) {
+
+                if (e.message != "No result")
+                    FirebaseCrashlytics.getInstance().recordException(e)
 
-            if (galleryIDs.isNullOrEmpty()) { //No result
                 withContext(Dispatchers.Main) {
                     main_noresult.visibility = View.VISIBLE
                     main_progressbar.hide()
@@ -1098,48 +1075,7 @@ class MainActivity : AppCompatActivity() {
                 for (chunk in chunks)
                     chunk.map { galleryID ->
                         async {
-                            try {
-                                val json = Json(JsonConfiguration.Stable)
-                                val serializer = GalleryBlock.serializer()
-
-                                val galleryBlock =
-                                    File(getCachedGallery(this@MainActivity, galleryID), "galleryBlock.json").let { cache ->
-                                        when {
-                                            cache.exists() -> json.parse(serializer, cache.readText())
-                                            else -> {
-                                                getGalleryBlock(galleryID).apply {
-                                                    this ?: return@apply
-
-                                                    if (cache.parentFile?.exists() == false)
-                                                        cache.parentFile!!.mkdirs()
-
-                                                    cache.writeText(json.stringify(serializer, this))
-                                                }
-                                            }
-                                        }
-                                    } ?: return@async null
-
-                                val thumbnail = async {
-                                    val ext = galleryBlock.thumbnails[0].split('.').last()
-                                    File(getCachedGallery(this@MainActivity, galleryBlock.id), "thumbnail.$ext").apply {
-                                        if (!exists())
-                                            try {
-                                                with(URL(galleryBlock.thumbnails[0]).openConnection() as HttpsURLConnection) {
-                                                    if (this@apply.parentFile?.exists() == false)
-                                                        this@apply.parentFile!!.mkdirs()
-
-                                                    inputStream.copyTo(FileOutputStream(this@apply))
-                                                }
-                                            } catch (e: Exception) {
-                                                delete()
-                                            }
-                                    }.absolutePath
-                                }
-
-                                Pair(galleryBlock, thumbnail)
-                            } catch (e: Exception) {
-                                null
-                            }
+                            Cache(this@MainActivity).getGalleryBlock(galleryID)
                         }
                     }.forEach {
                         val galleryBlock = it.await()

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

@@ -18,15 +18,15 @@
 
 package xyz.quaver.pupil.ui
 
-import android.Manifest
 import android.content.Intent
 import android.graphics.drawable.Animatable
 import android.graphics.drawable.Drawable
-import android.net.Uri
 import android.os.Bundle
 import android.view.*
+import android.widget.Toast
 import androidx.appcompat.app.AlertDialog
 import androidx.appcompat.app.AppCompatActivity
+import androidx.core.content.ContextCompat
 import androidx.preference.PreferenceManager
 import androidx.recyclerview.widget.LinearLayoutManager
 import androidx.recyclerview.widget.PagerSnapHelper
@@ -34,28 +34,27 @@ import androidx.recyclerview.widget.RecyclerView
 import androidx.vectordrawable.graphics.drawable.Animatable2Compat
 import androidx.vectordrawable.graphics.drawable.AnimatedVectorDrawableCompat
 import com.bumptech.glide.Glide
-import com.crashlytics.android.Crashlytics
 import com.google.android.material.snackbar.Snackbar
+import com.google.firebase.crashlytics.FirebaseCrashlytics
 import kotlinx.android.synthetic.main.activity_reader.*
 import kotlinx.android.synthetic.main.activity_reader.view.*
 import kotlinx.android.synthetic.main.dialog_numberpicker.view.*
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
-import kotlinx.serialization.ImplicitReflectionSerializer
+import xyz.quaver.Code
 import xyz.quaver.pupil.Pupil
 import xyz.quaver.pupil.R
 import xyz.quaver.pupil.adapters.ReaderAdapter
-import xyz.quaver.pupil.util.GalleryDownloader
 import xyz.quaver.pupil.util.Histories
-import xyz.quaver.pupil.util.ItemClickSupport
-import xyz.quaver.pupil.util.hasPermission
+import xyz.quaver.pupil.util.download.Cache
+import xyz.quaver.pupil.util.download.DownloadWorker
+import java.util.*
+import kotlin.concurrent.schedule
 
 class ReaderActivity : AppCompatActivity() {
 
     private var galleryID = 0
-    private val images = ArrayList<String>()
-    private var gallerySize = 0
     private var currentPage = 0
 
     private var isScroll = true
@@ -71,7 +70,7 @@ class ReaderActivity : AppCompatActivity() {
         }
     }
 
-    private lateinit var downloader: GalleryDownloader
+    private val timer = Timer()
 
     private val snapHelper = PagerSnapHelper()
 
@@ -95,19 +94,44 @@ class ReaderActivity : AppCompatActivity() {
 
         handleIntent(intent)
 
-        Crashlytics.setInt("GalleryID", galleryID)
+        FirebaseCrashlytics.getInstance().setCustomKey("GalleryID", galleryID)
 
         if (galleryID == 0) {
             onBackPressed()
             return
         }
 
-        initDownloader()
-
         initView()
+        if (PreferenceManager.getDefaultSharedPreferences(this).getBoolean("cache_disable", false)) {
+            reader_download_progressbar.visibility = View.GONE
+            CoroutineScope(Dispatchers.IO).launch {
+                val reader = Cache(this@ReaderActivity).getReader(galleryID)
 
-        if (!downloader.download)
-            downloader.start()
+                launch(Dispatchers.Main) initDownloader@{
+                    if (reader == null) {
+                        Snackbar
+                            .make(reader_layout, R.string.reader_failed_to_find_gallery, Snackbar.LENGTH_INDEFINITE)
+                            .show()
+                        return@initDownloader
+                    }
+
+                    (reader_recyclerview.adapter as ReaderAdapter).apply {
+                        this.reader = reader
+                        notifyDataSetChanged()
+                    }
+                    title = reader.galleryInfo.title ?: ""
+                    menu?.findItem(R.id.reader_menu_page_indicator)?.title = "$currentPage/${reader.galleryInfo.files.size}"
+
+                    menu?.findItem(R.id.reader_type)?.icon = ContextCompat.getDrawable(this@ReaderActivity,
+                        when (reader.code) {
+                            Code.HITOMI -> R.drawable.hitomi
+                            Code.HIYOBI -> R.drawable.ic_hiyobi
+                            else -> android.R.color.transparent
+                        })
+                }
+            }
+        } else
+            initDownloader()
     }
 
     override fun onNewIntent(intent: Intent) {
@@ -120,14 +144,12 @@ class ReaderActivity : AppCompatActivity() {
             val uri = intent.data
             val lastPathSegment = uri?.lastPathSegment
             if (uri != null && lastPathSegment != null) {
-                val nonNumber = Regex("[^-?0-9]+")
-
                 galleryID = when (uri.host) {
-                    "hitomi.la" -> lastPathSegment.replace(nonNumber, "").toInt()
-                    "히요비.asia" -> lastPathSegment.toInt()
-                    "xn--9w3b15m8vo.asia" -> lastPathSegment.toInt()
+                    "hitomi.la" ->
+                        Regex("([0-9]+).html").find(lastPathSegment)?.groupValues?.get(1)?.toIntOrNull() ?: 0
+                    "hiyobi.me" -> lastPathSegment.toInt()
                     "e-hentai.org" -> uri.pathSegments[1].toInt()
-                    else -> return
+                    else -> 0
                 }
             }
         } else {
@@ -148,7 +170,6 @@ class ReaderActivity : AppCompatActivity() {
         super.onResume()
     }
 
-    @UseExperimental(ImplicitReflectionSerializer::class)
     override fun onCreateOptionsMenu(menu: Menu?): Boolean {
         menuInflater.inflate(R.menu.reader, menu)
 
@@ -166,10 +187,10 @@ class ReaderActivity : AppCompatActivity() {
     override fun onOptionsItemSelected(item: MenuItem?): Boolean {
         when(item?.itemId) {
             R.id.reader_menu_page_indicator -> {
-                val view = LayoutInflater.from(this).inflate(R.layout.dialog_numberpicker, findViewById(android.R.id.content), false)
+                val view = LayoutInflater.from(this).inflate(R.layout.dialog_numberpicker, reader_layout, false)
                 with(view.dialog_number_picker) {
                     minValue=1
-                    maxValue=gallerySize
+                    maxValue=Cache(context).getReaderOrNull(galleryID)?.galleryInfo?.files?.size ?: 0
                     value=currentPage
                 }
                 val dialog = AlertDialog.Builder(this).apply {
@@ -202,8 +223,11 @@ class ReaderActivity : AppCompatActivity() {
     override fun onDestroy() {
         super.onDestroy()
 
-        if (::downloader.isInitialized && !downloader.download)
-            downloader.cancel()
+        timer.cancel()
+        (reader_recyclerview?.adapter as? ReaderAdapter)?.timer?.cancel()
+
+        if (!Cache(this).isDownloading(galleryID))
+            DownloadWorker.getInstance(this@ReaderActivity).cancel(galleryID)
     }
 
     override fun onBackPressed() {
@@ -239,101 +263,72 @@ class ReaderActivity : AppCompatActivity() {
     }
 
     private fun initDownloader() {
-        var d: GalleryDownloader? = GalleryDownloader.get(galleryID)
-
-        if (d == null)
-            d = GalleryDownloader(this, galleryID)
-
-        downloader = d.apply {
-            onReaderLoadedHandler = {
-                CoroutineScope(Dispatchers.Main).launch {
-                    title = it.title
-                    with(reader_download_progressbar) {
-                        max = it.readerItems.size
-                        progress = 0
-                    }
-                    with(reader_progressbar) {
-                        max = it.readerItems.size
-                        progress = 0
-                    }
-
-                    gallerySize = it.readerItems.size
-                    menu?.findItem(R.id.reader_menu_page_indicator)?.title = "$currentPage/${it.readerItems.size}"
-                }
-            }
-            onProgressHandler = {
-                CoroutineScope(Dispatchers.Main).launch {
-                    reader_download_progressbar.progress = it
-                    menu?.findItem(R.id.reader_menu_use_hiyobi)?.isVisible = downloader.useHiyobi
-                }
-            }
-            onDownloadedHandler = {
-                val item = it.toList()
-                CoroutineScope(Dispatchers.Main).launch {
-                    if (images.isEmpty()) {
-                        images.addAll(item)
-                        reader_recyclerview.adapter?.notifyDataSetChanged()
-                    } else {
-                        images.add(item.last())
-                        reader_recyclerview.adapter?.notifyItemInserted(images.size-1)
-                    }
-                }
-            }
-            onErrorHandler = {
-                Snackbar
-                    .make(reader_layout, it.message ?: it.javaClass.name, Snackbar.LENGTH_INDEFINITE)
-                    .setAction(R.string.reader_help) { _ ->
-                        startActivity(Intent(Intent.ACTION_VIEW, Uri.parse(getString(R.string.error_help))))
-                    }
-                    .show()
-                downloader.download = false
-            }
-            onCompleteHandler = {
-                CoroutineScope(Dispatchers.Main).launch {
-                    reader_download_progressbar.visibility = View.GONE
-                }
-            }
-            onNotifyChangedHandler = { notify ->
-                val fab = reader_fab_download
-
-                runOnUiThread {
-                    if (notify) {
-                        val icon = AnimatedVectorDrawableCompat.create(this, R.drawable.ic_downloading)
-                        icon?.registerAnimationCallback(object: Animatable2Compat.AnimationCallback() {
-                            override fun onAnimationEnd(drawable: Drawable?) {
-                                if (downloader.download)
-                                    fab.post {
-                                        icon.start()
-                                        fab.labelText = getString(R.string.reader_fab_download_cancel)
-                                    }
-                                else
-                                    fab.post {
-                                        fab.setImageResource(R.drawable.ic_download)
-                                        fab.labelText = getString(R.string.reader_fab_download)
-                                    }
-                            }
-                        })
-
-                        fab.setImageDrawable(icon)
-                        icon?.start()
-                    } else {
-                        runOnUiThread {
-                            fab.setImageResource(R.drawable.ic_download)
-                        }
-                    }
-                }
-            }
+        val worker = DownloadWorker.getInstance(this).apply {
+            queue.add(galleryID)
         }
 
-        if (downloader.download) {
-            downloader.invokeOnReaderLoaded()
-            downloader.invokeOnNotifyChanged()
+        timer.schedule(1000, 1000) {
+            if (worker.progress.indexOfKey(galleryID) < 0)  //loading
+                return@schedule
+
+            if (worker.progress[galleryID] == null) {      //Gallery not found
+                timer.cancel()
+                Snackbar
+                    .make(reader_layout, R.string.reader_failed_to_find_gallery, Snackbar.LENGTH_INDEFINITE)
+                    .show()
+            }
+
+            runOnUiThread {
+                reader_download_progressbar.max = reader_recyclerview.adapter?.itemCount ?: 0
+                reader_download_progressbar.progress = worker.progress[galleryID]?.count { !it.isFinite() } ?: 0
+                reader_progressbar.max = reader_recyclerview.adapter?.itemCount ?: 0
+
+                if (title == getString(R.string.reader_loading)) {
+                    val reader = Cache(this@ReaderActivity).getReaderOrNull(galleryID)
+
+                    if (reader != null) {
+
+                        with (reader_recyclerview.adapter as ReaderAdapter) {
+                            this.reader = reader
+                            notifyDataSetChanged()
+                        }
+
+                        title = reader.galleryInfo.title
+                        menu?.findItem(R.id.reader_menu_page_indicator)?.title = "$currentPage/${reader.galleryInfo.files.size}"
+
+                        menu?.findItem(R.id.reader_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
+                            })
+                    }
+                }
+
+                if (worker.progress[galleryID]?.all { !it.isFinite() } == true) {   //Download finished
+                    reader_download_progressbar.visibility = View.GONE
+
+                    animateDownloadFAB(false)
+                }
+            }
         }
     }
 
     private fun initView() {
         with(reader_recyclerview) {
-            adapter = ReaderAdapter(Glide.with(this@ReaderActivity), galleryID, images)
+            adapter = ReaderAdapter(Glide.with(this@ReaderActivity), galleryID).apply {
+                onItemClickListener = {
+                    if (isScroll) {
+                        isScroll = false
+                        isFullscreen = true
+
+                        scrollMode(false)
+                        fullscreen(true)
+                    } else {
+                        (reader_recyclerview.layoutManager as LinearLayoutManager?)?.scrollToPosition(currentPage) //Moves to next page because currentPage is 1-based indexing
+                    }
+                }
+            }
 
             addOnScrollListener(object: RecyclerView.OnScrollListener() {
                 override fun onScrolled(recyclerView: RecyclerView, dx: Int, dy: Int) {
@@ -349,43 +344,38 @@ class ReaderActivity : AppCompatActivity() {
                     if (layoutManager.findFirstVisibleItemPosition() == -1)
                         return
                     currentPage = layoutManager.findFirstVisibleItemPosition()+1
-                    menu?.findItem(R.id.reader_menu_page_indicator)?.title = "$currentPage/$gallerySize"
+                    menu?.findItem(R.id.reader_menu_page_indicator)?.title = "$currentPage/${recyclerView.adapter!!.itemCount}"
                     this@ReaderActivity.reader_progressbar.progress = currentPage
                 }
             })
-
-            ItemClickSupport.addTo(this)
-                .setOnItemClickListener { _, _, _ ->
-                    if (isScroll) {
-                        isScroll = false
-                        isFullscreen = true
-
-                        scrollMode(false)
-                        fullscreen(true)
-                    } else {
-                        (reader_recyclerview.layoutManager as LinearLayoutManager?)?.scrollToPosition(currentPage) //Moves to next page because currentPage is 1-based indexing
-                    }
-                }
         }
 
         with(reader_fab_download) {
-            setImageResource(R.drawable.ic_download)
+            animateDownloadFAB(Cache(context).isDownloading(galleryID)) //If download in progress, animate button
+
             setOnClickListener {
+                if (PreferenceManager.getDefaultSharedPreferences(context).getBoolean("cache_disable", false))
+                    Toast.makeText(context, R.string.settings_download_when_cache_disable_warning, Toast.LENGTH_SHORT).show()
+                else {
+                    if (Cache(context).isDownloading(galleryID)) {
+                        Cache(context).setDownloading(galleryID, false)
 
-                if (!this@ReaderActivity.hasPermission(Manifest.permission.WRITE_EXTERNAL_STORAGE)) {
-                    AlertDialog.Builder(this@ReaderActivity).apply {
-                        setTitle(R.string.warning)
-                        setMessage(R.string.update_no_permission)
-                        setPositiveButton(android.R.string.ok) { _, _ -> }
-                    }.show()
-
-                    return@setOnClickListener
+                        animateDownloadFAB(false)
+                    } else {
+                        Cache(context).setDownloading(galleryID, true)
+                        animateDownloadFAB(true)
+                    }
                 }
+            }
+        }
 
-                downloader.download = !downloader.download
-
-                if (!downloader.download)
-                    downloader.clearNotification()
+        with(reader_fab_retry) {
+            setImageResource(R.drawable.refresh)
+            setOnClickListener {
+                DownloadWorker.getInstance(context).let {
+                    it.cancel(galleryID)
+                    it.queue.add(galleryID)
+                }
             }
         }
 
@@ -414,6 +404,8 @@ class ReaderActivity : AppCompatActivity() {
 
             window.attributes = this
         }
+
+        reader_recyclerview.adapter = reader_recyclerview.adapter   // Force to redraw
     }
 
     private fun scrollMode(isScroll: Boolean) {
@@ -427,4 +419,34 @@ class ReaderActivity : AppCompatActivity() {
 
         (reader_recyclerview.layoutManager as LinearLayoutManager).scrollToPositionWithOffset(currentPage-1, 0)
     }
+
+    private fun animateDownloadFAB(animate: Boolean) {
+        with(reader_fab_download) {
+            if (animate) {
+                val icon = AnimatedVectorDrawableCompat.create(context, R.drawable.ic_downloading)
+
+                icon?.registerAnimationCallback(object : Animatable2Compat.AnimationCallback() {
+                    override fun onAnimationEnd(drawable: Drawable?) {
+                        val worker = DownloadWorker.getInstance(context)
+                        if (worker.progress[galleryID]?.all { !it.isFinite() } == true) // If download is finished, stop animating
+                            post {
+                                setImageResource(R.drawable.ic_download)
+                                labelText = getString(R.string.reader_fab_download_cancel)
+                            }
+                        else                                                            // Or continue animate
+                            post {
+                                icon.start()
+                                labelText = getString(R.string.reader_fab_download_cancel)
+                            }
+                    }
+                })
+
+                setImageDrawable(icon)
+                icon?.start()
+            } else {
+                setImageResource(R.drawable.ic_download)
+                labelText = getString(R.string.reader_fab_download)
+            }
+        }
+    }
 }

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

@@ -18,36 +18,31 @@
 
 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.Build
 import android.os.Bundle
-import android.text.Editable
-import android.text.TextWatcher
-import android.view.LayoutInflater
 import android.view.MenuItem
 import android.view.WindowManager
-import android.widget.ArrayAdapter
-import android.widget.LinearLayout
-import android.widget.TextView
-import androidx.appcompat.app.AlertDialog
 import androidx.appcompat.app.AppCompatActivity
-import androidx.appcompat.app.AppCompatDelegate
-import androidx.preference.Preference
-import androidx.preference.PreferenceFragmentCompat
 import androidx.preference.PreferenceManager
-import kotlinx.android.synthetic.main.dialog_default_query.view.*
+import com.google.android.material.snackbar.Snackbar
+import kotlinx.android.synthetic.main.settings_activity.*
+import kotlinx.serialization.builtins.list
+import kotlinx.serialization.builtins.serializer
+import net.rdrei.android.dirchooser.DirectoryChooserActivity
 import xyz.quaver.pupil.Pupil
 import xyz.quaver.pupil.R
-import xyz.quaver.pupil.types.Tags
-import xyz.quaver.pupil.util.Lock
-import xyz.quaver.pupil.util.LockManager
-import xyz.quaver.pupil.util.getDownloadDirectory
+import xyz.quaver.pupil.ui.fragment.LockSettingsFragment
+import xyz.quaver.pupil.ui.fragment.SettingsFragment
+import xyz.quaver.pupil.util.*
 import java.io.File
+import java.nio.charset.Charset
 
 class SettingsActivity : AppCompatActivity() {
 
-    val REQUEST_LOCK = 38238
-
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
 
@@ -75,338 +70,6 @@ class SettingsActivity : AppCompatActivity() {
         super.onResume()
     }
 
-    class SettingsFragment : PreferenceFragmentCompat() {
-
-        private val suffix = listOf(
-            "B",
-            "kB",
-            "MB",
-            "GB",
-            "TB" //really?
-        )
-
-        override fun onResume() {
-            super.onResume()
-
-            val lockManager = LockManager(context!!)
-
-            findPreference<Preference>("app_lock")?.summary = if (lockManager.locks.isNullOrEmpty()) {
-                getString(R.string.settings_lock_none)
-            } else {
-                lockManager.locks?.joinToString(", ") {
-                    when(it.type) {
-                        Lock.Type.PATTERN -> getString(R.string.settings_lock_pattern)
-                        Lock.Type.PIN -> getString(R.string.settings_lock_pin)
-                        Lock.Type.PASSWORD -> getString(R.string.settings_lock_password)
-                    }
-                }
-            }
-        }
-
-        private fun getDirSize(dir: File) : String {
-            var size = dir.walk().map { it.length() }.sum()
-            var suffixIndex = 0
-
-            while (size >= 1024) {
-                size /= 1024
-                suffixIndex++
-            }
-
-            return getString(R.string.settings_clear_summary, size, suffix[suffixIndex])
-        }
-
-        override fun onCreatePreferences(savedInstanceState: Bundle?, rootKey: String?) {
-            setPreferencesFromResource(R.xml.root_preferences, rootKey)
-
-            with(findPreference<Preference>("app_version")) {
-                this!!
-
-                val manager = context.packageManager
-                val info = manager.getPackageInfo(context.packageName, 0)
-
-                summary = info.versionName
-            }
-
-            with(findPreference<Preference>("delete_cache")) {
-                this!!
-
-                val dir = File(context.cacheDir, "imageCache")
-
-                summary = getDirSize(dir)
-
-                onPreferenceClickListener = Preference.OnPreferenceClickListener {
-                    AlertDialog.Builder(context).apply {
-                        setTitle(R.string.warning)
-                        setMessage(R.string.settings_clear_cache_alert_message)
-                        setPositiveButton(android.R.string.yes) { _, _ ->
-                            if (dir.exists())
-                                dir.deleteRecursively()
-
-                            summary = getDirSize(dir)
-                        }
-                        setNegativeButton(android.R.string.no) { _, _ -> }
-                    }.show()
-
-                    true
-                }
-            }
-
-            with(findPreference<Preference>("delete_downloads")) {
-                this!!
-
-                val dir = getDownloadDirectory(context)!!
-
-                summary = getDirSize(dir)
-
-                onPreferenceClickListener = Preference.OnPreferenceClickListener {
-                    AlertDialog.Builder(context).apply {
-                        setTitle(R.string.warning)
-                        setMessage(R.string.settings_clear_downloads_alert_message)
-                        setPositiveButton(android.R.string.yes) { _, _ ->
-                            if (dir.exists())
-                                dir.deleteRecursively()
-
-                            val downloads = (activity!!.application as Pupil).downloads
-
-                            downloads.clear()
-
-                            summary = getDirSize(dir)
-                        }
-                        setNegativeButton(android.R.string.no) { _, _ -> }
-                    }.show()
-
-                    true
-                }
-            }
-            with(findPreference<Preference>("clear_history")) {
-                this!!
-
-                val histories = (activity!!.application as Pupil).histories
-
-                summary = getString(R.string.settings_clear_history_summary, histories.size)
-
-                onPreferenceClickListener = Preference.OnPreferenceClickListener {
-                    AlertDialog.Builder(context).apply {
-                        setTitle(R.string.warning)
-                        setMessage(R.string.settings_clear_history_alert_message)
-                        setPositiveButton(android.R.string.yes) { _, _ ->
-                            histories.clear()
-                            summary = getString(R.string.settings_clear_history_summary, histories.size)
-                        }
-                        setNegativeButton(android.R.string.no) { _, _ -> }
-                    }.show()
-
-                    true
-                }
-            }
-
-            with(findPreference<Preference>("default_query")) {
-                this!!
-
-                val preferences = PreferenceManager.getDefaultSharedPreferences(context)
-
-                summary = preferences.getString("default_query", "") ?: ""
-
-                val languages = resources.getStringArray(R.array.languages).map {
-                    it.split("|").let { split ->
-                        Pair(split[0], split[1])
-                    }
-                }.toMap()
-                val reverseLanguages = languages.entries.associate { (k, v) -> v to k }
-
-                val excludeBL = "-male:yaoi"
-                val excludeGuro = listOf("-female:guro", "-male:guro")
-
-                onPreferenceClickListener = Preference.OnPreferenceClickListener {
-                    val dialogView = LayoutInflater.from(context).inflate(
-                        R.layout.dialog_default_query,
-                        LinearLayout(context),
-                        false
-                    )
-
-                    val tags = Tags.parse(
-                        preferences.getString("default_query", "") ?: ""
-                    )
-
-                    summary = tags.toString()
-
-                    with(dialogView.default_query_dialog_language_selector) {
-                        adapter =
-                            ArrayAdapter(
-                                context,
-                                android.R.layout.simple_spinner_dropdown_item,
-                                arrayListOf(
-                                    getString(R.string.default_query_dialog_language_selector_none)
-                                ).apply {
-                                    addAll(languages.values)
-                                }
-                            )
-                        if (tags.any { it.area == "language" && !it.isNegative }) {
-                            val tag = languages[tags.first { it.area == "language" }.tag]
-                            if (tag != null) {
-                                setSelection(
-                                    @Suppress("UNCHECKED_CAST")
-                                    (adapter as ArrayAdapter<String>).getPosition(tag)
-                                )
-                                tags.removeByArea("language", false)
-                            }
-                        }
-                    }
-
-                    with(dialogView.default_query_dialog_BL_checkbox) {
-                        isChecked = tags.contains(excludeBL)
-                        if (tags.contains(excludeBL))
-                            tags.remove(excludeBL)
-                    }
-
-                    with(dialogView.default_query_dialog_guro_checkbox) {
-                        isChecked = excludeGuro.all { tags.contains(it) }
-                        if (excludeGuro.all { tags.contains(it) })
-                            excludeGuro.forEach {
-                                tags.remove(it)
-                            }
-                    }
-
-                    with(dialogView.default_query_dialog_edittext) {
-                        setText(tags.toString(), TextView.BufferType.EDITABLE)
-                        addTextChangedListener(object : TextWatcher {
-                            override fun beforeTextChanged(s: CharSequence?, start: Int, count: Int, after: Int) {}
-
-                            override fun onTextChanged(s: CharSequence?, start: Int, before: Int, count: Int) {}
-
-                            override fun afterTextChanged(s: Editable?) {
-                                s ?: return
-
-                                if (s.any { it.isUpperCase() })
-                                    s.replace(0, s.length, s.toString().toLowerCase())
-                            }
-                        })
-                    }
-
-                    val dialog = AlertDialog.Builder(context!!).apply {
-                        setView(dialogView)
-                    }.create()
-
-                    dialogView.default_query_dialog_ok.setOnClickListener {
-                        val newTags = Tags.parse(dialogView.default_query_dialog_edittext.text.toString())
-
-                        with(dialogView.default_query_dialog_language_selector) {
-                            if (selectedItemPosition != 0)
-                                newTags.add("language:${reverseLanguages[selectedItem]}")
-                        }
-
-                        if (dialogView.default_query_dialog_BL_checkbox.isChecked)
-                            newTags.add(excludeBL)
-
-                        if (dialogView.default_query_dialog_guro_checkbox.isChecked)
-                            excludeGuro.forEach { tag ->
-                                newTags.add(tag)
-                            }
-
-                        preferenceManager.sharedPreferences.edit().putString("default_query", newTags.toString()).apply()
-                        summary = preferences.getString("default_query", "") ?: ""
-                        tags.clear()
-                        tags.addAll(newTags)
-                        dialog.dismiss()
-                    }
-
-                    dialog.show()
-
-                    true
-                }
-            }
-            with(findPreference<Preference>("app_lock")) {
-                this!!
-
-                val lockManager = LockManager(context)
-
-                summary = if (lockManager.locks.isNullOrEmpty()) {
-                    getString(R.string.settings_lock_none)
-                } else {
-                    lockManager.locks?.joinToString(", ") {
-                        when(it.type) {
-                            Lock.Type.PATTERN -> getString(R.string.settings_lock_pattern)
-                            Lock.Type.PIN -> getString(R.string.settings_lock_pin)
-                            Lock.Type.PASSWORD -> getString(R.string.settings_lock_password)
-                        }
-                    }
-                }
-
-                onPreferenceClickListener = Preference.OnPreferenceClickListener {
-                    val intent = Intent(context, LockActivity::class.java)
-                    activity?.startActivityForResult(intent, (activity as SettingsActivity).REQUEST_LOCK)
-
-                    true
-                }
-            }
-
-            with(findPreference<Preference>("dark_mode")) {
-                this!!
-
-                onPreferenceChangeListener = Preference.OnPreferenceChangeListener { _, newValue ->
-                    AppCompatDelegate.setDefaultNightMode(when (newValue as Boolean) {
-                            true -> AppCompatDelegate.MODE_NIGHT_YES
-                            false -> AppCompatDelegate.MODE_NIGHT_NO
-                    })
-
-                    true
-                }
-            }
-        }
-    }
-
-    class LockFragment : PreferenceFragmentCompat() {
-
-        override fun onResume() {
-            super.onResume()
-
-            val lockManager = LockManager(context!!)
-
-            findPreference<Preference>("lock_pattern")?.summary =
-                if (lockManager.contains(Lock.Type.PATTERN))
-                    getString(R.string.settings_lock_enabled)
-                else
-                    ""
-        }
-
-        override fun onCreatePreferences(savedInstanceState: Bundle?, rootKey: String?) {
-            setPreferencesFromResource(R.xml.lock_preferences, rootKey)
-
-            with(findPreference<Preference>("lock_pattern")) {
-                this!!
-
-                if (LockManager(context!!).contains(Lock.Type.PATTERN))
-                    summary = getString(R.string.settings_lock_enabled)
-
-                onPreferenceClickListener = Preference.OnPreferenceClickListener {
-                    val lockManager = LockManager(context!!)
-
-                    if (lockManager.contains(Lock.Type.PATTERN)) {
-                        AlertDialog.Builder(context).apply {
-                            setTitle(R.string.warning)
-                            setMessage(R.string.settings_lock_remove_message)
-
-                            setPositiveButton(android.R.string.yes) { _, _ ->
-                                lockManager.remove(Lock.Type.PATTERN)
-                                onResume()
-                            }
-                            setNegativeButton(android.R.string.no) { _, _ -> }
-                        }.show()
-                    } else {
-                        val intent = Intent(context, LockActivity::class.java).apply {
-                            putExtra("mode", "add_lock")
-                            putExtra("type", "pattern")
-                        }
-
-                        startActivity(intent)
-                    }
-
-                    true
-                }
-            }
-        }
-    }
-
     override fun onOptionsItemSelected(item: MenuItem?): Boolean {
         when (item?.itemId) {
             android.R.id.home -> onBackPressed()
@@ -421,12 +84,131 @@ class SettingsActivity : AppCompatActivity() {
                 if (resultCode == Activity.RESULT_OK) {
                     supportFragmentManager
                         .beginTransaction()
-                        .replace(R.id.settings, LockFragment())
+                        .replace(R.id.settings, LockSettingsFragment())
                         .addToBackStack("Lock")
                         .commitAllowingStateLoss()
                 }
             }
+            REQUEST_RESTORE -> {
+                if (resultCode == Activity.RESULT_OK) {
+                    val uri = data?.data ?: return
+
+                    try {
+                        val str = contentResolver.openInputStream(uri).use { inputStream ->
+                            inputStream!!
+
+                            inputStream.readBytes().toString(Charset.defaultCharset())
+                        }
+
+                        (application as Pupil).favorites.addAll(json.parse(Int.serializer().list, str).also {
+                            Snackbar.make(
+                                window.decorView,
+                                getString(R.string.settings_restore_successful, it.size),
+                                Snackbar.LENGTH_LONG
+                            ).show()
+                        })
+                    } catch (e: Exception) {
+                        Snackbar.make(
+                            window.decorView,
+                            R.string.settings_restore_failed,
+                            Snackbar.LENGTH_LONG
+                        ).show()
+                    }
+                }
+            }
+            REQUEST_DOWNLOAD_FOLDER -> {
+                if (resultCode == Activity.RESULT_OK) {
+                    data?.data?.also { uri ->
+                        val takeFlags: Int =
+                            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)
+                            contentResolver.takePersistableUriPermission(uri, takeFlags)
+
+                        val file = uri.toFile(this)
+
+                        if (file?.canWrite() != true)
+                            Snackbar.make(
+                                settings,
+                                R.string.settings_dl_location_not_writable,
+                                Snackbar.LENGTH_LONG
+                            ).show()
+                        else
+                            PreferenceManager.getDefaultSharedPreferences(this).edit()
+                                .putString("dl_location", file.canonicalPath)
+                                .apply()
+                    }
+                }
+            }
+            REQUEST_DOWNLOAD_FOLDER_OLD -> {
+                if (resultCode == DirectoryChooserActivity.RESULT_CODE_DIR_SELECTED) {
+                    val directory = data?.getStringExtra(DirectoryChooserActivity.RESULT_SELECTED_DIR)!!
+
+                    if (!File(directory).canWrite())
+                        Snackbar.make(
+                            settings,
+                            R.string.settings_dl_location_not_writable,
+                            Snackbar.LENGTH_LONG
+                        ).show()
+                    else
+                        PreferenceManager.getDefaultSharedPreferences(this).edit()
+                            .putString("dl_location", File(directory).canonicalPath)
+                            .apply()
+                }
+            }
+            REQUEST_IMPORT_OLD_GALLERIES -> {
+                if (resultCode == Activity.RESULT_OK) {
+                    data?.data?.also { uri ->
+                        val takeFlags: Int =
+                            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)
+                            contentResolver.takePersistableUriPermission(uri, takeFlags)
+
+                        val file = uri.toFile(this)
+
+                        if (file?.canRead() != true)
+                            Snackbar.make(
+                                settings,
+                                resources.getText(R.string.import_old_galleries_folder_not_readable),
+                                Snackbar.LENGTH_LONG
+                            ).show()
+                        else
+                            importOldGalleries(this, file)
+                    }
+                }
+            }
+            REQUEST_IMPORT_OLD_GALLERIES_OLD -> {
+                if (resultCode == DirectoryChooserActivity.RESULT_CODE_DIR_SELECTED) {
+                    val directory = data?.getStringExtra(DirectoryChooserActivity.RESULT_SELECTED_DIR)!!
+
+                    if (!File(directory).canRead())
+                        Snackbar.make(
+                            settings,
+                            resources.getText(R.string.import_old_galleries_folder_not_readable),
+                            Snackbar.LENGTH_LONG
+                        ).show()
+                    else {
+                        importOldGalleries(this, File(directory))
+                    }
+                }
+            }
             else -> super.onActivityResult(requestCode, resultCode, data)
         }
     }
+
+    @SuppressLint("InlinedApi")
+    override fun onRequestPermissionsResult(requestCode: Int, permissions: Array<out String>, grantResults: IntArray) {
+        when (requestCode) {
+            REQUEST_WRITE_PERMISSION_AND_SAF -> {
+                if (grantResults.firstOrNull() == PackageManager.PERMISSION_GRANTED) {
+                    val intent = Intent(Intent.ACTION_OPEN_DOCUMENT_TREE).apply {
+                        putExtra("android.content.extra.SHOW_ADVANCED", true)
+                    }
+
+                    startActivityForResult(intent, REQUEST_DOWNLOAD_FOLDER)
+                }
+            }
+        }
+    }
 }

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

@@ -0,0 +1,166 @@
+/*
+ *     Pupil, Hitomi.la viewer for Android
+ *     Copyright (C) 2020  tom5079
+ *
+ *     This program is free software: you can redistribute it and/or modify
+ *     it under the terms of the GNU General Public License as published by
+ *     the Free Software Foundation, either version 3 of the License, or
+ *     (at your option) any later version.
+ *
+ *     This program is distributed in the hope that it will be useful,
+ *     but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *     GNU General Public License for more details.
+ *
+ *     You should have received a copy of the GNU General Public License
+ *     along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package xyz.quaver.pupil.ui.dialog
+
+import android.annotation.SuppressLint
+import android.app.Dialog
+import android.content.Context
+import android.os.Bundle
+import android.text.Editable
+import android.text.TextWatcher
+import android.view.LayoutInflater
+import android.view.View
+import android.widget.ArrayAdapter
+import androidx.appcompat.app.AlertDialog
+import androidx.preference.PreferenceManager
+import kotlinx.android.synthetic.main.dialog_default_query.*
+import kotlinx.android.synthetic.main.dialog_default_query.view.*
+import xyz.quaver.pupil.R
+import xyz.quaver.pupil.types.Tags
+
+class DefaultQueryDialog(context : Context) : AlertDialog(context) {
+
+    private val languages = context.resources.getStringArray(R.array.languages).map {
+        it.split("|").let { split ->
+            Pair(split[0], split[1])
+        }
+    }.toMap()
+    private val reverseLanguages = languages.entries.associate { (k, v) -> v to k }
+
+    private val excludeBL = "-male:yaoi"
+    private val excludeGuro = listOf("-female:guro", "-male:guro")
+    private val excludeLoli = listOf("-female:loli", "-male:shota")
+
+    var onPositiveButtonClickListener : ((Tags) -> (Unit))? = null
+
+    @SuppressLint("InflateParams")
+    override fun onCreate(savedInstanceState: Bundle?) {
+        setTitle(R.string.default_query_dialog_title)
+        setView(build())
+        setButton(Dialog.BUTTON_POSITIVE, context.getString(android.R.string.ok)) { _, _ ->
+            val newTags = Tags.parse(default_query_dialog_edittext.text.toString())
+
+            with(default_query_dialog_language_selector) {
+                if (selectedItemPosition != 0)
+                    newTags.add("language:${reverseLanguages[selectedItem]}")
+            }
+
+            if (default_query_dialog_BL_checkbox.isChecked)
+                newTags.add(excludeBL)
+
+            if (default_query_dialog_guro_checkbox.isChecked)
+                excludeGuro.forEach { tag ->
+                    newTags.add(tag)
+                }
+
+            if (default_query_dialog_loli_checkbox.isChecked)
+                excludeLoli.forEach { tag ->
+                    newTags.add(tag)
+                }
+
+            onPositiveButtonClickListener?.invoke(newTags)
+        }
+
+        super.onCreate(savedInstanceState)
+    }
+
+    @SuppressLint("InflateParams")
+    private fun build() : View {
+        val preferences = PreferenceManager.getDefaultSharedPreferences(context)
+        val tags = Tags.parse(
+            preferences.getString("default_query", "") ?: ""
+        )
+
+        val view = LayoutInflater.from(context).inflate(R.layout.dialog_default_query, null)
+
+        with(view.default_query_dialog_language_selector) {
+            adapter =
+                ArrayAdapter(
+                    context,
+                    android.R.layout.simple_spinner_dropdown_item,
+                    arrayListOf(
+                        context.getString(R.string.default_query_dialog_language_selector_none)
+                    ).apply {
+                        addAll(languages.values)
+                    }
+                )
+            if (tags.any { it.area == "language" && !it.isNegative }) {
+                val tag = languages[tags.first { it.area == "language" }.tag]
+                if (tag != null) {
+                    setSelection(
+                        @Suppress("UNCHECKED_CAST")
+                        (adapter as ArrayAdapter<String>).getPosition(tag)
+                    )
+                    tags.removeByArea("language", false)
+                }
+            }
+        }
+
+        with(view.default_query_dialog_BL_checkbox) {
+            isChecked = tags.contains(excludeBL)
+            if (tags.contains(excludeBL))
+                tags.remove(excludeBL)
+        }
+
+        with(view.default_query_dialog_guro_checkbox) {
+            isChecked = excludeGuro.all { tags.contains(it) }
+            if (excludeGuro.all { tags.contains(it) })
+                excludeGuro.forEach {
+                    tags.remove(it)
+                }
+        }
+
+        with(view.default_query_dialog_loli_checkbox) {
+            isChecked = excludeLoli.all { tags.contains(it) }
+            if (excludeLoli.all { tags.contains(it) })
+                excludeLoli.forEach {
+                    tags.remove(it)
+                }
+        }
+
+        with(view.default_query_dialog_edittext) {
+            setText(tags.toString(), android.widget.TextView.BufferType.EDITABLE)
+            addTextChangedListener(object : TextWatcher {
+                override fun beforeTextChanged(
+                    s: CharSequence?,
+                    start: Int,
+                    count: Int,
+                    after: Int
+                ) {
+                }
+
+                override fun onTextChanged(s: CharSequence?, start: Int, before: Int, count: Int) {}
+
+                override fun afterTextChanged(s: Editable?) {
+                    s ?: return
+
+                    if (s.any { it.isUpperCase() })
+                        s.replace(
+                            0,
+                            s.length,
+                            s.toString().toLowerCase(java.util.Locale.getDefault())
+                        )
+                }
+            })
+        }
+
+        return view
+    }
+
+}

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

@@ -0,0 +1,138 @@
+/*
+ *     Pupil, Hitomi.la viewer for Android
+ *     Copyright (C) 2020  tom5079
+ *
+ *     This program is free software: you can redistribute it and/or modify
+ *     it under the terms of the GNU General Public License as published by
+ *     the Free Software Foundation, either version 3 of the License, or
+ *     (at your option) any later version.
+ *
+ *     This program is distributed in the hope that it will be useful,
+ *     but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *     GNU General Public License for more details.
+ *
+ *     You should have received a copy of the GNU General Public License
+ *     along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package xyz.quaver.pupil.ui.dialog
+
+import android.Manifest
+import android.annotation.SuppressLint
+import android.app.Activity
+import android.app.Dialog
+import android.content.Intent
+import android.content.pm.PackageManager
+import android.os.Build
+import android.os.Bundle
+import android.view.View
+import android.widget.LinearLayout
+import android.widget.RadioButton
+import androidx.appcompat.app.AlertDialog
+import androidx.core.app.ActivityCompat
+import androidx.core.content.ContextCompat
+import androidx.preference.PreferenceManager
+import kotlinx.android.synthetic.main.item_dl_location.view.*
+import net.rdrei.android.dirchooser.DirectoryChooserActivity
+import net.rdrei.android.dirchooser.DirectoryChooserConfig
+import xyz.quaver.pupil.R
+import xyz.quaver.pupil.util.*
+import java.io.File
+
+@SuppressLint("InflateParams")
+class DownloadLocationDialog(val activity: Activity) : AlertDialog(activity) {
+
+    private val preference = PreferenceManager.getDefaultSharedPreferences(context)
+    private val buttons = mutableListOf<Pair<RadioButton, File?>>()
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        setTitle(R.string.settings_dl_location)
+
+        setView(build())
+
+        setButton(Dialog.BUTTON_POSITIVE, context.getText(android.R.string.ok)) { _, _ -> }
+
+        super.onCreate(savedInstanceState)
+    }
+
+    private fun build() : View {
+        val view = layoutInflater.inflate(R.layout.dialog_dl_location, null) as LinearLayout
+
+        val externalFilesDirs = ContextCompat.getExternalFilesDirs(context, null)
+
+        externalFilesDirs.forEachIndexed { index, dir ->
+
+            dir ?: return@forEachIndexed
+
+            view.addView(layoutInflater.inflate(R.layout.item_dl_location, view, false).apply {
+                location_type.text = context.getString(when (index) {
+                    0 -> R.string.settings_dl_location_internal
+                    else -> R.string.settings_dl_location_removable
+                })
+                location_available.text = context.getString(
+                    R.string.settings_dl_location_available,
+                    byteToString(dir.freeSpace)
+                )
+                setOnClickListener {
+                    buttons.forEach { pair ->
+                        pair.first.isChecked = false
+                    }
+                    button.performClick()
+                    preference.edit().putString("dl_location", dir.canonicalPath).apply()
+                }
+                buttons.add(button to dir)
+            })
+        }
+
+        view.addView(layoutInflater.inflate(R.layout.item_dl_location, view, false).apply {
+            location_type.text = context.getString(R.string.settings_dl_location_custom)
+            setOnClickListener {
+                buttons.forEach { pair ->
+                    pair.first.isChecked = false
+                }
+                button.performClick()
+
+                if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
+
+                    if (ContextCompat.checkSelfPermission(context, Manifest.permission.WRITE_EXTERNAL_STORAGE) != PackageManager.PERMISSION_GRANTED)
+                        ActivityCompat.requestPermissions(activity, arrayOf(Manifest.permission.WRITE_EXTERNAL_STORAGE), REQUEST_WRITE_PERMISSION_AND_SAF)
+                    else {
+                        val intent = Intent(Intent.ACTION_OPEN_DOCUMENT_TREE).apply {
+                            putExtra("android.content.extra.SHOW_ADVANCED", true)
+                        }
+
+                        activity.startActivityForResult(intent, REQUEST_DOWNLOAD_FOLDER)
+                    }
+
+                    dismiss()
+                } else {    // Can't use SAF on old Androids!
+                    val config = DirectoryChooserConfig.builder()
+                        .newDirectoryName("Pupil")
+                        .allowNewDirectoryNameModification(true)
+                        .build()
+
+                    val intent = Intent(context, DirectoryChooserActivity::class.java).apply {
+                        putExtra(DirectoryChooserActivity.EXTRA_CONFIG, config)
+                    }
+
+                    activity.startActivityForResult(intent, REQUEST_DOWNLOAD_FOLDER_OLD)
+                    dismiss()
+                }
+            }
+            buttons.add(button to null)
+        })
+
+        externalFilesDirs.indexOfFirst {
+            it.canonicalPath == getDownloadDirectory(context).canonicalPath
+        }.let { index ->
+            if (index < 0)
+                buttons.first().first.isChecked = true
+            else
+                buttons[index].first.isChecked = true
+        }
+
+        return view
+    }
+
+}

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

@@ -1,6 +1,6 @@
 /*
  *     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
@@ -16,44 +16,44 @@
  *     along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package xyz.quaver.pupil.ui
+package xyz.quaver.pupil.ui.dialog
 
 import android.app.Dialog
 import android.content.Context
 import android.content.Intent
 import android.os.Bundle
-import android.view.Gravity
 import android.view.LayoutInflater
 import android.view.View
-import android.widget.ImageView
-import android.widget.LinearLayout
 import android.widget.LinearLayout.LayoutParams
 import androidx.core.content.ContextCompat
-import androidx.gridlayout.widget.GridLayout
 import androidx.recyclerview.widget.GridLayoutManager
 import androidx.recyclerview.widget.LinearLayoutManager
 import androidx.recyclerview.widget.RecyclerView
-import com.bumptech.glide.Glide
 import com.bumptech.glide.RequestManager
 import com.google.android.material.chip.Chip
 import com.google.android.material.snackbar.Snackbar
-import kotlinx.android.synthetic.main.dialog_galleryblock.*
+import kotlinx.android.synthetic.main.dialog_gallery.*
 import kotlinx.android.synthetic.main.gallery_details.view.*
 import kotlinx.android.synthetic.main.item_gallery_details.view.*
-import kotlinx.coroutines.*
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.async
+import kotlinx.coroutines.launch
 import xyz.quaver.hitomi.Gallery
 import xyz.quaver.hitomi.GalleryBlock
 import xyz.quaver.hitomi.getGallery
-import xyz.quaver.hitomi.getGalleryBlock
+import xyz.quaver.pupil.BuildConfig
 import xyz.quaver.pupil.Pupil
 import xyz.quaver.pupil.R
 import xyz.quaver.pupil.adapters.GalleryBlockAdapter
 import xyz.quaver.pupil.adapters.ThumbnailAdapter
 import xyz.quaver.pupil.types.Tag
+import xyz.quaver.pupil.ui.ReaderActivity
 import xyz.quaver.pupil.util.ItemClickSupport
+import xyz.quaver.pupil.util.download.Cache
 import xyz.quaver.pupil.util.wordCapitalize
 
-class GalleryDialog(context: Context, private val galleryID: Int) : Dialog(context) {
+class GalleryDialog(context: Context, private val glide: RequestManager, private val galleryID: Int) : Dialog(context) {
 
     private val languages = context.resources.getStringArray(R.array.languages).map {
         it.split("|").let { split ->
@@ -61,13 +61,11 @@ class GalleryDialog(context: Context, private val galleryID: Int) : Dialog(conte
         }
     }.toMap()
 
-    private val glide = Glide.with(context)
-
     val onChipClickedHandler = ArrayList<((Tag) -> (Unit))>()
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
-        setContentView(R.layout.dialog_galleryblock)
+        setContentView(R.layout.dialog_gallery)
 
         window?.attributes.apply {
             this ?: return@apply
@@ -90,7 +88,7 @@ class GalleryDialog(context: Context, private val galleryID: Int) : Dialog(conte
             try {
                 val gallery = getGallery(galleryID)
 
-                launch(Dispatchers.Main) {
+                gallery_cover.post {
                     gallery_progressbar.visibility = View.GONE
                     gallery_title.text = gallery.title
                     gallery_artist.text = gallery.artists.joinToString(", ") { it.wordCapitalize() }
@@ -112,9 +110,12 @@ class GalleryDialog(context: Context, private val galleryID: Int) : Dialog(conte
                         }
                     }
 
-                    Glide.with(context)
-                        .load(gallery.thumbnails.firstOrNull())
-                        .into(gallery_thumbnail)
+                    glide
+                        .load(gallery.cover)
+                        .apply {
+                            if (BuildConfig.CENSOR)
+                                override(5, 8)
+                        }.into(gallery_cover)
 
                     addDetails(gallery)
                     addThumbnails(gallery)
@@ -168,12 +169,12 @@ class GalleryDialog(context: Context, private val galleryID: Int) : Dialog(conte
                                     "male" -> {
                                         setChipBackgroundColorResource(R.color.material_blue_700)
                                         setTextColor(ContextCompat.getColor(context, android.R.color.white))
-                                        ContextCompat.getDrawable(context, R.drawable.ic_gender_male_white)
+                                        ContextCompat.getDrawable(context, R.drawable.gender_male)
                                     }
                                     "female" -> {
                                         setChipBackgroundColorResource(R.color.material_pink_600)
                                         setTextColor(ContextCompat.getColor(context, android.R.color.white))
-                                        ContextCompat.getDrawable(context, R.drawable.ic_gender_female_white)
+                                        ContextCompat.getDrawable(context, R.drawable.gender_female)
                                     }
                                     else -> null
                                 }
@@ -183,6 +184,8 @@ class GalleryDialog(context: Context, private val galleryID: Int) : Dialog(conte
                                     else -> tag.tag.wordCapitalize()
                                 }
 
+                                setEnsureMinTouchTargetSize(false)
+
                                 setOnClickListener {
                                     onChipClickedHandler.forEach { handler ->
                                         handler.invoke(tag)
@@ -219,7 +222,7 @@ class GalleryDialog(context: Context, private val galleryID: Int) : Dialog(conte
 
     private fun addRelated(gallery: Gallery) {
         val inflater = LayoutInflater.from(context)
-        val galleries = ArrayList<Pair<GalleryBlock, Deferred<String>>>()
+        val galleries = ArrayList<GalleryBlock>()
 
         val adapter = GalleryBlockAdapter(glide, galleries).apply {
             onChipClickedHandler.add { tag ->
@@ -232,11 +235,11 @@ class GalleryDialog(context: Context, private val galleryID: Int) : Dialog(conte
         CoroutineScope(Dispatchers.Main).launch {
             gallery.related.forEachIndexed { i, galleryID ->
                 async(Dispatchers.IO) {
-                    getGalleryBlock(galleryID)
+                    Cache(context).getGalleryBlock(galleryID)
                 }.let {
                     val galleryBlock = it.await() ?: return@let
 
-                    galleries.add(Pair(galleryBlock, GlobalScope.async { galleryBlock.thumbnails.first() }))
+                    galleries.add(galleryBlock)
                     adapter.notifyItemInserted(i)
                 }
             }
@@ -252,12 +255,16 @@ class GalleryDialog(context: Context, private val galleryID: Int) : Dialog(conte
                 ItemClickSupport.addTo(this)
                     .setOnItemClickListener { _, position, _ ->
                         context.startActivity(Intent(context, ReaderActivity::class.java).apply {
-                            putExtra("galleryID", galleries[position].first.id)
+                            putExtra("galleryID", galleries[position].id)
                         })
-                        (context.applicationContext as Pupil).histories.add(galleries[position].first.id)
+                        (context.applicationContext as Pupil).histories.add(galleries[position].id)
                     }
                     .setOnItemLongClickListener { _, position, _ ->
-                        GalleryDialog(context, galleries[position].first.id).apply {
+                        GalleryDialog(
+                            context,
+                            glide,
+                            galleries[position].id
+                        ).apply {
                             onChipClickedHandler.add { tag ->
                                 this@GalleryDialog.onChipClickedHandler.forEach { it.invoke(tag) }
                             }

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

@@ -0,0 +1,94 @@
+/*
+ *     Pupil, Hitomi.la viewer for Android
+ *     Copyright (C) 2020  tom5079
+ *
+ *     This program is free software: you can redistribute it and/or modify
+ *     it under the terms of the GNU General Public License as published by
+ *     the Free Software Foundation, either version 3 of the License, or
+ *     (at your option) any later version.
+ *
+ *     This program is distributed in the hope that it will be useful,
+ *     but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *     GNU General Public License for more details.
+ *
+ *     You should have received a copy of the GNU General Public License
+ *     along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package xyz.quaver.pupil.ui.dialog
+
+import android.annotation.SuppressLint
+import android.app.Dialog
+import android.content.Context
+import android.os.Bundle
+import android.view.View
+import androidx.appcompat.app.AlertDialog
+import androidx.preference.PreferenceManager
+import androidx.recyclerview.widget.DividerItemDecoration
+import androidx.recyclerview.widget.ItemTouchHelper
+import androidx.recyclerview.widget.LinearLayoutManager
+import androidx.recyclerview.widget.RecyclerView
+import xyz.quaver.pupil.R
+import xyz.quaver.pupil.adapters.MirrorAdapter
+
+class MirrorDialog(context: Context) : AlertDialog(context) {
+
+    class ItemTouchHelperCallback : ItemTouchHelper.Callback() {
+
+        var onMoveItem : ((Int, Int) -> (Unit))? = null
+
+        override fun getMovementFlags(
+            recyclerView: RecyclerView,
+            viewHolder: RecyclerView.ViewHolder
+        ) = makeMovementFlags(ItemTouchHelper.UP or ItemTouchHelper.DOWN, 0)
+
+        override fun onMove(
+            recyclerView: RecyclerView,
+            viewHolder: RecyclerView.ViewHolder,
+            target: RecyclerView.ViewHolder
+        ): Boolean {
+            onMoveItem?.invoke(viewHolder.adapterPosition, target.adapterPosition)
+            return true
+        }
+
+        override fun onSwiped(viewHolder: RecyclerView.ViewHolder, direction: Int) {
+
+        }
+    }
+
+    @SuppressLint("InflateParams")
+    override fun onCreate(savedInstanceState: Bundle?) {
+        setTitle(R.string.settings_mirror_title)
+        setView(build())
+        setButton(Dialog.BUTTON_POSITIVE, context.getString(android.R.string.ok)) { _, _ -> }
+
+        super.onCreate(savedInstanceState)
+    }
+
+    private fun build() : View {
+        return RecyclerView(context).apply recyclerview@{
+            addItemDecoration(DividerItemDecoration(context, DividerItemDecoration.VERTICAL))
+            layoutManager = LinearLayoutManager(context)
+            adapter = MirrorAdapter(context).apply adapter@{
+                val itemTouchHelper = ItemTouchHelper(ItemTouchHelperCallback().apply {
+                    onMoveItem = this@adapter.onItemMove
+                }).apply {
+                    attachToRecyclerView(this@recyclerview)
+                }
+
+                onStartDrag = {
+                    itemTouchHelper.startDrag(it)
+                }
+
+                onItemMoved = {
+                    PreferenceManager.getDefaultSharedPreferences(context)
+                        .edit()
+                        .putString("mirrors", it.joinToString(">"))
+                        .apply()
+                }
+            }
+        }
+    }
+
+}

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

@@ -0,0 +1,133 @@
+/*
+ *     Pupil, Hitomi.la viewer for Android
+ *     Copyright (C) 2020  tom5079
+ *
+ *     This program is free software: you can redistribute it and/or modify
+ *     it under the terms of the GNU General Public License as published by
+ *     the Free Software Foundation, either version 3 of the License, or
+ *     (at your option) any later version.
+ *
+ *     This program is distributed in the hope that it will be useful,
+ *     but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *     GNU General Public License for more details.
+ *
+ *     You should have received a copy of the GNU General Public License
+ *     along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package xyz.quaver.pupil.ui.dialog
+
+import android.annotation.SuppressLint
+import android.app.Dialog
+import android.content.Context
+import android.os.Bundle
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import android.widget.AdapterView
+import android.widget.ArrayAdapter
+import androidx.preference.PreferenceManager
+import kotlinx.android.synthetic.main.dialog_proxy.view.*
+import xyz.quaver.proxy
+import xyz.quaver.pupil.R
+import xyz.quaver.pupil.util.ProxyInfo
+import xyz.quaver.pupil.util.getProxyInfo
+import xyz.quaver.pupil.util.json
+import java.net.Proxy
+
+class ProxyDialog(context: Context) : Dialog(context) {
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        val view = build()
+
+        setTitle(R.string.settings_proxy_title)
+        setContentView(view)
+
+        window?.attributes?.width = ViewGroup.LayoutParams.MATCH_PARENT
+
+        super.onCreate(savedInstanceState)
+    }
+
+    @SuppressLint("InflateParams")
+    private fun build() : View {
+        val proxyInfo = getProxyInfo(context)
+
+        val view = LayoutInflater.from(context).inflate(R.layout.dialog_proxy, null)
+
+        val enabler = { enable: Boolean ->
+            view?.proxy_addr?.isEnabled = enable
+            view?.proxy_port?.isEnabled = enable
+            view?.proxy_username?.isEnabled = enable
+            view?.proxy_password?.isEnabled = enable
+
+            if (!enable) {
+                view?.proxy_addr?.text = null
+                view?.proxy_port?.text = null
+                view?.proxy_username?.text = null
+                view?.proxy_password?.text = null
+            }
+        }
+
+        with(view.proxy_type_selector) {
+            adapter = ArrayAdapter(
+                context,
+                android.R.layout.simple_spinner_dropdown_item,
+                context.resources.getStringArray(R.array.proxy_type)
+            )
+
+            setSelection(proxyInfo.type.ordinal)
+
+            onItemSelectedListener = object: AdapterView.OnItemSelectedListener {
+                override fun onItemSelected(parent: AdapterView<*>?, view: View?, position: Int, id: Long) {
+                    enabler.invoke(position != 0)
+                }
+
+                override fun onNothingSelected(parent: AdapterView<*>?) {}
+            }
+        }
+
+        view.proxy_addr.setText(proxyInfo.host)
+        view.proxy_port.setText(proxyInfo.port?.toString())
+        view.proxy_username.setText(proxyInfo.username)
+        view.proxy_password.setText(proxyInfo.password)
+
+        enabler.invoke(proxyInfo.type != Proxy.Type.DIRECT)
+
+        view.proxy_cancel.setOnClickListener {
+            dismiss()
+        }
+
+        view.proxy_ok.setOnClickListener {
+            val type = Proxy.Type.values()[view.proxy_type_selector.selectedItemPosition]
+            val addr = view.proxy_addr.text?.toString()
+            val port = view.proxy_port.text?.toString()?.toIntOrNull()
+            val username = view.proxy_username.text?.toString()
+            val password = view.proxy_password.text?.toString()
+
+            if (type != Proxy.Type.DIRECT) {
+                if (addr == null || addr.isEmpty())
+                    view.proxy_addr.error = context.getText(R.string.proxy_dialog_error)
+                if (port == null)
+                    view.proxy_port.error = context.getText(R.string.proxy_dialog_error)
+
+                if (addr == null || addr.isEmpty() || port == null)
+                    return@setOnClickListener
+            }
+
+            ProxyInfo(type, addr, port, username, password).let {
+
+                PreferenceManager.getDefaultSharedPreferences(context).edit().putString("proxy",
+                    json.stringify(ProxyInfo.serializer(), it)
+                ).apply()
+
+                proxy = it.proxy()
+            }
+
+            dismiss()
+        }
+
+        return view
+    }
+
+}

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

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

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

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

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

@@ -16,7 +16,7 @@
  *     along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package xyz.quaver.pupil.ui
+package xyz.quaver.pupil.ui.fragment
 
 import android.os.Bundle
 import android.view.LayoutInflater
@@ -29,8 +29,6 @@ import com.andrognito.patternlockview.utils.PatternLockUtils
 import kotlinx.android.synthetic.main.fragment_pattern_lock.*
 import kotlinx.android.synthetic.main.fragment_pattern_lock.view.*
 import xyz.quaver.pupil.R
-import xyz.quaver.pupil.util.hash
-import xyz.quaver.pupil.util.hashWithSalt
 
 class PatternLockFragment : Fragment(), PatternLockViewListener {
 

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

@@ -0,0 +1,355 @@
+/*
+ *     Pupil, Hitomi.la viewer for Android
+ *     Copyright (C) 2020  tom5079
+ *
+ *     This program is free software: you can redistribute it and/or modify
+ *     it under the terms of the GNU General Public License as published by
+ *     the Free Software Foundation, either version 3 of the License, or
+ *     (at your option) any later version.
+ *
+ *     This program is distributed in the hope that it will be useful,
+ *     but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *     GNU General Public License for more details.
+ *
+ *     You should have received a copy of the GNU General Public License
+ *     along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package xyz.quaver.pupil.ui.fragment
+
+import android.Manifest
+import android.content.*
+import android.content.pm.PackageManager
+import android.os.Build
+import android.os.Bundle
+import android.widget.Toast
+import androidx.appcompat.app.AlertDialog
+import androidx.appcompat.app.AppCompatDelegate
+import androidx.core.app.ActivityCompat
+import androidx.core.content.ContextCompat
+import androidx.preference.Preference
+import androidx.preference.PreferenceCategory
+import androidx.preference.PreferenceFragmentCompat
+import androidx.preference.PreferenceManager
+import com.google.android.material.snackbar.Snackbar
+import net.rdrei.android.dirchooser.DirectoryChooserActivity
+import net.rdrei.android.dirchooser.DirectoryChooserConfig
+import xyz.quaver.pupil.Pupil
+import xyz.quaver.pupil.R
+import xyz.quaver.pupil.ui.LockActivity
+import xyz.quaver.pupil.ui.SettingsActivity
+import xyz.quaver.pupil.ui.dialog.DefaultQueryDialog
+import xyz.quaver.pupil.ui.dialog.DownloadLocationDialog
+import xyz.quaver.pupil.ui.dialog.MirrorDialog
+import xyz.quaver.pupil.ui.dialog.ProxyDialog
+import xyz.quaver.pupil.util.*
+import java.io.File
+
+
+class SettingsFragment :
+    PreferenceFragmentCompat(),
+    Preference.OnPreferenceClickListener,
+    Preference.OnPreferenceChangeListener,
+    SharedPreferences.OnSharedPreferenceChangeListener {
+
+    lateinit var sharedPreference: SharedPreferences
+
+    override fun onResume() {
+        super.onResume()
+
+        val lockManager = LockManager(requireContext())
+
+        findPreference<Preference>("app_lock")?.summary = if (lockManager.locks.isNullOrEmpty()) {
+            getString(R.string.settings_lock_none)
+        } else {
+            lockManager.locks?.joinToString(", ") {
+                when(it.type) {
+                    Lock.Type.PATTERN -> getString(R.string.settings_lock_pattern)
+                    Lock.Type.PIN -> getString(R.string.settings_lock_pin)
+                    Lock.Type.PASSWORD -> getString(R.string.settings_lock_password)
+                }
+            }
+        }
+    }
+
+    private fun getDirSize(dir: File) : String {
+        val size = dir.walk().map { it.length() }.sum()
+
+        return getString(R.string.settings_clear_summary, byteToString(size))
+    }
+
+    override fun onPreferenceClick(preference: Preference?): Boolean {
+        with (preference) {
+            this ?: return false
+
+            when (key) {
+                "app_version" -> {
+                    checkUpdate(activity as SettingsActivity, true)
+                }
+                "delete_cache" -> {
+                    val dir = File(requireContext().cacheDir, "imageCache")
+
+                    AlertDialog.Builder(requireContext()).apply {
+                        setTitle(R.string.warning)
+                        setMessage(R.string.settings_clear_cache_alert_message)
+                        setPositiveButton(android.R.string.yes) { _, _ ->
+                            if (dir.exists())
+                                dir.deleteRecursively()
+
+                            summary = getDirSize(dir)
+                        }
+                        setNegativeButton(android.R.string.no) { _, _ -> }
+                    }.show()
+                }
+                "delete_downloads" -> {
+                    val dir = getDownloadDirectory(requireContext())
+
+                    AlertDialog.Builder(requireContext()).apply {
+                        setTitle(R.string.warning)
+                        setMessage(R.string.settings_clear_downloads_alert_message)
+                        setPositiveButton(android.R.string.yes) { _, _ ->
+                            if (dir.exists())
+                                dir.deleteRecursively()
+
+                            summary = getDirSize(dir)
+                        }
+                        setNegativeButton(android.R.string.no) { _, _ -> }
+                    }.show()
+                }
+                "clear_history" -> {
+                    val histories = (requireContext().applicationContext as Pupil).histories
+
+                    AlertDialog.Builder(requireContext()).apply {
+                        setTitle(R.string.warning)
+                        setMessage(R.string.settings_clear_history_alert_message)
+                        setPositiveButton(android.R.string.yes) { _, _ ->
+                            histories.clear()
+                            summary = getString(R.string.settings_clear_history_summary, histories.size)
+                        }
+                        setNegativeButton(android.R.string.no) { _, _ -> }
+                    }.show()
+                }
+                "dl_location" -> {
+                    DownloadLocationDialog(requireActivity()).show()
+                }
+                "default_query" -> {
+                    DefaultQueryDialog(requireContext()).apply {
+                        onPositiveButtonClickListener = { newTags ->
+                            sharedPreferences.edit().putString("default_query", newTags.toString()).apply()
+                            summary = newTags.toString()
+                        }
+                    }.show()
+                }
+                "app_lock" -> {
+                    val intent = Intent(requireContext(), LockActivity::class.java)
+                    activity?.startActivityForResult(intent, REQUEST_LOCK)
+                }
+                "mirrors" -> {
+                    MirrorDialog(requireContext())
+                        .show()
+                }
+                "proxy" -> {
+                    ProxyDialog(requireContext())
+                        .show()
+                }
+                "nomedia" -> {
+                    File(getDownloadDirectory(context), ".nomedia").createNewFile()
+                }
+                "backup" -> {
+                    File(ContextCompat.getDataDir(requireContext()), "favorites.json").copyTo(
+                        File(getDownloadDirectory(requireContext()), "favorites.json"),
+                        true
+                    )
+
+                    Snackbar.make(this@SettingsFragment.listView, R.string.settings_backup_snackbar, Snackbar.LENGTH_LONG)
+                        .show()
+                }
+                "restore" -> {
+                    val intent = Intent(Intent.ACTION_GET_CONTENT).apply {
+                        addCategory(Intent.CATEGORY_OPENABLE)
+                        type = "*/*"
+                    }
+
+                    activity?.startActivityForResult(intent, REQUEST_RESTORE)
+                }
+                "old_import_galleries" -> {
+                    if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
+
+                        if (ContextCompat.checkSelfPermission(requireContext(), Manifest.permission.WRITE_EXTERNAL_STORAGE) != PackageManager.PERMISSION_GRANTED)
+                            ActivityCompat.requestPermissions(requireActivity(), arrayOf(Manifest.permission.WRITE_EXTERNAL_STORAGE), REQUEST_WRITE_PERMISSION_AND_SAF)
+                        else {
+                            val intent = Intent(Intent.ACTION_OPEN_DOCUMENT_TREE).apply {
+                                putExtra("android.content.extra.SHOW_ADVANCED", true)
+                            }
+
+                            activity?.startActivityForResult(intent, REQUEST_IMPORT_OLD_GALLERIES)
+                        }
+                    } else {    // Can't use SAF on old Androids!
+                        val config = DirectoryChooserConfig.builder()
+                            .newDirectoryName("Pupil")
+                            .allowNewDirectoryNameModification(true)
+                            .build()
+
+                        val intent = Intent(requireContext(), DirectoryChooserActivity::class.java).apply {
+                            putExtra(DirectoryChooserActivity.EXTRA_CONFIG, config)
+                        }
+
+                        activity?.startActivityForResult(intent, REQUEST_IMPORT_OLD_GALLERIES_OLD)
+                    }
+                }
+                "user_id" -> {
+                    (context.getSystemService(Context.CLIPBOARD_SERVICE) as ClipboardManager).setPrimaryClip(
+                        ClipData.newPlainText("user_id", sharedPreference.getString("user_id", ""))
+                    )
+                    Toast.makeText(context, R.string.settings_user_id_toast, Toast.LENGTH_SHORT).show()
+                }
+                else -> return false
+            }
+        }
+
+        return true
+    }
+
+    override fun onPreferenceChange(preference: Preference?, newValue: Any?): Boolean {
+        with (preference) {
+            this ?: return false
+
+            when (key) {
+                "dark_mode" -> {
+                    AppCompatDelegate.setDefaultNightMode(when (newValue as Boolean) {
+                        true -> AppCompatDelegate.MODE_NIGHT_YES
+                        false -> AppCompatDelegate.MODE_NIGHT_NO
+                    })
+                }
+                else -> return false
+            }
+        }
+
+        return true
+    }
+
+    override fun onSharedPreferenceChanged(sharedPreferences: SharedPreferences?, key: String?) {
+        key ?: return
+
+        with(findPreference<Preference>(key)) {
+            this ?: return
+
+            when (key) {
+                "proxy" -> {
+                    summary = getProxyInfo(requireContext()).type.name
+                }
+                "dl_location" -> {
+                    summary = getDownloadDirectory(requireContext()).canonicalPath
+                }
+            }
+        }
+    }
+
+    override fun onCreatePreferences(savedInstanceState: Bundle?, rootKey: String?) {
+        setPreferencesFromResource(R.xml.root_preferences, rootKey)
+
+        sharedPreference = PreferenceManager.getDefaultSharedPreferences(requireContext())
+        sharedPreference.registerOnSharedPreferenceChangeListener(this)
+
+        initPreferences()
+    }
+
+    private fun initPreferences() {
+        for (i in 0 until preferenceScreen.preferenceCount) {
+
+            preferenceScreen.getPreference(i).run {
+                if (this is PreferenceCategory)
+                    (0 until preferenceCount).map { getPreference(it) }
+                else
+                    listOf(this)
+            }.forEach { preference ->
+                with (preference) {
+
+                    when (key) {
+                        "app_version" -> {
+                            val manager = requireContext().packageManager
+                            val info = manager.getPackageInfo(requireContext().packageName, 0)
+                            summary = requireContext().getString(R.string.settings_app_version_description, info.versionName)
+
+                            onPreferenceClickListener = this@SettingsFragment
+                        }
+                        "delete_cache" -> {
+                            val dir = File(requireContext().cacheDir, "imageCache")
+                            summary = getDirSize(dir)
+
+                            onPreferenceClickListener = this@SettingsFragment
+                        }
+                        "delete_downloads" -> {
+                            val dir = getDownloadDirectory(requireContext())
+                            summary = getDirSize(dir)
+
+                            onPreferenceClickListener = this@SettingsFragment
+                        }
+                        "clear_history" -> {
+                            val histories = (requireActivity().application as Pupil).histories
+                            summary = getString(R.string.settings_clear_history_summary, histories.size)
+
+                            onPreferenceClickListener = this@SettingsFragment
+                        }
+                        "dl_location" -> {
+                            summary = getDownloadDirectory(requireContext()).canonicalPath
+
+                            onPreferenceClickListener = this@SettingsFragment
+                        }
+                        "default_query" -> {
+                            summary = sharedPreference.getString("default_query", "") ?: ""
+
+                            onPreferenceClickListener = this@SettingsFragment
+                        }
+                        "app_lock" -> {
+                            val lockManager = LockManager(requireContext())
+                            summary =
+                                if (lockManager.locks.isNullOrEmpty()) {
+                                    getString(R.string.settings_lock_none)
+                                } else {
+                                    lockManager.locks?.joinToString(", ") {
+                                        when (it.type) {
+                                            Lock.Type.PATTERN -> getString(R.string.settings_lock_pattern)
+                                            Lock.Type.PIN -> getString(R.string.settings_lock_pin)
+                                            Lock.Type.PASSWORD -> getString(R.string.settings_lock_password)
+                                        }
+                                    }
+                                }
+
+                            onPreferenceClickListener = this@SettingsFragment
+                        }
+                        "mirrors" -> {
+                            onPreferenceClickListener = this@SettingsFragment
+                        }
+                        "proxy" -> {
+                            summary = getProxyInfo(requireContext()).type.name
+
+                            onPreferenceClickListener = this@SettingsFragment
+                        }
+                        "dark_mode" -> {
+                            onPreferenceChangeListener = this@SettingsFragment
+                        }
+                        "nomedia" -> {
+                            onPreferenceClickListener = this@SettingsFragment
+                        }
+                        "backup" -> {
+                            onPreferenceClickListener = this@SettingsFragment
+                        }
+                        "restore" -> {
+                            onPreferenceClickListener = this@SettingsFragment
+                        }
+                        "old_import_galleries" -> {
+                            onPreferenceClickListener = this@SettingsFragment
+                        }
+                        "user_id" -> {
+                            summary = sharedPreference.getString("user_id", "")
+                            onPreferenceClickListener = this@SettingsFragment
+                        }
+                    }
+
+                }
+            }
+        }
+    }
+}

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

@@ -0,0 +1,39 @@
+/*
+ *     Pupil, Hitomi.la viewer for Android
+ *     Copyright (C) 2020  tom5079
+ *
+ *     This program is free software: you can redistribute it and/or modify
+ *     it under the terms of the GNU General Public License as published by
+ *     the Free Software Foundation, either version 3 of the License, or
+ *     (at your option) any later version.
+ *
+ *     This program is distributed in the hope that it will be useful,
+ *     but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *     GNU General Public License for more details.
+ *
+ *     You should have received a copy of the GNU General Public License
+ *     along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package xyz.quaver.pupil.util
+
+import kotlinx.serialization.json.Json
+import kotlinx.serialization.json.JsonConfiguration
+import okhttp3.Dispatcher
+import okhttp3.OkHttpClient
+import xyz.quaver.proxy
+import java.util.concurrent.Executors
+import java.util.concurrent.TimeUnit
+
+const val REQUEST_LOCK = 38238
+const val REQUEST_RESTORE = 16546
+const val REQUEST_IMPORT_OLD_GALLERIES = 6458
+const val REQUEST_IMPORT_OLD_GALLERIES_OLD = 5946
+const val REQUEST_DOWNLOAD_FOLDER = 3874
+const val REQUEST_DOWNLOAD_FOLDER_OLD = 3425
+const val REQUEST_WRITE_PERMISSION_AND_SAF = 13900
+
+const val NOTIFICATION_ID_UPDATE = 2345
+
+val json = Json(JsonConfiguration.Stable)

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

@@ -1,325 +0,0 @@
-/*
- *     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/>.
- */
-
-package xyz.quaver.pupil.util
-
-import android.app.PendingIntent
-import android.content.Context
-import android.content.ContextWrapper
-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.preference.PreferenceManager
-import com.crashlytics.android.Crashlytics
-import kotlinx.coroutines.*
-import kotlinx.io.IOException
-import kotlinx.serialization.json.Json
-import kotlinx.serialization.json.JsonConfiguration
-import xyz.quaver.hitomi.Reader
-import xyz.quaver.hitomi.getReader
-import xyz.quaver.hitomi.getReferer
-import xyz.quaver.hiyobi.cookie
-import xyz.quaver.hiyobi.user_agent
-import xyz.quaver.pupil.Pupil
-import xyz.quaver.pupil.R
-import xyz.quaver.pupil.ui.ReaderActivity
-import java.io.File
-import java.io.FileOutputStream
-import java.net.URL
-import java.util.*
-import javax.net.ssl.HttpsURLConnection
-import kotlin.collections.ArrayList
-import kotlin.concurrent.schedule
-
-class GalleryDownloader(
-    base: Context,
-    private val galleryID: Int,
-    _notify: Boolean = false
-) : ContextWrapper(base) {
-
-    private val downloads = (applicationContext as Pupil).downloads
-    var useHiyobi = PreferenceManager.getDefaultSharedPreferences(this).getBoolean("use_hiyobi", false)
-
-    var download: Boolean = false
-        set(value) {
-            if (value) {
-                field = true
-                notificationManager.notify(galleryID, notificationBuilder.build())
-
-                if (reader?.isActive == false && downloadJob?.isActive != true) {
-                    val data = File(getDownloadDirectory(this), galleryID.toString())
-                    val cache = File(cacheDir, "imageCache/$galleryID")
-
-                    if (File(cache, "images").exists() && !data.exists()) {
-                        cache.copyRecursively(data, true)
-                        cache.deleteRecursively()
-                    }
-
-                    field = false
-                }
-
-                downloads.add(galleryID)
-            } else {
-                field = false
-            }
-
-            onNotifyChangedHandler?.invoke(value)
-        }
-
-    private val reader: Deferred<Reader>?
-    private var downloadJob: Job? = null
-
-    private lateinit var notificationBuilder: NotificationCompat.Builder
-    private lateinit var notificationManager: NotificationManagerCompat
-
-    var onReaderLoadedHandler: ((Reader) -> Unit)? = null
-    var onProgressHandler: ((Int) -> Unit)? = null
-    var onDownloadedHandler: ((List<String>) -> Unit)? = null
-    var onErrorHandler: ((Exception) -> Unit)? = null
-    var onCompleteHandler: (() -> Unit)? = null
-    var onNotifyChangedHandler: ((Boolean) -> Unit)? = null
-
-    companion object : SparseArray<GalleryDownloader>()
-
-    init {
-        put(galleryID, this)
-
-        initNotification()
-
-        reader = CoroutineScope(Dispatchers.IO).async {
-            try {
-                download = _notify
-                val json = Json(JsonConfiguration.Stable)
-                val serializer = Reader.serializer()
-
-                //Check cache
-                val cache = File(getCachedGallery(this@GalleryDownloader, galleryID), "reader.json")
-
-                try {
-                    json.parse(serializer, cache.readText())
-                } catch(e: Exception) {
-                    cache.delete()
-                }
-
-                if (cache.exists()) {
-                    val cached = json.parse(serializer, cache.readText())
-
-                    if (cached.readerItems.isNotEmpty()) {
-                        useHiyobi = when {
-                            cached.readerItems[0].url.contains("hitomi.la") -> false
-                            else -> true
-                        }
-
-                        onReaderLoadedHandler?.invoke(cached)
-
-                        return@async cached
-                    }
-                }
-
-                //Cache doesn't exist. Load from internet
-                val reader = when {
-                    useHiyobi -> {
-                        try {
-                            xyz.quaver.hiyobi.getReader(galleryID)
-                        } catch(e: Exception) {
-                            useHiyobi = false
-                            getReader(galleryID)
-                        }
-                    }
-                    else -> {
-                        getReader(galleryID)
-                    }
-                }
-
-                if (reader.readerItems.isNotEmpty()) {
-                    //Save cache
-                    if (cache.parentFile?.exists() == false)
-                        cache.parentFile!!.mkdirs()
-
-                    cache.writeText(json.stringify(serializer, reader))
-                }
-
-                reader
-            } catch (e: Exception) {
-                Crashlytics.logException(e)
-                Reader("", listOf())
-            }
-        }
-    }
-
-    private fun webpUrlFromUrl(url: String) = url.replace("/galleries/", "/webp/") + ".webp"
-
-    fun start() {
-        downloadJob = CoroutineScope(Dispatchers.Default).launch {
-            val reader = reader!!.await()
-
-            notificationBuilder.setContentTitle(reader.title)
-
-            if (reader.readerItems.isEmpty()) {
-                onErrorHandler?.invoke(IOException(getString(R.string.unable_to_connect)))
-                return@launch
-            }
-
-            val list = ArrayList<String>()
-
-            onReaderLoadedHandler?.invoke(reader)
-
-            notificationBuilder
-                .setProgress(reader.readerItems.size, 0, false)
-                .setContentText("0/${reader.readerItems.size}")
-
-            reader.readerItems.chunked(4).forEachIndexed { chunkIndex, chunked ->
-                chunked.mapIndexed { i, it ->
-                    val index = chunkIndex*4+i
-
-                    async(Dispatchers.IO) {
-                        val url = if (it.galleryInfo?.haswebp == 1) webpUrlFromUrl(it.url) else it.url
-
-                        val name = "$index".padStart(4, '0')
-                        val ext = url.split('.').last()
-
-                        val cache = File(getCachedGallery(this@GalleryDownloader, galleryID), "images/$name.$ext")
-
-                        if (!cache.exists())
-                            try {
-                                with(URL(url).openConnection() as HttpsURLConnection) {
-                                    if (useHiyobi) {
-                                        setRequestProperty("User-Agent", user_agent)
-                                        setRequestProperty("Cookie", cookie)
-                                    } else
-                                        setRequestProperty("Referer", getReferer(galleryID))
-
-                                    if (cache.parentFile?.exists() == false)
-                                        cache.parentFile!!.mkdirs()
-
-                                    inputStream.copyTo(FileOutputStream(cache))
-                                }
-                            } catch (e: Exception) {
-                                cache.delete()
-
-                                onErrorHandler?.invoke(e)
-
-                                notificationBuilder
-                                    .setContentTitle(reader.title)
-                                    .setContentText(getString(R.string.reader_notification_error))
-                                    .setProgress(0, 0, false)
-
-                                notificationManager.notify(galleryID, notificationBuilder.build())
-                            }
-
-                        "images/$name.$ext"
-                    }
-                }.forEach {
-                    list.add(it.await())
-
-                    val index = list.size
-
-                    onProgressHandler?.invoke(index)
-
-                    notificationBuilder
-                        .setProgress(reader.readerItems.size, index, false)
-                        .setContentText("$index/${reader.readerItems.size}")
-
-                    if (download)
-                        notificationManager.notify(galleryID, notificationBuilder.build())
-
-                    onDownloadedHandler?.invoke(list)
-                }
-            }
-
-            Timer(false).schedule(1000) {
-                notificationBuilder
-                    .setContentTitle(reader.title)
-                    .setContentText(getString(R.string.reader_notification_complete))
-                    .setProgress(0, 0, false)
-
-                if (download) {
-                    File(cacheDir, "imageCache/${galleryID}").let {
-                        if (it.exists()) {
-                            val target = File(getDownloadDirectory(this@GalleryDownloader), galleryID.toString())
-
-                            if (!target.exists())
-                                target.mkdirs()
-
-                            it.copyRecursively(target, true)
-                            it.deleteRecursively()
-                        }
-                    }
-
-                    notificationManager.notify(galleryID, notificationBuilder.build())
-
-                    download = false
-                }
-
-                onCompleteHandler?.invoke()
-            }
-
-            remove(galleryID)
-        }
-    }
-
-    fun cancel() {
-        downloadJob?.cancel()
-
-        remove(galleryID)
-    }
-
-    suspend fun cancelAndJoin() {
-        downloadJob?.cancelAndJoin()
-
-        remove(galleryID)
-    }
-
-    fun invokeOnReaderLoaded() {
-        CoroutineScope(Dispatchers.Default).launch {
-            onReaderLoadedHandler?.invoke(reader?.await() ?: return@launch)
-        }
-    }
-
-    fun clearNotification() {
-        notificationManager.cancel(galleryID)
-    }
-
-    fun invokeOnNotifyChanged() {
-        onNotifyChangedHandler?.invoke(download)
-    }
-
-    private fun initNotification() {
-        val intent = Intent(this, ReaderActivity::class.java).apply {
-            putExtra("galleryID", galleryID)
-        }
-        val pendingIntent = TaskStackBuilder.create(this).run {
-            addNextIntentWithParentStack(intent)
-            getPendingIntent(0, PendingIntent.FLAG_UPDATE_CURRENT)
-        }
-
-        notificationManager = NotificationManagerCompat.from(this)
-
-        notificationBuilder = 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)
-            setContentIntent(pendingIntent)
-            setProgress(0, 0, true)
-            priority = NotificationCompat.PRIORITY_LOW
-        }
-    }
-
-}

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

@@ -0,0 +1,312 @@
+/*
+ *     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.Log
+import android.util.SparseArray
+import androidx.preference.PreferenceManager
+import com.google.firebase.crashlytics.FirebaseCrashlytics
+import kotlinx.coroutines.*
+import xyz.quaver.Code
+import xyz.quaver.hitomi.GalleryBlock
+import xyz.quaver.hitomi.Reader
+import xyz.quaver.proxy
+import xyz.quaver.pupil.util.getCachedGallery
+import xyz.quaver.pupil.util.getDownloadDirectory
+import xyz.quaver.pupil.util.isParentOf
+import xyz.quaver.pupil.util.json
+import java.io.BufferedInputStream
+import java.io.File
+import java.io.FileOutputStream
+import java.io.InputStream
+import java.net.URL
+import java.util.*
+import java.util.concurrent.locks.Lock
+import java.util.concurrent.locks.ReentrantLock
+
+class Cache(context: Context) : ContextWrapper(context) {
+
+    companion object {
+        private val moving = mutableListOf<Int>()
+        private val readers = SparseArray<Reader?>()
+    }
+
+    private val locks = SparseArray<Lock>()
+    private fun lock(galleryID: Int) {
+        synchronized(locks) {
+            if (locks.indexOfKey(galleryID) < 0)
+                locks.put(galleryID, ReentrantLock())
+        }
+
+        locks[galleryID].lock()
+    }
+
+    private fun unlock(galleryID: Int) {
+        locks[galleryID]?.unlock()
+    }
+
+    private val preference = PreferenceManager.getDefaultSharedPreferences(this)
+
+    // Search in this order
+    // Download -> Cache
+    fun getCachedGallery(galleryID: Int) = getCachedGallery(this, galleryID).also {
+        if (!it.exists() && !preference.getBoolean("cache_disable", false))
+            it.mkdirs()
+    }
+
+    fun getCachedMetadata(galleryID: Int) : Metadata? {
+        val file = File(getCachedGallery(galleryID), ".metadata")
+
+        if (!file.exists())
+            return null
+
+        return try {
+            json.parse(Metadata.serializer(), 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.stringify(Metadata.serializer(), 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 thumbnails = getGalleryBlock(galleryID)?.thumbnails
+                try {
+                    Base64.encodeToString(URL(thumbnails?.firstOrNull()).openConnection(proxy).getInputStream().use {
+                        it.readBytes()
+                    }, 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) {
+            CoroutineScope(Dispatchers.IO).async {
+                var galleryBlock: GalleryBlock? = null
+
+                for (source in sources) {
+                    galleryBlock = try {
+                        source.invoke()
+                    } catch (e: Exception) {
+                        null
+                    }
+
+                    if (galleryBlock != null)
+                        break
+                }
+
+                galleryBlock
+            }.await() ?: 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(
+                    Comparator { 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
+
+            Log.i("PUPILD", "MOVING ${cache.canonicalPath} --> ${download.canonicalPath}")
+
+            cache.copyRecursively(download, true) { file, err ->
+                Log.i("PUPILD", "MOVING ERROR ${file.canonicalPath} ${err.message}")
+                OnErrorAction.SKIP
+            }
+            Log.i("PUPILD", "MOVED ${cache.canonicalPath}")
+
+            Log.i("PUPILD", "DELETING ${cache.canonicalPath}")
+            cache.deleteRecursively()
+            Log.i("PUPILD", "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

@@ -0,0 +1,444 @@
+/*
+ *     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.cookie
+import xyz.quaver.hiyobi.createImgList
+import xyz.quaver.hiyobi.user_agent
+import xyz.quaver.proxy
+import xyz.quaver.pupil.R
+import xyz.quaver.pupil.ui.ReaderActivity
+import java.io.File
+import java.io.IOException
+import java.util.concurrent.LinkedBlockingQueue
+import java.util.concurrent.TimeUnit
+
+@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
+            }
+
+        }
+    }
+    //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
+    *  Float.NaN -> Exception
+    */
+    val progress = SparseArray<MutableList<Float>?>()
+    /*
+    * KEY
+    *  primary galleryID
+    *  secondary index
+    * PRIMARY VALUE
+    *  MutableList -> Download in progress / Loading
+    *  null -> Gallery doesn't exist
+    * SECONDARY VALUE
+    *  Throwable -> Exception
+    *  null -> Download in progress / Loading
+    */
+    val exception = SparseArray<MutableList<Throwable?>?>()
+    val notification = SparseArray<NotificationCompat.Builder>()
+
+    private val loop = loop()
+    private val worker = SparseArray<Job?>()
+
+    val interceptor = Interceptor { 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()
+    }
+
+    val client =
+        OkHttpClient.Builder()
+            .connectTimeout(0, TimeUnit.SECONDS)
+            .addInterceptor(interceptor)
+            .readTimeout(0, TimeUnit.SECONDS)
+            .dispatcher(Dispatcher().apply {
+                maxRequests = 4
+                maxRequestsPerHost = 4
+            })
+            .proxy(proxy)
+            .build()
+
+    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()
+        }
+
+        progress.clear()
+        exception.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()
+        }
+
+        progress.remove(galleryID)
+        exception.remove(galleryID)
+        notification.remove(galleryID)
+        notificationManager.cancel(galleryID)
+
+        if (progress.indexOfKey(galleryID) >= 0)
+            Cache(this@DownloadWorker).setDownloading(galleryID, false)
+    }
+
+    fun isCompleted(galleryID: Int) = progress[galleryID]?.all { !it.isFinite() } == 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)
+                    addHeader("User-Agent", user_agent)
+                    addHeader("Cookie", cookie)
+                }
+                else -> {
+                    //shouldn't be called anyway
+                }
+            }
+            tag(galleryID to index)
+        }.build()
+
+        client.newCall(request).enqueue(callback)
+
+        Log.i("PUPILD", "DOWNLOADING ($galleryID, $index) from ${request.url()}")
+    }
+
+    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)
+            exception.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())
+        exception.put(galleryID, reader.galleryInfo.files.map { null }.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) {
+                    Log.i("PUPILD", "FAIL ${call.request().tag()} (${e.message})")
+                    if (e.message?.contains("cancel", true) != true)
+                        FirebaseCrashlytics.getInstance().recordException(e)
+
+                    progress[galleryID]?.set(i, Float.NaN)
+                    exception[galleryID]?.set(i, e)
+
+                    notify(galleryID)
+
+                    CoroutineScope(Dispatchers.IO).launch {
+                        if (isCompleted(galleryID)) {
+                            with(Cache(this@DownloadWorker)) {
+                                if (isDownloading(galleryID)) {
+                                    moveToDownload(galleryID)
+                                    setDownloading(galleryID, false)
+                                }
+                            }
+                        }
+                    }
+                }
+
+                override fun onResponse(call: Call, response: Response) {
+                    Log.i("PUPILD", "OK ${call.request().tag()}")
+
+                    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)
+                                    }
+                                }
+                            }
+                        }
+
+                        Log.i("PUPILD", "SUCCESS ${call.request().tag()}")
+                    } catch (e: Exception) {
+
+                        progress[galleryID]?.set(i, Float.NaN)
+                        exception[galleryID]?.set(i, e)
+
+                        notify(galleryID)
+
+                        CoroutineScope(Dispatchers.IO).launch {
+                            if (isCompleted(galleryID)) {
+                                with(Cache(this@DownloadWorker)) {
+                                    if (isDownloading(galleryID)) {
+                                        moveToDownload(galleryID)
+                                        setDownloading(galleryID, false)
+                                    }
+                                }
+                            }
+                        }
+
+                        File(Cache(this@DownloadWorker).getCachedGallery(galleryID), "%05d.$ext".format(i)).delete()
+
+                        Log.i("PUPILD", "FAIL ON OK ${call.request().tag()} (${e.message})")
+                    }
+                }
+            }
+
+            if (progress[galleryID]?.get(i)?.isFinite() == true) {
+                queueDownload(galleryID, reader, i, callback)
+                Log.i("PUPILD", "$galleryID QUEUED $i")
+            } else {
+                Log.i("PUPILD", "$galleryID SKIPPED $i (${progress[galleryID]?.get(i)})")
+            }
+        }
+    }
+
+    private fun notify(galleryID: Int) {
+        val max = progress[galleryID]?.size ?: 0
+        val progress = progress[galleryID]?.count { !it.isFinite() } ?: 0
+
+        Log.i("PUPILD", "NOTIFY $galleryID ${isCompleted(galleryID)} $progress/$max")
+
+        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)
+            notificationManager.notify(galleryID, notification[galleryID].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))
+                notificationManager.notify(galleryID, notification[galleryID].build())
+
+            Log.i("PUPILD", "QUEUED $galleryID")
+
+            worker.put(galleryID, download(galleryID))
+            queue.poll()
+        }
+    }
+
+}

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

@@ -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/>.
+ */
+
+package xyz.quaver.pupil.util.download
+
+import kotlinx.serialization.Serializable
+import xyz.quaver.hitomi.GalleryBlock
+import xyz.quaver.hitomi.Reader
+
+@Serializable
+data class Metadata(
+    val thumbnail: String? = null,
+    val galleryBlock: GalleryBlock? = null,
+    val reader: Reader? = null,
+    val 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/file.kt

@@ -18,26 +18,200 @@
 
 package xyz.quaver.pupil.util
 
+import android.annotation.TargetApi
 import android.content.Context
+import android.net.Uri
 import android.os.Build
-import android.os.Environment
-import android.provider.MediaStore
+import android.os.storage.StorageManager
+import android.provider.DocumentsContract
 import androidx.core.content.ContextCompat
+import androidx.preference.PreferenceManager
 import java.io.File
+import java.io.FileOutputStream
+import java.lang.reflect.Array
+import java.net.URL
 
-fun getCachedGallery(context: Context, galleryID: Int): File {
-    return File(getDownloadDirectory(context), galleryID.toString()).let {
-        when {
-            it.exists() -> it
-            else -> File(context.cacheDir, "imageCache/$galleryID")
+
+fun getCachedGallery(context: Context, galleryID: Int) =
+    File(getDownloadDirectory(context), galleryID.toString()).let {
+        if (it.exists())
+            it
+        else
+            File(context.cacheDir, "imageCache/$galleryID")
+    }
+
+fun getDownloadDirectory(context: Context) =
+    PreferenceManager.getDefaultSharedPreferences(context).getString("dl_location", null).let {
+        if (it != null && !it.startsWith("content"))
+            File(it)
+        else
+            context.getExternalFilesDir(null)!!
+    }
+
+fun URL.download(to: File, onDownloadProgress: ((Long, Long) -> Unit)? = null) {
+
+    if (to.parentFile?.exists() == false)
+        to.parentFile!!.mkdirs()
+
+    if (!to.exists())
+        to.createNewFile()
+
+    FileOutputStream(to).use { out ->
+
+        with(openConnection()) {
+            val fileSize = contentLength.toLong()
+
+            getInputStream().use {
+
+                var bytesCopied: Long = 0
+                val buffer = ByteArray(DEFAULT_BUFFER_SIZE)
+
+                var bytes = it.read(buffer)
+                while (bytes >= 0) {
+                    out.write(buffer, 0, bytes)
+                    bytesCopied += bytes
+                    onDownloadProgress?.invoke(bytesCopied, fileSize)
+                    bytes = it.read(buffer)
+                }
+
+            }
         }
+
     }
 }
 
-@Suppress("DEPRECATION")
-fun getDownloadDirectory(context: Context): File? {
-    return if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q)
-        context.getExternalFilesDir("Pupil")
-    else
-        File(Environment.getExternalStorageDirectory(), "Pupil")
-}
+fun getExtSdCardPaths(context: Context) =
+    ContextCompat.getExternalFilesDirs(context, null).drop(1).map {
+        it.absolutePath.substringBeforeLast("/Android/data").let {  path ->
+            runCatching {
+                File(path).canonicalPath
+            }.getOrElse {
+                path
+            }
+        }
+    }
+
+const val PRIMARY_VOLUME_NAME = "primary"
+fun getVolumePath(context: Context, volumeID: String?): String? {
+    return runCatching {
+        val storageManager = context.getSystemService(Context.STORAGE_SERVICE) as StorageManager
+        val storageVolumeClass = Class.forName("android.os.storage.StorageVolume")
+
+        val getVolumeList = storageVolumeClass.javaClass.getMethod("getVolumeList")
+        val getUUID = storageVolumeClass.getMethod("getUuid")
+        val getPath = storageVolumeClass.getMethod("getPath")
+        val isPrimary = storageVolumeClass.getMethod("isPrimary")
+
+        val result = getVolumeList.invoke(storageManager)!!
+
+        val length = Array.getLength(result)
+
+        for (i in 0 until length) {
+            val storageVolumeElement = Array.get(result, i)
+            val uuid = getUUID.invoke(storageVolumeElement) as? String
+            val primary = isPrimary.invoke(storageVolumeElement) as? Boolean
+
+            // primary volume?
+            if (primary == true && volumeID == PRIMARY_VOLUME_NAME)
+                return@runCatching getPath.invoke(storageVolumeElement) as? String
+
+            // other volumes?
+            if (volumeID == uuid) {
+                return@runCatching getPath.invoke(storageVolumeElement) as? String
+            }
+        }
+        return@runCatching null
+    }.getOrNull()
+}
+
+// Credits go to https://stackoverflow.com/questions/34927748/android-5-0-documentfile-from-tree-uri/36162691#36162691
+@TargetApi(Build.VERSION_CODES.LOLLIPOP)
+fun getVolumeIdFromTreeUri(uri: Uri) =
+    DocumentsContract.getTreeDocumentId(uri).split(':').let {
+        if (it.isNotEmpty())
+            it[0]
+        else
+            null
+    }
+
+@TargetApi(Build.VERSION_CODES.LOLLIPOP)
+fun getDocumentPathFromTreeUri(uri: Uri) =
+    DocumentsContract.getTreeDocumentId(uri).split(':').let {
+        if (it.size >= 2)
+            it[1]
+        else
+            File.separator
+    }
+
+fun getFullPathFromTreeUri(context: Context, uri: Uri) : String? {
+    val volumePath = getVolumePath(context, getVolumeIdFromTreeUri(uri) ?: return null).let {
+        it ?: return File.separator
+
+        if (it.endsWith(File.separator))
+            it.dropLast(1)
+        else
+            it
+    }
+
+    val documentPath = getDocumentPathFromTreeUri(uri).let {
+        if (it.endsWith(File.separator))
+            it.dropLast(1)
+        else
+            it
+    }
+
+    return if (documentPath.isNotEmpty()) {
+        if (documentPath.startsWith(File.separator))
+            volumePath + documentPath
+        else
+            volumePath + File.separator + documentPath
+    } else
+        volumePath
+}
+
+// Huge thanks to avluis(https://github.com/avluis)
+// This code is originated from Hentoid(https://github.com/avluis/Hentoid) under Apache-2.0 license.
+fun Uri.toFile(context: Context): File? {
+    val path = this.path ?: return null
+
+    val pathSeparator = path.indexOf(':')
+    val folderName = path.substring(pathSeparator+1)
+
+    // Determine whether the designated file is
+    // - on a removable media (e.g. SD card, OTG)
+    // or
+    // - on the internal phone memory
+    val removableMediaFolderRoots = getExtSdCardPaths(context)
+
+    /* First test is to compare root names with known roots of removable media
+     * In many cases, the SD card root name is shared between pre-SAF (File) and SAF (DocumentFile) frameworks
+     * (e.g. /storage/3437-3934 vs. /tree/3437-3934)
+     * This is what the following block is trying to do
+     */
+    for (s in removableMediaFolderRoots) {
+        val sRoot = s.substring(s.lastIndexOf(File.separatorChar))
+        val root = path.substring(0, pathSeparator).let {
+            it.substring(it.lastIndexOf(File.separatorChar))
+        }
+
+        if (sRoot.equals(root, true)) {
+            return File(s + File.separatorChar + folderName)
+        }
+    }
+    /* In some other cases, there is no common name (e.g. /storage/sdcard1 vs. /tree/3437-3934)
+     * We can use a slower method to translate the Uri obtained with SAF into a pre-SAF path
+     * and compare it to the known removable media volume names
+     */
+    val root = getFullPathFromTreeUri(context, this)
+
+    for (s in removableMediaFolderRoots) {
+        if (root?.startsWith(s) == true) {
+            return File(root)
+        }
+    }
+
+    return File(context.getExternalFilesDir(null)?.canonicalPath?.substringBeforeLast("/Android/data") ?: return null, folderName)
+}
+
+fun File.isParentOf(another: File) =
+    another.absolutePath.startsWith(this.absolutePath)

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

@@ -18,15 +18,15 @@
 
 package xyz.quaver.pupil.util
 
-import kotlinx.serialization.ImplicitReflectionSerializer
-import kotlinx.serialization.json.Json
-import kotlinx.serialization.json.JsonConfiguration
-import kotlinx.serialization.parseList
-import kotlinx.serialization.stringify
+import kotlinx.serialization.KSerializer
+import kotlinx.serialization.builtins.list
+import kotlinx.serialization.builtins.serializer
 import java.io.File
 
 class Histories(private val file: File) : ArrayList<Int>() {
 
+    val serializer: KSerializer<List<Int>> = Int.serializer().list
+
     init {
         if (!file.exists())
             file.parentFile?.mkdirs()
@@ -38,21 +38,20 @@ class Histories(private val file: File) : ArrayList<Int>() {
         }
     }
 
-    @UseExperimental(ImplicitReflectionSerializer::class)
     fun load() : Histories {
         return apply {
             super.clear()
             addAll(
-                Json(JsonConfiguration.Stable).parseList(
+                json.parse(
+                    serializer,
                     file.bufferedReader().use { it.readText() }
                 )
             )
         }
     }
 
-    @UseExperimental(ImplicitReflectionSerializer::class)
     fun save() {
-        file.writeText(Json(JsonConfiguration.Stable).stringify(this))
+        file.writeText(json.stringify(serializer, this))
     }
 
     override fun add(element: Int): Boolean {

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

@@ -21,9 +21,8 @@ package xyz.quaver.pupil.util
 import android.content.Context
 import android.content.ContextWrapper
 import androidx.core.content.ContextCompat
-import kotlinx.serialization.*
-import kotlinx.serialization.json.Json
-import kotlinx.serialization.json.JsonConfiguration
+import kotlinx.serialization.Serializable
+import kotlinx.serialization.builtins.list
 import java.io.File
 import java.security.MessageDigest
 
@@ -73,7 +72,6 @@ class LockManager(base: Context): ContextWrapper(base) {
         load()
     }
 
-    @UseExperimental(ImplicitReflectionSerializer::class)
     private fun load() {
         val lock = File(ContextCompat.getDataDir(this), "lock.json")
 
@@ -82,17 +80,16 @@ class LockManager(base: Context): ContextWrapper(base) {
             lock.writeText("[]")
         }
 
-        locks = ArrayList(Json(JsonConfiguration.Stable).parseList(lock.readText()))
+        locks = ArrayList(json.parse(Lock.serializer().list, lock.readText()))
     }
 
-    @UseExperimental(ImplicitReflectionSerializer::class)
     private fun save() {
         val lock = File(ContextCompat.getDataDir(this), "lock.json")
 
         if (!lock.exists())
             lock.createNewFile()
 
-        lock.writeText(Json(JsonConfiguration.Stable).stringify(locks?.toList() ?: listOf()))
+        lock.writeText(json.stringify(Lock.serializer().list, locks?.toList() ?: listOf()))
     }
 
     fun add(lock: Lock) {

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

@@ -18,18 +18,37 @@
 
 package xyz.quaver.pupil.util
 
-import android.content.Context
-import android.content.pm.PackageManager
-import androidx.core.content.ContextCompat
-
-fun Context.hasPermission(permission: String) =
-    ContextCompat.checkSelfPermission(this, permission) == PackageManager.PERMISSION_GRANTED
+import android.annotation.SuppressLint
+import java.util.*
+import kotlin.collections.ArrayList
 
+@OptIn(ExperimentalStdlibApi::class)
 fun String.wordCapitalize() : String {
     val result = ArrayList<String>()
 
+    @SuppressLint("DefaultLocale")
     for (word in this.split(" "))
-        result.add(word.capitalize())
+        result.add(word.capitalize(Locale.US))
 
     return result.joinToString(" ")
+}
+
+fun byteToString(byte: Long, precision : Int = 1) : String {
+
+    val suffix = listOf(
+        "B",
+        "kB",
+        "MB",
+        "GB",
+        "TB" //really?
+    )
+    var size = byte.toDouble(); var suffixIndex = 0
+
+    while (size >= 1024) {
+        size /= 1024
+        suffixIndex++
+    }
+
+    return "%.${precision}f ${suffix[suffixIndex]}".format(size)
+
 }

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

@@ -0,0 +1,63 @@
+/*
+ *     Pupil, Hitomi.la viewer for Android
+ *     Copyright (C) 2020  tom5079
+ *
+ *     This program is free software: you can redistribute it and/or modify
+ *     it under the terms of the GNU General Public License as published by
+ *     the Free Software Foundation, either version 3 of the License, or
+ *     (at your option) any later version.
+ *
+ *     This program is distributed in the hope that it will be useful,
+ *     but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *     GNU General Public License for more details.
+ *
+ *     You should have received a copy of the GNU General Public License
+ *     along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package xyz.quaver.pupil.util
+
+import android.content.Context
+import androidx.preference.PreferenceManager
+import kotlinx.serialization.Serializable
+import okhttp3.Authenticator
+import okhttp3.Credentials
+import java.net.InetSocketAddress
+import java.net.Proxy
+
+@Serializable
+data class ProxyInfo(
+    val type: Proxy.Type,
+    val host: String? = null,
+    val port: Int? = null,
+    val username: String? = null,
+    val password: String? = null
+) {
+    fun proxy() : Proxy {
+        return if (host == null || port == null)
+            return Proxy.NO_PROXY
+        else
+            Proxy(type, InetSocketAddress.createUnresolved(host, port))
+    }
+
+    fun authenticator() = Authenticator { _, response ->
+        val credential = Credentials.basic(username ?: "", password ?: "")
+
+        response.request().newBuilder()
+            .header("Proxy-Authorization", credential)
+            .build()
+    }
+
+}
+
+fun getProxy(context: Context) =
+    getProxyInfo(context).proxy()
+
+fun getProxyInfo(context: Context) =
+    PreferenceManager.getDefaultSharedPreferences(context).getString("proxy", null).let {
+        if (it == null)
+            ProxyInfo(Proxy.Type.DIRECT)
+        else
+            json.parse(ProxyInfo.serializer(), it)
+    }

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

@@ -18,32 +18,61 @@
 
 package xyz.quaver.pupil.util
 
-import kotlinx.serialization.json.*
+import android.annotation.SuppressLint
+import android.app.DownloadManager
+import android.app.PendingIntent
+import android.content.Context
+import android.content.Intent
+import android.net.Uri
+import android.util.Base64
+import androidx.appcompat.app.AlertDialog
+import androidx.core.app.NotificationCompat
+import androidx.core.app.NotificationManagerCompat
+import androidx.preference.PreferenceManager
+import kotlinx.coroutines.*
+import kotlinx.serialization.json.JsonArray
+import kotlinx.serialization.json.JsonObject
+import kotlinx.serialization.json.boolean
+import kotlinx.serialization.json.content
+import okhttp3.*
+import ru.noties.markwon.Markwon
+import xyz.quaver.hitomi.GalleryBlock
+import xyz.quaver.hitomi.Reader
+import xyz.quaver.hitomi.getGalleryBlock
+import xyz.quaver.hitomi.getReader
+import xyz.quaver.proxy
+import xyz.quaver.pupil.BroadcastReciever
 import xyz.quaver.pupil.BuildConfig
+import xyz.quaver.pupil.R
+import xyz.quaver.pupil.util.download.Cache
+import xyz.quaver.pupil.util.download.Metadata
+import java.io.File
+import java.io.IOException
 import java.net.URL
+import java.util.*
+import java.util.concurrent.TimeUnit
 
 fun getReleases(url: String) : JsonArray {
     return try {
         URL(url).readText().let {
-            Json(JsonConfiguration.Stable).parse(JsonArray.serializer(), it)
+            json.parse(JsonArray.serializer(), it)
         }
     } catch (e: Exception) {
         JsonArray(emptyList())
     }
 }
 
-fun checkUpdate(url: String) : JsonObject? {
+fun checkUpdate(context: Context, url: String) : JsonObject? {
     val releases = getReleases(url)
 
     if (releases.isEmpty())
         return null
 
     return releases.firstOrNull {
-        if (BuildConfig.PRERELEASE) {
+        if (PreferenceManager.getDefaultSharedPreferences(context).getBoolean("beta", false))
             true
-        } else {
+        else
             it.jsonObject["prerelease"]?.boolean == false
-        }
     }?.let {
         if (it.jsonObject["tag_name"]?.content == BuildConfig.VERSION_NAME)
             null
@@ -52,13 +81,255 @@ fun checkUpdate(url: String) : JsonObject? {
     }
 }
 
-fun getApkUrl(releases: JsonObject) : Pair<String?, String?>? {
+fun getApkUrl(releases: JsonObject) : String? {
     return releases["assets"]?.jsonArray?.firstOrNull {
-        Regex("Pupil-v(\\d+\\.)+\\d+\\.apk").matches(it.jsonObject["name"]?.content ?: "")
+        Regex("Pupil-v.+\\.apk").matches(it.jsonObject["name"]?.content ?: "")
     }.let {
-        if (it == null)
-            null
-        else
-            Pair(it.jsonObject["browser_download_url"]?.content, it.jsonObject["name"]?.content)
+        it?.jsonObject?.get("browser_download_url")?.content
     }
+}
+
+const val UPDATE_NOTIFICATION_ID = 384823
+fun checkUpdate(context: Context, force: Boolean = false) {
+
+    val preferences = PreferenceManager.getDefaultSharedPreferences(context)
+    val ignoreUpdateUntil = preferences.getLong("ignore_update_until", 0)
+
+    if (!force && ignoreUpdateUntil > System.currentTimeMillis())
+        return
+
+    fun extractReleaseNote(update: JsonObject, locale: Locale) : String {
+        val markdown = update["body"]!!.content
+
+        val target = when(locale.language) {
+            "ko" -> "한국어"
+            "ja" -> "日本語"
+            else -> "English"
+        }
+
+        val releaseNote = Regex("^# Release Note.+$")
+        val language = Regex("^## $target$")
+        val end = Regex("^#.+$")
+
+        var releaseNoteFlag = false
+        var languageFlag = false
+
+        val result = StringBuilder()
+
+        for(line in markdown.lines()) {
+            if (releaseNote.matches(line)) {
+                releaseNoteFlag = true
+                continue
+            }
+
+            if (releaseNoteFlag) {
+                if (language.matches(line)) {
+                    languageFlag = true
+                    continue
+                }
+            }
+
+            if (languageFlag) {
+                if (end.matches(line))
+                    break
+
+                result.append(line+"\n")
+            }
+        }
+
+        return context.getString(R.string.update_release_note, update["tag_name"]?.content, result.toString())
+    }
+
+    CoroutineScope(Dispatchers.Default).launch {
+        val update =
+            checkUpdate(context, context.getString(R.string.release_url)) ?: return@launch
+
+        val url = getApkUrl(update) ?: return@launch
+
+        val dialog = AlertDialog.Builder(context).apply {
+            setTitle(R.string.update_title)
+            val msg = extractReleaseNote(update, Locale.getDefault())
+            setMessage(Markwon.create(context).toMarkdown(msg))
+            setPositiveButton(android.R.string.yes) { _, _ ->
+
+                val preference = PreferenceManager.getDefaultSharedPreferences(context)
+
+                val downloadManager = context.getSystemService(Context.DOWNLOAD_SERVICE) as DownloadManager
+
+                //Cancel any download queued before
+
+                val id = preference.getLong("update_download_id", -1)
+
+                if (id != -1L)
+                    downloadManager.remove(id)
+
+                val target = File(context.getExternalFilesDir(null), "Pupil.apk").also {
+                    it.delete()
+                }
+
+                val request = DownloadManager.Request(Uri.parse(url))
+                    .setTitle(context.getText(R.string.update_notification_description))
+                    .setDestinationUri(Uri.fromFile(target))
+
+                downloadManager.enqueue(request).also {
+                    preference.edit().putLong("update_download_id", it).apply()
+                }
+            }
+            setNegativeButton(if (force) android.R.string.no else R.string.ignore_update) { _, _ ->
+                if (!force)
+                    preferences.edit()
+                        .putLong("ignore_update_until", System.currentTimeMillis() + 604800000)
+                        .apply()
+            }
+        }
+
+        launch(Dispatchers.Main) {
+            dialog.show()
+        }
+    }
+}
+
+var cancelImport = false
+@SuppressLint("RestrictedApi")
+fun importOldGalleries(context: Context, folder: File) = CoroutineScope(Dispatchers.IO).launch {
+    val client = OkHttpClient.Builder()
+        .connectTimeout(0, TimeUnit.SECONDS)
+        .readTimeout(0, TimeUnit.SECONDS)
+        .proxy(proxy)
+        .build()
+
+    val cancelIntent = Intent(context, BroadcastReciever::class.java).apply {
+        action = BroadcastReciever.ACTION_CANCEL_IMPORT
+        putExtra(BroadcastReciever.EXTRA_IMPORT_NOTIFICATION_ID, 0)
+    }
+    val pendingIntent = PendingIntent.getBroadcast(context, 0, cancelIntent, 0)
+
+    val notificationManager = NotificationManagerCompat.from(context)
+    val notificationBuilder = NotificationCompat.Builder(context, "import").apply {
+        setContentTitle(context.getText(R.string.import_old_galleries_notification))
+        setProgress(0, 0, true)
+        setSmallIcon(R.drawable.ic_notification)
+        addAction(0, context.getText(android.R.string.cancel), pendingIntent)
+        setOngoing(true)
+    }
+
+    notificationManager.notify(0, notificationBuilder.build())
+
+    if (!folder.isDirectory)
+        return@launch
+
+    val galleryRegex = Regex("""[0-9]+$""")
+    val imageRegex = Regex("""^[0-9]+\..+$""")
+    var size = 0
+    fun setProgress(progress: Int) {
+        notificationBuilder.apply {
+            setContentText(
+                context.getString(
+                    R.string.import_old_galleries_notification_text,
+                    progress,
+                    size
+                )
+            )
+            setProgress(size, progress, false)
+        }
+
+        notificationManager.notify(0, notificationBuilder.build())
+    }
+
+    folder.listFiles { _, name ->
+        galleryRegex.matches(name)
+    }?.also {
+        size = it.size
+        setProgress(0)
+    }?.forEachIndexed { index, gallery ->
+        if (cancelImport)
+            return@forEachIndexed
+
+        setProgress(index)
+
+        val galleryID = gallery.name.toIntOrNull() ?: return@forEachIndexed
+
+        File(getDownloadDirectory(context), galleryID.toString()).mkdirs()
+
+        val reader = async {
+            kotlin.runCatching {
+                json.parse(Reader.serializer(), File(gallery, "reader.json").readText())
+            }.getOrElse {
+                getReader(galleryID)
+            }
+        }
+        val galleryBlock = async {
+            kotlin.runCatching {
+                json.parse(GalleryBlock.serializer(), File(gallery, "galleryBlock.json").readText())
+            }.getOrElse {
+                getGalleryBlock(galleryID)
+            }
+        }
+        @Suppress("NAME_SHADOWING")
+        val thumbnail = async thumbnail@{
+            val galleryBlock = galleryBlock.await()
+
+            Base64.encodeToString(try {
+                File(gallery, "thumbnail.jpg").readBytes()
+            } catch (e: Exception) {
+                val url = galleryBlock?.thumbnails?.firstOrNull()
+
+                if (url == null)
+                    null
+                else {
+                    val request = Request.Builder().url(url).build()
+
+                    var done = false
+                    var result: ByteArray? = null
+                    client.newCall(request).enqueue(object : Callback {
+                        override fun onFailure(call: Call?, e: IOException?) {
+                            done = true
+                        }
+
+                        override fun onResponse(call: Call?, response: Response?) {
+                            result = response?.body()?.use {
+                                it.bytes()
+                            }
+                            done = true
+                        }
+                    })
+
+                    if (!done)
+                        yield()
+
+                    result
+                }
+            } ?: return@thumbnail null, Base64.DEFAULT)
+        }
+
+        Cache(context).setCachedMetadata(galleryID,
+            Metadata(
+                thumbnail.await(),
+                galleryBlock.await(),
+                reader.await()
+            )
+        )
+
+        File(gallery, "images").listFiles { _, name ->
+            imageRegex.matches(name)
+        }?.forEach {
+            if (cancelImport)
+                return@forEach
+
+            @Suppress("NAME_SHADOWING")
+            val index = it.nameWithoutExtension.toIntOrNull() ?: return@forEach
+
+            Cache(context).putImage(galleryID, index, it.extension, it.inputStream())
+        }
+    }
+
+    notificationBuilder.apply {
+        setContentText(context.getText(R.string.import_old_galleries_notification_done))
+        setProgress(0, 0, false)
+        setOngoing(false)
+        mActions.clear()
+    }
+    notificationManager.notify(0, notificationBuilder.build())
+
+    cancelImport = false
 }

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

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

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

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

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

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

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

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