fix tag

Merge pull request #189 from contigo/patch-1
Update strings.xml (zh-rTW)
2025-11-14 19:09:46 -08:00 · 2025-11-14 19:07:16 -08:00 · 2025-10-15 11:42:01 +09:00 · 2025-10-09 10:49:25 -07:00 · 2025-10-09 10:49:01 -07:00 · 2025-10-08 16:17:55 +07:00
165 changed files with 7951 additions and 9694 deletions
--- a/.gitignore
+++ b/.gitignore
@@ -1,20 +1,33 @@
 # 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
-.gradle
+.idea/
-/local.properties
+misc.xml
-/.idea/caches
+deploymentTargetDropDown.xml
-/.idea/libraries
+render.experimental.xml
 /.idea/modules.xml
 /.idea/workspace.xml
 /.idea/navEditor.xml
 /.idea/assetWizardSettings.xml
 .DS_Store
 /build
 /captures
 .externalNativeBuild
-#Github pages
+# Keystore files
-/gh-pages
+*.jks
 *.keystore
-#Private files
+# Google Services (e.g. APIs or Firebase)
-**/google-services.json
+google-services.json
-**/credentials.json
+
 # Android Profiling
 *.hprof
--- a/.idea/codeStyles/Project.xml
+++ b/.idea/codeStyles/Project.xml
@@ -1,139 +0,0 @@
 <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
@@ -1,5 +0,0 @@
 <component name="ProjectCodeStyleConfiguration">
  <state>
    <option name="USE_PER_PROJECT_SETTINGS" value="true" />
  </state>
 </component>
--- a/.idea/copyright/GPL.xml
+++ b/.idea/copyright/GPL.xml
@@ -1,6 +0,0 @@
 <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
@@ -1,7 +0,0 @@
 <component name="CopyrightManager">
  <settings>
    <module2copyright>
      <element module="Pupil" copyright="GPL" />
    </module2copyright>
  </settings>
 </component>
--- a/.idea/dictionaries/tom50.xml
+++ b/.idea/dictionaries/tom50.xml
@@ -1,7 +0,0 @@
 <component name="ProjectDictionaryState">
  <dictionary name="tom50">
    <words>
      <w>hitomi</w>
    </words>
  </dictionary>
 </component>
--- a/.idea/encodings.xml
+++ b/.idea/encodings.xml
@@ -1,4 +0,0 @@
 <?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
@@ -1,20 +0,0 @@
 <?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" />
      </GradleProjectSettings>
    </option>
  </component>
 </project>
--- a/.idea/jarRepositories.xml
+++ b/.idea/jarRepositories.xml
@@ -1,65 +0,0 @@
 <?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>
  </component>
 </project>
--- a/.idea/kotlinCodeInsightSettings.xml
+++ b/.idea/kotlinCodeInsightSettings.xml
@@ -1,7 +0,0 @@
 <?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
@@ -1,6 +0,0 @@
 <?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
@@ -1,9 +0,0 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" project-jdk-name="1.8" project-jdk-type="JavaSDK">
    <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
@@ -1,12 +0,0 @@
 <?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
@@ -1,3 +0,0 @@
 <component name="DependencyValidationManager">
  <scope name="Pupil" pattern="file[app]:*/" />
 </component>
--- a/.idea/vcs.xml
+++ b/.idea/vcs.xml
@@ -1,6 +0,0 @@
 <?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
@@ -1,29 +1,29 @@
 # Pupil
 ![Banner](https://github.com/tom5079/Pupil/blob/gh-pages/assets/images/pupil-banner.png?raw=true)
-*Pupil, Hitomi.la viewer for Android*  
+*Pupil, Hitomi.la viewer for Android*
-[![](https://discordapp.com/api/guilds/610452916612104194/embed.png?style=banner2)](https://discord.gg/Stj4b5v)  
+![](https://img.shields.io/github/downloads/tom5079/Pupil/total)  
 [![](https://img.shields.io/github/downloads/tom5079/Pupil/5.3.18/Pupil-v5.3.18.apk?color=%234fc3f7&label=DOWNLOAD%20APP&style=for-the-badge)](https://github.com/tom5079/Pupil/releases/download/5.3.18/Pupil-v5.3.18.apk)  
 [![](https://discordapp.com/api/guilds/610452916612104194/embed.png?style=banner2)](https://discord.gg/Stj4b5v)
-# Screenshot
+# Features
 ![Main Screen](https://github.com/tom5079/Pupil/blob/gh-pages/assets/images/main-screenshot.png?raw=true)
 *Main Screen*
-![Reader Screen](https://github.com/tom5079/Pupil/blob/gh-pages/assets/images/reader-screenshot.png?raw=true)
+![Main Screen](https://github.com/tom5079/Pupil/blob/gh-pages/assets/images/main-screenshot.jpg?raw=true)
 *Reader Screen*
 Images are censored to be SFW
 # Installation
 Go [Releases page](https://github.com/tom5079/Pupil/releases) and get latest version or  
 Visit [github page](https://tom5079.github.io/Pupil/) (only available in Korean)  
-or Build app yourself  
+or Build app yourself
 # Manual
-[Manual](https://tom5079.github.io/Pupil/2019/06/06/manual-kr.html) is only available in Korean. Consider using translator.
+[Manual](https://tom5079.github.io/Pupil/2019/06/06/manual-kr.html) is only available in Korean.
 Consider using translator.
 # Contribution
-Any kind of contribution is appriciated. Feel free to leave PR! 
+Any kind of contribution is appreciated. 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,118 +0,0 @@
 apply plugin: 'com.android.application'
 apply plugin: 'kotlin-android'
 apply plugin: 'kotlin-kapt'
 apply plugin: 'kotlin-android-extensions'
 apply plugin: 'kotlinx-serialization'
 apply plugin: 'com.google.android.gms.oss-licenses-plugin'
 if (file("google-services.json").exists() && file("src/debug/google-services.json").exists()) {
    logger.lifecycle("Firebase Enabled")
    apply plugin: 'com.google.gms.google-services'
    apply plugin: 'com.google.firebase.crashlytics'
    apply plugin: 'com.google.firebase.firebase-perf'
 } else {
    logger.lifecycle("Firebase Disabled")
 }
 android {
    compileSdkVersion 30
    defaultConfig {
        applicationId "xyz.quaver.pupil"
        minSdkVersion 16
        targetSdkVersion 30
        versionCode 59
        versionName "5.0.3-hotfix2"
        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
        vectorDrawables.useSupportLibrary = true
    }
    buildTypes {
        debug {
            minifyEnabled true
            shrinkResources true
            debuggable true
            applicationIdSuffix ".debug"
            versionNameSuffix "-DEBUG"
            buildConfigField('Boolean', 'CENSOR', 'false')
            proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
            ext.enableCrashlytics = false
            ext.alwaysUpdateBuildId = false
        }
        release {
            minifyEnabled true
            shrinkResources true
            buildConfigField('Boolean', 'CENSOR', 'false')
            proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
        }
    }
    kotlinOptions {
        jvmTarget = JavaVersion.VERSION_1_8.toString()
        freeCompilerArgs += '-Xuse-experimental=kotlin.Experimental'
    }
    compileOptions {
        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-core:1.3.9"
    implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:1.3.9"
    //implementation "org.jetbrains.kotlinx:kotlinx-serialization-core:1.0.0-RC"
    implementation 'androidx.appcompat:appcompat:1.2.0'
    implementation "androidx.activity:activity-ktx:1.2.0-alpha08"
    implementation 'androidx.fragment:fragment-ktx:1.3.0-alpha08'
    implementation 'androidx.preference:preference:1.1.1'
    implementation 'androidx.constraintlayout:constraintlayout:2.0.1'
    implementation 'androidx.gridlayout:gridlayout:1.0.0'
    implementation "androidx.biometric:biometric:1.0.1"
    implementation "com.daimajia.swipelayout:library:1.2.0@aar"
    implementation 'com.google.android.material:material:1.3.0-alpha02'
    implementation 'com.google.firebase:firebase-core:17.5.0'
    implementation 'com.google.firebase:firebase-analytics:17.5.0'
    implementation 'com.google.firebase:firebase-crashlytics:17.2.1'
    implementation 'com.google.firebase:firebase-perf:19.0.8'
    implementation 'com.google.android.gms:play-services-oss-licenses:17.0.0'
    implementation 'com.google.android.gms:play-services-mlkit-face-detection:16.1.1'
    implementation 'com.github.arimorty:floatingsearchview:2.1.1'
    implementation 'com.github.clans:fab:1.6.4'
    //implementation 'com.quiph.ui:recyclerviewfastscroller:0.2.1'
    //noinspection GradleDependency
    implementation 'com.squareup.okhttp3:okhttp:3.12.12'
    implementation 'com.github.bumptech.glide:glide:4.11.0'
    implementation ("com.github.bumptech.glide:okhttp3-integration:4.11.0") {
        transitive = false
    }
    implementation 'com.github.bumptech.glide:annotations:4.11.0'
    annotationProcessor 'com.github.bumptech.glide:compiler:4.11.0'
    kapt 'com.github.bumptech.glide:compiler:4.11.0'
    implementation ("com.github.bumptech.glide:recyclerview-integration:4.11.0") {
        transitive = false
    }
    implementation 'com.tbuonomo.andrui:viewpagerdotsindicator:4.1.2'
    implementation 'com.gu:option:1.3'
    implementation 'net.rdrei.android.dirchooser:library:3.2@aar'
    implementation 'com.github.chrisbanes:PhotoView:2.3.0'
    implementation 'com.andrognito.patternlockview:patternlockview:1.0.0'
    //implementation 'com.andrognito.pinlockview:pinlockview:2.1.0'
    implementation "ru.noties.markwon:core:3.1.0"
    implementation ("xyz.quaver:libpupil:1.6") {
        exclude group: 'org.jetbrains.kotlinx', module: 'kotlinx-serialization-core-jvm'
    }
    implementation "xyz.quaver:documentfilex:0.2.15"
    testImplementation 'junit:junit:4.13'
    androidTestImplementation 'androidx.test.ext:junit:1.1.2'
    androidTestImplementation 'androidx.test:rules:1.3.0'
    androidTestImplementation 'androidx.test:runner:1.3.0'
    androidTestImplementation 'androidx.test.espresso:espresso-core:3.3.0'
 }
 androidExtensions {
    experimental = true
 }
--- a/app/build.gradle.kts
+++ b/app/build.gradle.kts
@@ -0,0 +1,129 @@
 plugins {
    alias(libs.plugins.android.application)
    alias(libs.plugins.kotlin.android)
    alias(libs.plugins.kotlinx.serialization)
    alias(libs.plugins.kotlin.compose)
    alias(libs.plugins.gms.oss.licenses)
    alias(libs.plugins.gms.google.services)
    alias(libs.plugins.firebase.crashlytics)
    alias(libs.plugins.firebase.perf)
    id("kotlin-parcelize")
 }
 android {
    namespace = "xyz.quaver.pupil"
    compileSdk = 35
    defaultConfig {
        applicationId = "xyz.quaver.pupil"
        minSdk = 21
        targetSdk = 35
        versionCode = 70
        versionName = "5.3.22"
        testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
        vectorDrawables.useSupportLibrary = true
    }
    buildFeatures {
        buildConfig = true
        compose = true
    }
    buildTypes {
        debug {
            isMinifyEnabled = false
            isShrinkResources = false
            isDebuggable = true
            applicationIdSuffix = ".debug"
            versionNameSuffix = "-DEBUG"
            extra.apply {
                set("enableCrashlytics", false)
                set("alwaysUpdateBuildId", false)
            }
        }
        release {
            isMinifyEnabled = true
            isShrinkResources = true
            proguardFiles(
                getDefaultProguardFile("proguard-android-optimize.txt"),
                "proguard-rules.pro"
            )
        }
    }
    buildFeatures {
        viewBinding = true
    }
    kotlinOptions {
        jvmTarget = JavaVersion.VERSION_11.toString()
    }
    compileOptions {
        sourceCompatibility = JavaVersion.VERSION_11
        targetCompatibility = JavaVersion.VERSION_11
    }
 }
 dependencies {
    implementation(libs.kotlin.stdlib.jdk8)
    implementation(libs.kotlinx.coroutines.android)
    implementation(libs.kotlinx.serialization.json)
    implementation(libs.kotlinx.datetime)
    implementation(libs.androidx.compose.runtime)
    implementation(libs.core.ktx)
    implementation(libs.appcompat)
    implementation(libs.activity.ktx)
    implementation(libs.fragment.ktx)
    implementation(libs.preference.ktx)
    implementation(libs.recyclerview)
    implementation(libs.constraintlayout)
    implementation(libs.gridlayout)
    implementation(libs.biometric)
    implementation(libs.work.runtime.ktx)
    implementation(libs.library)
    implementation(libs.material)
    implementation(platform(libs.firebase.bom))
    implementation(libs.firebase.analytics.ktx)
    implementation(libs.firebase.crashlytics.ktx)
    implementation(libs.firebase.perf.ktx)
    implementation(libs.play.services.oss.licenses)
    implementation(libs.play.services.mlkit.face.detection)
    implementation(libs.fab)
    implementation(libs.bigimageviewer)
    implementation(libs.frescoimageloader)
    implementation(libs.frescoimageviewfactory)
    implementation(libs.imagepipeline.okhttp3)
    //noinspection GradleDependency
    implementation(libs.okhttp)
    implementation(libs.ktor.network)
    implementation(libs.dotsindicator)
    implementation(libs.pinlockview)
    implementation(libs.patternlockview)
    implementation(libs.core)
    implementation(libs.ripplebackground.library)
    implementation(libs.recyclerview.fastscroller)
    implementation(libs.jsoup)
    implementation(libs.documentfilex)
    implementation(libs.floatingsearchview)
    testImplementation(libs.junit)
    testImplementation(libs.kotlinx.coroutines.test)
    androidTestImplementation(libs.ext.junit)
    androidTestImplementation(libs.rules)
    androidTestImplementation(libs.runner)
    androidTestImplementation(libs.espresso.core)
 }
--- a/app/libs/kotlinx-serialization-core-1.0.0-RC.jar
+++ b/app/libs/kotlinx-serialization-core-1.0.0-RC.jar
--- a/app/libs/recyclerviewfastscroller-release.aar
+++ b/app/libs/recyclerviewfastscroller-release.aar
--- a/app/proguard-rules.pro
+++ b/app/proguard-rules.pro
@@ -22,21 +22,6 @@
 -dontobfuscate
 -keep public class * implements com.bumptech.glide.module.GlideModule
 -keep class * extends com.bumptech.glide.module.AppGlideModule {
 <init>(...);
 }
 -keep public enum com.bumptech.glide.load.ImageHeaderParser$** {
  **[] $VALUES;
  public *;
 }
 -keep class com.bumptech.glide.load.data.ParcelFileDescriptorRewinder$InternalRewinder {
  *** rewind();
 }
 -keep public class * extends com.bumptech.glide.module.AppGlideModule
 -keep class com.bumptech.glide.GeneratedAppGlideModuleImpl
 -keepattributes *Annotation*, InnerClasses
 -dontnote kotlinx.serialization.SerializationKt
 -keep,includedescriptorclasses class xyz.quaver.**$$serializer { *; } # <-- change package name to your app's
@@ -48,4 +33,5 @@
 }
 -keep class xyz.quaver.pupil.ui.fragment.ManageFavoritesFragment
 -keep class xyz.quaver.pupil.ui.fragment.ManageStorageFragment
-keep class xyz.quaver.pupil.util.Preferences
+-keep class xyz.quaver.pupil.** { *; }
 -keep class app.cash.zipline.** { *; }
--- a/app/release/baselineProfiles/0/app-release.dm
+++ b/app/release/baselineProfiles/0/app-release.dm
--- a/app/release/baselineProfiles/1/app-release.dm
+++ b/app/release/baselineProfiles/1/app-release.dm
--- a/app/release/output-metadata.json
+++ b/app/release/output-metadata.json
@@ -1,5 +1,5 @@
 {
-  "version": 1,
+  "version": 3,
  "artifactType": {
    "type": "APK",
    "kind": "Directory"
@@ -10,11 +10,28 @@
    {
      "type": "SINGLE",
      "filters": [],
-      "properties": [],
+      "attributes": [],
-      "versionCode": 59,
+      "versionCode": 70,
-      "versionName": "5.0.3-hotfix2",
+      "versionName": "5.3.22",
      "enabled": true,
      "outputFile": "app-release.apk"
    }
-  ]
+  ],
  "elementType": "File",
  "baselineProfiles": [
    {
      "minApi": 28,
      "maxApi": 30,
      "baselineProfiles": [
        "baselineProfiles/1/app-release.dm"
      ]
    },
    {
      "minApi": 31,
      "maxApi": 2147483647,
      "baselineProfiles": [
        "baselineProfiles/0/app-release.dm"
      ]
    }
  ],
  "minSdkVersionForDexing": 21
 }
--- a/app/src/androidTest/java/xyz/quaver/pupil/ExampleInstrumentedTest.kt
+++ b/app/src/androidTest/java/xyz/quaver/pupil/ExampleInstrumentedTest.kt
@@ -20,10 +20,18 @@
 package xyz.quaver.pupil
 import android.util.Log
 import androidx.test.ext.junit.runners.AndroidJUnit4
-import androidx.test.platform.app.InstrumentationRegistry
+import kotlinx.coroutines.runBlocking
 import okhttp3.OkHttpClient
 import okhttp3.Request
 import org.junit.Assert.assertEquals
 import org.junit.Before
 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.
@@ -32,10 +40,144 @@ import org.junit.runner.RunWith
 */
@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 useAppContext() {
+    fun test_empty() {
-        // Context of the app under test.
+        print(
-        val appContext = InstrumentationRegistry.getInstrumentation().targetContext
+            "".trim()
                .replace(Regex("""^\?"""), "")
                .lowercase(Locale.getDefault())
                .split(Regex("\\s+"))
                .map {
                    it.replace('_', ' ')
                })
    }
    @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/debug/res/values/strings.xml
+++ b/app/src/debug/res/values/strings.xml
@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?><!--
 <!--
  ~     Pupil, Hitomi.la viewer for Android
  ~     Copyright (C) 2020  tom5079
  ~
@@ -17,6 +16,4 @@
  ~     along with this program.  If not, see <http://www.gnu.org/licenses/>.
  -->
-<resources xmlns:tools="http://schemas.android.com/tools">
+<resources></resources>
    <string name="app_name" translatable="false" tools:override="true">Pupil-Debug</string>
 </resources>
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -1,15 +1,23 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
+    xmlns:tools="http://schemas.android.com/tools">
    package="xyz.quaver.pupil">
    <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="21"/>
+    <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" android:maxSdkVersion="23"/>
-    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" android:maxSdkVersion="21" />
+    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" android:maxSdkVersion="23"/>
    <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" />
    <uses-permission android:name="android.permission.FOREGROUND_SERVICE_DATA_SYNC"/>
    <uses-permission android:name="android.permission.POST_NOTIFICATIONS"/>
    <uses-permission android:name="android.permission.NEARBY_WIFI_DEVICES" android:usesPermissionFlags="neverForLocation"
        tools:targetApi="s" />
    <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" android:maxSdkVersion="32"
        tools:ignore="CoarseFineLocation" />
    <uses-permission android:name="android.permission.ACCESS_WIFI_STATE" />
    <uses-permission android:name="android.permission.CHANGE_WIFI_STATE" />
    <uses-feature android:name="android.hardware.camera" android:required="false" />
    <uses-feature android:name="android.hardware.camera.autofocus" android:required="false" />
@@ -44,7 +52,16 @@
        </provider>
        <service android:name=".services.DownloadService"
-            android:exported="false"/>
+            android:exported="false"
            android:foregroundServiceType="dataSync" />
        <service android:name=".services.TransferClientService"
            android:exported="false"
            android:foregroundServiceType="dataSync" />
        <service android:name=".services.TransferServerService"
            android:exported="false"
            android:foregroundServiceType="dataSync" />
        <receiver
            android:name=".receiver.UpdateBroadcastReceiver"
@@ -58,190 +75,124 @@
        <activity
            android:name=".ui.ReaderActivity"
            android:configChanges="keyboardHidden|orientation|screenSize"
-            android:parentActivityName=".ui.MainActivity">
+            android:parentActivityName=".ui.MainActivity"
-            <intent-filter>
+            android:exported="true">
            <intent-filter android:autoVerify="true">
                <action android:name="android.intent.action.VIEW" />
                <category android:name="android.intent.category.DEFAULT" />
                <category android:name="android.intent.category.BROWSABLE" />
-                <data
+                <data android:scheme="http" />
-                    android:host="hitomi.la"
+                <data android:scheme="https" />
-                    android:pathPrefix="/galleries"
+                <data android:host="*.hasha.in"/>
-                    android:scheme="http" />
+                <data android:pathPrefix="/reader"/>
            </intent-filter>
-            <intent-filter>
+            <intent-filter android:autoVerify="true">
                <action android:name="android.intent.action.VIEW" />
                <category android:name="android.intent.category.DEFAULT" />
                <category android:name="android.intent.category.BROWSABLE" />
-                <data
+                <data android:scheme="http" />
-                    android:host="hitomi.la"
+                <data android:scheme="https" />
-                    android:pathPrefix="/manga"
+                <data android:host="hitomi.la"/>
-                    android:scheme="http" />
+                <data android:pathPrefix="/galleries"/>
            </intent-filter>
-            <intent-filter>
+            <intent-filter android:autoVerify="true">
                <action android:name="android.intent.action.VIEW" />
                <category android:name="android.intent.category.DEFAULT" />
                <category android:name="android.intent.category.BROWSABLE" />
-                <data
+                <data android:scheme="http" />
-                    android:host="hitomi.la"
+                <data android:scheme="https" />
-                    android:pathPrefix="/doujinshi"
+                <data android:host="hitomi.la" />
-                    android:scheme="http" />
+                <data android:pathPrefix="/manga" />
            </intent-filter>
-            <intent-filter>
+            <intent-filter android:autoVerify="true">
                <action android:name="android.intent.action.VIEW" />
                <category android:name="android.intent.category.DEFAULT" />
                <category android:name="android.intent.category.BROWSABLE" />
-                <data
+                <data android:scheme="http" />
-                    android:host="hitomi.la"
+                <data android:scheme="https" />
-                    android:pathPrefix="/cg"
+                <data android:host="hitomi.la" />
-                    android:scheme="http" />
+                <data android:pathPrefix="/doujinshi" />
            </intent-filter>
-            <intent-filter>
+            <intent-filter android:autoVerify="true">
                <action android:name="android.intent.action.VIEW" />
                <category android:name="android.intent.category.DEFAULT" />
                <category android:name="android.intent.category.BROWSABLE" />
-                <data
+                <data android:scheme="http" />
-                    android:host="hitomi.la"
+                <data android:scheme="https" />
-                    android:pathPrefix="/reader"
+                <data android:host="hitomi.la" />
-                    android:scheme="http" />
+                <data android:pathPrefix="/cg" />
            </intent-filter>
-            <intent-filter>
+            <intent-filter android:autoVerify="true">
                <action android:name="android.intent.action.VIEW" />
                <category android:name="android.intent.category.DEFAULT" />
                <category android:name="android.intent.category.BROWSABLE" />
-                <data
+                <data android:scheme="http" />
-                    android:host="hitomi.la"
+                <data android:scheme="https" />
-                    android:pathPrefix="/galleries"
+                <data android:host="hitomi.la" />
-                    android:scheme="https" />
+                <data android:pathPrefix="/imageset" />
            </intent-filter>
-            <intent-filter>
+            <intent-filter android:autoVerify="true">
                <action android:name="android.intent.action.VIEW" />
                <category android:name="android.intent.category.DEFAULT" />
                <category android:name="android.intent.category.BROWSABLE" />
-                <data
+                <data android:scheme="http" />
-                    android:host="hitomi.la"
+                <data android:scheme="https" />
-                    android:pathPrefix="/manga"
+                <data android:host="hitomi.la" />
-                    android:scheme="https" />
+                <data android:pathPrefix="/reader" />
            </intent-filter>
-            <intent-filter>
+            <intent-filter android:autoVerify="true">
                <action android:name="android.intent.action.VIEW" />
                <category android:name="android.intent.category.DEFAULT" />
                <category android:name="android.intent.category.BROWSABLE" />
-                <data
+                <data android:scheme="http" />
-                    android:host="hitomi.la"
+                <data android:host="e-hentai.org" />
-                    android:pathPrefix="/doujinshi"
+                <data android:pathPrefix="/g" />
                    android:scheme="https" />
            </intent-filter>
-            <intent-filter>
+            <intent-filter android:autoVerify="true">
                <action android:name="android.intent.action.VIEW" />
                <category android:name="android.intent.category.DEFAULT" />
                <category android:name="android.intent.category.BROWSABLE" />
-                <data
+                <data android:scheme="https" />
-                    android:host="hitomi.la"
+                <data android:host="e-hentai.org" />
-                    android:pathPrefix="/cg"
+                <data android:pathPrefix="/g" />
                    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:theme="@style/NoActionBarAppTheme"
            android:exported="true">
            <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" />
        <activity android:name=".ui.TransferActivity" />
    </application>
 </manifest>
--- a/app/src/main/java/xyz/quaver/pupil/Pupil.kt
+++ b/app/src/main/java/xyz/quaver/pupil/Pupil.kt
@@ -18,33 +18,47 @@
 package xyz.quaver.pupil
-import android.app.*
+import android.app.Application
 import android.app.Notification
 import android.app.NotificationChannel
 import android.app.NotificationManager
 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.analytics.FirebaseAnalytics
+import com.google.firebase.FirebaseApp
 import com.google.firebase.crashlytics.FirebaseCrashlytics
-import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.*
-import kotlinx.coroutines.Dispatchers
+import okhttp3.Dispatcher
 import kotlinx.coroutines.launch
 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.security.KeyStore
 import java.security.SecureRandom
 import java.security.cert.CertificateFactory
 import java.util.*
 import java.util.concurrent.Executors
 import java.util.concurrent.TimeUnit
 import javax.net.ssl.SSLContext
 import javax.net.ssl.TrustManagerFactory
 import javax.net.ssl.X509TrustManager
 import kotlin.reflect.KClass
 typealias PupilInterceptor = (Interceptor.Chain) -> Response
@@ -66,12 +80,47 @@ var clientHolder: OkHttpClient? = null
 val client: OkHttpClient
    get() = clientHolder ?: clientBuilder.build().also {
        clientHolder = it
        setClient(it)
    }
 fun getSSLContext(context: Context): SSLContext {
    val keyStore = KeyStore.getInstance(KeyStore.getDefaultType())
    keyStore.load(null, null)
    val certificateFactory = CertificateFactory.getInstance("X.509")
    val certificate = context.resources.openRawResource(R.raw.isrgrootx1).use {
        certificateFactory.generateCertificate(it)
    }
    keyStore.setCertificateEntry("isrgrootx1", certificate)
    val defaultTrustManagerFactory = TrustManagerFactory.getInstance(TrustManagerFactory.getDefaultAlgorithm())
    defaultTrustManagerFactory.init(null as KeyStore?)
    defaultTrustManagerFactory.trustManagers.filterIsInstance(X509TrustManager::class.java).forEach { trustManager ->
        trustManager.acceptedIssuers.forEach { acceptedIssuer ->
            keyStore.setCertificateEntry(acceptedIssuer.subjectDN.name, acceptedIssuer)
        }
    }
    val trustManagerFactory = TrustManagerFactory.getInstance(TrustManagerFactory.getDefaultAlgorithm())
    trustManagerFactory.init(keyStore)
    val sslContext = SSLContext.getInstance("TLS")
    sslContext.init(null, trustManagerFactory.trustManagers, SecureRandom())
    return sslContext
 }
 class Pupil : Application() {
    companion object {
        lateinit var instance: Pupil
            private set
    }
    override fun onCreate() {
        instance = this
        AppCompatDelegate.setCompatVectorFromResourcesEnabled(true)
        preferences = PreferenceManager.getDefaultSharedPreferences(this)
@@ -81,24 +130,35 @@ 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)
            .sslSocketFactory(getSSLContext(this).socketFactory)
            .readTimeout(0, TimeUnit.SECONDS)
            .proxyInfo(proxyInfo)
            .addInterceptor { chain ->
-                val request = chain.request()
+                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 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") && Build.VERSION.SDK_INT > 19)
+                if (it.startsWith("content://"))
                    contentResolver.takePersistableUriPermission(
                        Uri.parse(it),
                        Intent.FLAG_GRANT_READ_URI_PERMISSION or Intent.FLAG_GRANT_WRITE_URI_PERMISSION
@@ -106,34 +166,28 @@ class Pupil : Application() {
                if (!FileX(this, it).canWrite())
                    throw Exception()
                DownloadManager.getInstance(this).migrate()
            }
        } catch (e: Exception) {
            Preferences.remove("download_folder")
        }
        if (!Preferences["reset_secure", false]) {
            Preferences["security_mode"] = false
            Preferences["reset_secure"] = true
        }
        histories = SavedSet(File(ContextCompat.getDataDir(this), "histories.json"), 0)
        favorites = SavedSet(File(ContextCompat.getDataDir(this), "favorites.json"), 0)
        favoriteTags = SavedSet(File(ContextCompat.getDataDir(this), "favorites_tags.json"), Tag.parse(""))
        searchHistory = SavedSet(File(ContextCompat.getDataDir(this), "search_histories.json"), "")
-        if (Preferences["new_history"]) {
+        favoriteTags.filter { it.tag.contains('_') }.forEach {
-            CoroutineScope(Dispatchers.IO).launch {
+            favoriteTags.remove(it)
                histories.reversed().let {
                    histories.clear()
                    histories.addAll(it)
                }
                favorites.reversed().let {
                    favorites.clear()
                    favorites.addAll(it)
                }
            }
            Preferences["new_history"] = true
        }
        /*
        if (BuildConfig.DEBUG)
-            FirebaseAnalytics.getInstance(this).setAnalyticsCollectionEnabled(false)
+            FirebaseAnalytics.getInstance(this).setAnalyticsCollectionEnabled(false)*/
        try {
            ProviderInstaller.installIfNeeded(this)
@@ -143,6 +197,15 @@ class Pupil : Application() {
            e.printStackTrace()
        }
        BigImageViewer.initialize(
            FrescoImageLoader.with(
                this,
                OkHttpImagePipelineConfigFactory
                    .newBuilder(this, client)
                    .build()
            )
        )
        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
            val manager = getSystemService(Context.NOTIFICATION_SERVICE) as NotificationManager
@@ -173,6 +236,13 @@ class Pupil : Application() {
                enableVibration(false)
                lockscreenVisibility = Notification.VISIBILITY_SECRET
            })
            manager.createNotificationChannel(NotificationChannel("transfer", getString(R.string.channel_transfer), NotificationManager.IMPORTANCE_LOW).apply {
                description = getString(R.string.channel_transfer_description)
                enableLights(false)
                enableVibration(false)
                lockscreenVisibility = Notification.VISIBILITY_SECRET
            })
        }
        AppCompatDelegate.setDefaultNightMode(when (Preferences.get<Boolean>("dark_mode")) {
--- a/app/src/main/java/xyz/quaver/pupil/adapters/GalleryBlockAdapter.kt
+++ b/app/src/main/java/xyz/quaver/pupil/adapters/GalleryBlockAdapter.kt
@@ -18,347 +18,294 @@
 package xyz.quaver.pupil.adapters
 import android.content.ClipData
 import android.content.ClipboardManager
 import android.content.Context
 import android.graphics.drawable.Drawable
 import android.util.Log
 import android.util.SparseBooleanArray
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
-import android.widget.LinearLayout
+import android.widget.Toast
-import androidx.cardview.widget.CardView
+import androidx.core.content.ContextCompat
 import androidx.recyclerview.widget.RecyclerView
 import androidx.swiperefreshlayout.widget.CircularProgressDrawable
 import androidx.vectordrawable.graphics.drawable.Animatable2Compat
 import androidx.vectordrawable.graphics.drawable.AnimatedVectorDrawableCompat
 import com.bumptech.glide.RequestManager
 import com.bumptech.glide.load.DataSource
 import com.bumptech.glide.load.engine.DiskCacheStrategy
 import com.bumptech.glide.load.engine.GlideException
 import com.bumptech.glide.request.RequestListener
 import com.bumptech.glide.request.target.Target
 import com.daimajia.swipe.SwipeLayout
 import com.daimajia.swipe.adapters.RecyclerSwipeAdapter
 import com.daimajia.swipe.interfaces.SwipeAdapterInterface
-import kotlinx.android.synthetic.main.item_galleryblock.view.*
+import com.github.piasy.biv.loader.ImageLoader
-import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.*
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.withContext
 import xyz.quaver.hitomi.getReader
 import xyz.quaver.io.util.getChild
 import xyz.quaver.pupil.BuildConfig
 import xyz.quaver.pupil.R
 import xyz.quaver.pupil.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.TagChip
+import xyz.quaver.pupil.ui.view.ProgressCard
 import xyz.quaver.pupil.util.Preferences
 import xyz.quaver.pupil.util.downloader.Cache
 import xyz.quaver.pupil.util.downloader.DownloadManager
 import xyz.quaver.pupil.util.wordCapitalize
-import java.util.*
+import java.io.File
 import kotlin.collections.ArrayList
 import kotlin.concurrent.schedule
-class GalleryBlockAdapter(private val glide: RequestManager, private val galleries: List<Int>) : RecyclerSwipeAdapter<RecyclerView.ViewHolder>(), SwipeAdapterInterface {
+class GalleryBlockAdapter(private val galleries: List<Int>) : RecyclerSwipeAdapter<RecyclerView.ViewHolder>(), SwipeAdapterInterface {
-    enum class ViewType {
+    var updateAll = true
-        NEXT,
+    var thin: Boolean = Preferences["thin"]
        GALLERY,
        PREV
    }
-    val timer = Timer()
+    inner class GalleryViewHolder(val binding: GalleryblockItemBinding) : RecyclerView.ViewHolder(binding.root) {
-
+        private var galleryID: Int = 0
    var isThin = false
    inner class GalleryViewHolder(val view: View) : RecyclerView.ViewHolder(view) {
        var timerTask: TimerTask? = null
        private fun updateProgress(context: Context, galleryID: Int) {
            val cache = Cache.getInstance(context, galleryID)
        init {
            CoroutineScope(Dispatchers.Main).launch {
-                if (cache.metadata.reader == null || Preferences["cache_disable"]) {
+                while (updateAll) {
-                    view.galleryblock_progressbar_layout.visibility = View.GONE
+                    updateProgress(itemView.context)
-                    view.galleryblock_progress_complete.visibility = View.INVISIBLE
+                    delay(1000)
-                    return@launch
+                }
            }
        }
        private fun updateProgress(context: Context) = CoroutineScope(Dispatchers.Main).launch {
            with(binding.galleryblockCard) {
                val imageList = Cache.getInstance(context, galleryID).metadata.imageList
                if (imageList == null) {
                    max = 0
                    return@with
                }
-                with(view.galleryblock_progressbar) {
+                progress = imageList.count { it != null }
-                    val imageList = cache.metadata.imageList!!
+                max = imageList.size
-                    progress = imageList.filterNotNull().size
+                this@GalleryViewHolder.binding.galleryblockId.setOnClickListener {
-                    max = imageList.size
+                    (context.getSystemService(Context.CLIPBOARD_SERVICE) as ClipboardManager).setPrimaryClip(
-
+                        ClipData.newPlainText("gallery_id", galleryID.toString())
-                    with(view.galleryblock_progressbar_layout) {
+                    )
-                        if (visibility == View.GONE)
+                    Toast.makeText(context, R.string.copied_to_clipboard, Toast.LENGTH_SHORT).show()
                            visibility = View.VISIBLE
                    }
                    if (progress == max) {
                        val downloadManager = DownloadManager.getInstance(context)
                        if (completeFlag.get(galleryID, false)) {
                            with(view.galleryblock_progress_complete) {
                                setImageResource(
                                    if (downloadManager.getDownloadFolder(galleryID) != null)
                                        R.drawable.ic_progressbar
                                    else R.drawable.ic_progressbar_cache
                                )
                                visibility = View.VISIBLE
                            }
                        } else {
                            with(view.galleryblock_progress_complete) {
                                setImageDrawable(AnimatedVectorDrawableCompat.create(context,
                                    if (downloadManager.getDownloadFolder(galleryID) != null)
                                        R.drawable.ic_progressbar_complete
                                    else R.drawable.ic_progressbar_complete_cache
                                ).apply {
                                    this?.start()
                                })
                                visibility = View.VISIBLE
                            }
                            completeFlag.put(galleryID, true)
                        }
                    } else
                        view.galleryblock_progress_complete.visibility = View.INVISIBLE
                }
                type = if (!imageList.contains(null)) {
                    val downloadManager = DownloadManager.getInstance(context)
                    if (downloadManager.getDownloadFolder(galleryID) == null)
                        ProgressCard.Type.CACHE
                    else
                        ProgressCard.Type.DOWNLOAD
                } else
                    ProgressCard.Type.LOADING
            }
        }
        fun bind(galleryID: Int) {
-            val cache = Cache.getInstance(view.context, galleryID)
+            this.galleryID = galleryID
            updateProgress(itemView.context)
-            val galleryBlock = cache.metadata.galleryBlock ?: return
+            val cache = Cache.getInstance(itemView.context, galleryID)
-            with(view) {
+            CoroutineScope(Dispatchers.IO).launch {
-                val resources = context.resources
+                val galleryBlock = cache.getGalleryBlock() ?: return@launch
                val languages = resources.getStringArray(R.array.languages).map {
                    it.split("|").let { split ->
                        Pair(split[0], split[1])
                    }
                }.toMap()
-                val artists = galleryBlock.artists
+                launch(Dispatchers.Main) {
-                val series = galleryBlock.series
+                    val resources = itemView.context.resources
                    val languages = resources.getStringArray(R.array.languages).map {
                        it.split("|").let { split ->
                            Pair(split[0], split[1])
                        }
                    }.toMap()
-                if (isThin)
+                    val artists = galleryBlock.artists
-                    galleryblock_thumbnail.layoutParams.width = context.resources.getDimensionPixelSize(
+                    val series = galleryBlock.series
                        R.dimen.galleryblock_thumbnail_thin
                    )
-                galleryblock_thumbnail.setImageDrawable(CircularProgressDrawable(context).also {
+                    binding.galleryblockThumbnail.apply {
-                    it.start()
+                        setOnClickListener {
-                })
+                            itemView.performClick()
-
+                        }
-                CoroutineScope(Dispatchers.IO).launch {
+                        setOnLongClickListener {
-                    val thumbnail = cache.getThumbnail()
+                            itemView.performLongClick()
-
+                        }
-                    glide
+                        setFailureImage(ContextCompat.getDrawable(context, R.drawable.image_broken_variant))
-                        .load(thumbnail)
+                        setImageLoaderCallback(object: ImageLoader.Callback {
-                        .skipMemoryCache(true)
+                            override fun onFail(error: Exception?) {
-                        .diskCacheStrategy(DiskCacheStrategy.NONE)
+                                Cache.delete(context, galleryID)
                        .error(R.drawable.image_broken_variant)
                        .listener(object: RequestListener<Drawable> {
                            override fun onLoadFailed(
                                e: GlideException?,
                                model: Any?,
                                target: Target<Drawable>?,
                                isFirstResource: Boolean
                            ): Boolean {
                                Cache.getInstance(context, galleryID).let {
                                    it.cacheFolder.getChild(".thumbnail").let { if (it.exists()) it.delete() }
                                    it.downloadFolder?.getChild(".thumbnail")?.let { if (it.exists()) it.delete() }
                                }
                                return false
                            }
-                            override fun onResourceReady(
+                            override fun onCacheHit(imageType: Int, image: File?) {}
-                                resource: Drawable?,
+                            override fun onCacheMiss(imageType: Int, image: File?) {}
-                                model: Any?,
+                            override fun onFinish() {}
-                                target: Target<Drawable>?,
+                            override fun onProgress(progress: Int) {}
-                                dataSource: DataSource?,
+                            override fun onStart() {}
-                                isFirstResource: Boolean
+                            override fun onSuccess(image: File?) {}
                            ): Boolean = false
                        })
-                        .apply {
+                        ssiv?.recycle()
-                            if (BuildConfig.CENSOR)
+                        CoroutineScope(Dispatchers.IO).launch {
-                                override(5, 8)
+                            cache.getThumbnail().let { launch(Dispatchers.Main) {
-                        }.let { launch(Dispatchers.Main) { it.into(galleryblock_thumbnail) } }
+                                showImage(it)
-                }
+                            } }
-
+                        }
                if (timerTask == null)
                    timerTask = timer.schedule(0, 1000) {
                        updateProgress(context, galleryID)
                    }
-                galleryblock_title.text = galleryBlock.title
+                    binding.galleryblockTitle.text = galleryBlock.title
-                with(galleryblock_artist) {
+                    with(binding.galleryblockArtist) {
-                    text = artists.joinToString(", ") { it.wordCapitalize() }
+                        text = artists.joinToString { it.wordCapitalize() }
-                    visibility = when {
+                        visibility = when {
-                        artists.isNotEmpty() -> View.VISIBLE
+                            artists.isNotEmpty() -> View.VISIBLE
-                        else -> View.GONE
+                            else -> View.GONE
-                    }
+                        }
                }
                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
                    }
                }
-                galleryblock_tag_group.removeAllViews()
+                        CoroutineScope(Dispatchers.IO).launch {
-                CoroutineScope(Dispatchers.Default).launch {
+                            val gallery = runCatching {
-                    galleryBlock.relatedTags.map {
+                                getGallery(galleryID)
-                        TagChip(context, Tag.parse(it)).apply {
+                            }.getOrNull()
-                            setOnClickListener { view ->
+
-                                for (callback in onChipClickedHandler)
+                            if (gallery?.groups?.isNotEmpty() != true)
-                                    callback.invoke((view as TagChip).tag)
+                                return@launch
                            launch(Dispatchers.Main) {
                                text = context.getString(
                                    R.string.galleryblock_artist_with_group,
                                    artists.joinToString { it.wordCapitalize() },
                                    gallery.groups.joinToString { it.wordCapitalize() }
                                )
                            }
                        }
                    }.let { launch(Dispatchers.Main) { it.forEach { galleryblock_tag_group.addView(it) } } }
                }
                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(binding.galleryblockSeries) {
                        text =
                            resources.getString(
                                R.string.galleryblock_series,
                                series.joinToString(", ") { it.wordCapitalize() })
                        visibility = when {
                            series.isNotEmpty() -> View.VISIBLE
                            else -> View.GONE
                        }
                    }
                    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(galleryblock_favorite) {
+                    with(binding.galleryblockTagGroup) {
-                    setImageResource(if (favorites.contains(galleryBlock.id)) R.drawable.ic_star_filled else R.drawable.ic_star_empty)
+                        onClickListener = {
-                    setOnClickListener {
+                            onChipClickedHandler.forEach { callback ->
-                        when {
+                                callback.invoke(it)
                            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 {
+                        tags.clear()
                                    this ?: return@apply
-                                    registerAnimationCallback(object: Animatable2Compat.AnimationCallback() {
+                        CoroutineScope(Dispatchers.IO).launch {
-                                        override fun onAnimationEnd(drawable: Drawable?) {
+                            tags.addAll(
-                                            setImageResource(R.drawable.ic_star_filled)
+                                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 {
-                                    start()
+                                    Tag.parse(it)
-                                })
+                                }
                            )
                            launch(Dispatchers.Main) {
                                refresh()
                            }
                        }
                    }
                    binding.galleryblockId.text = galleryBlock.id.toString()
                    binding.galleryblockPagecount.text = "-"
                    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)
                        }
                    }
                    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)
                                    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 (isThin) {
                    galleryblock_language.visibility = View.GONE
                    galleryblock_type.visibility = View.GONE
                    galleryblock_tag_group.visibility = View.GONE
                }
            }
            // Make some views invisible to make it thinner
            if (thin) {
                binding.galleryblockTagGroup.visibility = View.GONE
            }
        }
    }
    class NextViewHolder(view: LinearLayout) : RecyclerView.ViewHolder(view)
    class PrevViewHolder(view: LinearLayout) : RecyclerView.ViewHolder(view)
    class ViewHolderFactory {
        companion object {
            fun getLayoutID(type: Int): Int {
                return when(ViewType.values()[type]) {
                    ViewType.NEXT -> R.layout.item_next
                    ViewType.PREV -> R.layout.item_prev
                    ViewType.GALLERY -> R.layout.item_galleryblock
                }
            }
        }
    }
    val completeFlag = SparseBooleanArray()
    val onChipClickedHandler = ArrayList<((Tag) -> Unit)>()
    var onDownloadClickedHandler: ((Int) -> Unit)? = null
    var onDeleteClickedHandler: ((Int) -> Unit)? = null
    var showNext = false
    var showPrev = false
    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): RecyclerView.ViewHolder {
-
+        return GalleryViewHolder(GalleryblockItemBinding.inflate(LayoutInflater.from(parent.context), parent, false))
        fun getViewHolder(type: Int, view: View): RecyclerView.ViewHolder {
            return when(ViewType.values()[type]) {
                ViewType.NEXT -> NextViewHolder(view as LinearLayout)
                ViewType.PREV -> PrevViewHolder(view as LinearLayout)
                ViewType.GALLERY -> GalleryViewHolder(view as CardView)
            }
        }
        return getViewHolder(
            viewType,
            LayoutInflater.from(parent.context).inflate(
                ViewHolderFactory.getLayoutID(viewType),
                parent,
                false
            )
        )
    }
    override fun onBindViewHolder(holder: RecyclerView.ViewHolder, position: Int) {
        if (holder is GalleryViewHolder) {
-            val galleryID = galleries[position-(if (showPrev) 1 else 0)]
+            val galleryID = galleries[position]
            holder.bind(galleryID)
-            with(holder.view.galleryblock_primary) {
+            holder.binding.galleryblockCard.binding.download.setOnClickListener {
                setOnClickListener {
                    holder.view.performClick()
                }
                setOnLongClickListener {
                    holder.view.performLongClick()
                }
            }
            holder.view.galleryblock_download.setOnClickListener {
                onDownloadClickedHandler?.invoke(position)
            }
-            holder.view.galleryblock_delete.setOnClickListener {
+            holder.binding.galleryblockCard.binding.delete.setOnClickListener {
                onDeleteClickedHandler?.invoke(position)
            }
-            mItemManger.bindView(holder.view, position)
+            mItemManger.bindView(holder.binding.root, position)
-            holder.view.galleryblock_swipe_layout.addSwipeListener(object: SwipeLayout.SwipeListener {
+            holder.binding.galleryblockCard.binding.swipeLayout.addSwipeListener(object: SwipeLayout.SwipeListener {
                override fun onStartOpen(layout: SwipeLayout?) {
                    mItemManger.closeAllExcept(layout)
-                    holder.view.galleryblock_download.text =
+                    holder.binding.galleryblockCard.binding.download.text =
-                        if (DownloadManager.getInstance(holder.view.context).isDownloading(galleryID))
+                        if (DownloadManager.getInstance(holder.binding.root.context).isDownloading(galleryID))
-                            holder.view.context.getString(android.R.string.cancel)
+                            holder.binding.root.context.getString(android.R.string.cancel)
                        else
-                            holder.view.context.getString(R.string.main_download)
+                            holder.binding.root.context.getString(R.string.main_download)
                }
                override fun onClose(layout: SwipeLayout?) {}
@@ -370,27 +317,7 @@ class GalleryBlockAdapter(private val glide: RequestManager, private val galleri
        }
    }
-    override fun onViewDetachedFromWindow(holder: RecyclerView.ViewHolder) {
+    override fun getItemCount() = galleries.size
        super.onViewDetachedFromWindow(holder)
-        if (holder is GalleryViewHolder) {
+    override fun getSwipeLayoutResourceId(position: Int) = R.id.swipe_layout
            holder.timerTask?.cancel()
            holder.timerTask = null
        }
    }
    override fun getItemCount() =
        galleries.size +
        (if (showNext) 1 else 0) +
        (if (showPrev) 1 else 0)
    override fun getItemViewType(position: Int): Int {
        return when {
            showPrev && position == 0 -> ViewType.PREV
            showNext && position == galleries.size+(if (showPrev) 1 else 0) -> ViewType.NEXT
            else -> ViewType.GALLERY
        }.ordinal
    }
    override fun getSwipeLayoutResourceId(position: Int) = R.id.galleryblock_swipe_layout
 }
--- a/app/src/main/java/xyz/quaver/pupil/adapters/MirrorAdapter.kt
+++ b/app/src/main/java/xyz/quaver/pupil/adapters/MirrorAdapter.kt
@@ -1,86 +0,0 @@
 /*
 *     Pupil, Hitomi.la viewer for Android
 *     Copyright (C) 2020  tom5079
 *
 *     This program is free software: you can redistribute it and/or modify
 *     it under the terms of the GNU General Public License as published by
 *     the Free Software Foundation, either version 3 of the License, or
 *     (at your option) any later version.
 *
 *     This program is distributed in the hope that it will be useful,
 *     but WITHOUT ANY WARRANTY; without even the implied warranty of
 *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 *     GNU General Public License for more details.
 *
 *     You should have received a copy of the GNU General Public License
 *     along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 package xyz.quaver.pupil.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
@@ -18,188 +18,233 @@
 package xyz.quaver.pupil.adapters
-import android.graphics.drawable.Drawable
+import android.content.Context
 import android.graphics.drawable.Animatable
 import android.net.Uri
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
 import android.widget.ImageView
 import androidx.constraintlayout.widget.ConstraintLayout
 import androidx.core.content.ContextCompat
 import androidx.core.view.updateLayoutParams
 import androidx.recyclerview.widget.RecyclerView
-import com.bumptech.glide.Glide
+import com.davemorrissey.labs.subscaleview.SubsamplingScaleImageView
-import com.bumptech.glide.load.DataSource
+import com.facebook.drawee.backends.pipeline.Fresco
-import com.bumptech.glide.load.engine.DiskCacheStrategy
+import com.facebook.drawee.controller.BaseControllerListener
-import com.bumptech.glide.load.engine.GlideException
+import com.facebook.drawee.drawable.ScalingUtils
-import com.bumptech.glide.load.model.GlideUrl
+import com.facebook.drawee.interfaces.DraweeController
-import com.bumptech.glide.load.model.LazyHeaders
+import com.facebook.drawee.view.SimpleDraweeView
-import com.bumptech.glide.request.RequestListener
+import com.facebook.imagepipeline.image.ImageInfo
-import com.bumptech.glide.request.target.Target
+import com.github.piasy.biv.view.BigImageView
-import kotlinx.android.synthetic.main.item_reader.view.*
+import com.github.piasy.biv.view.ImageShownCallback
-import kotlinx.coroutines.CoroutineScope
+import com.github.piasy.biv.view.ImageViewFactory
-import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.*
 import kotlinx.coroutines.launch
 import xyz.quaver.Code
 import xyz.quaver.hitomi.Reader
 import xyz.quaver.hitomi.getReferer
 import xyz.quaver.hitomi.imageUrlFromImage
 import xyz.quaver.hiyobi.createImgList
 import xyz.quaver.pupil.BuildConfig
 import xyz.quaver.pupil.R
-import xyz.quaver.pupil.services.DownloadService
+import xyz.quaver.pupil.databinding.ReaderItemBinding
 import xyz.quaver.pupil.hitomi.GalleryInfo
 import xyz.quaver.pupil.ui.ReaderActivity
 import xyz.quaver.pupil.util.Preferences
 import xyz.quaver.pupil.util.downloader.Cache
-import java.util.*
+import java.io.File
 import kotlin.concurrent.schedule
 import kotlin.math.roundToInt
-class ReaderAdapter(private val activity: ReaderActivity,
+class ReaderAdapter(
-                    private val galleryID: Int) : RecyclerView.Adapter<ReaderAdapter.ViewHolder>() {
+    private val activity: ReaderActivity,
-
+    private val galleryID: Int
-    var reader: Reader? = null
+) : RecyclerView.Adapter<ReaderAdapter.ViewHolder>() {
-    val timer = Timer()
+    var galleryInfo: GalleryInfo? = null
    private val glide = Glide.with(activity)
    var isFullScreen = false
-    var onItemClickListener : ((Int) -> (Unit))? = null
+    var onItemClickListener : (() -> (Unit))? = null
-    class ViewHolder(val view: View) : RecyclerView.ViewHolder(view)
+    inner class ViewHolder(private val binding: ReaderItemBinding) : RecyclerView.ViewHolder(binding.root) {
-
+        init {
-    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): ViewHolder {
+            with (binding.image) {
-        return LayoutInflater.from(parent.context).inflate(
+                setImageViewFactory(FrescoImageViewFactory().apply {
-            R.layout.item_reader, parent, false
+                    updateView = { imageInfo ->
-        ).let {
+                        binding.image.updateLayoutParams<ConstraintLayout.LayoutParams> {
-            ViewHolder(it)
+                            dimensionRatio = "${imageInfo.width}:${imageInfo.height}"
-        }
+                        }
    }
    private var cache: Cache? = null
    override fun onBindViewHolder(holder: ViewHolder, position: Int) {
        holder.view as ConstraintLayout
        if (cache == null)
            cache = Cache.getInstance(holder.view.context, galleryID)
        if (isFullScreen) {
            holder.view.layoutParams.height = ConstraintLayout.LayoutParams.MATCH_PARENT
        } else {
            holder.view.layoutParams.height = ConstraintLayout.LayoutParams.WRAP_CONTENT
            (holder.view.progress_layout.layoutParams as ConstraintLayout.LayoutParams)
                .dimensionRatio = "${reader!!.galleryInfo.files[position].width}:${reader!!.galleryInfo.files[position].height}"
        }
        holder.view.image.setOnPhotoTapListener { _, _, _ ->
            onItemClickListener?.invoke(position)
        }
        holder.view.setOnClickListener {
            onItemClickListener?.invoke(position)
        }
        holder.view.reader_index.text = (position+1).toString()
        if (Preferences["cache_disable"]) {
            val lowQuality: Boolean = Preferences["low_quality"]
            val url = when (reader!!.code) {
                Code.HITOMI ->
                    GlideUrl(
                        imageUrlFromImage(
                            galleryID,
                            reader!!.galleryInfo.files[position],
                            !lowQuality
                        )
                    , LazyHeaders.Builder().addHeader("Referer", getReferer(galleryID)).build())
                Code.HIYOBI ->
                    GlideUrl(createImgList(galleryID, reader!!, lowQuality)[position].path)
                else -> null
            }
            holder.view.image.post {
                glide
                    .load(url!!)
                    .diskCacheStrategy(DiskCacheStrategy.NONE)
                    .skipMemoryCache(false)
                    .error(R.drawable.image_broken_variant)
                    .apply {
                        if (BuildConfig.CENSOR)
                            override(5, 8)
                        else
                            override(
                                holder.view.context.resources.displayMetrics.widthPixels,
                                holder.view.context.resources.getDimensionPixelSize(R.dimen.reader_max_height)
                            )
                    }
-                    .error(R.drawable.image_broken_variant)
+                })
-                    .into(holder.view.image)
+                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()
                }
            }
-        } else {
+
            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) {
-                holder.view.reader_item_progressbar.visibility = View.INVISIBLE
+                binding.progressGroup.visibility = View.INVISIBLE
-
+                binding.image.showImage(image.uri)
                CoroutineScope(Dispatchers.IO).launch {
                    glide
                        .load(image.uri)
                        .diskCacheStrategy(DiskCacheStrategy.NONE)
                        .skipMemoryCache(true)
                        .apply {
                            if (BuildConfig.CENSOR)
                                override(5, 8)
                            else
                                override(
                                    holder.view.context.resources.displayMetrics.widthPixels,
                                    holder.view.context.resources.getDimensionPixelSize(R.dimen.reader_max_height)
                                )
                        }
                        .error(R.drawable.image_broken_variant)
                        .listener(object: RequestListener<Drawable> {
                            override fun onLoadFailed(
                                e: GlideException?,
                                model: Any?,
                                target: Target<Drawable>?,
                                isFirstResource: Boolean
                            ): Boolean {
                                cache!!.metadata.imageList?.set(position, null)
                                image.delete()
                                DownloadService.cancel(holder.view.context, galleryID)
                                DownloadService.download(holder.view.context, galleryID, true)
                                return true
                            }
                            override fun onResourceReady(
                                resource: Drawable?,
                                model: Any?,
                                target: Target<Drawable>?,
                                dataSource: DataSource?,
                                isFirstResource: Boolean
                            ) = false
                        }).let { launch(Dispatchers.Main) { it.into(holder.view.image) } }
                }
            } else {
-                holder.view.reader_item_progressbar.visibility = View.VISIBLE
+                binding.progressGroup.visibility = View.VISIBLE
-
+                binding.readerItemProgressbar.progress =
                glide.clear(holder.view.image)
                holder.view.reader_item_progressbar.progress =
                    if (progress?.isInfinite() == true)
                        100
                    else
                        progress?.roundToInt() ?: 0
-                holder.view.image.setImageDrawable(null)
+                clear()
-                timer.schedule(1000) {
+                CoroutineScope(Dispatchers.Main).launch {
-                    CoroutineScope(Dispatchers.Main).launch {
+                    delay(1000)
-                        notifyItemChanged(position)
+                    notifyItemChanged(position)
-                    }
+                }
            }
        }
        fun clear() {
            binding.image.mainView.let {
                when (it) {
                    is SubsamplingScaleImageView ->
                        it.recycle()
                    is SimpleDraweeView ->
                        it.controller = null
                }
            }
        }
    }
-    override fun getItemCount() = reader?.galleryInfo?.files?.size ?: 0
+    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): ViewHolder {
        return ViewHolder(ReaderItemBinding.inflate(LayoutInflater.from(parent.context), parent, false))
    }
    private var cache: Cache? = null
    override fun onBindViewHolder(holder: ViewHolder, position: Int) {
        holder.bind(position)
    }
    override fun getItemCount() = galleryInfo?.files?.size ?: 0
    override fun onViewRecycled(holder: ViewHolder) {
        holder.clear()
    }
 }
 class FrescoImageViewFactory : ImageViewFactory() {
    var updateView: ((ImageInfo) -> Unit)? = null
    override fun createAnimatedImageView(
        context: Context, imageType: Int,
        initScaleType: Int
    ): View {
        val view = SimpleDraweeView(context)
        view.hierarchy.actualImageScaleType = scaleType(initScaleType)
        return view
    }
    override fun loadAnimatedContent(
        view: View, imageType: Int,
        imageFile: File
    ) {
        if (view is SimpleDraweeView) {
            val controller: DraweeController = Fresco.newDraweeControllerBuilder()
                .setUri(Uri.parse("file://" + imageFile.absolutePath))
                .setAutoPlayAnimations(true)
                .setControllerListener(object: BaseControllerListener<ImageInfo>() {
                    override fun onIntermediateImageSet(id: String?, imageInfo: ImageInfo?) {
                        imageInfo?.let { updateView?.invoke(it) }
                    }
                    override fun onFinalImageSet(id: String?, imageInfo: ImageInfo?, animatable: Animatable?) {
                        imageInfo?.let { updateView?.invoke(it) }
                    }
                })
                .build()
            view.controller = controller
        }
    }
    override fun createThumbnailView(
        context: Context,
        scaleType: ImageView.ScaleType, willLoadFromNetwork: Boolean
    ): View {
        return if (willLoadFromNetwork) {
            val thumbnailView = SimpleDraweeView(context)
            thumbnailView.hierarchy.actualImageScaleType = scaleType(scaleType)
            thumbnailView
        } else {
            super.createThumbnailView(context, scaleType, false)
        }
    }
    override fun loadThumbnailContent(view: View, thumbnail: Uri) {
        if (view is SimpleDraweeView) {
            val controller: DraweeController = Fresco.newDraweeControllerBuilder()
                .setUri(thumbnail)
                .build()
            view.controller = controller
        }
    }
    private fun scaleType(value: Int): ScalingUtils.ScaleType {
        return when (value) {
            BigImageView.INIT_SCALE_TYPE_CENTER -> ScalingUtils.ScaleType.CENTER
            BigImageView.INIT_SCALE_TYPE_CENTER_CROP -> ScalingUtils.ScaleType.CENTER_CROP
            BigImageView.INIT_SCALE_TYPE_CENTER_INSIDE -> ScalingUtils.ScaleType.CENTER_INSIDE
            BigImageView.INIT_SCALE_TYPE_FIT_END -> ScalingUtils.ScaleType.FIT_END
            BigImageView.INIT_SCALE_TYPE_FIT_START -> ScalingUtils.ScaleType.FIT_START
            BigImageView.INIT_SCALE_TYPE_FIT_XY -> ScalingUtils.ScaleType.FIT_XY
            BigImageView.INIT_SCALE_TYPE_FIT_CENTER -> ScalingUtils.ScaleType.FIT_CENTER
            else -> ScalingUtils.ScaleType.FIT_CENTER
        }
    }
    private fun scaleType(scaleType: ImageView.ScaleType): ScalingUtils.ScaleType {
        return when (scaleType) {
            ImageView.ScaleType.CENTER -> ScalingUtils.ScaleType.CENTER
            ImageView.ScaleType.CENTER_CROP -> ScalingUtils.ScaleType.CENTER_CROP
            ImageView.ScaleType.CENTER_INSIDE -> ScalingUtils.ScaleType.CENTER_INSIDE
            ImageView.ScaleType.FIT_END -> ScalingUtils.ScaleType.FIT_END
            ImageView.ScaleType.FIT_START -> ScalingUtils.ScaleType.FIT_START
            ImageView.ScaleType.FIT_XY -> ScalingUtils.ScaleType.FIT_XY
            ImageView.ScaleType.FIT_CENTER -> ScalingUtils.ScaleType.FIT_CENTER
            else -> ScalingUtils.ScaleType.FIT_CENTER
        }
    }
 }
--- a/app/src/main/java/xyz/quaver/pupil/adapters/ThumbnailAdapter.kt
+++ b/app/src/main/java/xyz/quaver/pupil/adapters/ThumbnailAdapter.kt
@@ -18,32 +18,35 @@
 package xyz.quaver.pupil.adapters
 import android.net.Uri
 import android.view.ViewGroup
-import android.widget.ImageView
+import androidx.core.content.ContextCompat
 import androidx.recyclerview.widget.RecyclerView
-import com.bumptech.glide.RequestManager
+import com.github.piasy.biv.view.BigImageView
-import com.bumptech.glide.load.engine.DiskCacheStrategy
+import xyz.quaver.pupil.R
 import xyz.quaver.pupil.BuildConfig
-class ThumbnailAdapter(private val glide: RequestManager, var thumbnails: List<String>) : RecyclerView.Adapter<ThumbnailAdapter.ViewHolder>() {
+class ThumbnailAdapter(var thumbnails: List<String>) : RecyclerView.Adapter<ThumbnailAdapter.ViewHolder>() {
-    class ViewHolder(val view: ImageView) : RecyclerView.ViewHolder(view)
+    class ViewHolder(val view: BigImageView) : RecyclerView.ViewHolder(view) {
        fun clear() {
            view.ssiv?.recycle()
        }
    }
    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): ViewHolder {
-        return ViewHolder(ImageView(parent.context))
+        return ViewHolder(BigImageView(parent.context).apply {
            setFailureImage(ContextCompat.getDrawable(context, R.drawable.image_broken_variant))
        })
    }
    override fun onBindViewHolder(holder: ViewHolder, position: Int) {
-        glide
+        holder.view.showImage(Uri.parse(thumbnails[position]))
            .load(thumbnails[position])
            .diskCacheStrategy(DiskCacheStrategy.NONE)
            .apply {
                if (BuildConfig.CENSOR)
                    override(5, 8)
            }
            .into(holder.view)
    }
    override fun getItemCount() = thumbnails.size
    override fun onViewRecycled(holder: ViewHolder) {
        holder.clear()
    }
 }
--- a/app/src/main/java/xyz/quaver/pupil/adapters/ThumbnailPageAdapter.kt
+++ b/app/src/main/java/xyz/quaver/pupil/adapters/ThumbnailPageAdapter.kt
@@ -21,17 +21,19 @@ package xyz.quaver.pupil.adapters
 import android.view.ViewGroup
 import androidx.recyclerview.widget.GridLayoutManager
 import androidx.recyclerview.widget.RecyclerView
 import com.bumptech.glide.RequestManager
 import kotlin.math.min
-class ThumbnailPageAdapter(private val glide: RequestManager, private val thumbnails: List<String>) : RecyclerView.Adapter<ThumbnailPageAdapter.ViewHolder>() {
+class ThumbnailPageAdapter(private val thumbnails: List<String>) : RecyclerView.Adapter<ThumbnailPageAdapter.ViewHolder>() {
    class ViewHolder(val view: RecyclerView) : RecyclerView.ViewHolder(view)
    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): ViewHolder {
        return ViewHolder(RecyclerView(parent.context).apply {
-            layoutManager = GridLayoutManager(parent.context, 3)
+            val layoutManager = GridLayoutManager(parent.context, 3)
-            adapter = ThumbnailAdapter(glide, listOf())
+            val adapter = ThumbnailAdapter(listOf())
            this.layoutManager = layoutManager
            this.adapter = adapter
            layoutParams = ViewGroup.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.MATCH_PARENT)
        })
    }
@@ -41,7 +43,7 @@ class ThumbnailPageAdapter(private val glide: RequestManager, private val thumbn
            thumbnails = this@ThumbnailPageAdapter.thumbnails.slice(9*position until min(9*position+9, this@ThumbnailPageAdapter.thumbnails.size))
            notifyDataSetChanged()
-            holder.view.layoutManager?.scrollToPosition(itemCount-1)
+            (holder.view.layoutManager as GridLayoutManager).scrollToPosition(8)
        }
    }
--- a/app/src/main/java/xyz/quaver/pupil/adapters/TransferPeersAdapter.kt
+++ b/app/src/main/java/xyz/quaver/pupil/adapters/TransferPeersAdapter.kt
@@ -0,0 +1,44 @@
 package xyz.quaver.pupil.adapters
 import android.net.wifi.p2p.WifiP2pDevice
 import android.net.wifi.p2p.WifiP2pDeviceList
 import android.util.Log
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
 import android.widget.BaseAdapter
 import androidx.recyclerview.widget.RecyclerView
 import xyz.quaver.pupil.R
 import xyz.quaver.pupil.databinding.TransferPeerListItemBinding
 class TransferPeersAdapter(
    private val devices: Collection<WifiP2pDevice>,
    private val onDeviceSelected: (WifiP2pDevice) -> Unit
 ): RecyclerView.Adapter<TransferPeersAdapter.ViewHolder>() {
    class ViewHolder(val binding: TransferPeerListItemBinding): RecyclerView.ViewHolder(binding.root)
    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): ViewHolder {
        val binding = TransferPeerListItemBinding.inflate(
            LayoutInflater.from(parent.context),
            parent,
            false
        )
        return ViewHolder(binding)
    }
    override fun onBindViewHolder(holder: ViewHolder, position: Int) {
        val device = devices.elementAt(position)
        holder.binding.deviceName.text = device.deviceName
        holder.binding.deviceAddress.text = device.deviceAddress
        holder.binding.root.setOnClickListener {
            onDeviceSelected(device)
        }
    }
    override fun getItemCount(): Int {
        return devices.size
    }
 }
--- a/app/src/main/java/xyz/quaver/pupil/hitomi/common.kt
+++ b/app/src/main/java/xyz/quaver/pupil/hitomi/common.kt
@@ -0,0 +1,308 @@
 /*
 *    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.Dispatchers
 import kotlinx.coroutines.ExperimentalCoroutinesApi
 import kotlinx.coroutines.Job
 import kotlinx.coroutines.suspendCancellableCoroutine
 import kotlinx.coroutines.sync.Mutex
 import kotlinx.coroutines.sync.withLock
 import kotlinx.coroutines.withContext
 import kotlinx.serialization.Serializable
 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 kotlin.coroutines.resumeWithException
 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.gold-usergeneratedcontent.net"
 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.gold-usergeneratedcontent.net/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, dir: String? = null): String {
    var retval = ""
    if (base.isNullOrBlank()) {
        when {
            dir == "webp" -> retval = "w"
            dir == "avif" -> retval = "a"
        }
    }
    val b = 16
    val r = Regex("""/[0-9a-f]{61}([0-9a-f]{2})([0-9a-f])""")
    val m = r.find(url) ?: return ""
    val g = m.groupValues.let { it[2] + it[1] }.toIntOrNull(b)
    if (g != null) {
        retval = if (base.isNullOrEmpty()) {
            retval + (1 + gg.m(g)).toString()
        } else {
            (97 + gg.m(g)).toChar().toString() + base
        }
    }
    return retval
 }
 suspend fun urlFromUrl(url: String, base: String? = null, dir: String? = null): String {
    return url.replace(
        Regex("""//..?\.(?:gold-usergeneratedcontent\.net|hitomi\.la)/"""),
        "//${subdomainFromURL(url, base, dir)}.gold-usergeneratedcontent.net/"
    )
 }
 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 != '.' }
    return buildString {
        append("https://a.gold-usergeneratedcontent.net/")
        if (dir != "webp" && dir != "avif") {
            append(dir)
            append("/")
        }
        append(fullPathFromHash(image.hash))
        append(".")
        append(ext)
    }
 }
 suspend fun urlFromUrlFromHash(
    galleryID: Int,
    image: GalleryFiles,
    dir: String? = null,
    ext: String? = null,
    base: String? = null,
 ) =
    if (base == "tn")
        urlFromUrl(
            "https://a.gold-usergeneratedcontent.net/$dir/${realFullPathFromHash(image.hash)}.$ext",
            base,
        )
    else
        urlFromUrl(urlFromHash(galleryID, image, dir, ext), base, dir)
 suspend fun imageUrlFromImage(galleryID: Int, image: GalleryFiles, noWebp: Boolean): String {
    return urlFromUrlFromHash(galleryID, image, "webp")
 //    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
@@ -0,0 +1,54 @@
 /*
 *    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
@@ -0,0 +1,92 @@
 /*
 *    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
@@ -0,0 +1,38 @@
 /*
 *    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
@@ -0,0 +1,94 @@
 /*
 *    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.LinkedList
 suspend fun doSearch(query: String, sortMode: SortMode): List<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.startsWith("-"))
            negativeTerms.push(term.substring(1))
        else if (term.isNotBlank())
            positiveTerms.push(term)
    }
    val positiveResults = positiveTerms.map {
        async {
            runCatching {
                getGalleryIDsForQuery(it, sortMode)
            }.getOrElse { emptySet() }
        }
    }
    val negativeResults = negativeTerms.map {
        async {
            runCatching {
                getGalleryIDsForQuery(it, sortMode)
            }.getOrElse { emptySet() }
        }
    }
    val results = when {
        positiveTerms.isEmpty() -> getGalleryIDsFromNozomi(
            SearchArgs("all", "index", "all"),
            sortMode
        )
        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.forEach {
        filterNegative(it.await())
    }
    return@coroutineScope if (sortMode != SortMode.RANDOM) {
        results.toList()
    } else {
        results.shuffled()
    }
 }
--- a/app/src/main/java/xyz/quaver/pupil/hitomi/search.kt
+++ b/app/src/main/java/xyz/quaver/pupil/hitomi/search.kt
@@ -0,0 +1,409 @@
 /*
 *    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.json.jsonArray
 import okhttp3.Request
 import xyz.quaver.pupil.client
 import xyz.quaver.pupil.util.content
 import java.net.URL
 import java.nio.ByteBuffer
 import java.nio.ByteOrder
 import java.security.MessageDigest
 import kotlin.math.min
 data class SearchArgs(
    val area: String?,
    val tag: String,
    val language: String,
 ) {
    companion object {
        fun fromQuery(query: String): SearchArgs? {
            if (!query.contains(':')) {
                return null
            }
            val (left, right) = query.split(':')
            return when (left) {
                "male", "female" -> SearchArgs("tag", query, "all")
                "language" -> SearchArgs("all", "index", right)
                else -> SearchArgs(left, right, "all")
            }
        }
    }
 }
 enum class SortMode {
    DATE_ADDED,
    DATE_PUBLISHED,
    POPULAR_TODAY,
    POPULAR_WEEK,
    POPULAR_MONTH,
    POPULAR_YEAR,
    RANDOM;
    val orderBy: String
        get() = when (this) {
            DATE_ADDED, DATE_PUBLISHED, RANDOM -> "date"
            POPULAR_TODAY, POPULAR_WEEK, POPULAR_MONTH, POPULAR_YEAR -> "popular"
        }
    val orderByKey: String
        get() = when (this) {
            DATE_ADDED, RANDOM -> "added"
            DATE_PUBLISHED -> "published"
            POPULAR_TODAY -> "today"
            POPULAR_WEEK -> "week"
            POPULAR_MONTH -> "month"
            POPULAR_YEAR -> "year"
        }
 }
 //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") }
 val tagIndexDomain = "tagindex.hitomi.la"
 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, sortMode: SortMode): Set<Int> {
    val sanitizedQuery = query.replace("_", " ")
    val args = SearchArgs.fromQuery(sanitizedQuery)
    return if (args != null) {
        getGalleryIDsFromNozomi(args, sortMode)
    } else {
        val key = hashTerm(sanitizedQuery)
        val field = "galleries"
        val node = getNodeAtAddress(field, 0)
        val data = bSearch(field, key, node)
        if (data != null)
            return getGalleryIDsFromData(data)
        return emptySet()
    }
 }
 fun encodeSearchQueryForUrl(s: Char) =
    when (s) {
        ' ' -> "_"
        '/' -> "slash"
        '.' -> "dot"
        else -> s.toString()
    }
 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 chars = term.map(::encodeSearchQueryForUrl)
        val url =
            "https://$tagIndexDomain/$field${if (chars.isNotEmpty()) "/${chars.joinToString("/")}" else ""}.json"
        val request = Request.Builder()
            .url(url)
            .build()
        val suggestions = json.parseToJsonElement(
            client.newCall(request).execute().body()?.use { body -> body.string() }
                ?: return emptyList())
        return buildList {
            suggestions.jsonArray.forEach { suggestionRaw ->
                val suggestion = suggestionRaw.jsonArray
                if (suggestion.size < 3) {
                    return@forEach
                }
                val ns = suggestion[2].content ?: ""
                val tagname = sanitize(suggestion[0].content ?: return@forEach)
                val url = when (ns) {
                    "female", "male" -> "/tag/$ns:$tagname${separator}1$extension"
                    "language" -> "/index-$tagname${separator}1$extension"
                    else -> "/$ns/$tagname${separator}all${separator}1$extension"
                }
                add(
                    Suggestion(
                        suggestion[0].content ?: "",
                        suggestion[1].content?.toIntOrNull() ?: 0,
                        url,
                        ns
                    )
                )
            }
        }
    }
 }
 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 nozomiAddressFromArgs(args: SearchArgs, sortMode: SortMode) = when {
    sortMode != SortMode.DATE_ADDED && sortMode != SortMode.RANDOM ->
        if (args.area == "all") "$protocol//$domain/$compressed_nozomi_prefix/${sortMode.orderBy}/${sortMode.orderByKey}-${args.language}$nozomiextension"
        else "$protocol//$domain/$compressed_nozomi_prefix/${args.area}/${sortMode.orderBy}/${sortMode.orderByKey}/${args.tag}-${args.language}$nozomiextension"
    args.area == "all" -> "$protocol//$domain/$compressed_nozomi_prefix/${args.tag}-${args.language}$nozomiextension"
    else -> "$protocol//$domain/$compressed_nozomi_prefix/${args.area}/${args.tag}-${args.language}$nozomiextension"
 }
 fun getGalleryIDsFromNozomi(args: SearchArgs, sortMode: SortMode): Set<Int> {
    val nozomiAddress = nozomiAddressFromArgs(args, sortMode)
    val bytes = URL(nozomiAddress).readBytes()
    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 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,6 +24,7 @@ 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
@@ -54,13 +55,15 @@ 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" ->
-                                    FileProvider.getUriForFile(context, context.applicationContext.packageName + ".provider", File(uri.path!!)
+                                    if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N)
-                                    )
+                                        FileProvider.getUriForFile(context, context.applicationContext.packageName + ".provider", File(uri.path!!))
                                    else
                                        uri
                                "content" -> uri
                                else -> null
                            }
@@ -73,10 +76,10 @@ class UpdateBroadcastReceiver : BroadcastReceiver() {
                val notificationManager = NotificationManagerCompat.from(context)
-                val pendingIntent = PendingIntent.getActivity(context, 0, Intent(Intent.ACTION_VIEW).apply {
+                val pendingIntent = PendingIntent.getActivity(context, System.currentTimeMillis().toInt(), Intent(Intent.ACTION_VIEW).apply {
                    flags = Intent.FLAG_ACTIVITY_CLEAR_TOP or Intent.FLAG_GRANT_READ_URI_PERMISSION or Intent.FLAG_ACTIVITY_NEW_TASK
                    setDataAndType(uri, MimeTypeMap.getSingleton().getMimeTypeFromExtension("apk"))
-                }, 0)
+                }, if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.S) PendingIntent.FLAG_IMMUTABLE else 0)
                val notification = NotificationCompat.Builder(context, "update")
                    .setSmallIcon(android.R.drawable.stat_sys_download_done)
--- a/app/src/main/java/xyz/quaver/pupil/receiver/WifiDirectBroadcastReceiver.kt
+++ b/app/src/main/java/xyz/quaver/pupil/receiver/WifiDirectBroadcastReceiver.kt
@@ -0,0 +1,64 @@
 package xyz.quaver.pupil.receiver
 import android.Manifest
 import android.annotation.SuppressLint
 import android.content.BroadcastReceiver
 import android.content.Context
 import android.content.Intent
 import android.content.pm.PackageManager
 import android.net.wifi.p2p.WifiP2pManager
 import android.os.Build
 import android.os.Parcelable
 import android.util.Log
 import androidx.core.app.ActivityCompat
 import xyz.quaver.pupil.ui.ErrorType
 import xyz.quaver.pupil.ui.TransferStep
 import xyz.quaver.pupil.ui.TransferViewModel
 private inline fun <reified T : Parcelable> Intent.getParcelableExtraCompat(key: String): T? = when {
    Build.VERSION.SDK_INT >= 33 -> getParcelableExtra(key, T::class.java)
    else -> @Suppress("DEPRECATION") getParcelableExtra(key) as? T
 }
 class WifiDirectBroadcastReceiver(
    private val manager: WifiP2pManager,
    private val channel: WifiP2pManager.Channel,
    private val viewModel: TransferViewModel
 ): BroadcastReceiver() {
    @SuppressLint("MissingPermission")
    override fun onReceive(context: Context?, intent: Intent?) {
        context!!
        when (intent?.action) {
            WifiP2pManager.WIFI_P2P_STATE_CHANGED_ACTION -> {
                val state = intent.getIntExtra(WifiP2pManager.EXTRA_WIFI_STATE, -1)
                Log.d("PUPILD", "Wifi P2P state changed: $state")
                viewModel.setWifiP2pEnabled(state == WifiP2pManager.WIFI_P2P_STATE_ENABLED)
            }
            WifiP2pManager.WIFI_P2P_PEERS_CHANGED_ACTION -> {
                Log.d("PUPILD", "Wifi P2P peers changed")
                manager.requestPeers(channel) { peers ->
                    viewModel.setPeers(peers)
                }
            }
            WifiP2pManager.WIFI_P2P_CONNECTION_CHANGED_ACTION -> {
                // Respond to new connection or disconnections
                val networkInfo = intent.getParcelableExtraCompat<android.net.NetworkInfo>(WifiP2pManager.EXTRA_NETWORK_INFO)
                Log.d("PUPILD", "Wifi P2P connection changed: $networkInfo ${networkInfo?.isConnected}")
                if (networkInfo?.isConnected == true) {
                    manager.requestConnectionInfo(channel) { info ->
                        viewModel.setConnectionInfo(info)
                    }
                } else {
                    viewModel.setConnectionInfo(null)
                }
            }
            WifiP2pManager.WIFI_P2P_THIS_DEVICE_CHANGED_ACTION -> {
                // Respond to this device's wifi state changing
                Log.d("PUPILD", "Wifi P2P this device changed")
                viewModel.setThisDevice(intent.getParcelableExtraCompat(WifiP2pManager.EXTRA_WIFI_P2P_DEVICE))
            }
        }
    }
 }
--- a/app/src/main/java/xyz/quaver/pupil/services/DownloadService.kt
+++ b/app/src/main/java/xyz/quaver/pupil/services/DownloadService.kt
@@ -23,7 +23,9 @@ import android.app.PendingIntent
 import android.app.Service
 import android.content.Context
 import android.content.Intent
-import android.util.SparseArray
+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
@@ -38,18 +40,15 @@ import okhttp3.Callback
 import okhttp3.Response
 import okhttp3.ResponseBody
 import okio.*
-import xyz.quaver.pupil.PupilInterceptor
+import xyz.quaver.pupil.*
 import xyz.quaver.pupil.R
 import xyz.quaver.pupil.client
 import xyz.quaver.pupil.interceptors
 import xyz.quaver.pupil.ui.ReaderActivity
-import xyz.quaver.pupil.util.Preferences
+import xyz.quaver.pupil.util.*
 import xyz.quaver.pupil.util.downloader.Cache
 import xyz.quaver.pupil.util.downloader.DownloadManager
 import xyz.quaver.pupil.util.ellipsize
 import xyz.quaver.pupil.util.normalizeID
 import xyz.quaver.pupil.util.requestBuilders
 import java.io.IOException
 import java.util.concurrent.ConcurrentHashMap
 import kotlin.math.ceil
 import kotlin.math.log10
 private typealias ProgressListener = (DownloadService.Tag, Long, Long, Boolean) -> Unit
 class DownloadService : Service() {
@@ -68,7 +67,7 @@ class DownloadService : Service() {
            .setOngoing(true)
    }
-    private val notification = SparseArray<NotificationCompat.Builder?>()
+    private val notification = ConcurrentHashMap<Int, NotificationCompat.Builder?>()
    private fun initNotification(galleryID: Int) {
        val intent = Intent(this, ReaderActivity::class.java)
@@ -76,7 +75,7 @@ class DownloadService : Service() {
        val pendingIntent = TaskStackBuilder.create(this).run {
            addNextIntentWithParentStack(intent)
-            getPendingIntent(galleryID, PendingIntent.FLAG_UPDATE_CURRENT)
+            getPendingIntent(galleryID, PendingIntent.FLAG_UPDATE_CURRENT or if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.S) PendingIntent.FLAG_MUTABLE else 0)
        }
        val action =
            NotificationCompat.Action.Builder(0, getText(android.R.string.cancel),
@@ -86,10 +85,10 @@ class DownloadService : Service() {
                    Intent(this, DownloadService::class.java)
                        .putExtra(KEY_COMMAND, COMMAND_CANCEL)
                        .putExtra(KEY_ID, galleryID),
-                    PendingIntent.FLAG_UPDATE_CURRENT),
+                    PendingIntent.FLAG_UPDATE_CURRENT or if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.S) PendingIntent.FLAG_MUTABLE else 0),
            ).build()
-        notification.put(galleryID, NotificationCompat.Builder(this, "download").apply {
+        notification[galleryID] = NotificationCompat.Builder(this, "download").apply {
            setContentTitle(getString(R.string.reader_loading))
            setContentText(getString(R.string.reader_notification_text))
            setSmallIcon(R.drawable.ic_notification)
@@ -97,18 +96,20 @@ class DownloadService : Service() {
            addAction(action)
            setProgress(0, 0, true)
            setOngoing(true)
-        })
+        }
        notify(galleryID)
    }
-    @SuppressLint("RestrictedApi")
+    @SuppressLint("RestrictedApi", "MissingPermission")
    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))
@@ -122,7 +123,7 @@ class DownloadService : Service() {
                .setProgress(max, progress, false)
                .setContentText("$progress/$max")
-        if (DownloadManager.getInstance(this).getDownloadFolder(galleryID) != null)
+        if (DownloadManager.getInstance(this).getDownloadFolder(galleryID) != null || galleryID == priority)
            notification.let { notificationManager.notify(galleryID, it.build()) }
        else
            notificationManager.cancel(galleryID)
@@ -169,15 +170,27 @@ class DownloadService : Service() {
    private val interceptor: PupilInterceptor = { chain ->
        val request = chain.request()
        var response = chain.proceed(request)
-        var retry = 5
+        var response = kotlin.runCatching {
-        while (!response.isSuccessful && retry > 0) {
+            chain.proceed(request)
-            response = chain.proceed(request)
+        }.getOrNull()
-            retry--
+        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()
        }
-        response.newBuilder()
+        if (response == null)
            response = chain.proceed(request)
        response!!.newBuilder()
            .body(response.body()?.let {
                ProgressResponseBody(request.tag(), it, progressListener)
            }).build()
@@ -196,19 +209,19 @@ class DownloadService : Service() {
    *  0 <= value < 100 -> Download in progress
    *  Float.POSITIVE_INFINITY -> Download completed
    */
-    val progress = SparseArray<MutableList<Float>?>()
+    val progress = ConcurrentHashMap<Int, MutableList<Float>>()
    var priority = 0
    fun isCompleted(galleryID: Int) = progress[galleryID]?.toList()?.all { it == Float.POSITIVE_INFINITY } == true
    private val callback = object: Callback {
        override fun onFailure(call: Call, e: IOException) {
            Log.d("PUPILD", "ONFAILURE ${call.request().tag()}, ${e}")
            FirebaseCrashlytics.getInstance().recordException(e)
            if (e.message?.contains("cancel", true) == false) {
                val galleryID = (call.request().tag() as Tag).galleryID
                // Retry
                cancel(galleryID)
                download(galleryID)
            }
        }
@@ -216,27 +229,27 @@ class DownloadService : Service() {
            val (galleryID, index, startId) = call.request().tag() as Tag
            val ext = call.request().url().encodedPath().split('.').last()
-            kotlin.runCatching {
+            CoroutineScope(Dispatchers.IO).launch {
-                val image = response.also { if (it.code() != 200) throw IOException() }.body()?.use { it.bytes() } ?: throw Exception()
+                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()
-                CoroutineScope(Dispatchers.IO).launch {
+                    Cache.getInstance(this@DownloadService, galleryID)
-                    kotlin.runCatching {
+                        .putImage(index, "${index.toString().padStart(padding, '0')}.$ext", image)
                        Cache.getInstance(this@DownloadService, galleryID).putImage(index, "$index.$ext", image)
                    }.onSuccess {
                        progress[galleryID]?.set(index, Float.POSITIVE_INFINITY)
                        notify(galleryID)
-                        if (isCompleted(galleryID)) {
+                    progress[galleryID]?.set(index, Float.POSITIVE_INFINITY)
-                            if (DownloadManager.getInstance(this@DownloadService)
+                    notify(galleryID)
                                    .getDownloadFolder(galleryID) != null)
                                Cache.getInstance(this@DownloadService, galleryID).moveToDownload()
-                            startId?.let { stopSelf(it) }
+                    if (isCompleted(galleryID)) {
-                        }
+                        if (DownloadManager.getInstance(this@DownloadService)
-                    }.onFailure {
+                                .getDownloadFolder(galleryID) != null
-                        cancel(galleryID)
+                        )
-                        download(galleryID)
+                            Cache.getInstance(this@DownloadService, galleryID).moveToDownload()
                        startId?.let { stopSelf(it) }
                    }
                }.onFailure {
                    FirebaseCrashlytics.getInstance().recordException(it)
                }
            }
        }
@@ -287,59 +300,42 @@ class DownloadService : Service() {
    fun delete(galleryID: Int, startId: Int? = null) = CoroutineScope(Dispatchers.IO).launch {
        cancel(galleryID)
        DownloadManager.getInstance(this@DownloadService).deleteDownloadFolder(galleryID)
-        Cache.delete(galleryID)
+        Cache.delete(this@DownloadService, galleryID)
        startId?.let { stopSelf(it) }
    }
    fun download(galleryID: Int, priority: Boolean = false, startId: Int? = null): Job = CoroutineScope(Dispatchers.IO).launch {
-        if (progress.indexOfKey(galleryID) >= 0)
+        if (DownloadManager.getInstance(this@DownloadService).isDownloading(galleryID))
-            cancel(galleryID)
+            return@launch
        cleanCache(this@DownloadService)
        val cache = Cache.getInstance(this@DownloadService, galleryID)
        initNotification(galleryID)
-        val reader = cache.getReader()
+        val galleryInfo = cache.getGalleryInfo()
        // Gallery doesn't exist
-        if (reader == null) {
+        if (galleryInfo == null) {
            delete(galleryID)
-            progress.put(galleryID, null)
+            progress[galleryID] = mutableListOf()
            return@launch
        }
-        progress.put(galleryID, MutableList(reader.galleryInfo.files.size) { 0F })
+        histories.add(galleryID)
-        FirebaseCrashlytics.getInstance().log(
+        progress[galleryID] = MutableList(galleryInfo.files.size) { 0F }
            """
                GALLERYID: $galleryID
                CACHE: ${cache.findFile(".metadata")}
                PATTERN: ${Preferences["download_folder_name", ""]}
                READER ID: ${reader.galleryInfo.id}
                READER SIZE: ${reader.galleryInfo.files.size}
                CACHE READER ID: ${cache.metadata.reader?.galleryInfo?.id}}
                CACHE READER SIZE: ${cache.metadata.reader?.galleryInfo?.files?.size}
            """.trimIndent()
        )
        cache.metadata.imageList?.let {
            if (progress[galleryID]?.size != it.size) {
                cache.metadata.imageList?.filterNotNull()?.forEach { file ->
                    cache.findFile(file)?.delete()
                }
                cache.metadata.imageList = MutableList(reader.galleryInfo.files.size) { null }
                return@let
            }
            it.forEachIndexed { index, image ->
                progress[galleryID]?.set(index, if (image != null) Float.POSITIVE_INFINITY else 0F)
            }
        }
        if (isCompleted(galleryID)) {
-            if (DownloadManager.getInstance(this@DownloadService)
+            if (DownloadManager.getInstance(this@DownloadService).getDownloadFolder(galleryID) != null)
                    .getDownloadFolder(galleryID) != null )
                Cache.getInstance(this@DownloadService, galleryID).moveToDownload()
            notificationManager.cancel(galleryID)
@@ -347,7 +343,7 @@ class DownloadService : Service() {
            return@launch
        }
-        notification[galleryID]?.setContentTitle(reader.galleryInfo.title?.ellipsize(30))
+        notification[galleryID]?.setContentTitle(galleryInfo.title.ellipsize(32))
        notify(galleryID)
        val queued = mutableSetOf<Int>()
@@ -361,8 +357,8 @@ class DownloadService : Service() {
            }
        }
-        reader.requestBuilders.forEachIndexed { index, it ->
+        galleryInfo.getRequestBuilders().forEachIndexed { index, it ->
-            if (progress[galleryID]?.get(index)?.isInfinite() != true) {
+            if (progress[galleryID]?.get(index)?.isInfinite() == false) {
                val request = it.tag(Tag(galleryID, index, startId)).build()
                client.newCall(request).enqueue(callback)
            }
@@ -409,7 +405,11 @@ class DownloadService : Service() {
    }
    override fun onStartCommand(intent: Intent?, flags: Int, startId: Int): Int {
-        startForeground(R.id.downloader_notification_id, serviceNotification.build())
+        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_DATA_SYNC)
        }
        when (intent?.getStringExtra(KEY_COMMAND)) {
            COMMAND_DOWNLOAD -> intent.getIntExtra(KEY_ID, -1).let { if (it > 0)
@@ -430,7 +430,11 @@ class DownloadService : Service() {
    override fun onBind(p0: Intent?) = binder
    override fun onCreate() {
-        startForeground(R.id.downloader_notification_id, serviceNotification.build())
+        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_DATA_SYNC)
        }
        interceptors[Tag::class] = interceptor
    }
--- a/app/src/main/java/xyz/quaver/pupil/services/TransferClientService.kt
+++ b/app/src/main/java/xyz/quaver/pupil/services/TransferClientService.kt
@@ -0,0 +1,128 @@
 package xyz.quaver.pupil.services
 import android.app.Service
 import android.content.Intent
 import android.content.pm.ServiceInfo
 import android.os.Build
 import android.os.IBinder
 import android.util.Log
 import androidx.core.app.NotificationCompat
 import androidx.core.app.ServiceCompat
 import io.ktor.network.selector.SelectorManager
 import io.ktor.network.sockets.aSocket
 import io.ktor.network.sockets.openReadChannel
 import io.ktor.network.sockets.openWriteChannel
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.DelicateCoroutinesApi
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.Job
 import kotlinx.coroutines.channels.Channel
 import kotlinx.coroutines.channels.trySendBlocking
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.withTimeout
 import xyz.quaver.pupil.R
 import kotlin.coroutines.Continuation
 import kotlin.coroutines.resume
 import kotlin.coroutines.suspendCoroutine
 class TransferClientService : Service() {
    private val selectorManager = SelectorManager(Dispatchers.IO)
    private val channel = Channel<Pair<TransferPacket, Continuation<TransferPacket>>>()
    private var job: Job? = null
    private fun startForeground() = runCatching {
        val notification = NotificationCompat.Builder(this, "transfer")
            .setContentTitle("Pupil")
            .setContentText("Transfer server is running")
            .setSmallIcon(R.drawable.ic_notification)
            .build()
        ServiceCompat.startForeground(
            this,
            1,
            notification,
            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) {
                ServiceInfo.FOREGROUND_SERVICE_TYPE_DATA_SYNC
            } else 0
        )
    }
    override fun onStartCommand(intent: Intent?, flags: Int, startId: Int): Int {
        val address = intent?.getStringExtra("address") ?: run {
            stopSelf(startId)
            return START_STICKY
        }
        startForeground()
        Log.d("PUPILD", "Starting service with address $address")
        job?.cancel()
        job = CoroutineScope(Dispatchers.IO).launch {
            Log.d("PUPILD", "Connecting to $address")
            val socket = aSocket(selectorManager).tcp().connect(address, 12221)
            Log.d("PUPILD", "Connected to $address")
            val readChannel = socket.openReadChannel()
            val writeChannel = socket.openWriteChannel(autoFlush = true)
            runCatching {
                TransferPacket.Hello().writeToChannel(writeChannel)
                val handshake = TransferPacket.readFromChannel(readChannel)
                if (handshake !is TransferPacket.Hello || handshake.version != TRANSFER_PROTOCOL_VERSION) {
                    throw IllegalStateException("Invalid handshake")
                }
                while (true) {
                    val (packet, continuation) = channel.receive()
                    Log.d("PUPILD", "Sending packet $packet")
                    packet.writeToChannel(writeChannel)
                    val response = TransferPacket.readFromChannel(readChannel).also {
                        Log.d("PUPILD", "Received packet $it")
                    }
                    continuation.resume(response)
                }
            }.onFailure {
                Log.d("PUPILD", "Connection closed with error $it")
                channel.close()
                socket.close()
                stopSelf(startId)
            }
        }
        return START_STICKY
    }
    override fun onDestroy() {
        super.onDestroy()
        job?.cancel()
    }
    inner class Binder: android.os.Binder() {
        @OptIn(DelicateCoroutinesApi::class)
        suspend fun sendPacket(packet: TransferPacket): Result<TransferPacket.ListResponse> = runCatching {
            check(job != null) { "Service not running" }
            check(!channel.isClosedForSend) { "Service not running" }
            val response = suspendCoroutine { continuation ->
                check (channel.trySend(packet to continuation).isSuccess) { "Service not running" }
            }
            check (response is TransferPacket.ListResponse) { "Invalid response" }
            response
        }
    }
    private val binder = Binder()
    override fun onBind(intent: Intent?): IBinder = binder
 }
--- a/app/src/main/java/xyz/quaver/pupil/services/TransferProtocol.kt
+++ b/app/src/main/java/xyz/quaver/pupil/services/TransferProtocol.kt
@@ -0,0 +1,94 @@
 package xyz.quaver.pupil.services
 import io.ktor.utils.io.ByteReadChannel
 import io.ktor.utils.io.ByteWriteChannel
 const val TRANSFER_PROTOCOL_VERSION: UByte = 1u
 enum class TransferType(val value: UByte) {
    INVALID(255u),
    HELLO(0u),
    PING(1u),
    PONG(2u),
    LIST_REQUEST(3u),
    LIST_RESPONSE(4u),
 }
 sealed interface TransferPacket {
    val type: TransferType
    suspend fun writeToChannel(channel: ByteWriteChannel)
    data class Hello(val version: UByte = TRANSFER_PROTOCOL_VERSION): TransferPacket {
        override val type = TransferType.HELLO
        override suspend fun writeToChannel(channel: ByteWriteChannel) {
            channel.writeByte(type.value.toByte())
            channel.writeByte(version.toByte())
        }
    }
    data object Ping: TransferPacket {
        override val type = TransferType.PING
        override suspend fun writeToChannel(channel: ByteWriteChannel) {
            channel.writeByte(type.value.toByte())
        }
    }
    data object Pong: TransferPacket {
        override val type = TransferType.PONG
        override suspend fun writeToChannel(channel: ByteWriteChannel) {
            channel.writeByte(type.value.toByte())
        }
    }
    data object ListRequest: TransferPacket {
        override val type = TransferType.LIST_REQUEST
        override suspend fun writeToChannel(channel: ByteWriteChannel) {
            channel.writeByte(type.value.toByte())
        }
    }
    data object Invalid: TransferPacket {
        override val type = TransferType.INVALID
        override suspend fun writeToChannel(channel: ByteWriteChannel) {
            channel.writeByte(type.value.toByte())
        }
    }
    data class ListResponse(
        val favoritesCount: Int,
        val historyCount: Int,
        val downloadsCount: Int,
    ): TransferPacket {
        override val type = TransferType.LIST_RESPONSE
        override suspend fun writeToChannel(channel: ByteWriteChannel) {
            channel.writeByte(type.value.toByte())
            channel.writeInt(favoritesCount)
            channel.writeInt(historyCount)
            channel.writeInt(downloadsCount)
        }
    }
    companion object {
        suspend fun readFromChannel(channel: ByteReadChannel): TransferPacket {
            return when(val type = channel.readByte().toUByte()) {
                TransferType.HELLO.value -> {
                    val version = channel.readByte().toUByte()
                    Hello(version)
                }
                TransferType.PING.value -> Ping
                TransferType.PONG.value -> Pong
                TransferType.LIST_REQUEST.value -> ListRequest
                TransferType.LIST_RESPONSE.value -> {
                    val favoritesCount = channel.readInt()
                    val historyCount = channel.readInt()
                    val downloadsCount = channel.readInt()
                    ListResponse(favoritesCount, historyCount, downloadsCount)
                }
                else -> throw IllegalArgumentException("Unknown packet type: $type")
            }
        }
    }
 }
--- a/app/src/main/java/xyz/quaver/pupil/services/TransferServerService.kt
+++ b/app/src/main/java/xyz/quaver/pupil/services/TransferServerService.kt
@@ -0,0 +1,123 @@
 package xyz.quaver.pupil.services
 import android.app.Service
 import android.content.Intent
 import android.content.pm.ServiceInfo
 import android.os.Build
 import android.os.IBinder
 import android.util.Log
 import androidx.core.app.NotificationCompat
 import androidx.core.app.ServiceCompat
 import io.ktor.network.selector.SelectorManager
 import io.ktor.network.sockets.ServerSocket
 import io.ktor.network.sockets.Socket
 import io.ktor.network.sockets.aSocket
 import io.ktor.network.sockets.openReadChannel
 import io.ktor.network.sockets.openWriteChannel
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.Job
 import kotlinx.coroutines.channels.Channel
 import kotlinx.coroutines.launch
 import xyz.quaver.pupil.R
 import xyz.quaver.pupil.favorites
 import xyz.quaver.pupil.histories
 import xyz.quaver.pupil.util.downloader.DownloadManager
 class TransferServerService : Service() {
    private val selectorManager = SelectorManager(Dispatchers.IO)
    private var serverSocket: ServerSocket? = null
    private val job = Job()
    private fun startForeground() = runCatching {
        val notification = NotificationCompat.Builder(this, "transfer")
            .setContentTitle("Pupil")
            .setContentText("Transfer server is running")
            .setSmallIcon(R.drawable.ic_notification)
            .build()
        ServiceCompat.startForeground(
            this,
            1,
            notification,
            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) {
                ServiceInfo.FOREGROUND_SERVICE_TYPE_DATA_SYNC
            } else 0
        )
    }
    private fun generateListResponse(): TransferPacket.ListResponse {
        val favoritesCount = favorites.size
        val historyCount = histories.size
        val downloadsCount = DownloadManager.getInstance(this).downloadFolderMap.size
        return TransferPacket.ListResponse(favoritesCount, historyCount, downloadsCount)
    }
    private suspend fun handleConnection(socket: Socket) {
        val readChannel = socket.openReadChannel()
        val writeChannel = socket.openWriteChannel(autoFlush = true)
        runCatching {
            while (true) {
                val packet = TransferPacket.readFromChannel(readChannel)
                Log.d("PUPILD", "Received packet $packet")
                binder.channel.trySend(packet)
                val response = when (packet) {
                    is TransferPacket.Hello -> TransferPacket.Hello()
                    is TransferPacket.Ping -> TransferPacket.Pong
                    is TransferPacket.ListRequest -> generateListResponse()
                    else -> TransferPacket.Invalid
                }
                response.writeToChannel(writeChannel)
            }
        }.onFailure {
            socket.close()
        }
    }
    override fun onStartCommand(intent: Intent?, flags: Int, startId: Int): Int {
        val address = intent?.getStringExtra("address") ?: run {
            stopSelf(startId)
            return START_STICKY
        }
        if (serverSocket != null) {
            return START_STICKY
        }
        startForeground()
        val serverSocket = aSocket(selectorManager).tcp().bind(address, 12221).also {
            this@TransferServerService.serverSocket = it
        }
        CoroutineScope(Dispatchers.IO + job).launch {
            while (true) {
                Log.d("PUPILD", "Waiting for connection")
                val socket = serverSocket.accept()
                Log.d("PUPILD", "Accepted connection from ${socket.remoteAddress}")
                launch { handleConnection(socket) }
            }
        }
        return START_STICKY
    }
    override fun onDestroy() {
        super.onDestroy()
        job.cancel()
        serverSocket?.close()
    }
    inner class Binder: android.os.Binder() {
        val channel = Channel<TransferPacket>()
    }
    private val binder = Binder()
    override fun onBind(intent: Intent?): IBinder = binder
 }
--- a/app/src/main/java/xyz/quaver/pupil/types/SendLogException.kt
+++ b/app/src/main/java/xyz/quaver/pupil/types/SendLogException.kt
@@ -1,6 +1,6 @@
 /*
 *     Pupil, Hitomi.la viewer for Android
- *     Copyright (C) 2020  tom5079
+ *     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
@@ -16,26 +16,7 @@
 *     along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
-package xyz.quaver.pupil
+package xyz.quaver.pupil.types
-import android.content.Context
+class SendLogException : Exception()
-import com.bumptech.glide.Glide
+class JavascriptException(message: String?) : Exception(message)
 import com.bumptech.glide.Registry
 import com.bumptech.glide.annotation.GlideModule
 import com.bumptech.glide.integration.okhttp3.OkHttpUrlLoader
 import com.bumptech.glide.load.model.GlideUrl
 import com.bumptech.glide.module.AppGlideModule
 import java.io.InputStream
@GlideModule
 class PupilGlideModule : AppGlideModule() {
    override fun registerComponents(context: Context, glide: Glide, registry: Registry) {
        registry.append(
            GlideUrl::class.java,
            InputStream::class.java,
            OkHttpUrlLoader.Factory(client)
        )
    }
 }
--- a/app/src/main/java/xyz/quaver/pupil/types/Suggestions.kt
+++ b/app/src/main/java/xyz/quaver/pupil/types/Suggestions.kt
@@ -18,36 +18,33 @@
 package xyz.quaver.pupil.types
-import com.arlib.floatingsearchview.suggestions.model.SearchSuggestion
+import kotlinx.parcelize.IgnoredOnParcel
-import kotlinx.android.parcel.Parcelize
+import kotlinx.parcelize.Parcelize
-import xyz.quaver.hitomi.Suggestion
+import xyz.quaver.floatingsearchview.suggestions.model.SearchSuggestion
 import xyz.quaver.pupil.hitomi.Suggestion
 import xyz.quaver.pupil.util.translations
@Parcelize
 data class TagSuggestion(val s: String, val t: Int, val u: String, val n: String) : SearchSuggestion {
    constructor(s: Suggestion) : this(s.s, s.t, s.u, s.n)
-    override fun getBody(): String {
+    @IgnoredOnParcel
-        return s
+    override val body =
-    }
+        if (translations[s] != null)
            "${translations[s]} ($s)"
        else
            s
 }
@Parcelize
-class Suggestion(val str: String) : SearchSuggestion {
+class Suggestion(override val body: String) : SearchSuggestion
    override fun getBody() = str
 }
@Parcelize
-class NoResultSuggestion(val str: String) : SearchSuggestion {
+class NoResultSuggestion(override val body: String) : SearchSuggestion
    override fun getBody() = str
 }
@Parcelize
-class LoadingSuggestion(val str: String) : SearchSuggestion {
+class LoadingSuggestion(override val body: String) : SearchSuggestion
    override fun getBody() = str
 }
@Parcelize
@Suppress("PARCELABLE_PRIMARY_CONSTRUCTOR_IS_EMPTY")
-class FavoriteHistorySwitch(private val body: String) : SearchSuggestion {
+class FavoriteHistorySwitch(override val body: String) : SearchSuggestion
    override fun getBody() = body
 }
--- a/app/src/main/java/xyz/quaver/pupil/ui/BaseActivity.kt
+++ b/app/src/main/java/xyz/quaver/pupil/ui/BaseActivity.kt
@@ -23,6 +23,7 @@ import android.content.Intent
 import android.os.Bundle
 import android.os.PersistableBundle
 import android.view.WindowManager
 import androidx.activity.result.contract.ActivityResultContracts
 import androidx.annotation.CallSuper
 import androidx.appcompat.app.AppCompatActivity
 import xyz.quaver.pupil.R
@@ -34,6 +35,13 @@ open class BaseActivity : AppCompatActivity() {
    private var locked: Boolean = true
    private val lockLauncher = registerForActivityResult(ActivityResultContracts.StartActivityForResult()) {
        if (it.resultCode == Activity.RESULT_OK)
            locked = false
        else
            finish()
    }
    @CallSuper
    override fun onCreate(savedInstanceState: Bundle?, persistentState: PersistableBundle?) {
        super.onCreate(savedInstanceState, persistentState)
@@ -53,20 +61,7 @@ open class BaseActivity : AppCompatActivity() {
            window.clearFlags(WindowManager.LayoutParams.FLAG_SECURE)
        if (locked)
-            startActivityForResult(Intent(this, LockActivity::class.java), R.id.request_lock.normalizeID())
+            lockLauncher.launch(Intent(this, LockActivity::class.java))
    }
    @CallSuper
    override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?) {
        when(requestCode) {
            R.id.request_lock.normalizeID() -> {
                if (resultCode == Activity.RESULT_OK)
                    locked = false
                else
                    finish()
            }
            else -> super.onActivityResult(requestCode, resultCode, data)
        }
    }
 }
--- a/app/src/main/java/xyz/quaver/pupil/ui/LockActivity.kt
+++ b/app/src/main/java/xyz/quaver/pupil/ui/LockActivity.kt
@@ -29,10 +29,8 @@ 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
@@ -45,6 +43,8 @@ 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
-                        lock_pattern_view.setViewMode(PatternLockView.PatternViewMode.WRONG)
+                        binding.patternLockView.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 {
-                            lock_pattern_view.setViewMode(PatternLockView.PatternViewMode.WRONG)
+                            binding.patternLockView.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 {
-                        indicator_dots.startAnimation(AnimationUtils.loadAnimation(context, R.anim.shake).apply {
+                        binding.indicatorDots.startAnimation(AnimationUtils.loadAnimation(context, R.anim.shake).apply {
                            setAnimationListener(object: Animation.AnimationListener {
                                override fun onAnimationEnd(animation: Animation?) {
-                                    pin_lock_view.resetPinLockView()
+                                    binding.pinLockView.resetPinLockView()
-                                    pin_lock_view.isEnabled = true
+                                    binding.pinLockView.isEnabled = true
                                }
                                override fun onAnimationStart(animation: Animation?) {
-                                    pin_lock_view.isEnabled = false
+                                    binding.pinLockView.isEnabled = false
                                }
                                override fun onAnimationRepeat(animation: Animation?) {
@@ -114,22 +114,22 @@ class LockActivity : AppCompatActivity() {
                    if (lastPass.isEmpty()) {
                        lastPass = it
-                        pin_lock_view.resetPinLockView()
+                        binding.pinLockView.resetPinLockView()
                        Snackbar.make(view!!, R.string.settings_lock_confirm, Snackbar.LENGTH_LONG).show()
                    } else {
                        if (lastPass == it) {
                            LockManager(context!!).add(Lock.generate(Lock.Type.PIN, it))
                            finish()
                        } else {
-                            indicator_dots.startAnimation(AnimationUtils.loadAnimation(context, R.anim.shake).apply {
+                            binding.indicatorDots.startAnimation(AnimationUtils.loadAnimation(context, R.anim.shake).apply {
                                setAnimationListener(object: Animation.AnimationListener {
                                    override fun onAnimationEnd(animation: Animation?) {
-                                        pin_lock_view.resetPinLockView()
+                                        binding.pinLockView.resetPinLockView()
-                                        pin_lock_view.isEnabled = true
+                                        binding.pinLockView.isEnabled = true
                                    }
                                    override fun onAnimationStart(animation: Animation?) {
-                                        pin_lock_view.isEnabled = false
+                                        binding.pinLockView.isEnabled = false
                                    }
                                    override fun onAnimationRepeat(animation: Animation?) {
@@ -173,7 +173,8 @@ class LockActivity : AppCompatActivity() {
    override fun onCreate(savedInstanceState: Bundle?) {
        super.onCreate(savedInstanceState)
-        setContentView(R.layout.activity_lock)
+        binding = LockActivityBinding.inflate(layoutInflater)
        setContentView(binding.root)
        lockManager = try {
            LockManager(this)
@@ -210,7 +211,7 @@ class LockActivity : AppCompatActivity() {
                    Preferences["lock_fingerprint"]
                    && BiometricManager.from(this).canAuthenticate() == BiometricManager.BIOMETRIC_SUCCESS
                ) {
-                    lock_fingerprint.apply {
+                    binding.fingerprintBtn.apply {
                        isEnabled = true
                        setOnClickListener {
                            showBiometricPrompt()
@@ -219,7 +220,7 @@ class LockActivity : AppCompatActivity() {
                    showBiometricPrompt()
                }
-                lock_pattern.apply {
+                binding.patternBtn.apply {
                    isEnabled = lockManager.contains(Lock.Type.PATTERN)
                    setOnClickListener {
                        supportFragmentManager.beginTransaction().replace(
@@ -227,7 +228,7 @@ class LockActivity : AppCompatActivity() {
                        ).commit()
                    }
                }
-                lock_pin.apply {
+                binding.pinBtn.apply {
                    isEnabled = lockManager.contains(Lock.Type.PIN)
                    setOnClickListener {
                        supportFragmentManager.beginTransaction().replace(
@@ -235,7 +236,7 @@ class LockActivity : AppCompatActivity() {
                        ).commit()
                    }
                }
-                lock_password.isEnabled = false
+                binding.passwordBtn.isEnabled = false
                when (lockManager.locks!!.first().type) {
                    Lock.Type.PIN -> {
@@ -253,20 +254,20 @@ class LockActivity : AppCompatActivity() {
                }
            }
            "add_lock" -> {
-                lock_pattern.isEnabled = false
+                binding.patternBtn.isEnabled = false
-                lock_pin.isEnabled = false
+                binding.pinBtn.isEnabled = false
-                lock_fingerprint.isEnabled = false
+                binding.fingerprintBtn.isEnabled = false
-                lock_password.isEnabled = false
+                binding.passwordBtn.isEnabled = false
                when(intent.getStringExtra("type")!!) {
                    "pattern" -> {
-                        lock_pattern.isEnabled = true
+                        binding.patternBtn.isEnabled = true
                        supportFragmentManager.beginTransaction().add(
                            R.id.lock_content, patternLockFragment
                        ).commit()
                    }
                    "pin" -> {
-                        lock_pin.isEnabled = true
+                        binding.pinBtn.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
--- a/app/src/main/java/xyz/quaver/pupil/ui/ReaderActivity.kt
+++ b/app/src/main/java/xyz/quaver/pupil/ui/ReaderActivity.kt
@@ -33,43 +33,37 @@ import android.view.animation.Animation
 import android.view.animation.AnticipateInterpolator
 import android.view.animation.OvershootInterpolator
 import android.view.animation.TranslateAnimation
 import android.widget.Toast
 import androidx.activity.result.contract.ActivityResultContracts
 import androidx.appcompat.app.AlertDialog
 import androidx.core.content.ContextCompat
 import androidx.preference.PreferenceManager
 import androidx.recyclerview.widget.LinearLayoutManager
 import androidx.recyclerview.widget.PagerSnapHelper
 import androidx.recyclerview.widget.RecyclerView
 import androidx.vectordrawable.graphics.drawable.Animatable2Compat
 import androidx.vectordrawable.graphics.drawable.AnimatedVectorDrawableCompat
 import com.bumptech.glide.Glide
 import com.google.android.material.snackbar.Snackbar
 import com.google.firebase.crashlytics.FirebaseCrashlytics
 import com.google.mlkit.vision.face.Face
 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.histories
 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
 import java.util.*
 import kotlin.concurrent.schedule
 class ReaderActivity : BaseActivity() {
@@ -81,14 +75,19 @@ class ReaderActivity : BaseActivity() {
    set(value) {
        field = value
-        (reader_recyclerview.adapter as ReaderAdapter).isFullScreen = value
+        (binding.recyclerview.adapter as ReaderAdapter).isFullScreen = value
    }
    private lateinit var cache: Cache
    var downloader: DownloadService? = null
    private val conn = object: ServiceConnection {
        override fun onServiceConnected(name: ComponentName?, service: IBinder?) {
-            downloader = (service as DownloadService.Binder).service
+            downloader = (service as DownloadService.Binder).service.also {
                it.priority = 0
                if (!it.progress.containsKey(galleryID))
                    DownloadService.download(this@ReaderActivity, galleryID, true)
            }
        }
        override fun onServiceDisconnected(name: ComponentName?) {
@@ -96,7 +95,6 @@ class ReaderActivity : BaseActivity() {
        }
    }
    private val timer = Timer()
    private val snapHelper = PagerSnapHelper()
    private var menu: Menu? = null
@@ -118,12 +116,20 @@ class ReaderActivity : BaseActivity() {
    private var cameraEnabled = false
    private var eyeType: Eye? = null
    private var eyeCount: Int = 0
    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)
-        setContentView(R.layout.activity_reader)
+        binding = ReaderActivityBinding.inflate(layoutInflater)
        setContentView(binding.root)
        title = getString(R.string.reader_loading)
        supportActionBar?.setDisplayHomeAsUpEnabled(false)
@@ -137,38 +143,7 @@ class ReaderActivity : BaseActivity() {
            return
        }
-        if (Preferences["cache_disable"]) {
+        initDownloadListener()
            reader_download_progressbar.visibility = View.GONE
            CoroutineScope(Dispatchers.IO).launch {
                val reader = cache.getReader()
                launch(Dispatchers.Main) initDownloader@{
                    if (reader == null) {
                        Snackbar
                            .make(reader_layout, R.string.reader_failed_to_find_gallery, Snackbar.LENGTH_INDEFINITE)
                            .show()
                        return@initDownloader
                    }
                    histories.add(galleryID)
                    (reader_recyclerview.adapter as ReaderAdapter).apply {
                        this.reader = reader
                        notifyDataSetChanged()
                    }
                    title = reader.galleryInfo.title ?: ""
                    menu?.findItem(R.id.reader_menu_page_indicator)?.title = "$currentPage/${reader.galleryInfo.files.size}"
                    menu?.findItem(R.id.reader_type)?.icon = ContextCompat.getDrawable(this@ReaderActivity,
                        when (reader.code) {
                            Code.HITOMI -> R.drawable.hitomi
                            Code.HIYOBI -> R.drawable.ic_hiyobi
                            else -> android.R.color.transparent
                        })
                }
            }
        } else
            initDownloader()
        initView()
    }
@@ -182,10 +157,11 @@ class ReaderActivity : BaseActivity() {
            val uri = intent.data
            val lastPathSegment = uri?.lastPathSegment
            if (uri != null && lastPathSegment != null) {
-                galleryID = when (uri.host) {
+                galleryID = if (uri.host?.endsWith("hasha.in") == true) {
                    lastPathSegment?.toInt() ?: 0
                } else 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
                }
@@ -195,12 +171,10 @@ 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()
        }
@@ -212,17 +186,19 @@ class ReaderActivity : BaseActivity() {
    override fun onOptionsItemSelected(item: MenuItem): Boolean {
        when(item.itemId) {
            R.id.reader_menu_page_indicator -> {
-                val view = LayoutInflater.from(this).inflate(R.layout.dialog_numberpicker, reader_layout, false)
+                // TODO: Switch to DialogFragment
-                with(view.dialog_number_picker) {
+                val binding = NumberpickerDialogBinding.inflate(layoutInflater, binding.root, false)
                with(binding.numberPicker) {
                    minValue = 1
-                    maxValue = cache.metadata.reader?.galleryInfo?.files?.size ?: 0
+                    maxValue = cache.metadata.galleryInfo?.files?.size ?: 0
                    value = currentPage
                }
                val dialog = AlertDialog.Builder(this).apply {
-                    setView(view)
+                    setView(binding.root)
                }.create()
-                view.dialog_ok.setOnClickListener {
+                binding.okButton.setOnClickListener {
-                    (reader_recyclerview.layoutManager as LinearLayoutManager?)?.scrollToPositionWithOffset(view.dialog_number_picker.value-1, 0)
+                    (this@ReaderActivity.binding.recyclerview.layoutManager as LinearLayoutManager).scrollToPositionWithOffset(binding.numberPicker.value-1, 0)
                    dialog.dismiss()
                }
@@ -248,6 +224,8 @@ class ReaderActivity : BaseActivity() {
    override fun onResume() {
        super.onResume()
        bindService(Intent(this, DownloadService::class.java), conn, BIND_AUTO_CREATE)
        if (cameraEnabled)
            startCamera(this, cameraCallback)
    }
@@ -255,19 +233,20 @@ class ReaderActivity : BaseActivity() {
    override fun onPause() {
        super.onPause()
        closeCamera()
        if (downloader != null)
            unbindService(conn)
        downloader?.priority = galleryID
    }
    override fun onDestroy() {
        super.onDestroy()
-        timer.cancel()
+        update = false
        (reader_recyclerview?.adapter as? ReaderAdapter)?.timer?.cancel()
        if (!DownloadManager.getInstance(this).isDownloading(galleryID))
            DownloadService.cancel(this, galleryID)
        if (downloader != null)
            unbindService(conn)
    }
    override fun onBackPressed() {
@@ -289,12 +268,12 @@ class ReaderActivity : BaseActivity() {
        //currentPage is 1-based
        return when(keyCode) {
            KeyEvent.KEYCODE_VOLUME_UP -> {
-                (reader_recyclerview.layoutManager as LinearLayoutManager?)?.scrollToPositionWithOffset(currentPage-2, 0)
+                (binding.recyclerview.layoutManager as LinearLayoutManager).scrollToPositionWithOffset(currentPage-2, 0)
                true
            }
            KeyEvent.KEYCODE_VOLUME_DOWN -> {
-                (reader_recyclerview.layoutManager as LinearLayoutManager?)?.scrollToPositionWithOffset(currentPage, 0)
+                (binding.recyclerview.layoutManager as LinearLayoutManager?)?.scrollToPositionWithOffset(currentPage, 0)
                true
            }
@@ -302,52 +281,49 @@ class ReaderActivity : BaseActivity() {
        }
    }
-    private fun initDownloader() {
+    private var update = true
-        DownloadService.download(this, galleryID, true)
+    private fun initDownloadListener() {
-        bindService(Intent(this, DownloadService::class.java), conn, BIND_AUTO_CREATE)
+        CoroutineScope(Dispatchers.Main).launch {
            while (update) {
                delay(1000)
-        timer.schedule(1000, 1000) {
+                val downloader = downloader ?: continue
            val downloader = downloader ?: return@schedule
-            if (downloader.progress.indexOfKey(galleryID) < 0)  //loading
+                if (!downloader.progress.containsKey(galleryID))  //loading
-                return@schedule
+                    continue
-            if (downloader.progress[galleryID] == null) {      //Gallery not found
+                if (downloader.progress[galleryID]?.isEmpty() == true) {      //Gallery not found
-                timer.cancel()
+                    update = false
-                Snackbar
+                    Snackbar
-                    .make(reader_layout, R.string.reader_failed_to_find_gallery, Snackbar.LENGTH_INDEFINITE)
+                        .make(binding.root, R.string.reader_failed_to_find_gallery, Snackbar.LENGTH_INDEFINITE)
-                    .show()
+                        .show()
            }
-            histories.add(galleryID)
+                    return@launch
                }
-            runOnUiThread {
+                binding.downloadProgressbar.max = binding.recyclerview.adapter?.itemCount ?: 0
-                reader_download_progressbar.max = reader_recyclerview.adapter?.itemCount ?: 0
+                binding.downloadProgressbar.progress =
-                reader_download_progressbar.progress = downloader.progress[galleryID]?.count { it.isInfinite() } ?: 0
+                    downloader.progress[galleryID]?.count { it.isInfinite() } ?: 0
                if (title == getString(R.string.reader_loading)) {
-                    val reader = cache.metadata.reader
+                    val galleryInfo = cache.metadata.galleryInfo
-                    if (reader != null) {
+                    if (galleryInfo != null) {
-                        with (reader_recyclerview.adapter as ReaderAdapter) {
+                        with(binding.recyclerview.adapter as ReaderAdapter) {
-                            this.reader = reader
+                            this.galleryInfo = galleryInfo
                            notifyDataSetChanged()
                        }
-                        title = reader.galleryInfo.title
+                        title = galleryInfo.title
-                        menu?.findItem(R.id.reader_menu_page_indicator)?.title = "$currentPage/${reader.galleryInfo.files.size}"
+                        menu?.findItem(R.id.reader_menu_page_indicator)?.title =
                            "$currentPage/${galleryInfo.files.size}"
-                        menu?.findItem(R.id.reader_type)?.icon = ContextCompat.getDrawable(this@ReaderActivity,
+                        menu?.findItem(R.id.reader_type)?.icon = ContextCompat.getDrawable(this@ReaderActivity, R.drawable.hitomi)
                            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
-                    reader_download_progressbar.visibility = View.GONE
+                    binding.downloadProgressbar.visibility = View.GONE
                    animateDownloadFAB(false)
                }
@@ -356,7 +332,7 @@ class ReaderActivity : BaseActivity() {
    }
    private fun initView() {
-        with(reader_recyclerview) {
+        with(binding.recyclerview) {
            adapter = ReaderAdapter(this@ReaderActivity, galleryID).apply {
                onItemClickListener = {
                    if (isScroll) {
@@ -366,7 +342,7 @@ class ReaderActivity : BaseActivity() {
                        scrollMode(false)
                        fullscreen(true)
                    } else {
-                        (reader_recyclerview.layoutManager as LinearLayoutManager?)?.scrollToPosition(currentPage) //Moves to next page because currentPage is 1-based indexing
+                        (binding.recyclerview.layoutManager as LinearLayoutManager).scrollToPositionWithOffset(currentPage, 0) //Moves to next page because currentPage is 1-based indexing
                    }
                }
            }
@@ -376,9 +352,9 @@ class ReaderActivity : BaseActivity() {
                    super.onScrolled(recyclerView, dx, dy)
                    if (dy < 0)
-                        this@ReaderActivity.reader_fab.showMenuButton(true)
+                        binding.fab.showMenuButton(true)
                    else if (dy > 0)
-                        this@ReaderActivity.reader_fab.hideMenuButton(true)
+                        binding.fab.hideMenuButton(true)
                    val layoutManager = recyclerView.layoutManager as LinearLayoutManager
@@ -386,18 +362,18 @@ class ReaderActivity : BaseActivity() {
                        return
                    currentPage = layoutManager.findFirstVisibleItemPosition()+1
                    menu?.findItem(R.id.reader_menu_page_indicator)?.title = "$currentPage/${recyclerView.adapter!!.itemCount}"
                }
            })
        }
-        with(reader_fab_download) {
+        with(binding.downloadFab) {
            animateDownloadFAB(DownloadManager.getInstance(this@ReaderActivity).getDownloadFolder(galleryID) != null) //If download in progress, animate button
            setOnClickListener {
-                if (PreferenceManager.getDefaultSharedPreferences(context).getBoolean("cache_disable", false))
+                requestNotificationPermission(
-                    Toast.makeText(context, R.string.settings_download_when_cache_disable_warning, Toast.LENGTH_SHORT).show()
+                    this@ReaderActivity,
-                else {
+                    requestNotificationPermssionLauncher
                ) {
                    val downloadManager = DownloadManager.getInstance(this@ReaderActivity)
                    if (downloadManager.isDownloading(galleryID)) {
@@ -412,14 +388,14 @@ class ReaderActivity : BaseActivity() {
            }
        }
-        with(reader_fab_retry) {
+        with(binding.retryFab) {
            setImageResource(R.drawable.refresh)
            setOnClickListener {
                DownloadService.download(context, galleryID)
            }
        }
-        with(reader_fab_auto) {
+        with(binding.autoFab) {
            setImageResource(R.drawable.eye_white)
            setOnClickListener {
                when {
@@ -439,13 +415,13 @@ class ReaderActivity : BaseActivity() {
            }
        }
-        with(reader_fab_fullscreen) {
+        with(binding.fullscreenFab) {
            setImageResource(R.drawable.ic_fullscreen)
            setOnClickListener {
                isFullscreen = true
                fullscreen(isFullscreen)
-                this@ReaderActivity.reader_fab.close(true)
+                binding.fab.close(true)
            }
        }
    }
@@ -455,8 +431,8 @@ class ReaderActivity : BaseActivity() {
            if (isFullscreen) {
                flags = flags or WindowManager.LayoutParams.FLAG_FULLSCREEN
                supportActionBar?.hide()
-                this@ReaderActivity.reader_fab.visibility = View.INVISIBLE
+                binding.fab.visibility = View.INVISIBLE
-                this@ReaderActivity.scroller.let {
+                binding.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)
@@ -465,8 +441,8 @@ class ReaderActivity : BaseActivity() {
            } else {
                flags = flags and WindowManager.LayoutParams.FLAG_FULLSCREEN.inv()
                supportActionBar?.show()
-                this@ReaderActivity.reader_fab.visibility = View.VISIBLE
+                binding.fab.visibility = View.VISIBLE
-                this@ReaderActivity.scroller.let {
+                binding.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)
@@ -477,23 +453,27 @@ class ReaderActivity : BaseActivity() {
            window.attributes = this
        }
-        reader_recyclerview.adapter = reader_recyclerview.adapter   // Force to redraw
+        binding.recyclerview.adapter = binding.recyclerview.adapter   // Force to redraw
    }
    private fun scrollMode(isScroll: Boolean) {
        if (isScroll) {
            snapHelper.attachToRecyclerView(null)
-            reader_recyclerview.layoutManager = LinearLayoutManager(this)
+            binding.recyclerview.layoutManager = LinearLayoutManager(this)
        } else {
-            snapHelper.attachToRecyclerView(reader_recyclerview)
+            snapHelper.attachToRecyclerView(binding.recyclerview)
-            reader_recyclerview.layoutManager = LinearLayoutManager(this, LinearLayoutManager.HORIZONTAL, Preferences["rtl", false])
+            binding.recyclerview.layoutManager = object: LinearLayoutManager(this, HORIZONTAL, Preferences["rtl", false]) {
                override fun calculateExtraLayoutSpace(state: RecyclerView.State, extraLayoutSpace: IntArray) {
                    extraLayoutSpace.fill(600)
                }
            }
        }
-        (reader_recyclerview.layoutManager as LinearLayoutManager).scrollToPositionWithOffset(currentPage-1, 0)
+        (binding.recyclerview.layoutManager as LinearLayoutManager).scrollToPositionWithOffset(currentPage-1, 0)
    }
    private fun animateDownloadFAB(animate: Boolean) {
-        with(reader_fab_download) {
+        with(binding.downloadFab) {
            if (animate) {
                val icon = AnimatedVectorDrawableCompat.create(context, R.drawable.ic_downloading)
@@ -522,7 +502,7 @@ class ReaderActivity : BaseActivity() {
    }
    val cameraCallback: (List<Face>) -> Unit = callback@{ faces ->
-        eye_card.dot.let {
+        binding.eyeCard.dot.let {
            it.visibility = View.VISIBLE
            CoroutineScope(Dispatchers.Main).launch {
                delay(50)
@@ -532,9 +512,9 @@ class ReaderActivity : BaseActivity() {
        if (faces.size != 1)
            ContextCompat.getDrawable(this, R.drawable.eye_off).let {
-                with(eye_card) {
+                with(binding.eyeCard) {
-                    left_eye.setImageDrawable(it)
+                    leftEye.setImageDrawable(it)
-                    right_eye.setImageDrawable(it)
+                    rightEye.setImageDrawable(it)
                }
                return@callback
@@ -545,16 +525,16 @@ class ReaderActivity : BaseActivity() {
            faces[0].leftEyeOpenProbability?.let { it > 0.4 } == true
        )
-        with(eye_card) {
+        with(binding.eyeCard) {
-            left_eye.setImageDrawable(
+            leftEye.setImageDrawable(
                ContextCompat.getDrawable(
-                    context,
+                    leftEye.context,
                    if (left) R.drawable.eye else R.drawable.eye_closed
                )
            )
-            right_eye.setImageDrawable(
+            rightEye.setImageDrawable(
                ContextCompat.getDrawable(
-                    context,
+                    rightEye.context,
                    if (right) R.drawable.eye else R.drawable.eye_closed
                )
            )
@@ -564,29 +544,24 @@ class ReaderActivity : BaseActivity() {
            // Both closed / opened
            !left.xor(right) -> {
                eyeType = null
                eyeCount = 0
                eyeTime = 0L
            }
            !left -> {
                if (eyeType != Eye.LEFT) {
                    eyeType = Eye.LEFT
                    eyeCount = 0
                    eyeTime = System.currentTimeMillis()
                }
                eyeCount++
            }
            !right -> {
                if (eyeType != Eye.RIGHT) {
                    eyeType = Eye.RIGHT
                    eyeCount = 0
                    eyeTime = System.currentTimeMillis()
                }
                eyeCount++
            }
        }
-        if (eyeCount > 3 && System.currentTimeMillis() - eyeTime > 500) {
+        if (eyeType != null && System.currentTimeMillis() - eyeTime > 100) {
-            (this@ReaderActivity.reader_recyclerview.layoutManager as LinearLayoutManager).let {
+            (binding.recyclerview.layoutManager as LinearLayoutManager).let {
                it.scrollToPositionWithOffset(when(eyeType!!) {
                    Eye.RIGHT -> {
                        if (it.reverseLayout) currentPage - 2 else currentPage
@@ -597,18 +572,16 @@ class ReaderActivity : BaseActivity() {
                }, 0)
            }
-            eyeType = null
+            eyeTime = System.currentTimeMillis() + 500
            eyeCount = 0
            eyeTime = 0L
        }
    }
    private fun toggleCamera() {
-        val eyes = this@ReaderActivity.eye_card
+        val eyes = binding.eyeCard.root
        when (camera) {
            null -> {
-                reader_fab_auto.labelText = getString(R.string.reader_fab_auto_cancel)
+                binding.autoFab.labelText = getString(R.string.reader_fab_auto_cancel)
-                reader_fab_auto.setImageResource(R.drawable.eye_off_white)
+                binding.autoFab.setImageResource(R.drawable.eye_off_white)
                eyes.apply {
                    visibility = View.VISIBLE
                    TranslateAnimation(0F, 0F, -100F, 0F).apply {
@@ -621,8 +594,8 @@ class ReaderActivity : BaseActivity() {
                cameraEnabled = true
            }
            else -> {
-                reader_fab_auto.labelText = getString(R.string.reader_fab_auto)
+                binding.autoFab.labelText = getString(R.string.reader_fab_auto)
-                reader_fab_auto.setImageResource(R.drawable.eye_white)
+                binding.autoFab.setImageResource(R.drawable.eye_white)
                eyes.apply {
                    TranslateAnimation(0F, 0F, 0F, -100F).apply {
                        duration = 500
@@ -643,14 +616,4 @@ class ReaderActivity : BaseActivity() {
            }
        }
    }
    override fun onLowMemory() {
        super.onLowMemory()
        Glide.get(this).onLowMemory()
    }
    override fun onTrimMemory(level: Int) {
        super.onTrimMemory(level)
        Glide.get(this).onTrimMemory(level)
    }
 }
--- a/app/src/main/java/xyz/quaver/pupil/ui/SettingsActivity.kt
+++ b/app/src/main/java/xyz/quaver/pupil/ui/SettingsActivity.kt
@@ -18,24 +18,10 @@
 package xyz.quaver.pupil.ui
 import android.annotation.SuppressLint
 import android.app.Activity
 import android.content.Intent
 import android.content.pm.PackageManager
 import android.os.Bundle
 import android.view.MenuItem
 import android.view.WindowManager
 import androidx.appcompat.app.AppCompatActivity
 import com.google.android.material.snackbar.Snackbar
 import kotlinx.serialization.decodeFromString
 import kotlinx.serialization.json.Json
 import xyz.quaver.pupil.R
 import xyz.quaver.pupil.favorites
 import xyz.quaver.pupil.ui.fragment.LockSettingsFragment
 import xyz.quaver.pupil.ui.fragment.SettingsFragment
 import xyz.quaver.pupil.util.Preferences
 import xyz.quaver.pupil.util.normalizeID
 import java.nio.charset.Charset
 class SettingsActivity : BaseActivity() {
@@ -56,19 +42,4 @@ class SettingsActivity : BaseActivity() {
        return true
    }
    @SuppressLint("InlinedApi")
    override fun onRequestPermissionsResult(requestCode: Int, permissions: Array<out String>, grantResults: IntArray) {
        when (requestCode) {
            R.id.request_write_permission_and_saf.normalizeID() -> {
                if (grantResults.firstOrNull() == PackageManager.PERMISSION_GRANTED) {
                    val intent = Intent(Intent.ACTION_OPEN_DOCUMENT_TREE).apply {
                        putExtra("android.content.extra.SHOW_ADVANCED", true)
                    }
                    startActivityForResult(intent, R.id.request_download_folder.normalizeID())
                }
            }
        }
    }
 }
--- a/app/src/main/java/xyz/quaver/pupil/ui/TransferActivity.kt
+++ b/app/src/main/java/xyz/quaver/pupil/ui/TransferActivity.kt
@@ -0,0 +1,382 @@
 package xyz.quaver.pupil.ui
 import android.Manifest
 import android.annotation.SuppressLint
 import android.content.BroadcastReceiver
 import android.content.ComponentName
 import android.content.Intent
 import android.content.IntentFilter
 import android.content.ServiceConnection
 import android.content.pm.ActivityInfo
 import android.content.pm.PackageManager
 import android.net.wifi.WpsInfo
 import android.net.wifi.p2p.WifiP2pConfig
 import android.net.wifi.p2p.WifiP2pDevice
 import android.net.wifi.p2p.WifiP2pDeviceList
 import android.net.wifi.p2p.WifiP2pInfo
 import android.net.wifi.p2p.WifiP2pManager
 import android.os.Build.VERSION
 import android.os.Build.VERSION_CODES
 import android.os.Bundle
 import android.os.IBinder
 import android.util.Log
 import androidx.activity.result.contract.ActivityResultContracts
 import androidx.activity.viewModels
 import androidx.appcompat.app.AppCompatActivity
 import androidx.core.app.ActivityCompat
 import androidx.core.content.ContextCompat
 import androidx.fragment.app.commit
 import androidx.lifecycle.Lifecycle
 import androidx.lifecycle.LiveData
 import androidx.lifecycle.MutableLiveData
 import androidx.lifecycle.ViewModel
 import androidx.lifecycle.flowWithLifecycle
 import androidx.lifecycle.lifecycleScope
 import kotlinx.coroutines.channels.Channel
 import kotlinx.coroutines.channels.consumeEach
 import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.flow.StateFlow
 import kotlinx.coroutines.flow.collectLatest
 import kotlinx.coroutines.flow.filterNotNull
 import kotlinx.coroutines.flow.first
 import kotlinx.coroutines.launch
 import xyz.quaver.pupil.R
 import xyz.quaver.pupil.receiver.WifiDirectBroadcastReceiver
 import xyz.quaver.pupil.services.TransferClientService
 import xyz.quaver.pupil.services.TransferPacket
 import xyz.quaver.pupil.services.TransferServerService
 import xyz.quaver.pupil.ui.fragment.TransferConnectedFragment
 import xyz.quaver.pupil.ui.fragment.TransferDirectionFragment
 import xyz.quaver.pupil.ui.fragment.TransferPermissionFragment
 import xyz.quaver.pupil.ui.fragment.TransferSelectDataFragment
 import xyz.quaver.pupil.ui.fragment.TransferTargetFragment
 import xyz.quaver.pupil.ui.fragment.TransferWaitForConnectionFragment
 import kotlin.coroutines.resume
 import kotlin.coroutines.resumeWithException
 import kotlin.coroutines.suspendCoroutine
 class TransferActivity : AppCompatActivity(R.layout.transfer_activity) {
    private val viewModel: TransferViewModel by viewModels()
    private val intentFilter = IntentFilter().apply {
        addAction(WifiP2pManager.WIFI_P2P_STATE_CHANGED_ACTION)
        addAction(WifiP2pManager.WIFI_P2P_PEERS_CHANGED_ACTION)
        addAction(WifiP2pManager.WIFI_P2P_CONNECTION_CHANGED_ACTION)
        addAction(WifiP2pManager.WIFI_P2P_THIS_DEVICE_CHANGED_ACTION)
    }
    private lateinit var manager: WifiP2pManager
    private lateinit var channel: WifiP2pManager.Channel
    private var receiver: BroadcastReceiver? = null
    private val requestPermissionLauncher = registerForActivityResult(
        ActivityResultContracts.RequestPermission()
    ) { granted ->
        if (granted) {
            viewModel.setStep(TransferStep.TARGET)
        } else {
            viewModel.setStep(TransferStep.PERMISSION)
        }
    }
    private var clientServiceBinder: TransferClientService.Binder? = null
    private val clientServiceConnection = object : ServiceConnection {
        override fun onServiceConnected(name: ComponentName?, service: IBinder?) {
            clientServiceBinder = service as TransferClientService.Binder
        }
        override fun onServiceDisconnected(name: ComponentName?) {
            clientServiceBinder = null
        }
    }
    private fun checkPermission(force: Boolean = false): Boolean {
        val permissionRequired = if (VERSION.SDK_INT < VERSION_CODES.TIRAMISU) {
            Manifest.permission.ACCESS_FINE_LOCATION
        } else {
            Manifest.permission.NEARBY_WIFI_DEVICES
        }
        val permissionGranted =
            ActivityCompat.checkSelfPermission(this, permissionRequired) == PackageManager.PERMISSION_GRANTED
        val shouldShowRationale =
            ActivityCompat.shouldShowRequestPermissionRationale(this, permissionRequired)
        if (!permissionGranted) {
            if (shouldShowRationale && force) {
                viewModel.setStep(TransferStep.PERMISSION)
            } else {
                requestPermissionLauncher.launch(permissionRequired)
            }
            return false
        }
        return true
    }
    private fun handleServerResponse(response: TransferPacket?) {
        when (response) {
            is TransferPacket.ListResponse -> {
                Log.d("PUPILD", "Received list response $response")
            }
            else -> {
                Log.d("PUPILD", "Received invalid response $response")
            }
        }
    }
    private suspend fun WifiP2pManager.disconnect() {
        suspendCoroutine { continuation ->
            removeGroup(channel, object : WifiP2pManager.ActionListener {
                override fun onSuccess() {
                    continuation.resume(Unit)
                }
                override fun onFailure(reason: Int) {
                    continuation.resume(Unit)
                }
            })
        }
        suspendCoroutine { continuation ->
            cancelConnect(channel, object: WifiP2pManager.ActionListener {
                override fun onSuccess() {
                    continuation.resume(Unit)
                }
                override fun onFailure(reason: Int) {
                    continuation.resume(Unit)
                }
            })
        }
    }
    @SuppressLint("SourceLockedOrientationActivity")
    override fun onCreate(savedInstanceState: Bundle?) {
        super.onCreate(savedInstanceState)
        supportActionBar?.hide()
        requestedOrientation = ActivityInfo.SCREEN_ORIENTATION_PORTRAIT
        manager = getSystemService(WIFI_P2P_SERVICE) as WifiP2pManager
        channel = manager.initialize(this, mainLooper, null)
        viewModel.peerToConnect.observe(this) { peer ->
            if (peer == null) { return@observe }
            if (!checkPermission()) { return@observe }
            val config = WifiP2pConfig().apply {
                deviceAddress = peer.deviceAddress
                wps.setup = WpsInfo.PBC
            }
            manager.connect(channel, config, object: WifiP2pManager.ActionListener {
                override fun onSuccess() { }
                override fun onFailure(reason: Int) {
                    viewModel.connect(null)
                }
            })
        }
        lifecycleScope.launch {
            viewModel.messageQueue.consumeEach {
                clientServiceBinder?.sendPacket(it)?.getOrNull()?.let(::handleServerResponse)
            }
        }
        lifecycleScope.launch {
            viewModel.step.flowWithLifecycle(lifecycle, Lifecycle.State.STARTED).collectLatest step@{ step ->
                when (step) {
                    TransferStep.TARGET,
                    TransferStep.TARGET_FORCE -> {
                        if (!checkPermission(step == TransferStep.TARGET_FORCE)) {
                            return@step
                        }
                        manager.discoverPeers(channel, object: WifiP2pManager.ActionListener {
                            override fun onSuccess() { }
                            override fun onFailure(reason: Int) {
                            }
                        })
                        supportFragmentManager.commit(true) {
                            replace(R.id.fragment_container_view, TransferTargetFragment())
                        }
                        val hostAddress = viewModel.connectionInfo.filterNotNull().first {
                            it.groupFormed
                        }.groupOwnerAddress.hostAddress
                        val intent = Intent(this@TransferActivity, TransferClientService::class.java).also {
                            it.putExtra("address", hostAddress)
                        }
                        ContextCompat.startForegroundService(this@TransferActivity, intent)
                        bindService(intent, clientServiceConnection, BIND_AUTO_CREATE)
                        viewModel.setStep(TransferStep.SELECT_DATA)
                    }
                    TransferStep.DIRECTION -> {
                        manager.disconnect()
                        supportFragmentManager.commit(true) {
                            replace(R.id.fragment_container_view, TransferDirectionFragment())
                        }
                    }
                    TransferStep.PERMISSION -> {
                        supportFragmentManager.commit(true) {
                            replace(R.id.fragment_container_view, TransferPermissionFragment())
                        }
                    }
                    TransferStep.WAIT_FOR_CONNECTION -> {
                        Log.d("PUPILD", "wait for connection")
                        if (!checkPermission()) { return@step }
                        runCatching {
                            suspendCoroutine { continuation ->
                                manager.createGroup(channel, object: WifiP2pManager.ActionListener {
                                    override fun onSuccess() {
                                        continuation.resume(Unit)
                                    }
                                    override fun onFailure(reason: Int) {
                                        continuation.resumeWithException(Exception("Failed to create group $reason"))
                                    }
                                })
                            }
                            supportFragmentManager.commit(true) {
                                replace(R.id.fragment_container_view, TransferWaitForConnectionFragment())
                            }
                            val address = viewModel.connectionInfo.filterNotNull().first {
                                it.groupFormed && it.isGroupOwner
                            }.groupOwnerAddress.hostAddress
                            val intent = Intent(this@TransferActivity, TransferServerService::class.java).also {
                                it.putExtra("address", address)
                            }
                            ContextCompat.startForegroundService(this@TransferActivity, intent)
                            val binder: TransferServerService.Binder = suspendCoroutine { continuation ->
                                bindService(intent, object: ServiceConnection {
                                    override fun onServiceConnected(name: ComponentName?, service: IBinder?) {
                                        continuation.resume(service as TransferServerService.Binder)
                                    }
                                    override fun onServiceDisconnected(name: ComponentName?) { }
                                }, BIND_AUTO_CREATE)
                            }
                            binder.channel.receive()
                            viewModel.setStep(TransferStep.CONNECTED)
                        }.onFailure {
                            Log.e("PUPILD", "Failed to create group", it)
                        }
                        supportFragmentManager.commit(true) {
                            replace(R.id.fragment_container_view, TransferWaitForConnectionFragment())
                        }
                    }
                    TransferStep.CONNECTED -> {
                        supportFragmentManager.commit(true) {
                            replace(R.id.fragment_container_view, TransferConnectedFragment())
                        }
                    }
                    TransferStep.SELECT_DATA -> {
                        supportFragmentManager.commit(true) {
                            replace(R.id.fragment_container_view, TransferSelectDataFragment())
                        }
                    }
                }
            }
        }
    }
    override fun onResume() {
        super.onResume()
        bindService(Intent(this, TransferClientService::class.java), clientServiceConnection, BIND_AUTO_CREATE)
        WifiDirectBroadcastReceiver(manager, channel, viewModel).also {
            receiver = it
            registerReceiver(it, intentFilter)
        }
    }
    override fun onPause() {
        super.onPause()
        unbindService(clientServiceConnection)
        receiver?.let { unregisterReceiver(it) }
        receiver = null
    }
 }
 enum class TransferStep {
    TARGET, TARGET_FORCE, DIRECTION, PERMISSION, WAIT_FOR_CONNECTION, CONNECTED, SELECT_DATA
 }
 enum class ErrorType {
 }
 class TransferViewModel : ViewModel() {
    private val _step: MutableStateFlow<TransferStep> = MutableStateFlow(TransferStep.DIRECTION)
    val step: StateFlow<TransferStep> = _step
    private val _error = MutableLiveData<ErrorType?>(null)
    val error: LiveData<ErrorType?> = _error
    private val _wifiP2pEnabled: MutableLiveData<Boolean> = MutableLiveData(false)
    val wifiP2pEnabled: LiveData<Boolean> = _wifiP2pEnabled
    private val _thisDevice: MutableLiveData<WifiP2pDevice?> = MutableLiveData(null)
    val thisDevice: LiveData<WifiP2pDevice?> = _thisDevice
    private val _peers: MutableLiveData<WifiP2pDeviceList?> = MutableLiveData(null)
    val peers: LiveData<WifiP2pDeviceList?> = _peers
    private val _connectionInfo: MutableStateFlow<WifiP2pInfo?> = MutableStateFlow(null)
    val connectionInfo: StateFlow<WifiP2pInfo?> = _connectionInfo
    private val _peerToConnect: MutableLiveData<WifiP2pDevice?> = MutableLiveData(null)
    val peerToConnect: LiveData<WifiP2pDevice?> = _peerToConnect
    val messageQueue: Channel<TransferPacket> = Channel()
    fun setStep(step: TransferStep) {
        Log.d("PUPILD", "Set step: $step")
        _step.value = step
    }
    fun setWifiP2pEnabled(enabled: Boolean) {
        _wifiP2pEnabled.value = enabled
    }
    fun setThisDevice(device: WifiP2pDevice?) {
        _thisDevice.value = device
    }
    fun setPeers(peers: WifiP2pDeviceList?) {
        _peers.value = peers
    }
    fun setConnectionInfo(info: WifiP2pInfo?) {
        _connectionInfo.value = info
    }
    fun setError(error: ErrorType?) {
        _error.value = error
    }
    fun connect(device: WifiP2pDevice?) {
        _peerToConnect.value = device
    }
    fun ping() {
        messageQueue.trySend(TransferPacket.Ping)
    }
    fun list() {
        messageQueue.trySend(TransferPacket.ListRequest)
    }
 }
--- 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 kotlinx.android.synthetic.main.dialog_default_query.*
+import androidx.fragment.app.DialogFragment
 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(context : Context) : AlertDialog(context) {
+class DefaultQueryDialog : DialogFragment() {
-    private val languages = context.resources.getStringArray(R.array.languages).map {
+    private val languages: Map<String, String> by lazy {
-        it.split("|").let { split ->
+        requireContext().resources.getStringArray(R.array.languages).map {
-            Pair(split[0], split[1])
+            it.split("|").let { split ->
-        }
+                Pair(split[0], split[1])
-    }.toMap()
+            }
-    private val reverseLanguages = languages.entries.associate { (k, v) -> v to k }
+        }.toMap()
    }
    private val reverseLanguages: Map<String, String> by lazy {
        languages.entries.associate { (k, v) -> v to k }
    }
    private val excludeBL = "-male:yaoi"
    private val excludeGuro = listOf("-female:guro", "-male:guro")
@@ -49,46 +49,15 @@ class DefaultQueryDialog(context : Context) : AlertDialog(context) {
    var onPositiveButtonClickListener : ((Tags) -> (Unit))? = null
-    @SuppressLint("InflateParams")
+    private var _binding: DefaultQueryDialogBinding? = null
-    override fun onCreate(savedInstanceState: Bundle?) {
+    private val binding get() = _binding!!
        setTitle(R.string.default_query_dialog_title)
        setView(build())
        setButton(Dialog.BUTTON_POSITIVE, context.getString(android.R.string.ok)) { _, _ ->
            val newTags = Tags.parse(default_query_dialog_edittext.text.toString())
-            with(default_query_dialog_language_selector) {
+    private fun initView() {
                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"]
        )
-        val view = LayoutInflater.from(context).inflate(R.layout.dialog_default_query, null)
+        with(binding.languageSelector) {
        with(view.default_query_dialog_language_selector) {
            adapter =
                ArrayAdapter(
                    context,
@@ -111,13 +80,13 @@ class DefaultQueryDialog(context : Context) : AlertDialog(context) {
            }
        }
-        with(view.default_query_dialog_BL_checkbox) {
+        with(binding.BLCheckbox) {
            isChecked = tags.contains(excludeBL)
            if (tags.contains(excludeBL))
                tags.remove(excludeBL)
        }
-        with(view.default_query_dialog_guro_checkbox) {
+        with(binding.guroCheckbox) {
            isChecked = excludeGuro.all { tags.contains(it) }
            if (excludeGuro.all { tags.contains(it) })
                excludeGuro.forEach {
@@ -125,7 +94,7 @@ class DefaultQueryDialog(context : Context) : AlertDialog(context) {
                }
        }
-        with(view.default_query_dialog_loli_checkbox) {
+        with(binding.loliCheckbox) {
            isChecked = excludeLoli.all { tags.contains(it) }
            if (excludeLoli.all { tags.contains(it) })
                excludeLoli.forEach {
@@ -133,7 +102,7 @@ class DefaultQueryDialog(context : Context) : AlertDialog(context) {
                }
        }
-        with(view.default_query_dialog_edittext) {
+        with(binding.edittext) {
            setText(tags.toString(), android.widget.TextView.BufferType.EDITABLE)
            addTextChangedListener(object : TextWatcher {
                override fun beforeTextChanged(
@@ -153,13 +122,50 @@ class DefaultQueryDialog(context : Context) : AlertDialog(context) {
                        s.replace(
                            0,
                            s.length,
-                            s.toString().toLowerCase(java.util.Locale.getDefault())
+                            s.toString().lowercase()
                        )
                }
            })
        }
    }
-        return view
+    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
    }
 }
--- 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.android.synthetic.main.dialog_download_folder_name.view.*
+import kotlinx.coroutines.CoroutineScope
-import kotlinx.coroutines.runBlocking
+import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
 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,38 +37,49 @@ import xyz.quaver.pupil.util.formatMap
 class DownloadFolderNameDialogFragment : DialogFragment() {
-    @SuppressLint("InflateParams")
+    private var _binding: DownloadFolderNameDialogBinding? = null
-    private fun build(): View {
+    private val binding get() = _binding!!
        val galleryID = Cache.instances.let { if (it.size() == 0) 1199708 else it.keyAt((0 until it.size()).random()) }
        val galleryBlock = runBlocking {
            Cache.getInstance(requireContext(), galleryID).getGalleryBlock()
        }
-        return layoutInflater.inflate(R.layout.dialog_download_folder_name, null).apply {
+    override fun onCreateDialog(savedInstanceState: Bundle?): Dialog {
-            message.text = getString(R.string.settings_download_folder_name_message, formatMap.keys.toString(), galleryBlock?.formatDownloadFolder() ?: "")
+        _binding = DownloadFolderNameDialogBinding.inflate(layoutInflater)
            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()
-                if ((newValue as? String)?.contains("/") != false) {
+        initView()
                    Snackbar.make(this, R.string.settings_invalid_download_folder_name, Snackbar.LENGTH_SHORT).show()
                    return@setOnClickListener
                }
-                Preferences["download_folder_name"] = edittext.text.toString()
+        return Dialog(requireContext()).apply {
-
+            setContentView(binding.root)
-                dismiss()
+            window?.attributes?.width = ViewGroup.LayoutParams.MATCH_PARENT
            }
        }
    }
-    override fun onCreateDialog(savedInstanceState: Bundle?): Dialog =
+    override fun onDestroy() {
-       Dialog(requireContext()).apply {
+        super.onDestroy()
-           setContentView(build())
+        _binding = null
-           window?.attributes?.width = ViewGroup.LayoutParams.MATCH_PARENT
+    }
-       }
+
    private fun initView() {
        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()) ?: "")
            }
        }
        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
            }
            Preferences["download_folder_name"] = binding.edittext.text.toString()
            dismiss()
        }
    }
 }
--- 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,179 +18,139 @@
 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 androidx.activity.result.contract.ActivityResultContracts
 import android.widget.LinearLayout
 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.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 xyz.quaver.pupil.util.normalizeID
 import java.io.File
 class DownloadLocationDialogFragment : DialogFragment() {
    private val entries = mutableMapOf<File?, View>()
-    @SuppressLint("InflateParams")
+    private var _binding: DownloadLocationDialogBinding? = null
-    private fun build() : View? {
+    private val binding get() = _binding!!
        val context = context ?: return null
-        val view = layoutInflater.inflate(R.layout.dialog_download_folder, null) as LinearLayout
+    private val entries = mutableMapOf<File?, DownloadLocationItemBinding>()
-        val externalFilesDirs = ContextCompat.getExternalFilesDirs(context, null)
+    private val requestDownloadFolderLauncher = registerForActivityResult(ActivityResultContracts.StartActivityForResult()) {
        if (it.resultCode == Activity.RESULT_OK) {
            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
                context.contentResolver.takePersistableUriPermission(uri, takeFlags)
                if (kotlin.runCatching { FileX(context, uri).canWrite() }.getOrDefault(false)) {
                    entries[null]?.locationAvailable?.text = uri.toFile(context)?.canonicalPath
                    Preferences["download_folder"] = uri.toString()
                } else {
                    Snackbar.make(
                        dialog.window!!.decorView.rootView,
                        R.string.settings_download_folder_not_writable,
                        Snackbar.LENGTH_LONG
                    ).show()
                    val downloadFolder = DownloadManager.getInstance(context).downloadFolder.canonicalPath
                    val key = entries.keys.firstOrNull { it?.canonicalPath == downloadFolder }
                    entries[key]!!.button.isChecked = true
                    if (key == null) entries[key]!!.locationAvailable.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
            }
        }
    }
    private fun initView() {
        val externalFilesDirs = ContextCompat.getExternalFilesDirs(requireContext(), null)
        externalFilesDirs.forEachIndexed { index, dir ->
            dir ?: return@forEachIndexed
-            view.addView(layoutInflater.inflate(R.layout.item_download_folder, view, false).apply {
+            DownloadLocationItemBinding.inflate(layoutInflater, binding.root, true).apply {
-                location_type.text = context.getString(when (index) {
+                locationType.text = requireContext().getString(when (index) {
                    0 -> R.string.settings_download_folder_internal
                    else -> R.string.settings_download_folder_removable
                })
-                location_available.text = context.getString(
+                locationAvailable.text = requireContext().getString(
                    R.string.settings_download_folder_available,
                    byteToString(dir.freeSpace)
                )
-                setOnClickListener {
+                root.setOnClickListener {
-                    entries.values.forEach {
+                    entries.values.forEach { entry ->
-                        it.button.isChecked = false
+                        entry.button.isChecked = false
                    }
                    button.performClick()
                    Preferences["download_folder"] = dir.toUri().toString()
                }
                entries[dir] = this
-            })
+            }
        }
-        view.addView(layoutInflater.inflate(R.layout.item_download_folder, view, false).apply {
+        DownloadLocationItemBinding.inflate(layoutInflater, binding.root, true).apply {
-            location_type.text = context.getString(R.string.settings_download_folder_custom)
+            locationType.text = requireContext().getString(R.string.settings_download_folder_custom)
-            setOnClickListener {
+            root.setOnClickListener {
-                entries.values.forEach {
+                entries.values.forEach { entry ->
-                    it.button.isChecked = false
+                    entry.button.isChecked = false
                }
                button.performClick()
-                if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
+                val intent = Intent(Intent.ACTION_OPEN_DOCUMENT_TREE).apply {
-                    val intent = Intent(Intent.ACTION_OPEN_DOCUMENT_TREE).apply {
+                    putExtra("android.content.extra.SHOW_ADVANCED", true)
                        putExtra("android.content.extra.SHOW_ADVANCED", true)
                    }
                    startActivityForResult(intent, R.id.request_download_folder.normalizeID())
                } else {    // Can't use SAF on old Androids!
                    val config = DirectoryChooserConfig.builder()
                        .newDirectoryName("Pupil")
                        .allowNewDirectoryNameModification(true)
                        .build()
                    val intent = Intent(context, DirectoryChooserActivity::class.java).apply {
                        putExtra(DirectoryChooserActivity.EXTRA_CONFIG, config)
                    }
                    startActivityForResult(intent, R.id.request_download_folder_old.normalizeID())
                }
                requestDownloadFolderLauncher.launch(intent)
            }
            entries[null] = this
-        })
+        }
-        val downloadFolder = DownloadManager.getInstance(context).downloadFolder.canonicalPath
+        val downloadFolder = DownloadManager.getInstance(requireContext()).downloadFolder.canonicalPath
        val key = entries.keys.firstOrNull { it?.canonicalPath == downloadFolder }
        entries[key]!!.button.isChecked = true
-        if (key == null) entries[key]!!.location_available.text = downloadFolder
+        if (key == null) entries[key]!!.locationAvailable.text = downloadFolder
        return view
    }
    override fun onCreateDialog(savedInstanceState: Bundle?): Dialog {
-        val builder = AlertDialog.Builder(requireContext())
+        _binding = DownloadLocationDialogBinding.inflate(layoutInflater)
-        builder
+        initView()
-            .setTitle(R.string.settings_download_folder)
+
-            .setView(build())
+        return AlertDialog.Builder(requireContext()).apply {
-            .setPositiveButton(requireContext().getText(android.R.string.ok)) { _, _ ->
+            setTitle(R.string.settings_download_folder)
            setView(binding.root)
            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
+            isCancelable = false
-
+        }.create()
        return builder.create()
    }
-    override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?) {
+    override fun onDestroy() {
-        when (requestCode) {
+        super.onDestroy()
-            R.id.request_download_folder.normalizeID() -> {
+        _binding = null
                if (resultCode == Activity.RESULT_OK) {
                    val activity = activity ?: return
                    val context = context ?: return
                    val dialog = dialog ?: return
                    data?.data?.also { uri ->
                        val takeFlags: Int =
                            activity.intent.flags and
                                    (Intent.FLAG_GRANT_READ_URI_PERMISSION or Intent.FLAG_GRANT_WRITE_URI_PERMISSION)
                        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.KITKAT)
                            context.contentResolver.takePersistableUriPermission(uri, takeFlags)
                        if (kotlin.runCatching { FileX(context, uri).canWrite() }.getOrDefault(false))
                            Preferences["download_folder"] = uri.toString()
                        else {
                            Snackbar.make(
                                dialog.window!!.decorView.rootView,
                                R.string.settings_download_folder_not_writable,
                                Snackbar.LENGTH_LONG
                            ).show()
                            val downloadFolder = DownloadManager.getInstance(context).downloadFolder.canonicalPath
                            val key = entries.keys.firstOrNull { it?.canonicalPath == downloadFolder }
                            entries[key]!!.button.isChecked = true
                            if (key == null) entries[key]!!.location_available.text = downloadFolder
                        }
                    }
                }
            }
            R.id.request_download_folder_old.normalizeID() -> {
                val context = context ?: return
                val dialog = dialog ?: return
                if (resultCode == DirectoryChooserActivity.RESULT_CODE_DIR_SELECTED) {
                    val directory = data?.getStringExtra(DirectoryChooserActivity.RESULT_SELECTED_DIR)!!
                    if (!File(directory).canWrite()) {
                        Snackbar.make(
                            dialog.window!!.decorView.rootView,
                            R.string.settings_download_folder_not_writable,
                            Snackbar.LENGTH_LONG
                        ).show()
                        val downloadFolder = DownloadManager.getInstance(context).downloadFolder.canonicalPath
                        val key = entries.keys.firstOrNull { it?.canonicalPath == downloadFolder }
                        entries[key]!!.button.isChecked = true
                        if (key == null) entries[key]!!.location_available.text = downloadFolder
                    }
                    else
                        Preferences["download_folder"] = File(directory).toURI().toString()
                }
            }
            else -> super.onActivityResult(requestCode, resultCode, data)
        }
    }
 }
--- a/app/src/main/java/xyz/quaver/pupil/ui/dialog/GalleryDialog.kt
+++ b/app/src/main/java/xyz/quaver/pupil/ui/dialog/GalleryDialog.kt
@@ -20,46 +20,47 @@ package xyz.quaver.pupil.ui.dialog
 import android.content.Context
 import android.content.Intent
 import android.net.Uri
 import android.os.Bundle
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
 import android.widget.LinearLayout.LayoutParams
 import androidx.appcompat.app.AlertDialog
 import androidx.core.content.ContextCompat
 import androidx.recyclerview.widget.LinearLayoutManager
 import androidx.recyclerview.widget.RecyclerView
 import androidx.viewpager2.widget.ViewPager2
 import com.bumptech.glide.RequestManager
 import com.google.android.material.snackbar.Snackbar
 import kotlinx.android.synthetic.main.dialog_gallery.*
 import kotlinx.android.synthetic.main.dialog_gallery_details.view.*
 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.hitomi.Gallery
+import xyz.quaver.pupil.hitomi.Gallery
-import xyz.quaver.hitomi.getGallery
+import xyz.quaver.pupil.hitomi.getGallery
 import xyz.quaver.pupil.BuildConfig
 import xyz.quaver.pupil.R
 import xyz.quaver.pupil.adapters.GalleryBlockAdapter
 import xyz.quaver.pupil.adapters.ThumbnailPageAdapter
-import xyz.quaver.pupil.histories
+import xyz.quaver.pupil.databinding.*
 import xyz.quaver.pupil.favoriteTags
 import xyz.quaver.pupil.types.Tag
 import xyz.quaver.pupil.ui.ReaderActivity
 import xyz.quaver.pupil.ui.view.TagChip
 import xyz.quaver.pupil.util.ItemClickSupport
 import xyz.quaver.pupil.util.downloader.Cache
 import xyz.quaver.pupil.util.wordCapitalize
 import java.util.*
 import kotlin.collections.ArrayList
-class GalleryDialog(context: Context, private val glide: RequestManager, private val galleryID: Int) : AlertDialog(context) {
+class GalleryDialog(context: Context, private val galleryID: Int) : AlertDialog(context) {
    val onChipClickedHandler = ArrayList<((Tag) -> (Unit))>()
    private lateinit var binding: GalleryDialogBinding
    override fun onCreate(savedInstanceState: Bundle?) {
        super.onCreate(savedInstanceState)
-        setContentView(R.layout.dialog_gallery)
+        binding = GalleryDialogBinding.inflate(layoutInflater)
        setContentView(binding.root)
        window?.attributes.apply {
            this ?: return@apply
@@ -68,13 +69,12 @@ class GalleryDialog(context: Context, private val glide: RequestManager, private
            height = LayoutParams.MATCH_PARENT
        }
-        with(gallery_fab) {
+        with(binding.fab) {
            setImageDrawable(ContextCompat.getDrawable(context, R.drawable.arrow_right))
            setOnClickListener {
                context.startActivity(Intent(context, ReaderActivity::class.java).apply {
                    putExtra("galleryID", galleryID)
                })
                histories.add(galleryID)
            }
        }
@@ -82,12 +82,12 @@ class GalleryDialog(context: Context, private val glide: RequestManager, private
            try {
                val gallery = getGallery(galleryID)
-                gallery_cover.post {
+                launch (Dispatchers.Main) {
-                    gallery_progressbar.visibility = View.GONE
+                    binding.progressbar.visibility = View.GONE
-                    gallery_title.text = gallery.title
+                    binding.title.text = gallery.title
-                    gallery_artist.text = gallery.artists.joinToString(", ") { it.wordCapitalize() }
+                    binding.artist.text = gallery.artists.joinToString(", ") { it.wordCapitalize() }
-                    with(gallery_type) {
+                    with(binding.type) {
                        text = gallery.type.wordCapitalize()
                        setOnClickListener {
                            gallery.type.let {
@@ -104,28 +104,26 @@ class GalleryDialog(context: Context, private val glide: RequestManager, private
                        }
                    }
-                    glide
+                    binding.cover.showImage(Uri.parse(gallery.cover))
                        .load(gallery.cover)
                        .apply {
                            if (BuildConfig.CENSOR)
                                override(5, 8)
                        }.into(gallery_cover)
                    addDetails(gallery)
                    addThumbnails(gallery)
                    addRelated(gallery)
                }
            } catch (e: Exception) {
-                Snackbar.make(gallery_layout, R.string.unable_to_connect, Snackbar.LENGTH_INDEFINITE).show()
+                Snackbar.make(binding.root, R.string.unable_to_connect, Snackbar.LENGTH_INDEFINITE).apply {
                    if (Locale.getDefault().language == "ko")
                        setAction(context.getText(R.string.https_text)) {
                            context.startActivity(Intent(Intent.ACTION_VIEW, Uri.parse(context.getString(R.string.https))))
                        }
                }.show()
            }
        }
    }
    private fun addDetails(gallery: Gallery) {
-        val inflater = LayoutInflater.from(context)
+        GalleryDialogDetailsBinding.inflate(layoutInflater, binding.contents, true).apply {
-
+            type.setText(R.string.gallery_details)
        inflater.inflate(R.layout.dialog_gallery_details, gallery_contents, false).apply {
            gallery_details.setText(R.string.gallery_details)
            listOf(
                R.string.gallery_artists,
@@ -141,7 +139,18 @@ class GalleryDialog(context: Context, private val glide: RequestManager, private
                    listOf(gallery.language).map { Tag("language", it) },
                    gallery.series.map { Tag("series", it) },
                    gallery.characters.map { Tag("character", it) },
-                    gallery.tags.map {
+                    gallery.tags.sortedBy {
                        val tag = Tag.parse(it)
                        if (favoriteTags.contains(tag))
                            -1
                        else
                            when(Tag.parse(it).area) {
                                "female" -> 0
                                "male" -> 1
                                else -> 2
                            }
                    }.map {
                        Tag.parse(it).let { tag ->
                            when {
                                tag.area != null -> tag
@@ -151,13 +160,13 @@ class GalleryDialog(context: Context, private val glide: RequestManager, private
                    }
                )
            ).filter {
-                (_, content) -> content.isNotEmpty()
+                    (_, content) -> content.isNotEmpty()
            }.forEach { (title, content) ->
-                inflater.inflate(R.layout.item_gallery_details, gallery_details_contents, false).apply {
+                GalleryDialogTagsBinding.inflate(layoutInflater, contents, true).apply {
-                    gallery_details_type.setText(title)
+                    type.setText(title)
                    content.forEach { tag ->
-                        gallery_details_tags.addView(
+                        tags.addView(
                            TagChip(context, tag).apply {
                                setOnClickListener {
                                    onChipClickedHandler.forEach { handler ->
@@ -167,43 +176,36 @@ class GalleryDialog(context: Context, private val glide: RequestManager, private
                            }
                        )
                    }
                }.let {
                    gallery_details_contents.addView(it)
                }
            }
        }.let {
            gallery_contents.addView(it)
        }
    }
    private fun addThumbnails(gallery: Gallery) {
-        val inflater = LayoutInflater.from(context)
+        GalleryDialogDetailsBinding.inflate(layoutInflater, binding.contents, true).apply {
-
+            type.setText(R.string.gallery_thumbnails)
        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(glide, gallery.thumbnails)
+                adapter = ThumbnailPageAdapter(gallery.thumbnails)
                layoutParams = ViewGroup.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, LayoutParams.WRAP_CONTENT)
            }
-            gallery_details_contents.addView(
+            contents.addView(
                pager,
                LayoutParams(LayoutParams.MATCH_PARENT, LayoutParams.WRAP_CONTENT)
            )
-            LayoutInflater.from(context).inflate(R.layout.dialog_gallery_dotindicator, gallery_details_contents)
+            // TODO: Change to direct allocation
-
+            GalleryDialogDotindicatorBinding.inflate(layoutInflater, contents, true).apply {
-            gallery_dotindicator.setViewPager2(pager)
+                dotindicator.setViewPager2(pager)
-        }.let {
+            }
            gallery_contents.addView(it)
        }
    }
    private fun addRelated(gallery: Gallery) {
-        val inflater = LayoutInflater.from(context)
+        val galleries = mutableListOf<Int>()
        val galleries = ArrayList<Int>()
-        val adapter = GalleryBlockAdapter(glide, galleries).apply {
+        val adapter = GalleryBlockAdapter(galleries).apply {
            onChipClickedHandler.add { tag ->
                this@GalleryDialog.onChipClickedHandler.forEach { handler ->
                    handler.invoke(tag)
@@ -211,10 +213,10 @@ class GalleryDialog(context: Context, private val glide: RequestManager, private
            }
        }
-        inflater.inflate(R.layout.dialog_gallery_details, gallery_contents, false).apply {
+        GalleryDialogDetailsBinding.inflate(layoutInflater, binding.contents, true).apply {
-            gallery_details.setText(R.string.gallery_related)
+            type.setText(R.string.gallery_related)
-            RecyclerView(context).apply {
+            contents.addView(RecyclerView(context).apply {
                layoutManager = LinearLayoutManager(context)
                this.adapter = adapter
@@ -223,14 +225,9 @@ class GalleryDialog(context: Context, private val glide: RequestManager, private
                        context.startActivity(Intent(context, ReaderActivity::class.java).apply {
                            putExtra("galleryID", galleries[position])
                        })
                        histories.add(galleries[position])
                    }
                    onItemLongClickListener = { _, position, _ ->
-                        GalleryDialog(
+                        GalleryDialog(context, galleries[position]).apply {
                            context,
                            glide,
                            galleries[position]
                        ).apply {
                            onChipClickedHandler.add { tag ->
                                this@GalleryDialog.onChipClickedHandler.forEach { it.invoke(tag) }
                            }
@@ -239,22 +236,18 @@ class GalleryDialog(context: Context, private val glide: RequestManager, private
                        true
                    }
                }
-            }.let {
+            })
                gallery_details_contents.addView(it, LayoutParams(LayoutParams.MATCH_PARENT, LayoutParams.WRAP_CONTENT))
            }
        }.let {
            gallery_contents.addView(it)
        }
-        CoroutineScope(Dispatchers.IO).launch {
+            CoroutineScope(Dispatchers.IO).launch {
-            gallery.related.forEach { galleryID ->
+                gallery.related.forEach { galleryID ->
-                Cache.getInstance(context, galleryID).getGalleryBlock()?.let {
+                    Cache.getInstance(context, galleryID).getGalleryBlock()?.let {
-                    galleries.add(galleryID)
+                        galleries.add(galleryID)
                    }
                }
            }
-            withContext(Dispatchers.Main) {
+                withContext(Dispatchers.Main) {
-                adapter.notifyDataSetChanged()
+                    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
@@ -1,91 +0,0 @@
 /*
 *     Pupil, Hitomi.la viewer for Android
 *     Copyright (C) 2020  tom5079
 *
 *     This program is free software: you can redistribute it and/or modify
 *     it under the terms of the GNU General Public License as published by
 *     the Free Software Foundation, either version 3 of the License, or
 *     (at your option) any later version.
 *
 *     This program is distributed in the hope that it will be useful,
 *     but WITHOUT ANY WARRANTY; without even the implied warranty of
 *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 *     GNU General Public License for more details.
 *
 *     You should have received a copy of the GNU General Public License
 *     along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 package xyz.quaver.pupil.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,59 +18,60 @@
 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 kotlinx.android.synthetic.main.dialog_proxy.view.*
+import androidx.fragment.app.DialogFragment
 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 ProxyDialog(context: Context) : AlertDialog(context) {
+class ProxyDialogFragment : DialogFragment() {
-    override fun onCreate(savedInstanceState: Bundle?) {
+    private var _binding: ProxyDialogBinding? = null
-        setContentView(build())
+    private val binding get() = _binding!!
        window?.attributes?.width = ViewGroup.LayoutParams.MATCH_PARENT
-        super.onCreate(savedInstanceState)
+    override fun onCreateDialog(savedInstanceState: Bundle?): Dialog {
        _binding = ProxyDialogBinding.inflate(layoutInflater)
        initView()
        return AlertDialog.Builder(requireContext()).apply {
            setView(binding.root)
        }.create()
    }
-    @SuppressLint("InflateParams")
+    private fun initView() {
    private fun build() : View {
        val proxyInfo = getProxyInfo()
        val view = LayoutInflater.from(context).inflate(R.layout.dialog_proxy, null)
        val enabler = { enable: Boolean ->
-            view?.proxy_addr?.isEnabled = enable
+            binding.addr.isEnabled = enable
-            view?.proxy_port?.isEnabled = enable
+            binding.port.isEnabled = enable
-            view?.proxy_username?.isEnabled = enable
+            binding.username.isEnabled = enable
-            view?.proxy_password?.isEnabled = enable
+            binding.password.isEnabled = enable
            if (!enable) {
-                view?.proxy_addr?.text = null
+                binding.addr.text = null
-                view?.proxy_port?.text = null
+                binding.port.text = null
-                view?.proxy_username?.text = null
+                binding.username.text = null
-                view?.proxy_password?.text = null
+                binding.password.text = null
            }
        }
-        with(view.proxy_type_selector) {
+        with(binding.typeSelector) {
            adapter = ArrayAdapter(
                context,
                android.R.layout.simple_spinner_dropdown_item,
@@ -88,29 +89,29 @@ class ProxyDialog(context: Context) : AlertDialog(context) {
            }
        }
-        view.proxy_addr.setText(proxyInfo.host)
+        binding.addr.setText(proxyInfo.host)
-        view.proxy_port.setText(proxyInfo.port?.toString())
+        binding.port.setText(proxyInfo.port?.toString())
-        view.proxy_username.setText(proxyInfo.username)
+        binding.username.setText(proxyInfo.username)
-        view.proxy_password.setText(proxyInfo.password)
+        binding.password.setText(proxyInfo.password)
        enabler.invoke(proxyInfo.type != Proxy.Type.DIRECT)
-        view.proxy_cancel.setOnClickListener {
+        binding.cancelButton.setOnClickListener {
            dismiss()
        }
-        view.proxy_ok.setOnClickListener {
+        binding.okButton.setOnClickListener {
-            val type = Proxy.Type.values()[view.proxy_type_selector.selectedItemPosition]
+            val type = Proxy.Type.values()[binding.typeSelector.selectedItemPosition]
-            val addr = view.proxy_addr.text?.toString()
+            val addr = binding.addr.text?.toString()
-            val port = view.proxy_port.text?.toString()?.toIntOrNull()
+            val port = binding.port.text?.toString()?.toIntOrNull()
-            val username = view.proxy_username.text?.toString()
+            val username = binding.username.text?.toString()
-            val password = view.proxy_password.text?.toString()
+            val password = binding.password.text?.toString()
            if (type != Proxy.Type.DIRECT) {
                if (addr == null || addr.isEmpty())
-                    view.proxy_addr.error = context.getText(R.string.proxy_dialog_error)
+                    binding.addr.error = requireContext().getText(R.string.proxy_dialog_error)
                if (port == null)
-                    view.proxy_port.error = context.getText(R.string.proxy_dialog_error)
+                    binding.port.error = requireContext().getText(R.string.proxy_dialog_error)
                if (addr == null || addr.isEmpty() || port == null)
                    return@setOnClickListener
@@ -127,8 +128,6 @@ class ProxyDialog(context: Context) : AlertDialog(context) {
            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,25 +18,72 @@
 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)
@@ -47,57 +94,44 @@ class ManageFavoritesFragment : PreferenceFragmentCompat() {
        val context = context ?: return
        findPreference<Preference>("backup")?.setOnPreferenceClickListener {
-            val request = Request.Builder()
+            val favorites = runCatching {
-                .url(context.getString(R.string.backup_url))
+                Json.parseToJsonElement(File(ContextCompat.getDataDir(context), "favorites.json").readText())
-                .post(
+            }.getOrNull()
-                    FormBody.Builder()
+            val favoriteTags = kotlin.runCatching {
-                        .add("f:1", File(ContextCompat.getDataDir(context), "favorites.json").readText())
+                Json.parseToJsonElement(File(ContextCompat.getDataDir(context), "favorites_tags.json").readText())
-                        .build()
+            }.getOrNull()
                ).build()
-            client.newCall(request).enqueue(object: Callback {
+            val favoriteJson = buildJsonObject {
-                override fun onFailure(call: Call, e: IOException) {
+                favorites?.let {
-                    val view = view ?: return
+                    put("favorites", it)
                    Snackbar.make(view, R.string.settings_backup_failed, Snackbar.LENGTH_LONG).show()
                }
-
+                favoriteTags?.let {
-                override fun onResponse(call: Call, response: Response) {
+                    put("favorite_tags", it)
                    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 editText = EditText(context).apply {
+            val intent = Intent(Intent.ACTION_OPEN_DOCUMENT).apply {
-                setText(context.getString(R.string.backup_url), TextView.BufferType.EDITABLE)
+                addCategory(Intent.CATEGORY_OPENABLE)
                type = "*/*"
            }
-            AlertDialog.Builder(context)
+            requestBackupFileLauncher.launch(intent)
                .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,21 +18,38 @@
 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 {
@@ -44,12 +61,10 @@ 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")
@@ -61,6 +76,8 @@ class ManageStorageFragment : PreferenceFragmentCompat(), Preference.OnPreferenc
                            if (dir.exists())
                                dir.deleteRecursively()
                            Cache.instances.clear()
                            summary = context.getString(R.string.settings_storage_usage, byteToString(0))
                            CoroutineScope(Dispatchers.IO).launch {
                                var size = 0L
@@ -77,6 +94,48 @@ 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
@@ -91,7 +150,12 @@ class ManageStorageFragment : PreferenceFragmentCompat(), Preference.OnPreferenc
                                }
                                if (dir.exists())
-                                    dir.listFiles()?.forEach { (it as? FileX)?.deleteRecursively() }
+                                    dir.listFiles()?.forEach {
                                        when (it) {
                                            is FileX -> it.deleteRecursively()
                                            else -> it.deleteRecursively()
                                        }
                                    }
                                job = launch {
                                    var size = 0L
@@ -183,6 +247,12 @@ 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,30 +24,34 @@ import android.view.View
 import android.view.ViewGroup
 import androidx.fragment.app.Fragment
 import com.andrognito.pinlockview.PinLockListener
-import kotlinx.android.synthetic.main.fragment_pin_lock.view.*
+import xyz.quaver.pupil.databinding.PinLockFragmentBinding
 import xyz.quaver.pupil.R
-class PINLockFragment : Fragment(), PinLockListener {
+class PINLockFragment : Fragment() {
    private var _binding: PinLockFragmentBinding? = null
    val binding get() = _binding!!
    var onPINEntered: ((String) -> Unit)? = null
-    override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
+    override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View {
-        return inflater.inflate(R.layout.fragment_pin_lock, container, false).apply {
+        _binding = PinLockFragmentBinding.inflate(inflater, container, false)
-            pin_lock_view.attachIndicatorDots(indicator_dots)
+
-            pin_lock_view.setPinLockListener(this@PINLockFragment)
+        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 onComplete(pin: String?) {
+    override fun onDestroy() {
-        onPINEntered?.invoke(pin!!)
+        super.onDestroy()
-    }
+        _binding = null
    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,38 +26,36 @@ import androidx.fragment.app.Fragment
 import com.andrognito.patternlockview.PatternLockView
 import com.andrognito.patternlockview.listener.PatternLockViewListener
 import com.andrognito.patternlockview.utils.PatternLockUtils
-import kotlinx.android.synthetic.main.fragment_pattern_lock.*
+import xyz.quaver.pupil.databinding.PatternLockFragmentBinding
 import kotlinx.android.synthetic.main.fragment_pattern_lock.view.*
 import xyz.quaver.pupil.R
-class PatternLockFragment : Fragment(), PatternLockViewListener {
+class PatternLockFragment : Fragment() {
    private var _binding: PatternLockFragmentBinding? = null
    val binding get() = _binding!!
    var onPatternDrawn: ((String) -> Unit)? = null
    override fun onCreateView(
        inflater: LayoutInflater, container: ViewGroup?,
        savedInstanceState: Bundle?
-    ): View? {
+    ): View {
-        return inflater.inflate(R.layout.fragment_pattern_lock, container, false).apply {
+        _binding = PatternLockFragmentBinding.inflate(inflater, container, false)
-            lock_pattern_view.addPatternLockListener(this@PatternLockFragment)
+        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
    }
-    override fun onCleared() {
+    override fun onDestroy() {
-
+        super.onDestroy()
-    }
+        _binding = null
    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
@@ -21,26 +21,33 @@ package xyz.quaver.pupil.ui.fragment
 import android.app.Activity
 import android.content.*
 import android.os.Bundle
 import android.util.Log
 import android.widget.Toast
 import androidx.activity.result.contract.ActivityResultContracts
 import androidx.appcompat.app.AppCompatDelegate
-import androidx.preference.Preference
+import androidx.preference.*
 import androidx.preference.PreferenceCategory
 import androidx.preference.PreferenceFragmentCompat
 import androidx.preference.SwitchPreferenceCompat
 import com.google.android.gms.oss.licenses.OssLicensesMenuActivity
-import com.google.android.material.snackbar.Snackbar
+import com.google.firebase.crashlytics.FirebaseCrashlytics
-import kotlinx.serialization.decodeFromString
+import com.google.firebase.crashlytics.internal.model.CrashlyticsReport
-import kotlinx.serialization.json.Json
+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.favorites
+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.TransferActivity
 import xyz.quaver.pupil.ui.dialog.*
 import xyz.quaver.pupil.util.*
 import xyz.quaver.pupil.util.downloader.DownloadManager
-import java.nio.charset.Charset
+import java.util.*
 import java.util.concurrent.Executors
 class SettingsFragment :
    PreferenceFragmentCompat(),
@@ -48,6 +55,16 @@ class SettingsFragment :
    Preference.OnPreferenceChangeListener,
    SharedPreferences.OnSharedPreferenceChangeListener {
    private val lockLauncher = registerForActivityResult(ActivityResultContracts.StartActivityForResult()) {
        if (it.resultCode == Activity.RESULT_OK) {
            parentFragmentManager
                .beginTransaction()
                .replace(R.id.settings, LockSettingsFragment())
                .addToBackStack("Lock")
                .commitAllowingStateLoss()
        }
    }
    override fun onResume() {
        super.onResume()
@@ -66,10 +83,8 @@ 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)
@@ -78,32 +93,31 @@ class SettingsFragment :
                    DownloadLocationDialogFragment().show(parentFragmentManager, "Download Location Dialog")
                }
                "default_query" -> {
-                    DefaultQueryDialog(requireContext()).apply {
+                    DefaultQueryDialog().apply {
                        onPositiveButtonClickListener = { newTags ->
                            Preferences["default_query"] = newTags.toString()
                            summary = newTags.toString()
                        }
-                    }.show()
+                    }.show(parentFragmentManager, "Default Query Dialog")
                }
                "app_lock" -> {
                    val intent = Intent(requireContext(), LockActivity::class.java).apply {
                        putExtra("force", true)
                    }
-                    startActivityForResult(intent, R.id.request_lock.normalizeID())
+                    lockLauncher.launch(intent)
                }
                "mirrors" -> {
                    MirrorDialog(requireContext())
                        .show()
                }
                "proxy" -> {
-                    ProxyDialog(requireContext())
+                    ProxyDialogFragment().show(parentFragmentManager, "Proxy Dialog")
                        .show()
                }
                "user_id" -> {
                    FirebaseCrashlytics.getInstance().recordException(SendLogException())
                    (context.getSystemService(Context.CLIPBOARD_SERVICE) as ClipboardManager).setPrimaryClip(
                        ClipData.newPlainText("user_id", Preferences.get<String>("user_id"))
                    )
-                    Toast.makeText(context, R.string.settings_user_id_toast, Toast.LENGTH_SHORT).show()
+                    Toast.makeText(context, R.string.copied_to_clipboard, Toast.LENGTH_SHORT).show()
                }
                "transfer_data" -> {
                    activity?.startActivity(Intent(activity, TransferActivity::class.java))
                }
                else -> return false
            }
@@ -112,11 +126,12 @@ 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()
                }
                "nomedia" -> {
                    val create = (newValue as? Boolean) ?: return false
@@ -150,7 +165,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
@@ -158,6 +173,18 @@ 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
            }
        }
    }
@@ -237,14 +264,32 @@ class SettingsFragment :
                            onPreferenceClickListener = this@SettingsFragment
                        }
                        "mirrors" -> {
                            onPreferenceClickListener = this@SettingsFragment
                        }
                        "proxy" -> {
                            summary = getProxyInfo().type.name
                            onPreferenceClickListener = this@SettingsFragment
                        }
                        "tag_translation" -> {
                            this as ListPreference
                            isEnabled = false
                            CoroutineScope(Dispatchers.IO).launch {
                                kotlin.runCatching {
                                    val languages = getAvailableLanguages().distinct().toTypedArray()
                                    entries = languages.map { Locale(it).let { loc -> loc.getDisplayLanguage(loc) } }.toTypedArray()
                                    entryValues = languages
                                    launch(Dispatchers.Main) {
                                        isEnabled = true
                                    }
                                }
                            }
                            onPreferenceChangeListener = this@SettingsFragment
                        }
                        "dark_mode" -> {
                            onPreferenceChangeListener = this@SettingsFragment
                        }
@@ -257,29 +302,17 @@ class SettingsFragment :
                        }
                        "oss" -> {
                            setOnPreferenceClickListener {
-                                context?.startActivity(Intent(context, OssLicensesMenuActivity::class.java))
+                                context.startActivity(Intent(context, OssLicensesMenuActivity::class.java))
                                true
                            }
                        }
                        "transfer_data" -> {
                            onPreferenceClickListener = this@SettingsFragment
                        }
                    }
                }
            }
        }
    }
    override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?) {
        when(requestCode) {
            R.id.request_lock.normalizeID() -> {
                if (resultCode == Activity.RESULT_OK) {
                    parentFragmentManager
                        .beginTransaction()
                        .replace(R.id.settings, LockSettingsFragment())
                        .addToBackStack("Lock")
                        .commitAllowingStateLoss()
                }
            }
            else -> super.onActivityResult(requestCode, resultCode, data)
        }
    }
 }
--- a/app/src/main/java/xyz/quaver/pupil/ui/fragment/TransferConnectedFragment.kt
+++ b/app/src/main/java/xyz/quaver/pupil/ui/fragment/TransferConnectedFragment.kt
@@ -0,0 +1,10 @@
 package xyz.quaver.pupil.ui.fragment
 import androidx.fragment.app.Fragment
 import xyz.quaver.pupil.R
 class TransferConnectedFragment: Fragment(R.layout.transfer_connected_fragment) {
 }
--- a/app/src/main/java/xyz/quaver/pupil/ui/fragment/TransferDirectionFragment.kt
+++ b/app/src/main/java/xyz/quaver/pupil/ui/fragment/TransferDirectionFragment.kt
@@ -0,0 +1,44 @@
 package xyz.quaver.pupil.ui.fragment
 import android.os.Bundle
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
 import androidx.fragment.app.Fragment
 import androidx.fragment.app.activityViewModels
 import xyz.quaver.pupil.R
 import xyz.quaver.pupil.databinding.TransferDirectionFragmentBinding
 import xyz.quaver.pupil.ui.TransferStep
 import xyz.quaver.pupil.ui.TransferViewModel
 class TransferDirectionFragment : Fragment(R.layout.transfer_direction_fragment) {
    private var _binding: TransferDirectionFragmentBinding? = null
    private val binding get() = _binding!!
    private val viewModel: TransferViewModel by activityViewModels()
    override fun onCreateView(
        inflater: LayoutInflater,
        container: ViewGroup?,
        savedInstanceState: Bundle?
    ): View {
        _binding = TransferDirectionFragmentBinding.inflate(inflater, container, false)
        binding.inButton.setOnClickListener {
            viewModel.setStep(TransferStep.TARGET)
        }
        binding.outButton.setOnClickListener {
            viewModel.setStep(TransferStep.WAIT_FOR_CONNECTION)
        }
        return binding.root
    }
    override fun onDestroyView() {
        super.onDestroyView()
        _binding = null
    }
 }
--- a/app/src/main/java/xyz/quaver/pupil/ui/fragment/TransferPermissionFragment.kt
+++ b/app/src/main/java/xyz/quaver/pupil/ui/fragment/TransferPermissionFragment.kt
@@ -0,0 +1,38 @@
 package xyz.quaver.pupil.ui.fragment
 import android.os.Bundle
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
 import androidx.fragment.app.Fragment
 import androidx.fragment.app.activityViewModels
 import xyz.quaver.pupil.databinding.TransferPermissionFragmentBinding
 import xyz.quaver.pupil.ui.TransferStep
 import xyz.quaver.pupil.ui.TransferViewModel
 class TransferPermissionFragment: Fragment() {
    private var _binding: TransferPermissionFragmentBinding? = null
    private val binding get() = _binding!!
    private val viewModel: TransferViewModel by activityViewModels()
    override fun onCreateView(
        inflater: LayoutInflater,
        container: ViewGroup?,
        savedInstanceState: Bundle?
    ): View {
        _binding = TransferPermissionFragmentBinding.inflate(inflater, container, false)
        binding.permissionsButton.setOnClickListener {
            viewModel.setStep(TransferStep.TARGET_FORCE)
        }
        return binding.root
    }
    override fun onDestroyView() {
        super.onDestroyView()
        _binding = null
    }
 }
--- a/app/src/main/java/xyz/quaver/pupil/ui/fragment/TransferSelectDataFragment.kt
+++ b/app/src/main/java/xyz/quaver/pupil/ui/fragment/TransferSelectDataFragment.kt
@@ -0,0 +1,37 @@
 package xyz.quaver.pupil.ui.fragment
 import android.os.Bundle
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
 import androidx.fragment.app.Fragment
 import androidx.fragment.app.activityViewModels
 import xyz.quaver.pupil.databinding.TransferSelectDataFragmentBinding
 import xyz.quaver.pupil.ui.TransferViewModel
 class TransferSelectDataFragment: Fragment() {
    private var _binding: TransferSelectDataFragmentBinding? = null
    private val binding get() = _binding!!
    private val viewModel: TransferViewModel by activityViewModels()
    override fun onCreateView(
        inflater: LayoutInflater,
        container: ViewGroup?,
        savedInstanceState: Bundle?
    ): View? {
        _binding = TransferSelectDataFragmentBinding.inflate(inflater, container, false)
        binding.checkAll.setOnCheckedChangeListener {  _, isChecked ->
            viewModel.list()
        }
        return binding.root
    }
    override fun onDestroyView() {
        super.onDestroyView()
        _binding = null
    }
 }
--- a/app/src/main/java/xyz/quaver/pupil/ui/fragment/TransferTargetFragment.kt
+++ b/app/src/main/java/xyz/quaver/pupil/ui/fragment/TransferTargetFragment.kt
@@ -0,0 +1,69 @@
 package xyz.quaver.pupil.ui.fragment
 import android.os.Bundle
 import android.util.Log
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
 import android.widget.ArrayAdapter
 import androidx.fragment.app.Fragment
 import androidx.fragment.app.activityViewModels
 import xyz.quaver.pupil.R
 import xyz.quaver.pupil.adapters.TransferPeersAdapter
 import xyz.quaver.pupil.databinding.TransferTargetFragmentBinding
 import xyz.quaver.pupil.ui.TransferStep
 import xyz.quaver.pupil.ui.TransferViewModel
 class TransferTargetFragment : Fragment() {
    private var _binding: TransferTargetFragmentBinding? = null
    private val binding get() = _binding!!
    private val viewModel: TransferViewModel by activityViewModels()
    override fun onCreateView(
        inflater: LayoutInflater,
        container: ViewGroup?,
        savedInstanceState: Bundle?
    ): View {
        _binding = TransferTargetFragmentBinding.inflate(inflater, container, false)
        viewModel.thisDevice.observe(viewLifecycleOwner) { device ->
            if (device == null) {
                return@observe
            }
            if (device.status == 3) {
                binding.ripple.startRippleAnimation()
                binding.retryButton.visibility = View.INVISIBLE
            } else {
                binding.ripple.stopRippleAnimation()
                binding.retryButton.visibility = View.VISIBLE
            }
        }
        viewModel.peers.observe(viewLifecycleOwner) { peers ->
            if (peers == null) {
                return@observe
            }
            binding.deviceList.adapter = TransferPeersAdapter(peers.deviceList) {
                viewModel.connect(it)
            }
        }
        binding.ripple.startRippleAnimation()
        binding.retryButton.setOnClickListener {
            viewModel.setStep(TransferStep.TARGET)
        }
        return binding.root
    }
    override fun onDestroyView() {
        super.onDestroyView()
        _binding = null
    }
 }
--- a/app/src/main/java/xyz/quaver/pupil/ui/fragment/TransferWaitForConnectionFragment.kt
+++ b/app/src/main/java/xyz/quaver/pupil/ui/fragment/TransferWaitForConnectionFragment.kt
@@ -0,0 +1,32 @@
 package xyz.quaver.pupil.ui.fragment
 import android.os.Bundle
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
 import androidx.fragment.app.Fragment
 import xyz.quaver.pupil.databinding.TransferWaitForConnectionFragmentBinding
 class TransferWaitForConnectionFragment : Fragment() {
    private var _binding: TransferWaitForConnectionFragmentBinding? = null
    private val binding get() = _binding!!
    override fun onCreateView(
        inflater: LayoutInflater,
        container: ViewGroup?,
        savedInstanceState: Bundle?
    ): View? {
        _binding = TransferWaitForConnectionFragmentBinding.inflate(layoutInflater)
        binding.ripple.startRippleAnimation()
        return binding.root
    }
    override fun onDestroyView() {
        super.onDestroyView()
        _binding = null
    }
 }
--- a/app/src/main/java/com/arlib/floatingsearchview/FloatingSearchViewDayNight.kt
+++ b/app/src/main/java/com/arlib/floatingsearchview/FloatingSearchViewDayNight.kt
@@ -16,16 +16,16 @@
 *     along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
-package com.arlib.floatingsearchview
+package xyz.quaver.pupil.ui.view
 import android.content.Context
 import android.graphics.PorterDuff
 import android.graphics.PorterDuffColorFilter
 import android.graphics.drawable.Animatable
 import android.os.Parcelable
 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
@@ -36,32 +36,32 @@ import androidx.core.content.ContextCompat
 import androidx.core.content.res.ResourcesCompat
 import androidx.swiperefreshlayout.widget.CircularProgressDrawable
 import androidx.vectordrawable.graphics.drawable.AnimatedVectorDrawableCompat
-import com.arlib.floatingsearchview.suggestions.SearchSuggestionsAdapter
+import xyz.quaver.floatingsearchview.FloatingSearchView
-import com.arlib.floatingsearchview.suggestions.model.SearchSuggestion
+import xyz.quaver.floatingsearchview.suggestions.model.SearchSuggestion
-import com.arlib.floatingsearchview.util.view.SearchInputView
+import xyz.quaver.floatingsearchview.util.view.SearchInputView
 import xyz.quaver.pupil.R
 import xyz.quaver.pupil.favoriteTags
 import xyz.quaver.pupil.types.*
 import java.util.*
-class FloatingSearchViewDayNight @JvmOverloads constructor(context: Context, attrs: AttributeSet? = null) :
+class FloatingSearchView @JvmOverloads constructor(context: Context, attrs: AttributeSet? = null) :
    FloatingSearchView(context, attrs),
    FloatingSearchView.OnSearchListener,
    SearchSuggestionsAdapter.OnBindSuggestionCallback,
    TextWatcher
 {
    private val searchInputView = findViewById<SearchInputView>(R.id.search_bar_text)
    var onHistoryDeleteClickedListener: ((String) -> Unit)? = null
    var onFavoriteHistorySwitchClickListener: (() -> Unit)? = null
    init {
-        searchInputView.imeOptions = EditorInfo.IME_FLAG_NO_EXTRACT_UI
+        searchInputView.imeOptions = EditorInfo.IME_FLAG_NO_EXTRACT_UI or searchInputView.imeOptions
        searchInputView.addTextChangedListener(this)
-        setOnSearchListener(this)
+        onSearchListener = this
-        setOnBindSuggestionCallback(this)
+        onBindSuggestionCallback = { binding, item, itemPosition ->
            onBindSuggestion(binding.root, binding.leftIcon, binding.body, item, itemPosition)
        }
    }
    override fun beforeTextChanged(s: CharSequence?, start: Int, count: Int, after: Int) {
@@ -76,14 +76,14 @@ class FloatingSearchViewDayNight @JvmOverloads constructor(context: Context, att
        s ?: return
        if (s.any { it.isUpperCase() })
-            s.replace(0, s.length, s.toString().toLowerCase(Locale.getDefault()))
+            s.replace(0, s.length, s.toString().lowercase())
    }
    override fun onSuggestionClicked(searchSuggestion: SearchSuggestion?) {
        when (searchSuggestion) {
            is TagSuggestion -> {
                val tag = "${searchSuggestion.n}:${searchSuggestion.s.replace(Regex("\\s"), "_")}"
-                with(searchInputView.text) {
+                with(searchInputView.text!!) {
                    delete(if (lastIndexOf(' ') == -1) 0 else lastIndexOf(' ') + 1, length)
                    if (!this.contains(tag))
@@ -91,9 +91,9 @@ class FloatingSearchViewDayNight @JvmOverloads constructor(context: Context, att
                }
            }
            is Suggestion -> {
-                with(searchInputView.text) {
+                with(searchInputView.text!!) {
                    clear()
-                    append(searchSuggestion.str)
+                    append(searchSuggestion.body)
                }
            }
            is FavoriteHistorySwitch -> onFavoriteHistorySwitchClickListener?.invoke()
@@ -102,16 +102,16 @@ class FloatingSearchViewDayNight @JvmOverloads constructor(context: Context, att
    override fun onSearchAction(currentQuery: String?) {}
-    override fun onBindSuggestion(
+    fun onBindSuggestion(
        suggestionView: View?,
        leftIcon: ImageView?,
        textView: TextView?,
        item: SearchSuggestion?,
        itemPosition: Int
    ) {
-        when(item) {
+      when(item) {
            is TagSuggestion -> {
-                val tag = "${item.n}:${item.s.replace(Regex("\\s"), "_")}"
+                val tag = "${item.n}:${item.s}"
                leftIcon?.setImageDrawable(
                    ResourcesCompat.getDrawable(
@@ -162,9 +162,7 @@ class FloatingSearchViewDayNight @JvmOverloads constructor(context: Context, att
                    }
                }
-                if (item.t == -1) {
+                if (item.t > 0) {
                    textView?.text = item.s
                } else {
                    (suggestionView as? LinearLayout)?.let {
                        val count = it.findViewById<TextView>(R.id.count)
                        if (count == null)
@@ -199,7 +197,7 @@ class FloatingSearchViewDayNight @JvmOverloads constructor(context: Context, att
                    isClickable = true
                    setOnClickListener {
-                        onHistoryDeleteClickedListener?.invoke(item.str)
+                        onHistoryDeleteClickedListener?.invoke(item.body)
                    }
                }
            }
@@ -215,10 +213,4 @@ class FloatingSearchViewDayNight @JvmOverloads constructor(context: Context, att
            }
        }
    }
-
+}
    // hack to remove color attributes which should not be reused
    override fun onSaveInstanceState(): Parcelable? {
        super.onSaveInstanceState()
        return null
    }
 }
--- a/app/src/main/java/xyz/quaver/pupil/ui/view/MainView.java
+++ b/app/src/main/java/xyz/quaver/pupil/ui/view/MainView.java
@@ -0,0 +1,462 @@
 /*
 *     Pupil, Hitomi.la viewer for Android
 *     Copyright (C) 2020  tom5079
 *
 *     This program is free software: you can redistribute it and/or modify
 *     it under the terms of the GNU General Public License as published by
 *     the Free Software Foundation, either version 3 of the License, or
 *     (at your option) any later version.
 *
 *     This program is distributed in the hope that it will be useful,
 *     but WITHOUT ANY WARRANTY; without even the implied warranty of
 *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 *     GNU General Public License for more details.
 *
 *     You should have received a copy of the GNU General Public License
 *     along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 package xyz.quaver.pupil.ui.view;
 import android.animation.ValueAnimator;
 import android.content.Context;
 import android.content.res.Configuration;
 import android.graphics.Canvas;
 import android.graphics.Paint;
 import android.graphics.Rect;
 import android.os.Vibrator;
 import android.util.AttributeSet;
 import android.util.DisplayMetrics;
 import android.view.Gravity;
 import android.view.View;
 import android.view.ViewGroup;
 import android.view.animation.DecelerateInterpolator;
 import android.widget.TextView;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.appcompat.app.AppCompatDelegate;
 import androidx.appcompat.content.res.AppCompatResources;
 import androidx.core.content.ContextCompat;
 import androidx.core.view.NestedScrollingChild;
 import androidx.core.view.NestedScrollingChildHelper;
 import androidx.core.view.NestedScrollingParent;
 import androidx.core.view.NestedScrollingParentHelper;
 import androidx.core.view.ViewCompat;
 import androidx.core.widget.TextViewCompat;
 import xyz.quaver.pupil.R;
@SuppressWarnings("NullableProblems")
 public class MainView extends ViewGroup implements NestedScrollingChild, NestedScrollingParent {
    private static final int PAGE_TURN_LAYOUT_SIZE = 48;
    private static final int PAGE_TURN_ANIM_DURATION = 500;
    private static final int PREV_OFFSET = 64;
    private static final int RIPPLE_GIVE = 4;
    private final float adjustedPageTurnLayoutSize;
    private final float adjustedPrevOffset;
    private final float adjustedRippleGive;
    final private NestedScrollingParentHelper mNestedScrollingParentHelper;
    final private NestedScrollingChildHelper mNestedScrollingChildHelper;
    final private Vibrator mVibrator;
    private View mTarget;
    private TextView mPrev;
    private TextView mNext;
    private final Paint mRipplePaint = new Paint();
    private final Rect mRippleBound = new Rect();
    private int mRippleSize = 0;
    private final int mRippleTargetSize;
    private final ValueAnimator mRippleAnimator = new ValueAnimator();
    private int mCurrentOverScroll = 0;
    private int mCurrentPage = 1;
    private boolean mShowPrev;
    private boolean mShowNext;
    private OnPageTurnListener mOnPageTurnListener;
    public MainView(@NonNull Context context) {
        this(context, null);
    }
    public MainView(@NonNull Context context, AttributeSet attr) {
        this(context, attr, 0);
    }
    public MainView(@NonNull Context context, AttributeSet attr, int defStyle) {
        super(context, attr, defStyle);
        setWillNotDraw(false);
        DisplayMetrics metrics = getResources().getDisplayMetrics();
        adjustedPageTurnLayoutSize = PAGE_TURN_LAYOUT_SIZE * metrics.density;
        adjustedPrevOffset = PREV_OFFSET * metrics.density;
        adjustedRippleGive = RIPPLE_GIVE * metrics.density;
        mRippleTargetSize = metrics.widthPixels;
        mNestedScrollingParentHelper = new NestedScrollingParentHelper(this);
        mNestedScrollingChildHelper = new NestedScrollingChildHelper(this);
        mVibrator = (Vibrator) getContext().getSystemService(Context.VIBRATOR_SERVICE);
        mRippleAnimator.addUpdateListener(animation -> {
            mRippleSize = (int) animation.getAnimatedValue();
            invalidate();
        });
        mRippleAnimator.setDuration(PAGE_TURN_ANIM_DURATION);
        initPageTurnView();
    }
    public void setCurrentPage(int currentPage, boolean showNext) {
        mCurrentPage = currentPage;
        mShowPrev = currentPage > 1;
        mShowNext = showNext;
        mPrev.setText(getContext().getString(R.string.main_move_to_page, mCurrentPage-1));
        mNext.setText(getContext().getString(R.string.main_move_to_page, mCurrentPage+1));
    }
    public void setOnPageTurnListener(OnPageTurnListener listener) {
        mOnPageTurnListener = listener;
    }
    private void initPageTurnView() {
        TextView prev = new TextView(getContext());
        TextView next = new TextView(getContext());
        prev.setGravity(Gravity.CENTER_VERTICAL);
        next.setGravity(Gravity.CENTER_VERTICAL);
        prev.setCompoundDrawablesWithIntrinsicBounds(R.drawable.navigate_prev, 0, 0, 0);
        next.setCompoundDrawablesWithIntrinsicBounds(0, 0, R.drawable.navigate_next, 0);
        TextViewCompat.setCompoundDrawableTintList(prev, AppCompatResources.getColorStateList(getContext(), R.color.colorAccent));
        TextViewCompat.setCompoundDrawableTintList(next, AppCompatResources.getColorStateList(getContext(), R.color.colorAccent));
        prev.setVisibility(View.INVISIBLE);
        next.setVisibility(View.INVISIBLE);
        mPrev = prev;
        mNext = next;
        addView(mPrev);
        addView(mNext);
        setCurrentPage(1, false);
    }
    private void ensureTarget() {
        if (mTarget == null) {
            for (int i = 0; i < getChildCount(); i++) {
                View child = getChildAt(i);
                if (!child.equals(mNext) && !child.equals(mPrev)) {
                    mTarget = child;
                    break;
                }
            }
        }
    }
    @Override
    protected void onLayout(boolean changed, int l, int t, int r, int b) {
        final int width = getMeasuredWidth();
        final int height = getMeasuredHeight();
        if (getChildCount() == 0)
            return;
        if (mTarget == null)
            ensureTarget();
        if (mTarget == null)
            return;
        mTarget.layout(
            getPaddingLeft(),
            getPaddingTop(),
            width - getPaddingRight(),
            height - getPaddingBottom()
        );
        final int prevWidth = mPrev.getMeasuredWidth();
        mPrev.layout(
            width / 2 - prevWidth / 2,
            getPaddingTop() + (int) adjustedPrevOffset,
            width / 2 + prevWidth / 2,
            getPaddingTop() + (int) adjustedPrevOffset + mPrev.getMeasuredHeight()
        );
        final int nextWidth = mNext.getMeasuredWidth();
        mNext.layout(
            width / 2 - nextWidth / 2,
            height - getPaddingBottom() - mNext.getMeasuredHeight(),
            width / 2 + nextWidth / 2,
            height - getPaddingBottom()
        );
    }
    @Override
    protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec) {
        super.onMeasure(widthMeasureSpec, heightMeasureSpec);
        if (mTarget == null)
            ensureTarget();
        if (mTarget == null)
            return;
        mTarget.measure(
            MeasureSpec.makeMeasureSpec(getMeasuredWidth() - getPaddingLeft() - getPaddingRight(), MeasureSpec.EXACTLY),
            MeasureSpec.makeMeasureSpec(getMeasuredHeight() - getPaddingTop() - getPaddingBottom(), MeasureSpec.EXACTLY)
        );
        mPrev.measure(
            MeasureSpec.makeMeasureSpec(getMeasuredWidth(), MeasureSpec.AT_MOST),
            MeasureSpec.makeMeasureSpec((int) adjustedPageTurnLayoutSize, MeasureSpec.EXACTLY)
        );
        mNext.measure(
            MeasureSpec.makeMeasureSpec(getMeasuredWidth(), MeasureSpec.AT_MOST),
            MeasureSpec.makeMeasureSpec((int) adjustedPageTurnLayoutSize, MeasureSpec.EXACTLY)
        );
    }
    @Override
    protected void onDraw(Canvas canvas) {
        super.onDraw(canvas);
        if (mCurrentOverScroll == 0)
            return;
        if (mCurrentOverScroll > 0) {
            mRippleBound.set(
                getPaddingLeft(),
                (int) (getPaddingTop() - adjustedRippleGive),
                getMeasuredWidth() - getPaddingRight(),
                (int) (getPaddingTop() + adjustedPrevOffset + mPrev.getMeasuredHeight() + adjustedRippleGive)
            );
        }
        if (mCurrentOverScroll < 0) {
            final int height = getMeasuredHeight();
            mRippleBound.set(
                getPaddingLeft(),
                (int) (height - getPaddingBottom() - mNext.getMeasuredHeight() - adjustedRippleGive),
                getMeasuredWidth() - getPaddingRight(),
                height - getPaddingBottom()
            );
        }
        mRipplePaint.reset();
        mRipplePaint.setStyle(Paint.Style.FILL);
        int currentNightMode = getResources().getConfiguration().uiMode & Configuration.UI_MODE_NIGHT_MASK;
        switch (currentNightMode) {
            case Configuration.UI_MODE_NIGHT_YES:
                mRipplePaint.setColor(ContextCompat.getColor(getContext(), R.color.material_light_blue_700));
                break;
            case Configuration.UI_MODE_NIGHT_NO:
                mRipplePaint.setColor(ContextCompat.getColor(getContext(), R.color.material_light_blue_300));
                break;
        }
        canvas.drawCircle(
            (mRippleBound.left + mRippleBound.right) / 2F,
            mCurrentOverScroll > 0 ? mRippleBound.bottom : mRippleBound.top,
            mRippleSize,
            mRipplePaint
        );
    }
    private void onOverscroll(int overscroll) {
        if (mTarget == null)
            ensureTarget();
        if (mTarget == null)
            return;
        mCurrentOverScroll = overscroll;
        if (overscroll > 0) {
            mPrev.setVisibility(View.VISIBLE);
            mNext.setVisibility(View.INVISIBLE);
        } else if (overscroll < 0) {
            mPrev.setVisibility(View.INVISIBLE);
            mNext.setVisibility(View.VISIBLE);
        } else {
            mPrev.setVisibility(View.INVISIBLE);
            mNext.setVisibility(View.INVISIBLE);
        }
        if (Math.abs(overscroll) >= adjustedPageTurnLayoutSize) {
            if (!mRippleAnimator.isStarted() && mRippleSize != mRippleTargetSize) {
                mVibrator.vibrate(10);
                mRippleAnimator.setIntValues(mRippleSize, mRippleTargetSize);
                mRippleAnimator.start();
            }
        } else {
            if (!mRippleAnimator.isStarted() && mRippleSize != 0) {
                mRippleAnimator.setIntValues(mRippleSize, 0);
                mRippleAnimator.start();
            }
        }
        float clippedOverScrollTop = (overscroll > 0 ? 1 : -1) * Math.min(Math.abs(overscroll), adjustedPageTurnLayoutSize);
        mTarget.setTranslationY(clippedOverScrollTop);
    }
    private void onOverscrollEnd(int overscroll) {
        if (mTarget == null)
            ensureTarget();
        if (mTarget == null)
            return;
        mRippleAnimator.cancel();
        mRippleAnimator.setIntValues(mRippleSize, 0);
        mRippleAnimator.start();
        mPrev.setVisibility(View.INVISIBLE);
        mNext.setVisibility(View.INVISIBLE);
        ViewCompat.animate(mTarget)
            .setDuration(PAGE_TURN_ANIM_DURATION)
            .setInterpolator(new DecelerateInterpolator())
            .translationY(0);
        if (Math.abs(overscroll) > adjustedPageTurnLayoutSize && mOnPageTurnListener != null) {
            if (overscroll > 0)
                mOnPageTurnListener.onPrev(mCurrentPage-1);
            if (overscroll < 0)
                mOnPageTurnListener.onNext(mCurrentPage+1);
        }
    }
    // NestedScrollingParent
    private int mTotalUnconsumed = 0;
    @Override
    public boolean onStartNestedScroll(View child, View target, int nestedScrollAxes) {
        return isEnabled() && (nestedScrollAxes & ViewCompat.SCROLL_AXIS_VERTICAL) != 0;
    }
    @Override
    public void onNestedScrollAccepted(View child, View target, int axes) {
        mNestedScrollingParentHelper.onNestedScrollAccepted(child, target, axes);
        startNestedScroll(axes & ViewCompat.SCROLL_AXIS_VERTICAL);
        mTotalUnconsumed = 0;
    }
    @Override
    public void onNestedPreScroll(View target, int dx, int dy, int[] consumed) {
        if (mTotalUnconsumed != 0 && dy > 0 == mTotalUnconsumed > 0) {
            if (Math.abs(dy) > Math.abs(mTotalUnconsumed)) {
                consumed[1] = dy - mTotalUnconsumed;
                mTotalUnconsumed = 0;
            } else {
                mTotalUnconsumed -= dy;
                consumed[1] = dy;
            }
            onOverscroll(mTotalUnconsumed);
        }
        final int[] parentConsumed = new int[2];
        if (dispatchNestedPreScroll(dx - consumed[0], dy - consumed[1], parentConsumed, null)) {
            consumed[0] += parentConsumed[0];
            consumed[1] += parentConsumed[1];
        }
    }
    @Override
    public void onNestedScroll(View target, int dxConsumed, int dyConsumed, int dxUnconsumed, int dyUnconsumed) {
        final int[] mParentOffsetInWindow = new int[2];
        dispatchNestedScroll(dxConsumed, dyConsumed, dxUnconsumed, dyUnconsumed, mParentOffsetInWindow);
        final int dy = dyUnconsumed + mParentOffsetInWindow[1];
        if (mTotalUnconsumed == 0 && ((dy < 0 && !mShowPrev) || (dy > 0 && !mShowNext)))
            return;
        if (dy != 0) {
            mTotalUnconsumed -= dy;
            onOverscroll(mTotalUnconsumed);
        }
    }
    @Override
    public void onStopNestedScroll(View child) {
        mNestedScrollingParentHelper.onStopNestedScroll(child);
        if (Math.abs(mTotalUnconsumed) > 0) {
            onOverscrollEnd(mTotalUnconsumed);
            mTotalUnconsumed = 0;
        }
        stopNestedScroll();
    }
    // NestedScrollingChild
    @Override
    public void setNestedScrollingEnabled(boolean enabled) {
        mNestedScrollingChildHelper.setNestedScrollingEnabled(enabled);
    }
    @Override
    public boolean isNestedScrollingEnabled() {
        return mNestedScrollingChildHelper.isNestedScrollingEnabled();
    }
    @Override
    public boolean startNestedScroll(int axes) {
        return mNestedScrollingChildHelper.startNestedScroll(axes);
    }
    @Override
    public void stopNestedScroll() {
        mNestedScrollingChildHelper.stopNestedScroll();
    }
    @Override
    public boolean hasNestedScrollingParent() {
        return mNestedScrollingChildHelper.hasNestedScrollingParent();
    }
    @Override
    public boolean dispatchNestedScroll(int dxConsumed, int dyConsumed, int dxUnconsumed, int dyUnconsumed, @Nullable int[] offsetInWindow) {
        return mNestedScrollingChildHelper.dispatchNestedScroll(dxConsumed, dyConsumed, dxUnconsumed, dyUnconsumed, offsetInWindow);
    }
    @Override
    public boolean dispatchNestedPreScroll(int dx, int dy, @Nullable int[] consumed, @Nullable int[] offsetInWindow) {
        return mNestedScrollingChildHelper.dispatchNestedPreScroll(dx, dy, consumed, offsetInWindow);
    }
    @Override
    public boolean dispatchNestedFling(float velocityX, float velocityY, boolean consumed) {
        return mNestedScrollingChildHelper.dispatchNestedFling(velocityX, velocityY, consumed);
    }
    @Override
    public boolean dispatchNestedPreFling(float velocityX, float velocityY) {
        return mNestedScrollingChildHelper.dispatchNestedPreFling(velocityX, velocityY);
    }
    public interface OnPageTurnListener {
        void onPrev(int page);
        void onNext(int page);
    }
 }
--- a/app/src/main/java/xyz/quaver/pupil/ui/view/ProgressCard.kt
+++ b/app/src/main/java/xyz/quaver/pupil/ui/view/ProgressCard.kt
@@ -0,0 +1,72 @@
 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.core.content.ContextCompat
 import androidx.core.graphics.drawable.DrawableCompat
 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) {
    enum class Type {
        LOADING,
        CACHE,
        DOWNLOAD
    }
    var type: Type = Type.LOADING
        set(value) {
            field = value
            when (field) {
                Type.LOADING -> R.color.colorAccent
                Type.CACHE -> R.color.material_blue_700
                Type.DOWNLOAD -> R.color.material_green_a700
            }.let {
                val color = ContextCompat.getColor(context, it)
                DrawableCompat.setTint(binding.progressbar.progressDrawable, color)
            }
        }
    var progress: Int
        get() = binding.progressbar.progress
        set(value) {
            binding.progressbar.progress = value
        }
    var max: Int
        get() = binding.progressbar.max
        set(value) {
            binding.progressbar.max = value
            binding.progressbar.visibility =
                if (value == 0)
                    GONE
                else
                    VISIBLE
        }
    val binding = ProgressCardViewBinding.inflate(LayoutInflater.from(context), this)
    init {
        binding.content.setOnClickListener {
            performClick()
        }
        binding.content.setOnLongClickListener {
            performLongClick()
        }
    }
    override fun addView(child: View?, index: Int, params: ViewGroup.LayoutParams?) {
        if (childCount == 0)
            super.addView(child, index, params)
        else
            binding.content.addView(child, index, params)
    }
 }
--- a/app/src/main/java/xyz/quaver/pupil/ui/view/TagChip.kt
+++ b/app/src/main/java/xyz/quaver/pupil/ui/view/TagChip.kt
@@ -23,17 +23,19 @@ import android.content.Context
 import androidx.core.content.ContextCompat
 import com.google.android.material.chip.Chip
 import xyz.quaver.pupil.R
 import xyz.quaver.pupil.favoriteTags
 import xyz.quaver.pupil.types.Tag
 import xyz.quaver.pupil.util.translations
 import xyz.quaver.pupil.util.wordCapitalize
@SuppressLint("ViewConstructor")
-class TagChip(context: Context, tag: Tag) : Chip(context) {
+class TagChip(context: Context, _tag: Tag) : Chip(context) {
    val tag: Tag =
-        tag.let {
+        _tag.let {
            when {
                it.area != null -> it
-                else -> Tag("tag", tag.tag)
+                else -> Tag("tag", _tag.tag)
            }
        }
@@ -44,23 +46,52 @@ class TagChip(context: Context, tag: Tag) : Chip(context) {
    }.toMap()
    init {
-        chipIcon = when(tag.area) {
+        when(tag.area) {
            "male" -> {
                setChipBackgroundColorResource(R.color.material_blue_700)
                setTextColor(ContextCompat.getColor(context, android.R.color.white))
-                ContextCompat.getDrawable(context, R.drawable.gender_male_white)
+                setCloseIconTintResource(android.R.color.white)
                chipIcon = ContextCompat.getDrawable(context, R.drawable.gender_male_white)
            }
            "female" -> {
                setChipBackgroundColorResource(R.color.material_pink_600)
                setTextColor(ContextCompat.getColor(context, android.R.color.white))
-                ContextCompat.getDrawable(context, R.drawable.gender_female_white)
+                setCloseIconTintResource(android.R.color.white)
                chipIcon = ContextCompat.getDrawable(context, R.drawable.gender_female_white)
            }
        }
        if (favoriteTags.contains(tag))
            setChipBackgroundColorResource(R.color.material_orange_500)
        isCloseIconVisible = true
        closeIcon = ContextCompat.getDrawable(context,
            if (favoriteTags.contains(tag))
                R.drawable.ic_star_filled
            else
                R.drawable.ic_star_empty
        )
        setOnCloseIconClickListener {
            if (favoriteTags.contains(tag)) {
                favoriteTags.remove(tag)
                closeIcon = ContextCompat.getDrawable(context, R.drawable.ic_star_empty)
                when(tag.area) {
                    "male" -> setChipBackgroundColorResource(R.color.material_blue_700)
                    "female" -> setChipBackgroundColorResource(R.color.material_pink_600)
                    else -> chipBackgroundColor = null
                }
            } else {
                favoriteTags.add(tag)
                closeIcon = ContextCompat.getDrawable(context, R.drawable.ic_star_filled)
                setChipBackgroundColorResource(R.color.material_orange_500)
            }
            else -> null
        }
        text = when (tag.area) {
            "language" -> languages[tag.tag]
-            else -> tag.tag.wordCapitalize()
+            else -> (translations[tag.tag] ?: tag.tag).wordCapitalize()
        }
        setEnsureMinTouchTargetSize(false)
--- a/app/src/main/java/xyz/quaver/pupil/ui/view/TagChipGroup.kt
+++ b/app/src/main/java/xyz/quaver/pupil/ui/view/TagChipGroup.kt
@@ -0,0 +1,100 @@
 /*
 *     Pupil, Hitomi.la viewer for Android
 *     Copyright (C) 2020  tom5079
 *
 *     This program is free software: you can redistribute it and/or modify
 *     it under the terms of the GNU General Public License as published by
 *     the Free Software Foundation, either version 3 of the License, or
 *     (at your option) any later version.
 *
 *     This program is distributed in the hope that it will be useful,
 *     but WITHOUT ANY WARRANTY; without even the implied warranty of
 *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 *     GNU General Public License for more details.
 *
 *     You should have received a copy of the GNU General Public License
 *     along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 package xyz.quaver.pupil.ui.view
 import android.content.Context
 import android.content.res.TypedArray
 import android.util.AttributeSet
 import android.util.Log
 import com.google.android.material.chip.Chip
 import com.google.android.material.chip.ChipGroup
 import kotlinx.coroutines.*
 import xyz.quaver.pupil.R
 import xyz.quaver.pupil.types.Tag
 import xyz.quaver.pupil.types.Tags
 class TagChipGroup @JvmOverloads constructor(context: Context, attr: AttributeSet? = null, attrStyle: Int = R.attr.chipGroupStyle, val tags: Tags = Tags()) : ChipGroup(context, attr, attrStyle), MutableSet<Tag> by tags {
    object Defaults {
        const val maxChipSize = 10
    }
    var maxChipSize: Int = Defaults.maxChipSize
        set(value) {
            field = value
            refresh()
        }
    private val moreView = Chip(context).apply {
        text = "…"
        setEnsureMinTouchTargetSize(false)
        setOnClickListener {
            removeView(this)
            for (i in maxChipSize until tags.size) {
                val tag = tags.elementAt(i)
                addView(TagChip(context, tag).apply {
                    setOnClickListener {
                        onClickListener?.invoke(tag)
                    }
                })
            }
        }
    }
    var onClickListener: ((Tag) -> Unit)? = null
    private fun applyAttributes(attr: TypedArray) {
        maxChipSize = attr.getInt(R.styleable.TagChipGroup_maxTag, Defaults.maxChipSize)
    }
    private var refreshJob: Job? = null
    fun refresh() {
        refreshJob?.cancel()
        this.removeAllViews()
        refreshJob = CoroutineScope(Dispatchers.Main).launch {
            tags.take(maxChipSize).map {
                CoroutineScope(Dispatchers.Default).async {
                    TagChip(context, it).apply {
                        setOnClickListener {
                            onClickListener?.invoke(this.tag)
                        }
                    }
                }
            }.forEach {
                addView(it.await())
            }
            if (maxChipSize > 0 && tags.size > maxChipSize)
                addView(moreView)
        }
    }
    init {
        applyAttributes(context.obtainStyledAttributes(attr, R.styleable.TagChipGroup))
        refresh()
    }
 }
--- a/app/src/main/java/xyz/quaver/pupil/util/SavedSet.kt
+++ b/app/src/main/java/xyz/quaver/pupil/util/SavedSet.kt
@@ -18,9 +18,12 @@
 package xyz.quaver.pupil.util
-import kotlinx.serialization.*
+import com.google.firebase.crashlytics.FirebaseCrashlytics
 import kotlinx.serialization.ExperimentalSerializationApi
 import kotlinx.serialization.KSerializer
 import kotlinx.serialization.builtins.ListSerializer
 import kotlinx.serialization.json.Json
 import kotlinx.serialization.serializer
 import java.io.File
 class SavedSet <T: Any> (private val file: File, private val any: T, private val set: MutableSet<T> = mutableSetOf()) : MutableSet<T> by set {
@@ -38,27 +41,26 @@ class SavedSet <T: Any> (private val file: File, private val any: T, private val
        load()
    }
    @Synchronized
    fun load() {
-        synchronized(this) {
+        set.clear()
-            set.clear()
+        kotlin.runCatching {
-            kotlin.runCatching {
+            Json.decodeFromString(serializer, file.readText())
-                Json.decodeFromString(serializer, file.readText())
+        }.onSuccess {
-            }.onSuccess {
+            set.addAll(it)
-                set.addAll(it)
+        }.onFailure {
-            }
+            FirebaseCrashlytics.getInstance().recordException(it)
        }
    }
    @Synchronized
    @OptIn(ExperimentalSerializationApi::class)
    fun save() {
-        synchronized(this) {
+        file.writeText(Json.encodeToString(serializer, set.toList()))
            file.writeText(Json.encodeToString(serializer, set.toList()))
        }
    }
    @Synchronized
    override fun add(element: T): Boolean {
        load()
        set.remove(element)
        return set.add(element).also {
@@ -66,9 +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 {
@@ -76,14 +77,14 @@ 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()
        }
    }
    @Synchronized
    override fun clear() {
        set.clear()
        save()
--- a/app/src/main/java/xyz/quaver/pupil/util/SetLineOverlap.kt
+++ b/app/src/main/java/xyz/quaver/pupil/util/SetLineOverlap.kt
@@ -1,37 +0,0 @@
 package xyz.quaver.pupil.util
 import android.graphics.Paint
 import android.text.style.LineHeightSpan
 class SetLineOverlap(private val overlap: Boolean) : LineHeightSpan {
    companion object {
        private var originalBottom = 15
        private var originalDescent = 13
        private var overlapSaved = false
    }
    override fun chooseHeight(
        text: CharSequence?,
        start: Int,
        end: Int,
        spanstartv: Int,
        lineHeight: Int,
        fm: Paint.FontMetricsInt?
    ) {
        fm ?: return
        if (overlap) {
            if (overlapSaved) {
                originalBottom = fm.bottom
                originalDescent = fm.descent
                overlapSaved = true
            }
            fm.bottom += fm.top
            fm.descent += fm.top
        } else {
            fm.bottom = originalBottom
            fm.descent = originalDescent
            overlapSaved = false
        }
    }
 }
--- a/app/src/main/java/xyz/quaver/pupil/util/downloader/Cache.kt
+++ b/app/src/main/java/xyz/quaver/pupil/util/downloader/Cache.kt
@@ -20,38 +20,98 @@ package xyz.quaver.pupil.util.downloader
 import android.content.Context
 import android.content.ContextWrapper
-import android.util.SparseArray
+import android.net.Uri
-import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.*
-import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.sync.Mutex
-import kotlinx.coroutines.launch
+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.util.Preferences
+import xyz.quaver.pupil.hitomi.*
 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 reader: Reader? = null,
+    var galleryInfo: GalleryInfo? = null,
    var imageList: MutableList<String?>? = null
 ) {
-    fun copy(): Metadata = Metadata(galleryBlock, reader, imageList?.let { MutableList(it.size) { i -> it[i] } })
+    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] } })
 }
 class Cache private constructor(context: Context, val galleryID: Int) : ContextWrapper(context) {
    companion object {
-        val instances = SparseArray<Cache>()
+        val instances = ConcurrentHashMap<Int, Cache>()
        fun getInstance(context: Context, galleryID: Int) =
            instances[galleryID] ?: synchronized(this) {
@@ -59,9 +119,9 @@ class Cache private constructor(context: Context, val galleryID: Int) : ContextW
            }
        @Synchronized
-        fun delete(galleryID: Int) {
+        fun delete(context: Context, galleryID: Int) {
-            instances[galleryID]?.cacheFolder?.deleteRecursively()
+            File(context.cacheDir, "imageCache/$galleryID").deleteRecursively()
-            instances.delete(galleryID)
+            instances.remove(galleryID)
        }
    }
@@ -70,10 +130,14 @@ class Cache private constructor(context: Context, val galleryID: Int) : ContextW
    }
    var metadata = kotlin.runCatching {
-        findFile(".metadata")?.readText()?.let {
+        findFile(".metadata")?.readText()?.let { metadata ->
-            Json.decodeFromString<Metadata>(it)
+            kotlin.runCatching {
                Json.decodeFromString<Metadata>(metadata)
            }.getOrElse {
                Metadata(json.decodeFromString<OldMetadata>(metadata))
            }
        }
-    }.getOrNull() ?: Metadata()
+    }.onFailure { it.printStackTrace() }.getOrNull() ?: Metadata()
    val downloadFolder: FileX?
        get() = DownloadManager.getInstance(this).getDownloadFolder(galleryID)
@@ -106,143 +170,128 @@ 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) {
-                var galleryBlock: GalleryBlock? = null
+                try {
-
+                    getGalleryBlock(galleryID).also {
-                for (source in sources) {
+                        setMetadata { metadata -> metadata.galleryBlock = it }
-                    galleryBlock = try {
+                    }
-                        source.invoke()
+                } catch (e: Exception) { return@withContext null }
                    } catch (e: Exception) { null }
                    if (galleryBlock != null)
                        break
                }
                galleryBlock?.also {
                    setMetadata { metadata -> metadata.galleryBlock = it }
                }
            }
    }
    @Suppress("BlockingMethodInNonBlockingContext")
-    suspend fun getThumbnail(): ByteArray? =
+    suspend fun getThumbnail(): Uri =
-        findFile(".thumbnail")?.readBytes()
+        findFile(".thumbnail")?.uri
            ?: getGalleryBlock()?.thumbnails?.firstOrNull()?.let { withContext(Dispatchers.IO) {
                kotlin.runCatching {
                    val request = Request.Builder()
                        .url(it)
                        .header("Referer", "https://hitomi.la/")
                        .build()
                    client.newCall(request).execute().also { if (it.code() != 200) throw IOException() }.body()?.use { it.bytes() }
-                }.getOrNull()?.also { kotlin.run {
+                }.getOrNull()?.let { thumbnail -> kotlin.runCatching {
-                    cacheFolder.getChild(".thumbnail").writeBytes(it)
+                    cacheFolder.getChild(".thumbnail").also {
-                } }
+                        if (!it.exists())
-            } }
+                            it.createNewFile()
-    suspend fun getReader(): Reader? {
+                        it.writeBytes(thumbnail)
-        val mirrors = Preferences.get<String>("mirrors").let { if (it.isEmpty()) emptyList() else it.split('>') }
+                    }
                }.getOrNull()?.uri }
            } } ?: Uri.EMPTY
-        val sources = mapOf(
+    suspend fun getGalleryInfo(): GalleryInfo? {
            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
+        return metadata.galleryInfo
            ?: withContext(Dispatchers.IO) {
-                var reader: Reader? = null
+                try {
                    getGalleryInfo(galleryID).also {
                        setMetadata { metadata ->
                            metadata.galleryInfo = it
-                for (source in sources) {
+                            if (metadata.imageList == null)
-                    reader = try {
+                                metadata.imageList = MutableList(it.files.size) { null }
-                        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
                }
            }
    }
    fun getImage(index: Int): FileX? =
-        metadata.imageList?.get(index)?.let { findFile(it) }
+        metadata.imageList?.getOrNull(index)?.let { findFile(it) }
    @Suppress("BlockingMethodInNonBlockingContext")
-    fun putImage(index: Int, fileName: String, data: ByteArray) {
+    suspend fun putImage(index: Int, fileName: String, data: ByteArray) = coroutineScope {
        val file = cacheFolder.getChild(fileName)
-        file.createNewFile()
+        if (!file.exists())
            file.createNewFile()
        file.writeBytes(data)
        setMetadata { metadata -> metadata.imageList!![index] = fileName }
    }
    private val lock = ConcurrentHashMap<Int, Mutex>()
    @Suppress("BlockingMethodInNonBlockingContext")
    fun moveToDownload() = CoroutineScope(Dispatchers.IO).launch {
        val downloadFolder = downloadFolder ?: return@launch
-        if (downloadFolder.getChild(".metadata").exists())
+        if (lock[galleryID]?.isLocked == true)
            return@launch
-        metadata.imageList?.forEach { imageName ->
+        (lock[galleryID] ?: Mutex().also { lock[galleryID] = it }).withLock {
-            imageName ?: return@forEach
+            val cacheMetadata = cacheFolder.getChild(".metadata")
-            val target = downloadFolder.getChild(imageName)
+            val downloadMetadata = downloadFolder.getChild(".metadata")
            val source = cacheFolder.getChild(imageName)
-            if (!source.exists() || target.exists())
+            if (!cacheMetadata.exists())
-                return@forEach
+                return@launch
-            kotlin.runCatching {
+            if (cacheMetadata.exists()) {
-                target.createNewFile()
+                kotlin.runCatching {
-                target.outputStream()?.use { target -> source.inputStream()?.use { source ->
+                    if (!downloadMetadata.exists())
-                    source.copyTo(target)
+                        downloadMetadata.createNewFile()
-                } }
+
                    downloadMetadata.writeText(Json.encodeToString(metadata))
                }
            }
        }
-        val cacheThumbnail = cacheFolder.getChild(".thumbnail")
+            val cacheThumbnail = cacheFolder.getChild(".thumbnail")
-        val downloadThumbnail = downloadFolder.getChild(".thumbnail")
+            val downloadThumbnail = downloadFolder.getChild(".thumbnail")
-        if (cacheThumbnail.exists() && !downloadThumbnail.exists()) {
+            if (cacheThumbnail.exists()) {
-            kotlin.runCatching {
+                kotlin.runCatching {
-                downloadThumbnail.createNewFile()
+                    if (!downloadThumbnail.exists())
-                downloadThumbnail.outputStream()?.use { target -> cacheThumbnail.inputStream()?.use { source ->
+                        downloadThumbnail.createNewFile()
-                    source.copyTo(target)
+
-                } }
+                    downloadThumbnail.outputStream()?.use { target -> target.channel.truncate(0L); cacheThumbnail.inputStream()?.use { source ->
-                cacheThumbnail.delete()
+                        source.copyTo(target)
                    } }
                    cacheThumbnail.delete()
                }
            }
        }
-        val cacheMetadata = cacheFolder.getChild(".metadata")
+            metadata.imageList?.forEach { imageName ->
-        val downloadMetadata = downloadFolder.getChild(".metadata")
+                imageName ?: return@forEach
                val target = downloadFolder.getChild(imageName)
                val source = cacheFolder.getChild(imageName)
-        if (cacheMetadata.exists() && !downloadMetadata.exists()) {
+                if (!source.exists())
-            kotlin.runCatching {
+                    return@forEach
-                downloadMetadata.createNewFile()
+
-                downloadMetadata.writeText(Json.encodeToString(metadata))
+                kotlin.runCatching {
-                cacheMetadata.delete()
+                    if (!target.exists())
                        target.createNewFile()
                    target.outputStream()?.use { target -> target.channel.truncate(0L); source.inputStream()?.use { source ->
                        source.copyTo(target)
                    } }
                }
            }
        }
-        cacheFolder.delete()
+            cacheFolder.deleteRecursively()
        }
    }
 }
--- a/app/src/main/java/xyz/quaver/pupil/util/downloader/DownloadManager.kt
+++ b/app/src/main/java/xyz/quaver/pupil/util/downloader/DownloadManager.kt
@@ -21,13 +21,18 @@ package xyz.quaver.pupil.util.downloader
 import android.content.Context
 import android.content.ContextWrapper
 import android.util.Log
-import kotlinx.coroutines.runBlocking
+import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
 import kotlinx.serialization.decodeFromString
 import kotlinx.serialization.encodeToString
 import kotlinx.serialization.json.Json
 import okhttp3.Call
 import xyz.quaver.io.FileX
-import xyz.quaver.io.util.*
+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.client
 import xyz.quaver.pupil.services.DownloadService
 import xyz.quaver.pupil.util.Preferences
@@ -47,14 +52,12 @@ class DownloadManager private constructor(context: Context) : ContextWrapper(con
    val defaultDownloadFolder = FileX(this, getExternalFilesDir(null)!!)
    val downloadFolder: FileX
-        get() = {
+        get() = kotlin.runCatching {
-            kotlin.runCatching {
+            FileX(this, Preferences.get<String>("download_folder"))
-                FileX(this, Preferences.get<String>("download_folder"))
+        }.getOrElse {
-            }.getOrElse {
+            Preferences["download_folder"] = defaultDownloadFolder.uri.toString()
-                Preferences["download_folder"] = defaultDownloadFolder.uri.toString()
+            defaultDownloadFolder
-                defaultDownloadFolder
+        }
            }
        }.invoke()
    private var prevDownloadFolder: FileX? = null
    private var downloadFolderMapInstance: MutableMap<Int, String>? = null
@@ -63,30 +66,28 @@ class DownloadManager private constructor(context: Context) : ContextWrapper(con
        get() {
            if (prevDownloadFolder != downloadFolder) {
                prevDownloadFolder = downloadFolder
-                downloadFolderMapInstance = {
+                downloadFolderMapInstance = run {
                    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<Int, String>()
+                        mutableMapOf()
-                    }.invoke()
+                    }
-                }.invoke()
+                }
            }
-            return downloadFolderMapInstance!!
+            return downloadFolderMapInstance ?: mutableMapOf()
        }
    @Synchronized
    fun isDownloading(galleryID: Int): Boolean {
-        val isThisGallery: (Call) -> Boolean = { (it.request().tag() as? DownloadService.Tag)?.galleryID == galleryID }
+        val isThisGallery: (Call) -> Boolean = { !it.isCanceled && (it.request().tag() as? DownloadService.Tag)?.galleryID == galleryID }
        return downloadFolderMap.containsKey(galleryID)
                && client.dispatcher().let { it.queuedCalls().any(isThisGallery) || it.runningCalls().any(isThisGallery) }
@@ -96,23 +97,19 @@ class DownloadManager private constructor(context: Context) : ContextWrapper(con
    fun getDownloadFolder(galleryID: Int): FileX? =
        downloadFolderMap[galleryID]?.let { downloadFolder.getChild(it) }
-    @Synchronized
+    fun addDownloadFolder(galleryID: Int) = CoroutineScope(Dispatchers.IO).launch {
-    fun addDownloadFolder(galleryID: Int) {
+        val name = Cache.getInstance(this@DownloadManager, galleryID).getGalleryBlock()
-        val name = runBlocking {
+            ?.formatDownloadFolder() ?: return@launch
            Cache.getInstance(this@DownloadManager, galleryID).getGalleryBlock()
        }?.formatDownloadFolder() ?: return
        val folder = downloadFolder.getChild(name)
-        if (folder.exists())
+        downloadFolderMap[galleryID] = name
            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/file.kt
+++ b/app/src/main/java/xyz/quaver/pupil/util/file.kt
@@ -19,35 +19,49 @@
 package xyz.quaver.pupil.util
 import android.content.Context
-import android.os.storage.StorageManager
+import kotlinx.coroutines.CoroutineScope
-import androidx.core.content.ContextCompat
+import kotlinx.coroutines.Dispatchers
-import androidx.core.net.toUri
+import kotlinx.coroutines.launch
 import kotlinx.coroutines.sync.Mutex
 import kotlinx.coroutines.sync.withLock
 import xyz.quaver.pupil.histories
 import xyz.quaver.pupil.util.downloader.Cache
 import xyz.quaver.pupil.util.downloader.DownloadManager
 import java.io.File
 import java.io.FileOutputStream
 import java.lang.reflect.Array
 import java.net.URL
-@Suppress("DEPRECATION")
+val mutex = Mutex()
-@Deprecated("Use downloader.Cache instead")
+fun cleanCache(context: Context) = CoroutineScope(Dispatchers.IO).launch {
-fun getCachedGallery(context: Context, galleryID: Int) =
+    if (mutex.isLocked) return@launch
-    File(getDownloadDirectory(context), galleryID.toString()).let {
+
-        if (it.exists())
+    mutex.withLock {
-            it
+        val cacheFolder = File(context.cacheDir, "imageCache")
-        else
+        val downloadManager = DownloadManager.getInstance(context)
-            File(context.cacheDir, "imageCache/$galleryID")
+
        val limit = (Preferences.get<String>("cache_limit").toLongOrNull() ?: 0L)*1024*1024*1024
        if (limit == 0L) return@withLock
        val cacheSize = {
            var size = 0L
            cacheFolder.walk().forEach {
                size += it.length()
            }
            size
        }
        if (cacheSize.invoke() > limit)
            while (cacheSize.invoke() > limit/2) {
                val caches = cacheFolder.list() ?: return@withLock
                synchronized(histories) {
                    (histories.firstOrNull {
                        caches.contains(it.toString()) && !downloadManager.isDownloading(it)
                    } ?: return@withLock).let {
                        Cache.delete(context, it)
                    }
                }
            }
    }
-
+}
@Suppress("DEPRECATION")
@Deprecated("Use downloader.Cache instead")
 fun getDownloadDirectory(context: Context) =
    Preferences.get<String>("dl_location").let {
        if (it.isNotEmpty() && !it.startsWith("content"))
            File(it)
        else
            context.getExternalFilesDir(null)!!
    }
@Suppress("DEPRECATION")
@Deprecated("Use FileX instead")
 fun File.isParentOf(another: File) =
    another.absolutePath.startsWith(this.absolutePath)
--- a/app/src/main/java/xyz/quaver/pupil/util/misc.kt
+++ b/app/src/main/java/xyz/quaver/pupil/util/misc.kt
@@ -18,19 +18,25 @@
 package xyz.quaver.pupil.util
 import android.Manifest
 import android.annotation.SuppressLint
 import android.app.Activity
 import android.content.Context
-import android.content.Intent
+import android.content.pm.PackageManager
 import android.os.Build
 import android.util.Log
 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.Code
+import xyz.quaver.pupil.R
-import xyz.quaver.hitomi.GalleryBlock
+import xyz.quaver.pupil.hitomi.GalleryBlock
-import xyz.quaver.hitomi.Reader
+import xyz.quaver.pupil.hitomi.GalleryInfo
-import xyz.quaver.hitomi.getReferer
+import xyz.quaver.pupil.hitomi.imageUrlFromImage
 import xyz.quaver.hitomi.imageUrlFromImage
 import xyz.quaver.hiyobi.createImgList
 import java.util.*
 import kotlin.collections.ArrayList
@@ -40,7 +46,7 @@ fun String.wordCapitalize() : String {
    @SuppressLint("DefaultLocale")
    for (word in this.split(" "))
-        result.add(word.capitalize(Locale.US))
+        result.add(word.replaceFirstChar { if (it.isLowerCase()) it.titlecase(Locale.US) else it.toString() })
    return result.joinToString(" ")
 }
@@ -82,7 +88,8 @@ fun OkHttpClient.Builder.proxyInfo(proxyInfo: ProxyInfo) = this.apply {
 val formatMap = mapOf<String, GalleryBlock.() -> (String)>(
    "-id-" to { id.toString() },
    "-title-" to { title },
-    "-artist-" to { artists.joinToString() }
+    "-artist-" to { if (artists.isNotEmpty()) artists.joinToString() else "N/A" },
    "-group-" to { if (groups.isNotEmpty()) groups.joinToString() else "N/A" }
    // TODO
 )
 /**
@@ -93,39 +100,95 @@ fun GalleryBlock.formatDownloadFolder(): String =
        formatMap.entries.fold(it) { str, (k, v) ->
            str.replace(k, v.invoke(this), true)
        }
-    }.replace(Regex("""[*\\|"?><:/]"""), "")
+    }.replace(Regex("""[*\\|"?><:/]"""), "").ellipsize(127)
 fun GalleryBlock.formatDownloadFolderTest(format: String): String =
    format.let {
        formatMap.entries.fold(it) { str, (k, v) ->
            str.replace(k, v.invoke(this), true)
        }
-    }.replace(Regex("""[*\\|"?><:/]"""), "")
+    }.replace(Regex("""[*\\|"?><:/]"""), "").ellipsize(127)
-val Reader.requestBuilders: List<Request.Builder>
+suspend fun GalleryInfo.getRequestBuilders(): List<Request.Builder> {
-    get() {
+    val galleryID = this.id.toIntOrNull() ?: 0
-        val galleryID = this.galleryInfo.id ?: 0
+    return this.files.map {
-        val lowQuality = Preferences["low_quality", true]
+        Request.Builder()
            .url(
                runCatching {
                    imageUrlFromImage(galleryID, it, false)
                }
                .onFailure {
                    FirebaseCrashlytics.getInstance().recordException(it)
                }
                .getOrDefault("https://a/")
            )
            .header("Referer", "https://hitomi.la/")
    }
 }
-        return when(code) {
+fun byteCount(codePoint: Int): Int = when (codePoint) {
-            Code.HITOMI -> {
+    in 0 ..< 0x80 -> 1
-                this.galleryInfo.files.map {
+    in 0x80 ..< 0x800 -> 2
-                    Request.Builder()
+    in 0x800 ..< 0x10000 -> 3
-                        .url(imageUrlFromImage(galleryID, it, !lowQuality))
+    in 0x10000 ..< 0x110000 -> 4
-                        .header("Referer", getReferer(galleryID))
+    else -> 0
-                }
+}
-            }
+
-            Code.HIYOBI -> {
+fun String.ellipsize(n: Int): String = buildString {
-                createImgList(galleryID, this, lowQuality).map {
+    var count = 0
-                    Request.Builder()
+    var index = 0
-                        .url(it.path)
+    val codePointLength = this@ellipsize.codePointCount(0, this@ellipsize.length)
-                }
+
-            }
+    while (index < codePointLength) {
        val nextCodePoint = this@ellipsize.codePointAt(index)
        val nextByte = byteCount(nextCodePoint)
        if (count + nextByte > 124) {
            append("…")
            break
        }
        appendCodePoint(nextCodePoint)
        count += nextByte
        index++
    }
-fun String.ellipsize(n: Int): String =
+}
-    if (this.length > n)
+
-        this.slice(0 until n) + "…"
+operator fun JsonElement.get(index: Int) =
-    else
+    this.jsonArray[index]
-        this
+
 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)
    }
 }
--- a/app/src/main/java/xyz/quaver/pupil/util/translation.kt
+++ b/app/src/main/java/xyz/quaver/pupil/util/translation.kt
@@ -0,0 +1,68 @@
 /*
 *     Pupil, Hitomi.la viewer for Android
 *     Copyright (C) 2020  tom5079
 *
 *     This program is free software: you can redistribute it and/or modify
 *     it under the terms of the GNU General Public License as published by
 *     the Free Software Foundation, either version 3 of the License, or
 *     (at your option) any later version.
 *
 *     This program is distributed in the hope that it will be useful,
 *     but WITHOUT ANY WARRANTY; without even the implied warranty of
 *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 *     GNU General Public License for more details.
 *
 *     You should have received a copy of the GNU General Public License
 *     along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 package xyz.quaver.pupil.util
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
 import kotlinx.serialization.decodeFromString
 import kotlinx.serialization.json.Json
 import kotlinx.serialization.json.jsonArray
 import kotlinx.serialization.json.jsonPrimitive
 import okhttp3.Request
 import xyz.quaver.pupil.client
 import java.io.IOException
 import java.util.*
 private val filesURL = "https://api.github.com/repos/tom5079/Pupil/git/trees/tags"
 private val contentURL = "https://raw.githubusercontent.com/tom5079/Pupil/tags/"
 var translations: Map<String, String> = run {
    updateTranslations()
    emptyMap()
 }
    private set
@Suppress("BlockingMethodInNonBlockingContext")
 fun updateTranslations() = CoroutineScope(Dispatchers.IO).launch {
    translations = emptyMap()
    kotlin.runCatching {
        translations = Json.decodeFromString<Map<String, String>>(client.newCall(
            Request.Builder()
                .url(contentURL + "${Preferences["tag_translation", ""].let { if (it.isEmpty()) Locale.getDefault().language else it }}.json")
                .build()
        ).execute().also { if (it.code() != 200) return@launch }.body()?.use { it.string() } ?: return@launch).filterValues { it.isNotEmpty() }
    }
 }
 fun getAvailableLanguages(): List<String> {
    val languages = Locale.getISOLanguages()
    val json = Json.parseToJsonElement(client.newCall(
        Request.Builder()
            .url(filesURL)
            .build()
    ).execute().also { if (it.code() != 200) throw IOException() }.body()?.use { it.string() } ?: return emptyList())
    return listOf("en") + (json["tree"]?.jsonArray?.mapNotNull {
        val name = it["path"]?.jsonPrimitive?.content?.takeWhile { c -> c != '.' }
        languages.firstOrNull { code -> code.equals(name, ignoreCase = true) }
    } ?: emptyList())
 }
--- a/app/src/main/java/xyz/quaver/pupil/util/update.kt
+++ b/app/src/main/java/xyz/quaver/pupil/util/update.kt
@@ -18,48 +18,23 @@
 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.util.Log
 import android.webkit.URLUtil
 import androidx.appcompat.app.AlertDialog
 import androidx.core.app.NotificationCompat
 import androidx.core.app.NotificationManagerCompat
 import androidx.preference.PreferenceManager
 import com.google.firebase.crashlytics.FirebaseCrashlytics
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.Job
 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.hitomi.GalleryBlock
+import xyz.quaver.pupil.*
-import xyz.quaver.hitomi.Reader
+import xyz.quaver.pupil.types.Tag
 import xyz.quaver.hitomi.getGalleryBlock
 import xyz.quaver.hitomi.getReader
 import xyz.quaver.io.FileX
 import xyz.quaver.io.util.getChild
 import xyz.quaver.io.util.*
 import xyz.quaver.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
@@ -160,6 +135,10 @@ 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
@@ -182,10 +161,10 @@ fun checkUpdate(context: Context, force: Boolean = false) {
                    Preferences["update_download_id"] = it
                }
            }
-            setNegativeButton(if (force) android.R.string.cancel else R.string.ignore_update) { _, _ ->
+            setNegativeButton(if (force) android.R.string.cancel else R.string.ignore) { _, _ ->
                if (!force)
                    preferences.edit()
-                        .putLong("ignore_update_until", System.currentTimeMillis() + 604800000)
+                        .putLong("ignore_update_until", System.currentTimeMillis() + 86400000)
                        .apply()
            }
        }
@@ -196,7 +175,7 @@ fun checkUpdate(context: Context, force: Boolean = false) {
    }
 }
-fun restore(url: String, onFailure: ((Throwable) -> Unit)? = null, onSuccess: ((List<Int>) -> Unit)? = null) {
+fun restore(url: String, onFailure: ((Throwable) -> Unit)? = null, onSuccess: ((Int) -> Unit)? = null) {
    if (!URLUtil.isValidUrl(url)) {
        onFailure?.invoke(IllegalArgumentException())
        return
@@ -214,123 +193,22 @@ fun restore(url: String, onFailure: ((Throwable) -> Unit)? = null, onSuccess: ((
        override fun onResponse(call: Call, response: Response) {
            kotlin.runCatching {
-                Json.decodeFromString<List<Int>>(response.also { if (it.code() != 200) throw IOException() }.body().use { it?.string() } ?: "[]").let {
+                val data = Json.parseToJsonElement(response.also { if (it.code() != 200) throw IOException() }.body().use { it?.string() } ?: "[]")
-                    favorites.addAll(it)
+
-                    onSuccess?.invoke(it)
+                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")
                }
            }.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 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())
            kotlin.runCatching {
                val metadata = kotlin.runCatching {
                    folder.getChild(".metadata").readText()?.let { Json.parseToJsonElement(it).jsonObject }
                }.getOrNull()
                val galleryID = folder.name.toIntOrNull() ?: return@runCatching
                val galleryBlock: GalleryBlock? = kotlin.runCatching {
                    metadata?.get("galleryBlock")?.let { Json.decodeFromJsonElement<GalleryBlock>(it) }
                }.getOrNull() ?: getGalleryBlock(galleryID)
                val reader: Reader? = kotlin.runCatching {
                    metadata?.get("reader")?.let { Json.decodeFromJsonElement<Reader>(it) }
                }.getOrNull() ?: getReader(galleryID)
                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.listFiles { file ->
                    file?.nameWithoutExtension?.let {
                        Regex("""\d{5}""").matches(it) && it.toIntOrNull() != null
                    } == true
                }?.forEach {
                    list[it.nameWithoutExtension.toInt()] = it.name
                }
                folder.getChild(".metadata").also { if (it.exists()) it.delete(); it.createNewFile() }.writeText(
                    Json.encodeToString(Metadata(galleryBlock, reader, list))
                )
                synchronized(Cache) {
                    Cache.delete(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/arrow.xml
+++ b/app/src/main/res/drawable/arrow.xml
@@ -0,0 +1,13 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
    android:width="24dp"
    android:height="24dp"
    android:viewportWidth="24"
    android:viewportHeight="24">
  <path
      android:pathData="M4.5,10.5 L12,3m0,0 l7.5,7.5M12,3v18"
      android:strokeLineJoin="round"
      android:strokeWidth="1.5"
      android:fillColor="#00000000"
      android:strokeColor="@color/colorPrimaryDark"
      android:strokeLineCap="round"/>
 </vector>
--- a/app/src/main/res/drawable/check.xml
+++ b/app/src/main/res/drawable/check.xml
@@ -0,0 +1,13 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
    android:width="24dp"
    android:height="24dp"
    android:viewportWidth="24"
    android:viewportHeight="24">
  <path
      android:pathData="M9,12.75 L11.25,15 15,9.75M21,12a9,9 0,1 1,-18 0,9 9,0 0,1 18,0Z"
      android:strokeLineJoin="round"
      android:strokeWidth="1.5"
      android:fillColor="#00000000"
      android:strokeColor="@color/colorPrimaryDark"
      android:strokeLineCap="round"/>
 </vector>
--- a/app/src/main/res/drawable/download.xml
+++ b/app/src/main/res/drawable/download.xml
@@ -0,0 +1,13 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
    android:width="24dp"
    android:height="24dp"
    android:viewportWidth="24"
    android:viewportHeight="24">
  <path
      android:pathData="M3,16.5v2.25A2.25,2.25 0,0 0,5.25 21h13.5A2.25,2.25 0,0 0,21 18.75V16.5M16.5,12 L12,16.5m0,0L7.5,12m4.5,4.5V3"
      android:strokeLineJoin="round"
      android:strokeWidth="1.5"
      android:fillColor="#00000000"
      android:strokeColor="@color/material_blue_700"
      android:strokeLineCap="round"/>
 </vector>
--- a/app/src/main/res/drawable/heart.xml
+++ b/app/src/main/res/drawable/heart.xml
@@ -0,0 +1,13 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
    android:width="24dp"
    android:height="24dp"
    android:viewportWidth="24"
    android:viewportHeight="24">
  <path
      android:pathData="M21,8.25c0,-2.485 -2.099,-4.5 -4.688,-4.5 -1.935,0 -3.597,1.126 -4.312,2.733 -0.715,-1.607 -2.377,-2.733 -4.313,-2.733C5.1,3.75 3,5.765 3,8.25c0,7.22 9,12 9,12s9,-4.78 9,-12Z"
      android:strokeLineJoin="round"
      android:strokeWidth="1.5"
      android:fillColor="#00000000"
      android:strokeColor="@color/material_pink_600"
      android:strokeLineCap="round"/>
 </vector>
--- a/app/src/main/res/drawable/history_rounded.xml
+++ b/app/src/main/res/drawable/history_rounded.xml
@@ -0,0 +1,9 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
    android:width="48dp"
    android:height="48dp"
    android:viewportWidth="960"
    android:viewportHeight="960">
  <path
      android:fillColor="@color/material_orange_500"
      android:pathData="M477,840q-142,0 -243.5,-95.5T121,509q-1,-12 7.5,-21t21.5,-9q12,0 20.5,8.5T181,509q11,115 95,193t201,78q127,0 215,-89t88,-216q0,-124 -89,-209.5T477,180q-68,0 -127.5,31T246,293h75q13,0 21.5,8.5T351,323q0,13 -8.5,21.5T321,353L172,353q-13,0 -21.5,-8.5T142,323v-148q0,-13 8.5,-21.5T172,145q13,0 21.5,8.5T202,175v76q52,-61 123.5,-96T477,120q75,0 141,28t115.5,76.5Q783,273 811.5,338T840,478q0,75 -28.5,141t-78,115Q684,783 618,811.5T477,840ZM511,466 L626,579q9,9 9,21.5t-9,21.5q-9,9 -21,9t-21,-9L460,500q-5,-5 -7,-10.5t-2,-11.5v-171q0,-13 8.5,-21.5T481,277q13,0 21.5,8.5T511,307v159Z"/>
 </vector>
--- a/app/src/main/res/drawable/ic_hiyobi.png
+++ b/app/src/main/res/drawable/ic_hiyobi.png
--- a/app/src/main/res/drawable/link.xml
+++ b/app/src/main/res/drawable/link.xml
@@ -0,0 +1,13 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
    android:width="24dp"
    android:height="24dp"
    android:viewportWidth="24"
    android:viewportHeight="24">
  <path
      android:pathData="M13.19,8.688a4.5,4.5 0,0 1,1.242 7.244l-4.5,4.5a4.5,4.5 0,0 1,-6.364 -6.364l1.757,-1.757m13.35,-0.622 l1.757,-1.757a4.5,4.5 0,0 0,-6.364 -6.364l-4.5,4.5a4.5,4.5 0,0 0,1.242 7.244"
      android:strokeLineJoin="round"
      android:strokeWidth="1.5"
      android:fillColor="#00000000"
      android:strokeColor="@color/colorPrimaryDark"
      android:strokeLineCap="round"/>
 </vector>
--- a/app/src/main/res/drawable/ic_navigate_next_black_24dp.xml
+++ b/app/src/main/res/drawable/ic_navigate_next_black_24dp.xml
@@ -1,3 +1,3 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android" android:width="24dp" android:height="24dp" android:viewportWidth="24.0" android:viewportHeight="24.0">
+<vector xmlns:android="http://schemas.android.com/apk/res/android" android:width="48dp" android:height="48dp" android:viewportWidth="24.0" android:viewportHeight="24.0">
    <path android:fillColor="#FF000000" android:pathData="M10 6L8.59 7.41 13.17 12l-4.58 4.59L10 18l6-6z"/>
 </vector>
--- a/app/src/main/res/drawable/navigate_prev.xml
+++ b/app/src/main/res/drawable/navigate_prev.xml
@@ -0,0 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <vector xmlns:android="http://schemas.android.com/apk/res/android" android:width="48dp" android:height="48dp" android:viewportWidth="24.0" android:viewportHeight="24.0">
    <group android:pivotX="12" android:scaleX="-1">
        <path android:fillColor="#FF000000" android:pathData="M10 6L8.59 7.41 13.17 12l-4.58 4.59L10 18l6-6z"/>
    </group>
 </vector>
--- a/app/src/main/res/drawable/reader_item_boundary.xml
+++ b/app/src/main/res/drawable/reader_item_boundary.xml
@@ -4,7 +4,7 @@
    <item android:bottom="1dp" android:left="1dp" android:right="1dp" android:top="1dp">
        <shape android:shape="rectangle">
            <stroke android:width="1dp" android:color="#555555"/>
-            <solid android:color="@color/transparent"/>
+            <solid android:color="@android:color/transparent"/>
        </shape>
    </item>
 </layer-list>
--- a/app/src/main/res/drawable/round_button.xml
+++ b/app/src/main/res/drawable/round_button.xml
@@ -0,0 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
    <item android:state_pressed="false">
        <shape android:shape="oval">
            <solid android:color="#dddddd"/>
        </shape>
    </item>
    <item android:state_pressed="true">
        <shape android:shape="oval">
            <solid android:color="#888888"/>
        </shape>
    </item>
 </selector>
--- a/app/src/main/res/drawable/sort_variant.xml
+++ b/app/src/main/res/drawable/sort_variant.xml
@@ -0,0 +1,8 @@
 <!-- drawable/sort_variant.xml -->
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
    android:height="24dp"
    android:width="24dp"
    android:viewportWidth="24"
    android:viewportHeight="24">
    <path android:fillColor="#000" android:pathData="M3,13H15V11H3M3,6V8H21V6M3,18H9V16H3V18Z" />
 </vector>
--- a/app/src/main/res/drawable/transfer_device.xml
+++ b/app/src/main/res/drawable/transfer_device.xml
@@ -0,0 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
 <layer-list xmlns:android="http://schemas.android.com/apk/res/android">
    <item android:bottom="-8dp">
        <shape xmlns:android="http://schemas.android.com/apk/res/android"
            android:shape="rectangle">
            <corners android:radius="32dp"
                android:bottomLeftRadius="0dp"
                android:bottomRightRadius="0dp" />
            <stroke android:width="4dp" android:color="#444444"/>
        </shape>
    </item>
 </layer-list>
--- a/app/src/main/res/drawable/transfer_ripple.xml
+++ b/app/src/main/res/drawable/transfer_ripple.xml
@@ -0,0 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <ripple xmlns:android="http://schemas.android.com/apk/res/android" android:color="#9d9d9d">
    <item android:id="@android:id/mask">
        <shape android:shape="rectangle">
            <solid android:color="#9d9d9d" />
            <corners android:radius="16dp" />
        </shape>
    </item>
 </ripple>
--- a/app/src/main/res/drawable/warning.xml
+++ b/app/src/main/res/drawable/warning.xml
@@ -0,0 +1,13 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
    android:width="24dp"
    android:height="24dp"
    android:viewportWidth="24"
    android:viewportHeight="24">
  <path
      android:pathData="M12,9v3.75m-9.303,3.376c-0.866,1.5 0.217,3.374 1.948,3.374h14.71c1.73,0 2.813,-1.874 1.948,-3.374L13.949,3.378c-0.866,-1.5 -3.032,-1.5 -3.898,0L2.697,16.126ZM12,15.75h0.007v0.008H12v-0.008Z"
      android:strokeLineJoin="round"
      android:strokeWidth="1.5"
      android:fillColor="#00000000"
      android:strokeColor="@color/colorAccent"
      android:strokeLineCap="round"/>
 </vector>
--- a/app/src/main/res/layout-v23/activity_main_content.xml
+++ b/app/src/main/res/layout-v23/activity_main_content.xml
@@ -1,152 +0,0 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
  ~     Pupil, Hitomi.la viewer for Android
  ~     Copyright (C) 2019  tom5079
  ~
  ~     This program is free software: you can redistribute it and/or modify
  ~     it under the terms of the GNU General Public License as published by
  ~     the Free Software Foundation, either version 3 of the License, or
  ~     (at your option) any later version.
  ~
  ~     This program is distributed in the hope that it will be useful,
  ~     but WITHOUT ANY WARRANTY; without even the implied warranty of
  ~     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  ~     GNU General Public License for more details.
  ~
  ~     You should have received a copy of the GNU General Public License
  ~     along with this program.  If not, see <http://www.gnu.org/licenses/>.
  -->
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
    xmlns:tools="http://schemas.android.com/tools"
    xmlns:app="http://schemas.android.com/apk/res-auto"
    android:layout_width="match_parent"
    android:layout_height="match_parent"
    tools:context=".ui.MainActivity">
    <androidx.coordinatorlayout.widget.CoordinatorLayout
        android:layout_width="match_parent"
        android:layout_height="match_parent">
        <com.google.android.material.appbar.AppBarLayout
            android:id="@+id/main_appbar_layout"
            android:layout_width="match_parent"
            android:layout_height="wrap_content"
            android:background="@color/transparent"
            android:visibility="invisible"
            app:layout_constraintTop_toTopOf="parent"
            app:layout_constraintLeft_toLeftOf="parent">
            <View
                android:layout_width="match_parent"
                android:layout_height="64dp"
                android:visibility="invisible"
                android:background="@color/transparent"
                app:layout_scrollFlags="scroll|enterAlways"
                app:layout_behavior="@string/appbar_scrolling_view_behavior"/>
        </com.google.android.material.appbar.AppBarLayout>
        <androidx.core.widget.ContentLoadingProgressBar
            style="?android:attr/progressBarStyle"
            android:id="@+id/main_progressbar"
            android:layout_width="wrap_content"
            android:layout_height="wrap_content"
            android:layout_gravity="center"
            android:indeterminate="true"/>
        <TextView
            android:id="@+id/main_noresult"
            android:layout_width="wrap_content"
            android:layout_height="wrap_content"
            android:layout_gravity="center"
            android:text="@string/main_no_result"
            android:visibility="invisible"/>
        <com.qtalk.recyclerviewfastscroller.RecyclerViewFastScroller
            android:layout_width="match_parent"
            android:layout_height="match_parent"
            app:handleDrawable="@drawable/thumb"
            app:handleHasFixedSize="true"
            app:handleHeight="72dp"
            app:handleWidth="24dp"
            app:disableTrack="true"
            app:hideHandleAfter="1000"
            app:trackMarginStart="64dp"
            app:addLastItemPadding="true"
            app:popupDrawable="@color/transparent">
            <androidx.recyclerview.widget.RecyclerView
                android:id="@+id/main_recyclerview"
                android:layout_width="match_parent"
                android:layout_height="match_parent"
                android:paddingTop="64dp"
                android:clipToPadding="false"
                app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"/>
        </com.qtalk.recyclerviewfastscroller.RecyclerViewFastScroller>
        <com.github.clans.fab.FloatingActionMenu
                android:id="@+id/main_fab"
                android:layout_width="wrap_content"
                android:layout_height="wrap_content"
                android:layout_gravity="bottom|end"
                android:layout_margin="16dp"
                app:menu_colorNormal="@color/colorAccent">
            <com.github.clans.fab.FloatingActionButton
                android:id="@+id/main_fab_cancel"
                android:layout_width="wrap_content"
                android:layout_height="wrap_content"
                app:fab_label="@string/main_fab_cancel"
                app:fab_size="mini"/>
            <com.github.clans.fab.FloatingActionButton
                android:id="@+id/main_fab_jump"
                android:layout_width="wrap_content"
                android:layout_height="wrap_content"
                app:fab_label="@string/main_jump_title"
                app:fab_size="mini"/>
            <com.github.clans.fab.FloatingActionButton
                android:id="@+id/main_fab_random"
                android:layout_width="wrap_content"
                android:layout_height="wrap_content"
                app:fab_label="@string/main_fab_random"
                app:fab_size="mini"/>
            <com.github.clans.fab.FloatingActionButton
                android:id="@+id/main_fab_id"
                android:layout_width="wrap_content"
                android:layout_height="wrap_content"
                app:fab_label="@string/main_open_gallery_by_id"
                app:fab_size="mini"/>
        </com.github.clans.fab.FloatingActionMenu>
    </androidx.coordinatorlayout.widget.CoordinatorLayout>
    <com.arlib.floatingsearchview.FloatingSearchViewDayNight
        android:id="@+id/main_searchview"
        android:layout_width="match_parent"
        android:layout_height="match_parent"
        app:floatingSearch_backgroundColor="?android:attr/colorBackgroundFloating"
        app:floatingSearch_leftActionColor="?attr/colorControlNormal"
        app:floatingSearch_menuItemIconColor="?attr/colorControlNormal"
        app:floatingSearch_actionMenuOverflowColor="?attr/colorControlNormal"
        app:floatingSearch_clearBtnColor="?attr/colorControlNormal"
        app:floatingSearch_viewTextColor="?android:attr/textColorPrimary"
        app:floatingSearch_suggestionRightIconColor="@color/material_orange_500"
        app:floatingSearch_searchBarMarginLeft="8dp"
        app:floatingSearch_searchBarMarginRight="8dp"
        app:floatingSearch_searchBarMarginTop="8dp"
        app:floatingSearch_searchHint="@string/search_hint"
        app:floatingSearch_suggestionsListAnimDuration="250"
        app:floatingSearch_showSearchKey="true"
        app:floatingSearch_leftActionMode="showHamburger"
        app:floatingSearch_menu="@menu/main"
        app:floatingSearch_dismissOnOutsideTouch="true"
        app:floatingSearch_close_search_on_keyboard_dismiss="true"
        tools:ignore="NewApi" />
 </RelativeLayout>
--- a/Show More
+++ b/Show More