Fixed typo & Built apk

Fixed show extra tags button not showing up & version up
Implemented proper Page Turn without relying on RecyclerView
2020-11-26 22:36:12 +09:00 · 2020-11-26 22:16:51 +09:00 · 2020-11-26 22:00:35 +09:00 · 2020-11-16 16:13:02 +09:00 · 2020-11-16 16:11:57 +09:00 · 2020-11-08 18:11:56 +09:00
92 changed files with 1939 additions and 2601 deletions
--- a/.gitignore
+++ b/.gitignore
@@ -1,33 +1,20 @@
-# Gradle files
-.gradle/
-build/
-
-# Local configuration file (sdk path, etc)
-local.properties
-
-# Log/OS Files
-*.log
-
-# Android Studio generated files and folders
-captures/
-.externalNativeBuild/
-.cxx/
-*.apk
-output.json
-
-# IntelliJ
 *.iml
-.idea/
-misc.xml
-deploymentTargetDropDown.xml
-render.experimental.xml
+.gradle
+/local.properties
+/.idea/caches
+/.idea/libraries
+/.idea/modules.xml
+/.idea/workspace.xml
+/.idea/navEditor.xml
+/.idea/assetWizardSettings.xml
+.DS_Store
+/build
+/captures
+.externalNativeBuild

-# Keystore files
-*.jks
-*.keystore
+#Github pages
+/gh-pages

-# Google Services (e.g. APIs or Firebase)
-google-services.json
-
-# Android Profiling
-*.hprof
+#Private files
+**/google-services.json
+**/credentials.json
--- a/.idea/codeStyles/Project.xml
+++ b/.idea/codeStyles/Project.xml
@@ -0,0 +1,139 @@
+<component name="ProjectCodeStyleConfiguration">
+  <code_scheme name="Project" version="173">
+    <option name="RIGHT_MARGIN" value="120" />
+    <JetCodeStyleSettings>
+      <option name="PACKAGES_TO_USE_STAR_IMPORTS">
+        <value>
+          <package name="java.util" alias="false" withSubpackages="false" />
+          <package name="kotlinx.android.synthetic" alias="false" withSubpackages="true" />
+          <package name="io.ktor" alias="false" withSubpackages="true" />
+        </value>
+      </option>
+      <option name="PACKAGES_IMPORT_LAYOUT">
+        <value>
+          <package name="" alias="false" withSubpackages="true" />
+          <package name="java" alias="false" withSubpackages="true" />
+          <package name="javax" alias="false" withSubpackages="true" />
+          <package name="kotlin" alias="false" withSubpackages="true" />
+          <package name="" alias="true" withSubpackages="true" />
+        </value>
+      </option>
+      <option name="CODE_STYLE_DEFAULTS" value="KOTLIN_OFFICIAL" />
+    </JetCodeStyleSettings>
+    <codeStyleSettings language="XML">
+      <indentOptions>
+        <option name="CONTINUATION_INDENT_SIZE" value="4" />
+      </indentOptions>
+      <arrangement>
+        <rules>
+          <section>
+            <rule>
+              <match>
+                <AND>
+                  <NAME>xmlns:android</NAME>
+                  <XML_ATTRIBUTE />
+                  <XML_NAMESPACE>^$</XML_NAMESPACE>
+                </AND>
+              </match>
+            </rule>
+          </section>
+          <section>
+            <rule>
+              <match>
+                <AND>
+                  <NAME>xmlns:.*</NAME>
+                  <XML_ATTRIBUTE />
+                  <XML_NAMESPACE>^$</XML_NAMESPACE>
+                </AND>
+              </match>
+              <order>BY_NAME</order>
+            </rule>
+          </section>
+          <section>
+            <rule>
+              <match>
+                <AND>
+                  <NAME>.*:id</NAME>
+                  <XML_ATTRIBUTE />
+                  <XML_NAMESPACE>http://schemas.android.com/apk/res/android</XML_NAMESPACE>
+                </AND>
+              </match>
+            </rule>
+          </section>
+          <section>
+            <rule>
+              <match>
+                <AND>
+                  <NAME>.*:name</NAME>
+                  <XML_ATTRIBUTE />
+                  <XML_NAMESPACE>http://schemas.android.com/apk/res/android</XML_NAMESPACE>
+                </AND>
+              </match>
+            </rule>
+          </section>
+          <section>
+            <rule>
+              <match>
+                <AND>
+                  <NAME>name</NAME>
+                  <XML_ATTRIBUTE />
+                  <XML_NAMESPACE>^$</XML_NAMESPACE>
+                </AND>
+              </match>
+            </rule>
+          </section>
+          <section>
+            <rule>
+              <match>
+                <AND>
+                  <NAME>style</NAME>
+                  <XML_ATTRIBUTE />
+                  <XML_NAMESPACE>^$</XML_NAMESPACE>
+                </AND>
+              </match>
+            </rule>
+          </section>
+          <section>
+            <rule>
+              <match>
+                <AND>
+                  <NAME>.*</NAME>
+                  <XML_ATTRIBUTE />
+                  <XML_NAMESPACE>^$</XML_NAMESPACE>
+                </AND>
+              </match>
+              <order>BY_NAME</order>
+            </rule>
+          </section>
+          <section>
+            <rule>
+              <match>
+                <AND>
+                  <NAME>.*</NAME>
+                  <XML_ATTRIBUTE />
+                  <XML_NAMESPACE>http://schemas.android.com/apk/res/android</XML_NAMESPACE>
+                </AND>
+              </match>
+              <order>ANDROID_ATTRIBUTE_ORDER</order>
+            </rule>
+          </section>
+          <section>
+            <rule>
+              <match>
+                <AND>
+                  <NAME>.*</NAME>
+                  <XML_ATTRIBUTE />
+                  <XML_NAMESPACE>.*</XML_NAMESPACE>
+                </AND>
+              </match>
+              <order>BY_NAME</order>
+            </rule>
+          </section>
+        </rules>
+      </arrangement>
+    </codeStyleSettings>
+    <codeStyleSettings language="kotlin">
+      <option name="CODE_STYLE_DEFAULTS" value="KOTLIN_OFFICIAL" />
+    </codeStyleSettings>
+  </code_scheme>
+</component>
--- a/.idea/codeStyles/codeStyleConfig.xml
+++ b/.idea/codeStyles/codeStyleConfig.xml
@@ -0,0 +1,5 @@
+<component name="ProjectCodeStyleConfiguration">
+  <state>
+    <option name="USE_PER_PROJECT_SETTINGS" value="true" />
+  </state>
+</component>
--- a/.idea/compiler.xml
+++ b/.idea/compiler.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="CompilerConfiguration">
+    <bytecodeTargetLevel target="1.8" />
+  </component>
+</project>
--- a/.idea/copyright/GPL.xml
+++ b/.idea/copyright/GPL.xml
@@ -0,0 +1,6 @@
+<component name="CopyrightManager">
+  <copyright>
+    <option name="notice" value="    Pupil, Hitomi.la viewer for Android&#10;    Copyright (C) &amp;#36;today.year  tom5079&#10;&#10;    This program is free software: you can redistribute it and/or modify&#10;    it under the terms of the GNU General Public License as published by&#10;    the Free Software Foundation, either version 3 of the License, or&#10;    (at your option) any later version.&#10;&#10;    This program is distributed in the hope that it will be useful,&#10;    but WITHOUT ANY WARRANTY; without even the implied warranty of&#10;    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the&#10;    GNU General Public License for more details.&#10;&#10;    You should have received a copy of the GNU General Public License&#10;    along with this program.  If not, see &lt;http://www.gnu.org/licenses/&gt;." />
+    <option name="myName" value="GPL" />
+  </copyright>
+</component>
--- a/.idea/copyright/profiles_settings.xml
+++ b/.idea/copyright/profiles_settings.xml
@@ -0,0 +1,7 @@
+<component name="CopyrightManager">
+  <settings>
+    <module2copyright>
+      <element module="Project Files" copyright="GPL" />
+    </module2copyright>
+  </settings>
+</component>
--- a/.idea/dictionaries/tom50.xml
+++ b/.idea/dictionaries/tom50.xml
@@ -0,0 +1,7 @@
+<component name="ProjectDictionaryState">
+  <dictionary name="tom50">
+    <words>
+      <w>hitomi</w>
+    </words>
+  </dictionary>
+</component>
--- a/.idea/encodings.xml
+++ b/.idea/encodings.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="Encoding" addBOMForNewFiles="with NO BOM" />
+</project>
--- a/.idea/gradle.xml
+++ b/.idea/gradle.xml
@@ -0,0 +1,21 @@
+<?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">
+          <set>
+            <option value="$PROJECT_DIR$" />
+            <option value="$PROJECT_DIR$/app" />
+          </set>
+        </option>
+        <option name="resolveModulePerSourceSet" value="false" />
+        <option name="useQualifiedModuleNames" value="true" />
+      </GradleProjectSettings>
+    </option>
+  </component>
+</project>
--- a/.idea/inspectionProfiles/Project_Default.xml
+++ b/.idea/inspectionProfiles/Project_Default.xml
@@ -0,0 +1,6 @@
+<component name="InspectionProjectProfileManager">
+  <profile version="1.0">
+    <option name="myName" value="Project Default" />
+    <inspection_tool class="AndroidLintNewerVersionAvailable" enabled="true" level="WARNING" enabled_by_default="true" />
+  </profile>
+</component>
--- a/.idea/jarRepositories.xml
+++ b/.idea/jarRepositories.xml
@@ -0,0 +1,75 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="RemoteRepositoriesConfiguration">
+    <remote-repository>
+      <option name="id" value="central" />
+      <option name="name" value="Maven Central repository" />
+      <option name="url" value="https://repo1.maven.org/maven2" />
+    </remote-repository>
+    <remote-repository>
+      <option name="id" value="jboss.community" />
+      <option name="name" value="JBoss Community repository" />
+      <option name="url" value="https://repository.jboss.org/nexus/content/repositories/public/" />
+    </remote-repository>
+    <remote-repository>
+      <option name="id" value="maven2" />
+      <option name="name" value="maven2" />
+      <option name="url" value="http://guardian.github.com/maven/repo-releases" />
+    </remote-repository>
+    <remote-repository>
+      <option name="id" value="BintrayJCenter" />
+      <option name="name" value="BintrayJCenter" />
+      <option name="url" value="https://jcenter.bintray.com/" />
+    </remote-repository>
+    <remote-repository>
+      <option name="id" value="maven" />
+      <option name="name" value="maven" />
+      <option name="url" value="https://jitpack.io" />
+    </remote-repository>
+    <remote-repository>
+      <option name="id" value="Google" />
+      <option name="name" value="Google" />
+      <option name="url" value="https://dl.google.com/dl/android/maven2/" />
+    </remote-repository>
+    <remote-repository>
+      <option name="id" value="MavenRepo" />
+      <option name="name" value="MavenRepo" />
+      <option name="url" value="https://repo.maven.apache.org/maven2/" />
+    </remote-repository>
+    <remote-repository>
+      <option name="id" value="maven2" />
+      <option name="name" value="maven2" />
+      <option name="url" value="https://guardian.github.com/maven/repo-releases" />
+    </remote-repository>
+    <remote-repository>
+      <option name="id" value="maven3" />
+      <option name="name" value="maven3" />
+      <option name="url" value="https://s3.amazonaws.com/fabric-artifacts-private/internal-snapshots" />
+    </remote-repository>
+    <remote-repository>
+      <option name="id" value="maven4" />
+      <option name="name" value="maven4" />
+      <option name="url" value="https://maven.fabric.io/public" />
+    </remote-repository>
+    <remote-repository>
+      <option name="id" value="MavenLocal" />
+      <option name="name" value="MavenLocal" />
+      <option name="url" value="file:/$USER_HOME$/.m2/repository/" />
+    </remote-repository>
+    <remote-repository>
+      <option name="id" value="MavenLocal" />
+      <option name="name" value="MavenLocal" />
+      <option name="url" value="file:/$USER_HOME$/.m2/repository" />
+    </remote-repository>
+    <remote-repository>
+      <option name="id" value="maven3" />
+      <option name="name" value="maven3" />
+      <option name="url" value="https://dl.bintray.com/tom5079/maven" />
+    </remote-repository>
+    <remote-repository>
+      <option name="id" value="maven3" />
+      <option name="name" value="maven3" />
+      <option name="url" value="http://dl.bintray.com/piasy/maven" />
+    </remote-repository>
+  </component>
+</project>
--- a/.idea/kotlinCodeInsightSettings.xml
+++ b/.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>
--- a/.idea/kotlinc.xml
+++ b/.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>
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" default="true" project-jdk-name="1.8" project-jdk-type="JavaSDK">
+    <output url="file://$PROJECT_DIR$/build/classes" />
+  </component>
+  <component name="ProjectType">
+    <option name="id" value="Android" />
+  </component>
+</project>
--- a/.idea/runConfigurations.xml
+++ b/.idea/runConfigurations.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="RunConfigurationProducerService">
+    <option name="ignoredProducers">
+      <set>
+        <option value="org.jetbrains.plugins.gradle.execution.test.runner.AllInPackageGradleConfigurationProducer" />
+        <option value="org.jetbrains.plugins.gradle.execution.test.runner.TestClassGradleConfigurationProducer" />
+        <option value="org.jetbrains.plugins.gradle.execution.test.runner.TestMethodGradleConfigurationProducer" />
+      </set>
+    </option>
+  </component>
+</project>
--- a/.idea/scopes/Pupil.xml
+++ b/.idea/scopes/Pupil.xml
@@ -0,0 +1,3 @@
+<component name="DependencyValidationManager">
+  <scope name="Pupil" pattern="file[app]:*/" />
+</component>
--- a/.idea/vcs.xml
+++ b/.idea/vcs.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="VcsDirectoryMappings">
+    <mapping directory="" vcs="Git" />
+  </component>
+</project>
--- a/README.md
+++ b/README.md
@@ -2,8 +2,8 @@
 *Pupil, Hitomi.la viewer for Android*  

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

 # Features
 ![Main Screen](https://github.com/tom5079/Pupil/blob/gh-pages/assets/images/main-screenshot.jpg?raw=true)
@@ -20,7 +20,7 @@ or Build app yourself

 # Contribution

-Any kind of contribution is appreciated. Feel free to leave PR!
+Any kind of contribution is appriciated. Feel free to leave PR!

 ## Tag Translation
 Head over to [tags branch](https://github.com/tom5079/Pupil/tree/tags)
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -1,7 +1,7 @@
 apply plugin: "com.android.application"
 apply plugin: "kotlin-android"
 apply plugin: "kotlin-kapt"
-apply plugin: "kotlin-parcelize"
+apply plugin: "kotlin-android-extensions"
 apply plugin: "kotlinx-serialization"
 apply plugin: "com.google.android.gms.oss-licenses-plugin"

@@ -32,27 +32,27 @@ configurations {
 }

 android {
+    compileSdkVersion 30
    defaultConfig {
        applicationId "xyz.quaver.pupil"
        minSdkVersion 16
-        compileSdk 34
-        targetSdkVersion 34
-        versionCode 69
-        versionName "5.3.10"
+        targetSdkVersion 30
+        versionCode 64
+        versionName "5.1.7-beta1"
        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
        vectorDrawables.useSupportLibrary = true
    }
    buildTypes {
        debug {
-            defaultConfig.minSdkVersion 21
-
-            minifyEnabled false
-            shrinkResources false
+            minifyEnabled true
+            shrinkResources true

            debuggable true
            applicationIdSuffix ".debug"
            versionNameSuffix "-DEBUG"

+            proguardFiles getDefaultProguardFile("proguard-android-optimize.txt"), "proguard-rules.pro"
+
            ext.enableCrashlytics = false
            ext.alwaysUpdateBuildId = false
        }
@@ -63,56 +63,52 @@ android {
            proguardFiles getDefaultProguardFile("proguard-android-optimize.txt"), "proguard-rules.pro"
        }
    }
-    buildFeatures {
-        viewBinding true
-    }
    kotlinOptions {
-        jvmTarget = JavaVersion.VERSION_11.toString()
+        jvmTarget = JavaVersion.VERSION_1_8.toString()
        freeCompilerArgs += "-Xuse-experimental=kotlin.Experimental"
    }
    compileOptions {
-        sourceCompatibility JavaVersion.VERSION_11
-        targetCompatibility JavaVersion.VERSION_11
+        sourceCompatibility JavaVersion.VERSION_1_8
+        targetCompatibility JavaVersion.VERSION_1_8
    }
+    buildToolsVersion = "29.0.3"
 }

 dependencies {
    implementation fileTree(dir: "libs", include: ["*.jar", "*.aar"])
    implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8"
-    implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:1.7.1"
-    implementation "org.jetbrains.kotlinx:kotlinx-serialization-json:1.3.2"
-    implementation "org.jetbrains.kotlinx:kotlinx-datetime:0.3.2"
+    implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:1.4.1"
+    implementation "org.jetbrains.kotlinx:kotlinx-serialization-json:1.0.1"
    
-    implementation "androidx.appcompat:appcompat:1.4.1"
-    implementation "androidx.activity:activity-ktx:1.4.0"
-    implementation "androidx.fragment:fragment-ktx:1.4.1"
-    implementation "androidx.preference:preference-ktx:1.2.0"
-    implementation "androidx.recyclerview:recyclerview:1.2.1"
-    implementation "androidx.constraintlayout:constraintlayout:2.1.3"
+    implementation "androidx.appcompat:appcompat:1.2.0"
+    implementation "androidx.activity:activity-ktx:1.2.0-beta01"
+    implementation "androidx.fragment:fragment-ktx:1.3.0-beta01"
+    implementation "androidx.preference:preference-ktx:1.1.1"
+    implementation "androidx.recyclerview:recyclerview:1.1.0"
+    implementation "androidx.constraintlayout:constraintlayout:2.0.4"
    implementation "androidx.gridlayout:gridlayout:1.0.0"
-    implementation "androidx.biometric:biometric:1.1.0"
-    implementation "androidx.work:work-runtime-ktx:2.7.1"
+    implementation "androidx.biometric:biometric:1.0.1"
+    implementation "androidx.work:work-runtime-ktx:2.4.0"

    implementation "com.daimajia.swipelayout:library:1.2.0@aar"

-    implementation "com.google.android.material:material:1.11.0"
+    implementation "com.google.android.material:material:1.3.0-alpha04"

-    implementation platform('com.google.firebase:firebase-bom:32.7.0')
-    implementation "com.google.firebase:firebase-analytics-ktx"
-    implementation "com.google.firebase:firebase-crashlytics-ktx"
-    implementation "com.google.firebase:firebase-perf-ktx"
+    implementation "com.google.firebase:firebase-core:18.0.0"
+    implementation "com.google.firebase:firebase-analytics:18.0.0"
+    implementation "com.google.firebase:firebase-crashlytics:17.3.0"
+    implementation "com.google.firebase:firebase-perf:19.0.10"

-    implementation "com.google.android.gms:play-services-oss-licenses:17.0.1"
-    implementation "com.google.android.gms:play-services-mlkit-face-detection:17.1.0"
+    implementation "com.google.android.gms:play-services-oss-licenses:17.0.0"
+    implementation "com.google.android.gms:play-services-mlkit-face-detection:16.1.1"

    implementation "com.github.clans:fab:1.6.4"

    //implementation "com.quiph.ui:recyclerviewfastscroller:0.2.1"

-    implementation 'com.github.piasy:BigImageViewer:1.8.1'
-    implementation 'com.github.piasy:FrescoImageLoader:1.8.1'
-    implementation 'com.github.piasy:FrescoImageViewFactory:1.8.1'
-    implementation 'com.facebook.fresco:imagepipeline-okhttp3:2.6.0'
+    implementation 'com.github.piasy:BigImageViewer:1.6.7'
+    implementation 'com.github.piasy:FrescoImageLoader:1.6.7'
+    implementation 'com.github.piasy:FrescoImageViewFactory:1.6.7'

    //noinspection GradleDependency
    implementation "com.squareup.okhttp3:okhttp:$okhttp_version"
@@ -127,15 +123,17 @@ dependencies {

    implementation "ru.noties.markwon:core:3.1.0"

-    implementation "org.jsoup:jsoup:1.14.3"
+    implementation "xyz.quaver:libpupil:1.8.16"
+    implementation "xyz.quaver:documentfilex:0.4-alpha02"
+    implementation "xyz.quaver:floatingsearchview:1.0.7"

-    implementation "xyz.quaver:documentfilex:0.7.2"
-    implementation "xyz.quaver:floatingsearchview:1.1.7"
+    testImplementation "junit:junit:4.13.1"
+    androidTestImplementation "androidx.test.ext:junit:1.1.2"
+    androidTestImplementation "androidx.test:rules:1.3.0"
+    androidTestImplementation "androidx.test:runner:1.3.0"
+    androidTestImplementation "androidx.test.espresso:espresso-core:3.3.0"
+}

-    testImplementation "junit:junit:4.13.2"
-    testImplementation "org.jetbrains.kotlinx:kotlinx-coroutines-test:1.6.1"
-    androidTestImplementation "androidx.test.ext:junit:1.1.3"
-    androidTestImplementation "androidx.test:rules:1.4.0"
-    androidTestImplementation "androidx.test:runner:1.4.0"
-    androidTestImplementation "androidx.test.espresso:espresso-core:3.4.0"
+androidExtensions {
+    experimental = true
 }
--- a/app/proguard-rules.pro
+++ b/app/proguard-rules.pro
@@ -32,6 +32,4 @@
    kotlinx.serialization.KSerializer serializer(...);
 }
 -keep class xyz.quaver.pupil.ui.fragment.ManageFavoritesFragment
-keep class xyz.quaver.pupil.ui.fragment.ManageStorageFragment
-keep class xyz.quaver.pupil.** { *; }
-keep class app.cash.zipline.** { *; }
+-keep class xyz.quaver.pupil.ui.fragment.ManageStorageFragment
--- a/app/release/output-metadata.json
+++ b/app/release/output-metadata.json
@@ -1,20 +1,18 @@
 {
-  "version": 3,
+  "version": 2,
  "artifactType": {
    "type": "APK",
    "kind": "Directory"
  },
  "applicationId": "xyz.quaver.pupil",
-  "variantName": "release",
+  "variantName": "processReleaseResources",
  "elements": [
    {
      "type": "SINGLE",
      "filters": [],
-      "attributes": [],
-      "versionCode": 69,
-      "versionName": "5.3.10",
+      "versionCode": 64,
+      "versionName": "5.1.7-beta1",
      "outputFile": "app-release.apk"
    }
-  ],
-  "elementType": "File"
+  ]
 }
--- a/app/src/androidTest/java/xyz/quaver/pupil/ExampleInstrumentedTest.kt
+++ b/app/src/androidTest/java/xyz/quaver/pupil/ExampleInstrumentedTest.kt
@@ -20,18 +20,10 @@

 package xyz.quaver.pupil

-import android.util.Log
 import androidx.test.ext.junit.runners.AndroidJUnit4
-import kotlinx.coroutines.runBlocking
-import okhttp3.OkHttpClient
-import okhttp3.Request
-import org.junit.Assert.assertEquals
-import org.junit.Before
+import androidx.test.platform.app.InstrumentationRegistry
 import org.junit.Test
 import org.junit.runner.RunWith
-import xyz.quaver.pupil.hitomi.*
-import java.util.*
-import java.util.concurrent.TimeUnit

 /**
 * Instrumented test, which will execute on an Android device.
@@ -40,144 +32,10 @@ import java.util.concurrent.TimeUnit
 */
@RunWith(AndroidJUnit4::class)
 class ExampleInstrumentedTest {
-//    @Before
-//    fun init() {
-//        val appContext = InstrumentationRegistry.getInstrumentation().targetContext
-//    }
-
-    @Before
-    fun init() {
-        clientBuilder = OkHttpClient.Builder()
-            .readTimeout(0, TimeUnit.SECONDS)
-            .writeTimeout(0, TimeUnit.SECONDS)
-            .callTimeout(0, TimeUnit.SECONDS)
-            .connectTimeout(0, TimeUnit.SECONDS)
-            .addInterceptor { chain ->
-                val request = chain.request().newBuilder()
-                    .header("Referer", "https://hitomi.la/")
-                    .build()
-
-                chain.proceed(request)
-            }
-    }

    @Test
-    fun test_empty() {
-        print(
-            "".trim()
-                .replace(Regex("""^\?"""), "")
-                .lowercase(Locale.getDefault())
-                .split(Regex("\\s+"))
-                .map {
-                    it.replace('_', ' ')
-                })
+    fun useAppContext() {
+        // Context of the app under test.
+        val appContext = InstrumentationRegistry.getInstrumentation().targetContext
    }
-    @Test
-    fun test_nozomi() {
-        val nozomi = getGalleryIDsFromNozomi(null, "index", "all")
-
-        Log.d("PUPILD", nozomi.size.toString())
-    }
-
-    @Test
-    fun test_search() {
-        val ids = getGalleryIDsForQuery("language:korean").reversed()
-
-        print(ids.size)
-    }
-
-    @Test
-    fun test_suggestions() {
-        val suggestions = getSuggestionsForQuery("language:g")
-
-        print(suggestions)
-    }
-
-    @Test
-    fun test_doSearch() {
-        val r = runBlocking {
-            doSearch("language:korean")
-        }
-
-        Log.d("PUPILD", r.take(10).toString())
-    }
-
-//    @Test
-//    fun test_getBlock() {
-//        val galleryBlock = getGalleryBlock(2097576)
-//
-//        print(galleryBlock)
-//    }
-//
-//    @Test
-//    fun test_getGallery() {
-//        val gallery = getGallery(2097751)
-//
-//        print(gallery)
-//    }
-
-    @Test
-    fun test_getGalleryInfo() {
-        val info = getGalleryInfo(1469394)
-
-        print(info)
-    }
-
-    @Test
-    fun test_getReader() {
-        val reader = getGalleryInfo(2128654)
-
-        Log.d("PUPILD", reader.toString())
-    }
-
-    @Test
-    fun test_getImages() { runBlocking {
-        val galleryID = 2128654
-
-        val images = getGalleryInfo(galleryID).files.map {
-            imageUrlFromImage(galleryID, it,false)
-        }
-
-        Log.d("PUPILD", images.toString())
-
-//        images.forEachIndexed { index, image ->
-//            println("Testing $index/${images.size}: $image")
-//            val response = client.newCall(
-//                Request.Builder()
-//                    .url(image)
-//                    .header("Referer", "https://hitomi.la/")
-//                    .build()
-//            ).execute()
-//
-//            assertEquals(200, response.code())
-//
-//            println("$index/${images.size} Passed")
-//        }
-    } }
-
-//    @Test
-//    fun test_urlFromUrlFromHash() {
-//        val url = urlFromUrlFromHash(1531795, GalleryFiles(
-//            212, "719d46a7556be0d0021c5105878507129b5b3308b02cf67f18901b69dbb3b5ef", 1, "00.jpg", 300
-//        ), "webp")
-//
-//        print(url)
-//    }
-
-//    @Test
-//    suspend fun test_doSearch_extreme() {
-//        val query = "language:korean -tag:sample -female:humiliation -female:diaper -female:strap-on -female:squirting -female:lizard_girl -female:voyeurism -type:artistcg -female:blood -female:ryona -male:blood -male:ryona -female:crotch_tattoo -male:urethra_insertion -female:living_clothes -male:tentacles -female:slave -female:gag -male:gag -female:wooden_horse -male:exhibitionism -male:miniguy -female:mind_break -male:mind_break -male:unbirth -tag:scanmark -tag:no_penetration -tag:nudity_only -female:enema -female:brain_fuck -female:navel_fuck -tag:novel -tag:mosaic_censorship -tag:webtoon -male:rape -female:rape -female:yuri -male:anal -female:anal -female:futanari -female:huge_breasts -female:big_areolae -male:torture -male:stuck_in_wall -female:stuck_in_wall -female:torture -female:birth -female:pregnant -female:drugs -female:bdsm -female:body_writing -female:cbt -male:dark_skin -male:insect -female:insect -male:vore -female:vore -female:vomit -female:urination -female:urethra_insertion -tag:mmf_threesome -female:sex_toys -female:double_penetration -female:eggs -female:prolapse -male:smell -male:bestiality -female:bestiality -female:big_ass -female:milf -female:mother -male:dilf -male:netorare -female:netorare -female:cosplaying -female:filming -female:armpit_sex -female:armpit_licking -female:tickling -female:lactation -male:skinsuit -female:skinsuit -male:bbm -female:prostitution -female:double_penetration -female:females_only -male:males_only -female:tentacles -female:tentacles -female:stomach_deformation -female:hairy_armpits -female:large_insertions -female:mind_control -male:orc -female:dark_skin -male:yandere -female:yandere -female:scat -female:toddlercon -female:bbw -female:hairy -male:cuntboy -male:lactation -male:drugs -female:body_modification -female:monoeye -female:chikan -female:long_tongue -female:harness -female:fisting -female:glory_hole -female:latex -male:latex -female:unbirth -female:giantess -female:sole_dickgirl -female:robot -female:doll_joints -female:machine -tag:artbook -male:cbt -female:farting -male:farting -male:midget -female:midget -female:exhibitionism  -male:monster -female:big_nipples -female:big_clit -female:gyaru -female:piercing -female:necrophilia -female:snuff -female:smell -male:cheating -female:cheating -male:snuff -female:harem -male:harem"
-//        print(doSearch(query).size)
-//    }
-
-//    @Test
-//    suspend fun test_parse() {
-//        print(doSearch("-male:yaoi -female:yaoi -female:loli").size)
-//    }
-
-//    @Test
-//    fun test_subdomainFromUrl() {
-//        val galleryInfo = getGalleryInfo(1929109).files[2]
-//        print(urlFromUrlFromHash(1929109, galleryInfo, "webp", null, "a"))
-//    }
 }
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -6,13 +6,11 @@
    <uses-permission android:name="android.permission.INTERNET" />
    <uses-permission android:name="android.permission.REQUEST_INSTALL_PACKAGES" />
    <uses-permission android:name="android.permission.USE_BIOMETRIC" />
-    <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" android:maxSdkVersion="23"/>
-    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" android:maxSdkVersion="23"/>
+    <uses-permission-sdk-23 android:name="android.permission.READ_EXTERNAL_STORAGE"/>
+    <uses-permission-sdk-23 android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
    <uses-permission android:name="android.permission.FOREGROUND_SERVICE" />
    <uses-permission android:name="android.permission.CAMERA" />
    <uses-permission android:name="android.permission.VIBRATE"/>
-    <uses-permission android:name="android.permission.FOREGROUND_SERVICE_SPECIAL_USE"/>
-    <uses-permission android:name="android.permission.POST_NOTIFICATIONS"/>

    <uses-feature android:name="android.hardware.camera" android:required="false" />
    <uses-feature android:name="android.hardware.camera.autofocus" android:required="false" />
@@ -47,8 +45,7 @@
        </provider>

        <service android:name=".services.DownloadService"
-            android:exported="false"
-            android:foregroundServiceType="specialUse" />
+            android:exported="false"/>

        <receiver
            android:name=".receiver.UpdateBroadcastReceiver"
@@ -62,121 +59,188 @@
        <activity
            android:name=".ui.ReaderActivity"
            android:configChanges="keyboardHidden|orientation|screenSize"
-            android:parentActivityName=".ui.MainActivity"
-            android:exported="true">
-            <intent-filter android:autoVerify="true">
+            android:parentActivityName=".ui.MainActivity">
+            <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:scheme="http" />
-                <data android:scheme="https" />
-                <data android:host="*.hasha.in"/>
-                <data android:pathPrefix="/reader"/>
+                <data
+                    android:host="hitomi.la"
+                    android:pathPrefix="/galleries"
+                    android:scheme="http" />
            </intent-filter>
-            <intent-filter android:autoVerify="true">
+            <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:scheme="http" />
-                <data android:scheme="https" />
-                <data android:host="hitomi.la"/>
-                <data android:pathPrefix="/galleries"/>
+                <data
+                    android:host="hitomi.la"
+                    android:pathPrefix="/manga"
+                    android:scheme="http" />
            </intent-filter>
-            <intent-filter android:autoVerify="true">
+            <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:scheme="http" />
-                <data android:scheme="https" />
-                <data android:host="hitomi.la" />
-                <data android:pathPrefix="/manga" />
+                <data
+                    android:host="hitomi.la"
+                    android:pathPrefix="/doujinshi"
+                    android:scheme="http" />
            </intent-filter>
-            <intent-filter android:autoVerify="true">
+            <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:scheme="http" />
-                <data android:scheme="https" />
-                <data android:host="hitomi.la" />
-                <data android:pathPrefix="/doujinshi" />
+                <data
+                    android:host="hitomi.la"
+                    android:pathPrefix="/cg"
+                    android:scheme="http" />
            </intent-filter>
-            <intent-filter android:autoVerify="true">
+            <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:scheme="http" />
-                <data android:scheme="https" />
-                <data android:host="hitomi.la" />
-                <data android:pathPrefix="/cg" />
+                <data
+                    android:host="hitomi.la"
+                    android:pathPrefix="/reader"
+                    android:scheme="http" />
            </intent-filter>
-            <intent-filter android:autoVerify="true">
+            <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:scheme="http" />
-                <data android:scheme="https" />
-                <data android:host="hitomi.la" />
-                <data android:pathPrefix="/imageset" />
+                <data
+                    android:host="hitomi.la"
+                    android:pathPrefix="/galleries"
+                    android:scheme="https" />
            </intent-filter>
-            <intent-filter android:autoVerify="true">
+            <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:scheme="http" />
-                <data android:scheme="https" />
-                <data android:host="hitomi.la" />
-                <data android:pathPrefix="/reader" />
+                <data
+                    android:host="hitomi.la"
+                    android:pathPrefix="/manga"
+                    android:scheme="https" />
            </intent-filter>
-            <intent-filter android:autoVerify="true">
+            <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:scheme="http" />
-                <data android:host="e-hentai.org" />
-                <data android:pathPrefix="/g" />
+                <data
+                    android:host="hitomi.la"
+                    android:pathPrefix="/doujinshi"
+                    android:scheme="https" />
            </intent-filter>
-            <intent-filter android:autoVerify="true">
+            <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:scheme="https" />
-                <data android:host="e-hentai.org" />
-                <data android:pathPrefix="/g" />
+                <data
+                    android:host="hitomi.la"
+                    android:pathPrefix="/cg"
+                    android:scheme="https" />
+            </intent-filter>
+            <intent-filter>
+                <action android:name="android.intent.action.VIEW" />
+
+                <category android:name="android.intent.category.DEFAULT" />
+                <category android:name="android.intent.category.BROWSABLE" />
+
+                <data
+                    android:host="hitomi.la"
+                    android:pathPrefix="/reader"
+                    android:scheme="https" />
+            </intent-filter>
+            <intent-filter>
+                <action android:name="android.intent.action.VIEW" />
+
+                <category android:name="android.intent.category.DEFAULT" />
+                <category android:name="android.intent.category.BROWSABLE" />
+
+                <data
+                    android:host="hiyobi.me"
+                    android:scheme="http"
+                    android:pathPrefix="/reader" />
+            </intent-filter>
+            <intent-filter>
+                <action android:name="android.intent.action.VIEW" />
+
+                <category android:name="android.intent.category.DEFAULT" />
+                <category android:name="android.intent.category.BROWSABLE" />
+
+                <data
+                    android:host="hiyobi.me"
+                    android:pathPrefix="/reader"
+                    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="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"
            android:label="@string/settings_title">
+            <tools:validation testUrl="http://ix.io/eer" />
        </activity>
        <activity
            android:name=".ui.MainActivity"
            android:configChanges="keyboardHidden|orientation|screenSize"
-            android:theme="@style/NoActionBarAppTheme"
-            android:exported="true">
+            android:theme="@style/NoActionBarAppTheme">
            <intent-filter>
                <action android:name="android.intent.action.MAIN" />
                <action android:name="android.intent.action.VIEW" />

                <category android:name="android.intent.category.LAUNCHER" />
            </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:scheme="http"
+                    android:host="ix.io"
+                    android:pathPattern="/..*" />
+            </intent-filter>
        </activity>
        <activity android:name="net.rdrei.android.dirchooser.DirectoryChooserActivity" />
    </application>
--- a/app/src/main/java/xyz/quaver/pupil/Pupil.kt
+++ b/app/src/main/java/xyz/quaver/pupil/Pupil.kt
@@ -26,32 +26,26 @@ import android.content.Context
 import android.content.Intent
 import android.net.Uri
 import android.os.Build
-import android.util.Log
 import androidx.appcompat.app.AppCompatDelegate
 import androidx.core.content.ContextCompat
 import androidx.preference.PreferenceManager
-import com.facebook.imagepipeline.backends.okhttp3.OkHttpImagePipelineConfigFactory
 import com.github.piasy.biv.BigImageViewer
 import com.github.piasy.biv.loader.fresco.FrescoImageLoader
 import com.google.android.gms.common.GooglePlayServicesNotAvailableException
 import com.google.android.gms.common.GooglePlayServicesRepairableException
 import com.google.android.gms.security.ProviderInstaller
-import com.google.firebase.FirebaseApp
+import com.google.firebase.analytics.FirebaseAnalytics
 import com.google.firebase.crashlytics.FirebaseCrashlytics
-import kotlinx.coroutines.*
-import okhttp3.Dispatcher
 import okhttp3.Interceptor
 import okhttp3.OkHttpClient
 import okhttp3.Response
 import xyz.quaver.io.FileX
-import xyz.quaver.pupil.hitomi.evaluationContext
-import xyz.quaver.pupil.hitomi.readText
 import xyz.quaver.pupil.types.Tag
 import xyz.quaver.pupil.util.*
+import xyz.quaver.pupil.util.downloader.DownloadManager
+import xyz.quaver.setClient
 import java.io.File
-import java.net.URL
 import java.util.*
-import java.util.concurrent.Executors
 import java.util.concurrent.TimeUnit
 import kotlin.reflect.KClass

@@ -74,17 +68,12 @@ var clientHolder: OkHttpClient? = null
 val client: OkHttpClient
    get() = clientHolder ?: clientBuilder.build().also {
        clientHolder = it
+        setClient(it)
    }

 class Pupil : Application() {
-    companion object {
-        lateinit var instance: Pupil
-            private set
-    }

    override fun onCreate() {
-        instance = this
-
        AppCompatDelegate.setCompatVectorFromResourcesEnabled(true)

        preferences = PreferenceManager.getDefaultSharedPreferences(this)
@@ -94,34 +83,24 @@ class Pupil : Application() {
            else userID
        }

-        FirebaseApp.initializeApp(this)
        FirebaseCrashlytics.getInstance().setUserId(userID)

        val proxyInfo = getProxyInfo()

        clientBuilder = OkHttpClient.Builder()
-//            .connectTimeout(0, TimeUnit.SECONDS)
+            .connectTimeout(0, TimeUnit.SECONDS)
            .readTimeout(0, TimeUnit.SECONDS)
            .proxyInfo(proxyInfo)
            .addInterceptor { chain ->
-                val request = chain.request().newBuilder()
-                    .addHeader("User-Agent", "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/94.0.4606.81 Safari/537.36")
-                    .header("Referer", "https://hitomi.la/")
-                    .build()
-
+                val request = chain.request()
                val tag = request.tag() ?: return@addInterceptor chain.proceed(request)

                interceptors[tag::class]?.invoke(chain) ?: chain.proceed(request)
-            }.apply {
-                (Preferences.get<String>("max_concurrent_download").toIntOrNull() ?: 0).let {
-                    if (it != 0)
-                        dispatcher(Dispatcher(Executors.newFixedThreadPool(it)))
-                }
            }

        try {
            Preferences.get<String>("download_folder").also {
-                if (it.startsWith("content://"))
+                if (it.startsWith("content") && Build.VERSION.SDK_INT > 19)
                    contentResolver.takePersistableUriPermission(
                        Uri.parse(it),
                        Intent.FLAG_GRANT_READ_URI_PERMISSION or Intent.FLAG_GRANT_WRITE_URI_PERMISSION
@@ -129,6 +108,8 @@ class Pupil : Application() {

                if (!FileX(this, it).canWrite())
                    throw Exception()
+
+                DownloadManager.getInstance(this).migrate()
            }
        } catch (e: Exception) {
            Preferences.remove("download_folder")
@@ -144,13 +125,8 @@ class Pupil : Application() {
        favoriteTags = SavedSet(File(ContextCompat.getDataDir(this), "favorites_tags.json"), Tag.parse(""))
        searchHistory = SavedSet(File(ContextCompat.getDataDir(this), "search_histories.json"), "")

-        favoriteTags.filter { it.tag.contains('_') }.forEach {
-            favoriteTags.remove(it)
-        }
-
-        /*
        if (BuildConfig.DEBUG)
-            FirebaseAnalytics.getInstance(this).setAnalyticsCollectionEnabled(false)*/
+            FirebaseAnalytics.getInstance(this).setAnalyticsCollectionEnabled(false)

        try {
            ProviderInstaller.installIfNeeded(this)
@@ -160,14 +136,7 @@ class Pupil : Application() {
            e.printStackTrace()
        }

-        BigImageViewer.initialize(
-            FrescoImageLoader.with(
-                this,
-                OkHttpImagePipelineConfigFactory
-                    .newBuilder(this, client)
-                    .build()
-            )
-        )
+        BigImageViewer.initialize(FrescoImageLoader.with(this))

        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
            val manager = getSystemService(Context.NOTIFICATION_SERVICE) as NotificationManager
--- a/app/src/main/java/xyz/quaver/pupil/adapters/GalleryBlockAdapter.kt
+++ b/app/src/main/java/xyz/quaver/pupil/adapters/GalleryBlockAdapter.kt
@@ -25,6 +25,7 @@ import android.graphics.drawable.Drawable
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
+import android.widget.LinearLayout
 import android.widget.Toast
 import androidx.core.content.ContextCompat
 import androidx.recyclerview.widget.RecyclerView
@@ -34,14 +35,15 @@ import com.daimajia.swipe.SwipeLayout
 import com.daimajia.swipe.adapters.RecyclerSwipeAdapter
 import com.daimajia.swipe.interfaces.SwipeAdapterInterface
 import com.github.piasy.biv.loader.ImageLoader
+import kotlinx.android.synthetic.main.item_galleryblock.view.*
+import kotlinx.android.synthetic.main.view_progress_card.view.*
 import kotlinx.coroutines.*
+import xyz.quaver.hitomi.getGallery
+import xyz.quaver.hitomi.getReader
 import xyz.quaver.io.util.getChild
 import xyz.quaver.pupil.R
-import xyz.quaver.pupil.databinding.GalleryblockItemBinding
 import xyz.quaver.pupil.favoriteTags
 import xyz.quaver.pupil.favorites
-import xyz.quaver.pupil.hitomi.getGallery
-import xyz.quaver.pupil.hitomi.getGalleryInfo
 import xyz.quaver.pupil.types.Tag
 import xyz.quaver.pupil.ui.view.ProgressCard
 import xyz.quaver.pupil.util.Preferences
@@ -55,20 +57,20 @@ class GalleryBlockAdapter(private val galleries: List<Int>) : RecyclerSwipeAdapt
    var updateAll = true
    var thin: Boolean = Preferences["thin"]

-    inner class GalleryViewHolder(val binding: GalleryblockItemBinding) : RecyclerView.ViewHolder(binding.root) {
+    inner class GalleryViewHolder(val view: View) : RecyclerView.ViewHolder(view) {
        private var galleryID: Int = 0

        init {
            CoroutineScope(Dispatchers.Main).launch {
                while (updateAll) {
-                    updateProgress(itemView.context)
+                    updateProgress(view.context)
                    delay(1000)
                }
            }
        }

        private fun updateProgress(context: Context) = CoroutineScope(Dispatchers.Main).launch {
-            with(binding.galleryblockCard) {
+            with(view.galleryblock_card) {
                val imageList = Cache.getInstance(context, galleryID).metadata.imageList

                if (imageList == null) {
@@ -79,7 +81,7 @@ class GalleryBlockAdapter(private val galleries: List<Int>) : RecyclerSwipeAdapt
                progress = imageList.count { it != null }
                max = imageList.size

-                this@GalleryViewHolder.binding.galleryblockId.setOnClickListener {
+                view.galleryblock_id.setOnClickListener {
                    (context.getSystemService(Context.CLIPBOARD_SERVICE) as ClipboardManager).setPrimaryClip(
                        ClipData.newPlainText("gallery_id", galleryID.toString())
                    )
@@ -100,175 +102,177 @@ class GalleryBlockAdapter(private val galleries: List<Int>) : RecyclerSwipeAdapt

        fun bind(galleryID: Int) {
            this.galleryID = galleryID
-            updateProgress(itemView.context)
+            updateProgress(view.context)

-            val cache = Cache.getInstance(itemView.context, galleryID)
+            val cache = Cache.getInstance(view.context, galleryID)

-            CoroutineScope(Dispatchers.IO).launch {
-                val galleryBlock = cache.getGalleryBlock() ?: return@launch
+            val galleryBlock = runBlocking {
+                cache.getGalleryBlock()
+            } ?: return

-                launch(Dispatchers.Main) {
-                    val resources = itemView.context.resources
-                    val languages = resources.getStringArray(R.array.languages).map {
-                        it.split("|").let { split ->
-                            Pair(split[0], split[1])
-                        }
-                    }.toMap()
-
-                    val artists = galleryBlock.artists
-                    val series = galleryBlock.series
-
-                    binding.galleryblockThumbnail.apply {
-                        setOnClickListener {
-                            itemView.performClick()
-                        }
-                        setOnLongClickListener {
-                            itemView.performLongClick()
-                        }
-                        setFailureImage(ContextCompat.getDrawable(context, R.drawable.image_broken_variant))
-                        setImageLoaderCallback(object: ImageLoader.Callback {
-                            override fun onFail(error: Exception?) {
-                                Cache.delete(context, galleryID)
-                            }
-
-                            override fun onCacheHit(imageType: Int, image: File?) {}
-                            override fun onCacheMiss(imageType: Int, image: File?) {}
-                            override fun onFinish() {}
-                            override fun onProgress(progress: Int) {}
-                            override fun onStart() {}
-                            override fun onSuccess(image: File?) {}
-                        })
-                        ssiv?.recycle()
-                        CoroutineScope(Dispatchers.IO).launch {
-                            cache.getThumbnail().let { launch(Dispatchers.Main) {
-                                showImage(it)
-                            } }
-                        }
+            with(view) {
+                val resources = context.resources
+                val languages = resources.getStringArray(R.array.languages).map {
+                    it.split("|").let { split ->
+                        Pair(split[0], split[1])
                    }
+                }.toMap()

-                    binding.galleryblockTitle.text = galleryBlock.title
-                    with(binding.galleryblockArtist) {
-                        text = artists.joinToString { it.wordCapitalize() }
-                        visibility = when {
-                            artists.isNotEmpty() -> View.VISIBLE
-                            else -> View.GONE
-                        }
+                val artists = galleryBlock.artists
+                val series = galleryBlock.series

-                        CoroutineScope(Dispatchers.IO).launch {
-                            val gallery = runCatching {
-                                getGallery(galleryID)
-                            }.getOrNull()
-
-                            if (gallery?.groups?.isNotEmpty() != true)
-                                return@launch
-
-                            launch(Dispatchers.Main) {
-                                text = context.getString(
-                                    R.string.galleryblock_artist_with_group,
-                                    artists.joinToString { it.wordCapitalize() },
-                                    gallery.groups.joinToString { it.wordCapitalize() }
-                                )
-                            }
-                        }
+                galleryblock_thumbnail.apply {
+                    setOnClickListener {
+                        view.performClick()
                    }
-                    with(binding.galleryblockSeries) {
-                        text =
-                            resources.getString(
-                                R.string.galleryblock_series,
-                                series.joinToString(", ") { it.wordCapitalize() })
-                        visibility = when {
-                            series.isNotEmpty() -> View.VISIBLE
-                            else -> View.GONE
-                        }
+                    setOnLongClickListener {
+                        view.performLongClick()
                    }
-                    binding.galleryblockType.text = resources.getString(R.string.galleryblock_type, galleryBlock.type).wordCapitalize()
-                    with(binding.galleryblockLanguage) {
-                        text =
-                            resources.getString(R.string.galleryblock_language, languages[galleryBlock.language])
-                        visibility = when {
-                            !galleryBlock.language.isNullOrEmpty() -> View.VISIBLE
-                            else -> View.GONE
-                        }
-                    }
-
-                    with(binding.galleryblockTagGroup) {
-                        onClickListener = {
-                            onChipClickedHandler.forEach { callback ->
-                                callback.invoke(it)
+                    setFailureImage(ContextCompat.getDrawable(context, R.drawable.image_broken_variant))
+                    setImageLoaderCallback(object: ImageLoader.Callback {
+                        override fun onFail(error: Exception?) {
+                            Cache.getInstance(context, galleryID).let { cache ->
+                                cache.cacheFolder.getChild(".thumbnail").let { if (it.exists()) it.delete() }
+                                cache.downloadFolder?.getChild(".thumbnail")?.let { if (it.exists()) it.delete() }
                            }
                        }

-                        tags.clear()
-
-                        CoroutineScope(Dispatchers.IO).launch {
-                            tags.addAll(
-                                galleryBlock.relatedTags.sortedBy {
-                                    val tag = Tag.parse(it)
-
-                                    if (favoriteTags.contains(tag))
-                                        -1
-                                    else
-                                        when(Tag.parse(it).area) {
-                                            "female" -> 0
-                                            "male" -> 1
-                                            else -> 2
-                                        }
-                                }.map {
-                                    Tag.parse(it)
-                                }
-                            )
-
-                            launch(Dispatchers.Main) {
-                                refresh()
-                            }
-                        }
-                    }
-
-                    binding.galleryblockId.text = galleryBlock.id.toString()
-                    binding.galleryblockPagecount.text = "-"
+                        override fun onCacheHit(imageType: Int, image: File?) {}
+                        override fun onCacheMiss(imageType: Int, image: File?) {}
+                        override fun onFinish() {}
+                        override fun onProgress(progress: Int) {}
+                        override fun onStart() {}
+                        override fun onSuccess(image: File?) {}
+                    })
+                    ssiv?.recycle()
                    CoroutineScope(Dispatchers.IO).launch {
-                        val pageCount = kotlin.runCatching {
-                            getGalleryInfo(galleryBlock.id).files.size
-                        }.getOrNull() ?: return@launch
-                        withContext(Dispatchers.Main) {
-                            binding.galleryblockPagecount.text = itemView.context.getString(R.string.galleryblock_pagecount, pageCount)
+                        cache.getThumbnail().let { launch(Dispatchers.Main) {
+                            showImage(it)
+                        } }
+                    }
+                }
+
+                galleryblock_title.text = galleryBlock.title
+                with(galleryblock_artist) {
+                    text = artists.joinToString { it.wordCapitalize() }
+                    visibility = when {
+                        artists.isNotEmpty() -> View.VISIBLE
+                        else -> View.GONE
+                    }
+
+                    CoroutineScope(Dispatchers.IO).launch {
+                        val gallery = runCatching {
+                            getGallery(galleryID)
+                        }.getOrNull()
+
+                        if (gallery?.groups?.isNotEmpty() != true)
+                            return@launch
+
+                        launch(Dispatchers.Main) {
+                            text = context.getString(
+                                R.string.galleryblock_artist_with_group,
+                                artists.joinToString { it.wordCapitalize() },
+                                gallery.groups.joinToString { it.wordCapitalize() }
+                            )
+                        }
+                    }
+                }
+                with(galleryblock_series) {
+                    text =
+                        resources.getString(
+                            R.string.galleryblock_series,
+                            series.joinToString(", ") { it.wordCapitalize() })
+                    visibility = when {
+                        series.isNotEmpty() -> View.VISIBLE
+                        else -> View.GONE
+                    }
+                }
+                galleryblock_type.text = resources.getString(R.string.galleryblock_type, galleryBlock.type).wordCapitalize()
+                with(galleryblock_language) {
+                    text =
+                        resources.getString(R.string.galleryblock_language, languages[galleryBlock.language])
+                    visibility = when {
+                        galleryBlock.language.isNotEmpty() -> View.VISIBLE
+                        else -> View.GONE
+                    }
+                }
+
+                with(galleryblock_tag_group) {
+                    onClickListener = {
+                        onChipClickedHandler.forEach { callback ->
+                            callback.invoke(it)
                        }
                    }

-                    with(binding.galleryblockFavorite) {
-                        setImageResource(if (favorites.contains(galleryBlock.id)) R.drawable.ic_star_filled else R.drawable.ic_star_empty)
-                        setOnClickListener {
-                            when {
-                                favorites.contains(galleryBlock.id) -> {
-                                    favorites.remove(galleryBlock.id)
+                    tags.clear()

-                                    setImageResource(R.drawable.ic_star_empty)
-                                }
-                                else -> {
-                                    favorites.add(galleryBlock.id)
+                    CoroutineScope(Dispatchers.IO).launch {
+                        tags.addAll(
+                            galleryBlock.relatedTags.sortedBy {
+                                val tag = Tag.parse(it)

-                                    setImageDrawable(AnimatedVectorDrawableCompat.create(context, R.drawable.avd_star).apply {
-                                        this ?: return@apply
+                                if (favoriteTags.contains(tag))
+                                    -1
+                                else
+                                    when(Tag.parse(it).area) {
+                                        "female" -> 0
+                                        "male" -> 1
+                                        else -> 2
+                                    }
+                            }.map {
+                                Tag.parse(it)
+                            }
+                        )

-                                        registerAnimationCallback(object: Animatable2Compat.AnimationCallback() {
-                                            override fun onAnimationEnd(drawable: Drawable?) {
-                                                setImageResource(R.drawable.ic_star_filled)
-                                            }
-                                        })
-                                        start()
+                        launch(Dispatchers.Main) {
+                            refresh()
+                        }
+                    }
+                }
+
+                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)
+                    }
+                }
+
+                with(galleryblock_favorite) {
+                    setImageResource(if (favorites.contains(galleryBlock.id)) R.drawable.ic_star_filled else R.drawable.ic_star_empty)
+                    setOnClickListener {
+                        when {
+                            favorites.contains(galleryBlock.id) -> {
+                                favorites.remove(galleryBlock.id)
+
+                                setImageResource(R.drawable.ic_star_empty)
+                            }
+                            else -> {
+                                favorites.add(galleryBlock.id)
+
+                                setImageDrawable(AnimatedVectorDrawableCompat.create(context, R.drawable.avd_star).apply {
+                                    this ?: return@apply
+
+                                    registerAnimationCallback(object: Animatable2Compat.AnimationCallback() {
+                                        override fun onAnimationEnd(drawable: Drawable?) {
+                                            setImageResource(R.drawable.ic_star_filled)
+                                        }
                                    })
-                                }
+                                    start()
+                                })
                            }
                        }
                    }
-
-
                }
-            }

-            // Make some views invisible to make it thinner
-            if (thin) {
-                binding.galleryblockTagGroup.visibility = View.GONE
+
+                // Make some views invisible to make it thinner
+                if (thin) {
+                    galleryblock_tag_group.visibility = View.GONE
+                }
            }
        }
    }
@@ -278,7 +282,9 @@ class GalleryBlockAdapter(private val galleries: List<Int>) : RecyclerSwipeAdapt
    var onDeleteClickedHandler: ((Int) -> Unit)? = null

    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): RecyclerView.ViewHolder {
-        return GalleryViewHolder(GalleryblockItemBinding.inflate(LayoutInflater.from(parent.context), parent, false))
+        return GalleryViewHolder(
+            LayoutInflater.from(parent.context).inflate(R.layout.item_galleryblock, parent, false)
+        )
    }

    override fun onBindViewHolder(holder: RecyclerView.ViewHolder, position: Int) {
@@ -287,25 +293,25 @@ class GalleryBlockAdapter(private val galleries: List<Int>) : RecyclerSwipeAdapt

            holder.bind(galleryID)

-            holder.binding.galleryblockCard.binding.download.setOnClickListener {
+            holder.view.galleryblock_card.download.setOnClickListener {
                onDownloadClickedHandler?.invoke(position)
            }

-            holder.binding.galleryblockCard.binding.delete.setOnClickListener {
+            holder.view.galleryblock_card.delete.setOnClickListener {
                onDeleteClickedHandler?.invoke(position)
            }

-            mItemManger.bindView(holder.binding.root, position)
+            mItemManger.bindView(holder.view, position)

-            holder.binding.galleryblockCard.binding.swipeLayout.addSwipeListener(object: SwipeLayout.SwipeListener {
+            holder.view.galleryblock_card.swipe_layout.addSwipeListener(object: SwipeLayout.SwipeListener {
                override fun onStartOpen(layout: SwipeLayout?) {
                    mItemManger.closeAllExcept(layout)

-                    holder.binding.galleryblockCard.binding.download.text =
-                        if (DownloadManager.getInstance(holder.binding.root.context).isDownloading(galleryID))
-                            holder.binding.root.context.getString(android.R.string.cancel)
+                    holder.view.galleryblock_card.download.text =
+                        if (DownloadManager.getInstance(holder.view.context).isDownloading(galleryID))
+                            holder.view.context.getString(android.R.string.cancel)
                        else
-                            holder.binding.root.context.getString(R.string.main_download)
+                            holder.view.context.getString(R.string.main_download)
                }

                override fun onClose(layout: SwipeLayout?) {}
--- a/app/src/main/java/xyz/quaver/pupil/adapters/MirrorAdapter.kt
+++ b/app/src/main/java/xyz/quaver/pupil/adapters/MirrorAdapter.kt
@@ -0,0 +1,86 @@
+/*
+ *     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.recyclerview.widget.RecyclerView
+import kotlinx.android.synthetic.main.item_mirrors.view.*
+import xyz.quaver.pupil.R
+import xyz.quaver.pupil.util.Preferences
+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 {
+        Preferences.get<String>("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
+
+}
--- a/app/src/main/java/xyz/quaver/pupil/adapters/ReaderAdapter.kt
+++ b/app/src/main/java/xyz/quaver/pupil/adapters/ReaderAdapter.kt
@@ -39,10 +39,10 @@ import com.facebook.imagepipeline.image.ImageInfo
 import com.github.piasy.biv.view.BigImageView
 import com.github.piasy.biv.view.ImageShownCallback
 import com.github.piasy.biv.view.ImageViewFactory
+import kotlinx.android.synthetic.main.item_reader.view.*
 import kotlinx.coroutines.*
+import xyz.quaver.hitomi.Reader
 import xyz.quaver.pupil.R
-import xyz.quaver.pupil.databinding.ReaderItemBinding
-import xyz.quaver.pupil.hitomi.GalleryInfo
 import xyz.quaver.pupil.ui.ReaderActivity
 import xyz.quaver.pupil.util.downloader.Cache
 import java.io.File
@@ -52,93 +52,16 @@ class ReaderAdapter(
    private val activity: ReaderActivity,
    private val galleryID: Int
 ) : RecyclerView.Adapter<ReaderAdapter.ViewHolder>() {
-    var galleryInfo: GalleryInfo? = null
+
+    var reader: Reader? = null

    var isFullScreen = false

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

-    inner class ViewHolder(private val binding: ReaderItemBinding) : RecyclerView.ViewHolder(binding.root) {
-        init {
-            with (binding.image) {
-                setImageViewFactory(FrescoImageViewFactory().apply {
-                    updateView = { imageInfo ->
-                        binding.image.updateLayoutParams<ConstraintLayout.LayoutParams> {
-                            dimensionRatio = "${imageInfo.width}:${imageInfo.height}"
-                        }
-                    }
-                })
-                setImageShownCallback(object : ImageShownCallback {
-                    override fun onMainImageShown() {
-                        binding.image.mainView.let { v ->
-                            when (v) {
-                                is SubsamplingScaleImageView ->
-                                    if (!isFullScreen) binding.image.layoutParams.height = ViewGroup.LayoutParams.WRAP_CONTENT
-                            }
-                        }
-                    }
-
-                    override fun onThumbnailShown() {}
-                })
-
-                setFailureImage(ContextCompat.getDrawable(itemView.context, R.drawable.image_broken_variant))
-                setOnClickListener {
-                    onItemClickListener?.invoke()
-                }
-            }
-
-            binding.root.setOnClickListener {
-                onItemClickListener?.invoke()
-            }
-        }
-
-        fun bind(position: Int) {
-            if (cache == null)
-                cache = Cache.getInstance(itemView.context, galleryID)
-
-            if (!isFullScreen) {
-                binding.root.setBackgroundResource(R.drawable.reader_item_boundary)
-                binding.image.updateLayoutParams<ConstraintLayout.LayoutParams> {
-                    height = 0
-                    dimensionRatio =
-                        "${galleryInfo!!.files[position].width}:${galleryInfo!!.files[position].height}"
-                }
-            } else {
-                binding.root.layoutParams.height = ViewGroup.LayoutParams.MATCH_PARENT
-                binding.image.updateLayoutParams<ConstraintLayout.LayoutParams> {
-                    height = ConstraintLayout.LayoutParams.MATCH_PARENT
-                    dimensionRatio = null
-                }
-                binding.root.background = null
-            }
-
-            binding.readerIndex.text = (position+1).toString()
-
-            val image = cache!!.getImage(position)
-            val progress = activity.downloader?.progress?.get(galleryID)?.get(position)
-
-            if (progress?.isInfinite() == true && image != null) {
-                binding.progressGroup.visibility = View.INVISIBLE
-                binding.image.showImage(image.uri)
-            } else {
-                binding.progressGroup.visibility = View.VISIBLE
-                binding.readerItemProgressbar.progress =
-                    if (progress?.isInfinite() == true)
-                        100
-                    else
-                        progress?.roundToInt() ?: 0
-
-                clear()
-
-                CoroutineScope(Dispatchers.Main).launch {
-                    delay(1000)
-                    notifyItemChanged(position)
-                }
-            }
-        }
-
+    class ViewHolder(val view: View) : RecyclerView.ViewHolder(view) {
        fun clear() {
-            binding.image.mainView.let {
+            view.image.mainView.let {
                when (it) {
                    is SubsamplingScaleImageView ->
                        it.recycle()
@@ -150,15 +73,91 @@ class ReaderAdapter(
    }

    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): ViewHolder {
-        return ViewHolder(ReaderItemBinding.inflate(LayoutInflater.from(parent.context), parent, false))
+        return LayoutInflater.from(parent.context).inflate(
+            R.layout.item_reader, parent, false
+        ).let {
+            with(it) {
+                image.setImageViewFactory(FrescoImageViewFactory().apply {
+                    updateView = { imageInfo ->
+                        it.image.updateLayoutParams<ConstraintLayout.LayoutParams> {
+                            dimensionRatio = "${imageInfo.width}:${imageInfo.height}"
+                        }
+                    }
+                })
+                image.setImageShownCallback(object : ImageShownCallback {
+                    override fun onMainImageShown() {
+                        it.image.mainView.let { v ->
+                            when (v) {
+                                is SubsamplingScaleImageView ->
+                                    if (!isFullScreen) it.image.layoutParams.height = ViewGroup.LayoutParams.WRAP_CONTENT
+                            }
+                        }
+                    }
+
+                    override fun onThumbnailShown() {}
+                })
+                image.setFailureImage(ContextCompat.getDrawable(context, R.drawable.image_broken_variant))
+                image.setOnClickListener {
+                    this.performClick()
+                }
+                setOnClickListener {
+                    onItemClickListener?.invoke()
+                }
+            }
+
+            ViewHolder(it)
+        }
    }

    private var cache: Cache? = null
    override fun onBindViewHolder(holder: ViewHolder, position: Int) {
-        holder.bind(position)
+        holder.view as ConstraintLayout
+
+        if (cache == null)
+            cache = Cache.getInstance(holder.view.context, galleryID)
+
+        if (!isFullScreen) {
+            holder.view.setBackgroundResource(R.drawable.reader_item_boundary)
+            holder.view.image.updateLayoutParams<ConstraintLayout.LayoutParams> {
+                height = 0
+                dimensionRatio =
+                    "${reader!!.galleryInfo.files[position].width}:${reader!!.galleryInfo.files[position].height}"
+            }
+        } else {
+            holder.view.layoutParams.height = ViewGroup.LayoutParams.MATCH_PARENT
+            holder.view.image.updateLayoutParams<ConstraintLayout.LayoutParams> {
+                height = ConstraintLayout.LayoutParams.MATCH_PARENT
+                dimensionRatio = null
+            }
+            holder.view.background = null
+        }
+
+        holder.view.reader_index.text = (position+1).toString()
+
+        val image = cache!!.getImage(position)
+        val progress = activity.downloader?.progress?.get(galleryID)?.get(position)
+
+        if (progress?.isInfinite() == true && image != null) {
+            holder.view.progress_group.visibility = View.INVISIBLE
+            holder.view.image.showImage(image.uri)
+        } else {
+            holder.view.progress_group.visibility = View.VISIBLE
+            holder.view.reader_item_progressbar.progress =
+                if (progress?.isInfinite() == true)
+                    100
+                else
+                    progress?.roundToInt() ?: 0
+
+            holder.clear()
+
+            CoroutineScope(Dispatchers.Main).launch {
+                delay(1000)
+                notifyItemChanged(position)
+            }
+        }
    }

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

    override fun onViewRecycled(holder: ViewHolder) {
        holder.clear()
--- a/app/src/main/java/xyz/quaver/pupil/hitomi/common.kt
+++ b/app/src/main/java/xyz/quaver/pupil/hitomi/common.kt
@@ -1,273 +0,0 @@
-/*
- *    Copyright 2019 tom5079
- *
- *    Licensed under the Apache License, Version 2.0 (the "License");
- *    you may not use this file except in compliance with the License.
- *    You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- *    Unless required by applicable law or agreed to in writing, software
- *    distributed under the License is distributed on an "AS IS" BASIS,
- *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *    See the License for the specific language governing permissions and
- *    limitations under the License.
- */
-
-package xyz.quaver.pupil.hitomi
-
-import kotlinx.coroutines.*
-import kotlinx.coroutines.sync.Mutex
-import kotlinx.coroutines.sync.withLock
-import kotlinx.datetime.Clock.System.now
-import kotlinx.serialization.Serializable
-import kotlinx.serialization.decodeFromString
-import kotlinx.serialization.json.Json
-import okhttp3.Call
-import okhttp3.Callback
-import okhttp3.Request
-import okhttp3.Response
-import xyz.quaver.pupil.client
-import java.io.IOException
-import java.net.URL
-import java.util.concurrent.Executors
-import kotlin.coroutines.resumeWithException
-import kotlin.time.Duration.Companion.minutes
-import kotlin.time.ExperimentalTime
-
-const val protocol = "https:"
-
-@Serializable
-data class Artist(
-    val artist: String,
-    val url: String
-)
-
-@Serializable
-data class Group(
-    val group: String,
-    val url: String
-)
-
-@Serializable
-data class Parody(
-    val parody: String,
-    val url: String
-)
-
-@Serializable
-data class Character(
-    val character: String,
-    val url: String
-)
-
-@Serializable
-data class Tag(
-    val tag: String,
-    val url: String,
-    val female: String? = null,
-    val male: String? = null
-)
-
-@Serializable
-data class Language(
-    val galleryid: String,
-    val url: String,
-    val language_localname: String,
-    val name: String
-)
-
-@Serializable
-data class GalleryInfo(
-    val id: String,
-    val title: String,
-    val japanese_title: String? = null,
-    val language: String? = null,
-    val type: String,
-    val date: String,
-    val artists: List<Artist>? = null,
-    val groups: List<Group>? = null,
-    val parodys: List<Parody>? = null,
-    val tags: List<Tag>? = null,
-    val related: List<Int> = emptyList(),
-    val languages: List<Language> = emptyList(),
-    val characters: List<Character>? = null,
-    val scene_indexes: List<Int>? = emptyList(),
-    val files: List<GalleryFiles> = emptyList()
-)
-
-val json = Json {
-    isLenient = true
-    ignoreUnknownKeys = true
-    allowSpecialFloatingPointValues = true
-    useArrayPolymorphism = true
-}
-
-typealias HeaderSetter = (Request.Builder) -> Request.Builder
-fun URL.readText(settings: HeaderSetter? = null): String {
-    val request = Request.Builder()
-        .url(this).let {
-            settings?.invoke(it) ?: it
-        }.build()
-
-    return client.newCall(request).execute().also{ if (it.code() != 200) throw IOException("CODE ${it.code()}") }.body()?.use { it.string() } ?: throw IOException()
-}
-
-fun URL.readBytes(settings: HeaderSetter? = null): ByteArray {
-    val request = Request.Builder()
-        .url(this).let {
-            settings?.invoke(it) ?: it
-        }.build()
-
-    return client.newCall(request).execute().also { if (it.code() != 200) throw IOException("CODE ${it.code()}") }.body()?.use { it.bytes() } ?: throw IOException()
-}
-
-@Suppress("EXPERIMENTAL_API_USAGE")
-fun getGalleryInfo(galleryID: Int) =
-    json.decodeFromString<GalleryInfo>(
-        URL("$protocol//$domain/galleries/$galleryID.js").readText()
-            .replace("var galleryinfo = ", "")
-    )
-
-//common.js
-const val domain = "ltn.hitomi.la"
-const val galleryblockextension = ".html"
-const val galleryblockdir = "galleryblock"
-const val nozomiextension = ".nozomi"
-
-val evaluationContext = Dispatchers.Main + Job()
-
-object gg {
-    private var lastRetrieval: Long? = null
-
-    private val mutex = Mutex()
-
-    private var mDefault = 0
-    private val mMap = mutableMapOf<Int, Int>()
-
-    private var b = ""
-
-    @OptIn(ExperimentalTime::class, ExperimentalCoroutinesApi::class)
-    private suspend fun refresh() = withContext(Dispatchers.IO) {
-        mutex.withLock {
-            if (lastRetrieval == null || (lastRetrieval!! + 60000) < System.currentTimeMillis()) {
-                val ggjs: String = suspendCancellableCoroutine { continuation ->
-                    val call = client.newCall(Request.Builder().url("https://ltn.hitomi.la/gg.js").build())
-
-                    call.enqueue(object: Callback {
-                        override fun onFailure(call: Call, e: IOException) {
-                            if (continuation.isCancelled) return
-                            continuation.resumeWithException(e)
-                        }
-
-                        override fun onResponse(call: Call, response: Response) {
-                            if (!call.isCanceled) {
-                                response.body()?.use {
-                                    continuation.resume(it.string()) {
-                                        call.cancel()
-                                    }
-                                }
-                            }
-                        }
-                    })
-
-                    continuation.invokeOnCancellation {
-                        call.cancel()
-                    }
-                }
-
-                mDefault = Regex("var o = (\\d)").find(ggjs)!!.groupValues[1].toInt()
-                val o = Regex("o = (\\d); break;").find(ggjs)!!.groupValues[1].toInt()
-
-                mMap.clear()
-                Regex("case (\\d+):").findAll(ggjs).forEach {
-                    val case = it.groupValues[1].toInt()
-                    mMap[case] = o
-                }
-
-                b = Regex("b: '(.+)'").find(ggjs)!!.groupValues[1]
-
-                lastRetrieval = System.currentTimeMillis()
-            }
-        }
-    }
-
-    suspend fun m(g: Int): Int {
-        refresh()
-
-        return mMap[g] ?: mDefault
-    }
-
-    suspend fun b(): String {
-        refresh()
-        return b
-    }
-    fun s(h: String): String {
-        val m = Regex("(..)(.)$").find(h)
-        return m!!.groupValues.let { it[2]+it[1] }.toInt(16).toString(10)
-    }
-}
-
-suspend fun subdomainFromURL(url: String, base: String? = null) : String {
-    var retval = "b"
-
-    if (!base.isNullOrBlank())
-        retval = base
-
-    val b = 16
-
-    val r = Regex("""/[0-9a-f]{61}([0-9a-f]{2})([0-9a-f])""")
-    val m = r.find(url) ?: return "a"
-
-    val g = m.groupValues.let { it[2]+it[1] }.toIntOrNull(b)
-
-    if (g != null) {
-        retval = (97+ gg.m(g)).toChar().toString() + retval
-    }
-
-    return retval
-}
-
-suspend fun urlFromUrl(url: String, base: String? = null) : String {
-    return url.replace(Regex("""//..?\.hitomi\.la/"""), "//${subdomainFromURL(url, base)}.hitomi.la/")
-}
-
-suspend fun fullPathFromHash(hash: String) : String =
-    "${gg.b()}${gg.s(hash)}/$hash"
-
-fun realFullPathFromHash(hash: String): String =
-    hash.replace(Regex("""^.*(..)(.)$"""), "$2/$1/$hash")
-
-suspend fun urlFromHash(galleryID: Int, image: GalleryFiles, dir: String? = null, ext: String? = null) : String {
-    val ext = ext ?: dir ?: image.name.takeLastWhile { it != '.' }
-    val dir = dir ?: "images"
-    return "https://a.hitomi.la/$dir/${fullPathFromHash(image.hash)}.$ext"
-}
-
-suspend fun urlFromUrlFromHash(galleryID: Int, image: GalleryFiles, dir: String? = null, ext: String? = null, base: String? = null) =
-    if (base == "tn")
-        urlFromUrl("https://a.hitomi.la/$dir/${realFullPathFromHash(image.hash)}.$ext", base)
-    else
-        urlFromUrl(urlFromHash(galleryID, image, dir, ext), base)
-
-suspend fun rewriteTnPaths(html: String) {
-    html.replace(Regex("""//tn\.hitomi\.la/[^/]+/[0-9a-f]/[0-9a-f]{2}/[0-9a-f]{64}""")) { url ->
-        runBlocking {
-            urlFromUrl(url.value, "tn")
-        }
-    }
-}
-
-suspend fun imageUrlFromImage(galleryID: Int, image: GalleryFiles, noWebp: Boolean) : String {
-    return urlFromUrlFromHash(galleryID, image, "webp", null, "a")
-//    return when {
-//        noWebp ->
-//            urlFromUrlFromHash(galleryID, image)
-////        image.hasavif != 0 ->
-////            urlFromUrlFromHash(galleryID, image, "avif", null, "a")
-//        image.haswebp != 0 ->
-//            urlFromUrlFromHash(galleryID, image, "webp", null, "a")
-//        else ->
-//            urlFromUrlFromHash(galleryID, image)
-//    }
-}
--- a/app/src/main/java/xyz/quaver/pupil/hitomi/galleries.kt
+++ b/app/src/main/java/xyz/quaver/pupil/hitomi/galleries.kt
@@ -1,54 +0,0 @@
-/*
- *    Copyright 2019 tom5079
- *
- *    Licensed under the Apache License, Version 2.0 (the "License");
- *    you may not use this file except in compliance with the License.
- *    You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- *    Unless required by applicable law or agreed to in writing, software
- *    distributed under the License is distributed on an "AS IS" BASIS,
- *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *    See the License for the specific language governing permissions and
- *    limitations under the License.
- */
-
-package xyz.quaver.pupil.hitomi
-
-import kotlinx.serialization.Serializable
-
-@Serializable
-data class Gallery(
-    val related: List<Int>,
-    val langList: List<Pair<String, String>>,
-    val cover: String,
-    val title: String,
-    val artists: List<String>,
-    val groups: List<String>,
-    val type: String,
-    val language: String,
-    val series: List<String>,
-    val characters: List<String>,
-    val tags: List<String>,
-    val thumbnails: List<String>
-)
-
-suspend fun getGallery(galleryID: Int) : Gallery {
-    val info = getGalleryInfo(galleryID)
-
-    return Gallery(
-        info.related,
-        info.languages.map { it.name to it.galleryid },
-        urlFromUrlFromHash(galleryID, info.files.first(), "webpbigtn", "webp", "tn"),
-        info.title,
-        info.artists?.map { it.artist }.orEmpty(),
-        info.groups?.map { it.group }.orEmpty(),
-        info.type,
-        info.language.orEmpty(),
-        info.parodys?.map { it.parody }.orEmpty(),
-        info.characters?.map { it.character }.orEmpty(),
-        info.tags?.map { "${if (it.female.isNullOrEmpty()) "" else "female:"}${if (it.male.isNullOrEmpty()) "" else "male:"}${it.tag}" }.orEmpty(),
-        info.files.map { urlFromUrlFromHash(galleryID, it, "webpsmalltn", "webp", "tn") }
-    )
-}
--- a/app/src/main/java/xyz/quaver/pupil/hitomi/galleryblock.kt
+++ b/app/src/main/java/xyz/quaver/pupil/hitomi/galleryblock.kt
@@ -1,92 +0,0 @@
-/*
- *    Copyright 2019 tom5079
- *
- *    Licensed under the Apache License, Version 2.0 (the "License");
- *    you may not use this file except in compliance with the License.
- *    You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- *    Unless required by applicable law or agreed to in writing, software
- *    distributed under the License is distributed on an "AS IS" BASIS,
- *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *    See the License for the specific language governing permissions and
- *    limitations under the License.
- */
-
-package xyz.quaver.pupil.hitomi
-
-import kotlinx.serialization.Serializable
-import org.jsoup.Jsoup
-import java.net.URL
-import java.net.URLDecoder
-import java.nio.ByteBuffer
-import java.nio.ByteOrder
-import javax.net.ssl.HttpsURLConnection
-import kotlin.io.readText
-
-//galleryblock.js
-fun fetchNozomi(area: String? = null, tag: String = "index", language: String = "all", start: Int = -1, count: Int = -1) : Pair<List<Int>, Int> {
-    val url = when(area) {
-        null -> "$protocol//$domain/$tag-$language$nozomiextension"
-        else -> "$protocol//$domain/$area/$tag-$language$nozomiextension"
-    }
-
-    with(URL(url).openConnection() as HttpsURLConnection) {
-        requestMethod = "GET"
-
-        if (start != -1 && count != -1) {
-            val startByte = start*4
-            val endByte = (start+count)*4-1
-
-            setRequestProperty("Range", "bytes=$startByte-$endByte")
-        }
-
-        connect()
-
-        val totalItems = getHeaderField("Content-Range")
-            .replace(Regex("^[Bb]ytes \\d+-\\d+/"), "").toInt() / 4
-
-        val nozomi = ArrayList<Int>()
-
-        val arrayBuffer = ByteBuffer
-            .wrap(inputStream.readBytes())
-            .order(ByteOrder.BIG_ENDIAN)
-
-        while (arrayBuffer.hasRemaining())
-            nozomi.add(arrayBuffer.int)
-
-        return Pair(nozomi, totalItems)
-    }
-}
-
-@Serializable
-data class GalleryBlock(
-    val id: Int,
-    val galleryUrl: String,
-    val thumbnails: List<String>,
-    val title: String,
-    val artists: List<String>,
-    val series: List<String>,
-    val type: String,
-    val language: String,
-    val relatedTags: List<String>,
-    val groups: List<String> = emptyList()
-)
-
-suspend fun getGalleryBlock(galleryID: Int) : GalleryBlock {
-    val info = getGalleryInfo(galleryID)
-
-    return GalleryBlock(
-        galleryID,
-        "",
-        listOf(urlFromUrlFromHash(galleryID, info.files.first(), "webpbigtn", "webp", "tn")),
-        info.title,
-        info.artists?.map { it.artist }.orEmpty(),
-        info.parodys?.map { it.parody }.orEmpty(),
-        info.type,
-        info.language.orEmpty(),
-        info.tags?.map { "${if (it.female.isNullOrEmpty()) "" else "female:"}${if (it.male.isNullOrEmpty()) "" else "male:"}${it.tag}" }.orEmpty(),
-        info.groups?.map { it.group }.orEmpty()
-    )
-}
--- a/app/src/main/java/xyz/quaver/pupil/hitomi/reader.kt
+++ b/app/src/main/java/xyz/quaver/pupil/hitomi/reader.kt
@@ -1,38 +0,0 @@
-/*
- *    Copyright 2019 tom5079
- *
- *    Licensed under the Apache License, Version 2.0 (the "License");
- *    you may not use this file except in compliance with the License.
- *    You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- *    Unless required by applicable law or agreed to in writing, software
- *    distributed under the License is distributed on an "AS IS" BASIS,
- *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *    See the License for the specific language governing permissions and
- *    limitations under the License.
- */
-
-package xyz.quaver.pupil.hitomi
-
-import kotlinx.serialization.Serializable
-import xyz.quaver.pupil.hitomi.GalleryInfo
-import xyz.quaver.pupil.hitomi.getGalleryInfo
-
-@Serializable
-data class GalleryFiles(
-    val width: Int,
-    val hash: String,
-    val haswebp: Int = 0,
-    val name: String,
-    val height: Int,
-    val hasavif: Int = 0,
-    val hasavifsmalltn: Int? = 0
-)
-
-//Set header `Referer` to reader url to avoid 403 error
-@Deprecated("", replaceWith = ReplaceWith("getGalleryInfo"))
-fun getReader(galleryID: Int) : GalleryInfo {
-   return getGalleryInfo(galleryID)
-}
--- a/app/src/main/java/xyz/quaver/pupil/hitomi/results.kt
+++ b/app/src/main/java/xyz/quaver/pupil/hitomi/results.kt
@@ -1,87 +0,0 @@
-/*
- *    Copyright 2019 tom5079
- *
- *    Licensed under the Apache License, Version 2.0 (the "License");
- *    you may not use this file except in compliance with the License.
- *    You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- *    Unless required by applicable law or agreed to in writing, software
- *    distributed under the License is distributed on an "AS IS" BASIS,
- *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *    See the License for the specific language governing permissions and
- *    limitations under the License.
- */
-
-package xyz.quaver.pupil.hitomi
-
-import kotlinx.coroutines.async
-import kotlinx.coroutines.coroutineScope
-import java.util.*
-
-suspend fun doSearch(query: String, sortByPopularity: Boolean = false) : Set<Int> = coroutineScope {
-    val terms = query
-        .trim()
-        .replace(Regex("""^\?"""), "")
-        .lowercase()
-        .split(Regex("\\s+"))
-        .map {
-            it.replace('_', ' ')
-        }
-
-    val positiveTerms = LinkedList<String>()
-    val negativeTerms = LinkedList<String>()
-
-    for (term in terms) {
-        if (term.matches(Regex("^-.+")))
-            negativeTerms.push(term.replace(Regex("^-"), ""))
-        else if (term.isNotBlank())
-            positiveTerms.push(term)
-    }
-
-    val positiveResults = positiveTerms.map {
-        async {
-            runCatching {
-                getGalleryIDsForQuery(it)
-            }.getOrElse { emptySet() }
-        }
-    }
-
-    val negativeResults = negativeTerms.mapIndexed { index, it ->
-        async {
-            runCatching {
-                getGalleryIDsForQuery(it)
-            }.getOrElse { emptySet() }
-        }
-    }
-
-    val results = when {
-        sortByPopularity -> getGalleryIDsFromNozomi(null, "popular", "all")
-        positiveTerms.isEmpty() -> getGalleryIDsFromNozomi(null, "index", "all")
-        else -> emptySet()
-    }.toMutableSet()
-
-    fun filterPositive(newResults: Set<Int>) {
-        when {
-            results.isEmpty() -> results.addAll(newResults)
-            else -> results.retainAll(newResults)
-        }
-    }
-
-    fun filterNegative(newResults: Set<Int>) {
-        results.removeAll(newResults)
-    }
-
-    //positive results
-    positiveResults.forEach {
-        filterPositive(it.await())
-    }
-
-    //negative results
-    negativeResults.forEachIndexed { index, it ->
-        filterNegative(it.await())
-    }
-
-    results
-}
--- a/app/src/main/java/xyz/quaver/pupil/hitomi/search.kt
+++ b/app/src/main/java/xyz/quaver/pupil/hitomi/search.kt
@@ -1,328 +0,0 @@
-/*
- *    Copyright 2019 tom5079
- *
- *    Licensed under the Apache License, Version 2.0 (the "License");
- *    you may not use this file except in compliance with the License.
- *    You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- *    Unless required by applicable law or agreed to in writing, software
- *    distributed under the License is distributed on an "AS IS" BASIS,
- *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *    See the License for the specific language governing permissions and
- *    limitations under the License.
- */
-
-package xyz.quaver.pupil.hitomi
-
-import okhttp3.Request
-import xyz.quaver.pupil.client
-import java.net.URL
-import java.nio.ByteBuffer
-import java.nio.ByteOrder
-import java.security.MessageDigest
-import kotlin.math.min
-
-//searchlib.js
-const val separator = "-"
-const val extension = ".html"
-const val index_dir = "tagindex"
-const val galleries_index_dir = "galleriesindex"
-const val max_node_size = 464
-const val B = 16
-const val compressed_nozomi_prefix = "n"
-
-val tag_index_version: String by lazy { getIndexVersion("tagindex") }
-val galleries_index_version: String by lazy { getIndexVersion("galleriesindex") }
-
-fun sha256(data: ByteArray) : ByteArray {
-    return MessageDigest.getInstance("SHA-256").digest(data)
-}
-
-@OptIn(ExperimentalUnsignedTypes::class)
-fun hashTerm(term: String) : UByteArray {
-    return sha256(term.toByteArray()).toUByteArray().sliceArray(0 until 4)
-}
-
-fun sanitize(input: String) : String {
-    return input.replace(Regex("[/#]"), "")
-}
-
-fun getIndexVersion(name: String) =
-        URL("$protocol//$domain/$name/version?_=${System.currentTimeMillis()}").readText()
-
-//search.js
-fun getGalleryIDsForQuery(query: String) : Set<Int> {
-    query.replace("_", " ").let {
-        if (it.indexOf(':') > -1) {
-            val sides = it.split(":")
-            val ns = sides[0]
-            var tag = sides[1]
-
-            var area : String? = ns
-            var language = "all"
-            when (ns) {
-                "female", "male" -> {
-                    area = "tag"
-                    tag = it
-                }
-                "language" -> {
-                    area = null
-                    language = tag
-                    tag = "index"
-                }
-            }
-
-            return getGalleryIDsFromNozomi(area, tag, language)
-        }
-
-        val key = hashTerm(it)
-        val field = "galleries"
-
-        val node = getNodeAtAddress(field, 0) ?: return emptySet()
-
-        val data = bSearch(field, key, node)
-
-        if (data != null)
-            return getGalleryIDsFromData(data)
-
-        return emptySet()
-    }
-}
-
-fun getSuggestionsForQuery(query: String) : List<Suggestion> {
-    query.replace('_', ' ').let {
-        var field = "global"
-        var term = it
-
-        if (term.indexOf(':') > -1) {
-            val sides = it.split(':')
-            field = sides[0]
-            term = sides[1]
-        }
-
-        val key = hashTerm(term)
-        val node = getNodeAtAddress(field, 0) ?: return emptyList()
-        val data = bSearch(field, key, node)
-
-        if (data != null)
-            return getSuggestionsFromData(field, data)
-
-        return emptyList()
-    }
-}
-
-data class Suggestion(val s: String, val t: Int, val u: String, val n: String)
-fun getSuggestionsFromData(field: String, data: Pair<Long, Int>) : List<Suggestion> {
-    val url = "$protocol//$domain/$index_dir/$field.$tag_index_version.data"
-    val (offset, length) = data
-    if (length > 10000 || length <= 0)
-        throw Exception("length $length is too long")
-
-    val inbuf = getURLAtRange(url, offset.until(offset+length))
-
-    val suggestions = ArrayList<Suggestion>()
-
-    val buffer = ByteBuffer
-        .wrap(inbuf)
-        .order(ByteOrder.BIG_ENDIAN)
-    val numberOfSuggestions = buffer.int
-
-    if (numberOfSuggestions > 100 || numberOfSuggestions <= 0)
-        throw Exception("number of suggestions $numberOfSuggestions is too long")
-
-    for (i in 0.until(numberOfSuggestions)) {
-        var top = buffer.int
-
-        val ns = inbuf.sliceArray(buffer.position().until(buffer.position()+top)).toString(charset("UTF-8"))
-        buffer.position(buffer.position()+top)
-
-        top = buffer.int
-
-        val tag = inbuf.sliceArray(buffer.position().until(buffer.position()+top)).toString(charset("UTF-8"))
-        buffer.position(buffer.position()+top)
-
-        val count = buffer.int
-
-        val tagname = sanitize(tag)
-        val u =
-                when(ns) {
-                    "female", "male" -> "/tag/$ns:$tagname${separator}1$extension"
-                    "language" -> "/index-$tagname${separator}1$extension"
-                    else -> "/$ns/$tagname${separator}all${separator}1$extension"
-                }
-
-        suggestions.add(Suggestion(tag, count, u, ns))
-    }
-
-    return suggestions
-}
-
-fun getGalleryIDsFromNozomi(area: String?, tag: String, language: String) : Set<Int> {
-    val nozomiAddress =
-            when(area) {
-                null -> "$protocol//$domain/$compressed_nozomi_prefix/$tag-$language$nozomiextension"
-                else -> "$protocol//$domain/$compressed_nozomi_prefix/$area/$tag-$language$nozomiextension"
-            }
-
-    val bytes = try {
-        URL(nozomiAddress).readBytes()
-    } catch (e: Exception) {
-        return emptySet()
-    }
-
-    val nozomi = mutableSetOf<Int>()
-
-    val arrayBuffer = ByteBuffer
-        .wrap(bytes)
-        .order(ByteOrder.BIG_ENDIAN)
-
-    while (arrayBuffer.hasRemaining())
-        nozomi.add(arrayBuffer.int)
-
-    return nozomi
-}
-
-fun getGalleryIDsFromData(data: Pair<Long, Int>) : Set<Int> {
-    val url = "$protocol//$domain/$galleries_index_dir/galleries.$galleries_index_version.data"
-    val (offset, length) = data
-    if (length > 100000000 || length <= 0)
-        throw Exception("length $length is too long")
-
-    val inbuf = getURLAtRange(url, offset.until(offset+length))
-
-    val galleryIDs = mutableSetOf<Int>()
-
-    val buffer = ByteBuffer
-        .wrap(inbuf)
-        .order(ByteOrder.BIG_ENDIAN)
-
-    val numberOfGalleryIDs = buffer.int
-
-    val expectedLength = numberOfGalleryIDs*4+4
-
-    if (numberOfGalleryIDs > 10000000 || numberOfGalleryIDs <= 0)
-        throw Exception("number_of_galleryids $numberOfGalleryIDs is too long")
-    else if (inbuf.size != expectedLength)
-        throw Exception("inbuf.byteLength ${inbuf.size} != expected_length $expectedLength")
-
-    for (i in 0.until(numberOfGalleryIDs))
-        galleryIDs.add(buffer.int)
-
-    return galleryIDs
-}
-
-fun getNodeAtAddress(field: String, address: Long) : Node? {
-    val url =
-            when(field) {
-                "galleries" -> "$protocol//$domain/$galleries_index_dir/galleries.$galleries_index_version.index"
-                "languages" -> "$protocol//$domain/$galleries_index_dir/languages.$galleries_index_version.index"
-                "nozomiurl" -> "$protocol//$domain/$galleries_index_dir/nozomiurl.$galleries_index_version.index"
-                else -> "$protocol//$domain/$index_dir/$field.$tag_index_version.index"
-            }
-
-    val nodedata = getURLAtRange(url, address.until(address+ max_node_size))
-
-    return decodeNode(nodedata)
-}
-
-fun getURLAtRange(url: String, range: LongRange) : ByteArray {
-    val request = Request.Builder()
-        .url(url)
-        .header("Range", "bytes=${range.first}-${range.last}")
-        .build()
-    
-    return client.newCall(request).execute().body()?.use { it.bytes() } ?: byteArrayOf()
-}
-
-@OptIn(ExperimentalUnsignedTypes::class)
-data class Node(val keys: List<UByteArray>, val datas: List<Pair<Long, Int>>, val subNodeAddresses: List<Long>)
-@OptIn(ExperimentalUnsignedTypes::class)
-fun decodeNode(data: ByteArray) : Node {
-    val buffer = ByteBuffer
-        .wrap(data)
-        .order(ByteOrder.BIG_ENDIAN)
-
-    val uData = data.toUByteArray()
-
-    val numberOfKeys = buffer.int
-    val keys = ArrayList<UByteArray>()
-
-    for (i in 0.until(numberOfKeys)) {
-        val keySize = buffer.int
-
-        if (keySize == 0 || keySize > 32)
-            throw Exception("fatal: !keySize || keySize > 32")
-
-        keys.add(uData.sliceArray(buffer.position().until(buffer.position()+keySize)))
-        buffer.position(buffer.position()+keySize)
-    }
-
-    val numberOfDatas = buffer.int
-    val datas = ArrayList<Pair<Long, Int>>()
-
-    for (i in 0.until(numberOfDatas)) {
-        val offset = buffer.long
-        val length = buffer.int
-
-        datas.add(Pair(offset, length))
-    }
-
-    val numberOfSubNodeAddresses = B +1
-    val subNodeAddresses = ArrayList<Long>()
-
-    for (i in 0.until(numberOfSubNodeAddresses)) {
-        val subNodeAddress = buffer.long
-        subNodeAddresses.add(subNodeAddress)
-    }
-
-    return Node(keys, datas, subNodeAddresses)
-}
-
-@OptIn(ExperimentalUnsignedTypes::class)
-fun bSearch(field: String, key: UByteArray, node: Node) : Pair<Long, Int>? {
-    fun compareArrayBuffers(dv1: UByteArray, dv2: UByteArray) : Int {
-        val top = min(dv1.size, dv2.size)
-
-        for (i in 0.until(top)) {
-            if (dv1[i] < dv2[i])
-                return -1
-            else if (dv1[i] > dv2[i])
-                return 1
-        }
-
-        return 0
-    }
-
-    fun locateKey(key: UByteArray, node: Node) : Pair<Boolean, Int> {
-        for (i in node.keys.indices) {
-            val cmpResult = compareArrayBuffers(key, node.keys[i])
-
-            if (cmpResult <= 0)
-                return Pair(cmpResult==0, i)
-        }
-
-        return Pair(false, node.keys.size)
-    }
-
-    fun isLeaf(node: Node) : Boolean {
-        for (subnode in node.subNodeAddresses)
-            if (subnode != 0L)
-                return false
-
-        return true
-    }
-
-    if (node.keys.isEmpty())
-        return null
-
-    val (there, where) = locateKey(key, node)
-    if (there)
-        return node.datas[where]
-    else if (isLeaf(node))
-        return null
-
-    val nextNode = getNodeAtAddress(field, node.subNodeAddresses[where]) ?: return null
-    return bSearch(field, key, nextNode)
-}
--- a/app/src/main/java/xyz/quaver/pupil/receiver/UpdateBroadcastReceiver.kt
+++ b/app/src/main/java/xyz/quaver/pupil/receiver/UpdateBroadcastReceiver.kt
@@ -24,7 +24,6 @@ import android.content.BroadcastReceiver
 import android.content.Context
 import android.content.Intent
 import android.net.Uri
-import android.os.Build
 import android.webkit.MimeTypeMap
 import androidx.core.app.NotificationCompat
 import androidx.core.app.NotificationManagerCompat
@@ -55,15 +54,13 @@ class UpdateBroadcastReceiver : BroadcastReceiver() {

                val uri = downloadManager.query(query).use { cursor ->
                    if (cursor.moveToFirst()) {
-                        cursor.getString(cursor.getColumnIndex(DownloadManager.COLUMN_LOCAL_URI))?.let {
+                        cursor.getString(cursor.getColumnIndex(DownloadManager.COLUMN_LOCAL_URI)).let {
                            val uri = Uri.parse(it)

                            when (uri.scheme) {
                                "file" ->
-                                    if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N)
-                                        FileProvider.getUriForFile(context, context.applicationContext.packageName + ".provider", File(uri.path!!))
-                                    else
-                                        uri
+                                    FileProvider.getUriForFile(context, context.applicationContext.packageName + ".provider", File(uri.path!!)
+                                    )
                                "content" -> uri
                                else -> null
                            }
@@ -76,10 +73,10 @@ class UpdateBroadcastReceiver : BroadcastReceiver() {

                val notificationManager = NotificationManagerCompat.from(context)

-                val pendingIntent = PendingIntent.getActivity(context, System.currentTimeMillis().toInt(), Intent(Intent.ACTION_VIEW).apply {
+                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"))
-                }, if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.S) PendingIntent.FLAG_IMMUTABLE else 0)
+                }, 0)

                val notification = NotificationCompat.Builder(context, "update")
                    .setSmallIcon(android.R.drawable.stat_sys_download_done)
--- a/app/src/main/java/xyz/quaver/pupil/services/DownloadService.kt
+++ b/app/src/main/java/xyz/quaver/pupil/services/DownloadService.kt
@@ -23,14 +23,10 @@ import android.app.PendingIntent
 import android.app.Service
 import android.content.Context
 import android.content.Intent
-import android.content.pm.ServiceInfo
-import android.os.Build
-import android.util.Log
 import androidx.core.app.NotificationCompat
 import androidx.core.app.NotificationManagerCompat
 import androidx.core.app.TaskStackBuilder
 import androidx.core.content.ContextCompat
-import com.google.firebase.crashlytics.FirebaseCrashlytics
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.Job
@@ -42,9 +38,12 @@ import okhttp3.ResponseBody
 import okio.*
 import xyz.quaver.pupil.*
 import xyz.quaver.pupil.ui.ReaderActivity
-import xyz.quaver.pupil.util.*
+import xyz.quaver.pupil.util.cleanCache
 import xyz.quaver.pupil.util.downloader.Cache
 import xyz.quaver.pupil.util.downloader.DownloadManager
+import xyz.quaver.pupil.util.ellipsize
+import xyz.quaver.pupil.util.normalizeID
+import xyz.quaver.pupil.util.requestBuilders
 import java.io.IOException
 import java.util.concurrent.ConcurrentHashMap
 import kotlin.math.ceil
@@ -75,7 +74,7 @@ class DownloadService : Service() {

        val pendingIntent = TaskStackBuilder.create(this).run {
            addNextIntentWithParentStack(intent)
-            getPendingIntent(galleryID, PendingIntent.FLAG_UPDATE_CURRENT or if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.S) PendingIntent.FLAG_MUTABLE else 0)
+            getPendingIntent(galleryID, PendingIntent.FLAG_UPDATE_CURRENT)
        }
        val action =
            NotificationCompat.Action.Builder(0, getText(android.R.string.cancel),
@@ -85,7 +84,7 @@ class DownloadService : Service() {
                    Intent(this, DownloadService::class.java)
                        .putExtra(KEY_COMMAND, COMMAND_CANCEL)
                        .putExtra(KEY_ID, galleryID),
-                    PendingIntent.FLAG_UPDATE_CURRENT or if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.S) PendingIntent.FLAG_MUTABLE else 0),
+                    PendingIntent.FLAG_UPDATE_CURRENT),
            ).build()

        notification[galleryID] = NotificationCompat.Builder(this, "download").apply {
@@ -101,15 +100,13 @@ class DownloadService : Service() {
        notify(galleryID)
    }

-    @SuppressLint("RestrictedApi", "MissingPermission")
+    @SuppressLint("RestrictedApi")
    private fun notify(galleryID: Int) {
        val max = progress[galleryID]?.size ?: 0
        val progress = progress[galleryID]?.count { it == Float.POSITIVE_INFINITY } ?: 0

        val notification = notification[galleryID] ?: return

-        if (!checkNotificationEnabled(this)) return
-
        if (isCompleted(galleryID)) {
            notification
                .setContentText(getString(R.string.reader_notification_complete))
@@ -170,27 +167,15 @@ class DownloadService : Service() {

    private val interceptor: PupilInterceptor = { chain ->
        val request = chain.request()
+        var response = chain.proceed(request)

-        var response = kotlin.runCatching {
-            chain.proceed(request)
-        }.getOrNull()
-        var limit = 10
-
-        while (response?.isSuccessful != true) {
-            if (response?.code() == 503) {
-                Thread.sleep(200)
-            } else if (--limit < 0)
-                break
-
-            response = kotlin.runCatching {
-                chain.proceed(request)
-            }.getOrNull()
+        var retry = 5
+        while (!response.isSuccessful && retry > 0) {
+            response = chain.proceed(request)
+            retry--
        }

-        if (response == null)
-            response = chain.proceed(request)
-
-        response!!.newBuilder()
+        response.newBuilder()
            .body(response.body()?.let {
                ProgressResponseBody(request.tag(), it, progressListener)
            }).build()
@@ -217,40 +202,44 @@ class DownloadService : Service() {
    private val callback = object: Callback {

        override fun onFailure(call: Call, e: IOException) {
-            Log.d("PUPILD", "ONFAILURE ${call.request().tag()}, ${e}")
-            FirebaseCrashlytics.getInstance().recordException(e)
+            e.printStackTrace()

            if (e.message?.contains("cancel", true) == false) {
                val galleryID = (call.request().tag() as Tag).galleryID
+
+                // Retry
+                cancel(galleryID)
+                download(galleryID)
            }
        }

        override fun onResponse(call: Call, response: Response) {
-            Log.d("PUPILD", "ONRESPONSE ${call.request().tag()}")
            val (galleryID, index, startId) = call.request().tag() as Tag
            val ext = call.request().url().encodedPath().split('.').last()

-            CoroutineScope(Dispatchers.IO).launch {
-                runCatching {
-                    val image = response.also { if (it.code() != 200) throw IOException( "$galleryID $index ${response.request().url()} CODE ${it.code()}" ) }.body()?.use { it.bytes() } ?: throw Exception("Response null")
-                    val padding = ceil(progress[galleryID]?.size?.let { log10(it.toFloat()) } ?: 0F).toInt()
+            kotlin.runCatching {
+                val image = response.also { if (it.code() != 200) throw IOException() }.body()?.use { it.bytes() } ?: throw Exception()
+                val padding = ceil(progress[galleryID]?.size?.let { log10(it.toFloat()) } ?: 0F).toInt()

-                    Cache.getInstance(this@DownloadService, galleryID)
-                        .putImage(index, "${index.toString().padStart(padding, '0')}.$ext", image)
+                CoroutineScope(Dispatchers.IO).launch {
+                    kotlin.runCatching {
+                        Cache.getInstance(this@DownloadService, galleryID).putImage(index, "${index.toString().padStart(padding, '0')}.$ext", image)
+                    }.onSuccess {
+                        progress[galleryID]?.set(index, Float.POSITIVE_INFINITY)
+                        notify(galleryID)

-                    progress[galleryID]?.set(index, Float.POSITIVE_INFINITY)
-                    notify(galleryID)
+                        if (isCompleted(galleryID)) {
+                            if (DownloadManager.getInstance(this@DownloadService)
+                                    .getDownloadFolder(galleryID) != null)
+                                Cache.getInstance(this@DownloadService, galleryID).moveToDownload()

-                    if (isCompleted(galleryID)) {
-                        if (DownloadManager.getInstance(this@DownloadService)
-                                .getDownloadFolder(galleryID) != null
-                        )
-                            Cache.getInstance(this@DownloadService, galleryID).moveToDownload()
-
-                        startId?.let { stopSelf(it) }
+                            startId?.let { stopSelf(it) }
+                        }
+                    }.onFailure {
+                        it.printStackTrace()
+                        cancel(galleryID)
+                        download(galleryID)
                    }
-                }.onFailure {
-                    FirebaseCrashlytics.getInstance().recordException(it)
                }
            }
        }
@@ -316,10 +305,10 @@ class DownloadService : Service() {

        initNotification(galleryID)

-        val galleryInfo = cache.getGalleryInfo()
+        val reader = cache.getReader()

        // Gallery doesn't exist
-        if (galleryInfo == null) {
+        if (reader == null) {
            delete(galleryID)
            progress[galleryID] = mutableListOf()
            return@launch
@@ -327,7 +316,7 @@ class DownloadService : Service() {

        histories.add(galleryID)

-        progress[galleryID] = MutableList(galleryInfo.files.size) { 0F }
+        progress[galleryID] = MutableList(reader.galleryInfo.files.size) { 0F }

        cache.metadata.imageList?.let {
            it.forEachIndexed { index, image ->
@@ -336,7 +325,8 @@ class DownloadService : Service() {
        }

        if (isCompleted(galleryID)) {
-            if (DownloadManager.getInstance(this@DownloadService).getDownloadFolder(galleryID) != null)
+            if (DownloadManager.getInstance(this@DownloadService)
+                    .getDownloadFolder(galleryID) != null )
                Cache.getInstance(this@DownloadService, galleryID).moveToDownload()

            notificationManager.cancel(galleryID)
@@ -344,7 +334,7 @@ class DownloadService : Service() {
            return@launch
        }

-        notification[galleryID]?.setContentTitle(galleryInfo.title?.ellipsize(30))
+        notification[galleryID]?.setContentTitle(reader.galleryInfo.title?.ellipsize(30))
        notify(galleryID)

        val queued = mutableSetOf<Int>()
@@ -358,7 +348,7 @@ class DownloadService : Service() {
            }
        }

-        galleryInfo.getRequestBuilders().forEachIndexed { index, it ->
+        reader.requestBuilders.forEachIndexed { index, it ->
            if (progress[galleryID]?.get(index)?.isInfinite() == false) {
                val request = it.tag(Tag(galleryID, index, startId)).build()
                client.newCall(request).enqueue(callback)
@@ -406,11 +396,7 @@ class DownloadService : Service() {
    }

    override fun onStartCommand(intent: Intent?, flags: Int, startId: Int): Int {
-        if (Build.VERSION.SDK_INT <= Build.VERSION_CODES.TIRAMISU) {
-            startForeground(R.id.downloader_notification_id, serviceNotification.build())
-        } else {
-            startForeground(R.id.downloader_notification_id, serviceNotification.build(), ServiceInfo.FOREGROUND_SERVICE_TYPE_SPECIAL_USE)
-        }
+        startForeground(R.id.downloader_notification_id, serviceNotification.build())

        when (intent?.getStringExtra(KEY_COMMAND)) {
            COMMAND_DOWNLOAD -> intent.getIntExtra(KEY_ID, -1).let { if (it > 0)
@@ -431,11 +417,7 @@ class DownloadService : Service() {
    override fun onBind(p0: Intent?) = binder

    override fun onCreate() {
-        if (Build.VERSION.SDK_INT <= Build.VERSION_CODES.TIRAMISU) {
-            startForeground(R.id.downloader_notification_id, serviceNotification.build())
-        } else {
-            startForeground(R.id.downloader_notification_id, serviceNotification.build(), ServiceInfo.FOREGROUND_SERVICE_TYPE_SPECIAL_USE)
-        }
+        startForeground(R.id.downloader_notification_id, serviceNotification.build())
        interceptors[Tag::class] = interceptor
    }

--- a/app/src/main/java/xyz/quaver/pupil/types/SendLogException.kt
+++ b/app/src/main/java/xyz/quaver/pupil/types/SendLogException.kt
@@ -1,22 +0,0 @@
-/*
- *     Pupil, Hitomi.la viewer for Android
- *     Copyright (C) 2022  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.types
-
-class SendLogException : Exception()
-class JavascriptException(message: String?) : Exception(message)
--- a/app/src/main/java/xyz/quaver/pupil/types/Suggestions.kt
+++ b/app/src/main/java/xyz/quaver/pupil/types/Suggestions.kt
@@ -18,10 +18,10 @@

 package xyz.quaver.pupil.types

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

@Parcelize
--- a/app/src/main/java/xyz/quaver/pupil/ui/LockActivity.kt
+++ b/app/src/main/java/xyz/quaver/pupil/ui/LockActivity.kt
@@ -29,8 +29,10 @@ import androidx.biometric.BiometricPrompt
 import androidx.core.content.ContextCompat
 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.databinding.LockActivityBinding
 import xyz.quaver.pupil.ui.fragment.PINLockFragment
 import xyz.quaver.pupil.ui.fragment.PatternLockFragment
 import xyz.quaver.pupil.util.Lock
@@ -43,8 +45,6 @@ class LockActivity : AppCompatActivity() {
    private lateinit var lockManager: LockManager
    private var mode: String? = null

-    private lateinit var binding: LockActivityBinding
-
    private val patternLockFragment = PatternLockFragment().apply {
        var lastPass = ""
        onPatternDrawn = {
@@ -57,7 +57,7 @@ class LockActivity : AppCompatActivity() {
                        setResult(Activity.RESULT_OK)
                        finish()
                    } else
-                        binding.patternLockView.setViewMode(PatternLockView.PatternViewMode.WRONG)
+                        lock_pattern_view.setViewMode(PatternLockView.PatternViewMode.WRONG)
                }
                "add_lock" -> {
                    if (lastPass.isEmpty()) {
@@ -69,7 +69,7 @@ class LockActivity : AppCompatActivity() {
                            LockManager(context!!).add(Lock.generate(Lock.Type.PATTERN, it))
                            finish()
                        } else {
-                            binding.patternLockView.setViewMode(PatternLockView.PatternViewMode.WRONG)
+                            lock_pattern_view.setViewMode(PatternLockView.PatternViewMode.WRONG)
                            lastPass = ""

                            Snackbar.make(view!!, R.string.settings_lock_wrong_confirm, Snackbar.LENGTH_LONG).show()
@@ -92,15 +92,15 @@ class LockActivity : AppCompatActivity() {
                        setResult(Activity.RESULT_OK)
                        finish()
                    } else {
-                        binding.indicatorDots.startAnimation(AnimationUtils.loadAnimation(context, R.anim.shake).apply {
+                        indicator_dots.startAnimation(AnimationUtils.loadAnimation(context, R.anim.shake).apply {
                            setAnimationListener(object: Animation.AnimationListener {
                                override fun onAnimationEnd(animation: Animation?) {
-                                    binding.pinLockView.resetPinLockView()
-                                    binding.pinLockView.isEnabled = true
+                                    pin_lock_view.resetPinLockView()
+                                    pin_lock_view.isEnabled = true
                                }

                                override fun onAnimationStart(animation: Animation?) {
-                                    binding.pinLockView.isEnabled = false
+                                    pin_lock_view.isEnabled = false
                                }

                                override fun onAnimationRepeat(animation: Animation?) {
@@ -114,22 +114,22 @@ class LockActivity : AppCompatActivity() {
                    if (lastPass.isEmpty()) {
                        lastPass = it

-                        binding.pinLockView.resetPinLockView()
+                        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 {
-                            binding.indicatorDots.startAnimation(AnimationUtils.loadAnimation(context, R.anim.shake).apply {
+                            indicator_dots.startAnimation(AnimationUtils.loadAnimation(context, R.anim.shake).apply {
                                setAnimationListener(object: Animation.AnimationListener {
                                    override fun onAnimationEnd(animation: Animation?) {
-                                        binding.pinLockView.resetPinLockView()
-                                        binding.pinLockView.isEnabled = true
+                                        pin_lock_view.resetPinLockView()
+                                        pin_lock_view.isEnabled = true
                                    }

                                    override fun onAnimationStart(animation: Animation?) {
-                                        binding.pinLockView.isEnabled = false
+                                        pin_lock_view.isEnabled = false
                                    }

                                    override fun onAnimationRepeat(animation: Animation?) {
@@ -173,8 +173,7 @@ class LockActivity : AppCompatActivity() {

    override fun onCreate(savedInstanceState: Bundle?) {
        super.onCreate(savedInstanceState)
-        binding = LockActivityBinding.inflate(layoutInflater)
-        setContentView(binding.root)
+        setContentView(R.layout.activity_lock)

        lockManager = try {
            LockManager(this)
@@ -211,7 +210,7 @@ class LockActivity : AppCompatActivity() {
                    Preferences["lock_fingerprint"]
                    && BiometricManager.from(this).canAuthenticate() == BiometricManager.BIOMETRIC_SUCCESS
                ) {
-                    binding.fingerprintBtn.apply {
+                    lock_fingerprint.apply {
                        isEnabled = true
                        setOnClickListener {
                            showBiometricPrompt()
@@ -220,7 +219,7 @@ class LockActivity : AppCompatActivity() {
                    showBiometricPrompt()
                }

-                binding.patternBtn.apply {
+                lock_pattern.apply {
                    isEnabled = lockManager.contains(Lock.Type.PATTERN)
                    setOnClickListener {
                        supportFragmentManager.beginTransaction().replace(
@@ -228,7 +227,7 @@ class LockActivity : AppCompatActivity() {
                        ).commit()
                    }
                }
-                binding.pinBtn.apply {
+                lock_pin.apply {
                    isEnabled = lockManager.contains(Lock.Type.PIN)
                    setOnClickListener {
                        supportFragmentManager.beginTransaction().replace(
@@ -236,7 +235,7 @@ class LockActivity : AppCompatActivity() {
                        ).commit()
                    }
                }
-                binding.passwordBtn.isEnabled = false
+                lock_password.isEnabled = false

                when (lockManager.locks!!.first().type) {
                    Lock.Type.PIN -> {
@@ -254,20 +253,20 @@ class LockActivity : AppCompatActivity() {
                }
            }
            "add_lock" -> {
-                binding.patternBtn.isEnabled = false
-                binding.pinBtn.isEnabled = false
-                binding.fingerprintBtn.isEnabled = false
-                binding.passwordBtn.isEnabled = false
+                lock_pattern.isEnabled = false
+                lock_pin.isEnabled = false
+                lock_fingerprint.isEnabled = false
+                lock_password.isEnabled = false

                when(intent.getStringExtra("type")!!) {
                    "pattern" -> {
-                        binding.patternBtn.isEnabled = true
+                        lock_pattern.isEnabled = true
                        supportFragmentManager.beginTransaction().add(
                            R.id.lock_content, patternLockFragment
                        ).commit()
                    }
                    "pin" -> {
-                        binding.pinBtn.isEnabled = true
+                        lock_pin.isEnabled = true
                        supportFragmentManager.beginTransaction().add(
                            R.id.lock_content, pinLockFragment
                        ).commit()
--- a/app/src/main/java/xyz/quaver/pupil/ui/MainActivity.kt
+++ b/app/src/main/java/xyz/quaver/pupil/ui/MainActivity.kt
@@ -18,12 +18,9 @@

 package xyz.quaver.pupil.ui

-import android.Manifest
 import android.annotation.SuppressLint
 import android.content.Intent
-import android.content.pm.PackageManager
 import android.net.Uri
-import android.os.Build
 import android.os.Bundle
 import android.text.InputType
 import android.text.util.Linkify
@@ -33,27 +30,27 @@ import android.view.View
 import android.view.animation.DecelerateInterpolator
 import android.widget.EditText
 import android.widget.TextView
-import androidx.activity.result.contract.ActivityResultContracts
 import androidx.appcompat.app.AlertDialog
-import androidx.core.app.ActivityCompat
-import androidx.core.content.ContextCompat
+import androidx.appcompat.app.AppCompatDelegate
+import androidx.cardview.widget.CardView
 import androidx.core.view.GravityCompat
 import androidx.core.view.ViewCompat
 import androidx.recyclerview.widget.RecyclerView
 import com.google.android.material.navigation.NavigationView
 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 xyz.quaver.floatingsearchview.FloatingSearchView
 import xyz.quaver.floatingsearchview.suggestions.model.SearchSuggestion
 import xyz.quaver.floatingsearchview.util.view.MenuView
 import xyz.quaver.floatingsearchview.util.view.SearchInputView
+import xyz.quaver.hitomi.doSearch
+import xyz.quaver.hitomi.getGalleryIDsFromNozomi
+import xyz.quaver.hitomi.getSuggestionsForQuery
 import xyz.quaver.pupil.*
 import xyz.quaver.pupil.adapters.GalleryBlockAdapter
-import xyz.quaver.pupil.databinding.MainActivityBinding
-import xyz.quaver.pupil.hitomi.doSearch
-import xyz.quaver.pupil.hitomi.getGalleryIDsFromNozomi
-import xyz.quaver.pupil.hitomi.getSuggestionsForQuery
 import xyz.quaver.pupil.services.DownloadService
 import xyz.quaver.pupil.types.*
 import xyz.quaver.pupil.ui.dialog.DownloadLocationDialogFragment
@@ -62,17 +59,12 @@ import xyz.quaver.pupil.ui.view.MainView
 import xyz.quaver.pupil.ui.view.ProgressCard
 import xyz.quaver.pupil.util.ItemClickSupport
 import xyz.quaver.pupil.util.Preferences
-import xyz.quaver.pupil.util.requestNotificationPermission
 import xyz.quaver.pupil.util.checkUpdate
 import xyz.quaver.pupil.util.downloader.Cache
 import xyz.quaver.pupil.util.downloader.DownloadManager
 import xyz.quaver.pupil.util.restore
-import xyz.quaver.pupil.util.showNotificationPermissionExplanationDialog
 import java.util.regex.Pattern
-import kotlin.math.ceil
-import kotlin.math.max
-import kotlin.math.min
-import kotlin.math.roundToInt
+import kotlin.math.*

 class MainActivity :
    BaseActivity(),
@@ -111,63 +103,35 @@ class MainActivity :
    private var loadingJob: Job? = null
    private var currentPage = 0

-    private lateinit var binding: MainActivityBinding
-
-    private val requestNotificationPermssionLauncher = registerForActivityResult(ActivityResultContracts.RequestPermission()) { isGranted ->
-        if (!isGranted) {
-            showNotificationPermissionExplanationDialog(this)
-        }
-    }
-
    override fun onCreate(savedInstanceState: Bundle?) {
+        AppCompatDelegate.setCompatVectorFromResourcesEnabled(true)
        super.onCreate(savedInstanceState)
-        binding = MainActivityBinding.inflate(layoutInflater)
-        setContentView(binding.root)
+        setContentView(R.layout.activity_main)

        if (intent.action == Intent.ACTION_VIEW) {
            intent.dataString?.let { url ->
                restore(url,
                    onFailure = {
-                        Snackbar.make(binding.contents.recyclerview, R.string.settings_backup_failed, Snackbar.LENGTH_LONG).show()
+                        Snackbar.make(this.main_recyclerview, R.string.settings_backup_failed, Snackbar.LENGTH_LONG).show()
                    }, onSuccess = {
-                        Snackbar.make(binding.contents.recyclerview, getString(R.string.settings_restore_success, it), Snackbar.LENGTH_LONG).show()
+                        Snackbar.make(this.main_recyclerview, getString(R.string.settings_restore_success, it.size), Snackbar.LENGTH_LONG).show()
                    }
                )
            }
        }

-        requestNotificationPermission(this, requestNotificationPermssionLauncher, false) {}
-
        if (Preferences["download_folder", ""].isEmpty())
            DownloadLocationDialogFragment().show(supportFragmentManager, "Download Location Dialog")

-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.R && !Preferences["download_folder_ignore_warning", false] &&
-            ContextCompat.getExternalFilesDirs(this, null).filterNotNull().map { Uri.fromFile(it).toString() }
-                .contains(Preferences["download_folder", ""])
-        ) {
-            AlertDialog.Builder(this)
-                .setTitle(R.string.warning)
-                .setMessage(R.string.unaccessible_download_folder)
-                .setPositiveButton(android.R.string.ok) { _, _ ->
-                    DownloadLocationDialogFragment().show(supportFragmentManager, "Download Location Dialog")
-                }.setNegativeButton(R.string.ignore) { _, _ ->
-                    Preferences["download_folder_ignore_warning"] = true
-                }.show()
-        }
+        checkUpdate(this)

        initView()
    }

-    override fun onResume() {
-        super.onResume()
-
-        checkUpdate(this)
-    }
-
    @OptIn(ExperimentalStdlibApi::class)
    override fun onBackPressed() {
        when {
-            binding.drawer.isDrawerOpen(GravityCompat.START) -> binding.drawer.closeDrawer(GravityCompat.START)
+            main_drawer_layout.isDrawerOpen(GravityCompat.START) -> main_drawer_layout.closeDrawer(GravityCompat.START)
            queryStack.removeLastOrNull() != null && queryStack.isNotEmpty() -> runOnUiThread {
                query = queryStack.last()

@@ -183,7 +147,7 @@ class MainActivity :
    override fun onDestroy() {
        super.onDestroy()

-        (binding.contents.recyclerview.adapter as? GalleryBlockAdapter)?.updateAll = false
+        (main_recyclerview?.adapter as? GalleryBlockAdapter)?.updateAll = false
    }

    override fun onKeyDown(keyCode: Int, event: KeyEvent?): Boolean {
@@ -224,36 +188,36 @@ class MainActivity :
    }

    private fun initView() {
-        binding.contents.recyclerview.addOnScrollListener(object: RecyclerView.OnScrollListener() {
+        main_recyclerview.addOnScrollListener(object: RecyclerView.OnScrollListener() {
            override fun onScrolled(recyclerView: RecyclerView, dx: Int, dy: Int) {
                // -height of the search view < translationY < 0
-                binding.contents.searchview.translationY =
+                main_searchview.translationY =
                    min(
                        max(
-                        binding.contents.searchview.translationY - dy,
-                        -binding.contents.searchview.binding.querySection.root.height.toFloat()
+                        main_searchview.translationY - dy,
+                        -main_searchview.findViewById<CardView>(R.id.search_query_section).height.toFloat()
                    ), 0F)

                if (dy > 0)
-                    binding.contents.fab.hideMenuButton(true)
+                    main_fab.hideMenuButton(true)
                else if (dy < 0)
-                    binding.contents.fab.showMenuButton(true)
+                    main_fab.showMenuButton(true)
            }
        })

-        Linkify.addLinks(binding.contents.noresult, Pattern.compile(getString(R.string.https_text)), null, null, { _, _ -> getString(R.string.https) })
+        Linkify.addLinks(main_noresult, Pattern.compile(getString(R.string.https_text)), null, null, { _, _ -> getString(R.string.https) })

        //NavigationView
-        binding.navView.setNavigationItemSelectedListener(this)
+        main_nav_view.setNavigationItemSelectedListener(this)

-        with(binding.contents.cancelFab) {
+        with(main_fab_cancel) {
            setImageResource(R.drawable.cancel)
            setOnClickListener {
                DownloadService.cancel(this@MainActivity)
            }
        }

-        with(binding.contents.jumpFab) {
+        with(main_fab_jump) {
            setImageResource(R.drawable.ic_jump)
            setOnClickListener {
                val perPage = Preferences["per_page", "25"].toInt()
@@ -281,7 +245,7 @@ class MainActivity :
            }
        }

-        with(binding.contents.randomFab) {
+        with(main_fab_random) {
            setImageResource(R.drawable.shuffle_variant)
            setOnClickListener {
                runBlocking {
@@ -311,7 +275,7 @@ class MainActivity :
            }
        }

-        with(binding.contents.idFab) {
+        with(main_fab_id) {
            setImageResource(R.drawable.numeric)
            setOnClickListener {
                val editText = EditText(context).apply {
@@ -344,7 +308,7 @@ class MainActivity :
            }
        }

-        with(binding.contents.view) {
+        with(main_view) {
            setOnPageTurnListener(object: MainView.OnPageTurnListener {
                override fun onPrev(page: Int) {
                    currentPage--
@@ -352,7 +316,7 @@ class MainActivity :
                    // disable pageturn until the contents are loaded
                    setCurrentPage(1, false)

-                    ViewCompat.animate(binding.contents.searchview)
+                    ViewCompat.animate(main_searchview)
                        .setDuration(100)
                        .setInterpolator(DecelerateInterpolator())
                        .translationY(0F)
@@ -369,7 +333,7 @@ class MainActivity :
                    // disable pageturn until the contents are loaded
                    setCurrentPage(1, false)

-                    ViewCompat.animate(binding.contents.searchview)
+                    ViewCompat.animate(main_searchview)
                        .setDuration(100)
                        .setInterpolator(DecelerateInterpolator())
                        .translationY(0F)
@@ -390,7 +354,7 @@ class MainActivity :

    @SuppressLint("ClickableViewAccessibility")
    private fun setupRecyclerView() {
-        with(binding.contents.recyclerview) {
+        with(main_recyclerview) {
            adapter = GalleryBlockAdapter(galleries).apply {
                onChipClickedHandler.add {
                    runOnUiThread {
@@ -406,17 +370,12 @@ class MainActivity :
                onDownloadClickedHandler = { position ->
                    val galleryID = galleries[position]

-                    requestNotificationPermission(
-                        this@MainActivity,
-                        requestNotificationPermssionLauncher
-                    ) {
-                        if (DownloadManager.getInstance(context).isDownloading(galleryID)) {     //download in progress
-                            DownloadService.cancel(this@MainActivity, galleryID)
-                        }
-                        else {
-                            DownloadManager.getInstance(context).addDownloadFolder(galleryID)
-                            DownloadService.download(this@MainActivity, galleryID)
-                        }
+                    if (DownloadManager.getInstance(context).isDownloading(galleryID)) {     //download in progress
+                        DownloadService.cancel(this@MainActivity, galleryID)
+                    }
+                    else {
+                        DownloadManager.getInstance(context).addDownloadFolder(galleryID)
+                        DownloadService.download(this@MainActivity, galleryID)
                    }

                    closeAllItems()
@@ -495,10 +454,10 @@ class MainActivity :

    private var suggestionJob : Job? = null
    private fun setupSearchBar() {
-        with(binding.contents.searchview) {
+        with(main_searchview as xyz.quaver.pupil.ui.view.FloatingSearchView) {
            onMenuStatusChangeListener = object: FloatingSearchView.OnMenuStatusChangeListener {
                override fun onMenuOpened() {
-                    (this@MainActivity.binding.contents.recyclerview.adapter as GalleryBlockAdapter).closeAllItems()
+                    (this@MainActivity.main_recyclerview.adapter as GalleryBlockAdapter).closeAllItems()
                }

                override fun onMenuClosed() {
@@ -582,7 +541,7 @@ class MainActivity :
                }
            }

-            attachNavigationDrawerToMenuButton(this@MainActivity.binding.drawer)
+            attachNavigationDrawerToMenuButton(main_drawer_layout)
        }
    }

@@ -593,7 +552,7 @@ class MainActivity :
                val thin = !item.isChecked

                item.isChecked = thin
-                binding.contents.recyclerview.apply {
+                main_recyclerview.apply {
                    (adapter as GalleryBlockAdapter).apply {
                        this.thin = thin

@@ -634,7 +593,7 @@ class MainActivity :

    override fun onNavigationItemSelected(item: MenuItem): Boolean {
        runOnUiThread {
-            binding.drawer.closeDrawers()
+            main_drawer_layout.closeDrawers()

            when(item.itemId) {
                R.id.main_drawer_home -> {
@@ -706,14 +665,14 @@ class MainActivity :
    private fun clearGalleries() = CoroutineScope(Dispatchers.Main).launch {
        galleries.clear()

-        with(binding.contents.recyclerview.adapter as GalleryBlockAdapter?) {
+        with(main_recyclerview.adapter as GalleryBlockAdapter?) {
            this ?: return@with

            this.notifyDataSetChanged()
        }

-        binding.contents.noresult.visibility = View.INVISIBLE
-        binding.contents.progressbar.show()
+        main_noresult.visibility = View.INVISIBLE
+        main_progressbar.show()
    }

    private fun fetchGalleries(query: String, sortMode: SortMode) {
@@ -728,7 +687,7 @@ class MainActivity :
        }

        if (query.isNotEmpty() && mode != Mode.SEARCH) {
-            Snackbar.make(binding.contents.recyclerview, R.string.search_all, Snackbar.LENGTH_SHORT).apply {
+            Snackbar.make(this@MainActivity.main_recyclerview, R.string.search_all, Snackbar.LENGTH_SHORT).apply {
                setAction(android.R.string.ok) {
                    cancelFetch()
                    clearGalleries()
@@ -820,19 +779,20 @@ class MainActivity :
                        throw Exception("No result")
                }
            } catch (e: Exception) {
-                if (e !is CancellationException)
+
+                if (e.message != "No result")
                    FirebaseCrashlytics.getInstance().recordException(e)

                withContext(Dispatchers.Main) {
-                    binding.contents.noresult.visibility = View.VISIBLE
-                    binding.contents.progressbar.hide()
+                    main_noresult.visibility = View.VISIBLE
+                    main_progressbar.hide()
                }

                return@launch
            }

            launch(Dispatchers.Main) {
-                binding.contents.view.setCurrentPage(currentPage + 1, galleryIDs.size > (currentPage+1)*perPage)
+                main_view.setCurrentPage(currentPage + 1, galleryIDs.size > (currentPage+1)*perPage)
            }

            galleryIDs.slice(currentPage*perPage until min(currentPage*perPage+perPage, galleryIDs.size)).chunked(5).let { chunks ->
@@ -846,10 +806,10 @@ class MainActivity :
                    }.forEach {
                        it.await()?.also {
                            withContext(Dispatchers.Main) {
-                                binding.contents.progressbar.hide()
+                                main_progressbar.hide()

                                galleries.add(it)
-                                binding.contents.recyclerview.adapter!!.notifyItemInserted(galleries.size - 1)
+                                main_recyclerview.adapter!!.notifyItemInserted(galleries.size - 1)
                            }
                        }
                    }
--- a/app/src/main/java/xyz/quaver/pupil/ui/ReaderActivity.kt
+++ b/app/src/main/java/xyz/quaver/pupil/ui/ReaderActivity.kt
@@ -45,24 +45,24 @@ import com.google.android.material.snackbar.Snackbar
 import com.google.firebase.crashlytics.FirebaseCrashlytics
 import com.google.mlkit.vision.face.Face
 import com.qtalk.recyclerviewfastscroller.RecyclerViewFastScroller
+import kotlinx.android.synthetic.main.activity_reader.*
+import kotlinx.android.synthetic.main.activity_reader.view.*
+import kotlinx.android.synthetic.main.dialog_numberpicker.view.*
+import kotlinx.android.synthetic.main.reader_eye_card.view.*
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.delay
 import kotlinx.coroutines.launch
+import xyz.quaver.Code
 import xyz.quaver.pupil.R
 import xyz.quaver.pupil.adapters.ReaderAdapter
-import xyz.quaver.pupil.databinding.NumberpickerDialogBinding
-import xyz.quaver.pupil.databinding.ReaderActivityBinding
 import xyz.quaver.pupil.favorites
 import xyz.quaver.pupil.services.DownloadService
 import xyz.quaver.pupil.util.Preferences
 import xyz.quaver.pupil.util.camera
-import xyz.quaver.pupil.util.checkNotificationEnabled
 import xyz.quaver.pupil.util.closeCamera
 import xyz.quaver.pupil.util.downloader.Cache
 import xyz.quaver.pupil.util.downloader.DownloadManager
-import xyz.quaver.pupil.util.requestNotificationPermission
-import xyz.quaver.pupil.util.showNotificationPermissionExplanationDialog
 import xyz.quaver.pupil.util.startCamera

 class ReaderActivity : BaseActivity() {
@@ -75,7 +75,7 @@ class ReaderActivity : BaseActivity() {
    set(value) {
        field = value

-        (binding.recyclerview.adapter as ReaderAdapter).isFullScreen = value
+        (reader_recyclerview.adapter as ReaderAdapter).isFullScreen = value
    }

    private lateinit var cache: Cache
@@ -118,18 +118,9 @@ class ReaderActivity : BaseActivity() {
    private var eyeType: Eye? = null
    private var eyeTime: Long = 0L

-    private lateinit var binding: ReaderActivityBinding
-
-    private val requestNotificationPermssionLauncher = registerForActivityResult(ActivityResultContracts.RequestPermission()) { isGranted ->
-        if (!isGranted) {
-            showNotificationPermissionExplanationDialog(this)
-        }
-    }
-
    override fun onCreate(savedInstanceState: Bundle?) {
        super.onCreate(savedInstanceState)
-        binding = ReaderActivityBinding.inflate(layoutInflater)
-        setContentView(binding.root)
+        setContentView(R.layout.activity_reader)

        title = getString(R.string.reader_loading)
        supportActionBar?.setDisplayHomeAsUpEnabled(false)
@@ -157,11 +148,10 @@ class ReaderActivity : BaseActivity() {
            val uri = intent.data
            val lastPathSegment = uri?.lastPathSegment
            if (uri != null && lastPathSegment != null) {
-                galleryID = if (uri.host?.endsWith("hasha.in") == true) {
-                    lastPathSegment?.toInt() ?: 0
-                } else when (uri.host) {
+                galleryID = when (uri.host) {
                    "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 -> 0
                }
@@ -171,10 +161,12 @@ class ReaderActivity : BaseActivity() {
        }
    }

-    override fun onCreateOptionsMenu(menu: Menu): Boolean {
+    override fun onCreateOptionsMenu(menu: Menu?): Boolean {
        menuInflater.inflate(R.menu.reader, menu)

-        with(menu.findItem(R.id.reader_menu_favorite)) {
+        with(menu?.findItem(R.id.reader_menu_favorite)) {
+            this ?: return@with
+
            if (favorites.contains(galleryID))
                (icon as Animatable).start()
        }
@@ -186,19 +178,17 @@ class ReaderActivity : BaseActivity() {
    override fun onOptionsItemSelected(item: MenuItem): Boolean {
        when(item.itemId) {
            R.id.reader_menu_page_indicator -> {
-                // TODO: Switch to DialogFragment
-                val binding = NumberpickerDialogBinding.inflate(layoutInflater, binding.root, false)
-
-                with(binding.numberPicker) {
+                val view = LayoutInflater.from(this).inflate(R.layout.dialog_numberpicker, reader_layout, false)
+                with(view.dialog_number_picker) {
                    minValue = 1
-                    maxValue = cache.metadata.galleryInfo?.files?.size ?: 0
+                    maxValue = cache.metadata.reader?.galleryInfo?.files?.size ?: 0
                    value = currentPage
                }
                val dialog = AlertDialog.Builder(this).apply {
-                    setView(binding.root)
+                    setView(view)
                }.create()
-                binding.okButton.setOnClickListener {
-                    (this@ReaderActivity.binding.recyclerview.layoutManager as LinearLayoutManager).scrollToPositionWithOffset(binding.numberPicker.value-1, 0)
+                view.dialog_ok.setOnClickListener {
+                    (reader_recyclerview.layoutManager as LinearLayoutManager?)?.scrollToPositionWithOffset(view.dialog_number_picker.value-1, 0)
                    dialog.dismiss()
                }

@@ -268,12 +258,12 @@ class ReaderActivity : BaseActivity() {
        //currentPage is 1-based
        return when(keyCode) {
            KeyEvent.KEYCODE_VOLUME_UP -> {
-                (binding.recyclerview.layoutManager as LinearLayoutManager).scrollToPositionWithOffset(currentPage-2, 0)
+                (reader_recyclerview.layoutManager as LinearLayoutManager).scrollToPositionWithOffset(currentPage-2, 0)

                true
            }
            KeyEvent.KEYCODE_VOLUME_DOWN -> {
-                (binding.recyclerview.layoutManager as LinearLayoutManager?)?.scrollToPositionWithOffset(currentPage, 0)
+                (reader_recyclerview.layoutManager as LinearLayoutManager?)?.scrollToPositionWithOffset(currentPage, 0)

                true
            }
@@ -295,35 +285,42 @@ class ReaderActivity : BaseActivity() {
                if (downloader.progress[galleryID]?.isEmpty() == true) {      //Gallery not found
                    update = false
                    Snackbar
-                        .make(binding.root, R.string.reader_failed_to_find_gallery, Snackbar.LENGTH_INDEFINITE)
+                        .make(reader_layout, R.string.reader_failed_to_find_gallery, Snackbar.LENGTH_INDEFINITE)
                        .show()

                    return@launch
                }

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

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

-                    if (galleryInfo != null) {
-                        with(binding.recyclerview.adapter as ReaderAdapter) {
-                            this.galleryInfo = galleryInfo
+                    if (reader != null) {
+                        with(reader_recyclerview.adapter as ReaderAdapter) {
+                            this.reader = reader
                            notifyDataSetChanged()
                        }

-                        title = galleryInfo.title
+                        title = reader.galleryInfo.title
                        menu?.findItem(R.id.reader_menu_page_indicator)?.title =
-                            "$currentPage/${galleryInfo.files.size}"
+                            "$currentPage/${reader.galleryInfo.files.size}"

-                        menu?.findItem(R.id.reader_type)?.icon = ContextCompat.getDrawable(this@ReaderActivity, R.drawable.hitomi)
+                        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 (downloader.isCompleted(galleryID)) {   //Download finished
-                    binding.downloadProgressbar.visibility = View.GONE
+                    reader_download_progressbar.visibility = View.GONE

                    animateDownloadFAB(false)
                }
@@ -332,7 +329,7 @@ class ReaderActivity : BaseActivity() {
    }

    private fun initView() {
-        with(binding.recyclerview) {
+        with(reader_recyclerview) {
            adapter = ReaderAdapter(this@ReaderActivity, galleryID).apply {
                onItemClickListener = {
                    if (isScroll) {
@@ -342,7 +339,7 @@ class ReaderActivity : BaseActivity() {
                        scrollMode(false)
                        fullscreen(true)
                    } else {
-                        (binding.recyclerview.layoutManager as LinearLayoutManager).scrollToPositionWithOffset(currentPage, 0) //Moves to next page because currentPage is 1-based indexing
+                        (reader_recyclerview.layoutManager as LinearLayoutManager).scrollToPositionWithOffset(currentPage, 0) //Moves to next page because currentPage is 1-based indexing
                    }
                }
            }
@@ -352,9 +349,9 @@ class ReaderActivity : BaseActivity() {
                    super.onScrolled(recyclerView, dx, dy)

                    if (dy < 0)
-                        binding.fab.showMenuButton(true)
+                        this@ReaderActivity.reader_fab.showMenuButton(true)
                    else if (dy > 0)
-                        binding.fab.hideMenuButton(true)
+                        this@ReaderActivity.reader_fab.hideMenuButton(true)

                    val layoutManager = recyclerView.layoutManager as LinearLayoutManager

@@ -366,36 +363,31 @@ class ReaderActivity : BaseActivity() {
            })
        }

-        with(binding.downloadFab) {
+        with(reader_fab_download) {
            animateDownloadFAB(DownloadManager.getInstance(this@ReaderActivity).getDownloadFolder(galleryID) != null) //If download in progress, animate button

            setOnClickListener {
-                requestNotificationPermission(
-                    this@ReaderActivity,
-                    requestNotificationPermssionLauncher
-                ) {
-                    val downloadManager = DownloadManager.getInstance(this@ReaderActivity)
+                val downloadManager = DownloadManager.getInstance(this@ReaderActivity)

-                    if (downloadManager.isDownloading(galleryID)) {
-                        downloadManager.deleteDownloadFolder(galleryID)
-                        animateDownloadFAB(false)
-                    } else {
-                        downloadManager.addDownloadFolder(galleryID)
-                        DownloadService.download(context, galleryID, true)
-                        animateDownloadFAB(true)
-                    }
+                if (downloadManager.isDownloading(galleryID)) {
+                    downloadManager.deleteDownloadFolder(galleryID)
+                    animateDownloadFAB(false)
+                } else {
+                    downloadManager.addDownloadFolder(galleryID)
+                    DownloadService.download(context, galleryID, true)
+                    animateDownloadFAB(true)
                }
            }
        }

-        with(binding.retryFab) {
+        with(reader_fab_retry) {
            setImageResource(R.drawable.refresh)
            setOnClickListener {
                DownloadService.download(context, galleryID)
            }
        }

-        with(binding.autoFab) {
+        with(reader_fab_auto) {
            setImageResource(R.drawable.eye_white)
            setOnClickListener {
                when {
@@ -415,13 +407,13 @@ class ReaderActivity : BaseActivity() {
            }
        }

-        with(binding.fullscreenFab) {
+        with(reader_fab_fullscreen) {
            setImageResource(R.drawable.ic_fullscreen)
            setOnClickListener {
                isFullscreen = true
                fullscreen(isFullscreen)

-                binding.fab.close(true)
+                this@ReaderActivity.reader_fab.close(true)
            }
        }
    }
@@ -431,8 +423,8 @@ class ReaderActivity : BaseActivity() {
            if (isFullscreen) {
                flags = flags or WindowManager.LayoutParams.FLAG_FULLSCREEN
                supportActionBar?.hide()
-                binding.fab.visibility = View.INVISIBLE
-                binding.scroller.let {
+                this@ReaderActivity.reader_fab.visibility = View.INVISIBLE
+                this@ReaderActivity.scroller.let {
                    it.handleWidth = resources.getDimensionPixelSize(R.dimen.thumb_height)
                    it.handleHeight = resources.getDimensionPixelSize(R.dimen.thumb_width)
                    it.handleDrawable = ContextCompat.getDrawable(this@ReaderActivity, R.drawable.thumb_horizontal)
@@ -441,8 +433,8 @@ class ReaderActivity : BaseActivity() {
            } else {
                flags = flags and WindowManager.LayoutParams.FLAG_FULLSCREEN.inv()
                supportActionBar?.show()
-                binding.fab.visibility = View.VISIBLE
-                binding.scroller.let {
+                this@ReaderActivity.reader_fab.visibility = View.VISIBLE
+                this@ReaderActivity.scroller.let {
                    it.handleWidth = resources.getDimensionPixelSize(R.dimen.thumb_width)
                    it.handleHeight = resources.getDimensionPixelSize(R.dimen.thumb_height)
                    it.handleDrawable = ContextCompat.getDrawable(this@ReaderActivity, R.drawable.thumb)
@@ -453,27 +445,27 @@ class ReaderActivity : BaseActivity() {
            window.attributes = this
        }

-        binding.recyclerview.adapter = binding.recyclerview.adapter   // Force to redraw
+        reader_recyclerview.adapter = reader_recyclerview.adapter   // Force to redraw
    }

    private fun scrollMode(isScroll: Boolean) {
        if (isScroll) {
            snapHelper.attachToRecyclerView(null)
-            binding.recyclerview.layoutManager = LinearLayoutManager(this)
+            reader_recyclerview.layoutManager = LinearLayoutManager(this)
        } else {
-            snapHelper.attachToRecyclerView(binding.recyclerview)
-            binding.recyclerview.layoutManager = object: LinearLayoutManager(this, HORIZONTAL, Preferences["rtl", false]) {
+            snapHelper.attachToRecyclerView(reader_recyclerview)
+            reader_recyclerview.layoutManager = object: LinearLayoutManager(this, HORIZONTAL, Preferences["rtl", false]) {
                override fun calculateExtraLayoutSpace(state: RecyclerView.State, extraLayoutSpace: IntArray) {
                    extraLayoutSpace.fill(600)
                }
            }
        }

-        (binding.recyclerview.layoutManager as LinearLayoutManager).scrollToPositionWithOffset(currentPage-1, 0)
+        (reader_recyclerview.layoutManager as LinearLayoutManager).scrollToPositionWithOffset(currentPage-1, 0)
    }

    private fun animateDownloadFAB(animate: Boolean) {
-        with(binding.downloadFab) {
+        with(reader_fab_download) {
            if (animate) {
                val icon = AnimatedVectorDrawableCompat.create(context, R.drawable.ic_downloading)

@@ -502,7 +494,7 @@ class ReaderActivity : BaseActivity() {
    }

    val cameraCallback: (List<Face>) -> Unit = callback@{ faces ->
-        binding.eyeCard.dot.let {
+        eye_card.dot.let {
            it.visibility = View.VISIBLE
            CoroutineScope(Dispatchers.Main).launch {
                delay(50)
@@ -512,9 +504,9 @@ class ReaderActivity : BaseActivity() {

        if (faces.size != 1)
            ContextCompat.getDrawable(this, R.drawable.eye_off).let {
-                with(binding.eyeCard) {
-                    leftEye.setImageDrawable(it)
-                    rightEye.setImageDrawable(it)
+                with(eye_card) {
+                    left_eye.setImageDrawable(it)
+                    right_eye.setImageDrawable(it)
                }

                return@callback
@@ -525,16 +517,16 @@ class ReaderActivity : BaseActivity() {
            faces[0].leftEyeOpenProbability?.let { it > 0.4 } == true
        )

-        with(binding.eyeCard) {
-            leftEye.setImageDrawable(
+        with(eye_card) {
+            left_eye.setImageDrawable(
                ContextCompat.getDrawable(
-                    leftEye.context,
+                    context,
                    if (left) R.drawable.eye else R.drawable.eye_closed
                )
            )
-            rightEye.setImageDrawable(
+            right_eye.setImageDrawable(
                ContextCompat.getDrawable(
-                    rightEye.context,
+                    context,
                    if (right) R.drawable.eye else R.drawable.eye_closed
                )
            )
@@ -561,7 +553,7 @@ class ReaderActivity : BaseActivity() {
        }

        if (eyeType != null && System.currentTimeMillis() - eyeTime > 100) {
-            (binding.recyclerview.layoutManager as LinearLayoutManager).let {
+            (this@ReaderActivity.reader_recyclerview.layoutManager as LinearLayoutManager).let {
                it.scrollToPositionWithOffset(when(eyeType!!) {
                    Eye.RIGHT -> {
                        if (it.reverseLayout) currentPage - 2 else currentPage
@@ -577,11 +569,11 @@ class ReaderActivity : BaseActivity() {
    }

    private fun toggleCamera() {
-        val eyes = binding.eyeCard.root
+        val eyes = this@ReaderActivity.eye_card
        when (camera) {
            null -> {
-                binding.autoFab.labelText = getString(R.string.reader_fab_auto_cancel)
-                binding.autoFab.setImageResource(R.drawable.eye_off_white)
+                reader_fab_auto.labelText = getString(R.string.reader_fab_auto_cancel)
+                reader_fab_auto.setImageResource(R.drawable.eye_off_white)
                eyes.apply {
                    visibility = View.VISIBLE
                    TranslateAnimation(0F, 0F, -100F, 0F).apply {
@@ -594,8 +586,8 @@ class ReaderActivity : BaseActivity() {
                cameraEnabled = true
            }
            else -> {
-                binding.autoFab.labelText = getString(R.string.reader_fab_auto)
-                binding.autoFab.setImageResource(R.drawable.eye_white)
+                reader_fab_auto.labelText = getString(R.string.reader_fab_auto)
+                reader_fab_auto.setImageResource(R.drawable.eye_white)
                eyes.apply {
                    TranslateAnimation(0F, 0F, 0F, -100F).apply {
                        duration = 500
--- a/app/src/main/java/xyz/quaver/pupil/ui/dialog/DefaultQueryDialog.kt
+++ b/app/src/main/java/xyz/quaver/pupil/ui/dialog/DefaultQueryDialog.kt
@@ -18,30 +18,30 @@

 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.fragment.app.DialogFragment
+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.databinding.DefaultQueryDialogBinding
 import xyz.quaver.pupil.types.Tags
 import xyz.quaver.pupil.util.Preferences

-class DefaultQueryDialog : DialogFragment() {
+class DefaultQueryDialog(context : Context) : AlertDialog(context) {

-    private val languages: Map<String, String> by lazy {
-        requireContext().resources.getStringArray(R.array.languages).map {
-            it.split("|").let { split ->
-                Pair(split[0], split[1])
-            }
-        }.toMap()
-    }
-    private val reverseLanguages: Map<String, String> by lazy {
-        languages.entries.associate { (k, v) -> v to k }
-    }
+    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")
@@ -49,15 +49,46 @@ class DefaultQueryDialog : DialogFragment() {

    var onPositiveButtonClickListener : ((Tags) -> (Unit))? = null

-    private var _binding: DefaultQueryDialogBinding? = null
-    private val binding get() = _binding!!
+    @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())

-    private fun initView() {
+            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 tags = Tags.parse(
            Preferences["default_query"]
        )

-        with(binding.languageSelector) {
+        val view = LayoutInflater.from(context).inflate(R.layout.dialog_default_query, null)
+
+        with(view.default_query_dialog_language_selector) {
            adapter =
                ArrayAdapter(
                    context,
@@ -80,13 +111,13 @@ class DefaultQueryDialog : DialogFragment() {
            }
        }

-        with(binding.BLCheckbox) {
+        with(view.default_query_dialog_BL_checkbox) {
            isChecked = tags.contains(excludeBL)
            if (tags.contains(excludeBL))
                tags.remove(excludeBL)
        }

-        with(binding.guroCheckbox) {
+        with(view.default_query_dialog_guro_checkbox) {
            isChecked = excludeGuro.all { tags.contains(it) }
            if (excludeGuro.all { tags.contains(it) })
                excludeGuro.forEach {
@@ -94,7 +125,7 @@ class DefaultQueryDialog : DialogFragment() {
                }
        }

-        with(binding.loliCheckbox) {
+        with(view.default_query_dialog_loli_checkbox) {
            isChecked = excludeLoli.all { tags.contains(it) }
            if (excludeLoli.all { tags.contains(it) })
                excludeLoli.forEach {
@@ -102,7 +133,7 @@ class DefaultQueryDialog : DialogFragment() {
                }
        }

-        with(binding.edittext) {
+        with(view.default_query_dialog_edittext) {
            setText(tags.toString(), android.widget.TextView.BufferType.EDITABLE)
            addTextChangedListener(object : TextWatcher {
                override fun beforeTextChanged(
@@ -127,45 +158,8 @@ class DefaultQueryDialog : DialogFragment() {
                }
            })
        }
-    }

-    override fun onCreateDialog(savedInstanceState: Bundle?): Dialog {
-        _binding = DefaultQueryDialogBinding.inflate(layoutInflater)
-
-        initView()
-
-        return AlertDialog.Builder(requireContext()).apply {
-            setTitle(R.string.default_query_dialog_title)
-            setView(binding.root)
-            setPositiveButton(android.R.string.ok) { _, _ ->
-                val newTags = Tags.parse(binding.edittext.text.toString())
-
-                with(binding.languageSelector) {
-                    if (selectedItemPosition != 0)
-                        newTags.add("language:${reverseLanguages[selectedItem]}")
-                }
-
-                if (binding.BLCheckbox.isChecked)
-                    newTags.add(excludeBL)
-
-                if (binding.guroCheckbox.isChecked)
-                    excludeGuro.forEach { tag ->
-                        newTags.add(tag)
-                    }
-
-                if (binding.loliCheckbox.isChecked)
-                    excludeLoli.forEach { tag ->
-                        newTags.add(tag)
-                    }
-
-                onPositiveButtonClickListener?.invoke(newTags)
-            }
-        }.create()
-    }
-
-    override fun onDestroy() {
-        super.onDestroy()
-        _binding = null
+        return view
    }

 }
--- a/app/src/main/java/xyz/quaver/pupil/ui/dialog/DownloadFolderNameDialogFragment.kt
+++ b/app/src/main/java/xyz/quaver/pupil/ui/dialog/DownloadFolderNameDialogFragment.kt
@@ -18,17 +18,17 @@

 package xyz.quaver.pupil.ui.dialog

+import android.annotation.SuppressLint
 import android.app.Dialog
 import android.os.Bundle
+import android.view.View
 import android.view.ViewGroup
 import androidx.core.widget.addTextChangedListener
 import androidx.fragment.app.DialogFragment
 import com.google.android.material.snackbar.Snackbar
-import kotlinx.coroutines.CoroutineScope
-import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.launch
+import kotlinx.android.synthetic.main.dialog_download_folder_name.view.*
+import kotlinx.coroutines.runBlocking
 import xyz.quaver.pupil.R
-import xyz.quaver.pupil.databinding.DownloadFolderNameDialogBinding
 import xyz.quaver.pupil.util.Preferences
 import xyz.quaver.pupil.util.downloader.Cache
 import xyz.quaver.pupil.util.formatDownloadFolder
@@ -37,49 +37,38 @@ import xyz.quaver.pupil.util.formatMap

 class DownloadFolderNameDialogFragment : DialogFragment() {

-    private var _binding: DownloadFolderNameDialogBinding? = null
-    private val binding get() = _binding!!
-
-    override fun onCreateDialog(savedInstanceState: Bundle?): Dialog {
-        _binding = DownloadFolderNameDialogBinding.inflate(layoutInflater)
-
-        initView()
-
-        return Dialog(requireContext()).apply {
-            setContentView(binding.root)
-            window?.attributes?.width = ViewGroup.LayoutParams.MATCH_PARENT
-        }
-    }
-
-    override fun onDestroy() {
-        super.onDestroy()
-        _binding = null
-    }
-
-    private fun initView() {
+    @SuppressLint("InflateParams")
+    private fun build(): View {
        val galleryID = Cache.instances.let { if (it.size == 0) 1199708 else it.keys.elementAt((0 until it.size).random()) }
-        CoroutineScope(Dispatchers.IO).launch {
-            val galleryBlock = Cache.getInstance(requireContext(), galleryID).getGalleryBlock()
-
-            binding.message.text = getString(R.string.settings_download_folder_name_message, formatMap.keys.toString(), galleryBlock?.formatDownloadFolder() ?: "")
-            binding.edittext.addTextChangedListener {
-                binding.message.text = requireContext().getString(R.string.settings_download_folder_name_message, formatMap.keys.toString(), galleryBlock?.formatDownloadFolderTest(it.toString()) ?: "")
-            }
+        val galleryBlock = runBlocking {
+            Cache.getInstance(requireContext(), galleryID).getGalleryBlock()
        }

-        binding.edittext.setText(Preferences["download_folder_name", "[-id-] -title-"])
-        binding.okButton.setOnClickListener {
-            val newValue = binding.edittext.text.toString()
-
-            if ((newValue as? String)?.contains("/") != false) {
-                Snackbar.make(binding.root, R.string.settings_invalid_download_folder_name, Snackbar.LENGTH_SHORT).show()
-                return@setOnClickListener
+        return layoutInflater.inflate(R.layout.dialog_download_folder_name, null).apply {
+            message.text = getString(R.string.settings_download_folder_name_message, formatMap.keys.toString(), galleryBlock?.formatDownloadFolder() ?: "")
+            edittext.setText(Preferences["download_folder_name", "[-id-] -title-"])
+            edittext.addTextChangedListener {
+                message.text = getString(R.string.settings_download_folder_name_message, formatMap.keys.toString(), galleryBlock?.formatDownloadFolderTest(it.toString()) ?: "")
            }
+            ok_button.setOnClickListener {
+                val newValue = edittext.text.toString()

-            Preferences["download_folder_name"] = binding.edittext.text.toString()
+                if ((newValue as? String)?.contains("/") != false) {
+                    Snackbar.make(this, R.string.settings_invalid_download_folder_name, Snackbar.LENGTH_SHORT).show()
+                    return@setOnClickListener
+                }

-            dismiss()
+                Preferences["download_folder_name"] = edittext.text.toString()
+
+                dismiss()
+            }
        }
    }

+    override fun onCreateDialog(savedInstanceState: Bundle?): Dialog =
+       Dialog(requireContext()).apply {
+           setContentView(build())
+           window?.attributes?.width = ViewGroup.LayoutParams.MATCH_PARENT
+       }
+
 }
--- a/app/src/main/java/xyz/quaver/pupil/ui/dialog/DownloadLocationDialogFragment.kt
+++ b/app/src/main/java/xyz/quaver/pupil/ui/dialog/DownloadLocationDialogFragment.kt
@@ -18,49 +18,52 @@

 package xyz.quaver.pupil.ui.dialog

+import android.annotation.SuppressLint
 import android.app.Activity
 import android.app.Dialog
 import android.content.Intent
 import android.os.Build
 import android.os.Bundle
+import android.view.View
+import android.widget.LinearLayout
 import androidx.activity.result.contract.ActivityResultContracts
 import androidx.appcompat.app.AlertDialog
 import androidx.core.content.ContextCompat
 import androidx.core.net.toUri
 import androidx.fragment.app.DialogFragment
 import com.google.android.material.snackbar.Snackbar
+import kotlinx.android.synthetic.main.dialog_download_folder_name.view.*
+import kotlinx.android.synthetic.main.item_download_folder.view.*
 import net.rdrei.android.dirchooser.DirectoryChooserActivity
 import net.rdrei.android.dirchooser.DirectoryChooserConfig
 import xyz.quaver.io.FileX
 import xyz.quaver.io.util.toFile
 import xyz.quaver.pupil.R
-import xyz.quaver.pupil.databinding.DownloadLocationDialogBinding
-import xyz.quaver.pupil.databinding.DownloadLocationItemBinding
 import xyz.quaver.pupil.util.Preferences
 import xyz.quaver.pupil.util.byteToString
 import xyz.quaver.pupil.util.downloader.DownloadManager
+import xyz.quaver.pupil.util.migrate
 import java.io.File

 class DownloadLocationDialogFragment : DialogFragment() {
-
-    private var _binding: DownloadLocationDialogBinding? = null
-    private val binding get() = _binding!!
-
-    private val entries = mutableMapOf<File?, DownloadLocationItemBinding>()
+    private val entries = mutableMapOf<File?, View>()

    private val requestDownloadFolderLauncher = registerForActivityResult(ActivityResultContracts.StartActivityForResult()) {
        if (it.resultCode == Activity.RESULT_OK) {
+            val activity = activity ?: return@registerForActivityResult
            val context = context ?: return@registerForActivityResult
            val dialog = dialog ?: return@registerForActivityResult

            it.data?.data?.also { uri ->
-                val takeFlags: Int = Intent.FLAG_GRANT_READ_URI_PERMISSION or Intent.FLAG_GRANT_WRITE_URI_PERMISSION
+                val takeFlags: Int =
+                    activity.intent.flags and
+                            (Intent.FLAG_GRANT_READ_URI_PERMISSION or Intent.FLAG_GRANT_WRITE_URI_PERMISSION)

                if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.KITKAT)
                    context.contentResolver.takePersistableUriPermission(uri, takeFlags)

                if (kotlin.runCatching { FileX(context, uri).canWrite() }.getOrDefault(false)) {
-                    entries[null]?.locationAvailable?.text = uri.toFile(context)?.canonicalPath
+                    entries[null]?.location_available?.text = uri.toFile(context)?.canonicalPath
                    Preferences["download_folder"] = uri.toString()
                } else {
                    Snackbar.make(
@@ -72,18 +75,9 @@ class DownloadLocationDialogFragment : DialogFragment() {
                    val downloadFolder = DownloadManager.getInstance(context).downloadFolder.canonicalPath
                    val key = entries.keys.firstOrNull { it?.canonicalPath == downloadFolder }
                    entries[key]!!.button.isChecked = true
-                    if (key == null) entries[key]!!.locationAvailable.text = downloadFolder
+                    if (key == null) entries[key]!!.location_available.text = downloadFolder
                }
            }
-        } else {
-            val downloadFolder = DownloadManager.getInstance(context ?: return@registerForActivityResult).downloadFolder.canonicalPath
-            val key = entries.keys.firstOrNull { it?.canonicalPath == downloadFolder }
-            if (key == null)
-                entries[key]!!.locationAvailable.text = downloadFolder
-            else {
-                entries[null]!!.button.isChecked = false
-                entries[key]!!.button.isChecked = true
-            }
        }
    }

@@ -104,46 +98,51 @@ class DownloadLocationDialogFragment : DialogFragment() {
                val downloadFolder = DownloadManager.getInstance(context).downloadFolder.canonicalPath
                val key = entries.keys.firstOrNull { it?.canonicalPath == downloadFolder }
                entries[key]!!.button.isChecked = true
-                if (key == null) entries[key]!!.locationAvailable.text = downloadFolder
+                if (key == null) entries[key]!!.location_available.text = downloadFolder
            }
            else {
-                entries[null]?.locationAvailable?.text = directory
+                entries[null]?.location_available?.text = directory
                Preferences["download_folder"] = File(directory).toURI().toString()
            }
        }
    }

-    private fun initView() {
-        val externalFilesDirs = ContextCompat.getExternalFilesDirs(requireContext(), null)
+    @SuppressLint("InflateParams")
+    private fun build() : View? {
+        val context = context ?: return null
+
+        val view = layoutInflater.inflate(R.layout.dialog_download_folder, null) as LinearLayout
+
+        val externalFilesDirs = ContextCompat.getExternalFilesDirs(context, null)

        externalFilesDirs.forEachIndexed { index, dir ->
            dir ?: return@forEachIndexed

-            DownloadLocationItemBinding.inflate(layoutInflater, binding.root, true).apply {
-                locationType.text = requireContext().getString(when (index) {
+            view.addView(layoutInflater.inflate(R.layout.item_download_folder, view, false).apply {
+                location_type.text = context.getString(when (index) {
                    0 -> R.string.settings_download_folder_internal
                    else -> R.string.settings_download_folder_removable
                })
-                locationAvailable.text = requireContext().getString(
+                location_available.text = context.getString(
                    R.string.settings_download_folder_available,
                    byteToString(dir.freeSpace)
                )
-                root.setOnClickListener {
-                    entries.values.forEach { entry ->
-                        entry.button.isChecked = false
+                setOnClickListener {
+                    entries.values.forEach {
+                        it.button.isChecked = false
                    }
                    button.performClick()
                    Preferences["download_folder"] = dir.toUri().toString()
                }
                entries[dir] = this
-            }
+            })
        }

-        DownloadLocationItemBinding.inflate(layoutInflater, binding.root, true).apply {
-            locationType.text = requireContext().getString(R.string.settings_download_folder_custom)
-            root.setOnClickListener {
-                entries.values.forEach { entry ->
-                    entry.button.isChecked = false
+        view.addView(layoutInflater.inflate(R.layout.item_download_folder, view, false).apply {
+            location_type.text = context.getString(R.string.settings_download_folder_custom)
+            setOnClickListener {
+                entries.values.forEach {
+                    it.button.isChecked = false
                }
                button.performClick()

@@ -167,33 +166,31 @@ class DownloadLocationDialogFragment : DialogFragment() {
                }
            }
            entries[null] = this
-        }
+        })

-        val downloadFolder = DownloadManager.getInstance(requireContext()).downloadFolder.canonicalPath
+        val downloadFolder = DownloadManager.getInstance(context).downloadFolder.canonicalPath
        val key = entries.keys.firstOrNull { it?.canonicalPath == downloadFolder }
        entries[key]!!.button.isChecked = true
-        if (key == null) entries[key]!!.locationAvailable.text = downloadFolder
+        if (key == null) entries[key]!!.location_available.text = downloadFolder
+
+        return view
    }

    override fun onCreateDialog(savedInstanceState: Bundle?): Dialog {
-        _binding = DownloadLocationDialogBinding.inflate(layoutInflater)
+        val builder = AlertDialog.Builder(requireContext())

-        initView()
-
-        return AlertDialog.Builder(requireContext()).apply {
-            setTitle(R.string.settings_download_folder)
-            setView(binding.root)
-            setPositiveButton(requireContext().getText(android.R.string.ok)) { _, _ ->
+        builder
+            .setTitle(R.string.settings_download_folder)
+            .setView(build())
+            .setPositiveButton(requireContext().getText(android.R.string.ok)) { _, _ ->
                if (Preferences["download_folder", ""].isEmpty())
-                    Preferences["download_folder"] = context.getExternalFilesDir(null)?.toUri()?.toString() ?: ""
+                    Preferences["download_folder"] = context?.getExternalFilesDir(null)?.toUri()?.toString() ?: ""
+
+                DownloadManager.getInstance(requireContext()).migrate()
            }

-            isCancelable = false
-        }.create()
-    }
+        isCancelable = false

-    override fun onDestroy() {
-        super.onDestroy()
-        _binding = null
+        return builder.create()
    }
 }
--- a/app/src/main/java/xyz/quaver/pupil/ui/dialog/GalleryDialog.kt
+++ b/app/src/main/java/xyz/quaver/pupil/ui/dialog/GalleryDialog.kt
@@ -22,6 +22,7 @@ import android.content.Context
 import android.content.Intent
 import android.net.Uri
 import android.os.Bundle
+import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
 import android.widget.LinearLayout.LayoutParams
@@ -31,16 +32,19 @@ import androidx.recyclerview.widget.LinearLayoutManager
 import androidx.recyclerview.widget.RecyclerView
 import androidx.viewpager2.widget.ViewPager2
 import com.google.android.material.snackbar.Snackbar
+import kotlinx.android.synthetic.main.dialog_gallery.*
+import kotlinx.android.synthetic.main.dialog_gallery_details.view.*
+import kotlinx.android.synthetic.main.dialog_gallery_dotindicator.view.*
+import kotlinx.android.synthetic.main.item_gallery_details.view.*
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.withContext
-import xyz.quaver.pupil.hitomi.Gallery
-import xyz.quaver.pupil.hitomi.getGallery
+import xyz.quaver.hitomi.Gallery
+import xyz.quaver.hitomi.getGallery
 import xyz.quaver.pupil.R
 import xyz.quaver.pupil.adapters.GalleryBlockAdapter
 import xyz.quaver.pupil.adapters.ThumbnailPageAdapter
-import xyz.quaver.pupil.databinding.*
 import xyz.quaver.pupil.favoriteTags
 import xyz.quaver.pupil.types.Tag
 import xyz.quaver.pupil.ui.ReaderActivity
@@ -55,12 +59,9 @@ class GalleryDialog(context: Context, private val galleryID: Int) : AlertDialog(

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

-    private lateinit var binding: GalleryDialogBinding
-
    override fun onCreate(savedInstanceState: Bundle?) {
        super.onCreate(savedInstanceState)
-        binding = GalleryDialogBinding.inflate(layoutInflater)
-        setContentView(binding.root)
+        setContentView(R.layout.dialog_gallery)

        window?.attributes.apply {
            this ?: return@apply
@@ -69,7 +70,7 @@ class GalleryDialog(context: Context, private val galleryID: Int) : AlertDialog(
            height = LayoutParams.MATCH_PARENT
        }

-        with(binding.fab) {
+        with(gallery_fab) {
            setImageDrawable(ContextCompat.getDrawable(context, R.drawable.arrow_right))
            setOnClickListener {
                context.startActivity(Intent(context, ReaderActivity::class.java).apply {
@@ -82,12 +83,12 @@ class GalleryDialog(context: Context, private val galleryID: Int) : AlertDialog(
            try {
                val gallery = getGallery(galleryID)

-                launch (Dispatchers.Main) {
-                    binding.progressbar.visibility = View.GONE
-                    binding.title.text = gallery.title
-                    binding.artist.text = gallery.artists.joinToString(", ") { it.wordCapitalize() }
+                gallery_cover.post {
+                    gallery_progressbar.visibility = View.GONE
+                    gallery_title.text = gallery.title
+                    gallery_artist.text = gallery.artists.joinToString(", ") { it.wordCapitalize() }

-                    with(binding.type) {
+                    with(gallery_type) {
                        text = gallery.type.wordCapitalize()
                        setOnClickListener {
                            gallery.type.let {
@@ -104,14 +105,14 @@ class GalleryDialog(context: Context, private val galleryID: Int) : AlertDialog(
                        }
                    }

-                    binding.cover.showImage(Uri.parse(gallery.cover))
+                    gallery_cover.showImage(Uri.parse(gallery.cover))

                    addDetails(gallery)
                    addThumbnails(gallery)
                    addRelated(gallery)
                }
            } catch (e: Exception) {
-                Snackbar.make(binding.root, R.string.unable_to_connect, Snackbar.LENGTH_INDEFINITE).apply {
+                Snackbar.make(gallery_layout, R.string.unable_to_connect, Snackbar.LENGTH_INDEFINITE).apply {
                    if (Locale.getDefault().language == "ko")
                        setAction(context.getText(R.string.https_text)) {
                            context.startActivity(Intent(Intent.ACTION_VIEW, Uri.parse(context.getString(R.string.https))))
@@ -122,8 +123,10 @@ class GalleryDialog(context: Context, private val galleryID: Int) : AlertDialog(
    }

    private fun addDetails(gallery: Gallery) {
-        GalleryDialogDetailsBinding.inflate(layoutInflater, binding.contents, true).apply {
-            type.setText(R.string.gallery_details)
+        val inflater = LayoutInflater.from(context)
+
+        inflater.inflate(R.layout.dialog_gallery_details, gallery_contents, false).apply {
+            gallery_details.setText(R.string.gallery_details)

            listOf(
                R.string.gallery_artists,
@@ -160,13 +163,13 @@ class GalleryDialog(context: Context, private val galleryID: Int) : AlertDialog(
                    }
                )
            ).filter {
-                    (_, content) -> content.isNotEmpty()
+                (_, content) -> content.isNotEmpty()
            }.forEach { (title, content) ->
-                GalleryDialogTagsBinding.inflate(layoutInflater, contents, true).apply {
-                    type.setText(title)
+                inflater.inflate(R.layout.item_gallery_details, gallery_details_contents, false).apply {
+                    gallery_details_type.setText(title)

                    content.forEach { tag ->
-                        tags.addView(
+                        gallery_details_tags.addView(
                            TagChip(context, tag).apply {
                                setOnClickListener {
                                    onChipClickedHandler.forEach { handler ->
@@ -176,34 +179,42 @@ class GalleryDialog(context: Context, private val galleryID: Int) : AlertDialog(
                            }
                        )
                    }
+                }.let {
+                    gallery_details_contents.addView(it)
                }
            }
+        }.let {
+            gallery_contents.addView(it)
        }
    }

    private fun addThumbnails(gallery: Gallery) {
-        GalleryDialogDetailsBinding.inflate(layoutInflater, binding.contents, true).apply {
-            type.setText(R.string.gallery_thumbnails)
+        val inflater = LayoutInflater.from(context)
+
+        inflater.inflate(R.layout.dialog_gallery_details, gallery_contents, false).apply {
+            gallery_details.setText(R.string.gallery_thumbnails)

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

-            contents.addView(
+            gallery_details_contents.addView(
                pager,
                LayoutParams(LayoutParams.MATCH_PARENT, LayoutParams.WRAP_CONTENT)
            )

-            // TODO: Change to direct allocation
-            GalleryDialogDotindicatorBinding.inflate(layoutInflater, contents, true).apply {
-                dotindicator.setViewPager2(pager)
-            }
+            LayoutInflater.from(context).inflate(R.layout.dialog_gallery_dotindicator, gallery_details_contents)
+
+            gallery_dotindicator.setViewPager2(pager)
+        }.let {
+            gallery_contents.addView(it)
        }
    }

    private fun addRelated(gallery: Gallery) {
-        val galleries = mutableListOf<Int>()
+        val inflater = LayoutInflater.from(context)
+        val galleries = ArrayList<Int>()

        val adapter = GalleryBlockAdapter(galleries).apply {
            onChipClickedHandler.add { tag ->
@@ -213,10 +224,10 @@ class GalleryDialog(context: Context, private val galleryID: Int) : AlertDialog(
            }
        }

-        GalleryDialogDetailsBinding.inflate(layoutInflater, binding.contents, true).apply {
-            type.setText(R.string.gallery_related)
+        inflater.inflate(R.layout.dialog_gallery_details, gallery_contents, false).apply {
+            gallery_details.setText(R.string.gallery_related)

-            contents.addView(RecyclerView(context).apply {
+            RecyclerView(context).apply {
                layoutManager = LinearLayoutManager(context)
                this.adapter = adapter

@@ -236,18 +247,22 @@ class GalleryDialog(context: Context, private val galleryID: Int) : AlertDialog(
                        true
                    }
                }
-            })
+            }.let {
+                gallery_details_contents.addView(it, LayoutParams(LayoutParams.MATCH_PARENT, LayoutParams.WRAP_CONTENT))
+            }
+        }.let {
+            gallery_contents.addView(it)
+        }

-            CoroutineScope(Dispatchers.IO).launch {
-                gallery.related.forEach { galleryID ->
-                    Cache.getInstance(context, galleryID).getGalleryBlock()?.let {
-                        galleries.add(galleryID)
-                    }
+        CoroutineScope(Dispatchers.IO).launch {
+            gallery.related.forEach { galleryID ->
+                Cache.getInstance(context, galleryID).getGalleryBlock()?.let {
+                    galleries.add(galleryID)
                }
+            }

-                withContext(Dispatchers.Main) {
-                    adapter.notifyDataSetChanged()
-                }
+            withContext(Dispatchers.Main) {
+                adapter.notifyDataSetChanged()
            }
        }
    }
--- a/app/src/main/java/xyz/quaver/pupil/ui/dialog/MirrorDialog.kt
+++ b/app/src/main/java/xyz/quaver/pupil/ui/dialog/MirrorDialog.kt
@@ -0,0 +1,91 @@
+/*
+ *     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.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
+import xyz.quaver.pupil.util.Preferences
+
+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 = {
+                    Preferences["mirrors"] = it.joinToString(">")
+                }
+            }
+        }
+    }
+
+}
--- a/app/src/main/java/xyz/quaver/pupil/ui/dialog/ProxyDialogFragment.kt
+++ b/app/src/main/java/xyz/quaver/pupil/ui/dialog/ProxyDialogFragment.kt
@@ -18,60 +18,58 @@

 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.appcompat.app.AlertDialog
-import androidx.fragment.app.DialogFragment
+import kotlinx.android.synthetic.main.dialog_proxy.view.*
 import kotlinx.serialization.encodeToString
 import kotlinx.serialization.json.Json
 import xyz.quaver.pupil.R
 import xyz.quaver.pupil.client
 import xyz.quaver.pupil.clientBuilder
 import xyz.quaver.pupil.clientHolder
-import xyz.quaver.pupil.databinding.ProxyDialogBinding
 import xyz.quaver.pupil.util.Preferences
 import xyz.quaver.pupil.util.ProxyInfo
 import xyz.quaver.pupil.util.getProxyInfo
 import xyz.quaver.pupil.util.proxyInfo
 import java.net.Proxy

-class ProxyDialogFragment : DialogFragment() {
+class ProxyDialog(context: Context) : AlertDialog(context) {

-    private var _binding: ProxyDialogBinding? = null
-    private val binding get() = _binding!!
+    override fun onCreate(savedInstanceState: Bundle?) {
+        setView(build())

-    override fun onCreateDialog(savedInstanceState: Bundle?): Dialog {
-        _binding = ProxyDialogBinding.inflate(layoutInflater)
-
-        initView()
-
-        return AlertDialog.Builder(requireContext()).apply {
-            setView(binding.root)
-        }.create()
+        super.onCreate(savedInstanceState)
    }

-    private fun initView() {
+    @SuppressLint("InflateParams")
+    private fun build() : View {
        val proxyInfo = getProxyInfo()

+        val view = LayoutInflater.from(context).inflate(R.layout.dialog_proxy, null)
+
        val enabler = { enable: Boolean ->
-            binding.addr.isEnabled = enable
-            binding.port.isEnabled = enable
-            binding.username.isEnabled = enable
-            binding.password.isEnabled = enable
+            view?.proxy_addr?.isEnabled = enable
+            view?.proxy_port?.isEnabled = enable
+            view?.proxy_username?.isEnabled = enable
+            view?.proxy_password?.isEnabled = enable

            if (!enable) {
-                binding.addr.text = null
-                binding.port.text = null
-                binding.username.text = null
-                binding.password.text = null
+                view?.proxy_addr?.text = null
+                view?.proxy_port?.text = null
+                view?.proxy_username?.text = null
+                view?.proxy_password?.text = null
            }
        }

-        with(binding.typeSelector) {
+        with(view.proxy_type_selector) {
            adapter = ArrayAdapter(
                context,
                android.R.layout.simple_spinner_dropdown_item,
@@ -89,29 +87,29 @@ class ProxyDialogFragment : DialogFragment() {
            }
        }

-        binding.addr.setText(proxyInfo.host)
-        binding.port.setText(proxyInfo.port?.toString())
-        binding.username.setText(proxyInfo.username)
-        binding.password.setText(proxyInfo.password)
+        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)

-        binding.cancelButton.setOnClickListener {
+        view.proxy_cancel.setOnClickListener {
            dismiss()
        }

-        binding.okButton.setOnClickListener {
-            val type = Proxy.Type.values()[binding.typeSelector.selectedItemPosition]
-            val addr = binding.addr.text?.toString()
-            val port = binding.port.text?.toString()?.toIntOrNull()
-            val username = binding.username.text?.toString()
-            val password = binding.password.text?.toString()
+        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())
-                    binding.addr.error = requireContext().getText(R.string.proxy_dialog_error)
+                    view.proxy_addr.error = context.getText(R.string.proxy_dialog_error)
                if (port == null)
-                    binding.port.error = requireContext().getText(R.string.proxy_dialog_error)
+                    view.proxy_port.error = context.getText(R.string.proxy_dialog_error)

                if (addr == null || addr.isEmpty() || port == null)
                    return@setOnClickListener
@@ -128,6 +126,8 @@ class ProxyDialogFragment : DialogFragment() {

            dismiss()
        }
+
+        return view
    }

 }
--- a/app/src/main/java/xyz/quaver/pupil/ui/fragment/ManageFavoritesFragment.kt
+++ b/app/src/main/java/xyz/quaver/pupil/ui/fragment/ManageFavoritesFragment.kt
@@ -18,72 +18,25 @@

 package xyz.quaver.pupil.ui.fragment

-import android.app.Activity
 import android.content.Intent
-import android.content.res.Resources
-import android.graphics.PorterDuff
-import android.graphics.PorterDuffColorFilter
 import android.os.Bundle
-import android.util.Log
 import android.widget.EditText
 import android.widget.TextView
-import android.widget.Toast
-import androidx.activity.result.contract.ActivityResultContracts
 import androidx.appcompat.app.AlertDialog
 import androidx.core.content.ContextCompat
-import androidx.core.content.FileProvider
-import androidx.core.graphics.drawable.DrawableCompat
 import androidx.preference.Preference
 import androidx.preference.PreferenceFragmentCompat
-import androidx.swiperefreshlayout.widget.CircularProgressDrawable
 import com.google.android.material.snackbar.Snackbar
-import kotlinx.coroutines.MainScope
-import kotlinx.coroutines.launch
-import kotlinx.datetime.LocalDate
-import kotlinx.serialization.json.Json
-import kotlinx.serialization.json.buildJsonObject
-import kotlinx.serialization.json.decodeFromJsonElement
 import okhttp3.*
-import xyz.quaver.io.FileX
-import xyz.quaver.io.util.readText
 import xyz.quaver.pupil.R
 import xyz.quaver.pupil.client
-import xyz.quaver.pupil.favoriteTags
 import xyz.quaver.pupil.favorites
-import xyz.quaver.pupil.types.Tag
-import xyz.quaver.pupil.util.get
 import xyz.quaver.pupil.util.restore
 import java.io.File
 import java.io.IOException
-import kotlin.math.roundToInt

 class ManageFavoritesFragment : PreferenceFragmentCompat() {

-    private val requestBackupFileLauncher = registerForActivityResult(ActivityResultContracts.StartActivityForResult()) { result ->
-        if (result.resultCode != Activity.RESULT_OK) {
-            return@registerForActivityResult
-        }
-
-        val uri = result.data?.data ?: return@registerForActivityResult
-        val context = context ?: return@registerForActivityResult
-        val view = view ?: return@registerForActivityResult
-
-        val backupData = runCatching {
-            FileX(context, uri).readText()?.let { Json.parseToJsonElement(it) }
-        }.getOrNull() ?: run{
-            Snackbar.make(view, context.getString(R.string.error), Toast.LENGTH_LONG).show()
-            return@registerForActivityResult
-        }
-
-        val newFavorites = backupData["favorites"]?.let { Json.decodeFromJsonElement<List<Int>>(it) }.orEmpty()
-        val newFavoriteTags = backupData["favorite_tags"]?.let { Json.decodeFromJsonElement<List<Tag>>(it) }.orEmpty()
-
-        favorites.addAll(newFavorites)
-        favoriteTags.addAll(newFavoriteTags)
-
-        Snackbar.make(view, context.getString(R.string.settings_restore_success, newFavorites.size + newFavoriteTags.size), Snackbar.LENGTH_LONG).show()
-    }
-
    override fun onCreatePreferences(savedInstanceState: Bundle?, rootKey: String?) {
        setPreferencesFromResource(R.xml.manage_favorites_preferences, rootKey)

@@ -94,44 +47,57 @@ class ManageFavoritesFragment : PreferenceFragmentCompat() {
        val context = context ?: return

        findPreference<Preference>("backup")?.setOnPreferenceClickListener {
-            val favorites = runCatching {
-                Json.parseToJsonElement(File(ContextCompat.getDataDir(context), "favorites.json").readText())
-            }.getOrNull()
-            val favoriteTags = kotlin.runCatching {
-                Json.parseToJsonElement(File(ContextCompat.getDataDir(context), "favorites_tags.json").readText())
-            }.getOrNull()
+            val request = Request.Builder()
+                .url(context.getString(R.string.backup_url))
+                .post(
+                    FormBody.Builder()
+                        .add("f:1", File(ContextCompat.getDataDir(context), "favorites.json").readText())
+                        .build()
+                ).build()

-            val favoriteJson = buildJsonObject {
-                favorites?.let {
-                    put("favorites", it)
+            client.newCall(request).enqueue(object: Callback {
+                override fun onFailure(call: Call, e: IOException) {
+                    val view = view ?: return
+                    Snackbar.make(view, R.string.settings_backup_failed, Snackbar.LENGTH_LONG).show()
                }
-                favoriteTags?.let {
-                    put("favorite_tags", it)
+
+                override fun onResponse(call: Call, response: Response) {
+                    if (response.code() != 200) {
+                        response.close()
+                        return
+                    }
+
+                    Intent(Intent.ACTION_SEND).apply {
+                        type = "text/plain"
+                        putExtra(Intent.EXTRA_TEXT, response.body()?.use { it.string() }?.replace("\n", ""))
+                    }.let {
+                        getContext()?.startActivity(Intent.createChooser(it, getString(R.string.settings_backup_share)))
+                    }
                }
-            }
-
-            val backupFile = File(context.filesDir, "pupil-backup.json").also {
-                it.writeText(favoriteJson.toString())
-            }
-
-            Intent(Intent.ACTION_SEND).apply {
-                val uri = FileProvider.getUriForFile(context, "${context.packageName}.provider", backupFile)
-                setDataAndType(uri, "application/json")
-                addFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION)
-                putExtra(Intent.EXTRA_STREAM, uri)
-            }.let {
-                context.startActivity(Intent.createChooser(it, getString(R.string.settings_backup_share)))
-            }
+            })

            true
        }
        findPreference<Preference>("restore")?.setOnPreferenceClickListener {
-            val intent = Intent(Intent.ACTION_OPEN_DOCUMENT).apply {
-                addCategory(Intent.CATEGORY_OPENABLE)
-                type = "*/*"
+            val editText = EditText(context).apply {
+                setText(context.getString(R.string.backup_url), TextView.BufferType.EDITABLE)
            }

-            requestBackupFileLauncher.launch(intent)
+            AlertDialog.Builder(context)
+                .setTitle(R.string.settings_restore_title)
+                .setView(editText)
+                .setPositiveButton(android.R.string.ok) { _, _ ->
+                    restore(editText.text.toString(),
+                        onFailure = onFailure@{
+                            val view = view ?: return@onFailure
+                            Snackbar.make(view, R.string.settings_restore_failed, Snackbar.LENGTH_LONG).show()
+                        }, onSuccess = onSuccess@{
+                            val view = view ?: return@onSuccess
+                            Snackbar.make(view, context.getString(R.string.settings_restore_success, it.size), Snackbar.LENGTH_LONG).show()
+                        })
+                }.setNegativeButton(android.R.string.cancel) { _, _ ->
+                    // Do Nothing
+                }.show()

            true
        }
--- a/app/src/main/java/xyz/quaver/pupil/ui/fragment/ManageStorageFragment.kt
+++ b/app/src/main/java/xyz/quaver/pupil/ui/fragment/ManageStorageFragment.kt
@@ -18,38 +18,22 @@

 package xyz.quaver.pupil.ui.fragment

-import android.graphics.ColorFilter
-import android.graphics.PorterDuff
-import android.graphics.PorterDuffColorFilter
 import android.os.Bundle
-import android.widget.Toast
 import androidx.appcompat.app.AlertDialog
-import androidx.core.content.ContextCompat
 import androidx.preference.Preference
 import androidx.preference.PreferenceFragmentCompat
-import androidx.swiperefreshlayout.widget.CircularProgressDrawable
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.Job
 import kotlinx.coroutines.launch
-import kotlinx.serialization.decodeFromString
-import kotlinx.serialization.encodeToString
-import kotlinx.serialization.json.Json
 import xyz.quaver.io.FileX
-import xyz.quaver.io.SAFileX
 import xyz.quaver.io.util.deleteRecursively
-import xyz.quaver.io.util.getChild
-import xyz.quaver.io.util.readText
-import xyz.quaver.io.util.writeText
 import xyz.quaver.pupil.R
 import xyz.quaver.pupil.histories
-import xyz.quaver.pupil.hitomi.json
 import xyz.quaver.pupil.util.byteToString
 import xyz.quaver.pupil.util.downloader.Cache
 import xyz.quaver.pupil.util.downloader.DownloadManager
-import xyz.quaver.pupil.util.downloader.Metadata
 import java.io.File
-import kotlin.math.roundToInt

 class ManageStorageFragment : PreferenceFragmentCompat(), Preference.OnPreferenceClickListener {

@@ -61,10 +45,12 @@ class ManageStorageFragment : PreferenceFragmentCompat(), Preference.OnPreferenc
        initPreferences()
    }

-    override fun onPreferenceClick(preference: Preference): Boolean {
+    override fun onPreferenceClick(preference: Preference?): Boolean {
        val context = context ?: return false

        with(preference) {
+            this ?: return false
+
            when (key) {
                "delete_cache" -> {
                    val dir = File(context.cacheDir, "imageCache")
@@ -94,48 +80,6 @@ class ManageStorageFragment : PreferenceFragmentCompat(), Preference.OnPreferenc
                        setNegativeButton(android.R.string.cancel) { _, _ -> }
                    }.show()
                }
-                "recover_downloads" -> {
-                    val density = context.resources.displayMetrics.density
-                    this.icon = object: CircularProgressDrawable(context) {
-                        override fun getIntrinsicHeight() = (24*density).roundToInt()
-                        override fun getIntrinsicWidth() = (24*density).roundToInt()
-                    }.apply {
-                        setStyle(CircularProgressDrawable.DEFAULT)
-                        colorFilter = PorterDuffColorFilter(ContextCompat.getColor(context, R.color.colorAccent), PorterDuff.Mode.SRC_IN)
-                        start()
-                    }
-
-                    val downloadManager = DownloadManager.getInstance(context)
-
-                    val downloadFolderMap = downloadManager.downloadFolderMap
-
-                    downloadFolderMap.clear()
-
-                    downloadManager.downloadFolder.listFiles { file -> file.isDirectory }?.forEach { folder ->
-                        val metadataFile = FileX(context, folder, ".metadata")
-
-                        if (!metadataFile.exists()) return@forEach
-
-                        val metadata = metadataFile.readText()?.let {
-                            runCatching {
-                                json.decodeFromString<Metadata>(it)
-                            }.getOrNull()
-                        } ?: return@forEach
-
-                        val galleryID = metadata.galleryBlock?.id ?: metadata.galleryInfo?.id?.toIntOrNull() ?: return@forEach
-
-                        downloadFolderMap[galleryID] = folder.name
-                    }
-
-                    downloadManager.downloadFolderMap.putAll(downloadFolderMap)
-                    val downloads = FileX(context, downloadManager.downloadFolder, ".download")
-
-                    if (!downloads.exists()) downloads.createNewFile()
-                    downloads.writeText(Json.encodeToString(downloadFolderMap))
-
-                    this.icon = null
-                    Toast.makeText(context, android.R.string.ok, Toast.LENGTH_SHORT).show()
-                }
                "delete_downloads" -> {
                    val dir = DownloadManager.getInstance(context).downloadFolder

@@ -150,12 +94,7 @@ class ManageStorageFragment : PreferenceFragmentCompat(), Preference.OnPreferenc
                                }

                                if (dir.exists())
-                                    dir.listFiles()?.forEach {
-                                        when (it) {
-                                            is FileX -> it.deleteRecursively()
-                                            else -> it.deleteRecursively()
-                                        }
-                                    }
+                                    dir.listFiles()?.forEach { (it as? FileX)?.deleteRecursively() }

                                job = launch {
                                    var size = 0L
@@ -247,12 +186,6 @@ class ManageStorageFragment : PreferenceFragmentCompat(), Preference.OnPreferenc

            onPreferenceClickListener = this@ManageStorageFragment
        }
-
-        with(findPreference<Preference>("recover_downloads")) {
-            this ?: return@with
-
-            onPreferenceClickListener = this@ManageStorageFragment
-        }
    }

    override fun onDestroy() {
--- a/app/src/main/java/xyz/quaver/pupil/ui/fragment/PINLockFragment.kt
+++ b/app/src/main/java/xyz/quaver/pupil/ui/fragment/PINLockFragment.kt
@@ -24,34 +24,30 @@ import android.view.View
 import android.view.ViewGroup
 import androidx.fragment.app.Fragment
 import com.andrognito.pinlockview.PinLockListener
-import xyz.quaver.pupil.databinding.PinLockFragmentBinding
+import kotlinx.android.synthetic.main.fragment_pin_lock.view.*
+import xyz.quaver.pupil.R

-class PINLockFragment : Fragment() {
-
-    private var _binding: PinLockFragmentBinding? = null
-    val binding get() = _binding!!
+class PINLockFragment : Fragment(), PinLockListener {

    var onPINEntered: ((String) -> Unit)? = null

-    override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View {
-        _binding = PinLockFragmentBinding.inflate(inflater, container, false)
-
-        binding.pinLockView.attachIndicatorDots(binding.indicatorDots)
-        binding.pinLockView.setPinLockListener(object: PinLockListener {
-            override fun onComplete(p0: String?) {
-                onPINEntered?.invoke(p0 ?: "")
-            }
-
-            override fun onEmpty() {}
-            override fun onPinChange(p0: Int, p1: String?) {}
-        })
-
-        return binding.root
+    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 onDestroy() {
-        super.onDestroy()
-        _binding = null
+    override fun onComplete(pin: String?) {
+        onPINEntered?.invoke(pin!!)
+    }
+
+    override fun onEmpty() {
+
+    }
+
+    override fun onPinChange(pinLength: Int, intermediatePin: String?) {
+
    }

 }
--- a/app/src/main/java/xyz/quaver/pupil/ui/fragment/PatternLockFragment.kt
+++ b/app/src/main/java/xyz/quaver/pupil/ui/fragment/PatternLockFragment.kt
@@ -26,36 +26,38 @@ import androidx.fragment.app.Fragment
 import com.andrognito.patternlockview.PatternLockView
 import com.andrognito.patternlockview.listener.PatternLockViewListener
 import com.andrognito.patternlockview.utils.PatternLockUtils
-import xyz.quaver.pupil.databinding.PatternLockFragmentBinding
+import kotlinx.android.synthetic.main.fragment_pattern_lock.*
+import kotlinx.android.synthetic.main.fragment_pattern_lock.view.*
+import xyz.quaver.pupil.R

-class PatternLockFragment : Fragment() {
-
-    private var _binding: PatternLockFragmentBinding? = null
-    val binding get() = _binding!!
+class PatternLockFragment : Fragment(), PatternLockViewListener {

    var onPatternDrawn: ((String) -> Unit)? = null

    override fun onCreateView(
        inflater: LayoutInflater, container: ViewGroup?,
        savedInstanceState: Bundle?
-    ): View {
-        _binding = PatternLockFragmentBinding.inflate(inflater, container, false)
-        binding.patternLockView.addPatternLockListener(object: PatternLockViewListener {
-            override fun onComplete(pattern: MutableList<PatternLockView.Dot>?) {
-                val password = PatternLockUtils.patternToMD5(binding.patternLockView, pattern)
-                onPatternDrawn?.invoke(password)
-            }
-
-            override fun onCleared() {}
-            override fun onProgress(progressPattern: MutableList<PatternLockView.Dot>?) {}
-            override fun onStarted() {}
-        })
-        return binding.root
+    ): View? {
+        return inflater.inflate(R.layout.fragment_pattern_lock, container, false).apply {
+            lock_pattern_view.addPatternLockListener(this@PatternLockFragment)
+        }
    }

-    override fun onDestroy() {
-        super.onDestroy()
-        _binding = null
+    override fun onCleared() {
+
+    }
+
+    override fun onComplete(pattern: MutableList<PatternLockView.Dot>?) {
+        val password = PatternLockUtils.patternToMD5(lock_pattern_view, pattern)
+        onPatternDrawn?.invoke(password)
+    }
+
+    override fun onProgress(progressPattern: MutableList<PatternLockView.Dot>?) {
+
+    }
+
+    override fun onStarted() {
+
    }

 }
--- a/app/src/main/java/xyz/quaver/pupil/ui/fragment/SettingsFragment.kt
+++ b/app/src/main/java/xyz/quaver/pupil/ui/fragment/SettingsFragment.kt
@@ -26,25 +26,18 @@ import androidx.activity.result.contract.ActivityResultContracts
 import androidx.appcompat.app.AppCompatDelegate
 import androidx.preference.*
 import com.google.android.gms.oss.licenses.OssLicensesMenuActivity
-import com.google.firebase.crashlytics.FirebaseCrashlytics
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
-import okhttp3.Dispatcher
 import xyz.quaver.io.FileX
 import xyz.quaver.io.util.getChild
 import xyz.quaver.pupil.R
-import xyz.quaver.pupil.client
-import xyz.quaver.pupil.clientBuilder
-import xyz.quaver.pupil.clientHolder
-import xyz.quaver.pupil.types.SendLogException
 import xyz.quaver.pupil.ui.LockActivity
 import xyz.quaver.pupil.ui.SettingsActivity
 import xyz.quaver.pupil.ui.dialog.*
 import xyz.quaver.pupil.util.*
 import xyz.quaver.pupil.util.downloader.DownloadManager
 import java.util.*
-import java.util.concurrent.Executors

 class SettingsFragment :
    PreferenceFragmentCompat(),
@@ -80,8 +73,10 @@ class SettingsFragment :
        }
    }

-    override fun onPreferenceClick(preference: Preference): Boolean {
+    override fun onPreferenceClick(preference: Preference?): Boolean {
        with (preference) {
+            this ?: return false
+
            when (key) {
                "app_version" -> {
                    checkUpdate(activity as SettingsActivity, true)
@@ -90,12 +85,12 @@ class SettingsFragment :
                    DownloadLocationDialogFragment().show(parentFragmentManager, "Download Location Dialog")
                }
                "default_query" -> {
-                    DefaultQueryDialog().apply {
+                    DefaultQueryDialog(requireContext()).apply {
                        onPositiveButtonClickListener = { newTags ->
                            Preferences["default_query"] = newTags.toString()
                            summary = newTags.toString()
                        }
-                    }.show(parentFragmentManager, "Default Query Dialog")
+                    }.show()
                }
                "app_lock" -> {
                    val intent = Intent(requireContext(), LockActivity::class.java).apply {
@@ -103,11 +98,15 @@ class SettingsFragment :
                    }
                    lockLauncher.launch(intent)
                }
+                "mirrors" -> {
+                    MirrorDialog(requireContext())
+                        .show()
+                }
                "proxy" -> {
-                    ProxyDialogFragment().show(parentFragmentManager, "Proxy Dialog")
+                    ProxyDialog(requireContext())
+                        .show()
                }
                "user_id" -> {
-                    FirebaseCrashlytics.getInstance().recordException(SendLogException())
                    (context.getSystemService(Context.CLIPBOARD_SERVICE) as ClipboardManager).setPrimaryClip(
                        ClipData.newPlainText("user_id", Preferences.get<String>("user_id"))
                    )
@@ -120,8 +119,10 @@ class SettingsFragment :
        return true
    }

-    override fun onPreferenceChange(preference: Preference, newValue: Any?): Boolean {
+    override fun onPreferenceChange(preference: Preference?, newValue: Any?): Boolean {
        with (preference) {
+            this ?: return false
+
            when (key) {
                "tag_translation" -> {
                    updateTranslations()
@@ -159,7 +160,7 @@ class SettingsFragment :

            when (key) {
                "proxy" -> {
-                    summary = context.let { getProxyInfo().type.name }
+                    summary = context?.let { getProxyInfo().type.name }
                }
                "download_folder" -> {
                    summary = FileX(context, Preferences.get<String>("download_folder")).canonicalPath
@@ -167,18 +168,6 @@ class SettingsFragment :
                "download_folder_name" -> {
                    summary = Preferences["download_folder_name", "[-id-] -title-"]
                }
-                "max_concurrent_download" -> {
-                    val newValue = Preferences.get<String>(key).toIntOrNull() ?: 0
-
-                    if (newValue == 0)
-                        clientBuilder.dispatcher(Dispatcher())
-                    else
-                        clientBuilder.dispatcher((Dispatcher(Executors.newFixedThreadPool(newValue))))
-
-                    clientHolder = null
-                    client
-                }
-                else -> return
            }
        }
    }
@@ -258,11 +247,6 @@ class SettingsFragment :

                            onPreferenceClickListener = this@SettingsFragment
                        }
-                        "proxy" -> {
-                            summary = getProxyInfo().type.name
-
-                            onPreferenceClickListener = this@SettingsFragment
-                        }
                        "tag_translation" -> {
                            this as ListPreference

@@ -284,6 +268,14 @@ class SettingsFragment :
                            onPreferenceChangeListener = this@SettingsFragment

                        }
+                        "mirrors" -> {
+                            onPreferenceClickListener = this@SettingsFragment
+                        }
+                        "proxy" -> {
+                            summary = getProxyInfo().type.name
+
+                            onPreferenceClickListener = this@SettingsFragment
+                        }
                        "dark_mode" -> {
                            onPreferenceChangeListener = this@SettingsFragment
                        }
@@ -296,7 +288,7 @@ class SettingsFragment :
                        }
                        "oss" -> {
                            setOnPreferenceClickListener {
-                                context.startActivity(Intent(context, OssLicensesMenuActivity::class.java))
+                                context?.startActivity(Intent(context, OssLicensesMenuActivity::class.java))
                                true
                            }
                        }
--- a/app/src/main/java/xyz/quaver/pupil/ui/view/FloatingSearchView.kt
+++ b/app/src/main/java/xyz/quaver/pupil/ui/view/FloatingSearchView.kt
@@ -25,7 +25,6 @@ import android.graphics.drawable.Animatable
 import android.text.Editable
 import android.text.TextWatcher
 import android.util.AttributeSet
-import android.util.Log
 import android.view.LayoutInflater
 import android.view.View
 import android.view.inputmethod.EditorInfo
@@ -59,8 +58,8 @@ class FloatingSearchView @JvmOverloads constructor(context: Context, attrs: Attr

        searchInputView.addTextChangedListener(this)
        onSearchListener = this
-        onBindSuggestionCallback = { binding, item, itemPosition ->
-            onBindSuggestion(binding.root, binding.leftIcon, binding.body, item, itemPosition)
+        onBindSuggestionCallback = { a, b, c, d, e ->
+            onBindSuggestion(a, b, c, d, e)
        }
    }

@@ -111,7 +110,7 @@ class FloatingSearchView @JvmOverloads constructor(context: Context, attrs: Attr
    ) {
      when(item) {
            is TagSuggestion -> {
-                val tag = "${item.n}:${item.s}"
+                val tag = "${item.n}:${item.s.replace(Regex("\\s"), "_")}"

                leftIcon?.setImageDrawable(
                    ResourcesCompat.getDrawable(
--- a/app/src/main/java/xyz/quaver/pupil/ui/view/ProgressCard.kt
+++ b/app/src/main/java/xyz/quaver/pupil/ui/view/ProgressCard.kt
@@ -2,14 +2,14 @@ package xyz.quaver.pupil.ui.view

 import android.content.Context
 import android.util.AttributeSet
-import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
 import androidx.cardview.widget.CardView
+import androidx.constraintlayout.widget.ConstraintLayout
 import androidx.core.content.ContextCompat
 import androidx.core.graphics.drawable.DrawableCompat
+import kotlinx.android.synthetic.main.view_progress_card.view.*
 import xyz.quaver.pupil.R
-import xyz.quaver.pupil.databinding.ProgressCardViewBinding

 class ProgressCard @JvmOverloads constructor(context: Context, attr: AttributeSet? = null, defStyle: Int = R.attr.cardViewStyle) : CardView(context, attr, defStyle) {

@@ -29,35 +29,35 @@ class ProgressCard @JvmOverloads constructor(context: Context, attr: AttributeSe
                Type.DOWNLOAD -> R.color.material_green_a700
            }.let {
                val color = ContextCompat.getColor(context, it)
-                DrawableCompat.setTint(binding.progressbar.progressDrawable, color)
+                DrawableCompat.setTint(progressbar.progressDrawable, color)
            }
        }

    var progress: Int
-        get() = binding.progressbar.progress
+        get() = progressbar?.progress ?: 0
        set(value) {
-            binding.progressbar.progress = value
+            progressbar?.progress = value
        }
    var max: Int
-        get() = binding.progressbar.max
+        get() = progressbar?.max ?: 0
        set(value) {
-            binding.progressbar.max = value
+            progressbar?.max = value

-            binding.progressbar.visibility =
+            progressbar.visibility =
                if (value == 0)
                    GONE
                else
                    VISIBLE
        }

-    val binding = ProgressCardViewBinding.inflate(LayoutInflater.from(context), this)
-
    init {
-        binding.content.setOnClickListener {
+        inflate(context, R.layout.view_progress_card, this)
+
+        content.setOnClickListener {
            performClick()
        }

-        binding.content.setOnLongClickListener {
+        content.setOnLongClickListener {
            performLongClick()
        }
    }
@@ -66,7 +66,7 @@ class ProgressCard @JvmOverloads constructor(context: Context, attr: AttributeSe
        if (childCount == 0)
            super.addView(child, index, params)
        else
-            binding.content.addView(child, index, params)
+            content.addView(child, index, params)
    }

 }
--- a/app/src/main/java/xyz/quaver/pupil/util/SavedSet.kt
+++ b/app/src/main/java/xyz/quaver/pupil/util/SavedSet.kt
@@ -18,13 +18,11 @@

 package xyz.quaver.pupil.util

-import com.google.firebase.crashlytics.FirebaseCrashlytics
-import kotlinx.serialization.ExperimentalSerializationApi
-import kotlinx.serialization.KSerializer
+import kotlinx.serialization.*
 import kotlinx.serialization.builtins.ListSerializer
 import kotlinx.serialization.json.Json
-import kotlinx.serialization.serializer
 import java.io.File
+import java.util.*

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

@@ -48,8 +46,6 @@ class SavedSet <T: Any> (private val file: File, private val any: T, private val
            Json.decodeFromString(serializer, file.readText())
        }.onSuccess {
            set.addAll(it)
-        }.onFailure {
-            FirebaseCrashlytics.getInstance().recordException(it)
        }
    }

@@ -61,6 +57,8 @@ class SavedSet <T: Any> (private val file: File, private val any: T, private val

    @Synchronized
    override fun add(element: T): Boolean {
+        load()
+
        set.remove(element)

        return set.add(element).also {
@@ -70,6 +68,8 @@ class SavedSet <T: Any> (private val file: File, private val any: T, private val

    @Synchronized
    override fun addAll(elements: Collection<T>): Boolean {
+        load()
+
        set.removeAll(elements)

        return set.addAll(elements).also {
@@ -79,6 +79,8 @@ class SavedSet <T: Any> (private val file: File, private val any: T, private val

    @Synchronized
    override fun remove(element: T): Boolean {
+        load()
+
        return set.remove(element).also {
            save()
        }
--- a/app/src/main/java/xyz/quaver/pupil/util/downloader/Cache.kt
+++ b/app/src/main/java/xyz/quaver/pupil/util/downloader/Cache.kt
@@ -21,95 +21,39 @@ package xyz.quaver.pupil.util.downloader
 import android.content.Context
 import android.content.ContextWrapper
 import android.net.Uri
-import kotlinx.coroutines.*
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.launch
 import kotlinx.coroutines.sync.Mutex
 import kotlinx.coroutines.sync.withLock
+import kotlinx.coroutines.withContext
 import kotlinx.serialization.Serializable
 import kotlinx.serialization.decodeFromString
 import kotlinx.serialization.encodeToString
 import kotlinx.serialization.json.Json
 import okhttp3.Request
+import xyz.quaver.Code
+import xyz.quaver.hitomi.GalleryBlock
+import xyz.quaver.hitomi.Reader
 import xyz.quaver.io.FileX
 import xyz.quaver.io.util.*
 import xyz.quaver.pupil.client
-import xyz.quaver.pupil.hitomi.*
+import xyz.quaver.pupil.util.Preferences
 import java.io.File
 import java.io.IOException
 import java.util.concurrent.ConcurrentHashMap

-@Serializable
-data class OldReader(
-    val code: String,
-    val galleryInfo: OldGalleryInfo
-)
-
-@Serializable
-data class OldGalleryInfo(
-    val language_localname: String? = null,
-    val language: String? = null,
-    val date: String? = null,
-    val files: List<OldGalleryFiles>,
-    val id: Int? = null,
-    val type: String? = null,
-    val title: String? = null
-)
-
-@Serializable
-data class OldGalleryFiles(
-    val width: Int,
-    val hash: String,
-    val haswebp: Int = 0,
-    val name: String,
-    val height: Int,
-    val hasavif: Int = 0,
-    val hasavifsmalltn: Int? = 0
-)
-
-@Serializable
-data class OldMetadata(
-    var galleryBlock: GalleryBlock? = null,
-    var reader: OldReader? = null,
-    var imageList: MutableList<String?>? = null
-) {
-    fun copy(): OldMetadata = OldMetadata(galleryBlock, reader, imageList?.let { MutableList(it.size) { i -> it[i] } })
-}
-
@Serializable
 data class Metadata(
    var galleryBlock: GalleryBlock? = null,
-    var galleryInfo: GalleryInfo? = null,
+    var reader: Reader? = null,
    var imageList: MutableList<String?>? = null
 ) {
-    constructor(old: OldMetadata) : this(
-        old.galleryBlock,
-        old.reader?.galleryInfo?.let { oldGalleryInfo ->
-            GalleryInfo(
-                oldGalleryInfo.id.toString(),
-                oldGalleryInfo.title ?: "",
-                null,
-                oldGalleryInfo.language,
-                oldGalleryInfo.type ?: "",
-                oldGalleryInfo.date ?: "",
-                files = oldGalleryInfo.files.map {
-                    GalleryFiles(
-                        it.width,
-                        it.hash,
-                        it.haswebp,
-                        it.name,
-                        it.height,
-                        it.hasavif,
-                        it.hasavifsmalltn
-                    )
-                }
-            )
-        },
-        old.imageList
-    )
-
-    fun copy(): Metadata = Metadata(galleryBlock, galleryInfo, imageList?.let { MutableList(it.size) { i -> it[i] } })
+    fun copy(): Metadata = Metadata(galleryBlock, reader, imageList?.let { MutableList(it.size) { i -> it[i] } })
 }

 class Cache private constructor(context: Context, val galleryID: Int) : ContextWrapper(context) {
+
    companion object {
        val instances = ConcurrentHashMap<Int, Cache>()

@@ -130,14 +74,10 @@ class Cache private constructor(context: Context, val galleryID: Int) : ContextW
    }

    var metadata = kotlin.runCatching {
-        findFile(".metadata")?.readText()?.let { metadata ->
-            kotlin.runCatching {
-                Json.decodeFromString<Metadata>(metadata)
-            }.getOrElse {
-                Metadata(json.decodeFromString<OldMetadata>(metadata))
-            }
+        findFile(".metadata")?.readText()?.let {
+            Json.decodeFromString<Metadata>(it)
        }
-    }.onFailure { it.printStackTrace() }.getOrNull() ?: Metadata()
+    }.getOrNull() ?: Metadata()

    val downloadFolder: FileX?
        get() = DownloadManager.getInstance(this).getDownloadFolder(galleryID)
@@ -170,13 +110,27 @@ class Cache private constructor(context: Context, val galleryID: Int) : ContextW
    }

    suspend fun getGalleryBlock(): GalleryBlock? {
+        val sources = listOf(
+            { xyz.quaver.hitomi.getGalleryBlock(galleryID) },
+            { xyz.quaver.hiyobi.getGalleryBlock(galleryID) }
+        )
+
        return metadata.galleryBlock
            ?: withContext(Dispatchers.IO) {
-                try {
-                    getGalleryBlock(galleryID).also {
-                        setMetadata { metadata -> metadata.galleryBlock = it }
-                    }
-                } catch (e: Exception) { return@withContext null }
+                var galleryBlock: GalleryBlock? = null
+
+                for (source in sources) {
+                    galleryBlock = try {
+                        source.invoke()
+                    } catch (e: Exception) { null }
+
+                    if (galleryBlock != null)
+                        break
+                }
+
+                galleryBlock?.also {
+                    setMetadata { metadata -> metadata.galleryBlock = it }
+                }
            }
    }

@@ -187,7 +141,6 @@ class Cache private constructor(context: Context, val galleryID: Int) : ContextW
                kotlin.runCatching {
                    val request = Request.Builder()
                        .url(it)
-                        .header("Referer", "https://hitomi.la/")
                        .build()

                    client.newCall(request).execute().also { if (it.code() != 200) throw IOException() }.body()?.use { it.bytes() }
@@ -201,21 +154,41 @@ class Cache private constructor(context: Context, val galleryID: Int) : ContextW
                }.getOrNull()?.uri }
            } } ?: Uri.EMPTY

-    suspend fun getGalleryInfo(): GalleryInfo? {
+    suspend fun getReader(): Reader? {
+        val mirrors = Preferences.get<String>("mirrors").let { if (it.isEmpty()) emptyList() else it.split('>') }

-        return metadata.galleryInfo
+        val sources = mapOf(
+            Code.HITOMI to { xyz.quaver.hitomi.getReader(galleryID) },
+            Code.HIYOBI to { xyz.quaver.hiyobi.getReader(galleryID) }
+        ).let {
+            if (mirrors.isNotEmpty())
+                it.toSortedMap{ o1, o2 -> mirrors.indexOf(o1.name) - mirrors.indexOf(o2.name) }
+            else
+                it
+        }
+
+        return metadata.reader
            ?: withContext(Dispatchers.IO) {
-                try {
-                    getGalleryInfo(galleryID).also {
-                        setMetadata { metadata ->
-                            metadata.galleryInfo = it
+                var reader: Reader? = null

-                            if (metadata.imageList == null)
-                                metadata.imageList = MutableList(it.files.size) { null }
-                        }
+                for (source in sources) {
+                    reader = try {
+                        source.value.invoke()
+                    } catch (e: Exception) {
+                        null
+                    }
+
+                   if (reader != null)
+                       break
+                }
+
+                reader?.also {
+                    setMetadata { metadata ->
+                        metadata.reader = it
+
+                        if (metadata.imageList == null)
+                            metadata.imageList = MutableList(reader.galleryInfo.files.size) { null }
                    }
-                } catch (e: Exception) {
-                    null
                }
            }
    }
@@ -224,12 +197,11 @@ class Cache private constructor(context: Context, val galleryID: Int) : ContextW
        metadata.imageList?.getOrNull(index)?.let { findFile(it) }

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

        if (!file.exists())
            file.createNewFile()
-
        file.writeBytes(data)
        setMetadata { metadata -> metadata.imageList!![index] = fileName }
    }
--- a/app/src/main/java/xyz/quaver/pupil/util/downloader/DownloadManager.kt
+++ b/app/src/main/java/xyz/quaver/pupil/util/downloader/DownloadManager.kt
@@ -20,9 +20,8 @@ package xyz.quaver.pupil.util.downloader

 import android.content.Context
 import android.content.ContextWrapper
-import kotlinx.coroutines.CoroutineScope
-import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.launch
+import android.util.Log
+import kotlinx.coroutines.runBlocking
 import kotlinx.serialization.decodeFromString
 import kotlinx.serialization.encodeToString
 import kotlinx.serialization.json.Json
@@ -48,12 +47,14 @@ class DownloadManager private constructor(context: Context) : ContextWrapper(con
    val defaultDownloadFolder = FileX(this, getExternalFilesDir(null)!!)

    val downloadFolder: FileX
-        get() = kotlin.runCatching {
-            FileX(this, Preferences.get<String>("download_folder"))
-        }.getOrElse {
-            Preferences["download_folder"] = defaultDownloadFolder.uri.toString()
-            defaultDownloadFolder
-        }
+        get() = {
+            kotlin.runCatching {
+                FileX(this, Preferences.get<String>("download_folder"))
+            }.getOrElse {
+                Preferences["download_folder"] = defaultDownloadFolder.uri.toString()
+                defaultDownloadFolder
+            }
+        }.invoke()

    private var prevDownloadFolder: FileX? = null
    private var downloadFolderMapInstance: MutableMap<Int, String>? = null
@@ -62,19 +63,21 @@ class DownloadManager private constructor(context: Context) : ContextWrapper(con
        get() {
            if (prevDownloadFolder != downloadFolder) {
                prevDownloadFolder = downloadFolder
-                downloadFolderMapInstance = run {
+                downloadFolderMapInstance = {
                    val file = downloadFolder.getChild(".download")
+
                    val data = if (file.exists())
                        kotlin.runCatching {
-                            file.readText()?.let{ Json.decodeFromString<MutableMap<Int, String>>(it) }
+                            file.readText()?.let { Json.decodeFromString<MutableMap<Int, String>>(it) }
                        }.onFailure { file.delete() }.getOrNull()
                    else
                        null
-                    data ?: run {
+
+                    data ?: {
                        file.createNewFile()
-                        mutableMapOf()
-                    }
-                }
+                        mutableMapOf<Int, String>()
+                    }.invoke()
+                }.invoke()
            }

            return downloadFolderMapInstance ?: mutableMapOf()
@@ -83,7 +86,7 @@ class DownloadManager private constructor(context: Context) : ContextWrapper(con

    @Synchronized
    fun isDownloading(galleryID: Int): Boolean {
-        val isThisGallery: (Call) -> Boolean = { !it.isCanceled && (it.request().tag() as? DownloadService.Tag)?.galleryID == galleryID }
+        val isThisGallery: (Call) -> Boolean = { (it.request().tag() as? DownloadService.Tag)?.galleryID == galleryID }

        return downloadFolderMap.containsKey(galleryID)
                && client.dispatcher().let { it.queuedCalls().any(isThisGallery) || it.runningCalls().any(isThisGallery) }
@@ -93,19 +96,23 @@ class DownloadManager private constructor(context: Context) : ContextWrapper(con
    fun getDownloadFolder(galleryID: Int): FileX? =
        downloadFolderMap[galleryID]?.let { downloadFolder.getChild(it) }

-    fun addDownloadFolder(galleryID: Int) = CoroutineScope(Dispatchers.IO).launch {
-        val name = Cache.getInstance(this@DownloadManager, galleryID).getGalleryBlock()
-            ?.formatDownloadFolder() ?: return@launch
+    @Synchronized
+    fun addDownloadFolder(galleryID: Int) {
+        val name = runBlocking {
+            Cache.getInstance(this@DownloadManager, galleryID).getGalleryBlock()
+        }?.formatDownloadFolder() ?: return

        val folder = downloadFolder.getChild(name)

-        downloadFolderMap[galleryID] = name
+        if (folder.exists())
+            return
+
+        folder.mkdir()
+
+        downloadFolderMap[galleryID] = folder.name

        downloadFolder.getChild(".download").let { if (!it.exists()) it.createNewFile() }
        downloadFolder.getChild(".download").writeText(Json.encodeToString(downloadFolderMap))
-
-        if (folder.exists()) return@launch
-        folder.mkdir()
    }

    @Synchronized
--- a/app/src/main/java/xyz/quaver/pupil/util/misc.kt
+++ b/app/src/main/java/xyz/quaver/pupil/util/misc.kt
@@ -18,24 +18,20 @@

 package xyz.quaver.pupil.util

-import android.Manifest
 import android.annotation.SuppressLint
-import android.app.Activity
 import android.content.Context
-import android.content.pm.PackageManager
+import android.content.Intent
 import android.os.Build
-import androidx.activity.result.ActivityResultLauncher
-import androidx.appcompat.app.AlertDialog
-import androidx.core.app.ActivityCompat
 import androidx.core.content.ContextCompat
-import com.google.firebase.crashlytics.FirebaseCrashlytics
 import kotlinx.serialization.json.*
 import okhttp3.OkHttpClient
 import okhttp3.Request
-import xyz.quaver.pupil.R
-import xyz.quaver.pupil.hitomi.GalleryBlock
-import xyz.quaver.pupil.hitomi.GalleryInfo
-import xyz.quaver.pupil.hitomi.imageUrlFromImage
+import xyz.quaver.Code
+import xyz.quaver.hitomi.GalleryBlock
+import xyz.quaver.hitomi.Reader
+import xyz.quaver.hitomi.getReferer
+import xyz.quaver.hitomi.imageUrlFromImage
+import xyz.quaver.hiyobi.createImgList
 import java.util.*
 import kotlin.collections.ArrayList

@@ -45,7 +41,7 @@ fun String.wordCapitalize() : String {

    @SuppressLint("DefaultLocale")
    for (word in this.split(" "))
-        result.add(word.replaceFirstChar { if (it.isLowerCase()) it.titlecase(Locale.US) else it.toString() })
+        result.add(word.capitalize(Locale.US))

    return result.joinToString(" ")
 }
@@ -87,8 +83,7 @@ fun OkHttpClient.Builder.proxyInfo(proxyInfo: ProxyInfo) = this.apply {
 val formatMap = mapOf<String, GalleryBlock.() -> (String)>(
    "-id-" to { id.toString() },
    "-title-" to { title },
-    "-artist-" to { if (artists.isNotEmpty()) artists.joinToString() else "N/A" },
-    "-group-" to { if (groups.isNotEmpty()) groups.joinToString() else "N/A" }
+    "-artist-" to { artists.joinToString() }
    // TODO
 )
 /**
@@ -108,22 +103,27 @@ fun GalleryBlock.formatDownloadFolderTest(format: String): String =
        }
    }.replace(Regex("""[*\\|"?><:/]"""), "").ellipsize(127)

-suspend fun GalleryInfo.getRequestBuilders(): List<Request.Builder> {
-    val galleryID = this.id.toIntOrNull() ?: 0
-    return this.files.map {
-        Request.Builder()
-            .url(
-                runCatching {
-                    imageUrlFromImage(galleryID, it, false)
+val Reader.requestBuilders: List<Request.Builder>
+    get() {
+        val galleryID = this.galleryInfo.id ?: 0
+        val lowQuality = Preferences["low_quality", true]
+
+        return when(code) {
+            Code.HITOMI -> {
+                this.galleryInfo.files.map {
+                    Request.Builder()
+                        .url(imageUrlFromImage(galleryID, it, !lowQuality))
+                        .header("Referer", getReferer(galleryID))
                }
-                .onFailure {
-                    FirebaseCrashlytics.getInstance().recordException(it)
+            }
+            Code.HIYOBI -> {
+                createImgList(galleryID, this, lowQuality).map {
+                    Request.Builder()
+                        .url(it.path)
                }
-                .getOrDefault("https://a/")
-            )
-            .header("Referer", "https://hitomi.la/")
+            }
+        }
    }
-}

 fun String.ellipsize(n: Int): String =
    if (this.length > n)
@@ -137,36 +137,5 @@ operator fun JsonElement.get(index: Int) =
 operator fun JsonElement.get(tag: String) =
    this.jsonObject[tag]

-fun JsonElement.getOrNull(tag: String) = kotlin.runCatching {
-    this.jsonObject.getOrDefault(tag, null)
-}.getOrNull()
-
 val JsonElement.content
-    get() = this.jsonPrimitive.contentOrNull
-
-fun checkNotificationEnabled(context: Context) =
-    Build.VERSION.SDK_INT < Build.VERSION_CODES.TIRAMISU ||
-    ContextCompat.checkSelfPermission(context, Manifest.permission.POST_NOTIFICATIONS) == PackageManager.PERMISSION_GRANTED
-
-fun showNotificationPermissionExplanationDialog(context: Context) {
-    AlertDialog.Builder(context)
-        .setTitle(R.string.warning)
-        .setMessage(R.string.notification_denied)
-        .setPositiveButton(android.R.string.ok) { _, _ -> }
-        .show()
-}
-
-fun requestNotificationPermission(
-    activity: Activity,
-    requestPermissionLauncher: ActivityResultLauncher<String>,
-    showRationale: Boolean = true,
-    ifGranted: () -> Unit,
-) {
-    when {
-        checkNotificationEnabled(activity) -> ifGranted()
-        showRationale && ActivityCompat.shouldShowRequestPermissionRationale(activity, Manifest.permission.POST_NOTIFICATIONS) ->
-            showNotificationPermissionExplanationDialog(activity)
-        else ->
-            requestPermissionLauncher.launch(Manifest.permission.POST_NOTIFICATIONS)
-    }
-}
+    get() = this.jsonPrimitive.contentOrNull
--- a/app/src/main/java/xyz/quaver/pupil/util/update.kt
+++ b/app/src/main/java/xyz/quaver/pupil/util/update.kt
@@ -18,23 +18,49 @@

 package xyz.quaver.pupil.util

+import android.annotation.SuppressLint
 import android.app.DownloadManager
+import android.app.PendingIntent
+import android.content.BroadcastReceiver
 import android.content.Context
+import android.content.Intent
+import android.content.IntentFilter
 import android.net.Uri
+import android.util.Base64
 import android.webkit.URLUtil
 import androidx.appcompat.app.AlertDialog
+import androidx.core.app.NotificationCompat
+import androidx.core.app.NotificationManagerCompat
 import androidx.preference.PreferenceManager
+import com.google.firebase.crashlytics.FirebaseCrashlytics
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.Job
 import kotlinx.coroutines.launch
+import kotlinx.serialization.decodeFromString
+import kotlinx.serialization.encodeToString
 import kotlinx.serialization.json.*
 import okhttp3.Call
 import okhttp3.Callback
 import okhttp3.Request
 import okhttp3.Response
 import ru.noties.markwon.Markwon
-import xyz.quaver.pupil.*
-import xyz.quaver.pupil.types.Tag
+import xyz.quaver.hitomi.GalleryBlock
+import xyz.quaver.hitomi.Reader
+import xyz.quaver.hitomi.getGalleryBlock
+import xyz.quaver.hitomi.getReader
+import xyz.quaver.io.FileX
+import xyz.quaver.io.util.getChild
+import xyz.quaver.io.util.readText
+import xyz.quaver.io.util.writeBytes
+import xyz.quaver.io.util.writeText
+import xyz.quaver.pupil.BuildConfig
+import xyz.quaver.pupil.R
+import xyz.quaver.pupil.client
+import xyz.quaver.pupil.favorites
+import xyz.quaver.pupil.services.DownloadService
+import xyz.quaver.pupil.util.downloader.Cache
+import xyz.quaver.pupil.util.downloader.Metadata
 import java.io.File
 import java.io.IOException
 import java.net.URL
@@ -135,11 +161,6 @@ fun checkUpdate(context: Context, force: Boolean = false) {
            val msg = extractReleaseNote(update, Locale.getDefault())
            setMessage(Markwon.create(context).toMarkdown(msg))
            setPositiveButton(android.R.string.ok) { _, _ ->
-                if (!checkNotificationEnabled(context)) {
-                    showNotificationPermissionExplanationDialog(context)
-                    return@setPositiveButton
-                }
-
                val downloadManager = context.getSystemService(Context.DOWNLOAD_SERVICE) as DownloadManager

                //Cancel any download queued before
@@ -161,10 +182,10 @@ fun checkUpdate(context: Context, force: Boolean = false) {
                    Preferences["update_download_id"] = it
                }
            }
-            setNegativeButton(if (force) android.R.string.cancel else R.string.ignore) { _, _ ->
+            setNegativeButton(if (force) android.R.string.cancel else R.string.ignore_update) { _, _ ->
                if (!force)
                    preferences.edit()
-                        .putLong("ignore_update_until", System.currentTimeMillis() + 86400000)
+                        .putLong("ignore_update_until", System.currentTimeMillis() + 604800000)
                        .apply()
            }
        }
@@ -175,7 +196,7 @@ fun checkUpdate(context: Context, force: Boolean = false) {
    }
 }

-fun restore(url: String, onFailure: ((Throwable) -> Unit)? = null, onSuccess: ((Int) -> Unit)? = null) {
+fun restore(url: String, onFailure: ((Throwable) -> Unit)? = null, onSuccess: ((List<Int>) -> Unit)? = null) {
    if (!URLUtil.isValidUrl(url)) {
        onFailure?.invoke(IllegalArgumentException())
        return
@@ -193,22 +214,134 @@ fun restore(url: String, onFailure: ((Throwable) -> Unit)? = null, onSuccess: ((

        override fun onResponse(call: Call, response: Response) {
            kotlin.runCatching {
-                val data = Json.parseToJsonElement(response.also { if (it.code() != 200) throw IOException() }.body().use { it?.string() } ?: "[]")
-
-                when (data) {
-                    is JsonArray -> favorites.addAll(data.map { it.jsonPrimitive.int })
-                    is JsonObject -> {
-                        val newFavorites = data["favorites"]?.let { Json.decodeFromJsonElement<List<Int>>(it) }.orEmpty()
-                        val newFavoriteTags = data["favorite_tags"]?.let { Json.decodeFromJsonElement<List<Tag>>(it) }.orEmpty()
-
-                        favorites.addAll(newFavorites)
-                        favoriteTags.addAll(newFavoriteTags)
-
-                        onSuccess?.invoke(favorites.size + favoriteTags.size)
-                    }
-                    else -> error("data is neither JsonArray or JsonObject")
+                Json.decodeFromString<List<Int>>(response.also { if (it.code() != 200) throw IOException() }.body().use { it?.string() } ?: "[]").let {
+                    favorites.addAll(it)
+                    onSuccess?.invoke(it)
                }
            }.onFailure { onFailure?.invoke(it) }
        }
    })
+}
+
+private var job: Job? = null
+private val receiver = object: BroadcastReceiver() {
+    val ACTION_CANCEL = "ACTION_IMPORT_CANCEL"
+    override fun onReceive(context: Context?, intent: Intent?) {
+        context ?: return
+
+        when (intent?.action) {
+            ACTION_CANCEL -> {
+                job?.cancel()
+                NotificationManagerCompat.from(context).cancel(R.id.notification_id_import)
+                context.unregisterReceiver(this)
+            }
+        }
+    }
+}
+@SuppressLint("RestrictedApi")
+fun xyz.quaver.pupil.util.downloader.DownloadManager.migrate() {
+    registerReceiver(receiver, IntentFilter().apply { addAction(receiver.ACTION_CANCEL) })
+
+    val notificationManager = NotificationManagerCompat.from(this)
+    val action = NotificationCompat.Action.Builder(0, getText(android.R.string.cancel),
+        PendingIntent.getBroadcast(this, R.id.notification_import_cancel_action.normalizeID(), Intent(receiver.ACTION_CANCEL), PendingIntent.FLAG_UPDATE_CURRENT)
+    ).build()
+    val notification = NotificationCompat.Builder(this, "import")
+        .setContentTitle(getText(R.string.import_old_galleries_notification))
+        .setProgress(0, 0, true)
+        .addAction(action)
+        .setSmallIcon(R.drawable.ic_notification)
+        .setOngoing(true)
+
+    DownloadService.cancel(this)
+
+    job?.cancel()
+    job = CoroutineScope(Dispatchers.IO).launch {
+        val images = listOf(
+            "jpg",
+            "png",
+            "gif",
+            "webp"
+        )
+
+        val downloadFolders = downloadFolder.listFiles { folder ->
+            folder.isDirectory && !downloadFolderMap.values.contains(folder.name)
+        }?.map {
+            if (it !is FileX)
+                FileX(this@migrate, it)
+            else
+                it
+        }
+
+        if (downloadFolders.isNullOrEmpty()) return@launch
+
+        downloadFolders.forEachIndexed { index, folder ->
+            notification
+                .setContentText(getString(R.string.import_old_galleries_notification_text, index, downloadFolders.size))
+                .setProgress(index, downloadFolders.size, false)
+            notificationManager.notify(R.id.notification_id_import, notification.build())
+
+            val metadata = kotlin.runCatching {
+                folder.getChild(".metadata").readText()?.let { Json.parseToJsonElement(it) }
+            }.getOrNull()
+
+            val galleryID = metadata?.get("reader")?.get("galleryInfo")?.get("id")?.content?.toIntOrNull()
+                ?: folder.name.toIntOrNull() ?: return@forEachIndexed
+
+            val galleryBlock: GalleryBlock? = kotlin.runCatching {
+                metadata?.get("galleryBlock")?.let { Json.decodeFromJsonElement<GalleryBlock>(it) }
+            }.getOrNull() ?: kotlin.runCatching {
+                getGalleryBlock(galleryID)
+            }.getOrNull() ?: kotlin.runCatching {
+                xyz.quaver.hiyobi.getGalleryBlock(galleryID)
+            }.getOrNull()
+
+            val reader: Reader? = kotlin.runCatching {
+                metadata?.get("reader")?.let { Json.decodeFromJsonElement<Reader>(it) }
+            }.getOrNull() ?: kotlin.runCatching {
+                getReader(galleryID)
+            }.getOrNull() ?: kotlin.runCatching {
+                xyz.quaver.hiyobi.getReader(galleryID)
+            }.getOrNull()
+
+            metadata?.get("thumbnail")?.jsonPrimitive?.contentOrNull?.also { thumbnail ->
+                val file = folder.getChild(".thumbnail").also {
+                    if (it.exists())
+                        it.delete()
+                    it.createNewFile()
+                }
+
+                file.writeBytes(Base64.decode(thumbnail, Base64.DEFAULT))
+            }
+
+            val list: MutableList<String?> =
+                MutableList(reader!!.galleryInfo.files.size) { null }
+
+            folder.list { _, name ->
+                name?.substringAfterLast('.') in images
+            }?.sorted()?.take(list.size)?.forEachIndexed { i, name ->
+                list[i] = name
+            }
+
+            folder.getChild(".metadata").also { if (it.exists()) it.delete(); it.createNewFile() }.writeText(
+                Json.encodeToString(Metadata(galleryBlock, reader, list))
+            )
+
+            Cache.delete(this@migrate, galleryID)
+            downloadFolderMap[galleryID] = folder.name
+
+            downloadFolder.getChild(".download").let { if (!it.exists()) it.createNewFile(); it.writeText(Json.encodeToString(downloadFolderMap)) }
+        }
+
+        notification
+            .setContentText(getText(R.string.import_old_galleries_notification_done))
+            .setProgress(0, 0, false)
+            .setOngoing(false)
+            .mActions.clear()
+        notificationManager.notify(R.id.notification_id_import, notification.build())
+
+        kotlin.runCatching {
+            unregisterReceiver(receiver)
+        }
+    }
 }
--- a/app/src/main/res/drawable/ic_hiyobi.png
+++ b/app/src/main/res/drawable/ic_hiyobi.png
--- a/app/src/main/res/layout/activity_lock.xml
+++ b/app/src/main/res/layout/activity_lock.xml
@@ -41,7 +41,7 @@
        app:layout_constraintBottom_toTopOf="@id/lock_button_layout">

        <com.google.android.material.floatingactionbutton.FloatingActionButton
-            android:id="@+id/fingerprint_btn"
+            android:id="@+id/lock_fingerprint"
            android:layout_width="wrap_content"
            android:layout_height="wrap_content"
            app:srcCompat="@drawable/fingerprint"
@@ -64,7 +64,7 @@
        android:gravity="center">

        <com.google.android.material.floatingactionbutton.FloatingActionButton
-            android:id="@+id/pattern_btn"
+            android:id="@+id/lock_pattern"
            android:layout_width="wrap_content"
            android:layout_height="wrap_content"
            app:tint="@null"
@@ -73,7 +73,7 @@
            app:fabSize="mini"/>

        <com.google.android.material.floatingactionbutton.FloatingActionButton
-            android:id="@+id/pin_btn"
+            android:id="@+id/lock_pin"
            android:layout_width="wrap_content"
            android:layout_height="wrap_content"
            app:tint="@null"
@@ -84,7 +84,7 @@
            app:fabSize="mini"/>

        <com.google.android.material.floatingactionbutton.FloatingActionButton
-            android:id="@+id/password_btn"
+            android:id="@+id/lock_password"
            android:layout_width="wrap_content"
            android:layout_height="wrap_content"
            app:tint="@null"
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -21,18 +21,17 @@
 	xmlns:android="http://schemas.android.com/apk/res/android"
 	xmlns:app="http://schemas.android.com/apk/res-auto"
 	xmlns:tools="http://schemas.android.com/tools"
-	android:id="@+id/drawer"
+	android:id="@+id/main_drawer_layout"
 	android:layout_width="match_parent"
 	android:layout_height="match_parent"
 	tools:openDrawer="start">

-	<include android:id="@+id/contents"
-		layout="@layout/main_activity_content"
+	<include layout="@layout/activity_main_content"
 		android:layout_width="match_parent"
 		android:layout_height="match_parent"/>

 	<com.google.android.material.navigation.NavigationView
-		android:id="@+id/nav_view"
+		android:id="@+id/main_nav_view"
 		android:layout_width="wrap_content"
 		android:layout_height="match_parent"
 		android:layout_gravity="start"
--- a/app/src/main/res/layout/activity_main_content.xml
+++ b/app/src/main/res/layout/activity_main_content.xml
@@ -25,7 +25,7 @@
    tools:context=".ui.MainActivity">

    <xyz.quaver.pupil.ui.view.MainView
-        android:id="@+id/view"
+        android:id="@+id/main_view"
        android:layout_width="match_parent"
        android:layout_height="match_parent">

@@ -43,7 +43,7 @@
            app:popupDrawable="@android:color/transparent">

            <androidx.recyclerview.widget.RecyclerView
-                android:id="@+id/recyclerview"
+                android:id="@+id/main_recyclerview"
                android:layout_width="match_parent"
                android:layout_height="match_parent"
                android:paddingTop="64dp"
@@ -56,14 +56,14 @@

    <androidx.core.widget.ContentLoadingProgressBar
        style="?android:attr/progressBarStyle"
-        android:id="@+id/progressbar"
+        android:id="@+id/main_progressbar"
        android:layout_width="wrap_content"
        android:layout_height="wrap_content"
        android:layout_gravity="center"
        android:indeterminate="true"/>

    <TextView
-        android:id="@+id/noresult"
+        android:id="@+id/main_noresult"
        android:layout_width="wrap_content"
        android:layout_height="wrap_content"
        android:layout_gravity="center"
@@ -72,7 +72,7 @@
        android:visibility="invisible"/>

    <com.github.clans.fab.FloatingActionMenu
-        android:id="@+id/fab"
+        android:id="@+id/main_fab"
        android:layout_width="wrap_content"
        android:layout_height="wrap_content"
        android:layout_gravity="bottom|end"
@@ -80,28 +80,28 @@
        app:menu_colorNormal="@color/colorAccent">

        <com.github.clans.fab.FloatingActionButton
-            android:id="@+id/cancel_fab"
+            android:id="@+id/main_fab_cancel"
            android:layout_width="wrap_content"
            android:layout_height="wrap_content"
            app:fab_label="@string/main_fab_cancel"
            app:fab_size="mini"/>

        <com.github.clans.fab.FloatingActionButton
-            android:id="@+id/jump_fab"
+            android:id="@+id/main_fab_jump"
            android:layout_width="wrap_content"
            android:layout_height="wrap_content"
            app:fab_label="@string/main_jump_title"
            app:fab_size="mini"/>

        <com.github.clans.fab.FloatingActionButton
-            android:id="@+id/random_fab"
+            android:id="@+id/main_fab_random"
            android:layout_width="wrap_content"
            android:layout_height="wrap_content"
            app:fab_label="@string/main_fab_random"
            app:fab_size="mini"/>

        <com.github.clans.fab.FloatingActionButton
-            android:id="@+id/id_fab"
+            android:id="@+id/main_fab_id"
            android:layout_width="wrap_content"
            android:layout_height="wrap_content"
            app:fab_label="@string/main_open_gallery_by_id"
@@ -110,7 +110,7 @@
    </com.github.clans.fab.FloatingActionMenu>

    <xyz.quaver.pupil.ui.view.FloatingSearchView
-        android:id="@+id/searchview"
+        android:id="@+id/main_searchview"
        android:layout_width="match_parent"
        android:layout_height="match_parent"
        app:searchBarMarginLeft="6dp"
--- a/app/src/main/res/layout/activity_reader.xml
+++ b/app/src/main/res/layout/activity_reader.xml
@@ -18,6 +18,7 @@
  -->

 <androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/reader_layout"
    xmlns:app="http://schemas.android.com/apk/res-auto"
    xmlns:tools="http://schemas.android.com/tools"
    android:layout_width="match_parent"
@@ -39,7 +40,7 @@
        app:popupDrawable="@android:color/transparent">

        <androidx.recyclerview.widget.RecyclerView
-            android:id="@+id/recyclerview"
+            android:id="@+id/reader_recyclerview"
            android:layout_width="match_parent"
            android:layout_height="match_parent"
            app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"/>
@@ -55,13 +56,13 @@
        android:layout_margin="8dp"/>

    <ProgressBar
-        android:id="@+id/download_progressbar"
+        android:id="@+id/reader_download_progressbar"
        style="@style/Widget.AppCompat.ProgressBar.Horizontal"
        android:layout_width="match_parent"
        android:layout_height="4dp"/>
    
    <com.github.clans.fab.FloatingActionMenu
-        android:id="@+id/fab"
+        android:id="@+id/reader_fab"
        android:layout_width="wrap_content"
        android:layout_height="wrap_content"
        android:layout_gravity="bottom|end"
@@ -69,7 +70,7 @@
        app:menu_colorNormal="@color/colorAccent">

        <com.github.clans.fab.FloatingActionButton
-            android:id="@+id/download_fab"
+            android:id="@+id/reader_fab_download"
            android:layout_width="wrap_content"
            android:layout_height="wrap_content"
            app:srcCompat="@drawable/ic_download"
@@ -77,7 +78,7 @@
            app:fab_size="mini"/>

        <com.github.clans.fab.FloatingActionButton
-            android:id="@+id/retry_fab"
+            android:id="@+id/reader_fab_retry"
            android:layout_width="wrap_content"
            android:layout_height="wrap_content"
            app:srcCompat="@drawable/refresh"
@@ -85,7 +86,7 @@
            app:fab_size="mini"/>

        <com.github.clans.fab.FloatingActionButton
-            android:id="@+id/auto_fab"
+            android:id="@+id/reader_fab_auto"
            android:layout_width="wrap_content"
            android:layout_height="wrap_content"
            app:srcCompat="@drawable/eye_white"
@@ -93,7 +94,7 @@
            app:fab_size="mini"/>

        <com.github.clans.fab.FloatingActionButton
-            android:id="@+id/fullscreen_fab"
+            android:id="@+id/reader_fab_fullscreen"
            android:layout_width="wrap_content"
            android:layout_height="wrap_content"
            app:srcCompat="@drawable/ic_fullscreen"
--- a/app/src/main/res/layout/dialog_default_query.xml
+++ b/app/src/main/res/layout/dialog_default_query.xml
@@ -28,7 +28,7 @@
        tools:ignore="Autofill"
        android:inputType="text"
        android:hint="@string/settings_default_query"
-        android:id="@+id/edittext"
+        android:id="@+id/default_query_dialog_edittext"
        android:layout_width="0dp"
        android:layout_height="wrap_content"
        app:layout_constraintTop_toTopOf="parent"
@@ -36,10 +36,10 @@
        app:layout_constraintEnd_toEndOf="parent"/>

    <LinearLayout
-        android:id="@+id/language_layout"
+        android:id="@+id/default_query_dialog_language_layout"
        android:layout_width="0dp"
        android:layout_height="wrap_content"
-        app:layout_constraintTop_toBottomOf="@id/edittext"
+        app:layout_constraintTop_toBottomOf="@id/default_query_dialog_edittext"
        app:layout_constraintStart_toStartOf="parent"
        app:layout_constraintEnd_toEndOf="parent">

@@ -49,14 +49,14 @@
            android:text="@string/default_query_dialog_language"/>

        <Spinner
-            android:id="@+id/language_selector"
+            android:id="@+id/default_query_dialog_language_selector"
            android:layout_width="match_parent"
            android:layout_height="wrap_content"/>

    </LinearLayout>

    <LinearLayout
-        android:id="@+id/BL_layout"
+        android:id="@+id/default_query_dialog_BL_layout"
        android:layout_width="0dp"
        android:layout_height="wrap_content"
        android:orientation="horizontal"
@@ -64,7 +64,7 @@
        android:paddingStart="0dp"
        android:paddingEnd="8dp"
        android:paddingRight="8dp"
-        app:layout_constraintTop_toBottomOf="@id/language_layout"
+        app:layout_constraintTop_toBottomOf="@id/default_query_dialog_language_layout"
        app:layout_constraintStart_toStartOf="parent"
        app:layout_constraintEnd_toEndOf="parent">

@@ -75,14 +75,14 @@
            android:text="@string/default_query_dialog_filter_BL"/>

        <CheckBox
-            android:id="@+id/BL_checkbox"
+            android:id="@+id/default_query_dialog_BL_checkbox"
            android:layout_width="wrap_content"
            android:layout_height="wrap_content" />

    </LinearLayout>

    <LinearLayout
-        android:id="@+id/guro_layout"
+        android:id="@+id/default_query_dialog_guro_layout"
        android:layout_width="0dp"
        android:layout_height="wrap_content"
        android:orientation="horizontal"
@@ -90,7 +90,7 @@
        android:paddingStart="0dp"
        android:paddingEnd="8dp"
        android:paddingRight="8dp"
-        app:layout_constraintTop_toBottomOf="@id/BL_layout"
+        app:layout_constraintTop_toBottomOf="@id/default_query_dialog_BL_layout"
        app:layout_constraintStart_toStartOf="parent"
        app:layout_constraintEnd_toEndOf="parent">

@@ -101,7 +101,7 @@
            android:text="@string/default_query_dialog_filter_guro"/>

        <CheckBox
-            android:id="@+id/guro_checkbox"
+            android:id="@+id/default_query_dialog_guro_checkbox"
            android:layout_width="wrap_content"
            android:layout_height="wrap_content" />

@@ -115,7 +115,7 @@
        android:paddingStart="0dp"
        android:paddingEnd="8dp"
        android:paddingRight="8dp"
-        app:layout_constraintTop_toBottomOf="@id/guro_layout"
+        app:layout_constraintTop_toBottomOf="@id/default_query_dialog_guro_layout"
        app:layout_constraintStart_toStartOf="parent"
        app:layout_constraintEnd_toEndOf="parent">

@@ -126,7 +126,7 @@
            android:text="@string/default_query_dialog_filter_loli"/>

        <CheckBox
-            android:id="@+id/loli_checkbox"
+            android:id="@+id/default_query_dialog_loli_checkbox"
            android:layout_width="wrap_content"
            android:layout_height="wrap_content" />

--- a/app/src/main/res/layout/download_location_dialog.xml
+++ b/app/src/main/res/layout/download_location_dialog.xml
--- a/app/src/main/res/layout/dialog_download_folder_name.xml
+++ b/app/src/main/res/layout/dialog_download_folder_name.xml
--- a/app/src/main/res/layout/dialog_gallery.xml
+++ b/app/src/main/res/layout/dialog_gallery.xml
@@ -19,13 +19,14 @@

 <androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
    xmlns:tools="http://schemas.android.com/tools"
+    android:id="@+id/gallery_layout"
    android:layout_width="match_parent"
    android:layout_height="match_parent"
    xmlns:app="http://schemas.android.com/apk/res-auto"
    android:orientation="vertical">

    <com.google.android.material.appbar.AppBarLayout
-        android:id="@+id/toolbar"
+        android:id="@+id/gallery_toolbar"
        android:layout_width="match_parent"
        android:layout_height="wrap_content">

@@ -40,34 +41,34 @@
                android:padding="8dp">

                <com.github.piasy.biv.view.BigImageView
-                    android:id="@+id/cover"
+                    android:id="@+id/gallery_cover"
                    android:layout_width="150dp"
                    android:layout_height="wrap_content"
                    android:adjustViewBounds="true"
                    app:layout_constraintTop_toTopOf="parent"
                    app:layout_constraintBottom_toBottomOf="parent"
                    app:layout_constraintLeft_toLeftOf="parent"
-                    app:layout_constraintRight_toLeftOf="@id/title"
+                    app:layout_constraintRight_toLeftOf="@id/gallery_title"
                    tools:ignore="ContentDescription" />

                <TextView
-                    android:id="@+id/title"
+                    android:id="@+id/gallery_title"
                    style="@style/TextAppearance.AppCompat.Headline"
                    android:layout_width="0dp"
                    android:layout_height="wrap_content"
                    app:layout_constraintTop_toTopOf="parent"
-                    app:layout_constraintLeft_toRightOf="@id/cover"
+                    app:layout_constraintLeft_toRightOf="@id/gallery_cover"
                    app:layout_constraintRight_toRightOf="parent"
                    android:layout_marginLeft="8dp"
                    android:layout_marginStart="8dp"/>

                <TextView
                    style="@style/TextAppearance.AppCompat.Medium"
-                    android:id="@+id/artist"
+                    android:id="@+id/gallery_artist"
                    android:layout_width="0dp"
                    android:layout_height="wrap_content"
-                    app:layout_constraintTop_toBottomOf="@id/title"
-                    app:layout_constraintLeft_toRightOf="@id/cover"
+                    app:layout_constraintTop_toBottomOf="@id/gallery_title"
+                    app:layout_constraintLeft_toRightOf="@id/gallery_cover"
                    app:layout_constraintRight_toRightOf="parent"
                    android:layout_marginLeft="8dp"
                    android:layout_marginStart="8dp"/>
@@ -75,15 +76,15 @@
                <View
                    android:layout_width="match_parent"
                    android:layout_height="0dp"
-                    app:layout_constraintTop_toBottomOf="@id/artist"
-                    app:layout_constraintBottom_toTopOf="@id/type"/>
+                    app:layout_constraintTop_toBottomOf="@id/gallery_artist"
+                    app:layout_constraintBottom_toTopOf="@id/gallery_type"/>

                <com.google.android.material.chip.Chip
-                    android:id="@+id/type"
+                    android:id="@+id/gallery_type"
                    android:layout_width="wrap_content"
                    android:layout_height="wrap_content"
                    app:layout_constraintBottom_toBottomOf="parent"
-                    app:layout_constraintLeft_toRightOf="@id/cover"
+                    app:layout_constraintLeft_toRightOf="@id/gallery_cover"
                    android:layout_marginLeft="8dp"
                    android:layout_marginStart="8dp"/>

@@ -99,7 +100,7 @@
        app:layout_behavior="@string/appbar_scrolling_view_behavior">

        <LinearLayout
-            android:id="@+id/contents"
+            android:id="@+id/gallery_contents"
            android:layout_width="match_parent"
            android:layout_height="match_parent"
            android:orientation="vertical"/>
@@ -111,7 +112,7 @@
        android:layout_height="match_parent">

        <ProgressBar
-            android:id="@+id/progressbar"
+            android:id="@+id/gallery_progressbar"
            android:layout_width="wrap_content"
            android:layout_height="wrap_content"
            app:layout_constraintLeft_toLeftOf="parent"
@@ -122,11 +123,11 @@
    </androidx.constraintlayout.widget.ConstraintLayout>

    <com.google.android.material.floatingactionbutton.FloatingActionButton
-        android:id="@+id/fab"
+        android:id="@+id/gallery_fab"
        android:layout_width="wrap_content"
        android:layout_height="wrap_content"
        android:layout_margin="16dp"
-        app:layout_anchor="@id/toolbar"
+        app:layout_anchor="@id/gallery_toolbar"
        app:layout_anchorGravity="bottom|end"/>

 </androidx.coordinatorlayout.widget.CoordinatorLayout>
--- a/app/src/main/res/layout/dialog_gallery_details.xml
+++ b/app/src/main/res/layout/dialog_gallery_details.xml
@@ -25,14 +25,14 @@
    android:padding="8dp">

    <TextView
-        android:id="@+id/type"
+        android:id="@+id/gallery_details"
        android:layout_width="match_parent"
        android:layout_height="wrap_content"
        style="@style/TextAppearance.MaterialComponents.Body1"
        android:textColor="@color/colorAccent"/>

    <LinearLayout
-        android:id="@+id/contents"
+        android:id="@+id/gallery_details_contents"
        android:layout_width="match_parent"
        android:layout_height="wrap_content"
        android:orientation="vertical"/>
--- a/app/src/main/res/layout/dialog_gallery_dotindicator.xml
+++ b/app/src/main/res/layout/dialog_gallery_dotindicator.xml
@@ -25,7 +25,7 @@
    android:layout_margin="8dp">

    <com.tbuonomo.viewpagerdotsindicator.DotsIndicator
-        android:id="@+id/dotindicator"
+        android:id="@+id/gallery_dotindicator"
        android:layout_width="wrap_content"
        android:layout_height="wrap_content"
        android:layout_centerHorizontal="true"
--- a/app/src/main/res/layout/dialog_numberpicker.xml
+++ b/app/src/main/res/layout/dialog_numberpicker.xml
@@ -25,7 +25,7 @@

    <TextView
        style="?android:textAppearanceLarge"
-        android:id="@+id/title"
+        android:id="@+id/dialog_title"
        android:layout_width="wrap_content"
        android:layout_height="wrap_content"
        android:text="@string/reader_go_to_page"
@@ -33,20 +33,20 @@
        app:layout_constraintStart_toStartOf="parent"/>

    <NumberPicker
-        android:id="@+id/number_picker"
+        android:id="@+id/dialog_number_picker"
        android:layout_width="wrap_content"
        android:layout_height="wrap_content"
-        app:layout_constraintTop_toBottomOf="@id/title"
+        app:layout_constraintTop_toBottomOf="@id/dialog_title"
        app:layout_constraintStart_toStartOf="parent"
        app:layout_constraintEnd_toEndOf="parent"/>

    <Button
-        android:id="@+id/ok_button"
+        android:id="@+id/dialog_ok"
        style="?borderlessButtonStyle"
        android:layout_width="wrap_content"
        android:layout_height="wrap_content"
        android:text="@android:string/ok"
-        app:layout_constraintTop_toBottomOf="@id/number_picker"
+        app:layout_constraintTop_toBottomOf="@id/dialog_number_picker"
        app:layout_constraintBottom_toBottomOf="parent"
        app:layout_constraintEnd_toEndOf="parent"/>

--- a/app/src/main/res/layout/dialog_proxy.xml
+++ b/app/src/main/res/layout/dialog_proxy.xml
@@ -24,7 +24,7 @@
    android:padding="16dp">

    <TextView
-        android:id="@+id/title"
+        android:id="@+id/proxy_title"
        android:layout_width="wrap_content"
        android:layout_height="wrap_content"
        android:paddingBottom="16dp"
@@ -35,46 +35,46 @@
        app:layout_constraintLeft_toLeftOf="parent"/>

    <TextView
-        android:id="@+id/type_text"
+        android:id="@+id/proxy_type_text"
        android:layout_width="wrap_content"
        android:layout_height="wrap_content"
-        app:layout_constraintTop_toBottomOf="@id/title"
+        app:layout_constraintTop_toBottomOf="@id/proxy_title"
        app:layout_constraintStart_toStartOf="parent"
        app:layout_constraintLeft_toLeftOf="parent"
        android:text="@string/proxy_dialog_type"
        android:textAppearance="?android:attr/listSeparatorTextViewStyle"/>

    <Spinner
-        android:id="@+id/type_selector"
+        android:id="@+id/proxy_type_selector"
        android:layout_width="match_parent"
        android:layout_height="wrap_content"
-        app:layout_constraintTop_toBottomOf="@id/type_text"/>
+        app:layout_constraintTop_toBottomOf="@id/proxy_type_text"/>

    <TextView
-        android:id="@+id/server_text"
+        android:id="@+id/proxy_server_text"
        android:layout_width="wrap_content"
        android:layout_height="wrap_content"
-        app:layout_constraintTop_toBottomOf="@id/type_selector"
+        app:layout_constraintTop_toBottomOf="@id/proxy_type_selector"
        app:layout_constraintStart_toStartOf="parent"
        app:layout_constraintLeft_toLeftOf="parent"
        android:text="@string/proxy_dialog_server"
        android:textAppearance="?android:attr/listSeparatorTextViewStyle"/>

    <LinearLayout
-        android:id="@+id/address_layout"
+        android:id="@+id/proxy_address_layout"
        android:layout_width="match_parent"
        android:layout_height="wrap_content"
-        app:layout_constraintTop_toBottomOf="@id/server_text">
+        app:layout_constraintTop_toBottomOf="@id/proxy_server_text">

        <androidx.appcompat.widget.AppCompatEditText
-            android:id="@+id/addr"
+            android:id="@+id/proxy_addr"
            android:layout_width="0dp"
            android:layout_weight="2"
            android:layout_height="wrap_content"
            android:hint="@string/proxy_dialog_addr_hint"/>

        <androidx.appcompat.widget.AppCompatEditText
-            android:id="@+id/port"
+            android:id="@+id/proxy_port"
            android:layout_width="0dp"
            android:layout_weight="1"
            android:layout_height="wrap_content"
@@ -83,39 +83,39 @@
    </LinearLayout>

    <androidx.appcompat.widget.AppCompatEditText
-        android:id="@+id/username"
+        android:id="@+id/proxy_username"
        android:layout_width="match_parent"
        android:layout_height="wrap_content"
-        app:layout_constraintTop_toBottomOf="@id/address_layout"
+        app:layout_constraintTop_toBottomOf="@id/proxy_address_layout"
        android:hint="@string/proxy_dialog_username_hint"
        android:enabled="false"/>

    <androidx.appcompat.widget.AppCompatEditText
-        android:id="@+id/password"
+        android:id="@+id/proxy_password"
        android:layout_width="match_parent"
        android:layout_height="wrap_content"
-        app:layout_constraintTop_toBottomOf="@id/username"
+        app:layout_constraintTop_toBottomOf="@id/proxy_username"
        android:hint="@string/proxy_dialog_password_hint"
        android:enabled="false"/>

    <Button
-        android:id="@+id/cancel_button"
+        android:id="@+id/proxy_cancel"
        style="?borderlessButtonStyle"
        android:layout_width="wrap_content"
        android:layout_height="wrap_content"
        android:text="@android:string/cancel"
-        app:layout_constraintTop_toBottomOf="@id/password"
+        app:layout_constraintTop_toBottomOf="@id/proxy_password"
        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toStartOf="@id/ok_button"
-        app:layout_constraintRight_toLeftOf="@id/ok_button"/>
+        app:layout_constraintEnd_toStartOf="@id/proxy_ok"
+        app:layout_constraintRight_toLeftOf="@id/proxy_ok"/>

    <Button
-        android:id="@+id/ok_button"
+        android:id="@+id/proxy_ok"
        style="?borderlessButtonStyle"
        android:layout_width="wrap_content"
        android:layout_height="wrap_content"
        android:text="@android:string/ok"
-        app:layout_constraintTop_toBottomOf="@id/password"
+        app:layout_constraintTop_toBottomOf="@id/proxy_password"
        app:layout_constraintBottom_toBottomOf="parent"
        app:layout_constraintEnd_toEndOf="parent"
        app:layout_constraintRight_toRightOf="parent"/>
--- a/app/src/main/res/layout/fragment_pattern_lock.xml
+++ b/app/src/main/res/layout/fragment_pattern_lock.xml
@@ -25,7 +25,7 @@
    tools:context=".ui.fragment.PatternLockFragment">

    <com.andrognito.patternlockview.PatternLockView
-        android:id="@+id/pattern_lock_view"
+        android:id="@+id/lock_pattern_view"
        android:layout_width="match_parent"
        android:layout_height="match_parent"
        android:layout_gravity="center"
--- a/app/src/main/res/layout/fragment_pin_lock.xml
+++ b/app/src/main/res/layout/fragment_pin_lock.xml
--- a/app/src/main/res/layout/download_location_item.xml
+++ b/app/src/main/res/layout/download_location_item.xml
--- a/app/src/main/res/layout/item_gallery_details.xml
+++ b/app/src/main/res/layout/item_gallery_details.xml
@@ -26,13 +26,13 @@

    <TextView
        style="@style/TextAppearance.MaterialComponents.Body2"
-        android:id="@+id/type"
+        android:id="@+id/gallery_details_type"
        android:layout_width="wrap_content"
        android:layout_height="wrap_content"
        android:paddingBottom="8dp"/>

    <com.google.android.material.chip.ChipGroup
-        android:id="@+id/tags"
+        android:id="@+id/gallery_details_tags"
        android:layout_width="wrap_content"
        android:layout_height="wrap_content"
        app:chipSpacingVertical="4dp"/>
--- a/app/src/main/res/layout/item_galleryblock.xml
+++ b/app/src/main/res/layout/item_galleryblock.xml
--- a/app/src/main/res/layout/item_mirrors.xml
+++ b/app/src/main/res/layout/item_mirrors.xml
--- a/app/src/main/res/layout/item_reader.xml
+++ b/app/src/main/res/layout/item_reader.xml
--- a/app/src/main/res/layout/view_progress_card.xml
+++ b/app/src/main/res/layout/view_progress_card.xml
--- a/app/src/main/res/layout/view_swipe_pageturn.xml
+++ b/app/src/main/res/layout/view_swipe_pageturn.xml
--- a/app/src/main/res/values-ja/strings.xml
+++ b/app/src/main/res/values-ja/strings.xml
@@ -22,7 +22,6 @@
    <string name="settings_clear_history_alert_message">履歴を削除しますか？</string>
    <string name="settings_clear_history_summary">履歴数: %1$d</string>
    <string name="main_drawer_history">履歴</string>
-    <string name="notification_denied">通知を無効にするとバックグラウンドダウンロード及びアプリのアップデート機能が使用不可になります。</string>
    <string name="main_drawer_home">トップ</string>
    <string name="update_release_note"># リリースノート(v%1$s)\n%2$s</string>
    <string name="settings_security_mode_title">セキュリティーモード</string>
@@ -74,7 +73,7 @@
    <string name="main_menu_sort">ソート</string>
    <string name="main_menu_sort_newest">投稿日時順</string>
    <string name="main_menu_sort_popular">人気順</string>
-    <string name="ignore">無視</string>
+    <string name="ignore_update">無視</string>
    <string name="lock_corrupted">ロックファイルが破損されています。Pupilを再再インストールしてください。</string>
    <string name="settings_dark_mode_title">ダークモード</string>
    <string name="settings_dark_mode_summary">夜にシコりたい方々へ</string>
@@ -152,11 +151,8 @@
    <string name="no_camera">この機器には前面カメラが装着されていません</string>
    <string name="error">エラー</string>
    <string name="settings_cache_limit">キャッシュサイズ制限</string>
-    <string name="unlimited">制限なし</string>
+    <string name="settings_cache_unlimited">制限なし</string>
    <string name="settings_tag_translation">タグ言語</string>
    <string name="settings_tag_translation_message">Githubにて翻訳に参加できます</string>
-    <string name="settings_max_concurrent_download">並列ダウンロード</string>
-    <string name="unaccessible_download_folder">アンドロイド11以上では外部からのアプリ内部空間接近が不可能です。ダウンロードフォルダを変更しますか？</string>
-    <string name="settings_networking">ネットワーク</string>
-    <string name="settings_recover_downloads">ダウンロードデータベースを再構築</string>
+    <string name="settings_concurrent_download">並列ダウンロード</string>
 </resources>
--- a/app/src/main/res/values-ko/strings.xml
+++ b/app/src/main/res/values-ko/strings.xml
@@ -21,7 +21,6 @@
    <string name="settings_clear_history_alert_message">기록을 삭제하시겠습니까?</string>
    <string name="settings_clear_history_summary">기록 %1$d개 저장됨</string>
    <string name="main_drawer_history">기록</string>
-    <string name="notification_denied">백그라운드 다운로드를 위해서는 알림을 활성화할 필요가 있습니다. 알림을 비활성화하면 백그라운드 다운로드와 앱 업데이트 기능을 사용할 수 없습니다.</string>
    <string name="main_drawer_home">홈</string>
    <string name="update_release_note"># 릴리즈 노트(v%1$s)\n%2$s</string>
    <string name="settings_security_mode_summary">최근 앱 목록 창에서 앱 화면을 보이지 않게 합니다</string>
@@ -72,7 +71,7 @@
    <string name="main_menu_sort">정렬</string>
    <string name="main_menu_sort_popular">인기순</string>
    <string name="main_menu_sort_newest">시간순</string>
-    <string name="ignore">무시</string>
+    <string name="ignore_update">무시</string>
    <string name="lock_corrupted">잠금 파일이 손상되었습니다! 앱을 재설치 해 주시기 바랍니다.</string>
    <string name="settings_dark_mode_title">다크 모드</string>
    <string name="settings_dark_mode_summary">딥 다크한 모오드</string>
@@ -152,11 +151,8 @@
    <string name="no_camera">이 장치에는 전면 카메라가 없습니다</string>
    <string name="error">오류</string>
    <string name="settings_cache_limit">캐시 크기 제한</string>
-    <string name="unlimited">무제한</string>
+    <string name="settings_cache_unlimited">무제한</string>
    <string name="settings_tag_translation">태그 언어</string>
    <string name="settings_tag_translation_message">Github에서 번역에 참여하세요</string>
-    <string name="settings_max_concurrent_download">병렬 다운로드</string>
-    <string name="unaccessible_download_folder">안드로이드 11 이상에서는 외부에서 현재 다운로드 폴더에 접근할 수 없습니다. 변경하시겠습니까?</string>
-    <string name="settings_networking">네트워크</string>
-    <string name="settings_recover_downloads">다운로드 데이터베이스 복구</string>
+    <string name="settings_concurrent_download">병렬 다운로드</string>
 </resources>
--- a/app/src/main/res/values/arrays.xml
+++ b/app/src/main/res/values/arrays.xml
@@ -48,6 +48,11 @@
        <item>japanese|日本語</item>
    </string-array>

+    <string-array name="mirrors">
+        <item>HITOMI|hitomi.la</item>
+        <item>HIYOBI|hiyobi.me</item>
+    </string-array>
+
    <string-array name="proxy_type">
        <item>Direct</item>
        <item>HTTP</item>
@@ -65,7 +70,7 @@
    </string-array>

    <string-array name="cache_size_text">
-        <item>@string/unlimited</item>
+        <item>@string/settings_cache_unlimited</item>
        <item>1G</item>
        <item>2G</item>
        <item>4G</item>
@@ -74,24 +79,4 @@
        <item>32G</item>
    </string-array>

-    <string-array name="concurrent_download">
-        <item>0</item>
-        <item>1</item>
-        <item>2</item>
-        <item>4</item>
-        <item>8</item>
-        <item>16</item>
-        <item>32</item>
-    </string-array>
-
-    <string-array name="concurrent_download_text">
-        <item>@string/unlimited</item>
-        <item>1</item>
-        <item>2</item>
-        <item>4</item>
-        <item>8</item>
-        <item>16</item>
-        <item>32</item>
-    </string-array>
-
 </resources>
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -28,9 +28,7 @@
    <string name="warning">Warning</string>
    <string name="error">Error</string>

-    <string name="ignore">Ignore</string>
-
-    <string name="unlimited">Unlimited</string>
+    <string name="ignore_update">Ignore</string>

    <string name="copied_to_clipboard">Copied to clipboard</string>

@@ -49,10 +47,6 @@

    <string name="main_no_result">No result</string>

-    <string name="unaccessible_download_folder">From Android 11 and above, current Download folder cannot be accessed by outside apps. Would you like to change the download folder?</string>
-
-    <string name="notification_denied">Notification permission is required for background downloads. If you deny notifications from this app, in-app update and background download will be disabled.</string>
-
    <string name="main_drawer_home">Home</string>
    <string name="main_drawer_history">History</string>
    <string name="main_drawer_downloads">Downloads</string>
@@ -152,7 +146,6 @@
    <string name="settings_storage_usage_loading">Calculating storage usage…</string>
    <string name="settings_clear_cache">Clear cache</string>
    <string name="settings_clear_cache_alert_message">Deleting cache can affect image loading speed. Do you want to continue?</string>
-    <string name="settings_recover_downloads">Reconstruct download database</string>
    <string name="settings_clear_downloads">Clear downloads</string>
    <string name="settings_clear_downloads_alert_message">Delete all downloaded galleries.\nDo you want to continue?</string>
    <string name="settings_clear_history">Clear history</string>
@@ -171,6 +164,7 @@
    <string name="settings_download_folder_custom">Custom Location</string>
    <string name="settings_download_folder_not_writable">This folder is not writable. Please select another folder.</string>
    <string name="settings_cache_limit">Cache Limit</string>
+    <string name="settings_cache_unlimited">Unlimited</string>
    <string name="settings_nomedia_title">Hide image from gallery</string>
    <string name="settings_low_quality">Low quality images</string>
    <string name="settings_low_quality_summary">Load low quality images to improve load speed and data usage</string>
@@ -180,17 +174,14 @@
    <string name="settings_app_lock">App lock</string>
    <string name="settings_app_lock_type">App lock type</string>

-    <!-- SETTINGS/NETWORKING -->
-    <string name="settings_networking">Networking</string>
-    <string name="settings_mirror_summary">Load images from mirrors</string>
-    <string name="settings_proxy_title">Proxy</string>
-    <string name="settings_max_concurrent_download">Concurrent Download</string>
-
    <!-- SETTINGS/MISCELLANEOUS -->

    <string name="settings_miscellaneous_title">Miscellaneous</string>
    <string name="settings_tag_translation">Tag Language</string>
+    <string name="settings_concurrent_download">Concurrent Download</string>
    <string name="settings_tag_translation_message">Participate in translation on Github</string>
+    <string name="settings_mirror_summary">Load images from mirrors</string>
+    <string name="settings_proxy_title">Proxy</string>
    <string name="settings_rtl">Turn pages Right-to-Left</string>
    <string name="settings_security_mode_title">Enable security mode</string>
    <string name="settings_security_mode_summary">Enable security mode to make the screen invisible on recent app window</string>
--- a/app/src/main/res/xml/file_paths.xml
+++ b/app/src/main/res/xml/file_paths.xml
@@ -18,7 +18,6 @@
  -->

 <paths>
-    <external-path name="external" path="."/>
-    <external-files-path name="files" path="."/>
-    <files-path name="files" path="." />
+    <external-path name="external" path="/"/>
+    <external-files-path name="files" path="/"/>
 </paths>
--- a/app/src/main/res/xml/manage_storage_preferences.xml
+++ b/app/src/main/res/xml/manage_storage_preferences.xml
@@ -27,11 +27,6 @@
        app:key="delete_downloads"
        app:title="@string/settings_clear_downloads"/>

-    <Preference
-        app:key="recover_downloads"
-        app:title="@string/settings_recover_downloads"
-        app:iconSpaceReserved="true"/>
-
    <Preference
        app:key="clear_history"
        app:title="@string/settings_clear_history"/>
--- a/app/src/main/res/xml/network_security_config.xml
+++ b/app/src/main/res/xml/network_security_config.xml
@@ -18,9 +18,6 @@
  -->

 <network-security-config>
-    <domain-config cleartextTrafficPermitted="true">
-        <domain includeSubdomains="false">10.0.2.2</domain>
-    </domain-config>
    <domain-config cleartextTrafficPermitted="true">
        <domain includeSubdomains="false">ix.io</domain>
    </domain-config>
--- a/app/src/main/res/xml/root_preferences.xml
+++ b/app/src/main/res/xml/root_preferences.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<PreferenceScreen xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:android="http://schemas.android.com/apk/res/android">
+<PreferenceScreen xmlns:app="http://schemas.android.com/apk/res-auto">

    <Preference
        app:key="app_version"
@@ -56,6 +55,12 @@
            app:key="nomedia"
            app:title="@string/settings_nomedia_title"/>

+        <SwitchPreferenceCompat
+            app:key="low_quality"
+            app:title="@string/settings_low_quality"
+            app:summary="@string/settings_low_quality_summary"
+            app:defaultValue="true"/>
+
    </PreferenceCategory>

    <PreferenceCategory
@@ -67,23 +72,6 @@

    </PreferenceCategory>

-    <PreferenceCategory
-        app:title="@string/settings_networking">
-
-        <Preference
-            app:key="proxy"
-            app:title="@string/settings_proxy_title"/>
-
-        <ListPreference
-            app:key="max_concurrent_download"
-            android:title="@string/settings_max_concurrent_download"
-            app:entries="@array/concurrent_download_text"
-            app:entryValues="@array/concurrent_download"
-            android:defaultValue="0"
-            app:useSimpleSummaryProvider="true"/>
-
-    </PreferenceCategory>
-
    <PreferenceCategory
        app:title="@string/settings_miscellaneous_title">

@@ -92,6 +80,15 @@
            app:title="@string/settings_tag_translation"
            app:useSimpleSummaryProvider="true"/>

+        <Preference
+            app:key="mirrors"
+            app:title="@string/settings_mirror_title"
+            app:summary="@string/settings_mirror_summary"/>
+
+        <Preference
+            app:key="proxy"
+            app:title="@string/settings_proxy_title"/>
+
        <SwitchPreferenceCompat
            app:key="rtl"
            app:title="@string/settings_rtl"
--- a/app/src/test/java/xyz/quaver/pupil/ExampleUnitTest.kt
+++ b/app/src/test/java/xyz/quaver/pupil/ExampleUnitTest.kt
@@ -26,14 +26,21 @@ package xyz.quaver.pupil
 * See [testing documentation](http://d.android.com/tools/testing).
 */

+import kotlinx.serialization.*
+import kotlinx.serialization.json.Json
 import org.junit.Test
 import java.lang.reflect.ParameterizedType
+import kotlin.reflect.KClass
+import kotlin.reflect.KType
+import kotlin.reflect.typeOf

 class ExampleUnitTest {
+
    @Test
    fun test() {
        val a = mutableSetOf<Int>()

        print(a::class.java.methods.firstOrNull { it.name == "add" }?.genericParameterTypes?.firstOrNull() as? ParameterizedType)
    }
+
 }
--- a/build.gradle
+++ b/build.gradle
@@ -3,30 +3,29 @@
 buildscript {
    repositories {
        google()
-        mavenCentral()
+        jcenter()
    }
    dependencies {
-        classpath 'com.android.tools.build:gradle:7.3.1'
+        classpath 'com.android.tools.build:gradle:4.1.1'
        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
        classpath "org.jetbrains.kotlin:kotlin-android-extensions:$kotlin_version"
        classpath "org.jetbrains.kotlin:kotlin-serialization:$kotlin_version"
-        classpath "com.google.gms:google-services:4.3.15"
+        classpath "com.google.gms:google-services:4.3.4"
        // NOTE: Do not place your application dependencies here; they belong
        // in the individual module build.gradle files
-        classpath "com.google.firebase:firebase-crashlytics-gradle:2.9.9"
-        classpath "com.google.firebase:perf-plugin:1.4.2"
-        classpath "com.google.android.gms:oss-licenses-plugin:0.10.6"
+        classpath "com.google.firebase:firebase-crashlytics-gradle:2.4.1"
+        classpath "com.google.firebase:perf-plugin:1.3.4"
+        classpath "com.google.android.gms:oss-licenses-plugin:0.10.2"
    }
 }

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

--- a/gradle.properties
+++ b/gradle.properties
@@ -20,4 +20,4 @@ kotlin.code.style=official
 android.enableJetifier=true
 android.useAndroidX=true

-kotlin_version=1.9.0
+kotlin_version=1.4.20
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.4-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.5-all.zip
Author	SHA1	Message	Date
tom5079	65fafa8f2c	Fixed typo & Built apk	2020-11-26 22:36:12 +09:00
tom5079	edef2a3eae	Fixed `show extra tags` button not showing up & version up	2020-11-26 22:16:51 +09:00
tom5079	338241d26f	Implemented proper Page Turn without relying on RecyclerView	2020-11-26 22:00:35 +09:00
tom5079	17b031e1b7	Merge remote-tracking branch 'origin/dev' into dev # Conflicts: # app/build.gradle	2020-11-16 16:13:02 +09:00
tom5079	2abfe1a061	ProgressCard	2020-11-16 16:11:57 +09:00
tom5079	7510202f55	fixed gallery import	2020-11-08 18:11:56 +09:00