Dependency update, added LocalActivity provider

Merge pull request #133 from tom5079/Pupil-129
Pupil-129 [Source] Implement in-app update
2022-11-08 14:21:37 -08:00 · 2022-05-06 12:49:00 +09:00 · 2022-05-06 12:48:19 +09:00 · 2022-05-02 21:29:58 +09:00 · 2022-05-02 16:48:57 +09:00 · 2022-05-02 16:48:10 +09:00
217 changed files with 3840 additions and 16346 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
-/local.properties
-/.idea/caches
-/.idea/libraries
-/.idea/modules.xml
-/.idea/workspace.xml
-/.idea/navEditor.xml
-/.idea/assetWizardSettings.xml
-.DS_Store
-/build
-/captures
-.externalNativeBuild
+.idea/
+misc.xml
+deploymentTargetDropDown.xml
+render.experimental.xml

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

-#Private files
-**/google-services.json
-**/credentials.json
+# Google Services (e.g. APIs or Firebase)
+google-services.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,18 +1,12 @@
-# Pupil
-
 ![Banner](https://github.com/tom5079/Pupil/blob/gh-pages/assets/images/pupil-banner.png?raw=true)
 *Pupil, Hitomi.la viewer for Android*  

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

-# Screenshot
-![Main Screen](https://github.com/tom5079/Pupil/blob/gh-pages/assets/images/main-screenshot.png?raw=true)
-*Main Screen*
-
-![Reader Screen](https://github.com/tom5079/Pupil/blob/gh-pages/assets/images/reader-screenshot.png?raw=true)
-*Reader Screen*
-
-Images are censored to be SFW
+# Features
+![Main Screen](https://github.com/tom5079/Pupil/blob/gh-pages/assets/images/main-screenshot.jpg?raw=true)

 # Installation

@@ -26,4 +20,7 @@ or Build app yourself

 # Contribution

-Any kind of contribution is appriciated. Feel free to leave PR! 
+Any kind of contribution is appriciated. Feel free to leave PR!
+
+## 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"
-        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,183 @@
+import com.google.protobuf.gradle.*
+
+plugins {
+    id("com.android.application")
+    kotlin("android")
+    kotlin("kapt")
+    id("kotlin-parcelize")
+    id("kotlinx-serialization")
+    id("com.google.android.gms.oss-licenses-plugin")
+    id("com.google.gms.google-services")
+    id("com.google.firebase.crashlytics")
+    id("com.google.firebase.firebase-perf")
+    id("com.google.protobuf")
+}
+
+android {
+    compileSdk = 33
+
+    signingConfigs {
+        create("release") {
+            storeFile = File(System.getenv("SIGNING_STORE_FILE"))
+            storePassword = System.getenv("SIGNING_STORE_PASSWORD")
+            keyAlias = System.getenv("SIGNING_KEY_ALIAS")
+            keyPassword = System.getenv("SIGNING_KEY_PASSWORD")
+        }
+    }
+
+    defaultConfig {
+        applicationId = "xyz.quaver.pupil"
+        minSdk = 21
+        targetSdk = 33
+        versionCode = 600
+        versionName = VERSION
+        testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
+    }
+
+    buildTypes {
+        getByName("debug") {
+            isDebuggable = true
+            applicationIdSuffix = ".debug"
+            versionNameSuffix = "-DEBUG"
+
+            proguardFiles(getDefaultProguardFile("proguard-android-optimize.txt"), "proguard-rules.pro")
+
+            extra.set("enableCrashlytics", false)
+            extra.set("alwaysUpdateBuildId", false)
+        }
+        getByName("release") {
+            isMinifyEnabled = false
+            applicationIdSuffix = ".beta"
+
+            isCrunchPngs = false
+
+            proguardFiles(getDefaultProguardFile("proguard-android-optimize.txt"), "proguard-rules.pro")
+
+            signingConfig = signingConfigs.getByName("release")
+        }
+    }
+
+    buildFeatures {
+        compose = true
+    }
+
+    composeOptions {
+        kotlinCompilerExtensionVersion = Versions.JETPACK_COMPOSE
+    }
+
+    compileOptions {
+        sourceCompatibility = JavaVersion.VERSION_1_8
+        targetCompatibility = JavaVersion.VERSION_1_8
+    }
+
+    kotlinOptions {
+        jvmTarget = "1.8"
+        freeCompilerArgs += "-Xopt-in=kotlin.RequiresOptIn"
+    }
+
+    packagingOptions {
+        resources.excludes.addAll(
+            listOf(
+                "META-INF/AL2.0",
+                "META-INF/LGPL2.1"
+            )
+        )
+    }
+    namespace = "xyz.quaver.pupil"
+}
+
+dependencies {
+    implementation(fileTree(mapOf("dir" to "libs", "include" to listOf("*.aar"))))
+    implementation("org.jetbrains.kotlin:kotlin-stdlib-jdk8")
+    implementation(Kotlin.SERIALIZATION)
+    implementation(Kotlin.COROUTINE)
+
+    implementation("androidx.activity:activity-compose:1.6.1")
+    implementation("androidx.navigation:navigation-compose:2.5.3")
+
+    implementation(JetpackCompose.FOUNDATION)
+    implementation(JetpackCompose.UI)
+    implementation(JetpackCompose.UI_UTIL)
+    implementation(JetpackCompose.UI_TOOLING)
+    implementation(JetpackCompose.ANIMATION)
+    implementation(JetpackCompose.MATERIAL)
+    implementation(JetpackCompose.MATERIAL_ICONS)
+    implementation(JetpackCompose.RUNTIME_LIVEDATA)
+
+//    implementation(JetpackCompose.MARKDOWN)
+
+    implementation(Accompanist.INSETS)
+    implementation(Accompanist.INSETS_UI)
+    implementation(Accompanist.FLOW_LAYOUT)
+    implementation(Accompanist.SYSTEM_UI_CONTROLLER)
+    implementation(Accompanist.DRAWABLE_PAINTER)
+    implementation(Accompanist.APPCOMPAT_THEME)
+
+    implementation("io.coil-kt:coil-compose:2.0.0-rc03")
+
+    implementation(KtorClient.CORE)
+    implementation(KtorClient.OKHTTP)
+    implementation(KtorClient.CONTENT_NEGOTIATION)
+    implementation(KtorClient.SERIALIZATION)
+
+    implementation("androidx.room:room-runtime:2.4.3")
+    annotationProcessor("androidx.room:room-compiler:2.4.3")
+    kapt("androidx.room:room-compiler:2.4.3")
+    implementation("androidx.room:room-ktx:2.4.3")
+
+    implementation("androidx.datastore:datastore:1.0.0")
+    implementation("androidx.datastore:datastore-preferences:1.0.0")
+
+    implementation("org.kodein.di:kodein-di-framework-compose:7.11.0")
+
+    implementation(platform("com.google.firebase:firebase-bom:29.0.3"))
+    implementation("com.google.firebase:firebase-analytics-ktx")
+    implementation("com.google.firebase:firebase-crashlytics-ktx")
+    implementation("com.google.firebase:firebase-perf-ktx")
+
+    implementation("com.google.protobuf:protobuf-javalite:3.19.1")
+
+    implementation("com.google.android.gms:play-services-oss-licenses:17.0.0")
+
+    implementation("org.jsoup:jsoup:1.14.3")
+
+    implementation("xyz.quaver.pupil.sources:core:0.0.1-alpha01-DEV29")
+
+    implementation("xyz.quaver:documentfilex:0.7.2")
+    implementation("xyz.quaver:subsampledimage:0.0.1-alpha22-SNAPSHOT")
+
+    implementation("org.kodein.log:kodein-log:0.12.0")
+    debugImplementation("com.squareup.leakcanary:leakcanary-android:2.8.1")
+
+    testImplementation("junit:junit:4.13.2")
+    testImplementation("org.mockito:mockito-inline:4.4.0")
+    testImplementation(KtorClient.TEST)
+    testImplementation(Kotlin.COROUTINE_TEST)
+
+    androidTestImplementation("androidx.test.ext:junit:1.1.3")
+    androidTestImplementation("androidx.test:rules:1.4.0")
+    androidTestImplementation("androidx.test:runner:1.4.0")
+    androidTestImplementation("androidx.test.espresso:espresso-core:3.4.0")
+    androidTestImplementation(KtorClient.TEST)
+
+    androidTestImplementation("androidx.compose.ui:ui-test-junit4:1.1.1")
+}
+
+protobuf {
+    protoc {
+        artifact = "com.google.protobuf:protoc:3.19.1"
+    }
+    generateProtoTasks {
+        all().forEach { task ->
+            task.builtins {
+                id("java") {
+                    option("lite")
+                }
+            }
+        }
+    }
+}
+
+task<Exec>("clearAppCache") {
+    commandLine("adb", "shell", "pm", "clear", "xyz.quaver.pupil.debug")
+}
--- a/app/credentials.json
+++ b/app/credentials.json
@@ -0,0 +1 @@
+{"installed":{"client_id":"644157827114-rnbcmlqiaqgg295o45kavchnvi3dedbo.apps.googleusercontent.com","project_id":"pupil-1598439316578","auth_uri":"https://accounts.google.com/o/oauth2/auth","token_uri":"https://oauth2.googleapis.com/token","auth_provider_x509_cert_url":"https://www.googleapis.com/oauth2/v1/certs","redirect_uris":["urn:ietf:wg:oauth:2.0:oob","http://localhost"]}}
--- 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/pinlockview-release.aar
+++ b/app/libs/pinlockview-release.aar
--- a/app/libs/recyclerviewfastscroller-release.aar
+++ b/app/libs/recyclerviewfastscroller-release.aar
--- a/app/proguard-rules.pro
+++ b/app/proguard-rules.pro
@@ -1,6 +1,6 @@
 # Add project specific ProGuard rules here.
 # You can control the set of applied configuration files using the
-# proguardFiles setting in build.gradle.
+# proguardFiles setting in build.gradle.kts.
 #
 # For more details, see
 #   http://developer.android.com/guide/developing/tools/proguard.html
@@ -22,30 +22,24 @@

 -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
-keepclassmembers class xyz.quaver.pupil.** { # <-- change package name to your app's
+-dontnote kotlinx.serialization.AnnotationsKt # core serialization annotations
+
+# kotlinx-serialization-json specific. Add this if you have java.lang.NoClassDefFoundError kotlinx.serialization.json.JsonObjectSerializer
+-keepclassmembers class kotlinx.serialization.json.** {
    *** Companion;
 }
-keepclasseswithmembers class xyz.quaver.pupil.** { # <-- change package name to your app's
+-keepclasseswithmembers class kotlinx.serialization.json.** {
    kotlinx.serialization.KSerializer serializer(...);
 }
-keep class xyz.quaver.pupil.ui.fragment.ManageFavoritesFragment
-keep class xyz.quaver.pupil.ui.fragment.ManageStorageFragment
-keep class xyz.quaver.pupil.util.Preferences
+
+-keep,includedescriptorclasses class xyz.quaver.**$$serializer { *; }
+-keepclassmembers class xyz.quaver.** {
+    *** Companion;
+}
+-keepclasseswithmembers class xyz.quaver.** {
+    kotlinx.serialization.KSerializer serializer(...);
+}
+-keepclassmembers class * extends androidx.datastore.preferences.protobuf.GeneratedMessageLite {
+    <fields>;
+}
--- a/app/release/output-metadata.json
+++ b/app/release/output-metadata.json
@@ -1,20 +1,20 @@
 {
-  "version": 1,
+  "version": 3,
  "artifactType": {
    "type": "APK",
    "kind": "Directory"
  },
-  "applicationId": "xyz.quaver.pupil",
+  "applicationId": "xyz.quaver.pupil.beta",
  "variantName": "release",
  "elements": [
    {
      "type": "SINGLE",
      "filters": [],
-      "properties": [],
-      "versionCode": 59,
-      "versionName": "5.0.3",
-      "enabled": true,
+      "attributes": [],
+      "versionCode": 600,
+      "versionName": "6.0.0-alpha02",
      "outputFile": "app-release.apk"
    }
-  ]
+  ],
+  "elementType": "File"
 }
--- a/app/src/androidTest/java/xyz/quaver/pupil/ExampleInstrumentedTest.kt
+++ b/app/src/androidTest/java/xyz/quaver/pupil/ExampleInstrumentedTest.kt
@@ -20,8 +20,18 @@

 package xyz.quaver.pupil

+import android.util.Log
 import androidx.test.ext.junit.runners.AndroidJUnit4
 import androidx.test.platform.app.InstrumentationRegistry
+import com.google.api.Http
+import io.ktor.client.*
+import io.ktor.client.call.*
+import io.ktor.client.engine.okhttp.*
+import io.ktor.client.request.*
+import io.ktor.client.statement.*
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.runBlocking
+import kotlinx.coroutines.withContext
 import org.junit.Test
 import org.junit.runner.RunWith

--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -1,18 +1,15 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    package="xyz.quaver.pupil">
+    xmlns:tools="http://schemas.android.com/tools">

    <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.WRITE_EXTERNAL_STORAGE" android:maxSdkVersion="21" />
-    <uses-permission android:name="android.permission.FOREGROUND_SERVICE" />
-    <uses-permission android:name="android.permission.CAMERA" />
+    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" android:maxSdkVersion="21"/>
+    <uses-permission android:name="android.permission.VIBRATE"/>
+    <uses-permission android:name="android.permission.QUERY_ALL_PACKAGES" tools:ignore="QueryAllPackagesPermission" />

-    <uses-feature android:name="android.hardware.camera" android:required="false" />
-    <uses-feature android:name="android.hardware.camera.autofocus" android:required="false" />

    <application
        android:name=".Pupil"
@@ -24,15 +21,12 @@
        android:supportsRtl="true"
        android:theme="@style/AppTheme"
        android:networkSecurityConfig="@xml/network_security_config"
+        android:windowSoftInputMode="adjustResize"
        tools:replace="android:theme"
        tools:ignore="UnusedAttribute">

-        <meta-data
-            android:name="com.google.mlkit.vision.DEPENDENCIES"
-            android:value="face" />
-
        <provider
-            android:authorities="${applicationId}.provider"
+            android:authorities="${applicationId}.fileprovider"
            android:name="androidx.core.content.FileProvider"
            android:exported="false"
            android:grantUriPermissions="true">
@@ -40,189 +34,14 @@
            <meta-data
                android:name="android.support.FILE_PROVIDER_PATHS"
                android:resource="@xml/file_paths" />
-
        </provider>

-        <service android:name=".services.DownloadService"
-            android:exported="false"/>
-
-        <receiver
-            android:name=".receiver.UpdateBroadcastReceiver"
-            android:exported="true">
-            <intent-filter>
-                <action android:name="android.intent.action.DOWNLOAD_COMPLETE" />
-            </intent-filter>
-        </receiver>
-
-        <activity android:name=".ui.LockActivity" />
-        <activity
-            android:name=".ui.ReaderActivity"
-            android:configChanges="keyboardHidden|orientation|screenSize"
-            android:parentActivityName=".ui.MainActivity">
-            <intent-filter>
-                <action android:name="android.intent.action.VIEW" />
-
-                <category android:name="android.intent.category.DEFAULT" />
-                <category android:name="android.intent.category.BROWSABLE" />
-
-                <data
-                    android:host="hitomi.la"
-                    android:pathPrefix="/galleries"
-                    android:scheme="http" />
-            </intent-filter>
-            <intent-filter>
-                <action android:name="android.intent.action.VIEW" />
-
-                <category android:name="android.intent.category.DEFAULT" />
-                <category android:name="android.intent.category.BROWSABLE" />
-
-                <data
-                    android:host="hitomi.la"
-                    android:pathPrefix="/manga"
-                    android:scheme="http" />
-            </intent-filter>
-            <intent-filter>
-                <action android:name="android.intent.action.VIEW" />
-
-                <category android:name="android.intent.category.DEFAULT" />
-                <category android:name="android.intent.category.BROWSABLE" />
-
-                <data
-                    android:host="hitomi.la"
-                    android:pathPrefix="/doujinshi"
-                    android:scheme="http" />
-            </intent-filter>
-            <intent-filter>
-                <action android:name="android.intent.action.VIEW" />
-
-                <category android:name="android.intent.category.DEFAULT" />
-                <category android:name="android.intent.category.BROWSABLE" />
-
-                <data
-                    android:host="hitomi.la"
-                    android:pathPrefix="/cg"
-                    android:scheme="http" />
-            </intent-filter>
-            <intent-filter>
-                <action android:name="android.intent.action.VIEW" />
-
-                <category android:name="android.intent.category.DEFAULT" />
-                <category android:name="android.intent.category.BROWSABLE" />
-
-                <data
-                    android:host="hitomi.la"
-                    android:pathPrefix="/reader"
-                    android:scheme="http" />
-            </intent-filter>
-            <intent-filter>
-                <action android:name="android.intent.action.VIEW" />
-
-                <category android:name="android.intent.category.DEFAULT" />
-                <category android:name="android.intent.category.BROWSABLE" />
-
-                <data
-                    android:host="hitomi.la"
-                    android:pathPrefix="/galleries"
-                    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="/manga"
-                    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="/doujinshi"
-                    android:scheme="https" />
-            </intent-filter>
-            <intent-filter>
-                <action android:name="android.intent.action.VIEW" />
-
-                <category android:name="android.intent.category.DEFAULT" />
-                <category android:name="android.intent.category.BROWSABLE" />
-
-                <data
-                    android:host="hitomi.la"
-                    android:pathPrefix="/cg"
-                    android:scheme="https" />
-            </intent-filter>
-            <intent-filter>
-                <action android:name="android.intent.action.VIEW" />
-
-                <category android:name="android.intent.category.DEFAULT" />
-                <category android:name="android.intent.category.BROWSABLE" />
-
-                <data
-                    android:host="hitomi.la"
-                    android:pathPrefix="/reader"
-                    android:scheme="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"
+            android:windowSoftInputMode="adjustResize">
            <intent-filter>
                <action android:name="android.intent.action.MAIN" />
                <action android:name="android.intent.action.VIEW" />
@@ -231,17 +50,8 @@
            </intent-filter>
            <intent-filter>
                <action android:name="android.intent.action.VIEW" />
-
-                <category android:name="android.intent.category.DEFAULT" />
-                <category android:name="android.intent.category.BROWSABLE" />
-
-                <data
-                    android:scheme="http"
-                    android:host="ix.io"
-                    android:pathPattern="/..*" />
            </intent-filter>
        </activity>
-        <activity android:name="net.rdrei.android.dirchooser.DirectoryChooserActivity" />
    </application>

 </manifest>
--- a/app/src/main/java/com/arlib/floatingsearchview/FloatingSearchViewDayNight.kt
+++ b/app/src/main/java/com/arlib/floatingsearchview/FloatingSearchViewDayNight.kt
@@ -1,221 +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 com.arlib.floatingsearchview
-
-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.view.LayoutInflater
-import android.view.View
-import android.view.inputmethod.EditorInfo
-import android.widget.ImageView
-import android.widget.LinearLayout
-import android.widget.TextView
-import androidx.core.content.ContextCompat
-import androidx.core.content.res.ResourcesCompat
-import androidx.swiperefreshlayout.widget.CircularProgressDrawable
-import androidx.vectordrawable.graphics.drawable.AnimatedVectorDrawableCompat
-import com.arlib.floatingsearchview.suggestions.SearchSuggestionsAdapter
-import com.arlib.floatingsearchview.suggestions.model.SearchSuggestion
-import com.arlib.floatingsearchview.util.view.SearchInputView
-import xyz.quaver.pupil.R
-import xyz.quaver.pupil.favoriteTags
-import xyz.quaver.pupil.types.*
-import java.util.*
-
-class FloatingSearchViewDayNight @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.addTextChangedListener(this)
-        setOnSearchListener(this)
-        setOnBindSuggestionCallback(this)
-    }
-
-    override fun beforeTextChanged(s: CharSequence?, start: Int, count: Int, after: Int) {
-
-    }
-
-    override fun onTextChanged(s: CharSequence?, start: Int, before: Int, count: Int) {
-
-    }
-
-    override fun afterTextChanged(s: Editable?) {
-        s ?: return
-
-        if (s.any { it.isUpperCase() })
-            s.replace(0, s.length, s.toString().toLowerCase(Locale.getDefault()))
-    }
-
-    override fun onSuggestionClicked(searchSuggestion: SearchSuggestion?) {
-        when (searchSuggestion) {
-            is TagSuggestion -> {
-                with(searchInputView.text) {
-                    delete(if (lastIndexOf(' ') == -1) 0 else lastIndexOf(' ')+1, length)
-                    append("${searchSuggestion.n}:${searchSuggestion.s.replace(Regex("\\s"), "_")} ")
-                }
-            }
-            is Suggestion -> {
-                with(searchInputView.text) {
-                    clear()
-                    append(searchSuggestion.str)
-                }
-            }
-            is FavoriteHistorySwitch -> onFavoriteHistorySwitchClickListener?.invoke()
-        }
-    }
-
-    override fun onSearchAction(currentQuery: String?) {}
-
-    override fun onBindSuggestion(
-        suggestionView: View?,
-        leftIcon: ImageView?,
-        textView: TextView?,
-        item: SearchSuggestion?,
-        itemPosition: Int
-    ) {
-        when(item) {
-            is TagSuggestion -> {
-                val tag = "${item.n}:${item.s.replace(Regex("\\s"), "_")}"
-
-                leftIcon?.setImageDrawable(
-                    ResourcesCompat.getDrawable(
-                        resources,
-                        when(item.n) {
-                            "female" -> R.drawable.gender_female
-                            "male" -> R.drawable.gender_male
-                            "language" -> R.drawable.translate
-                            "group" -> R.drawable.account_group
-                            "character" -> R.drawable.account_star
-                            "series" -> R.drawable.book_open
-                            "artist" -> R.drawable.brush
-                            else -> R.drawable.tag
-                        },
-                        context.theme)
-                )
-
-                with(suggestionView?.findViewById<ImageView>(R.id.right_icon)) {
-                    this ?: return@with
-
-                    if (favoriteTags.contains(Tag.parse(tag)))
-                        setImageResource(R.drawable.ic_star_filled)
-                    else
-                        setImageResource(R.drawable.ic_star_empty)
-
-                    visibility = View.VISIBLE
-                    rotation = 0f
-
-                    isEnabled = true
-                    isClickable = true
-
-                    setOnClickListener {
-                        val tag = Tag.parse(tag)
-
-                        if (favoriteTags.contains(tag)) {
-                            setImageResource(R.drawable.ic_star_empty)
-                            favoriteTags.remove(tag)
-                        }
-                        else {
-                            setImageDrawable(
-                                AnimatedVectorDrawableCompat.create(context,
-                                    R.drawable.avd_star
-                                ))
-                            (drawable as Animatable).start()
-
-                            favoriteTags.add(tag)
-                        }
-                    }
-                }
-
-                if (item.t == -1) {
-                    textView?.text = item.s
-                } else {
-                    (suggestionView as? LinearLayout)?.let {
-                        val count = it.findViewById<TextView>(R.id.count)
-                        if (count == null)
-                            it.addView(
-                                LayoutInflater.from(context).inflate(R.layout.suggestion_count, suggestionView, false)
-                                    .apply {
-                                        this as TextView
-
-                                        text = item.t.toString()
-                                    }, 2
-                            )
-                        else
-                            count.text = item.t.toString()
-                    }
-                }
-            }
-            is FavoriteHistorySwitch -> {
-                leftIcon?.setImageDrawable(ResourcesCompat.getDrawable(resources, R.drawable.swap_horizontal, context.theme))
-            }
-            is Suggestion -> {
-                leftIcon?.setImageDrawable(ResourcesCompat.getDrawable(resources, R.drawable.history, context.theme))
-
-                with(suggestionView?.findViewById<ImageView>(R.id.right_icon)) {
-                    this ?: return@with
-
-                    setImageDrawable(ResourcesCompat.getDrawable(resources, R.drawable.delete, context.theme))
-
-                    visibility = View.VISIBLE
-                    rotation = 0f
-
-                    isEnabled = true
-                    isClickable = true
-
-                    setOnClickListener {
-                        onHistoryDeleteClickedListener?.invoke(item.str)
-                    }
-                }
-            }
-            is LoadingSuggestion -> {
-                leftIcon?.setImageDrawable(CircularProgressDrawable(context).also {
-                    it.setStyle(CircularProgressDrawable.DEFAULT)
-                    it.colorFilter = PorterDuffColorFilter(ContextCompat.getColor(context, R.color.colorAccent), PorterDuff.Mode.SRC_IN)
-                    it.start()
-                })
-            }
-            is NoResultSuggestion -> {
-                leftIcon?.setImageDrawable(ResourcesCompat.getDrawable(resources, R.drawable.close, context.theme))
-            }
-        }
-    }
-
-    // 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/Pupil.kt
+++ b/app/src/main/java/xyz/quaver/pupil/Pupil.kt
@@ -18,122 +18,39 @@

 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 androidx.appcompat.app.AppCompatDelegate
-import androidx.core.content.ContextCompat
-import androidx.preference.PreferenceManager
 import com.google.android.gms.common.GooglePlayServicesNotAvailableException
 import com.google.android.gms.common.GooglePlayServicesRepairableException
 import com.google.android.gms.security.ProviderInstaller
-import com.google.firebase.analytics.FirebaseAnalytics
-import com.google.firebase.crashlytics.FirebaseCrashlytics
-import kotlinx.coroutines.CoroutineScope
-import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.launch
-import okhttp3.Interceptor
-import okhttp3.OkHttpClient
-import okhttp3.Response
-import xyz.quaver.io.FileX
-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.util.*
-import java.util.concurrent.TimeUnit
-import kotlin.reflect.KClass
+import io.ktor.client.*
+import io.ktor.client.engine.okhttp.*
+import io.ktor.client.plugins.contentnegotiation.*
+import io.ktor.serialization.kotlinx.json.*
+import org.kodein.di.*
+import org.kodein.di.android.x.androidXModule
+import xyz.quaver.pupil.sources.core.NetworkCache
+import xyz.quaver.pupil.sources.core.settingsDataStore
+import xyz.quaver.pupil.util.PupilHttpClient

-typealias PupilInterceptor = (Interceptor.Chain) -> Response
+class Pupil : Application(), DIAware {

-lateinit var histories: SavedSet<Int>
-    private set
-lateinit var favorites: SavedSet<Int>
-    private set
-lateinit var favoriteTags: SavedSet<Tag>
-    private set
-lateinit var searchHistory: SavedSet<String>
-    private set
+    override val di: DI by DI.lazy {
+        import(androidXModule(this@Pupil))

-val interceptors = mutableMapOf<KClass<out Any>, PupilInterceptor>()
+        bind { singleton { NetworkCache(this@Pupil) } }

-lateinit var clientBuilder: OkHttpClient.Builder
+        bindSingleton { settingsDataStore }

-var clientHolder: OkHttpClient? = null
-val client: OkHttpClient
-    get() = clientHolder ?: clientBuilder.build().also {
-        clientHolder = it
-        setClient(it)
+        bind { singleton { PupilHttpClient(OkHttp.create()) } }
    }

-class Pupil : Application() {
-
    override fun onCreate() {
-        AppCompatDelegate.setCompatVectorFromResourcesEnabled(true)
-
-        preferences = PreferenceManager.getDefaultSharedPreferences(this)
-
-        val userID = Preferences["user_id", ""].let {  userID ->
-            if (userID.isEmpty()) UUID.randomUUID().toString().also { Preferences["user_id"] = it }
-            else userID
-        }
-
-        FirebaseCrashlytics.getInstance().setUserId(userID)
-
-        val proxyInfo = getProxyInfo()
-
-        clientBuilder = OkHttpClient.Builder()
-            .connectTimeout(0, TimeUnit.SECONDS)
-            .readTimeout(0, TimeUnit.SECONDS)
-            .proxyInfo(proxyInfo)
-            .addInterceptor { chain ->
-                val request = chain.request()
-                val tag = request.tag() ?: return@addInterceptor chain.proceed(request)
-
-                interceptors[tag::class]?.invoke(chain) ?: chain.proceed(request)
-            }
-
-        try {
-            Preferences.get<String>("download_folder").also {
-                if (it.startsWith("content") && Build.VERSION.SDK_INT > 19)
-                    contentResolver.takePersistableUriPermission(
-                        Uri.parse(it),
-                        Intent.FLAG_GRANT_READ_URI_PERMISSION or Intent.FLAG_GRANT_WRITE_URI_PERMISSION
-                    )
-
-                if (!FileX(this, it).canWrite())
-                    throw Exception()
-
-                DownloadManager.getInstance(this).migrate()
-            }
-        } catch (e: Exception) {
-            Preferences.remove("download_folder")
-        }
-
-        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"]) {
-            CoroutineScope(Dispatchers.IO).launch {
-                histories.reversed().let {
-                    histories.clear()
-                    histories.addAll(it)
-                }
-                favorites.reversed().let {
-                    favorites.clear()
-                    favorites.addAll(it)
-                }
-            }
-            Preferences["new_history"] = true
-        }
-
-        if (BuildConfig.DEBUG)
-            FirebaseAnalytics.getInstance(this).setAnalyticsCollectionEnabled(false)
+        super.onCreate()

        try {
            ProviderInstaller.installIfNeeded(this)
@@ -166,21 +83,6 @@ class Pupil : Application() {
                enableVibration(true)
                lockscreenVisibility = Notification.VISIBILITY_SECRET
            })
-
-            manager.createNotificationChannel(NotificationChannel("import", getString(R.string.channel_update), NotificationManager.IMPORTANCE_LOW).apply {
-                description = getString(R.string.channel_update_description)
-                enableLights(false)
-                enableVibration(false)
-                lockscreenVisibility = Notification.VISIBILITY_SECRET
-            })
        }
-
-        AppCompatDelegate.setDefaultNightMode(when (Preferences.get<Boolean>("dark_mode")) {
-            true -> AppCompatDelegate.MODE_NIGHT_YES
-            false -> AppCompatDelegate.MODE_NIGHT_NO
-        })
-
-        super.onCreate()
    }
-
 }
--- a/app/src/main/java/xyz/quaver/pupil/adapters/GalleryBlockAdapter.kt
+++ b/app/src/main/java/xyz/quaver/pupil/adapters/GalleryBlockAdapter.kt
@@ -1,396 +0,0 @@
-/*
- *     Pupil, Hitomi.la viewer for Android
- *     Copyright (C) 2019  tom5079
- *
- *     This program is free software: you can redistribute it and/or modify
- *     it under the terms of the GNU General Public License as published by
- *     the Free Software Foundation, either version 3 of the License, or
- *     (at your option) any later version.
- *
- *     This program is distributed in the hope that it will be useful,
- *     but WITHOUT ANY WARRANTY; without even the implied warranty of
- *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *     GNU General Public License for more details.
- *
- *     You should have received a copy of the GNU General Public License
- *     along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-package xyz.quaver.pupil.adapters
-
-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 androidx.cardview.widget.CardView
-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 kotlinx.coroutines.CoroutineScope
-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.favorites
-import xyz.quaver.pupil.types.Tag
-import xyz.quaver.pupil.ui.view.TagChip
-import xyz.quaver.pupil.util.Preferences
-import xyz.quaver.pupil.util.downloader.Cache
-import xyz.quaver.pupil.util.downloader.DownloadManager
-import xyz.quaver.pupil.util.wordCapitalize
-import java.util.*
-import kotlin.collections.ArrayList
-import kotlin.concurrent.schedule
-
-class GalleryBlockAdapter(private val glide: RequestManager, private val galleries: List<Int>) : RecyclerSwipeAdapter<RecyclerView.ViewHolder>(), SwipeAdapterInterface {
-
-    enum class ViewType {
-        NEXT,
-        GALLERY,
-        PREV
-    }
-
-    val timer = Timer()
-
-    var isThin = false
-
-    inner class GalleryViewHolder(val view: View) : RecyclerView.ViewHolder(view) {
-        var timerTask: TimerTask? = null
-
-        private fun updateProgress(context: Context, galleryID: Int) {
-            val cache = Cache.getInstance(context, galleryID)
-
-            CoroutineScope(Dispatchers.Main).launch {
-                if (cache.metadata.reader == null || Preferences["cache_disable"]) {
-                    view.galleryblock_progressbar_layout.visibility = View.GONE
-                    view.galleryblock_progress_complete.visibility = View.INVISIBLE
-                    return@launch
-                }
-
-                with(view.galleryblock_progressbar) {
-                    val imageList = cache.metadata.imageList!!
-
-                    progress = imageList.filterNotNull().size
-                    max = imageList.size
-
-                    with(view.galleryblock_progressbar_layout) {
-                        if (visibility == View.GONE)
-                            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
-                }
-            }
-        }
-
-        fun bind(galleryID: Int) {
-            val cache = Cache.getInstance(view.context, galleryID)
-
-            val galleryBlock = cache.metadata.galleryBlock ?: return
-
-            with(view) {
-                val resources = context.resources
-                val languages = resources.getStringArray(R.array.languages).map {
-                    it.split("|").let { split ->
-                        Pair(split[0], split[1])
-                    }
-                }.toMap()
-
-                val artists = galleryBlock.artists
-                val series = galleryBlock.series
-
-                if (isThin)
-                    galleryblock_thumbnail.layoutParams.width = context.resources.getDimensionPixelSize(
-                        R.dimen.galleryblock_thumbnail_thin
-                    )
-
-                galleryblock_thumbnail.setImageDrawable(CircularProgressDrawable(context).also {
-                    it.start()
-                })
-
-                CoroutineScope(Dispatchers.IO).launch {
-                    val thumbnail = cache.getThumbnail()
-
-                    glide
-                        .load(thumbnail)
-                        .skipMemoryCache(true)
-                        .diskCacheStrategy(DiskCacheStrategy.NONE)
-                        .error(R.drawable.image_broken_variant)
-                        .listener(object: RequestListener<Drawable> {
-                            override fun onLoadFailed(
-                                e: GlideException?,
-                                model: Any?,
-                                target: Target<Drawable>?,
-                                isFirstResource: Boolean
-                            ): Boolean {
-                                Cache.getInstance(context, galleryID).let {
-                                    it.cacheFolder.getChild(".thumbnail").let { if (it.exists()) it.delete() }
-                                    it.downloadFolder?.getChild(".thumbnail")?.let { if (it.exists()) it.delete() }
-                                }
-                                return false
-                            }
-
-                            override fun onResourceReady(
-                                resource: Drawable?,
-                                model: Any?,
-                                target: Target<Drawable>?,
-                                dataSource: DataSource?,
-                                isFirstResource: Boolean
-                            ): Boolean = false
-                        })
-                        .apply {
-                            if (BuildConfig.CENSOR)
-                                override(5, 8)
-                        }.let { launch(Dispatchers.Main) { it.into(galleryblock_thumbnail) } }
-                }
-
-                if (timerTask == null)
-                    timerTask = timer.schedule(0, 1000) {
-                        updateProgress(context, galleryID)
-                    }
-
-                galleryblock_title.text = galleryBlock.title
-                with(galleryblock_artist) {
-                    text = artists.joinToString(", ") { it.wordCapitalize() }
-                    visibility = when {
-                        artists.isNotEmpty() -> View.VISIBLE
-                        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.Default).launch {
-                    galleryBlock.relatedTags.map {
-                        TagChip(context, Tag.parse(it)).apply {
-                            setOnClickListener { view ->
-                                for (callback in onChipClickedHandler)
-                                    callback.invoke((view as TagChip).tag)
-                            }
-                        }
-                    }.let { launch(Dispatchers.Main) { it.forEach { galleryblock_tag_group.addView(it) } } }
-                }
-
-                galleryblock_id.text = galleryBlock.id.toString()
-                galleryblock_pagecount.text = "-"
-                CoroutineScope(Dispatchers.IO).launch {
-                    val pageCount = kotlin.runCatching {
-                        getReader(galleryBlock.id).galleryInfo.files.size
-                    }.getOrNull() ?: return@launch
-                    withContext(Dispatchers.Main) {
-                        galleryblock_pagecount.text = context.getString(R.string.galleryblock_pagecount, pageCount)
-                    }
-                }
-
-                with(galleryblock_favorite) {
-                    setImageResource(if (favorites.contains(galleryBlock.id)) R.drawable.ic_star_filled else R.drawable.ic_star_empty)
-                    setOnClickListener {
-                        when {
-                            favorites.contains(galleryBlock.id) -> {
-                                favorites.remove(galleryBlock.id)
-
-                                setImageResource(R.drawable.ic_star_empty)
-                            }
-                            else -> {
-                                favorites.add(galleryBlock.id)
-
-                                setImageDrawable(AnimatedVectorDrawableCompat.create(context, R.drawable.avd_star).apply {
-                                    this ?: return@apply
-
-                                    registerAnimationCallback(object: Animatable2Compat.AnimationCallback() {
-                                        override fun onAnimationEnd(drawable: Drawable?) {
-                                            setImageResource(R.drawable.ic_star_filled)
-                                        }
-                                    })
-                                    start()
-                                })
-                            }
-                        }
-                    }
-                }
-
-
-                // Make some views invisible to make it thinner
-                if (isThin) {
-                    galleryblock_language.visibility = View.GONE
-                    galleryblock_type.visibility = View.GONE
-                    galleryblock_tag_group.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 {
-
-        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)]
-
-            holder.bind(galleryID)
-
-            with(holder.view.galleryblock_primary) {
-                setOnClickListener {
-                    holder.view.performClick()
-                }
-                setOnLongClickListener {
-                    holder.view.performLongClick()
-                }
-            }
-
-            holder.view.galleryblock_download.setOnClickListener {
-                onDownloadClickedHandler?.invoke(position)
-            }
-
-            holder.view.galleryblock_delete.setOnClickListener {
-                onDeleteClickedHandler?.invoke(position)
-            }
-
-            mItemManger.bindView(holder.view, position)
-
-            holder.view.galleryblock_swipe_layout.addSwipeListener(object: SwipeLayout.SwipeListener {
-                override fun onStartOpen(layout: SwipeLayout?) {
-                    mItemManger.closeAllExcept(layout)
-
-                    holder.view.galleryblock_download.text =
-                        if (DownloadManager.getInstance(holder.view.context).isDownloading(galleryID))
-                            holder.view.context.getString(android.R.string.cancel)
-                        else
-                            holder.view.context.getString(R.string.main_download)
-                }
-
-                override fun onClose(layout: SwipeLayout?) {}
-                override fun onHandRelease(layout: SwipeLayout?, xvel: Float, yvel: Float) {}
-                override fun onOpen(layout: SwipeLayout?) {}
-                override fun onStartClose(layout: SwipeLayout?) {}
-                override fun onUpdate(layout: SwipeLayout?, leftOffset: Int, topOffset: Int) {}
-            })
-        }
-    }
-
-    override fun onViewDetachedFromWindow(holder: RecyclerView.ViewHolder) {
-        super.onViewDetachedFromWindow(holder)
-
-        if (holder is GalleryViewHolder) {
-            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
@@ -1,205 +0,0 @@
-/*
- *     Pupil, Hitomi.la viewer for Android
- *     Copyright (C) 2019  tom5079
- *
- *     This program is free software: you can redistribute it and/or modify
- *     it under the terms of the GNU General Public License as published by
- *     the Free Software Foundation, either version 3 of the License, or
- *     (at your option) any later version.
- *
- *     This program is distributed in the hope that it will be useful,
- *     but WITHOUT ANY WARRANTY; without even the implied warranty of
- *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *     GNU General Public License for more details.
- *
- *     You should have received a copy of the GNU General Public License
- *     along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-package xyz.quaver.pupil.adapters
-
-import android.graphics.drawable.Drawable
-import android.view.LayoutInflater
-import android.view.View
-import android.view.ViewGroup
-import androidx.constraintlayout.widget.ConstraintLayout
-import androidx.recyclerview.widget.RecyclerView
-import com.bumptech.glide.Glide
-import com.bumptech.glide.load.DataSource
-import com.bumptech.glide.load.engine.DiskCacheStrategy
-import com.bumptech.glide.load.engine.GlideException
-import com.bumptech.glide.load.model.GlideUrl
-import com.bumptech.glide.load.model.LazyHeaders
-import com.bumptech.glide.request.RequestListener
-import com.bumptech.glide.request.target.Target
-import kotlinx.android.synthetic.main.item_reader.view.*
-import kotlinx.coroutines.CoroutineScope
-import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.launch
-import xyz.quaver.Code
-import xyz.quaver.hitomi.Reader
-import xyz.quaver.hitomi.getReferer
-import xyz.quaver.hitomi.imageUrlFromImage
-import xyz.quaver.hiyobi.createImgList
-import xyz.quaver.pupil.BuildConfig
-import xyz.quaver.pupil.R
-import xyz.quaver.pupil.services.DownloadService
-import xyz.quaver.pupil.ui.ReaderActivity
-import xyz.quaver.pupil.util.Preferences
-import xyz.quaver.pupil.util.downloader.Cache
-import java.util.*
-import kotlin.concurrent.schedule
-import kotlin.math.roundToInt
-
-class ReaderAdapter(private val activity: ReaderActivity,
-                    private val galleryID: Int) : RecyclerView.Adapter<ReaderAdapter.ViewHolder>() {
-
-    var reader: Reader? = null
-    val timer = Timer()
-
-    private val glide = Glide.with(activity)
-
-    var isFullScreen = false
-
-    var onItemClickListener : ((Int) -> (Unit))? = null
-
-    class ViewHolder(val view: View) : RecyclerView.ViewHolder(view)
-
-    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): ViewHolder {
-        return LayoutInflater.from(parent.context).inflate(
-            R.layout.item_reader, parent, false
-        ).let {
-            ViewHolder(it)
-        }
-    }
-
-    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)
-            }
-        } else {
-            val image = cache!!.getImage(position)
-            val progress = activity.downloader?.progress?.get(galleryID)?.get(position)
-
-            if (progress?.isInfinite() == true && image != null) {
-                holder.view.reader_item_progressbar.visibility = View.INVISIBLE
-
-                CoroutineScope(Dispatchers.IO).launch {
-                    glide
-                        .load(image.uri)
-                        .diskCacheStrategy(DiskCacheStrategy.NONE)
-                        .skipMemoryCache(true)
-                        .apply {
-                            if (BuildConfig.CENSOR)
-                                override(5, 8)
-                            else
-                                override(
-                                    holder.view.context.resources.displayMetrics.widthPixels,
-                                    holder.view.context.resources.getDimensionPixelSize(R.dimen.reader_max_height)
-                                )
-                        }
-                        .error(R.drawable.image_broken_variant)
-                        .listener(object: RequestListener<Drawable> {
-                            override fun onLoadFailed(
-                                e: GlideException?,
-                                model: Any?,
-                                target: Target<Drawable>?,
-                                isFirstResource: Boolean
-                            ): Boolean {
-                                cache!!.metadata.imageList?.set(position, null)
-                                image.delete()
-                                DownloadService.cancel(holder.view.context, galleryID)
-                                DownloadService.download(holder.view.context, galleryID, true)
-                                return true
-                            }
-
-                            override fun onResourceReady(
-                                resource: Drawable?,
-                                model: Any?,
-                                target: Target<Drawable>?,
-                                dataSource: DataSource?,
-                                isFirstResource: Boolean
-                            ) = false
-                        }).let { launch(Dispatchers.Main) { it.into(holder.view.image) } }
-                }
-            } else {
-                holder.view.reader_item_progressbar.visibility = View.VISIBLE
-
-                glide.clear(holder.view.image)
-
-                holder.view.reader_item_progressbar.progress =
-                    if (progress?.isInfinite() == true)
-                        100
-                    else
-                        progress?.roundToInt() ?: 0
-
-                holder.view.image.setImageDrawable(null)
-
-                timer.schedule(1000) {
-                    CoroutineScope(Dispatchers.Main).launch {
-                        notifyItemChanged(position)
-                    }
-                }
-            }
-        }
-    }
-
-    override fun getItemCount() = reader?.galleryInfo?.files?.size ?: 0
-
-}
--- a/app/src/main/java/xyz/quaver/pupil/adapters/ThumbnailAdapter.kt
+++ b/app/src/main/java/xyz/quaver/pupil/adapters/ThumbnailAdapter.kt
@@ -1,49 +0,0 @@
-/*
- *     Pupil, Hitomi.la viewer for Android
- *     Copyright (C) 2019  tom5079
- *
- *     This program is free software: you can redistribute it and/or modify
- *     it under the terms of the GNU General Public License as published by
- *     the Free Software Foundation, either version 3 of the License, or
- *     (at your option) any later version.
- *
- *     This program is distributed in the hope that it will be useful,
- *     but WITHOUT ANY WARRANTY; without even the implied warranty of
- *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *     GNU General Public License for more details.
- *
- *     You should have received a copy of the GNU General Public License
- *     along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-package xyz.quaver.pupil.adapters
-
-import android.view.ViewGroup
-import android.widget.ImageView
-import androidx.recyclerview.widget.RecyclerView
-import com.bumptech.glide.RequestManager
-import com.bumptech.glide.load.engine.DiskCacheStrategy
-import xyz.quaver.pupil.BuildConfig
-
-class ThumbnailAdapter(private val glide: RequestManager, var thumbnails: List<String>) : RecyclerView.Adapter<ThumbnailAdapter.ViewHolder>() {
-
-    class ViewHolder(val view: ImageView) : RecyclerView.ViewHolder(view)
-
-    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): ViewHolder {
-        return ViewHolder(ImageView(parent.context))
-    }
-
-    override fun onBindViewHolder(holder: ViewHolder, position: Int) {
-        glide
-            .load(thumbnails[position])
-            .diskCacheStrategy(DiskCacheStrategy.NONE)
-            .apply {
-                if (BuildConfig.CENSOR)
-                    override(5, 8)
-            }
-            .into(holder.view)
-    }
-
-    override fun getItemCount() = thumbnails.size
-
-}
--- a/app/src/main/java/xyz/quaver/pupil/adapters/ThumbnailPageAdapter.kt
+++ b/app/src/main/java/xyz/quaver/pupil/adapters/ThumbnailPageAdapter.kt
@@ -1,50 +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.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 ViewHolder(val view: RecyclerView) : RecyclerView.ViewHolder(view)
-
-    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): ViewHolder {
-        return ViewHolder(RecyclerView(parent.context).apply {
-            layoutManager = GridLayoutManager(parent.context, 3)
-            adapter = ThumbnailAdapter(glide, listOf())
-            layoutParams = ViewGroup.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.MATCH_PARENT)
-        })
-    }
-
-    override fun onBindViewHolder(holder: ViewHolder, position: Int) {
-        (holder.view.adapter as ThumbnailAdapter).apply {
-            thumbnails = this@ThumbnailPageAdapter.thumbnails.slice(9*position until min(9*position+9, this@ThumbnailPageAdapter.thumbnails.size))
-            notifyDataSetChanged()
-
-            holder.view.layoutManager?.scrollToPosition(itemCount-1)
-        }
-    }
-
-    override fun getItemCount() = if (thumbnails.isEmpty()) 0 else thumbnails.size/9 + if (thumbnails.size%9 != 0) 1 else 0
-
-}
--- a/app/src/main/java/xyz/quaver/pupil/receiver/UpdateBroadcastReceiver.kt
+++ b/app/src/main/java/xyz/quaver/pupil/receiver/UpdateBroadcastReceiver.kt
@@ -1,93 +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.receiver
-
-import android.app.DownloadManager
-import android.app.PendingIntent
-import android.content.BroadcastReceiver
-import android.content.Context
-import android.content.Intent
-import android.net.Uri
-import android.webkit.MimeTypeMap
-import androidx.core.app.NotificationCompat
-import androidx.core.app.NotificationManagerCompat
-import androidx.core.content.FileProvider
-import xyz.quaver.pupil.R
-import xyz.quaver.pupil.util.Preferences
-import java.io.File
-
-class UpdateBroadcastReceiver : BroadcastReceiver() {
-
-    override fun onReceive(context: Context?, intent: Intent?) {
-        context ?: return
-
-        when (intent?.action) {
-            DownloadManager.ACTION_DOWNLOAD_COMPLETE -> {
-
-                // Validate download
-                val downloadID: Long = Preferences["update_download_id"]
-                val downloadManager = context.getSystemService(Context.DOWNLOAD_SERVICE) as DownloadManager
-
-                if (intent.getLongExtra(DownloadManager.EXTRA_DOWNLOAD_ID, -2) != downloadID)
-                    return
-
-                // Get target uri
-
-                val query = DownloadManager.Query()
-                    .setFilterById(downloadID)
-
-                val uri = downloadManager.query(query).use { cursor ->
-                    if (cursor.moveToFirst()) {
-                        cursor.getString(cursor.getColumnIndex(DownloadManager.COLUMN_LOCAL_URI)).let {
-                            val uri = Uri.parse(it)
-
-                            when (uri.scheme) {
-                                "file" ->
-                                    FileProvider.getUriForFile(context, context.applicationContext.packageName + ".provider", File(uri.path!!)
-                                    )
-                                "content" -> uri
-                                else -> null
-                            }
-                        }
-                    } else
-                        null
-                } ?: return
-
-                // Build Notification
-
-                val notificationManager = NotificationManagerCompat.from(context)
-
-                val pendingIntent = PendingIntent.getActivity(context, 0, Intent(Intent.ACTION_VIEW).apply {
-                    flags = Intent.FLAG_ACTIVITY_CLEAR_TOP or Intent.FLAG_GRANT_READ_URI_PERMISSION or Intent.FLAG_ACTIVITY_NEW_TASK
-                    setDataAndType(uri, MimeTypeMap.getSingleton().getMimeTypeFromExtension("apk"))
-                }, 0)
-
-                val notification = NotificationCompat.Builder(context, "update")
-                    .setSmallIcon(android.R.drawable.stat_sys_download_done)
-                    .setContentTitle(context.getText(R.string.update_download_completed))
-                    .setContentText(context.getText(R.string.update_download_completed_description))
-                    .setContentIntent(pendingIntent)
-                    .build()
-
-                notificationManager.notify(R.id.notification_id_update, notification)
-            }
-        }
-    }
-
-}
--- a/app/src/main/java/xyz/quaver/pupil/services/DownloadService.kt
+++ b/app/src/main/java/xyz/quaver/pupil/services/DownloadService.kt
@@ -1,440 +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.services
-
-import android.annotation.SuppressLint
-import android.app.PendingIntent
-import android.app.Service
-import android.content.Context
-import android.content.Intent
-import android.util.SparseArray
-import androidx.core.app.NotificationCompat
-import androidx.core.app.NotificationManagerCompat
-import androidx.core.app.TaskStackBuilder
-import androidx.core.content.ContextCompat
-import com.google.firebase.crashlytics.FirebaseCrashlytics
-import kotlinx.coroutines.CoroutineScope
-import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.Job
-import kotlinx.coroutines.launch
-import okhttp3.Call
-import okhttp3.Callback
-import okhttp3.Response
-import okhttp3.ResponseBody
-import okio.*
-import xyz.quaver.pupil.PupilInterceptor
-import xyz.quaver.pupil.R
-import xyz.quaver.pupil.client
-import xyz.quaver.pupil.interceptors
-import xyz.quaver.pupil.ui.ReaderActivity
-import xyz.quaver.pupil.util.Preferences
-import xyz.quaver.pupil.util.downloader.Cache
-import xyz.quaver.pupil.util.downloader.DownloadManager
-import xyz.quaver.pupil.util.ellipsize
-import xyz.quaver.pupil.util.normalizeID
-import xyz.quaver.pupil.util.requestBuilders
-import java.io.IOException
-
-private typealias ProgressListener = (DownloadService.Tag, Long, Long, Boolean) -> Unit
-class DownloadService : Service() {
-    data class Tag(val galleryID: Int, val index: Int, val startId: Int? = null)
-
-    //region Notification
-    private val notificationManager by lazy {
-        NotificationManagerCompat.from(this)
-    }
-
-    private val serviceNotification by lazy {
-        NotificationCompat.Builder(this, "downloader")
-            .setContentTitle(getString(R.string.downloader_running))
-            .setProgress(0, 0, false)
-            .setSmallIcon(R.drawable.ic_notification)
-            .setOngoing(true)
-    }
-
-    private val notification = SparseArray<NotificationCompat.Builder?>()
-
-    private fun initNotification(galleryID: Int) {
-        val intent = Intent(this, ReaderActivity::class.java)
-            .putExtra("galleryID", galleryID)
-
-        val pendingIntent = TaskStackBuilder.create(this).run {
-            addNextIntentWithParentStack(intent)
-            getPendingIntent(galleryID, PendingIntent.FLAG_UPDATE_CURRENT)
-        }
-        val action =
-            NotificationCompat.Action.Builder(0, getText(android.R.string.cancel),
-                PendingIntent.getService(
-                    this,
-                    R.id.notification_download_cancel_action.normalizeID(),
-                    Intent(this, DownloadService::class.java)
-                        .putExtra(KEY_COMMAND, COMMAND_CANCEL)
-                        .putExtra(KEY_ID, galleryID),
-                    PendingIntent.FLAG_UPDATE_CURRENT),
-            ).build()
-
-        notification.put(galleryID, NotificationCompat.Builder(this, "download").apply {
-            setContentTitle(getString(R.string.reader_loading))
-            setContentText(getString(R.string.reader_notification_text))
-            setSmallIcon(R.drawable.ic_notification)
-            setContentIntent(pendingIntent)
-            addAction(action)
-            setProgress(0, 0, true)
-            setOngoing(true)
-        })
-
-        notify(galleryID)
-    }
-
-    @SuppressLint("RestrictedApi")
-    private fun notify(galleryID: Int) {
-        val max = progress[galleryID]?.size ?: 0
-        val progress = progress[galleryID]?.count { it == Float.POSITIVE_INFINITY } ?: 0
-
-        val notification = notification[galleryID] ?: return
-
-        if (isCompleted(galleryID)) {
-            notification
-                .setContentText(getString(R.string.reader_notification_complete))
-                .setProgress(0, 0, false)
-                .setOngoing(false)
-                .mActions.clear()
-
-            notificationManager.cancel(galleryID)
-        } else
-            notification
-                .setProgress(max, progress, false)
-                .setContentText("$progress/$max")
-
-        if (DownloadManager.getInstance(this).getDownloadFolder(galleryID) != null)
-            notification.let { notificationManager.notify(galleryID, it.build()) }
-        else
-            notificationManager.cancel(galleryID)
-    }
-    //endregion
-
-    //region ProgressListener
-    @Suppress("UNCHECKED_CAST")
-    private val progressListener: ProgressListener = { (galleryID, index), bytesRead, contentLength, done ->
-        if (!done && progress[galleryID]?.get(index)?.isFinite() == true)
-            progress[galleryID]?.set(index, bytesRead * 100F / contentLength)
-    }
-
-    private class ProgressResponseBody(
-        val tag: Any?,
-        val responseBody: ResponseBody,
-        val progressListener : ProgressListener
-    ) : ResponseBody() {
-        private var bufferedSource : BufferedSource? = null
-
-        override fun contentLength() = responseBody.contentLength()
-        override fun contentType() = responseBody.contentType()
-
-        override fun source(): BufferedSource {
-            if (bufferedSource == null)
-                bufferedSource = Okio.buffer(source(responseBody.source()))
-
-            return bufferedSource!!
-        }
-
-        private fun source(source: Source) = object: ForwardingSource(source) {
-            var totalBytesRead = 0L
-
-            override fun read(sink: Buffer, byteCount: Long): Long {
-                val bytesRead = super.read(sink, byteCount)
-
-                totalBytesRead += if (bytesRead == -1L) 0L else bytesRead
-                progressListener.invoke(tag as Tag, totalBytesRead, responseBody.contentLength(), bytesRead == -1L)
-
-                return bytesRead
-            }
-        }
-    }
-
-    private val interceptor: PupilInterceptor = { chain ->
-        val request = chain.request()
-        var response = chain.proceed(request)
-
-        var retry = 5
-        while (!response.isSuccessful && retry > 0) {
-            response = chain.proceed(request)
-            retry--
-        }
-
-        response.newBuilder()
-            .body(response.body()?.let {
-                ProgressResponseBody(request.tag(), it, progressListener)
-            }).build()
-    }
-    //endregion
-
-    //region Downloader
-    /**
-    * KEY
-    *  primary galleryID
-    *  secondary index
-    * PRIMARY VALUE
-    *  MutableList -> Download in progress
-    *  null -> Loading / Gallery doesn't exist
-    * SECONDARY VALUE
-    *  0 <= value < 100 -> Download in progress
-    *  Float.POSITIVE_INFINITY -> Download completed
-    */
-    val progress = SparseArray<MutableList<Float>?>()
-
-    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) {
-            if (e.message?.contains("cancel", true) == false) {
-                val galleryID = (call.request().tag() as Tag).galleryID
-
-                // Retry
-                cancel(galleryID)
-                download(galleryID)
-            }
-        }
-
-        override fun onResponse(call: Call, response: Response) {
-            val (galleryID, index, startId) = call.request().tag() as Tag
-            val ext = call.request().url().encodedPath().split('.').last()
-
-            kotlin.runCatching {
-                val image = response.also { if (it.code() != 200) throw IOException() }.body()?.use { it.bytes() } ?: throw Exception()
-
-                CoroutineScope(Dispatchers.IO).launch {
-                    kotlin.runCatching {
-                        Cache.getInstance(this@DownloadService, galleryID).putImage(index, "$index.$ext", image)
-                    }.onSuccess {
-                        progress[galleryID]?.set(index, Float.POSITIVE_INFINITY)
-                        notify(galleryID)
-
-                        if (isCompleted(galleryID)) {
-                            if (DownloadManager.getInstance(this@DownloadService)
-                                    .getDownloadFolder(galleryID) != null)
-                                Cache.getInstance(this@DownloadService, galleryID).moveToDownload()
-
-                            startId?.let { stopSelf(it) }
-                        }
-                    }.onFailure {
-                        cancel(galleryID)
-                        download(galleryID)
-                    }
-                }
-            }
-        }
-    }
-
-    fun cancel(startId: Int? = null) {
-        client.dispatcher().queuedCalls().filter {
-            it.request().tag() is Tag
-        }.forEach {
-            (it.request().tag() as? Tag)?.startId?.let { stopSelf(it) }
-            it.cancel()
-        }
-        client.dispatcher().runningCalls().filter {
-            it.request().tag() is Tag
-        }.forEach {
-            (it.request().tag() as? Tag)?.startId?.let { stopSelf(it) }
-            it.cancel()
-        }
-
-        progress.clear()
-        notification.clear()
-        notificationManager.cancelAll()
-
-        startId?.let { stopSelf(it) }
-    }
-
-    fun cancel(galleryID: Int, startId: Int? = null) {
-        client.dispatcher().queuedCalls().filter {
-            (it.request().tag() as? Tag)?.galleryID == galleryID
-        }.forEach {
-            (it.request().tag() as? Tag)?.startId?.let { stopSelf(it) }
-            it.cancel()
-        }
-        client.dispatcher().runningCalls().filter {
-            (it.request().tag() as? Tag)?.galleryID == galleryID
-        }.forEach {
-            (it.request().tag() as? Tag)?.startId?.let { stopSelf(it) }
-            it.cancel()
-        }
-
-        progress.remove(galleryID)
-        notification.remove(galleryID)
-        notificationManager.cancel(galleryID)
-
-        startId?.let { stopSelf(it) }
-    }
-
-    fun delete(galleryID: Int, startId: Int? = null) = CoroutineScope(Dispatchers.IO).launch {
-        cancel(galleryID)
-        DownloadManager.getInstance(this@DownloadService).deleteDownloadFolder(galleryID)
-        Cache.delete(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)
-            cancel(galleryID)
-
-        val cache = Cache.getInstance(this@DownloadService, galleryID)
-
-        initNotification(galleryID)
-
-        val reader = cache.getReader()
-
-        // Gallery doesn't exist
-        if (reader == null) {
-            delete(galleryID)
-            progress.put(galleryID, null)
-            return@launch
-        }
-
-        progress.put(galleryID, MutableList(reader.galleryInfo.files.size) { 0F })
-
-        FirebaseCrashlytics.getInstance().log(
-            """
-                GALLERYID: $galleryID
-                CACHE: ${cache.findFile(".metadata")}
-                PATTERN: ${Preferences["download_folder_name", ""]}
-                READER ID: ${reader.galleryInfo.id}
-                READER SIZE: ${reader.galleryInfo.files.size}
-                CACHE READER ID: ${cache.metadata.reader?.galleryInfo?.id}}
-                CACHE READER SIZE: ${cache.metadata.reader?.galleryInfo?.files?.size}
-            """.trimIndent()
-        )
-
-        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)
-                    .getDownloadFolder(galleryID) != null )
-                Cache.getInstance(this@DownloadService, galleryID).moveToDownload()
-
-            notificationManager.cancel(galleryID)
-            startId?.let { stopSelf(it) }
-            return@launch
-        }
-
-        notification[galleryID]?.setContentTitle(reader.galleryInfo.title?.ellipsize(30))
-        notify(galleryID)
-
-        val queued = mutableSetOf<Int>()
-
-        if (priority) {
-            client.dispatcher().queuedCalls().forEach {
-                val queuedID = (it.request().tag() as? Tag)?.galleryID ?: return@forEach
-
-                if (queued.add(queuedID))
-                    cancel(queuedID)
-            }
-        }
-
-        reader.requestBuilders.forEachIndexed { index, it ->
-            if (progress[galleryID]?.get(index)?.isInfinite() != true) {
-                val request = it.tag(Tag(galleryID, index, startId)).build()
-                client.newCall(request).enqueue(callback)
-            }
-        }
-
-        queued.forEach { download(it) }
-    }
-    //endregion
-
-    companion object {
-        const val KEY_COMMAND = "COMMAND"   // String
-        const val KEY_ID = "ID"             // Int
-        const val KEY_PRIORITY = "PRIORITY" // Boolean
-
-        const val COMMAND_DOWNLOAD = "DOWNLOAD"
-        const val COMMAND_CANCEL = "CANCEL"
-        const val COMMAND_DELETE = "DELETE"
-
-        private fun command(context: Context, extras: Intent.() -> Unit) {
-            ContextCompat.startForegroundService(context, Intent(context, DownloadService::class.java).apply(extras))
-        }
-
-        fun download(context: Context, galleryID: Int, priority: Boolean = false) {
-            command(context) {
-                putExtra(KEY_COMMAND, COMMAND_DOWNLOAD)
-                putExtra(KEY_PRIORITY, priority)
-                putExtra(KEY_ID, galleryID)
-            }
-        }
-
-        fun cancel(context: Context, galleryID: Int? = null) {
-            command(context) {
-                putExtra(KEY_COMMAND, COMMAND_CANCEL)
-                galleryID?.let { putExtra(KEY_ID, it) }
-            }
-        }
-
-        fun delete(context: Context, galleryID: Int) {
-            command(context) {
-                putExtra(KEY_COMMAND, COMMAND_DELETE)
-                putExtra(KEY_ID, galleryID)
-            }
-        }
-    }
-
-    override fun onStartCommand(intent: Intent?, flags: Int, startId: Int): Int {
-        startForeground(R.id.downloader_notification_id, serviceNotification.build())
-
-        when (intent?.getStringExtra(KEY_COMMAND)) {
-            COMMAND_DOWNLOAD -> intent.getIntExtra(KEY_ID, -1).let { if (it > 0)
-                download(it, intent.getBooleanExtra(KEY_PRIORITY, false), startId)
-            }
-            COMMAND_CANCEL -> intent.getIntExtra(KEY_ID, -1).let { if (it > 0) cancel(it, startId) else cancel(startId = startId) }
-            COMMAND_DELETE -> intent.getIntExtra(KEY_ID, -1).let { if (it > 0) delete(it, startId) }
-        }
-
-        return START_NOT_STICKY
-    }
-
-    inner class Binder : android.os.Binder() {
-        val service = this@DownloadService
-    }
-
-    private val binder = Binder()
-    override fun onBind(p0: Intent?) = binder
-
-    override fun onCreate() {
-        startForeground(R.id.downloader_notification_id, serviceNotification.build())
-        interceptors[Tag::class] = interceptor
-    }
-
-    override fun onDestroy() {
-        interceptors.remove(Tag::class)
-    }
-}
--- a/app/src/main/java/xyz/quaver/pupil/sources/LocalSources.kt
+++ b/app/src/main/java/xyz/quaver/pupil/sources/LocalSources.kt
@@ -0,0 +1,108 @@
+/*
+ *     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.sources
+
+import android.app.Application
+import android.content.Context
+import android.content.pm.PackageInfo
+import android.content.pm.PackageManager
+import androidx.compose.runtime.*
+import androidx.compose.ui.platform.LocalContext
+import dalvik.system.PathClassLoader
+import kotlinx.coroutines.coroutineScope
+import kotlinx.coroutines.delay
+import kotlinx.coroutines.sync.Mutex
+import kotlinx.coroutines.sync.withLock
+import xyz.quaver.pupil.sources.core.Source
+
+@Composable
+fun rememberLocalSourceList(context: Context = LocalContext.current): State<List<SourceEntry>> = produceState(emptyList()) {
+    while (true) {
+        value = loadSourceList(context)
+        delay(1000)
+    }
+}
+
+suspend fun loadSource(context: Context, sourceEntry: SourceEntry): Source = coroutineScope {
+    sourceCacheMutex.withLock {
+        sourceCache[sourceEntry.packageName] ?: run {
+            val classLoader = PathClassLoader(sourceEntry.sourceDir, null, context.classLoader)
+
+            Class.forName("${sourceEntry.packagePath}${sourceEntry.sourcePath}", false, classLoader)
+                .getConstructor(Application::class.java)
+                .newInstance(context.applicationContext) as Source
+        }.also { sourceCache[sourceEntry.packageName] = it }
+    }
+}
+
+private const val SOURCES_FEATURE = "pupil.sources"
+private const val SOURCES_PACKAGE_PREFIX = "xyz.quaver.pupil.sources"
+private const val SOURCES_PATH = "pupil.sources.path"
+
+private val PackageInfo.isSourceFeatureEnabled
+    get() = this.reqFeatures.orEmpty().any { it.name == SOURCES_FEATURE }
+
+private fun loadSource(context: Context, packageInfo: PackageInfo): List<SourceEntry> {
+    val packageManager = context.packageManager
+
+    val applicationInfo = packageInfo.applicationInfo
+
+    val packageName = packageManager.getApplicationLabel(applicationInfo).toString().substringAfter("[Pupil] ")
+    val packagePath = packageInfo.packageName
+
+    val icon = packageManager.getApplicationIcon(applicationInfo)
+
+    val version = packageInfo.versionName
+
+    return packageInfo
+        .applicationInfo
+        .metaData
+        ?.getString(SOURCES_PATH)
+        ?.split(';')
+        ?.map { source ->
+            val (sourceName, sourcePath) = source.split(':', limit = 2)
+            SourceEntry(
+                packageName,
+                packagePath,
+                sourceName,
+                sourcePath,
+                applicationInfo.sourceDir,
+                icon,
+                version
+            )
+        }.orEmpty()
+}
+
+private val sourceCacheMutex = Mutex()
+private val sourceCache = mutableMapOf<String, Source>()
+
+private fun loadSourceList(context: Context): List<SourceEntry> {
+    val packageManager = context.packageManager
+
+    val packages = packageManager.getInstalledPackages(
+        PackageManager.GET_CONFIGURATIONS or PackageManager.GET_META_DATA
+    )
+
+    return packages.flatMap { packageInfo ->
+        if (packageInfo.isSourceFeatureEnabled)
+            loadSource(context, packageInfo)
+        else
+            emptyList()
+    }
+}
--- a/app/src/main/java/xyz/quaver/pupil/sources/RemoteSources.kt
+++ b/app/src/main/java/xyz/quaver/pupil/sources/RemoteSources.kt
@@ -1,6 +1,6 @@
 /*
 *     Pupil, Hitomi.la viewer for Android
- *     Copyright (C) 2019  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,31 +16,21 @@
 *     along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */

-@file:Suppress("UNUSED_VARIABLE", "IncorrectScope")
+package xyz.quaver.pupil.sources

-package xyz.quaver.pupil
+import androidx.compose.runtime.*
+import kotlinx.coroutines.delay
+import org.kodein.di.compose.localDI
+import org.kodein.di.compose.rememberInstance
+import org.kodein.di.direct
+import org.kodein.di.instance
+import xyz.quaver.pupil.util.PupilHttpClient
+import xyz.quaver.pupil.util.RemoteSourceInfo

-/**
- * Example local unit test, which will execute on the development machine (host).
- *
- * See [testing documentation](http://d.android.com/tools/testing).
- */
-
-import kotlinx.serialization.*
-import kotlinx.serialization.json.Json
-import org.junit.Test
-import java.lang.reflect.ParameterizedType
-import kotlin.reflect.KClass
-import kotlin.reflect.KType
-import kotlin.reflect.typeOf
-
-class ExampleUnitTest {
-
-    @Test
-    fun test() {
-        val a = mutableSetOf<Int>()
-
-        print(a::class.java.methods.firstOrNull { it.name == "add" }?.genericParameterTypes?.firstOrNull() as? ParameterizedType)
+@Composable
+fun rememberRemoteSourceList(client: PupilHttpClient = localDI().direct.instance()) = produceState<Map<String, RemoteSourceInfo>?>(null) {
+    while (true) {
+        value = client.getRemoteSourceList()
+        delay(1000)
    }
-
-}
+}
--- a/app/src/main/java/xyz/quaver/pupil/sources/common.kt
+++ b/app/src/main/java/xyz/quaver/pupil/sources/common.kt
@@ -0,0 +1,31 @@
+/*
+ *     Pupil, Hitomi.la viewer for Android
+ *     Copyright (C) 2022  tom5079
+ *
+ *     This program is free software: you can redistribute it and/or modify
+ *     it under the terms of the GNU General Public License as published by
+ *     the Free Software Foundation, either version 3 of the License, or
+ *     (at your option) any later version.
+ *
+ *     This program is distributed in the hope that it will be useful,
+ *     but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *     GNU General Public License for more details.
+ *
+ *     You should have received a copy of the GNU General Public License
+ *     along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package xyz.quaver.pupil.sources
+
+import android.graphics.drawable.Drawable
+
+data class SourceEntry(
+    val packageName: String,
+    val packagePath: String,
+    val sourceName: String,
+    val sourcePath: String,
+    val sourceDir: String,
+    val icon: Drawable,
+    val version: String
+)
--- a/app/src/main/java/xyz/quaver/pupil/types/Suggestions.kt
+++ b/app/src/main/java/xyz/quaver/pupil/types/Suggestions.kt
@@ -1,53 +0,0 @@
-/*
- *     Pupil, Hitomi.la viewer for Android
- *     Copyright (C) 2019  tom5079
- *
- *     This program is free software: you can redistribute it and/or modify
- *     it under the terms of the GNU General Public License as published by
- *     the Free Software Foundation, either version 3 of the License, or
- *     (at your option) any later version.
- *
- *     This program is distributed in the hope that it will be useful,
- *     but WITHOUT ANY WARRANTY; without even the implied warranty of
- *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *     GNU General Public License for more details.
- *
- *     You should have received a copy of the GNU General Public License
- *     along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-package xyz.quaver.pupil.types
-
-import com.arlib.floatingsearchview.suggestions.model.SearchSuggestion
-import kotlinx.android.parcel.Parcelize
-import xyz.quaver.hitomi.Suggestion
-
-@Parcelize
-data class TagSuggestion(val s: String, val t: Int, val u: String, val n: String) : SearchSuggestion {
-    constructor(s: Suggestion) : this(s.s, s.t, s.u, s.n)
-
-    override fun getBody(): String {
-        return s
-    }
-}
-
-@Parcelize
-class Suggestion(val str: String) : SearchSuggestion {
-    override fun getBody() = str
-}
-
-@Parcelize
-class NoResultSuggestion(val str: String) : SearchSuggestion {
-    override fun getBody() = str
-}
-
-@Parcelize
-class LoadingSuggestion(val str: String) : SearchSuggestion {
-    override fun getBody() = str
-}
-
-@Parcelize
-@Suppress("PARCELABLE_PRIMARY_CONSTRUCTOR_IS_EMPTY")
-class FavoriteHistorySwitch(private val body: String) : SearchSuggestion {
-    override fun getBody() = body
-}
--- a/app/src/main/java/xyz/quaver/pupil/types/Tags.kt
+++ b/app/src/main/java/xyz/quaver/pupil/types/Tags.kt
@@ -1,111 +0,0 @@
-/*
- *     Pupil, Hitomi.la viewer for Android
- *     Copyright (C) 2019  tom5079
- *
- *     This program is free software: you can redistribute it and/or modify
- *     it under the terms of the GNU General Public License as published by
- *     the Free Software Foundation, either version 3 of the License, or
- *     (at your option) any later version.
- *
- *     This program is distributed in the hope that it will be useful,
- *     but WITHOUT ANY WARRANTY; without even the implied warranty of
- *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *     GNU General Public License for more details.
- *
- *     You should have received a copy of the GNU General Public License
- *     along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-package xyz.quaver.pupil.types
-
-import kotlinx.serialization.Serializable
-
-@Serializable
-data class Tag(val area: String?, val tag: String, val isNegative: Boolean = false) {
-    companion object {
-        fun parse(tag: String) : Tag {
-            if (tag.firstOrNull() == '-') {
-                tag.substring(1).split(Regex(":"), 2).let {
-                    return when(it.size) {
-                        2 -> Tag(it[0], it[1], true)
-                        else -> Tag(null, tag, true)
-                    }
-                }
-            }
-            tag.split(Regex(":"), 2).let {
-                return when(it.size) {
-                    2 -> Tag(it[0], it[1])
-                    else -> Tag(null, tag)
-                }
-            }
-        }
-    }
-
-    override fun toString(): String {
-        return (if (isNegative) "-" else "") + when(area) {
-            null -> tag
-            else -> "$area:$tag"
-        }
-    }
-
-    fun toQuery(): String {
-        return toString().replace(' ', '_')
-    }
-
-    override fun equals(other: Any?): Boolean {
-        if (other !is Tag)
-            return false
-
-        if (other.area == area && other.tag == tag)
-            return true
-
-        return false
-    }
-
-    override fun hashCode() = toString().hashCode()
-}
-
-class Tags(val tags: MutableSet<Tag> = mutableSetOf()) : MutableSet<Tag> by tags {
-
-    companion object {
-        fun parse(tags: String) : Tags {
-            return Tags(
-                tags.split(' ').map {
-                    if (it.isNotEmpty())
-                        Tag.parse(it)
-                    else
-                        null
-                }.filterNotNull().toMutableSet()
-            )
-        }
-    }
-
-    fun contains(element: String): Boolean {
-        tags.forEach {
-            if (it.toString() == element)
-                return true
-        }
-
-        return false
-    }
-
-    fun add(element: String): Boolean {
-        return tags.add(Tag.parse(element))
-    }
-
-    fun remove(element: String) {
-        tags.filter { it.toString() == element }.forEach {
-            tags.remove(it)
-        }
-    }
-
-    fun removeByArea(area: String, isNegative: Boolean? = null) {
-        tags.filter { it.area == area && (if(isNegative == null) true else (it.isNegative == isNegative)) }.forEach {
-            tags.remove(it)
-        }
-    }
-
-    override fun toString(): String {
-        return tags.joinToString(" ") { it.toString() }
-    }
-}
--- a/app/src/main/java/xyz/quaver/pupil/ui/BaseActivity.kt
+++ b/app/src/main/java/xyz/quaver/pupil/ui/BaseActivity.kt
@@ -1,72 +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
-
-import android.app.Activity
-import android.content.Intent
-import android.os.Bundle
-import android.os.PersistableBundle
-import android.view.WindowManager
-import androidx.annotation.CallSuper
-import androidx.appcompat.app.AppCompatActivity
-import xyz.quaver.pupil.R
-import xyz.quaver.pupil.util.LockManager
-import xyz.quaver.pupil.util.Preferences
-import xyz.quaver.pupil.util.normalizeID
-
-open class BaseActivity : AppCompatActivity() {
-
-    private var locked: Boolean = true
-
-    @CallSuper
-    override fun onCreate(savedInstanceState: Bundle?, persistentState: PersistableBundle?) {
-        super.onCreate(savedInstanceState, persistentState)
-
-        locked = !LockManager(this).locks.isNullOrEmpty()
-    }
-
-    @CallSuper
-    override fun onResume() {
-        super.onResume()
-
-        if (Preferences["security_mode"])
-            window.setFlags(
-                WindowManager.LayoutParams.FLAG_SECURE,
-                WindowManager.LayoutParams.FLAG_SECURE)
-        else
-            window.clearFlags(WindowManager.LayoutParams.FLAG_SECURE)
-
-        if (locked)
-            startActivityForResult(Intent(this, LockActivity::class.java), R.id.request_lock.normalizeID())
-    }
-
-    @CallSuper
-    override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?) {
-        when(requestCode) {
-            R.id.request_lock.normalizeID() -> {
-                if (resultCode == Activity.RESULT_OK)
-                    locked = false
-                else
-                    finish()
-            }
-            else -> super.onActivityResult(requestCode, resultCode, data)
-        }
-    }
-
-}
--- a/app/src/main/java/xyz/quaver/pupil/ui/LockActivity.kt
+++ b/app/src/main/java/xyz/quaver/pupil/ui/LockActivity.kt
@@ -1,279 +0,0 @@
-/*
- *     Pupil, Hitomi.la viewer for Android
- *     Copyright (C) 2019  tom5079
- *
- *     This program is free software: you can redistribute it and/or modify
- *     it under the terms of the GNU General Public License as published by
- *     the Free Software Foundation, either version 3 of the License, or
- *     (at your option) any later version.
- *
- *     This program is distributed in the hope that it will be useful,
- *     but WITHOUT ANY WARRANTY; without even the implied warranty of
- *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *     GNU General Public License for more details.
- *
- *     You should have received a copy of the GNU General Public License
- *     along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-package xyz.quaver.pupil.ui
-
-import android.app.Activity
-import android.app.AlertDialog
-import android.os.Bundle
-import android.view.animation.Animation
-import android.view.animation.AnimationUtils
-import androidx.appcompat.app.AppCompatActivity
-import androidx.biometric.BiometricManager
-import androidx.biometric.BiometricPrompt
-import androidx.core.content.ContextCompat
-import com.andrognito.patternlockview.PatternLockView
-import com.google.android.material.snackbar.Snackbar
-import kotlinx.android.synthetic.main.activity_lock.*
-import kotlinx.android.synthetic.main.fragment_pattern_lock.*
-import kotlinx.android.synthetic.main.fragment_pin_lock.*
-import xyz.quaver.pupil.R
-import xyz.quaver.pupil.ui.fragment.PINLockFragment
-import xyz.quaver.pupil.ui.fragment.PatternLockFragment
-import xyz.quaver.pupil.util.Lock
-import xyz.quaver.pupil.util.LockManager
-import xyz.quaver.pupil.util.Preferences
-
-private var lastUnlocked = 0L
-class LockActivity : AppCompatActivity() {
-
-    private lateinit var lockManager: LockManager
-    private var mode: String? = null
-
-    private val patternLockFragment = PatternLockFragment().apply {
-        var lastPass = ""
-        onPatternDrawn = {
-            when(mode) {
-                null -> {
-                    val result = lockManager.check(it)
-
-                    if (result == true) {
-                        lastUnlocked = System.currentTimeMillis()
-                        setResult(Activity.RESULT_OK)
-                        finish()
-                    } else
-                        lock_pattern_view.setViewMode(PatternLockView.PatternViewMode.WRONG)
-                }
-                "add_lock" -> {
-                    if (lastPass.isEmpty()) {
-                        lastPass = it
-
-                        Snackbar.make(view!!, R.string.settings_lock_confirm, Snackbar.LENGTH_LONG).show()
-                    } else {
-                        if (lastPass == it) {
-                            LockManager(context!!).add(Lock.generate(Lock.Type.PATTERN, it))
-                            finish()
-                        } else {
-                            lock_pattern_view.setViewMode(PatternLockView.PatternViewMode.WRONG)
-                            lastPass = ""
-
-                            Snackbar.make(view!!, R.string.settings_lock_wrong_confirm, Snackbar.LENGTH_LONG).show()
-                        }
-                    }
-                }
-            }
-        }
-    }
-
-    private val pinLockFragment = PINLockFragment().apply {
-        var lastPass = ""
-        onPINEntered = {
-            when(mode) {
-                null -> {
-                    val result = lockManager.check(it)
-
-                    if (result == true) {
-                        lastUnlocked = System.currentTimeMillis()
-                        setResult(Activity.RESULT_OK)
-                        finish()
-                    } else {
-                        indicator_dots.startAnimation(AnimationUtils.loadAnimation(context, R.anim.shake).apply {
-                            setAnimationListener(object: Animation.AnimationListener {
-                                override fun onAnimationEnd(animation: Animation?) {
-                                    pin_lock_view.resetPinLockView()
-                                    pin_lock_view.isEnabled = true
-                                }
-
-                                override fun onAnimationStart(animation: Animation?) {
-                                    pin_lock_view.isEnabled = false
-                                }
-
-                                override fun onAnimationRepeat(animation: Animation?) {
-                                    // Do Nothing
-                                }
-                            })
-                        })
-                    }
-                }
-                "add_lock" -> {
-                    if (lastPass.isEmpty()) {
-                        lastPass = it
-
-                        pin_lock_view.resetPinLockView()
-                        Snackbar.make(view!!, R.string.settings_lock_confirm, Snackbar.LENGTH_LONG).show()
-                    } else {
-                        if (lastPass == it) {
-                            LockManager(context!!).add(Lock.generate(Lock.Type.PIN, it))
-                            finish()
-                        } else {
-                            indicator_dots.startAnimation(AnimationUtils.loadAnimation(context, R.anim.shake).apply {
-                                setAnimationListener(object: Animation.AnimationListener {
-                                    override fun onAnimationEnd(animation: Animation?) {
-                                        pin_lock_view.resetPinLockView()
-                                        pin_lock_view.isEnabled = true
-                                    }
-
-                                    override fun onAnimationStart(animation: Animation?) {
-                                        pin_lock_view.isEnabled = false
-                                    }
-
-                                    override fun onAnimationRepeat(animation: Animation?) {
-                                        // Do Nothing
-                                    }
-                                })
-                            })
-                            lastPass = ""
-
-                            Snackbar.make(view!!, R.string.settings_lock_wrong_confirm, Snackbar.LENGTH_LONG).show()
-                        }
-                    }
-                }
-            }
-        }
-    }
-
-    private fun showBiometricPrompt() {
-        val promptInfo = BiometricPrompt.PromptInfo.Builder()
-            .setTitle(getText(R.string.settings_lock_fingerprint_prompt))
-            .setSubtitle(getText(R.string.settings_lock_fingerprint_prompt_subtitle))
-            .setNegativeButtonText(getText(android.R.string.cancel))
-            .setConfirmationRequired(false)
-            .build()
-
-        val biometricPrompt = BiometricPrompt(this, ContextCompat.getMainExecutor(this),
-            object : BiometricPrompt.AuthenticationCallback() {
-                override fun onAuthenticationSucceeded(
-                    result: BiometricPrompt.AuthenticationResult) {
-                    super.onAuthenticationSucceeded(result)
-                    lastUnlocked = System.currentTimeMillis()
-                    setResult(RESULT_OK)
-                    finish()
-                    return
-                }
-            })
-
-        // Displays the "log in" prompt.
-        biometricPrompt.authenticate(promptInfo)
-    }
-
-    override fun onCreate(savedInstanceState: Bundle?) {
-        super.onCreate(savedInstanceState)
-        setContentView(R.layout.activity_lock)
-
-        lockManager = try {
-            LockManager(this)
-        } catch (e: Exception) {
-            AlertDialog.Builder(this).apply {
-                setTitle(R.string.warning)
-                setMessage(R.string.lock_corrupted)
-                setPositiveButton(android.R.string.ok) { _, _ ->
-                    finish()
-                }
-            }.show()
-            return
-        }
-
-        mode = intent.getStringExtra("mode")
-        val force = intent.getBooleanExtra("force", false)
-
-        when(mode) {
-            null -> {
-                if (lockManager.isEmpty()) {
-                    setResult(RESULT_OK)
-                    finish()
-                    return
-                }
-
-                if (System.currentTimeMillis() - lastUnlocked < 5*60*1000 && !force) {
-                    lastUnlocked = System.currentTimeMillis()
-                    setResult(RESULT_OK)
-                    finish()
-                    return
-                }
-
-                if (
-                    Preferences["lock_fingerprint"]
-                    && BiometricManager.from(this).canAuthenticate() == BiometricManager.BIOMETRIC_SUCCESS
-                ) {
-                    lock_fingerprint.apply {
-                        isEnabled = true
-                        setOnClickListener {
-                            showBiometricPrompt()
-                        }
-                    }
-                    showBiometricPrompt()
-                }
-
-                lock_pattern.apply {
-                    isEnabled = lockManager.contains(Lock.Type.PATTERN)
-                    setOnClickListener {
-                        supportFragmentManager.beginTransaction().replace(
-                            R.id.lock_content, patternLockFragment
-                        ).commit()
-                    }
-                }
-                lock_pin.apply {
-                    isEnabled = lockManager.contains(Lock.Type.PIN)
-                    setOnClickListener {
-                        supportFragmentManager.beginTransaction().replace(
-                            R.id.lock_content, pinLockFragment
-                        ).commit()
-                    }
-                }
-                lock_password.isEnabled = false
-
-                when (lockManager.locks!!.first().type) {
-                    Lock.Type.PIN -> {
-
-                        supportFragmentManager.beginTransaction().add(
-                            R.id.lock_content, pinLockFragment
-                        ).commit()
-                    }
-                    Lock.Type.PATTERN -> {
-                        supportFragmentManager.beginTransaction().add(
-                            R.id.lock_content, patternLockFragment
-                        ).commit()
-                    }
-                    else -> return
-                }
-            }
-            "add_lock" -> {
-                lock_pattern.isEnabled = false
-                lock_pin.isEnabled = false
-                lock_fingerprint.isEnabled = false
-                lock_password.isEnabled = false
-
-                when(intent.getStringExtra("type")!!) {
-                    "pattern" -> {
-                        lock_pattern.isEnabled = true
-                        supportFragmentManager.beginTransaction().add(
-                            R.id.lock_content, patternLockFragment
-                        ).commit()
-                    }
-                    "pin" -> {
-                        lock_pin.isEnabled = true
-                        supportFragmentManager.beginTransaction().add(
-                            R.id.lock_content, pinLockFragment
-                        ).commit()
-                    }
-                }
-            }
-        }
-    }
-
-}
--- 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
@@ -1,668 +0,0 @@
-/*
- *     Pupil, Hitomi.la viewer for Android
- *     Copyright (C) 2019  tom5079
- *
- *     This program is free software: you can redistribute it and/or modify
- *     it under the terms of the GNU General Public License as published by
- *     the Free Software Foundation, either version 3 of the License, or
- *     (at your option) any later version.
- *
- *     This program is distributed in the hope that it will be useful,
- *     but WITHOUT ANY WARRANTY; without even the implied warranty of
- *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *     GNU General Public License for more details.
- *
- *     You should have received a copy of the GNU General Public License
- *     along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-package xyz.quaver.pupil.ui
-
-import android.Manifest
-import android.content.ComponentName
-import android.content.Intent
-import android.content.ServiceConnection
-import android.content.pm.PackageManager
-import android.graphics.drawable.Animatable
-import android.graphics.drawable.Drawable
-import android.os.Build
-import android.os.Bundle
-import android.os.IBinder
-import android.view.*
-import android.view.animation.Animation
-import android.view.animation.AnticipateInterpolator
-import android.view.animation.OvershootInterpolator
-import android.view.animation.TranslateAnimation
-import android.widget.Toast
-import androidx.activity.result.contract.ActivityResultContracts
-import androidx.appcompat.app.AlertDialog
-import androidx.core.content.ContextCompat
-import androidx.preference.PreferenceManager
-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.favorites
-import xyz.quaver.pupil.histories
-import xyz.quaver.pupil.services.DownloadService
-import xyz.quaver.pupil.util.Preferences
-import xyz.quaver.pupil.util.camera
-import xyz.quaver.pupil.util.closeCamera
-import xyz.quaver.pupil.util.downloader.Cache
-import xyz.quaver.pupil.util.downloader.DownloadManager
-import xyz.quaver.pupil.util.startCamera
-import java.util.*
-import kotlin.concurrent.schedule
-
-class ReaderActivity : BaseActivity() {
-
-    private var galleryID = 0
-    private var currentPage = 0
-
-    private var isScroll = true
-    private var isFullscreen = false
-    set(value) {
-        field = value
-
-        (reader_recyclerview.adapter as ReaderAdapter).isFullScreen = value
-
-        reader_progressbar.visibility = when {
-            value -> View.VISIBLE
-            else -> View.GONE
-        }
-    }
-
-    private lateinit var cache: Cache
-    var downloader: DownloadService? = null
-    private val conn = object: ServiceConnection {
-        override fun onServiceConnected(name: ComponentName?, service: IBinder?) {
-            downloader = (service as DownloadService.Binder).service
-        }
-
-        override fun onServiceDisconnected(name: ComponentName?) {
-            downloader = null
-        }
-    }
-
-    private val timer = Timer()
-    private val snapHelper = PagerSnapHelper()
-    private var menu: Menu? = null
-
-    private val requestPermissionLauncher = registerForActivityResult(ActivityResultContracts.RequestPermission()) { isGranted ->
-        if (isGranted)
-            toggleCamera()
-        else
-            AlertDialog.Builder(this)
-                .setTitle(R.string.error)
-                .setMessage(R.string.camera_denied)
-                .setPositiveButton(android.R.string.ok) { _, _ ->}
-                .show()
-    }
-
-    enum class Eye {
-        LEFT,
-        RIGHT
-    }
-
-    private var cameraEnabled = false
-    private var eyeType: Eye? = null
-    private var eyeCount: Int = 0
-
-    override fun onCreate(savedInstanceState: Bundle?) {
-        super.onCreate(savedInstanceState)
-        setContentView(R.layout.activity_reader)
-
-        title = getString(R.string.reader_loading)
-        supportActionBar?.setDisplayHomeAsUpEnabled(false)
-
-        handleIntent(intent)
-        cache = Cache.getInstance(this, galleryID)
-        FirebaseCrashlytics.getInstance().setCustomKey("GalleryID", galleryID)
-
-        if (galleryID == 0) {
-            onBackPressed()
-            return
-        }
-
-        if (Preferences["cache_disable"]) {
-            reader_download_progressbar.visibility = View.GONE
-            CoroutineScope(Dispatchers.IO).launch {
-                val reader = cache.getReader()
-
-                launch(Dispatchers.Main) initDownloader@{
-                    if (reader == null) {
-                        Snackbar
-                            .make(reader_layout, R.string.reader_failed_to_find_gallery, Snackbar.LENGTH_INDEFINITE)
-                            .show()
-                        return@initDownloader
-                    }
-
-                    histories.add(galleryID)
-                    (reader_recyclerview.adapter as ReaderAdapter).apply {
-                        this.reader = reader
-                        notifyDataSetChanged()
-                    }
-                    title = reader.galleryInfo.title ?: ""
-                    menu?.findItem(R.id.reader_menu_page_indicator)?.title = "$currentPage/${reader.galleryInfo.files.size}"
-
-                    menu?.findItem(R.id.reader_type)?.icon = ContextCompat.getDrawable(this@ReaderActivity,
-                        when (reader.code) {
-                            Code.HITOMI -> R.drawable.hitomi
-                            Code.HIYOBI -> R.drawable.ic_hiyobi
-                            else -> android.R.color.transparent
-                        })
-                }
-            }
-        } else
-            initDownloader()
-
-        initView()
-    }
-
-    override fun onNewIntent(intent: Intent) {
-        super.onNewIntent(intent)
-        handleIntent(intent)
-    }
-
-    private fun handleIntent(intent: Intent) {
-        if (intent.action == Intent.ACTION_VIEW) {
-            val uri = intent.data
-            val lastPathSegment = uri?.lastPathSegment
-            if (uri != null && lastPathSegment != null) {
-                galleryID = when (uri.host) {
-                    "hitomi.la" ->
-                        Regex("([0-9]+).html").find(lastPathSegment)?.groupValues?.get(1)?.toIntOrNull() ?: 0
-                    "hiyobi.me" -> lastPathSegment.toInt()
-                    "e-hentai.org" -> uri.pathSegments[1].toInt()
-                    else -> 0
-                }
-            }
-        } else {
-            galleryID = intent.getIntExtra("galleryID", 0)
-        }
-    }
-
-    override fun onCreateOptionsMenu(menu: Menu?): Boolean {
-        menuInflater.inflate(R.menu.reader, menu)
-
-        with(menu?.findItem(R.id.reader_menu_favorite)) {
-            this ?: return@with
-
-            if (favorites.contains(galleryID))
-                (icon as Animatable).start()
-        }
-
-        this.menu = menu
-        return true
-    }
-
-    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)
-                with(view.dialog_number_picker) {
-                    minValue = 1
-                    maxValue = cache.metadata.reader?.galleryInfo?.files?.size ?: 0
-                    value = currentPage
-                }
-                val dialog = AlertDialog.Builder(this).apply {
-                    setView(view)
-                }.create()
-                view.dialog_ok.setOnClickListener {
-                    (reader_recyclerview.layoutManager as LinearLayoutManager?)?.scrollToPositionWithOffset(view.dialog_number_picker.value-1, 0)
-                    dialog.dismiss()
-                }
-
-                dialog.show()
-            }
-            R.id.reader_menu_favorite -> {
-                val id = galleryID
-                val favorite = menu?.findItem(R.id.reader_menu_favorite) ?: return true
-
-                if (favorites.contains(id)) {
-                    favorites.remove(id)
-                    favorite.icon = AnimatedVectorDrawableCompat.create(this, R.drawable.avd_star)
-                } else {
-                    favorites.add(id)
-                    (favorite.icon as Animatable).start()
-                }
-            }
-        }
-
-        return true
-    }
-
-    override fun onResume() {
-        super.onResume()
-
-        if (cameraEnabled)
-            startCamera(this, cameraCallback)
-    }
-
-    override fun onPause() {
-        super.onPause()
-        closeCamera()
-    }
-
-    override fun onDestroy() {
-        super.onDestroy()
-
-        timer.cancel()
-        (reader_recyclerview?.adapter as? ReaderAdapter)?.timer?.cancel()
-
-        if (!DownloadManager.getInstance(this).isDownloading(galleryID))
-            DownloadService.cancel(this, galleryID)
-
-        if (downloader != null)
-            unbindService(conn)
-    }
-
-    override fun onBackPressed() {
-        if (isScroll and !isFullscreen)
-            super.onBackPressed()
-
-        if (isFullscreen) {
-            isFullscreen = false
-            fullscreen(false)
-        }
-
-        if (!isScroll) {
-            isScroll = true
-            scrollMode(true)
-        }
-    }
-
-    override fun onKeyDown(keyCode: Int, event: KeyEvent?): Boolean {
-        //currentPage is 1-based
-        return when(keyCode) {
-            KeyEvent.KEYCODE_VOLUME_UP -> {
-                (reader_recyclerview.layoutManager as LinearLayoutManager?)?.scrollToPositionWithOffset(currentPage-2, 0)
-
-                true
-            }
-            KeyEvent.KEYCODE_VOLUME_DOWN -> {
-                (reader_recyclerview.layoutManager as LinearLayoutManager?)?.scrollToPositionWithOffset(currentPage, 0)
-
-                true
-            }
-            else -> super.onKeyDown(keyCode, event)
-        }
-    }
-
-    private fun initDownloader() {
-        DownloadService.download(this, galleryID, true)
-        bindService(Intent(this, DownloadService::class.java), conn, BIND_AUTO_CREATE)
-
-        timer.schedule(1000, 1000) {
-            val downloader = downloader ?: return@schedule
-
-            if (downloader.progress.indexOfKey(galleryID) < 0)  //loading
-                return@schedule
-
-            if (downloader.progress[galleryID] == null) {      //Gallery not found
-                timer.cancel()
-                Snackbar
-                    .make(reader_layout, R.string.reader_failed_to_find_gallery, Snackbar.LENGTH_INDEFINITE)
-                    .show()
-            }
-
-            histories.add(galleryID)
-
-            runOnUiThread {
-                reader_download_progressbar.max = reader_recyclerview.adapter?.itemCount ?: 0
-                reader_download_progressbar.progress = downloader.progress[galleryID]?.count { it.isInfinite() } ?: 0
-                reader_progressbar.max = reader_recyclerview.adapter?.itemCount ?: 0
-
-                if (title == getString(R.string.reader_loading)) {
-                    val reader = cache.metadata.reader
-
-                    if (reader != null) {
-                        with (reader_recyclerview.adapter as ReaderAdapter) {
-                            this.reader = reader
-                            notifyDataSetChanged()
-                        }
-
-                        title = reader.galleryInfo.title
-                        menu?.findItem(R.id.reader_menu_page_indicator)?.title = "$currentPage/${reader.galleryInfo.files.size}"
-
-                        menu?.findItem(R.id.reader_type)?.icon = ContextCompat.getDrawable(this@ReaderActivity,
-                            when (reader.code) {
-                                Code.HITOMI -> R.drawable.hitomi
-                                Code.HIYOBI -> R.drawable.ic_hiyobi
-                                else -> android.R.color.transparent
-                            })
-                    }
-                }
-
-                if (downloader.isCompleted(galleryID)) {   //Download finished
-                    reader_download_progressbar.visibility = View.GONE
-
-                    animateDownloadFAB(false)
-                }
-            }
-        }
-    }
-
-    private fun initView() {
-        with(reader_recyclerview) {
-            adapter = ReaderAdapter(this@ReaderActivity, galleryID).apply {
-                onItemClickListener = {
-                    if (isScroll) {
-                        isScroll = false
-                        isFullscreen = true
-
-                        scrollMode(false)
-                        fullscreen(true)
-                    } else {
-                        (reader_recyclerview.layoutManager as LinearLayoutManager?)?.scrollToPosition(currentPage) //Moves to next page because currentPage is 1-based indexing
-                    }
-                }
-            }
-
-            addOnScrollListener(object: RecyclerView.OnScrollListener() {
-                override fun onScrolled(recyclerView: RecyclerView, dx: Int, dy: Int) {
-                    super.onScrolled(recyclerView, dx, dy)
-
-                    if (dy < 0)
-                        this@ReaderActivity.reader_fab.showMenuButton(true)
-                    else if (dy > 0)
-                        this@ReaderActivity.reader_fab.hideMenuButton(true)
-
-                    val layoutManager = recyclerView.layoutManager as LinearLayoutManager
-
-                    if (layoutManager.findFirstVisibleItemPosition() == -1)
-                        return
-                    currentPage = layoutManager.findFirstVisibleItemPosition()+1
-                    menu?.findItem(R.id.reader_menu_page_indicator)?.title = "$currentPage/${recyclerView.adapter!!.itemCount}"
-                    this@ReaderActivity.reader_progressbar.progress = currentPage
-                }
-            })
-        }
-
-        with(reader_fab_download) {
-            animateDownloadFAB(DownloadManager.getInstance(this@ReaderActivity).getDownloadFolder(galleryID) != null) //If download in progress, animate button
-
-            setOnClickListener {
-                if (PreferenceManager.getDefaultSharedPreferences(context).getBoolean("cache_disable", false))
-                    Toast.makeText(context, R.string.settings_download_when_cache_disable_warning, Toast.LENGTH_SHORT).show()
-                else {
-                    val downloadManager = DownloadManager.getInstance(this@ReaderActivity)
-
-                    if (downloadManager.isDownloading(galleryID)) {
-                        downloadManager.deleteDownloadFolder(galleryID)
-                        animateDownloadFAB(false)
-                    } else {
-                        downloadManager.addDownloadFolder(galleryID)
-                        DownloadService.download(context, galleryID, true)
-                        animateDownloadFAB(true)
-                    }
-                }
-            }
-        }
-
-        with(reader_fab_retry) {
-            setImageResource(R.drawable.refresh)
-            setOnClickListener {
-                DownloadService.download(context, galleryID)
-            }
-        }
-
-        with(reader_fab_auto) {
-            setImageResource(R.drawable.eye_white)
-            setOnClickListener {
-                when {
-                    ContextCompat.checkSelfPermission(context, Manifest.permission.CAMERA) == PackageManager.PERMISSION_GRANTED -> {
-                        toggleCamera()
-                    }
-                    Build.VERSION.SDK_INT >= 23 && shouldShowRequestPermissionRationale(Manifest.permission.CAMERA) -> {
-                        AlertDialog.Builder(this@ReaderActivity)
-                            .setTitle(R.string.warning)
-                            .setMessage(R.string.camera_denied)
-                            .setPositiveButton(android.R.string.ok) { _, _ ->}
-                            .show()
-                    }
-                    else ->
-                        requestPermissionLauncher.launch(Manifest.permission.CAMERA)
-                }
-            }
-        }
-
-        with(reader_fab_fullscreen) {
-            setImageResource(R.drawable.ic_fullscreen)
-            setOnClickListener {
-                isFullscreen = true
-                fullscreen(isFullscreen)
-
-                this@ReaderActivity.reader_fab.close(true)
-            }
-        }
-    }
-
-    private fun fullscreen(isFullscreen: Boolean) {
-        with(window.attributes) {
-            if (isFullscreen) {
-                flags = flags or WindowManager.LayoutParams.FLAG_FULLSCREEN
-                supportActionBar?.hide()
-                this@ReaderActivity.reader_fab.visibility = View.INVISIBLE
-                this@ReaderActivity.scroller.let {
-                    it.handleWidth = resources.getDimensionPixelSize(R.dimen.thumb_height)
-                    it.handleHeight = resources.getDimensionPixelSize(R.dimen.thumb_width)
-                    it.handleDrawable = ContextCompat.getDrawable(this@ReaderActivity, R.drawable.thumb_horizontal)
-                    it.fastScrollDirection = RecyclerViewFastScroller.FastScrollDirection.HORIZONTAL
-                }
-            } else {
-                flags = flags and WindowManager.LayoutParams.FLAG_FULLSCREEN.inv()
-                supportActionBar?.show()
-                this@ReaderActivity.reader_fab.visibility = View.VISIBLE
-                this@ReaderActivity.scroller.let {
-                    it.handleWidth = resources.getDimensionPixelSize(R.dimen.thumb_width)
-                    it.handleHeight = resources.getDimensionPixelSize(R.dimen.thumb_height)
-                    it.handleDrawable = ContextCompat.getDrawable(this@ReaderActivity, R.drawable.thumb)
-                    it.fastScrollDirection = RecyclerViewFastScroller.FastScrollDirection.VERTICAL
-                }
-            }
-
-            window.attributes = this
-        }
-
-        reader_recyclerview.adapter = reader_recyclerview.adapter   // Force to redraw
-    }
-
-    private fun scrollMode(isScroll: Boolean) {
-        if (isScroll) {
-            snapHelper.attachToRecyclerView(null)
-            reader_recyclerview.layoutManager = LinearLayoutManager(this)
-        } else {
-            snapHelper.attachToRecyclerView(reader_recyclerview)
-            reader_recyclerview.layoutManager = LinearLayoutManager(this, LinearLayoutManager.HORIZONTAL, Preferences["rtl", false])
-
-            if (Preferences["rtl", false])
-                with(reader_progressbar) {
-                    scaleX = -1F
-                    translationX = 1F
-                }
-            else
-                with(reader_progressbar) {
-                    scaleX = 0F
-                    translationX = 0F
-                }
-        }
-
-        (reader_recyclerview.layoutManager as LinearLayoutManager).scrollToPositionWithOffset(currentPage-1, 0)
-    }
-
-    private fun animateDownloadFAB(animate: Boolean) {
-        with(reader_fab_download) {
-            if (animate) {
-                val icon = AnimatedVectorDrawableCompat.create(context, R.drawable.ic_downloading)
-
-                icon?.registerAnimationCallback(object : Animatable2Compat.AnimationCallback() {
-                    override fun onAnimationEnd(drawable: Drawable?) {
-                        if (downloader?.isCompleted(galleryID) == true) // If download is finished, stop animating
-                            post {
-                                setImageResource(R.drawable.ic_download)
-                                labelText = getString(R.string.reader_fab_download_cancel)
-                            }
-                        else                                                            // Or continue animate
-                            post {
-                                icon.start()
-                                labelText = getString(R.string.reader_fab_download_cancel)
-                            }
-                    }
-                })
-
-                setImageDrawable(icon)
-                icon?.start()
-            } else {
-                setImageResource(R.drawable.ic_download)
-                labelText = getString(R.string.reader_fab_download)
-            }
-        }
-    }
-
-    val cameraCallback: (List<Face>) -> Unit = callback@{ faces ->
-        eye_card.dot.let {
-            it.visibility = View.VISIBLE
-            CoroutineScope(Dispatchers.Main).launch {
-                delay(50)
-                it.visibility = View.INVISIBLE
-            }
-        }
-
-        if (faces.size != 1)
-            ContextCompat.getDrawable(this, R.drawable.eye_off).let {
-                with(eye_card) {
-                    left_eye.setImageDrawable(it)
-                    right_eye.setImageDrawable(it)
-                }
-
-                return@callback
-            }
-
-        val (left, right) = Pair(
-            faces[0].rightEyeOpenProbability?.let { it > 0.4 } == true,
-            faces[0].leftEyeOpenProbability?.let { it > 0.4 } == true
-        )
-
-        with(eye_card) {
-            left_eye.setImageDrawable(
-                ContextCompat.getDrawable(
-                    context,
-                    if (left) R.drawable.eye else R.drawable.eye_closed
-                )
-            )
-            right_eye.setImageDrawable(
-                ContextCompat.getDrawable(
-                    context,
-                    if (right) R.drawable.eye else R.drawable.eye_closed
-                )
-            )
-        }
-
-        when {
-            // Both closed / opened
-            !left.xor(right) -> {
-                eyeType = null
-                eyeCount = 0
-            }
-            !left -> {
-                if (eyeType != Eye.LEFT) {
-                    eyeType = Eye.LEFT
-                    eyeCount = 0
-                }
-                eyeCount++
-            }
-            !right -> {
-                if (eyeType != Eye.RIGHT) {
-                    eyeType = Eye.RIGHT
-                    eyeCount = 0
-                }
-                eyeCount++
-            }
-        }
-
-        if (eyeCount > 3) {
-            (this@ReaderActivity.reader_recyclerview.layoutManager as LinearLayoutManager).let {
-                it.scrollToPositionWithOffset(when(eyeType!!) {
-                    Eye.RIGHT -> {
-                        if (it.reverseLayout) currentPage - 2 else currentPage
-                    }
-                    Eye.LEFT -> {
-                        if (it.reverseLayout) currentPage else currentPage - 2
-                    }
-                }, 0)
-            }
-
-            eyeType = null
-            eyeCount = 0
-        }
-    }
-
-    private fun toggleCamera() {
-        val eyes = this@ReaderActivity.eye_card
-        when (camera) {
-            null -> {
-                reader_fab_auto.labelText = getString(R.string.reader_fab_auto_cancel)
-                reader_fab_auto.setImageResource(R.drawable.eye_off_white)
-                eyes.apply {
-                    visibility = View.VISIBLE
-                    TranslateAnimation(0F, 0F, -100F, 0F).apply {
-                        duration = 500
-                        fillAfter = false
-                        interpolator = OvershootInterpolator()
-                    }.let { startAnimation(it) }
-                }
-                startCamera(this, cameraCallback)
-                cameraEnabled = true
-            }
-            else -> {
-                reader_fab_auto.labelText = getString(R.string.reader_fab_auto)
-                reader_fab_auto.setImageResource(R.drawable.eye_white)
-                eyes.apply {
-                    TranslateAnimation(0F, 0F, 0F, -100F).apply {
-                        duration = 500
-                        fillAfter = false
-                        interpolator = AnticipateInterpolator()
-                        setAnimationListener(object: Animation.AnimationListener {
-                            override fun onAnimationStart(p0: Animation?) {}
-                            override fun onAnimationRepeat(p0: Animation?) {}
-
-                            override fun onAnimationEnd(p0: Animation?) {
-                                eyes.visibility = View.GONE
-                            }
-                        })
-                    }.let { startAnimation(it) }
-                }
-                closeCamera()
-                cameraEnabled = false
-            }
-        }
-    }
-
-    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
@@ -1,74 +0,0 @@
-/*
- *     Pupil, Hitomi.la viewer for Android
- *     Copyright (C) 2019  tom5079
- *
- *     This program is free software: you can redistribute it and/or modify
- *     it under the terms of the GNU General Public License as published by
- *     the Free Software Foundation, either version 3 of the License, or
- *     (at your option) any later version.
- *
- *     This program is distributed in the hope that it will be useful,
- *     but WITHOUT ANY WARRANTY; without even the implied warranty of
- *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *     GNU General Public License for more details.
- *
- *     You should have received a copy of the GNU General Public License
- *     along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-package xyz.quaver.pupil.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() {
-
-    override fun onCreate(savedInstanceState: Bundle?) {
-        super.onCreate(savedInstanceState)
-        setContentView(R.layout.settings_activity)
-        supportFragmentManager
-            .beginTransaction()
-            .replace(R.id.settings, SettingsFragment())
-            .commit()
-        supportActionBar?.setDisplayHomeAsUpEnabled(true)
-    }
-
-    override fun onOptionsItemSelected(item: MenuItem): Boolean {
-        when (item.itemId) {
-            android.R.id.home -> onBackPressed()
-        }
-
-        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/SourceSelector.kt
+++ b/app/src/main/java/xyz/quaver/pupil/ui/SourceSelector.kt
@@ -0,0 +1,352 @@
+/*
+ *     Pupil, Hitomi.la viewer for Android
+ *     Copyright (C) 2021 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 <https://www.gnu.org/licenses/>.
+ */
+
+package xyz.quaver.pupil.ui
+
+import android.app.Application
+import android.content.Intent
+import android.net.Uri
+import android.provider.Settings
+import androidx.compose.foundation.Image
+import androidx.compose.foundation.layout.*
+import androidx.compose.foundation.lazy.LazyColumn
+import androidx.compose.foundation.lazy.items
+import androidx.compose.material.*
+import androidx.compose.material.icons.Icons
+import androidx.compose.material.icons.filled.Download
+import androidx.compose.material.icons.filled.DownloadDone
+import androidx.compose.material.icons.filled.Explore
+import androidx.compose.material.icons.outlined.Info
+import androidx.compose.runtime.*
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.graphics.vector.ImageVector
+import androidx.compose.ui.platform.LocalContext
+import androidx.compose.ui.text.capitalize
+import androidx.compose.ui.text.intl.Locale
+import androidx.compose.ui.text.style.TextAlign
+import androidx.compose.ui.unit.dp
+import androidx.navigation.NavDestination.Companion.hierarchy
+import androidx.navigation.NavGraph.Companion.findStartDestination
+import androidx.navigation.compose.NavHost
+import androidx.navigation.compose.composable
+import androidx.navigation.compose.currentBackStackEntryAsState
+import androidx.navigation.compose.rememberNavController
+import coil.compose.AsyncImage
+import com.google.accompanist.drawablepainter.rememberDrawablePainter
+import com.google.accompanist.insets.LocalWindowInsets
+import com.google.accompanist.insets.rememberInsetsPaddingValues
+import com.google.accompanist.insets.systemBarsPadding
+import com.google.accompanist.insets.ui.BottomNavigation
+import com.google.accompanist.insets.ui.Scaffold
+import com.google.accompanist.insets.ui.TopAppBar
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.launch
+import kotlinx.coroutines.withContext
+import org.kodein.di.DI
+import org.kodein.di.DIAware
+import org.kodein.di.compose.localDI
+import org.kodein.di.instance
+import xyz.quaver.pupil.sources.SourceEntry
+import xyz.quaver.pupil.sources.rememberLocalSourceList
+import xyz.quaver.pupil.sources.rememberRemoteSourceList
+import xyz.quaver.pupil.util.PupilHttpClient
+import xyz.quaver.pupil.util.RemoteSourceInfo
+import xyz.quaver.pupil.util.launchApkInstaller
+import java.io.File
+
+private sealed class SourceSelectorScreen(val route: String, val icon: ImageVector) {
+    object Local: SourceSelectorScreen("local", Icons.Default.DownloadDone)
+    object Explore: SourceSelectorScreen("explore", Icons.Default.Explore)
+}
+
+private val sourceSelectorScreens = listOf(
+    SourceSelectorScreen.Local,
+    SourceSelectorScreen.Explore
+)
+
+private val RemoteSourceInfo.apkUrl: String
+    get() = "https://github.com/tom5079/PupilSources/releases/download/$name-$version/$projectName-release.apk"
+
+
+class DownloadApkActionState(override val di: DI) : DIAware {
+    private val app: Application by instance()
+    private val client: PupilHttpClient by instance()
+
+    var progress by mutableStateOf<Float?>(null)
+        private set
+
+    suspend fun download(url: String): File? = withContext(Dispatchers.IO) {
+        progress = 0f
+
+        val file = File.createTempFile("pupil", ".apk", File(app.cacheDir, "apks").also {
+            it.mkdirs()
+        })
+
+        client.downloadFile(url, file).collect { progress = it }
+
+        if (progress == Float.POSITIVE_INFINITY) file else null
+    }
+
+    fun reset() {
+        progress = null
+    }
+}
+
+@Composable
+fun rememberDownloadApkActionState(di: DI = localDI()) = remember { DownloadApkActionState(di) }
+
+@Composable
+fun DownloadApkAction(
+    state: DownloadApkActionState,
+    content: @Composable () -> Unit
+) {
+    state.progress?.let { progress ->
+        Box(
+            Modifier.padding(12.dp, 0.dp)
+        ) {
+            when {
+                progress.isFinite() && progress > 0f ->
+                    CircularProgressIndicator(progress, modifier = Modifier.size(24.dp))
+                else ->
+                    CircularProgressIndicator(modifier = Modifier.size(24.dp))
+            }
+        }
+
+        true
+    } ?: content()
+}
+
+@Composable
+fun SourceListItem(icon: @Composable (Modifier) -> Unit = { }, name: String, version: String, actions: @Composable () -> Unit = { }) {
+    Card(
+        modifier = Modifier.padding(8.dp),
+        elevation = 4.dp
+    ) {
+        Row(
+            modifier = Modifier.fillMaxWidth(),
+            verticalAlignment = Alignment.CenterVertically,
+            horizontalArrangement = Arrangement.spacedBy(8.dp)
+        ) {
+            icon(Modifier.size(48.dp))
+
+            Column(
+                Modifier.weight(1f)
+            ) {
+                Text(name.capitalize(Locale.current))
+
+                CompositionLocalProvider(LocalContentAlpha provides 0.5f) {
+                    Text(
+                        "v$version",
+                        style = MaterialTheme.typography.caption
+                    )
+                }
+            }
+
+            actions()
+        }
+    }
+}
+
+@Composable
+fun Local(onSource: (SourceEntry) -> Unit) {
+    val coroutineScope = rememberCoroutineScope()
+    val context = LocalContext.current
+
+    val localSourceList by rememberLocalSourceList()
+    val remoteSourceList by rememberRemoteSourceList()
+
+    if (localSourceList.isEmpty()) {
+        Box(Modifier.fillMaxSize()) {
+            Column(
+                Modifier.align(Alignment.Center),
+                horizontalAlignment = Alignment.CenterHorizontally,
+                verticalArrangement = Arrangement.spacedBy(16.dp)
+            ) {
+                CompositionLocalProvider(LocalContentAlpha provides 0.5f) {
+                    Text("(´∇｀)", style = MaterialTheme.typography.h2)
+                }
+                Text("No sources found!\nLet's go download one.", textAlign = TextAlign.Center)
+            }
+        }
+    } else {
+        LazyColumn {
+            items(localSourceList) { source ->
+                val actionState = rememberDownloadApkActionState()
+
+                SourceListItem(
+                    icon = { modifier ->
+                        Image(
+                            rememberDrawablePainter(source.icon),
+                            contentDescription = "source icon",
+                            modifier = modifier
+                        )
+                    },
+                    source.sourceName,
+                    source.version
+                ) {
+                    DownloadApkAction(actionState) {
+                        val remoteSource = remoteSourceList?.get(source.packageName)
+                        if (remoteSource != null && remoteSource.version != source.version) {
+                            TextButton(onClick = {
+                                coroutineScope.launch {
+                                    val file = actionState.download(remoteSource.apkUrl)!! // TODO("Handle error")
+                                    context.launchApkInstaller(file)
+                                    actionState.reset()
+                                }
+                            }) {
+                                Text("UPDATE")
+                            }
+                        } else {
+                            TextButton(
+                                onClick = { onSource(source) }
+                            ) {
+                                Text("GO")
+                            }
+                        }
+                    }
+                }
+            }
+        }
+    }
+}
+
+@Composable
+fun Explore() {
+    val localSourceList by rememberLocalSourceList()
+    val localSources by derivedStateOf {
+        localSourceList.associateBy {
+            it.packageName
+        }
+    }
+
+    val context = LocalContext.current
+
+    val coroutineScope = rememberCoroutineScope()
+
+    val remoteSources by rememberRemoteSourceList()
+
+    Box(
+        Modifier.fillMaxSize()
+    ) {
+        if (remoteSources == null)
+            CircularProgressIndicator(Modifier.align(Alignment.Center))
+        else
+            LazyColumn {
+                items(remoteSources?.values?.toList().orEmpty()) { sourceInfo ->
+                    val actionState = rememberDownloadApkActionState()
+
+                    SourceListItem(
+                        icon = { modifier ->
+                            AsyncImage(
+                                "https://raw.githubusercontent.com/tom5079/PupilSources/master/${sourceInfo.projectName}/src/main/res/mipmap-xxxhdpi/ic_launcher.png",
+                                contentDescription = "source icon",
+                                modifier = modifier
+                            )
+                        },
+                        sourceInfo.name,
+                        sourceInfo.version
+                    ) {
+                        DownloadApkAction(actionState) {
+                            if (localSources[sourceInfo.name]?.version != sourceInfo.version) {
+                                TextButton(onClick = {
+                                    coroutineScope.launch {
+                                        val file = actionState.download(sourceInfo.apkUrl)!! // TODO("Handle exception")
+                                        context.launchApkInstaller(file)
+                                        actionState.reset()
+                                    }
+                                }) {
+                                    Text("UPDATE")
+                                }
+                            } else {
+                                IconButton(onClick = {
+                                    if (sourceInfo.name in localSources) {
+                                        context.startActivity(
+                                            Intent(
+                                                Settings.ACTION_APPLICATION_DETAILS_SETTINGS,
+                                                Uri.fromParts("package", localSources[sourceInfo.name]!!.packagePath, null)
+                                            )
+                                        )
+                                    } else coroutineScope.launch {
+                                        val file = actionState.download(sourceInfo.apkUrl)!! // TODO("Handle exception")
+                                        context.launchApkInstaller(file)
+                                        actionState.reset()
+                                    }
+                                }) {
+                                    Icon(
+                                        if (sourceInfo.name !in localSources) Icons.Default.Download
+                                        else                                  Icons.Outlined.Info,
+                                        contentDescription = "download"
+                                    )
+                                }
+                            }
+                        }
+                    }
+                }
+            }
+    }
+}
+
+@Composable
+fun SourceSelector(onSource: (SourceEntry) -> Unit) {
+    val bottomNavController = rememberNavController()
+
+    Scaffold(
+        topBar = {
+            TopAppBar(
+                title = {
+                    Text("Pupil")
+                },
+                contentPadding = rememberInsetsPaddingValues(LocalWindowInsets.current.statusBars)
+            )
+        },
+        bottomBar = {
+            BottomNavigation(
+                contentPadding = rememberInsetsPaddingValues(LocalWindowInsets.current.navigationBars)
+            ) {
+                val navBackStackEntry by bottomNavController.currentBackStackEntryAsState()
+                val currentDestination = navBackStackEntry?.destination
+
+                sourceSelectorScreens.forEach { screen ->
+                    BottomNavigationItem(
+                        icon = { Icon(screen.icon, contentDescription = screen.route) },
+                        label = { Text(screen.route) },
+                        selected = currentDestination?.hierarchy?.any { it.route == screen.route } == true,
+                        onClick = {
+                            bottomNavController.navigate(screen.route) {
+                                popUpTo(bottomNavController.graph.findStartDestination().id) {
+                                    saveState = true
+                                }
+                                launchSingleTop = true
+                                restoreState = true
+                            }
+                        }
+                    )
+                }
+            }
+        }
+    ) { contentPadding ->
+        NavHost(bottomNavController, startDestination = "local", modifier = Modifier
+            .systemBarsPadding(top = false, bottom = false)
+            .padding(contentPadding)) {
+            composable(SourceSelectorScreen.Local.route) { Local(onSource) }
+            composable(SourceSelectorScreen.Explore.route) { Explore() }
+        }
+    }
+
+}
--- a/app/src/main/java/xyz/quaver/pupil/ui/UpdateDialog.kt
+++ b/app/src/main/java/xyz/quaver/pupil/ui/UpdateDialog.kt
@@ -0,0 +1,95 @@
+/*
+ *     Pupil, Hitomi.la viewer for Android
+ *     Copyright (C) 2022  tom5079
+ *
+ *     This program is free software: you can redistribute it and/or modify
+ *     it under the terms of the GNU General Public License as published by
+ *     the Free Software Foundation, either version 3 of the License, or
+ *     (at your option) any later version.
+ *
+ *     This program is distributed in the hope that it will be useful,
+ *     but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *     GNU General Public License for more details.
+ *
+ *     You should have received a copy of the GNU General Public License
+ *     along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package xyz.quaver.pupil.ui
+
+import androidx.compose.foundation.layout.*
+import androidx.compose.material.*
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.rememberCoroutineScope
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.platform.LocalContext
+import androidx.compose.ui.unit.dp
+import androidx.compose.ui.window.Dialog
+import kotlinx.coroutines.launch
+import org.kodein.di.compose.onDIContext
+import xyz.quaver.pupil.util.Release
+import xyz.quaver.pupil.util.launchApkInstaller
+import java.util.*
+
+@Composable
+fun UpdateAlertDialog(
+    show: Boolean,
+    release: Release,
+    onDismiss: () -> Unit
+) {
+    val state = rememberDownloadApkActionState()
+
+    val coroutineScope = rememberCoroutineScope()
+    val context = LocalContext.current
+
+    if (show) {
+        Dialog(onDismissRequest = { if (state.progress == null) onDismiss() }) {
+            Card {
+                val progress = state.progress
+
+                if (progress != null) {
+                    if (progress.isFinite() && progress > 0)
+                        LinearProgressIndicator(progress)
+                    else
+                        LinearProgressIndicator()
+                }
+
+                Column(
+                    Modifier.padding(start = 8.dp, top = 8.dp, end = 8.dp, bottom = 0.dp),
+                    verticalArrangement = Arrangement.spacedBy(8.dp)
+                ) {
+                    Text(
+                        "Update Available",
+                        style = MaterialTheme.typography.h6
+                    )
+
+                    Text(release.releaseNotes.getOrElse(Locale.getDefault()) { release.releaseNotes[Locale.ENGLISH]!! })
+
+                    Row(
+                        Modifier.fillMaxWidth(),
+                        horizontalArrangement = Arrangement.End
+                    ) {
+                        TextButton(onClick = onDismiss, enabled = progress == null) {
+                            Text("DISMISS")
+                        }
+
+                        TextButton(
+                            onClick = {
+                                coroutineScope.launch {
+                                    val file = state.download(release.apkUrl)!! // TODO("Handle exception")
+                                    context.launchApkInstaller(file)
+                                    state.reset()
+                                    onDismiss()
+                                }
+                            },
+                            enabled = progress == null
+                        ) {
+                            Text("UPDATE")
+                        }
+                    }
+                }
+            }
+        }
+    }
+}
--- a/app/src/main/java/xyz/quaver/pupil/ui/dialog/DefaultQueryDialog.kt
+++ b/app/src/main/java/xyz/quaver/pupil/ui/dialog/DefaultQueryDialog.kt
@@ -1,165 +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.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 kotlinx.android.synthetic.main.dialog_default_query.view.*
-import xyz.quaver.pupil.R
-import xyz.quaver.pupil.types.Tags
-import xyz.quaver.pupil.util.Preferences
-
-class DefaultQueryDialog(context : Context) : AlertDialog(context) {
-
-    private val languages = context.resources.getStringArray(R.array.languages).map {
-        it.split("|").let { split ->
-            Pair(split[0], split[1])
-        }
-    }.toMap()
-    private val reverseLanguages = languages.entries.associate { (k, v) -> v to k }
-
-    private val excludeBL = "-male:yaoi"
-    private val excludeGuro = listOf("-female:guro", "-male:guro")
-    private val excludeLoli = listOf("-female:loli", "-male:shota")
-
-    var onPositiveButtonClickListener : ((Tags) -> (Unit))? = null
-
-    @SuppressLint("InflateParams")
-    override fun onCreate(savedInstanceState: Bundle?) {
-        setTitle(R.string.default_query_dialog_title)
-        setView(build())
-        setButton(Dialog.BUTTON_POSITIVE, context.getString(android.R.string.ok)) { _, _ ->
-            val newTags = Tags.parse(default_query_dialog_edittext.text.toString())
-
-            with(default_query_dialog_language_selector) {
-                if (selectedItemPosition != 0)
-                    newTags.add("language:${reverseLanguages[selectedItem]}")
-            }
-
-            if (default_query_dialog_BL_checkbox.isChecked)
-                newTags.add(excludeBL)
-
-            if (default_query_dialog_guro_checkbox.isChecked)
-                excludeGuro.forEach { tag ->
-                    newTags.add(tag)
-                }
-
-            if (default_query_dialog_loli_checkbox.isChecked)
-                excludeLoli.forEach { tag ->
-                    newTags.add(tag)
-                }
-
-            onPositiveButtonClickListener?.invoke(newTags)
-        }
-
-        super.onCreate(savedInstanceState)
-    }
-
-    @SuppressLint("InflateParams")
-    private fun build() : View {
-        val tags = Tags.parse(
-            Preferences["default_query"]
-        )
-
-        val view = LayoutInflater.from(context).inflate(R.layout.dialog_default_query, null)
-
-        with(view.default_query_dialog_language_selector) {
-            adapter =
-                ArrayAdapter(
-                    context,
-                    android.R.layout.simple_spinner_dropdown_item,
-                    arrayListOf(
-                        context.getString(R.string.default_query_dialog_language_selector_none)
-                    ).apply {
-                        addAll(languages.values)
-                    }
-                )
-            if (tags.any { it.area == "language" && !it.isNegative }) {
-                val tag = languages[tags.first { it.area == "language" }.tag]
-                if (tag != null) {
-                    setSelection(
-                        @Suppress("UNCHECKED_CAST")
-                        (adapter as ArrayAdapter<String>).getPosition(tag)
-                    )
-                    tags.removeByArea("language", false)
-                }
-            }
-        }
-
-        with(view.default_query_dialog_BL_checkbox) {
-            isChecked = tags.contains(excludeBL)
-            if (tags.contains(excludeBL))
-                tags.remove(excludeBL)
-        }
-
-        with(view.default_query_dialog_guro_checkbox) {
-            isChecked = excludeGuro.all { tags.contains(it) }
-            if (excludeGuro.all { tags.contains(it) })
-                excludeGuro.forEach {
-                    tags.remove(it)
-                }
-        }
-
-        with(view.default_query_dialog_loli_checkbox) {
-            isChecked = excludeLoli.all { tags.contains(it) }
-            if (excludeLoli.all { tags.contains(it) })
-                excludeLoli.forEach {
-                    tags.remove(it)
-                }
-        }
-
-        with(view.default_query_dialog_edittext) {
-            setText(tags.toString(), android.widget.TextView.BufferType.EDITABLE)
-            addTextChangedListener(object : TextWatcher {
-                override fun beforeTextChanged(
-                    s: CharSequence?,
-                    start: Int,
-                    count: Int,
-                    after: Int
-                ) {
-                }
-
-                override fun onTextChanged(s: CharSequence?, start: Int, before: Int, count: Int) {}
-
-                override fun afterTextChanged(s: Editable?) {
-                    s ?: return
-
-                    if (s.any { it.isUpperCase() })
-                        s.replace(
-                            0,
-                            s.length,
-                            s.toString().toLowerCase(java.util.Locale.getDefault())
-                        )
-                }
-            })
-        }
-
-        return view
-    }
-
-}
--- a/app/src/main/java/xyz/quaver/pupil/ui/dialog/DownloadFolderNameDialogFragment.kt
+++ b/app/src/main/java/xyz/quaver/pupil/ui/dialog/DownloadFolderNameDialogFragment.kt
@@ -1,74 +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.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.runBlocking
-import xyz.quaver.pupil.R
-import xyz.quaver.pupil.util.Preferences
-import xyz.quaver.pupil.util.downloader.Cache
-import xyz.quaver.pupil.util.formatDownloadFolder
-import xyz.quaver.pupil.util.formatDownloadFolderTest
-import xyz.quaver.pupil.util.formatMap
-
-class DownloadFolderNameDialogFragment : DialogFragment() {
-
-    @SuppressLint("InflateParams")
-    private fun build(): View {
-        val galleryID = Cache.instances.let { if (it.size() == 0) 1199708 else it.keyAt((0 until it.size()).random()) }
-        val galleryBlock = runBlocking {
-            Cache.getInstance(requireContext(), galleryID).getGalleryBlock()
-        }
-
-        return layoutInflater.inflate(R.layout.dialog_download_folder_name, null).apply {
-            message.text = getString(R.string.settings_download_folder_name_message, formatMap.keys.toString(), galleryBlock?.formatDownloadFolder() ?: "")
-            edittext.setText(Preferences["download_folder_name", "[-id-] -title-"])
-            edittext.addTextChangedListener {
-                message.text = getString(R.string.settings_download_folder_name_message, formatMap.keys.toString(), galleryBlock?.formatDownloadFolderTest(it.toString()) ?: "")
-            }
-            ok_button.setOnClickListener {
-                val newValue = edittext.text.toString()
-
-                if ((newValue as? String)?.contains("/") != false) {
-                    Snackbar.make(this, R.string.settings_invalid_download_folder_name, Snackbar.LENGTH_SHORT).show()
-                    return@setOnClickListener
-                }
-
-                Preferences["download_folder_name"] = edittext.text.toString()
-
-                dismiss()
-            }
-        }
-    }
-
-    override fun onCreateDialog(savedInstanceState: Bundle?): Dialog =
-       Dialog(requireContext()).apply {
-           setContentView(build())
-           window?.attributes?.width = ViewGroup.LayoutParams.MATCH_PARENT
-       }
-
-}
--- a/app/src/main/java/xyz/quaver/pupil/ui/dialog/DownloadLocationDialogFragment.kt
+++ b/app/src/main/java/xyz/quaver/pupil/ui/dialog/DownloadLocationDialogFragment.kt
@@ -1,196 +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.Activity
-import android.app.Dialog
-import android.content.Intent
-import android.os.Build
-import android.os.Bundle
-import android.view.View
-import android.widget.LinearLayout
-import androidx.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.pupil.R
-import xyz.quaver.pupil.util.Preferences
-import xyz.quaver.pupil.util.byteToString
-import xyz.quaver.pupil.util.downloader.DownloadManager
-import xyz.quaver.pupil.util.migrate
-import xyz.quaver.pupil.util.normalizeID
-import java.io.File
-
-class DownloadLocationDialogFragment : DialogFragment() {
-    private val entries = mutableMapOf<File?, View>()
-
-    @SuppressLint("InflateParams")
-    private fun build() : View? {
-        val context = context ?: return null
-
-        val view = layoutInflater.inflate(R.layout.dialog_download_folder, null) as LinearLayout
-
-        val externalFilesDirs = ContextCompat.getExternalFilesDirs(context, null)
-
-        externalFilesDirs.forEachIndexed { index, dir ->
-            dir ?: return@forEachIndexed
-
-            view.addView(layoutInflater.inflate(R.layout.item_download_folder, view, false).apply {
-                location_type.text = context.getString(when (index) {
-                    0 -> R.string.settings_download_folder_internal
-                    else -> R.string.settings_download_folder_removable
-                })
-                location_available.text = context.getString(
-                    R.string.settings_download_folder_available,
-                    byteToString(dir.freeSpace)
-                )
-                setOnClickListener {
-                    entries.values.forEach {
-                        it.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 {
-            location_type.text = context.getString(R.string.settings_download_folder_custom)
-            setOnClickListener {
-                entries.values.forEach {
-                    it.button.isChecked = false
-                }
-                button.performClick()
-
-                if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
-                    val intent = Intent(Intent.ACTION_OPEN_DOCUMENT_TREE).apply {
-                        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())
-                }
-            }
-            entries[null] = this
-        })
-
-        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
-
-        return view
-    }
-
-    override fun onCreateDialog(savedInstanceState: Bundle?): Dialog {
-        val builder = AlertDialog.Builder(requireContext())
-
-        builder
-            .setTitle(R.string.settings_download_folder)
-            .setView(build())
-            .setPositiveButton(requireContext().getText(android.R.string.ok)) { _, _ ->
-                if (Preferences["download_folder", ""].isEmpty())
-                    Preferences["download_folder"] = context?.getExternalFilesDir(null)?.toUri()?.toString() ?: ""
-
-                DownloadManager.getInstance(requireContext()).migrate()
-            }
-
-        isCancelable = false
-
-        return builder.create()
-    }
-
-    override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?) {
-        when (requestCode) {
-            R.id.request_download_folder.normalizeID() -> {
-                if (resultCode == Activity.RESULT_OK) {
-                    val activity = activity ?: return
-                    val context = context ?: return
-                    val dialog = dialog ?: return
-
-                    data?.data?.also { uri ->
-                        val takeFlags: Int =
-                            activity.intent.flags and
-                                    (Intent.FLAG_GRANT_READ_URI_PERMISSION or Intent.FLAG_GRANT_WRITE_URI_PERMISSION)
-
-                        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.KITKAT)
-                            context.contentResolver.takePersistableUriPermission(uri, takeFlags)
-
-                        if (kotlin.runCatching { FileX(context, uri).canWrite() }.getOrDefault(false))
-                            Preferences["download_folder"] = uri.toString()
-                        else {
-                            Snackbar.make(
-                                dialog.window!!.decorView.rootView,
-                                R.string.settings_download_folder_not_writable,
-                                Snackbar.LENGTH_LONG
-                            ).show()
-
-                            val downloadFolder = DownloadManager.getInstance(context).downloadFolder.canonicalPath
-                            val key = entries.keys.firstOrNull { it?.canonicalPath == downloadFolder }
-                            entries[key]!!.button.isChecked = true
-                            if (key == null) entries[key]!!.location_available.text = downloadFolder
-                        }
-                    }
-                }
-            }
-            R.id.request_download_folder_old.normalizeID() -> {
-                val context = context ?: return
-                val dialog = dialog ?: return
-
-                if (resultCode == DirectoryChooserActivity.RESULT_CODE_DIR_SELECTED) {
-                    val directory = data?.getStringExtra(DirectoryChooserActivity.RESULT_SELECTED_DIR)!!
-
-                    if (!File(directory).canWrite()) {
-                        Snackbar.make(
-                            dialog.window!!.decorView.rootView,
-                            R.string.settings_download_folder_not_writable,
-                            Snackbar.LENGTH_LONG
-                        ).show()
-
-                        val downloadFolder = DownloadManager.getInstance(context).downloadFolder.canonicalPath
-                        val key = entries.keys.firstOrNull { it?.canonicalPath == downloadFolder }
-                        entries[key]!!.button.isChecked = true
-                        if (key == null) entries[key]!!.location_available.text = downloadFolder
-                    }
-                    else
-                        Preferences["download_folder"] = File(directory).toURI().toString()
-                }
-            }
-            else -> super.onActivityResult(requestCode, resultCode, data)
-        }
-    }
-
-}
--- a/app/src/main/java/xyz/quaver/pupil/ui/dialog/GalleryDialog.kt
+++ b/app/src/main/java/xyz/quaver/pupil/ui/dialog/GalleryDialog.kt
@@ -1,262 +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.content.Context
-import android.content.Intent
-import android.os.Bundle
-import android.view.LayoutInflater
-import android.view.View
-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.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.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
-
-class GalleryDialog(context: Context, private val glide: RequestManager, private val galleryID: Int) : AlertDialog(context) {
-
-    val onChipClickedHandler = ArrayList<((Tag) -> (Unit))>()
-
-    override fun onCreate(savedInstanceState: Bundle?) {
-        super.onCreate(savedInstanceState)
-        setContentView(R.layout.dialog_gallery)
-
-        window?.attributes.apply {
-            this ?: return@apply
-
-            width = LayoutParams.MATCH_PARENT
-            height = LayoutParams.MATCH_PARENT
-        }
-
-        with(gallery_fab) {
-            setImageDrawable(ContextCompat.getDrawable(context, R.drawable.arrow_right))
-            setOnClickListener {
-                context.startActivity(Intent(context, ReaderActivity::class.java).apply {
-                    putExtra("galleryID", galleryID)
-                })
-                histories.add(galleryID)
-            }
-        }
-
-        CoroutineScope(Dispatchers.IO).launch {
-            try {
-                val gallery = getGallery(galleryID)
-
-                gallery_cover.post {
-                    gallery_progressbar.visibility = View.GONE
-                    gallery_title.text = gallery.title
-                    gallery_artist.text = gallery.artists.joinToString(", ") { it.wordCapitalize() }
-
-                    with(gallery_type) {
-                        text = gallery.type.wordCapitalize()
-                        setOnClickListener {
-                            gallery.type.let {
-                                when (it) {
-                                    "artist CG" -> "artistcg"
-                                    "game CG" -> "gamecg"
-                                    else -> it
-                                }
-                            }.let {
-                                onChipClickedHandler.forEach { handler ->
-                                    handler.invoke(Tag("type", it))
-                                }
-                            }
-                        }
-                    }
-
-                    glide
-                        .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()
-            }
-        }
-    }
-
-    private fun addDetails(gallery: Gallery) {
-        val inflater = LayoutInflater.from(context)
-
-        inflater.inflate(R.layout.dialog_gallery_details, gallery_contents, false).apply {
-            gallery_details.setText(R.string.gallery_details)
-
-            listOf(
-                R.string.gallery_artists,
-                R.string.gallery_groups,
-                R.string.gallery_language,
-                R.string.gallery_series,
-                R.string.gallery_characters,
-                R.string.gallery_tags
-            ).zip(
-                listOf(
-                    gallery.artists.map { Tag("artist", it) },
-                    gallery.groups.map { Tag("group", it) },
-                    listOf(gallery.language).map { Tag("language", it) },
-                    gallery.series.map { Tag("series", it) },
-                    gallery.characters.map { Tag("character", it) },
-                    gallery.tags.map {
-                        Tag.parse(it).let { tag ->
-                            when {
-                                tag.area != null -> tag
-                                else -> Tag("tag", it)
-                            }
-                        }
-                    }
-                )
-            ).filter {
-                (_, content) -> content.isNotEmpty()
-            }.forEach { (title, content) ->
-                inflater.inflate(R.layout.item_gallery_details, gallery_details_contents, false).apply {
-                    gallery_details_type.setText(title)
-
-                    content.forEach { tag ->
-                        gallery_details_tags.addView(
-                            TagChip(context, tag).apply {
-                                setOnClickListener {
-                                    onChipClickedHandler.forEach { handler ->
-                                        handler.invoke(tag)
-                                    }
-                                }
-                            }
-                        )
-                    }
-                }.let {
-                    gallery_details_contents.addView(it)
-                }
-            }
-        }.let {
-            gallery_contents.addView(it)
-        }
-    }
-
-    private fun addThumbnails(gallery: Gallery) {
-        val inflater = LayoutInflater.from(context)
-
-        inflater.inflate(R.layout.dialog_gallery_details, gallery_contents, false).apply {
-            gallery_details.setText(R.string.gallery_thumbnails)
-
-            val pager = ViewPager2(context).apply {
-                adapter = ThumbnailPageAdapter(glide, gallery.thumbnails)
-            }
-
-            gallery_details_contents.addView(
-                pager,
-                LayoutParams(LayoutParams.MATCH_PARENT, LayoutParams.WRAP_CONTENT)
-            )
-
-            LayoutInflater.from(context).inflate(R.layout.dialog_gallery_dotindicator, gallery_details_contents)
-
-            gallery_dotindicator.setViewPager2(pager)
-        }.let {
-            gallery_contents.addView(it)
-        }
-    }
-
-    private fun addRelated(gallery: Gallery) {
-        val inflater = LayoutInflater.from(context)
-        val galleries = ArrayList<Int>()
-
-        val adapter = GalleryBlockAdapter(glide, galleries).apply {
-            onChipClickedHandler.add { tag ->
-                this@GalleryDialog.onChipClickedHandler.forEach { handler ->
-                    handler.invoke(tag)
-                }
-            }
-        }
-
-        inflater.inflate(R.layout.dialog_gallery_details, gallery_contents, false).apply {
-            gallery_details.setText(R.string.gallery_related)
-
-            RecyclerView(context).apply {
-                layoutManager = LinearLayoutManager(context)
-                this.adapter = adapter
-
-                ItemClickSupport.addTo(this).apply {
-                    onItemClickListener = { _, position, _ ->
-                        context.startActivity(Intent(context, ReaderActivity::class.java).apply {
-                            putExtra("galleryID", galleries[position])
-                        })
-                        histories.add(galleries[position])
-                    }
-                    onItemLongClickListener = { _, position, _ ->
-                        GalleryDialog(
-                            context,
-                            glide,
-                            galleries[position]
-                        ).apply {
-                            onChipClickedHandler.add { tag ->
-                                this@GalleryDialog.onChipClickedHandler.forEach { it.invoke(tag) }
-                            }
-                        }.show()
-
-                        true
-                    }
-                }
-            }.let {
-                gallery_details_contents.addView(it, LayoutParams(LayoutParams.MATCH_PARENT, LayoutParams.WRAP_CONTENT))
-            }
-        }.let {
-            gallery_contents.addView(it)
-        }
-
-        CoroutineScope(Dispatchers.IO).launch {
-            gallery.related.forEach { galleryID ->
-                Cache.getInstance(context, galleryID).getGalleryBlock()?.let {
-                    galleries.add(galleryID)
-                }
-            }
-
-            withContext(Dispatchers.Main) {
-                adapter.notifyDataSetChanged()
-            }
-        }
-    }
-
-}
--- a/app/src/main/java/xyz/quaver/pupil/ui/dialog/MirrorDialog.kt
+++ b/app/src/main/java/xyz/quaver/pupil/ui/dialog/MirrorDialog.kt
@@ -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/ProxyDialog.kt
+++ b/app/src/main/java/xyz/quaver/pupil/ui/dialog/ProxyDialog.kt
@@ -1,134 +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.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 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.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) {
-
-    override fun onCreate(savedInstanceState: Bundle?) {
-        setContentView(build())
-        window?.attributes?.width = ViewGroup.LayoutParams.MATCH_PARENT
-
-        super.onCreate(savedInstanceState)
-    }
-
-    @SuppressLint("InflateParams")
-    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
-            view?.proxy_port?.isEnabled = enable
-            view?.proxy_username?.isEnabled = enable
-            view?.proxy_password?.isEnabled = enable
-
-            if (!enable) {
-                view?.proxy_addr?.text = null
-                view?.proxy_port?.text = null
-                view?.proxy_username?.text = null
-                view?.proxy_password?.text = null
-            }
-        }
-
-        with(view.proxy_type_selector) {
-            adapter = ArrayAdapter(
-                context,
-                android.R.layout.simple_spinner_dropdown_item,
-                context.resources.getStringArray(R.array.proxy_type)
-            )
-
-            setSelection(proxyInfo.type.ordinal)
-
-            onItemSelectedListener = object: AdapterView.OnItemSelectedListener {
-                override fun onItemSelected(parent: AdapterView<*>?, view: View?, position: Int, id: Long) {
-                    enabler.invoke(position != 0)
-                }
-
-                override fun onNothingSelected(parent: AdapterView<*>?) {}
-            }
-        }
-
-        view.proxy_addr.setText(proxyInfo.host)
-        view.proxy_port.setText(proxyInfo.port?.toString())
-        view.proxy_username.setText(proxyInfo.username)
-        view.proxy_password.setText(proxyInfo.password)
-
-        enabler.invoke(proxyInfo.type != Proxy.Type.DIRECT)
-
-        view.proxy_cancel.setOnClickListener {
-            dismiss()
-        }
-
-        view.proxy_ok.setOnClickListener {
-            val type = Proxy.Type.values()[view.proxy_type_selector.selectedItemPosition]
-            val addr = view.proxy_addr.text?.toString()
-            val port = view.proxy_port.text?.toString()?.toIntOrNull()
-            val username = view.proxy_username.text?.toString()
-            val password = view.proxy_password.text?.toString()
-
-            if (type != Proxy.Type.DIRECT) {
-                if (addr == null || addr.isEmpty())
-                    view.proxy_addr.error = context.getText(R.string.proxy_dialog_error)
-                if (port == null)
-                    view.proxy_port.error = context.getText(R.string.proxy_dialog_error)
-
-                if (addr == null || addr.isEmpty() || port == null)
-                    return@setOnClickListener
-            }
-
-            ProxyInfo(type, addr, port, username, password).let {
-                Preferences["proxy"] = Json.encodeToString(it)
-
-                clientBuilder
-                    .proxyInfo(it)
-                clientHolder = null
-                client
-            }
-
-            dismiss()
-        }
-
-        return view
-    }
-
-}
--- a/app/src/main/java/xyz/quaver/pupil/ui/fragment/LockSettingsFragment.kt
+++ b/app/src/main/java/xyz/quaver/pupil/ui/fragment/LockSettingsFragment.kt
@@ -1,146 +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.fragment
-
-import android.content.Intent
-import android.os.Bundle
-import android.widget.Toast
-import androidx.appcompat.app.AlertDialog
-import androidx.preference.Preference
-import androidx.preference.PreferenceFragmentCompat
-import androidx.preference.SwitchPreferenceCompat
-import xyz.quaver.pupil.R
-import xyz.quaver.pupil.ui.LockActivity
-import xyz.quaver.pupil.util.Lock
-import xyz.quaver.pupil.util.LockManager
-import xyz.quaver.pupil.util.Preferences
-
-class LockSettingsFragment : PreferenceFragmentCompat() {
-
-    override fun onResume() {
-        super.onResume()
-
-        val lockManager = LockManager(requireContext())
-
-        findPreference<Preference>("lock_pattern")?.summary =
-            if (lockManager.contains(Lock.Type.PATTERN))
-                getString(R.string.settings_lock_enabled)
-            else
-                ""
-
-        findPreference<Preference>("lock_pin")?.summary =
-            if (lockManager.contains(Lock.Type.PIN))
-                getString(R.string.settings_lock_enabled)
-            else
-                ""
-
-        if (lockManager.isEmpty()) {
-            (findPreference<Preference>("lock_fingerprint") as SwitchPreferenceCompat).isChecked = false
-
-            Preferences["lock_fingerprint"] = false
-        }
-    }
-
-    override fun onCreatePreferences(savedInstanceState: Bundle?, rootKey: String?) {
-        setPreferencesFromResource(R.xml.lock_preferences, rootKey)
-
-        with(findPreference<Preference>("lock_pattern")) {
-            this!!
-
-            if (LockManager(requireContext()).contains(Lock.Type.PATTERN))
-                summary = getString(R.string.settings_lock_enabled)
-
-            onPreferenceClickListener = Preference.OnPreferenceClickListener {
-                val lockManager = LockManager(requireContext())
-
-                if (lockManager.contains(Lock.Type.PATTERN)) {
-                    AlertDialog.Builder(requireContext()).apply {
-                        setTitle(R.string.warning)
-                        setMessage(R.string.settings_lock_remove_message)
-
-                        setPositiveButton(android.R.string.ok) { _, _ ->
-                            lockManager.remove(Lock.Type.PATTERN)
-                            onResume()
-                        }
-                        setNegativeButton(android.R.string.cancel) { _, _ -> }
-                    }.show()
-                } else {
-                    val intent = Intent(requireContext(), LockActivity::class.java).apply {
-                        putExtra("mode", "add_lock")
-                        putExtra("type", "pattern")
-                    }
-
-                    startActivity(intent)
-                }
-
-                true
-            }
-        }
-
-        with(findPreference<Preference>("lock_pin")) {
-            this!!
-
-            if (LockManager(requireContext()).contains(Lock.Type.PIN))
-                summary = getString(R.string.settings_lock_enabled)
-
-            onPreferenceClickListener = Preference.OnPreferenceClickListener {
-                val lockManager = LockManager(requireContext())
-
-                if (lockManager.contains(Lock.Type.PIN)) {
-                    AlertDialog.Builder(requireContext()).apply {
-                        setTitle(R.string.warning)
-                        setMessage(R.string.settings_lock_remove_message)
-
-                        setPositiveButton(android.R.string.ok) { _, _ ->
-                            lockManager.remove(Lock.Type.PIN)
-                            onResume()
-                        }
-                        setNegativeButton(android.R.string.cancel) { _, _ -> }
-                    }.show()
-                } else {
-                    val intent = Intent(requireContext(), LockActivity::class.java).apply {
-                        putExtra("mode", "add_lock")
-                        putExtra("type", "pin")
-                    }
-
-                    startActivity(intent)
-                }
-
-                true
-            }
-        }
-
-        with(findPreference<Preference>("lock_fingerprint")) {
-            this!!
-
-            setOnPreferenceChangeListener { _, newValue ->
-                this as SwitchPreferenceCompat
-
-                if (newValue == true && LockManager(requireContext()).isEmpty()) {
-                    isChecked = false
-
-                    Toast.makeText(requireContext(), R.string.settings_lock_fingerprint_without_lock, Toast.LENGTH_SHORT).show()
-                } else
-                    isChecked = newValue as Boolean
-
-                false
-            }
-        }
-    }
-}
--- a/app/src/main/java/xyz/quaver/pupil/ui/fragment/ManageFavoritesFragment.kt
+++ b/app/src/main/java/xyz/quaver/pupil/ui/fragment/ManageFavoritesFragment.kt
@@ -1,106 +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.fragment
-
-import android.content.Intent
-import android.os.Bundle
-import android.widget.EditText
-import android.widget.TextView
-import androidx.appcompat.app.AlertDialog
-import androidx.core.content.ContextCompat
-import androidx.preference.Preference
-import androidx.preference.PreferenceFragmentCompat
-import com.google.android.material.snackbar.Snackbar
-import okhttp3.*
-import xyz.quaver.pupil.R
-import xyz.quaver.pupil.client
-import xyz.quaver.pupil.favorites
-import xyz.quaver.pupil.util.restore
-import java.io.File
-import java.io.IOException
-
-class ManageFavoritesFragment : PreferenceFragmentCompat() {
-
-    override fun onCreatePreferences(savedInstanceState: Bundle?, rootKey: String?) {
-        setPreferencesFromResource(R.xml.manage_favorites_preferences, rootKey)
-
-        initPreferences()
-    }
-
-    private fun initPreferences() {
-        val context = context ?: return
-
-        findPreference<Preference>("backup")?.setOnPreferenceClickListener {
-            val request = Request.Builder()
-                .url(context.getString(R.string.backup_url))
-                .post(
-                    FormBody.Builder()
-                        .add("f:1", File(ContextCompat.getDataDir(context), "favorites.json").readText())
-                        .build()
-                ).build()
-
-            client.newCall(request).enqueue(object: Callback {
-                override fun onFailure(call: Call, e: IOException) {
-                    val view = view ?: return
-                    Snackbar.make(view, R.string.settings_backup_failed, Snackbar.LENGTH_LONG).show()
-                }
-
-                override fun onResponse(call: Call, response: Response) {
-                    if (response.code() != 200) {
-                        response.close()
-                        return
-                    }
-
-                    Intent(Intent.ACTION_SEND).apply {
-                        type = "text/plain"
-                        putExtra(Intent.EXTRA_TEXT, response.body()?.use { it.string() }?.replace("\n", ""))
-                    }.let {
-                        getContext()?.startActivity(Intent.createChooser(it, getString(R.string.settings_backup_share)))
-                    }
-                }
-            })
-
-            true
-        }
-        findPreference<Preference>("restore")?.setOnPreferenceClickListener {
-            val editText = EditText(context).apply {
-                setText(context.getString(R.string.backup_url), TextView.BufferType.EDITABLE)
-            }
-
-            AlertDialog.Builder(context)
-                .setTitle(R.string.settings_restore_title)
-                .setView(editText)
-                .setPositiveButton(android.R.string.ok) { _, _ ->
-                    restore(editText.text.toString(),
-                        onFailure = onFailure@{
-                            val view = view ?: return@onFailure
-                            Snackbar.make(view, R.string.settings_restore_failed, Snackbar.LENGTH_LONG).show()
-                        }, onSuccess = onSuccess@{
-                            val view = view ?: return@onSuccess
-                            Snackbar.make(view, context.getString(R.string.settings_restore_success, it.size), Snackbar.LENGTH_LONG).show()
-                        })
-                }.setNegativeButton(android.R.string.cancel) { _, _ ->
-                    // Do Nothing
-                }.show()
-
-            true
-        }
-    }
-
-}
--- a/app/src/main/java/xyz/quaver/pupil/ui/fragment/ManageStorageFragment.kt
+++ b/app/src/main/java/xyz/quaver/pupil/ui/fragment/ManageStorageFragment.kt
@@ -1,193 +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.fragment
-
-import android.os.Bundle
-import androidx.appcompat.app.AlertDialog
-import androidx.preference.Preference
-import androidx.preference.PreferenceFragmentCompat
-import kotlinx.coroutines.CoroutineScope
-import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.Job
-import kotlinx.coroutines.launch
-import xyz.quaver.io.FileX
-import xyz.quaver.io.util.deleteRecursively
-import xyz.quaver.pupil.R
-import xyz.quaver.pupil.histories
-import xyz.quaver.pupil.util.byteToString
-import xyz.quaver.pupil.util.downloader.DownloadManager
-import java.io.File
-
-class ManageStorageFragment : PreferenceFragmentCompat(), Preference.OnPreferenceClickListener {
-
-    private var job: Job? = null
-
-    override fun onCreatePreferences(savedInstanceState: Bundle?, rootKey: String?) {
-        setPreferencesFromResource(R.xml.manage_storage_preferences, rootKey)
-
-        initPreferences()
-    }
-
-    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")
-
-                    AlertDialog.Builder(context).apply {
-                        setTitle(R.string.warning)
-                        setMessage(R.string.settings_clear_cache_alert_message)
-                        setPositiveButton(android.R.string.ok) { _, _ ->
-                            if (dir.exists())
-                                dir.deleteRecursively()
-
-                            summary = context.getString(R.string.settings_storage_usage, byteToString(0))
-                            CoroutineScope(Dispatchers.IO).launch {
-                                var size = 0L
-
-                                dir.walk().forEach {
-                                    size += it.length()
-
-                                    launch(Dispatchers.Main) {
-                                        summary = context.getString(R.string.settings_storage_usage, byteToString(size))
-                                    }
-                                }
-                            }
-                        }
-                        setNegativeButton(android.R.string.cancel) { _, _ -> }
-                    }.show()
-                }
-                "delete_downloads" -> {
-                    val dir = DownloadManager.getInstance(context).downloadFolder
-
-                    AlertDialog.Builder(context).apply {
-                        setTitle(R.string.warning)
-                        setMessage(R.string.settings_clear_downloads_alert_message)
-                        setPositiveButton(android.R.string.ok) { _, _ ->
-                            CoroutineScope(Dispatchers.IO).launch {
-                                job?.cancel()
-                                launch(Dispatchers.Main) {
-                                    summary = context.getString(R.string.settings_storage_usage_loading)
-                                }
-
-                                if (dir.exists())
-                                    dir.listFiles()?.forEach { (it as? FileX)?.deleteRecursively() }
-
-                                job = launch {
-                                    var size = 0L
-
-                                    launch(Dispatchers.Main) {
-                                        summary = context.getString(R.string.settings_storage_usage, byteToString(size))
-                                    }
-                                    dir.walk().forEach {
-                                        size += it.length()
-
-                                        launch(Dispatchers.Main) {
-                                            summary = context.getString(R.string.settings_storage_usage, byteToString(size))
-                                        }
-                                    }
-                                }
-                            }
-                        }
-                        setNegativeButton(android.R.string.cancel) { _, _ -> }
-                    }.show()
-                }
-                "clear_history" -> {
-                    AlertDialog.Builder(context).apply {
-                        setTitle(R.string.warning)
-                        setMessage(R.string.settings_clear_history_alert_message)
-                        setPositiveButton(android.R.string.ok) { _, _ ->
-                            histories.clear()
-                            summary = context.getString(R.string.settings_clear_history_summary, histories.size)
-                        }
-                        setNegativeButton(android.R.string.cancel) { _, _ -> }
-                    }.show()
-                }
-                else -> return false
-            }
-        }
-
-        return true
-    }
-
-    private fun initPreferences() {
-        val context = context ?: return
-
-        with(findPreference<Preference>("delete_cache")) {
-            this ?: return@with
-
-            val dir = File(context.cacheDir, "imageCache")
-
-            summary = context.getString(R.string.settings_storage_usage, byteToString(0))
-            CoroutineScope(Dispatchers.IO).launch {
-                var size = 0L
-
-                dir.walk().forEach {
-                    size += it.length()
-
-                    launch(Dispatchers.Main) {
-                        summary = context.getString(R.string.settings_storage_usage, byteToString(size))
-                    }
-                }
-            }
-
-            onPreferenceClickListener = this@ManageStorageFragment
-        }
-
-        with(findPreference<Preference>("delete_downloads")) {
-            this ?: return@with
-
-            val dir = DownloadManager.getInstance(context).downloadFolder
-
-            summary = context.getString(R.string.settings_storage_usage, byteToString(0))
-            job?.cancel()
-            job = CoroutineScope(Dispatchers.IO).launch {
-                var size = 0L
-
-                dir.walk().forEach {
-                    launch(Dispatchers.Main) {
-                        summary = context.getString(R.string.settings_storage_usage, byteToString(size))
-                    }
-
-                    size += it.length()
-                }
-            }
-
-            onPreferenceClickListener = this@ManageStorageFragment
-        }
-
-        with(findPreference<Preference>("clear_history")) {
-            this ?: return@with
-
-            summary = context.getString(R.string.settings_clear_history_summary, histories.size)
-
-            onPreferenceClickListener = this@ManageStorageFragment
-        }
-    }
-
-    override fun onDestroy() {
-        job?.cancel()
-        super.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
@@ -1,53 +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.fragment
-
-import android.os.Bundle
-import android.view.LayoutInflater
-import android.view.View
-import android.view.ViewGroup
-import androidx.fragment.app.Fragment
-import com.andrognito.pinlockview.PinLockListener
-import kotlinx.android.synthetic.main.fragment_pin_lock.view.*
-import xyz.quaver.pupil.R
-
-class PINLockFragment : Fragment(), PinLockListener {
-
-    var onPINEntered: ((String) -> Unit)? = null
-
-    override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
-        return inflater.inflate(R.layout.fragment_pin_lock, container, false).apply {
-            pin_lock_view.attachIndicatorDots(indicator_dots)
-            pin_lock_view.setPinLockListener(this@PINLockFragment)
-        }
-    }
-
-    override fun onComplete(pin: String?) {
-        onPINEntered?.invoke(pin!!)
-    }
-
-    override fun onEmpty() {
-
-    }
-
-    override fun onPinChange(pinLength: Int, intermediatePin: String?) {
-
-    }
-
-}
--- a/app/src/main/java/xyz/quaver/pupil/ui/fragment/PatternLockFragment.kt
+++ b/app/src/main/java/xyz/quaver/pupil/ui/fragment/PatternLockFragment.kt
@@ -1,63 +0,0 @@
-/*
- *     Pupil, Hitomi.la viewer for Android
- *     Copyright (C) 2019  tom5079
- *
- *     This program is free software: you can redistribute it and/or modify
- *     it under the terms of the GNU General Public License as published by
- *     the Free Software Foundation, either version 3 of the License, or
- *     (at your option) any later version.
- *
- *     This program is distributed in the hope that it will be useful,
- *     but WITHOUT ANY WARRANTY; without even the implied warranty of
- *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *     GNU General Public License for more details.
- *
- *     You should have received a copy of the GNU General Public License
- *     along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-package xyz.quaver.pupil.ui.fragment
-
-import android.os.Bundle
-import android.view.LayoutInflater
-import android.view.View
-import android.view.ViewGroup
-import androidx.fragment.app.Fragment
-import com.andrognito.patternlockview.PatternLockView
-import com.andrognito.patternlockview.listener.PatternLockViewListener
-import com.andrognito.patternlockview.utils.PatternLockUtils
-import kotlinx.android.synthetic.main.fragment_pattern_lock.*
-import kotlinx.android.synthetic.main.fragment_pattern_lock.view.*
-import xyz.quaver.pupil.R
-
-class PatternLockFragment : Fragment(), PatternLockViewListener {
-
-    var onPatternDrawn: ((String) -> Unit)? = null
-
-    override fun onCreateView(
-        inflater: LayoutInflater, container: ViewGroup?,
-        savedInstanceState: Bundle?
-    ): View? {
-        return inflater.inflate(R.layout.fragment_pattern_lock, container, false).apply {
-            lock_pattern_view.addPatternLockListener(this@PatternLockFragment)
-        }
-    }
-
-    override fun onCleared() {
-
-    }
-
-    override fun onComplete(pattern: MutableList<PatternLockView.Dot>?) {
-        val password = PatternLockUtils.patternToMD5(lock_pattern_view, pattern)
-        onPatternDrawn?.invoke(password)
-    }
-
-    override fun onProgress(progressPattern: MutableList<PatternLockView.Dot>?) {
-
-    }
-
-    override fun onStarted() {
-
-    }
-
-}
--- a/app/src/main/java/xyz/quaver/pupil/ui/fragment/SettingsFragment.kt
+++ b/app/src/main/java/xyz/quaver/pupil/ui/fragment/SettingsFragment.kt
@@ -1,285 +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.fragment
-
-import android.app.Activity
-import android.content.*
-import android.os.Bundle
-import android.widget.Toast
-import androidx.appcompat.app.AppCompatDelegate
-import androidx.preference.Preference
-import androidx.preference.PreferenceCategory
-import androidx.preference.PreferenceFragmentCompat
-import androidx.preference.SwitchPreferenceCompat
-import com.google.android.gms.oss.licenses.OssLicensesMenuActivity
-import com.google.android.material.snackbar.Snackbar
-import kotlinx.serialization.decodeFromString
-import kotlinx.serialization.json.Json
-import xyz.quaver.io.FileX
-import xyz.quaver.io.util.getChild
-import xyz.quaver.pupil.R
-import xyz.quaver.pupil.favorites
-import xyz.quaver.pupil.ui.LockActivity
-import xyz.quaver.pupil.ui.SettingsActivity
-import xyz.quaver.pupil.ui.dialog.*
-import xyz.quaver.pupil.util.*
-import xyz.quaver.pupil.util.downloader.DownloadManager
-import java.nio.charset.Charset
-
-class SettingsFragment :
-    PreferenceFragmentCompat(),
-    Preference.OnPreferenceClickListener,
-    Preference.OnPreferenceChangeListener,
-    SharedPreferences.OnSharedPreferenceChangeListener {
-
-    override fun onResume() {
-        super.onResume()
-
-        val lockManager = LockManager(requireContext())
-
-        findPreference<Preference>("app_lock")?.summary = if (lockManager.locks.isNullOrEmpty()) {
-            getString(R.string.settings_lock_none)
-        } else {
-            lockManager.locks?.joinToString(", ") {
-                when(it.type) {
-                    Lock.Type.PATTERN -> getString(R.string.settings_lock_pattern)
-                    Lock.Type.PIN -> getString(R.string.settings_lock_pin)
-                    Lock.Type.PASSWORD -> getString(R.string.settings_lock_password)
-                }
-            }
-        }
-    }
-
-    override fun onPreferenceClick(preference: Preference?): Boolean {
-        with (preference) {
-            this ?: return false
-
-            when (key) {
-                "app_version" -> {
-                    checkUpdate(activity as SettingsActivity, true)
-                }
-                "download_folder" -> {
-                    DownloadLocationDialogFragment().show(parentFragmentManager, "Download Location Dialog")
-                }
-                "default_query" -> {
-                    DefaultQueryDialog(requireContext()).apply {
-                        onPositiveButtonClickListener = { newTags ->
-                            Preferences["default_query"] = newTags.toString()
-                            summary = newTags.toString()
-                        }
-                    }.show()
-                }
-                "app_lock" -> {
-                    val intent = Intent(requireContext(), LockActivity::class.java).apply {
-                        putExtra("force", true)
-                    }
-                    startActivityForResult(intent, R.id.request_lock.normalizeID())
-                }
-                "mirrors" -> {
-                    MirrorDialog(requireContext())
-                        .show()
-                }
-                "proxy" -> {
-                    ProxyDialog(requireContext())
-                        .show()
-                }
-                "user_id" -> {
-                    (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()
-                }
-                else -> return false
-            }
-        }
-
-        return true
-    }
-
-    override fun onPreferenceChange(preference: Preference?, newValue: Any?): Boolean {
-        with (preference) {
-            this ?: return false
-
-            when (key) {
-                "nomedia" -> {
-                    val create = (newValue as? Boolean) ?: return false
-
-                    return kotlin.runCatching {
-                        val nomedia = DownloadManager.getInstance(context).downloadFolder.getChild(".nomedia")
-
-                        if (create)
-                            nomedia.createNewFile()
-                        else
-                            nomedia.delete()
-                    }.getOrDefault(false)
-                }
-                "dark_mode" -> {
-                    AppCompatDelegate.setDefaultNightMode(when (newValue as Boolean) {
-                        true -> AppCompatDelegate.MODE_NIGHT_YES
-                        false -> AppCompatDelegate.MODE_NIGHT_NO
-                    })
-                }
-                else -> return false
-            }
-        }
-
-        return true
-    }
-
-    override fun onSharedPreferenceChanged(sharedPreferences: SharedPreferences?, key: String?) {
-        key ?: return
-
-        with(findPreference<Preference>(key)) {
-            this ?: return
-
-            when (key) {
-                "proxy" -> {
-                    summary = context?.let { getProxyInfo().type.name }
-                }
-                "download_folder" -> {
-                    summary = FileX(context, Preferences.get<String>("download_folder")).canonicalPath
-                }
-                "download_folder_name" -> {
-                    summary = Preferences["download_folder_name", "[-id-] -title-"]
-                }
-            }
-        }
-    }
-
-    override fun onCreatePreferences(savedInstanceState: Bundle?, rootKey: String?) {
-        setPreferencesFromResource(R.xml.root_preferences, rootKey)
-
-        Preferences.registerOnSharedPreferenceChangeListener(this)
-
-        initPreferences()
-    }
-
-    override fun onDestroy() {
-        Preferences.unregisterOnSharedPreferenceChangeListener(this)
-        super.onDestroy()
-    }
-
-    private fun initPreferences() {
-        for (i in 0 until preferenceScreen.preferenceCount) {
-
-            preferenceScreen.getPreference(i).run {
-                if (this is PreferenceCategory)
-                    (0 until preferenceCount).map { getPreference(it) }
-                else
-                    listOf(this)
-            }.forEach { preference ->
-                with (preference) with@{
-
-                    when (key) {
-                        "app_version" -> {
-                            val manager = requireContext().packageManager
-                            val info = manager.getPackageInfo(requireContext().packageName, 0)
-                            summary = requireContext().getString(R.string.settings_app_version_description, info.versionName)
-
-                            onPreferenceClickListener = this@SettingsFragment
-                        }
-                        "download_folder_name" -> {
-                            summary = Preferences["download_folder_name", "[-id-] -title-"]
-
-                            setOnPreferenceClickListener {
-                                DownloadFolderNameDialogFragment().show(requireActivity().supportFragmentManager, "Download Location Dialog")
-
-                                true
-                            }
-                        }
-                        "download_folder" -> {
-                            summary = FileX(context, Preferences.get<String>("download_folder")).canonicalPath
-
-                            onPreferenceClickListener = this@SettingsFragment
-                        }
-                        "nomedia" -> {
-                            (this as SwitchPreferenceCompat).isChecked = kotlin.runCatching {
-                                DownloadManager.getInstance(context).downloadFolder.getChild(".nomedia").exists()
-                            }.getOrDefault(false)
-
-                            onPreferenceChangeListener = this@SettingsFragment
-                        }
-                        "default_query" -> {
-                            summary = Preferences.get<String>("default_query")
-
-                            onPreferenceClickListener = this@SettingsFragment
-                        }
-                        "app_lock" -> {
-                            val lockManager = LockManager(requireContext())
-                            summary =
-                                if (lockManager.locks.isNullOrEmpty()) {
-                                    getString(R.string.settings_lock_none)
-                                } else {
-                                    lockManager.locks?.joinToString(", ") {
-                                        when (it.type) {
-                                            Lock.Type.PATTERN -> getString(R.string.settings_lock_pattern)
-                                            Lock.Type.PIN -> getString(R.string.settings_lock_pin)
-                                            Lock.Type.PASSWORD -> getString(R.string.settings_lock_password)
-                                        }
-                                    }
-                                }
-
-                            onPreferenceClickListener = this@SettingsFragment
-                        }
-                        "mirrors" -> {
-                            onPreferenceClickListener = this@SettingsFragment
-                        }
-                        "proxy" -> {
-                            summary = getProxyInfo().type.name
-
-                            onPreferenceClickListener = this@SettingsFragment
-                        }
-                        "dark_mode" -> {
-                            onPreferenceChangeListener = this@SettingsFragment
-                        }
-                        "old_import_galleries" -> {
-                            onPreferenceClickListener = this@SettingsFragment
-                        }
-                        "user_id" -> {
-                            summary = Preferences.get<String>("user_id")
-                            onPreferenceClickListener = this@SettingsFragment
-                        }
-                        "oss" -> {
-                            setOnPreferenceClickListener {
-                                context?.startActivity(Intent(context, OssLicensesMenuActivity::class.java))
-                                true
-                            }
-                        }
-                    }
-
-                }
-            }
-        }
-    }
-
-    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/theme/Color.kt
+++ b/app/src/main/java/xyz/quaver/pupil/ui/theme/Color.kt
@@ -0,0 +1,28 @@
+/*
+ *     Pupil, Hitomi.la viewer for Android
+ *     Copyright (C) 2021 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 <https://www.gnu.org/licenses/>.
+ */
+
+package xyz.quaver.pupil.ui.theme
+
+import androidx.compose.ui.graphics.Color
+
+val LightBlue300 = Color(0xFF4FC3F7)
+val LightBlue700 = Color(0xFF0288D1)
+val Pink600 = Color(0xFFD81B60)
+val Blue700 = Color(0xFF1976D2)
+val GreenA700 = Color(0xFF00C853)
+val Orange500 = Color(0xFFFF9800)
--- a/app/src/main/java/xyz/quaver/pupil/ui/theme/Shape.kt
+++ b/app/src/main/java/xyz/quaver/pupil/ui/theme/Shape.kt
@@ -0,0 +1,29 @@
+/*
+ *     Pupil, Hitomi.la viewer for Android
+ *     Copyright (C) 2021 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 <https://www.gnu.org/licenses/>.
+ */
+
+package xyz.quaver.pupil.ui.theme
+
+import androidx.compose.foundation.shape.RoundedCornerShape
+import androidx.compose.material.Shapes
+import androidx.compose.ui.unit.dp
+
+val Shapes = Shapes(
+    small = RoundedCornerShape(4.dp),
+    medium = RoundedCornerShape(4.dp),
+    large = RoundedCornerShape(0.dp)
+)
--- a/app/src/main/java/xyz/quaver/pupil/ui/theme/Theme.kt
+++ b/app/src/main/java/xyz/quaver/pupil/ui/theme/Theme.kt
@@ -0,0 +1,57 @@
+/*
+ *     Pupil, Hitomi.la viewer for Android
+ *     Copyright (C) 2021 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 <https://www.gnu.org/licenses/>.
+ */
+
+package xyz.quaver.pupil.ui.theme
+
+import androidx.compose.foundation.isSystemInDarkTheme
+import androidx.compose.material.MaterialTheme
+import androidx.compose.material.contentColorFor
+import androidx.compose.material.darkColors
+import androidx.compose.material.lightColors
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.graphics.Color
+
+private val DarkColorPalette = darkColors(
+    primary = LightBlue300,
+    primaryVariant = LightBlue700,
+    secondary = Pink600,
+    onPrimary = Color.White,
+    onSecondary = Color.White
+)
+private val LightColorPalette = lightColors(
+    primary = LightBlue300,
+    primaryVariant = LightBlue700,
+    secondary = Pink600,
+    onPrimary = Color.White,
+    onSecondary = Color.White
+)
+
+@Composable
+fun PupilTheme(
+    darkTheme: Boolean = isSystemInDarkTheme(),
+    content: @Composable () -> Unit
+) {
+    val colors = if (darkTheme) DarkColorPalette else LightColorPalette
+
+    MaterialTheme(
+        colors = colors,
+        typography = Typography,
+        shapes = Shapes,
+        content = content
+    )
+}
--- a/app/src/main/java/xyz/quaver/pupil/ui/theme/Type.kt
+++ b/app/src/main/java/xyz/quaver/pupil/ui/theme/Type.kt
@@ -0,0 +1,33 @@
+/*
+ *     Pupil, Hitomi.la viewer for Android
+ *     Copyright (C) 2021 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 <https://www.gnu.org/licenses/>.
+ */
+
+package xyz.quaver.pupil.ui.theme
+
+import androidx.compose.material.Typography
+import androidx.compose.ui.text.TextStyle
+import androidx.compose.ui.text.font.FontFamily
+import androidx.compose.ui.text.font.FontWeight
+import androidx.compose.ui.unit.sp
+
+val Typography = Typography(
+    body1 = TextStyle(
+        fontFamily = FontFamily.Default,
+        fontWeight = FontWeight.Normal,
+        fontSize = 16.sp
+    )
+)
--- a/app/src/main/java/xyz/quaver/pupil/ui/view/TagChip.kt
+++ b/app/src/main/java/xyz/quaver/pupil/ui/view/TagChip.kt
@@ -1,69 +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.view
-
-import android.annotation.SuppressLint
-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.types.Tag
-import xyz.quaver.pupil.util.wordCapitalize
-
-@SuppressLint("ViewConstructor")
-class TagChip(context: Context, tag: Tag) : Chip(context) {
-
-    val tag: Tag =
-        tag.let {
-            when {
-                it.area != null -> it
-                else -> Tag("tag", tag.tag)
-            }
-        }
-
-    private val languages = context.resources.getStringArray(R.array.languages).map {
-        it.split("|").let { split ->
-            Pair(split[0], split[1])
-        }
-    }.toMap()
-
-    init {
-        chipIcon = 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)
-            }
-            "female" -> {
-                setChipBackgroundColorResource(R.color.material_pink_600)
-                setTextColor(ContextCompat.getColor(context, android.R.color.white))
-                ContextCompat.getDrawable(context, R.drawable.gender_female_white)
-            }
-            else -> null
-        }
-
-        text = when (tag.area) {
-            "language" -> languages[tag.tag]
-            else -> tag.tag.wordCapitalize()
-        }
-
-        setEnsureMinTouchTargetSize(false)
-    }
-
-}
--- a/app/src/main/java/xyz/quaver/pupil/util/ItemClickSupport.kt
+++ b/app/src/main/java/xyz/quaver/pupil/util/ItemClickSupport.kt
@@ -1,69 +0,0 @@
-/*
- *     Pupil, Hitomi.la viewer for Android
- *     Copyright (C) 2020  tom5079
- *
- *     This program is free software: you can redistribute it and/or modify
- *     it under the terms of the GNU General Public License as published by
- *     the Free Software Foundation, either version 3 of the License, or
- *     (at your option) any later version.
- *
- *     This program is distributed in the hope that it will be useful,
- *     but WITHOUT ANY WARRANTY; without even the implied warranty of
- *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *     GNU General Public License for more details.
- *
- *     You should have received a copy of the GNU General Public License
- *     along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-package xyz.quaver.pupil.util
-
-import android.view.View
-import androidx.recyclerview.widget.RecyclerView
-import xyz.quaver.pupil.R
-
-class ItemClickSupport(private val recyclerView: RecyclerView) {
-
-    var onItemClickListener: ((RecyclerView, Int, View) -> Unit)? = null
-    var onItemLongClickListener: ((RecyclerView, Int, View) -> Boolean)? = null
-
-    init {
-        recyclerView.apply {
-            setTag(R.id.item_click_support, this)
-            addOnChildAttachStateChangeListener(object: RecyclerView.OnChildAttachStateChangeListener {
-                override fun onChildViewAttachedToWindow(view: View) {
-                    onItemClickListener?.let { listener ->
-                        view.setOnClickListener {
-                            recyclerView.getChildViewHolder(view).let { holder ->
-                                listener.invoke(recyclerView, holder.adapterPosition, view)
-                            }
-                        }
-                    }
-                    onItemLongClickListener?.let { listener ->
-                        view.setOnLongClickListener {
-                            recyclerView.getChildViewHolder(view).let { holder ->
-                                listener.invoke(recyclerView, holder.adapterPosition, view)
-                            }
-                        }
-                    }
-                }
-
-                override fun onChildViewDetachedFromWindow(view: View) {
-                    // Do Nothing
-                }
-            })
-        }
-    }
-
-    fun detach() {
-        recyclerView.apply {
-            clearOnChildAttachStateChangeListeners()
-            setTag(R.id.item_click_support, null)
-        }
-    }
-
-    companion object {
-        fun addTo(view: RecyclerView) = view.let { removeFrom(it); ItemClickSupport(it) }
-        fun removeFrom(view: RecyclerView) = (view.tag as? ItemClickSupport)?.detach()
-    }
-}
--- a/app/src/main/java/xyz/quaver/pupil/util/Preferences.kt
+++ b/app/src/main/java/xyz/quaver/pupil/util/Preferences.kt
@@ -1,48 +0,0 @@
-/*
- *     Pupil, Hitomi.la viewer for Android
- *     Copyright (C) 2020  tom5079
- *
- *     This program is free software: you can redistribute it and/or modify
- *     it under the terms of the GNU General Public License as published by
- *     the Free Software Foundation, either version 3 of the License, or
- *     (at your option) any later version.
- *
- *     This program is distributed in the hope that it will be useful,
- *     but WITHOUT ANY WARRANTY; without even the implied warranty of
- *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *     GNU General Public License for more details.
- *
- *     You should have received a copy of the GNU General Public License
- *     along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-package xyz.quaver.pupil.util
-
-import android.content.SharedPreferences
-import kotlin.reflect.KClass
-
-lateinit var preferences: SharedPreferences
-
-object Preferences: SharedPreferences by preferences {
-
-    val defMap = mapOf(
-        String::class to "",
-        Int::class to -1,
-        Long::class to -1L,
-        Boolean::class to false,
-        Set::class to emptySet<Any>()
-    )
-
-    operator fun set(key: String, value: String) = edit().putString(key, value).apply()
-    operator fun set(key: String, value: Int) = edit().putInt(key, value).apply()
-    operator fun set(key: String, value: Long) = edit().putLong(key, value).apply()
-    operator fun set(key: String, value: Boolean) = edit().putBoolean(key, value).apply()
-    operator fun set(key: String, value: Set<String>) = edit().putStringSet(key, value).apply()
-
-    @Suppress("UNCHECKED_CAST")
-    inline operator fun <reified T: Any> get(key: String, defaultVal: T = defMap[T::class] as T): T = (all[key] as? T) ?: defaultVal
-
-    fun remove(key: String) {
-        edit().remove(key).apply()
-    }
-}
--- a/app/src/main/java/xyz/quaver/pupil/util/PupilHttpClient.kt
+++ b/app/src/main/java/xyz/quaver/pupil/util/PupilHttpClient.kt
@@ -0,0 +1,156 @@
+/*
+ *     Pupil, Hitomi.la viewer for Android
+ *     Copyright (C) 2022  tom5079
+ *
+ *     This program is free software: you can redistribute it and/or modify
+ *     it under the terms of the GNU General Public License as published by
+ *     the Free Software Foundation, either version 3 of the License, or
+ *     (at your option) any later version.
+ *
+ *     This program is distributed in the hope that it will be useful,
+ *     but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *     GNU General Public License for more details.
+ *
+ *     You should have received a copy of the GNU General Public License
+ *     along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package xyz.quaver.pupil.util
+
+import androidx.compose.ui.res.stringArrayResource
+import io.ktor.client.*
+import io.ktor.client.call.*
+import io.ktor.client.engine.*
+import io.ktor.client.plugins.contentnegotiation.*
+import io.ktor.client.request.*
+import io.ktor.client.statement.*
+import io.ktor.http.*
+import io.ktor.serialization.kotlinx.json.*
+import io.ktor.utils.io.core.*
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.flow.flow
+import kotlinx.coroutines.flow.flowOn
+import kotlinx.coroutines.withContext
+import kotlinx.serialization.Serializable
+import kotlinx.serialization.json.*
+import java.io.File
+import java.util.*
+
+@Serializable
+data class RemoteSourceInfo(
+    val projectName: String,
+    val name: String,
+    val version: String
+)
+
+class Release(
+    val version: String,
+    val apkUrl: String,
+    val releaseNotes: Map<Locale, String>
+)
+
+private val localeMap = mapOf(
+    "한국어" to Locale.KOREAN,
+    "日本語" to Locale.JAPANESE,
+    "English" to Locale.ENGLISH
+)
+
+class PupilHttpClient(engine: HttpClientEngine) {
+    private val httpClient = HttpClient(engine) {
+        install(ContentNegotiation) {
+            json()
+        }
+    }
+
+    /**
+     * Fetch a list of available sources from PupilSources repository.
+     * Returns empty map when exception occurs
+     */
+    suspend fun getRemoteSourceList(): Map<String, RemoteSourceInfo> = withContext(Dispatchers.IO) {
+        runCatching {
+            httpClient.get("https://tom5079.github.io/PupilSources/versions.json").body<Map<String, RemoteSourceInfo>>()
+        }.getOrDefault(emptyMap())
+    }
+
+    /**
+     * Downloads specific file from :url to :dest.
+     * Returns flow that emits progress.
+     * when value emitted by flow {
+     *   in 0f .. 1f        -> downloading
+     *   POSITIVE_INFINITY  -> download finised
+     *   NEGATIVE_INFINITY  -> exception occured
+     * }
+     */
+    fun downloadFile(url: String, dest: File) = flow {
+        runCatching {
+            httpClient.prepareGet(url).execute { response ->
+                val channel = response.bodyAsChannel()
+                val contentLength = response.contentLength() ?: -1
+                var readBytes = 0f
+
+                dest.outputStream().use { outputStream ->
+                    while (!channel.isClosedForRead) {
+                        val packet = channel.readRemaining(DEFAULT_BUFFER_SIZE.toLong())
+                        while (!packet.isEmpty) {
+                            val bytes = packet.readBytes()
+                            outputStream.write(bytes)
+
+                            readBytes += bytes.size
+                            emit(readBytes / contentLength)
+                        }
+                    }
+                }
+            }
+
+            emit(Float.POSITIVE_INFINITY)
+        }.onFailure {
+            emit(Float.NEGATIVE_INFINITY)
+        }
+    }.flowOn(Dispatchers.IO)
+
+    /**
+     * Latest application release info from Github API.
+     * Returns null when exception occurs.
+     */
+    suspend fun latestRelease(beta: Boolean = true): Release? = withContext(Dispatchers.IO) {
+        runCatching {
+            val releases = Json.parseToJsonElement(
+                httpClient.get("https://api.github.com/repos/tom5079/Pupil/releases").bodyAsText()
+            ).jsonArray
+
+            val latestRelease = releases.first { release ->
+                beta || !release.jsonObject["prerelease"]!!.jsonPrimitive.boolean
+            }.jsonObject
+
+            val version = latestRelease["tag_name"]!!.jsonPrimitive.content
+
+            val apkUrl = latestRelease["assets"]!!.jsonArray.first { asset ->
+                val name = asset.jsonObject["name"]!!.jsonPrimitive.content
+                name.startsWith("Pupil-v") && name.endsWith(".apk")
+            }.jsonObject["browser_download_url"]!!.jsonPrimitive.content
+
+            val releaseNotes: Map<Locale, String> = buildMap {
+                val body = latestRelease["body"]!!.jsonPrimitive.content
+
+                var locale: Locale? = null
+                val stringBuilder = StringBuilder()
+                body.lineSequence().forEach { line ->
+                    localeMap[line.drop(3)]?.let { newLocale ->
+                        if (locale != null) {
+                            put(locale!!, stringBuilder.deleteCharAt(stringBuilder.length-1).toString())
+                            stringBuilder.clear()
+                        }
+                        locale = newLocale
+                        return@forEach
+                    }
+
+                    if (locale != null) stringBuilder.appendLine(line)
+                }
+                put(locale!!, stringBuilder.deleteCharAt(stringBuilder.length-1).toString())
+            }
+
+            Release(version, apkUrl, releaseNotes)
+        }.getOrNull()
+    }
+}
--- a/app/src/main/java/xyz/quaver/pupil/util/SavedSet.kt
+++ b/app/src/main/java/xyz/quaver/pupil/util/SavedSet.kt
@@ -1,88 +0,0 @@
-/*
- *     Pupil, Hitomi.la viewer for Android
- *     Copyright (C) 2020  tom5079
- *
- *     This program is free software: you can redistribute it and/or modify
- *     it under the terms of the GNU General Public License as published by
- *     the Free Software Foundation, either version 3 of the License, or
- *     (at your option) any later version.
- *
- *     This program is distributed in the hope that it will be useful,
- *     but WITHOUT ANY WARRANTY; without even the implied warranty of
- *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *     GNU General Public License for more details.
- *
- *     You should have received a copy of the GNU General Public License
- *     along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-package xyz.quaver.pupil.util
-
-import kotlinx.serialization.*
-import kotlinx.serialization.builtins.ListSerializer
-import kotlinx.serialization.json.Json
-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 {
-
-    @Suppress("UNCHECKED_CAST")
-    @OptIn(ExperimentalSerializationApi::class)
-    val serializer: KSerializer<List<T>>
-        get() = ListSerializer(serializer(any::class.java) as KSerializer<T>)
-
-    init {
-        if (!file.exists()) {
-            file.parentFile?.mkdirs()
-            save()
-        }
-        load()
-    }
-
-    fun load() {
-        synchronized(this) {
-            set.clear()
-            kotlin.runCatching {
-                Json.decodeFromString(serializer, file.readText())
-            }.onSuccess {
-                set.addAll(it)
-            }
-        }
-    }
-
-    @OptIn(ExperimentalSerializationApi::class)
-    fun save() {
-        synchronized(this) {
-            file.writeText(Json.encodeToString(serializer, set.toList()))
-        }
-    }
-
-    override fun add(element: T): Boolean {
-        load()
-
-        return set.add(element).also {
-            save()
-        }
-    }
-
-    override fun addAll(elements: Collection<T>): Boolean {
-        load()
-
-        return set.addAll(elements).also {
-            save()
-        }
-    }
-
-    override fun remove(element: T): Boolean {
-        load()
-
-        return set.remove(element).also {
-            save()
-        }
-    }
-
-    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/camera.kt
+++ b/app/src/main/java/xyz/quaver/pupil/util/camera.kt
@@ -1,119 +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/>.
- */
-
-@file:Suppress("DEPRECATION", "Recycle")
-
-package xyz.quaver.pupil.util
-
-import android.content.Context
-import android.content.pm.PackageManager
-import android.graphics.ImageFormat
-import android.graphics.SurfaceTexture
-import android.hardware.Camera
-import android.view.Surface
-import android.view.WindowManager
-import com.google.android.gms.tasks.Task
-import com.google.mlkit.vision.common.InputImage
-import com.google.mlkit.vision.face.Face
-import com.google.mlkit.vision.face.FaceDetection
-import com.google.mlkit.vision.face.FaceDetectorOptions
-
-/** Check if this device has a camera */
-private fun Context.checkCameraHardware() =
-    this.packageManager.hasSystemFeature(PackageManager.FEATURE_CAMERA)
-
-private fun openFrontCamera() : Pair<Camera?, Int> {
-    var camera: Camera? = null
-    var cameraID: Int = -1
-
-    val cameraInfo = Camera.CameraInfo()
-
-    for (i in 0 until Camera.getNumberOfCameras()) {
-        Camera.getCameraInfo(i, cameraInfo)
-        if (cameraInfo.facing == Camera.CameraInfo.CAMERA_FACING_FRONT)
-            runCatching { Camera.open(i) }.getOrNull()?.let { camera = it; cameraID = i }
-
-        if (camera != null) break
-    }
-
-    return Pair(camera, cameraID)
-}
-
-val orientations = mapOf(
-    Surface.ROTATION_0 to 0,
-    Surface.ROTATION_90 to 90,
-    Surface.ROTATION_180 to 180,
-    Surface.ROTATION_270 to 270,
-)
-
-private fun getRotation(context: Context, cameraID: Int): Int {
-    val cameraRotation = Camera.CameraInfo().also { Camera.getCameraInfo(cameraID, it) }.orientation
-    val rotation = orientations[(context.getSystemService(Context.WINDOW_SERVICE) as WindowManager).defaultDisplay.rotation] ?: error("")
-
-    return (cameraRotation + rotation) % 360
-}
-
-var camera: Camera? = null
-var surfaceTexture: SurfaceTexture? = null
-private val detector = FaceDetection.getClient(
-    FaceDetectorOptions.Builder()
-        .setClassificationMode(FaceDetectorOptions.CLASSIFICATION_MODE_ALL)
-        .build()
-)
-private var process: Task<List<Face>>? = null
-
-fun startCamera(context: Context, callback: (List<Face>) -> Unit) {
-    if (camera != null) closeCamera()
-
-    val cameraID = openFrontCamera().let { (cam, cameraID) ->
-        cam ?: return
-        camera = cam
-        cameraID
-    }
-
-    with (camera!!) {
-        parameters = parameters.apply {
-            setPreviewSize(640, 480)
-            previewFormat = ImageFormat.NV21
-        }
-
-        setPreviewTexture(surfaceTexture ?: SurfaceTexture(0).also {
-            surfaceTexture = it
-        })
-        startPreview()
-        setPreviewCallback { bytes, _ ->
-            if (process?.isComplete == false)
-                return@setPreviewCallback
-
-            val rotation = getRotation(context, cameraID)
-
-            val image = InputImage.fromByteArray(bytes, 640, 480, rotation, InputImage.IMAGE_FORMAT_NV21)
-            process = detector.process(image)
-                .addOnSuccessListener(callback)
-        }
-    }
-}
-
-fun closeCamera() {
-    camera?.setPreviewCallback(null)
-    camera?.stopPreview()
-    surfaceTexture?.release()
-    surfaceTexture = null
-    camera?.release()
-    camera = null
-}
--- a/app/src/main/java/xyz/quaver/pupil/util/downloader/Cache.kt
+++ b/app/src/main/java/xyz/quaver/pupil/util/downloader/Cache.kt
@@ -1,248 +0,0 @@
-/*
- *     Pupil, Hitomi.la viewer for Android
- *     Copyright (C) 2020  tom5079
- *
- *     This program is free software: you can redistribute it and/or modify
- *     it under the terms of the GNU General Public License as published by
- *     the Free Software Foundation, either version 3 of the License, or
- *     (at your option) any later version.
- *
- *     This program is distributed in the hope that it will be useful,
- *     but WITHOUT ANY WARRANTY; without even the implied warranty of
- *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *     GNU General Public License for more details.
- *
- *     You should have received a copy of the GNU General Public License
- *     along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-package xyz.quaver.pupil.util.downloader
-
-import android.content.Context
-import android.content.ContextWrapper
-import android.util.SparseArray
-import kotlinx.coroutines.CoroutineScope
-import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.launch
-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 java.io.IOException
-
-@Serializable
-data class Metadata(
-    var galleryBlock: GalleryBlock? = null,
-    var reader: Reader? = null,
-    var imageList: MutableList<String?>? = null
-) {
-    fun copy(): Metadata = Metadata(galleryBlock, reader, imageList?.let { MutableList(it.size) { i -> it[i] } })
-}
-
-class Cache private constructor(context: Context, val galleryID: Int) : ContextWrapper(context) {
-
-    companion object {
-        val instances = SparseArray<Cache>()
-
-        fun getInstance(context: Context, galleryID: Int) =
-            instances[galleryID] ?: synchronized(this) {
-                instances[galleryID] ?: Cache(context, galleryID).also { instances.put(galleryID, it) }
-            }
-
-        @Synchronized
-        fun delete(galleryID: Int) {
-            instances[galleryID]?.cacheFolder?.deleteRecursively()
-            instances.delete(galleryID)
-        }
-    }
-
-    init {
-        cacheFolder.mkdirs()
-    }
-
-    var metadata = kotlin.runCatching {
-        findFile(".metadata")?.readText()?.let {
-            Json.decodeFromString<Metadata>(it)
-        }
-    }.getOrNull() ?: Metadata()
-
-    val downloadFolder: FileX?
-        get() = DownloadManager.getInstance(this).getDownloadFolder(galleryID)
-
-    val cacheFolder: FileX
-        get() = FileX(this, cacheDir, "imageCache/$galleryID").also {
-            if (!it.exists())
-                it.mkdirs()
-        }
-
-    fun findFile(fileName: String): FileX? =
-         downloadFolder?.let { downloadFolder -> downloadFolder.getChild(fileName).let {
-            if (it.exists()) it else null
-        } } ?: cacheFolder.getChild(fileName).let {
-            if (it.exists()) it else null
-        }
-
-    @Suppress("BlockingMethodInNonBlockingContext")
-    fun setMetadata(change: (Metadata) -> Unit) {
-        change.invoke(metadata)
-
-        val file = cacheFolder.getChild(".metadata")
-
-        kotlin.runCatching {
-            if (!file.exists()) {
-                file.createNewFile()
-            }
-            file.writeText(Json.encodeToString(metadata))
-        }
-    }
-
-    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
-
-                for (source in sources) {
-                    galleryBlock = try {
-                        source.invoke()
-                    } catch (e: Exception) { null }
-
-                    if (galleryBlock != null)
-                        break
-                }
-
-                galleryBlock?.also {
-                    setMetadata { metadata -> metadata.galleryBlock = it }
-                }
-            }
-    }
-
-    @Suppress("BlockingMethodInNonBlockingContext")
-    suspend fun getThumbnail(): ByteArray? =
-        findFile(".thumbnail")?.readBytes()
-            ?: getGalleryBlock()?.thumbnails?.firstOrNull()?.let { withContext(Dispatchers.IO) {
-                kotlin.runCatching {
-                    val request = Request.Builder()
-                        .url(it)
-                        .build()
-
-                    client.newCall(request).execute().also { if (it.code() != 200) throw IOException() }.body()?.use { it.bytes() }
-                }.getOrNull()?.also { kotlin.run {
-                    cacheFolder.getChild(".thumbnail").writeBytes(it)
-                } }
-            } }
-
-    suspend fun getReader(): Reader? {
-        val mirrors = Preferences.get<String>("mirrors").let { if (it.isEmpty()) emptyList() else it.split('>') }
-
-        val sources = mapOf(
-            Code.HITOMI to { xyz.quaver.hitomi.getReader(galleryID) },
-            Code.HIYOBI to { xyz.quaver.hiyobi.getReader(galleryID) }
-        ).let {
-            if (mirrors.isNotEmpty())
-                it.toSortedMap{ o1, o2 -> mirrors.indexOf(o1.name) - mirrors.indexOf(o2.name) }
-            else
-                it
-        }
-
-        return metadata.reader
-            ?: withContext(Dispatchers.IO) {
-                var reader: Reader? = null
-
-                for (source in sources) {
-                    reader = try {
-                        source.value.invoke()
-                    } catch (e: Exception) {
-                        null
-                    }
-
-                   if (reader != null)
-                       break
-                }
-
-                reader?.also {
-                    setMetadata { metadata ->
-                        metadata.reader = it
-
-                        if (metadata.imageList == null)
-                            metadata.imageList = MutableList(reader.galleryInfo.files.size) { null }
-                    }
-                }
-            }
-    }
-
-    fun getImage(index: Int): FileX? =
-        metadata.imageList?.get(index)?.let { findFile(it) }
-
-    @Suppress("BlockingMethodInNonBlockingContext")
-    fun putImage(index: Int, fileName: String, data: ByteArray) {
-        val file = cacheFolder.getChild(fileName)
-
-        file.createNewFile()
-        file.writeBytes(data)
-        setMetadata { metadata -> metadata.imageList!![index] = fileName }
-    }
-
-    @Suppress("BlockingMethodInNonBlockingContext")
-    fun moveToDownload() = CoroutineScope(Dispatchers.IO).launch {
-        val downloadFolder = downloadFolder ?: return@launch
-
-        if (downloadFolder.getChild(".metadata").exists())
-            return@launch
-
-        metadata.imageList?.forEach { imageName ->
-            imageName ?: return@forEach
-            val target = downloadFolder.getChild(imageName)
-            val source = cacheFolder.getChild(imageName)
-
-            if (!source.exists() || target.exists())
-                return@forEach
-
-            kotlin.runCatching {
-                target.createNewFile()
-                target.outputStream()?.use { target -> source.inputStream()?.use { source ->
-                    source.copyTo(target)
-                } }
-            }
-        }
-
-        val cacheThumbnail = cacheFolder.getChild(".thumbnail")
-        val downloadThumbnail = downloadFolder.getChild(".thumbnail")
-
-        if (cacheThumbnail.exists() && !downloadThumbnail.exists()) {
-            kotlin.runCatching {
-                downloadThumbnail.createNewFile()
-                downloadThumbnail.outputStream()?.use { target -> cacheThumbnail.inputStream()?.use { source ->
-                    source.copyTo(target)
-                } }
-                cacheThumbnail.delete()
-            }
-        }
-
-        val cacheMetadata = cacheFolder.getChild(".metadata")
-        val downloadMetadata = downloadFolder.getChild(".metadata")
-
-        if (cacheMetadata.exists() && !downloadMetadata.exists()) {
-            kotlin.runCatching {
-                downloadMetadata.createNewFile()
-                downloadMetadata.writeText(Json.encodeToString(metadata))
-                cacheMetadata.delete()
-            }
-        }
-
-        cacheFolder.delete()
-    }
-}
--- a/app/src/main/java/xyz/quaver/pupil/util/downloader/DownloadManager.kt
+++ b/app/src/main/java/xyz/quaver/pupil/util/downloader/DownloadManager.kt
@@ -1,130 +0,0 @@
-/*
- *     Pupil, Hitomi.la viewer for Android
- *     Copyright (C) 2020  tom5079
- *
- *     This program is free software: you can redistribute it and/or modify
- *     it under the terms of the GNU General Public License as published by
- *     the Free Software Foundation, either version 3 of the License, or
- *     (at your option) any later version.
- *
- *     This program is distributed in the hope that it will be useful,
- *     but WITHOUT ANY WARRANTY; without even the implied warranty of
- *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *     GNU General Public License for more details.
- *
- *     You should have received a copy of the GNU General Public License
- *     along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-package xyz.quaver.pupil.util.downloader
-
-import android.content.Context
-import android.content.ContextWrapper
-import android.util.Log
-import kotlinx.coroutines.runBlocking
-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.pupil.client
-import xyz.quaver.pupil.services.DownloadService
-import xyz.quaver.pupil.util.Preferences
-import xyz.quaver.pupil.util.formatDownloadFolder
-
-class DownloadManager private constructor(context: Context) : ContextWrapper(context) {
-
-    companion object {
-        @Volatile private var instance: DownloadManager? = null
-
-        fun getInstance(context: Context) =
-            instance ?: synchronized(this) {
-                instance ?: DownloadManager(context).also { instance = it }
-            }
-    }
-
-    val defaultDownloadFolder = FileX(this, getExternalFilesDir(null)!!)
-
-    val downloadFolder: FileX
-        get() = {
-            kotlin.runCatching {
-                FileX(this, Preferences.get<String>("download_folder"))
-            }.getOrElse {
-                Preferences["download_folder"] = defaultDownloadFolder.uri.toString()
-                defaultDownloadFolder
-            }
-        }.invoke()
-
-    private var prevDownloadFolder: FileX? = null
-    private var downloadFolderMapInstance: MutableMap<Int, String>? = null
-    val downloadFolderMap: MutableMap<Int, String>
-        @Synchronized
-        get() {
-            if (prevDownloadFolder != downloadFolder) {
-                prevDownloadFolder = downloadFolder
-                downloadFolderMapInstance = {
-                    val file = downloadFolder.getChild(".download")
-
-                    val data = if (file.exists())
-                        kotlin.runCatching {
-                            file.readText()?.let { Json.decodeFromString<MutableMap<Int, String>>(it) }
-                        }.onFailure { file.delete() }.getOrNull()
-                    else
-                        null
-
-                    data ?: {
-                        file.createNewFile()
-                        mutableMapOf<Int, String>()
-                    }.invoke()
-                }.invoke()
-            }
-
-            return downloadFolderMapInstance!!
-        }
-
-
-    @Synchronized
-    fun isDownloading(galleryID: Int): Boolean {
-        val isThisGallery: (Call) -> Boolean = { (it.request().tag() as? DownloadService.Tag)?.galleryID == galleryID }
-
-        return downloadFolderMap.containsKey(galleryID)
-                && client.dispatcher().let { it.queuedCalls().any(isThisGallery) || it.runningCalls().any(isThisGallery) }
-    }
-
-    @Synchronized
-    fun getDownloadFolder(galleryID: Int): FileX? =
-        downloadFolderMap[galleryID]?.let { downloadFolder.getChild(it) }
-
-    @Synchronized
-    fun addDownloadFolder(galleryID: Int) {
-        val name = runBlocking {
-            Cache.getInstance(this@DownloadManager, galleryID).getGalleryBlock()
-        }?.formatDownloadFolder() ?: return
-
-        val folder = downloadFolder.getChild(name)
-
-        if (folder.exists())
-            return
-
-        folder.mkdir()
-
-        downloadFolderMap[galleryID] = folder.name
-
-        downloadFolder.getChild(".download").let { if (!it.exists()) it.createNewFile() }
-        downloadFolder.getChild(".download").writeText(Json.encodeToString(downloadFolderMap))
-    }
-
-    @Synchronized
-    fun deleteDownloadFolder(galleryID: Int) {
-        downloadFolderMap[galleryID]?.let {
-            kotlin.runCatching {
-                downloadFolder.getChild(it).deleteRecursively()
-                downloadFolderMap.remove(galleryID)
-
-                downloadFolder.getChild(".download").let { if (!it.exists()) it.createNewFile() }
-                downloadFolder.getChild(".download").writeText(Json.encodeToString(downloadFolderMap))
-            }
-        }
-    }
-}
--- a/app/src/main/java/xyz/quaver/pupil/util/file.kt
+++ b/app/src/main/java/xyz/quaver/pupil/util/file.kt
@@ -1,53 +0,0 @@
-/*
- *     Pupil, Hitomi.la viewer for Android
- *     Copyright (C) 2019  tom5079
- *
- *     This program is free software: you can redistribute it and/or modify
- *     it under the terms of the GNU General Public License as published by
- *     the Free Software Foundation, either version 3 of the License, or
- *     (at your option) any later version.
- *
- *     This program is distributed in the hope that it will be useful,
- *     but WITHOUT ANY WARRANTY; without even the implied warranty of
- *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *     GNU General Public License for more details.
- *
- *     You should have received a copy of the GNU General Public License
- *     along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-package xyz.quaver.pupil.util
-
-import android.content.Context
-import android.os.storage.StorageManager
-import androidx.core.content.ContextCompat
-import androidx.core.net.toUri
-import java.io.File
-import java.io.FileOutputStream
-import java.lang.reflect.Array
-import java.net.URL
-
-@Suppress("DEPRECATION")
-@Deprecated("Use downloader.Cache instead")
-fun getCachedGallery(context: Context, galleryID: Int) =
-    File(getDownloadDirectory(context), galleryID.toString()).let {
-        if (it.exists())
-            it
-        else
-            File(context.cacheDir, "imageCache/$galleryID")
-    }
-
-@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/lock.kt
+++ b/app/src/main/java/xyz/quaver/pupil/util/lock.kt
@@ -1,124 +0,0 @@
-/*
- *     Pupil, Hitomi.la viewer for Android
- *     Copyright (C) 2019  tom5079
- *
- *     This program is free software: you can redistribute it and/or modify
- *     it under the terms of the GNU General Public License as published by
- *     the Free Software Foundation, either version 3 of the License, or
- *     (at your option) any later version.
- *
- *     This program is distributed in the hope that it will be useful,
- *     but WITHOUT ANY WARRANTY; without even the implied warranty of
- *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *     GNU General Public License for more details.
- *
- *     You should have received a copy of the GNU General Public License
- *     along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-package xyz.quaver.pupil.util
-
-import android.content.Context
-import android.content.ContextWrapper
-import androidx.core.content.ContextCompat
-import kotlinx.serialization.Serializable
-import kotlinx.serialization.decodeFromString
-import kotlinx.serialization.encodeToString
-import kotlinx.serialization.json.Json
-import java.io.File
-import java.security.MessageDigest
-
-fun hash(password: String): String {
-    val bytes = password.toByteArray()
-    val md = MessageDigest.getInstance("SHA-256")
-
-    return md.digest(bytes).fold("") { str, it -> str + "%02x".format(it) }
-}
-
-// Ret1: SHA-256 Hash
-// Ret2: Hash salt
-fun hashWithSalt(password: String): Pair<String, String> {
-    val salt = (0 until 12).map { source.random() }.joinToString()
-
-    return Pair(hash(password+salt), salt)
-}
-
-const val source = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789"
-
-@Serializable
-data class Lock(val type: Type, val hash: String, val salt: String) {
-
-    enum class Type {
-        PATTERN,
-        PIN,
-        PASSWORD
-    }
-
-    companion object {
-        fun generate(type: Type, password: String): Lock {
-            val (hash, salt) = hashWithSalt(password)
-            return Lock(type, hash, salt)
-        }
-    }
-
-    fun match(password: String): Boolean {
-        return hash(password+salt) == hash
-    }
-}
-
-class LockManager(base: Context): ContextWrapper(base) {
-
-    var locks: ArrayList<Lock>? = null
-
-    init {
-        load()
-    }
-
-    private fun load() {
-        val lock = File(ContextCompat.getDataDir(this), "lock.json")
-
-        if (!lock.exists()) {
-            lock.createNewFile()
-            lock.writeText("[]")
-        }
-
-        locks = Json.decodeFromString(lock.readText())
-    }
-
-    private fun save() {
-        val lock = File(ContextCompat.getDataDir(this), "lock.json")
-
-        if (!lock.exists())
-            lock.createNewFile()
-
-        lock.writeText(Json.encodeToString(locks?.toList() ?: listOf()))
-    }
-
-    fun add(lock: Lock) {
-        remove(lock.type)
-        locks?.add(lock)
-        save()
-    }
-
-    fun remove(type: Lock.Type) {
-        locks?.removeAll { it.type == type }
-        save()
-    }
-
-    fun check(password: String): Boolean? {
-        return locks?.any {
-            it.match(password)
-        }
-    }
-
-    fun isEmpty(): Boolean {
-        return locks.isNullOrEmpty()
-    }
-
-    fun isNotEmpty(): Boolean = !isEmpty()
-
-    fun contains(type: Lock.Type): Boolean {
-        return locks?.any { it.type == type } ?: false
-    }
-
-}
--- a/app/src/main/java/xyz/quaver/pupil/util/misc.kt
+++ b/app/src/main/java/xyz/quaver/pupil/util/misc.kt
@@ -1,131 +0,0 @@
-/*
- *     Pupil, Hitomi.la viewer for Android
- *     Copyright (C) 2019  tom5079
- *
- *     This program is free software: you can redistribute it and/or modify
- *     it under the terms of the GNU General Public License as published by
- *     the Free Software Foundation, either version 3 of the License, or
- *     (at your option) any later version.
- *
- *     This program is distributed in the hope that it will be useful,
- *     but WITHOUT ANY WARRANTY; without even the implied warranty of
- *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *     GNU General Public License for more details.
- *
- *     You should have received a copy of the GNU General Public License
- *     along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-package xyz.quaver.pupil.util
-
-import android.annotation.SuppressLint
-import android.content.Context
-import android.content.Intent
-import android.os.Build
-import androidx.core.content.ContextCompat
-import okhttp3.OkHttpClient
-import okhttp3.Request
-import xyz.quaver.Code
-import xyz.quaver.hitomi.GalleryBlock
-import xyz.quaver.hitomi.Reader
-import xyz.quaver.hitomi.getReferer
-import xyz.quaver.hitomi.imageUrlFromImage
-import xyz.quaver.hiyobi.createImgList
-import java.util.*
-import kotlin.collections.ArrayList
-
-@OptIn(ExperimentalStdlibApi::class)
-fun String.wordCapitalize() : String {
-    val result = ArrayList<String>()
-
-    @SuppressLint("DefaultLocale")
-    for (word in this.split(" "))
-        result.add(word.capitalize(Locale.US))
-
-    return result.joinToString(" ")
-}
-
-private val suffix = listOf(
-    "B",
-    "kB",
-    "MB",
-    "GB",
-    "TB" //really?
-)
-
-fun byteToString(byte: Long, precision : Int = 1) : String {
-    var size = byte.toDouble(); var suffixIndex = 0
-
-    while (size >= 1024) {
-        size /= 1024
-        suffixIndex++
-    }
-
-    return "%.${precision}f ${suffix[suffixIndex]}".format(size)
-}
-
-/**
- * Convert android generated ID to requestCode
- * to prevent java.lang.IllegalArgumentException: Can only use lower 16 bits for requestCode
- *
- * https://stackoverflow.com/questions/38072322/generate-16-bit-unique-ids-in-android-for-startactivityforresult
- */
-fun Int.normalizeID() = this.and(0xFFFF)
-
-fun OkHttpClient.Builder.proxyInfo(proxyInfo: ProxyInfo) = this.apply {
-    proxy(proxyInfo.proxy())
-    proxyInfo.authenticator()?.let {
-        proxyAuthenticator(it)
-    }
-}
-
-val formatMap = mapOf<String, GalleryBlock.() -> (String)>(
-    "-id-" to { id.toString() },
-    "-title-" to { title },
-    "-artist-" to { artists.joinToString() }
-    // TODO
-)
-/**
- * Formats download folder name with given Metadata
- */
-fun GalleryBlock.formatDownloadFolder(): String =
-    Preferences["download_folder_name", "[-id-] -title-"].let {
-        formatMap.entries.fold(it) { str, (k, v) ->
-            str.replace(k, v.invoke(this), true)
-        }
-    }.replace(Regex("""[*\\|"?><:/]"""), "")
-
-fun GalleryBlock.formatDownloadFolderTest(format: String): String =
-    format.let {
-        formatMap.entries.fold(it) { str, (k, v) ->
-            str.replace(k, v.invoke(this), true)
-        }
-    }.replace(Regex("""[*\\|"?><:/]"""), "")
-
-val Reader.requestBuilders: List<Request.Builder>
-    get() {
-        val galleryID = this.galleryInfo.id ?: 0
-        val lowQuality = Preferences["low_quality", true]
-
-        return when(code) {
-            Code.HITOMI -> {
-                this.galleryInfo.files.map {
-                    Request.Builder()
-                        .url(imageUrlFromImage(galleryID, it, !lowQuality))
-                        .header("Referer", getReferer(galleryID))
-                }
-            }
-            Code.HIYOBI -> {
-                createImgList(galleryID, this, lowQuality).map {
-                    Request.Builder()
-                        .url(it.path)
-                }
-            }
-        }
-    }
-
-fun String.ellipsize(n: Int): String =
-    if (this.length > n)
-        this.slice(0 until n) + "…"
-    else
-        this
--- a/app/src/main/java/xyz/quaver/pupil/util/proxy.kt
+++ b/app/src/main/java/xyz/quaver/pupil/util/proxy.kt
@@ -1,58 +0,0 @@
-/*
- *     Pupil, Hitomi.la viewer for Android
- *     Copyright (C) 2020  tom5079
- *
- *     This program is free software: you can redistribute it and/or modify
- *     it under the terms of the GNU General Public License as published by
- *     the Free Software Foundation, either version 3 of the License, or
- *     (at your option) any later version.
- *
- *     This program is distributed in the hope that it will be useful,
- *     but WITHOUT ANY WARRANTY; without even the implied warranty of
- *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *     GNU General Public License for more details.
- *
- *     You should have received a copy of the GNU General Public License
- *     along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-package xyz.quaver.pupil.util
-
-import android.content.Context
-import kotlinx.serialization.Serializable
-import kotlinx.serialization.decodeFromString
-import kotlinx.serialization.encodeToString
-import kotlinx.serialization.json.Json
-import okhttp3.Authenticator
-import okhttp3.Credentials
-import java.net.InetSocketAddress
-import java.net.Proxy
-
-@Serializable
-data class ProxyInfo(
-    val type: Proxy.Type,
-    val host: String? = null,
-    val port: Int? = null,
-    val username: String? = null,
-    val password: String? = null
-) {
-    fun proxy() : Proxy {
-        return if (host.isNullOrBlank() || port == null)
-            return Proxy.NO_PROXY
-        else
-            Proxy(type, InetSocketAddress.createUnresolved(host, port))
-    }
-
-    fun authenticator(): Authenticator? = if (username.isNullOrBlank() || password.isNullOrBlank()) null else
-            Authenticator { _, response ->
-                val credential = Credentials.basic(username, password)
-
-                response.request().newBuilder()
-                    .header("Proxy-Authorization", credential)
-                    .build()
-            }
-
-}
-
-fun getProxyInfo(): ProxyInfo =
-    Json.decodeFromString(Preferences["proxy", Json.encodeToString(ProxyInfo(Proxy.Type.DIRECT))])
--- a/app/src/main/java/xyz/quaver/pupil/util/update.kt
+++ b/app/src/main/java/xyz/quaver/pupil/util/update.kt
@@ -1,336 +0,0 @@
-/*
- *     Pupil, Hitomi.la viewer for Android
- *     Copyright (C) 2019  tom5079
- *
- *     This program is free software: you can redistribute it and/or modify
- *     it under the terms of the GNU General Public License as published by
- *     the Free Software Foundation, either version 3 of the License, or
- *     (at your option) any later version.
- *
- *     This program is distributed in the hope that it will be useful,
- *     but WITHOUT ANY WARRANTY; without even the implied warranty of
- *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *     GNU General Public License for more details.
- *
- *     You should have received a copy of the GNU General Public License
- *     along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-package xyz.quaver.pupil.util
-
-import android.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.hitomi.Reader
-import xyz.quaver.hitomi.getGalleryBlock
-import xyz.quaver.hitomi.getReader
-import xyz.quaver.io.FileX
-import xyz.quaver.io.util.getChild
-import xyz.quaver.io.util.*
-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
-import java.util.*
-
-fun getReleases(url: String) : JsonArray {
-    return try {
-        URL(url).readText().let {
-            Json.parseToJsonElement(it).jsonArray
-        }
-    } catch (e: Exception) {
-        JsonArray(emptyList())
-    }
-}
-
-fun checkUpdate(url: String) : JsonObject? {
-    val releases = getReleases(url)
-
-    if (releases.isEmpty())
-        return null
-
-    return releases.firstOrNull {
-        Preferences["beta"] || it.jsonObject["prerelease"]?.jsonPrimitive?.booleanOrNull == false
-    }?.let {
-        if (it.jsonObject["tag_name"]?.jsonPrimitive?.contentOrNull == BuildConfig.VERSION_NAME)
-            null
-        else
-            it.jsonObject
-    }
-}
-
-fun getApkUrl(releases: JsonObject) : String? {
-    return releases["assets"]?.jsonArray?.firstOrNull {
-        Regex("Pupil-v.+\\.apk").matches(it.jsonObject["name"]?.jsonPrimitive?.contentOrNull ?: "")
-    }.let {
-        it?.jsonObject?.get("browser_download_url")?.jsonPrimitive?.contentOrNull
-    }
-}
-
-fun checkUpdate(context: Context, force: Boolean = false) {
-
-    val preferences = PreferenceManager.getDefaultSharedPreferences(context)
-    val ignoreUpdateUntil = preferences.getLong("ignore_update_until", 0)
-
-    if (!force && ignoreUpdateUntil > System.currentTimeMillis())
-        return
-
-    fun extractReleaseNote(update: JsonObject, locale: Locale) : String {
-        val markdown = update["body"]!!.jsonPrimitive.content
-
-        val target = when(locale.language) {
-            "ko" -> "한국어"
-            "ja" -> "日本語"
-            else -> "English"
-        }
-
-        val releaseNote = Regex("^# Release Note.+$")
-        val language = Regex("^## $target$")
-        val end = Regex("^#.+$")
-
-        var releaseNoteFlag = false
-        var languageFlag = false
-
-        val result = StringBuilder()
-
-        for(line in markdown.lines()) {
-            if (releaseNote.matches(line)) {
-                releaseNoteFlag = true
-                continue
-            }
-
-            if (releaseNoteFlag) {
-                if (language.matches(line)) {
-                    languageFlag = true
-                    continue
-                }
-            }
-
-            if (languageFlag) {
-                if (end.matches(line))
-                    break
-
-                result.append(line+"\n")
-            }
-        }
-
-        return context.getString(R.string.update_release_note, update["tag_name"]?.jsonPrimitive?.contentOrNull, result.toString())
-    }
-
-    CoroutineScope(Dispatchers.Default).launch {
-        val update =
-            checkUpdate(context.getString(R.string.release_url)) ?: return@launch
-
-        val url = getApkUrl(update) ?: return@launch
-
-        val dialog = AlertDialog.Builder(context).apply {
-            setTitle(R.string.update_title)
-            val msg = extractReleaseNote(update, Locale.getDefault())
-            setMessage(Markwon.create(context).toMarkdown(msg))
-            setPositiveButton(android.R.string.ok) { _, _ ->
-
-                val downloadManager = context.getSystemService(Context.DOWNLOAD_SERVICE) as DownloadManager
-
-                //Cancel any download queued before
-
-                val id: Long = Preferences["update_download_id"]
-
-                if (id != -1L)
-                    downloadManager.remove(id)
-
-                val target = File(context.getExternalFilesDir(null), "Pupil.apk").also {
-                    it.delete()
-                }
-
-                val request = DownloadManager.Request(Uri.parse(url))
-                    .setTitle(context.getText(R.string.update_notification_description))
-                    .setDestinationUri(Uri.fromFile(target))
-
-                downloadManager.enqueue(request).also {
-                    Preferences["update_download_id"] = it
-                }
-            }
-            setNegativeButton(if (force) android.R.string.cancel else R.string.ignore_update) { _, _ ->
-                if (!force)
-                    preferences.edit()
-                        .putLong("ignore_update_until", System.currentTimeMillis() + 604800000)
-                        .apply()
-            }
-        }
-
-        launch(Dispatchers.Main) {
-            dialog.show()
-        }
-    }
-}
-
-fun restore(url: String, onFailure: ((Throwable) -> Unit)? = null, onSuccess: ((List<Int>) -> Unit)? = null) {
-    if (!URLUtil.isValidUrl(url)) {
-        onFailure?.invoke(IllegalArgumentException())
-        return
-    }
-
-    val request = Request.Builder()
-        .url(url)
-        .get()
-        .build()
-
-    client.newCall(request).enqueue(object: Callback {
-        override fun onFailure(call: Call, e: IOException) {
-            onFailure?.invoke(e)
-        }
-
-        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 {
-                    favorites.addAll(it)
-                    onSuccess?.invoke(it)
-                }
-            }.onFailure { onFailure?.invoke(it) }
-        }
-    })
-}
-
-private var job: Job? = null
-private val receiver = object: BroadcastReceiver() {
-    val ACTION_CANCEL = "ACTION_IMPORT_CANCEL"
-    override fun onReceive(context: Context?, intent: Intent?) {
-        context ?: return
-
-        when (intent?.action) {
-            ACTION_CANCEL -> {
-                job?.cancel()
-                NotificationManagerCompat.from(context).cancel(R.id.notification_id_import)
-                context.unregisterReceiver(this)
-            }
-        }
-    }
-}
-@SuppressLint("RestrictedApi")
-fun xyz.quaver.pupil.util.downloader.DownloadManager.migrate() {
-    registerReceiver(receiver, IntentFilter().apply { addAction(receiver.ACTION_CANCEL) })
-
-    val notificationManager = NotificationManagerCompat.from(this)
-    val action = NotificationCompat.Action.Builder(0, getText(android.R.string.cancel),
-        PendingIntent.getBroadcast(this, R.id.notification_import_cancel_action.normalizeID(), Intent(receiver.ACTION_CANCEL), PendingIntent.FLAG_UPDATE_CURRENT)
-    ).build()
-    val notification = NotificationCompat.Builder(this, "import")
-        .setContentTitle(getText(R.string.import_old_galleries_notification))
-        .setProgress(0, 0, true)
-        .addAction(action)
-        .setSmallIcon(R.drawable.ic_notification)
-        .setOngoing(true)
-
-    DownloadService.cancel(this)
-
-    job?.cancel()
-    job = CoroutineScope(Dispatchers.IO).launch {
-        val 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/java/xyz/quaver/pupil/PupilGlideModule.kt
+++ b/app/src/main/java/xyz/quaver/pupil/PupilGlideModule.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,23 @@
 *     along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */

-package xyz.quaver.pupil
+package xyz.quaver.pupil.util

 import android.content.Context
-import com.bumptech.glide.Glide
-import com.bumptech.glide.Registry
-import com.bumptech.glide.annotation.GlideModule
-import com.bumptech.glide.integration.okhttp3.OkHttpUrlLoader
-import com.bumptech.glide.load.model.GlideUrl
-import com.bumptech.glide.module.AppGlideModule
-import java.io.InputStream
+import android.content.Intent
+import android.webkit.MimeTypeMap
+import androidx.core.content.FileProvider
+import java.io.File

-@GlideModule
-class PupilGlideModule : AppGlideModule() {
+fun Context.launchApkInstaller(file: File) {
+    val uri = FileProvider.getUriForFile(this, "$packageName.fileprovider", file)

-    override fun registerComponents(context: Context, glide: Glide, registry: Registry) {
-        registry.append(
-            GlideUrl::class.java,
-            InputStream::class.java,
-            OkHttpUrlLoader.Factory(client)
-        )
+    val intent = 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"))
    }

+    startActivity(intent)
 }
--- a/app/src/main/res/anim/shake.xml
+++ b/app/src/main/res/anim/shake.xml
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-  ~     Pupil, Hitomi.la viewer for Android
-  ~     Copyright (C) 2020  tom5079
-  ~
-  ~     This program is free software: you can redistribute it and/or modify
-  ~     it under the terms of the GNU General Public License as published by
-  ~     the Free Software Foundation, either version 3 of the License, or
-  ~     (at your option) any later version.
-  ~
-  ~     This program is distributed in the hope that it will be useful,
-  ~     but WITHOUT ANY WARRANTY; without even the implied warranty of
-  ~     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  ~     GNU General Public License for more details.
-  ~
-  ~     You should have received a copy of the GNU General Public License
-  ~     along with this program.  If not, see <http://www.gnu.org/licenses/>.
-  -->
-
-<translate xmlns:android="http://schemas.android.com/apk/res/android"
-    android:duration="300"
-    android:fromXDelta="0"
-    android:interpolator="@anim/shake_cycle"
-    android:toXDelta="10" />
--- a/app/src/main/res/anim/shake_cycle.xml
+++ b/app/src/main/res/anim/shake_cycle.xml
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-  ~     Pupil, Hitomi.la viewer for Android
-  ~     Copyright (C) 2020  tom5079
-  ~
-  ~     This program is free software: you can redistribute it and/or modify
-  ~     it under the terms of the GNU General Public License as published by
-  ~     the Free Software Foundation, either version 3 of the License, or
-  ~     (at your option) any later version.
-  ~
-  ~     This program is distributed in the hope that it will be useful,
-  ~     but WITHOUT ANY WARRANTY; without even the implied warranty of
-  ~     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  ~     GNU General Public License for more details.
-  ~
-  ~     You should have received a copy of the GNU General Public License
-  ~     along with this program.  If not, see <http://www.gnu.org/licenses/>.
-  -->
-
-<cycleInterpolator xmlns:android="http://schemas.android.com/apk/res/android"
-    android:cycles="3" />
--- a/app/src/main/res/color/lock_fab.xml
+++ b/app/src/main/res/color/lock_fab.xml
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-  ~     Pupil, Hitomi.la viewer for Android
-  ~     Copyright (C) 2020  tom5079
-  ~
-  ~     This program is free software: you can redistribute it and/or modify
-  ~     it under the terms of the GNU General Public License as published by
-  ~     the Free Software Foundation, either version 3 of the License, or
-  ~     (at your option) any later version.
-  ~
-  ~     This program is distributed in the hope that it will be useful,
-  ~     but WITHOUT ANY WARRANTY; without even the implied warranty of
-  ~     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  ~     GNU General Public License for more details.
-  ~
-  ~     You should have received a copy of the GNU General Public License
-  ~     along with this program.  If not, see <http://www.gnu.org/licenses/>.
-  -->
-
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:state_enabled="false" android:color="@android:color/darker_gray"/>
-    <item android:color="@color/colorPrimary"/>
-</selector>
--- a/app/src/main/res/drawable-hdpi/ic_email.png
+++ b/app/src/main/res/drawable-hdpi/ic_email.png
--- a/app/src/main/res/drawable-hdpi/ic_fullscreen.png
+++ b/app/src/main/res/drawable-hdpi/ic_fullscreen.png
--- a/app/src/main/res/drawable-hdpi/ic_help.png
+++ b/app/src/main/res/drawable-hdpi/ic_help.png
--- a/app/src/main/res/drawable-hdpi/ic_home.png
+++ b/app/src/main/res/drawable-hdpi/ic_home.png
--- a/app/src/main/res/drawable-hdpi/ic_notification.png
+++ b/app/src/main/res/drawable-hdpi/ic_notification.png
--- a/app/src/main/res/drawable-hdpi/ic_settings.png
+++ b/app/src/main/res/drawable-hdpi/ic_settings.png
--- a/app/src/main/res/drawable-mdpi/ic_email.png
+++ b/app/src/main/res/drawable-mdpi/ic_email.png
--- a/app/src/main/res/drawable-mdpi/ic_fullscreen.png
+++ b/app/src/main/res/drawable-mdpi/ic_fullscreen.png
--- a/app/src/main/res/drawable-mdpi/ic_help.png
+++ b/app/src/main/res/drawable-mdpi/ic_help.png
--- a/app/src/main/res/drawable-mdpi/ic_home.png
+++ b/app/src/main/res/drawable-mdpi/ic_home.png
--- a/app/src/main/res/drawable-mdpi/ic_notification.png
+++ b/app/src/main/res/drawable-mdpi/ic_notification.png
--- a/app/src/main/res/drawable-mdpi/ic_settings.png
+++ b/app/src/main/res/drawable-mdpi/ic_settings.png
--- a/app/src/main/res/drawable-xhdpi/ic_email.png
+++ b/app/src/main/res/drawable-xhdpi/ic_email.png
--- a/app/src/main/res/drawable-xhdpi/ic_fullscreen.png
+++ b/app/src/main/res/drawable-xhdpi/ic_fullscreen.png
--- a/app/src/main/res/drawable-xhdpi/ic_help.png
+++ b/app/src/main/res/drawable-xhdpi/ic_help.png
--- a/app/src/main/res/drawable-xhdpi/ic_home.png
+++ b/app/src/main/res/drawable-xhdpi/ic_home.png
--- a/app/src/main/res/drawable-xhdpi/ic_notification.png
+++ b/app/src/main/res/drawable-xhdpi/ic_notification.png
--- a/app/src/main/res/drawable-xhdpi/ic_settings.png
+++ b/app/src/main/res/drawable-xhdpi/ic_settings.png
--- a/app/src/main/res/drawable-xxhdpi/ic_email.png
+++ b/app/src/main/res/drawable-xxhdpi/ic_email.png
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
tom5079	a4e8f20b26	Dependency update, added LocalActivity provider	2022-11-08 14:21:37 -08:00
tom5079	4531a6b05f	Merge pull request #133 from tom5079/Pupil-129 Pupil-129 [Source] Implement in-app update	2022-05-06 12:49:00 +09:00
tom5079	2ef70d0da0	Update Jetpack Compose version to 1.2.0-alpha07	2022-05-06 12:48:19 +09:00
tom5079	4fe769cbbf	Pupil-129 [Source] Implement in-app update	2022-05-02 21:29:58 +09:00
tom5079	de068a760e	Changed PupilHttpClient.downloadApk to receive url instead of RemoteSourceInfo	2022-05-02 16:48:57 +09:00
tom5079	a183ff803d	Delete SourceLoaderInstrumentedTest	2022-05-02 16:48:10 +09:00
tom5079	e84c381423	Added latestRelease to PupilHttpClient	2022-05-02 16:47:36 +09:00
tom5079	85a7eeeeea	Remove unnecessary annotations	2022-05-01 15:43:00 +09:00
tom5079	0d9fb97bbb	Show update button in Explore menu when installed version is not the latest	2022-05-01 15:42:03 +09:00
tom5079	9ed3631c30	Merge pull request #132 from tom5079/Pupil-130 Pupil-130 [Source] Show progress indicator right away when update button is clicked	2022-05-01 15:36:54 +09:00
tom5079	0a68df6492	Pupil-130 [Source] Show progress indicator right away when update button is clicked	2022-05-01 15:36:12 +09:00
tom5079	f3f47d9407	Implement source update Refactor codes for testability	2022-04-30 22:48:29 +09:00
tom5079	b6ff956637	Migrate to ktor 2.0	2022-04-24 21:06:29 +09:00
tom5079	aa99c18a1b	updated .gitignore	2022-04-16 06:28:54 +09:00
tom5079	1be5ecac6b	updated .gitignore	2022-04-16 06:27:01 +09:00
tom5079	c8eff885b5	updated .gitignore	2022-04-16 06:26:48 +09:00
tom5079	e0eb187442	updated .gitignore	2022-04-16 06:25:36 +09:00
tom5079	0fbce15e41	AGP update	2022-04-13 08:44:22 +09:00
tom5079	f11dce968e	Cache loadSource	2022-04-04 23:46:32 +09:00
tom5079	df341c777e	clean up dependencies	2022-04-04 11:42:21 +09:00
tom5079	bed6d7d6ab	Removed build files from repository	2022-04-03 23:25:35 +09:00
tom5079	97eb85e97c	windowSoftInputMode="adjustResize" for Insets	2022-04-02 11:30:54 +09:00
tom5079	4448f61430	Sign release build	2022-04-01 18:52:04 +09:00
tom5079	9beb4ded2e	Added Crossfade when entering source	2022-04-01 16:27:42 +09:00
tom5079	fc3a0fa178	Fixed app crashing when using rememberInstance() to retrieve Application Applied systemBarsPadding() to SourceSelector Dependency Update	2022-04-01 16:20:28 +09:00
tom5079	03e71b3000	AGP update	2022-02-21 11:50:36 +09:00
tom5079	8503c64f04	Import optimizations	2022-01-22 20:13:28 +09:00
tom5079	0dd25faced	Implemented source launching	2022-01-22 19:59:43 +09:00
tom5079	00cf429bd9	Dependency update	2022-01-02 16:00:00 +09:00
tom5079	628d42703f	Dependency update	2022-01-01 16:30:29 +09:00
tom5079	f271e61ea2	External Sources	2021-12-31 14:03:52 +09:00
tom5079	2e11a4907a	Prepare to export sources	2021-12-30 13:00:22 +09:00
tom5079	0e19d6c9b2	[Manatoki] Fixed crashing	2021-12-27 12:33:57 +09:00
tom5079	850ac3ea83	Decentralize database	2021-12-27 11:57:26 +09:00
tom5079	c3c5761ffa	[Manatoki] Implemented next episode button in reader [Hitomi] Adjusted Search result padding	2021-12-26 21:19:51 +09:00
tom5079	0ff91d76b1	[Manatoki] Fixed app crash when clicking list in reader	2021-12-26 15:32:05 +09:00
tom5079	cd4be5898b	Beta bad	2021-12-26 15:10:02 +09:00
tom5079	d80de6fde7	Dependency Update	2021-12-26 13:10:00 +09:00
tom5079	193db578f0	Fixed layout [Hitomi] Fixed image not loading	2021-12-26 12:28:52 +09:00
tom5079	3abd015505	Dependency upgrade [Manatoki] Implemented Artist suggestions	2021-12-26 11:46:51 +09:00
tom5079	84c536a597	[Manatoki] Implemented Recent page	2021-12-26 10:09:41 +09:00
tom5079	480bbd3628	[ReaderBase] Fixed No Padding + Horizontal layout not working	2021-12-26 09:23:14 +09:00
tom5079	b708437a16	Fixed a few things... Can't really write them all down :v	2021-12-25 23:33:13 +09:00
tom5079	fcbe107fe7	[Reader] Enable Gesture, Adjusted BrokenImage tint [NetworkCache] Don't download existing file again	2021-12-25 14:19:28 +09:00
tom5079	bf3e7d7117	[Reader] Improved layout config	2021-12-25 10:56:56 +09:00
tom5079	f78c66a9f4	[Reader] WIP	2021-12-24 17:10:22 +09:00
tom5079	7e52a2e296	[Reader] ReaderOptions TopSheet	2021-12-23 22:37:38 +09:00
tom5079	4625bb5806	[Manatoki] MangaListingBottomSheet show current item indicator	2021-12-22 21:33:55 +09:00
tom5079	d626cc09d5	[Manatoki] cache all requests	2021-12-22 21:23:10 +09:00
tom5079	57c4e249cf	[Manatoki] changed mangaListing scroll behavior to instant	2021-12-22 18:43:10 +09:00
tom5079	016ce3ff42	Renamed SearchOptionDrawer to ModalTopSheetLayout and promoted to shared composables	2021-12-22 18:32:48 +09:00
tom5079	383baa900c	[Manatoki] Fixed tag not visible on MangaListingBottomSheet	2021-12-22 18:25:33 +09:00
tom5079	551b4cae80	[Manatoki] Search text fillMaxWidth	2021-12-21 19:58:20 +09:00
tom5079	0c13ad6869	Fixed unable to download files without extension	2021-12-21 19:12:37 +09:00
tom5079	8b2e388a81	[Manatoki] Bug fix	2021-12-21 19:05:15 +09:00
tom5079	c34b0f6f0f	[Manatoki] Drawer highlight	2021-12-21 18:04:54 +09:00
tom5079	f6f0ed40c1	Reader bug fix	2021-12-20 18:04:29 +09:00
tom5079	b82ef8695c	[Manatoki] Main/Reader OK	2021-12-20 11:44:13 +09:00
tom5079	0f4e1a8e0d	Readerbase actions	2021-12-19 12:42:19 +09:00
tom5079	20ddf04614	Insets Nested navigation Hitomi main actions	2021-12-19 12:33:47 +09:00
tom5079	7befa24aff	Pageturn	2021-12-19 00:07:38 +09:00
tom5079	93d68d3867	Fix navigation bug	2021-12-18 22:07:09 +09:00
tom5079	9037b41b49	WIP	2021-12-18 20:19:06 +09:00
tom5079	02751233f8	Manatoki	2021-12-18 14:57:25 +09:00
tom5079	a57b1d5614	[WIP] Pageturn	2021-12-18 13:32:07 +09:00
tom5079	adf18341d0	Changed app name to Pupil-Beta	2021-12-18 09:36:46 +09:00
tom5079	bdd2bc8645	Share image with long click	2021-12-18 00:48:49 +09:00
tom5079	338b789e62	Protobuf	2021-12-18 00:23:27 +09:00
tom5079	98fda1a53f	Bookmark	2021-12-17 22:34:46 +09:00
tom5079	e7debfec46	Gestures OpenWithIDDialog	2021-12-17 20:39:30 +09:00
tom5079	62d0de3ef6	Changed Theme / Deprecated Preferences. Use DataStore instead.	2021-12-17 11:56:34 +09:00
tom5079	ef0f71310b	Code Refactor / Dependency Update	2021-12-17 11:23:32 +09:00
tom5079	052990c4ef	Added hiyobi.io	2021-12-16 22:51:17 +09:00
tom5079	077d9b976c	SourceSelectDialog	2021-12-16 16:38:59 +09:00
tom5079	78ba11ca5f	NetworkCache	2021-12-16 12:19:32 +09:00
tom5079	b690d01243	FloatingSearchBar	2021-12-15 16:30:05 +09:00
tom5079	458530e80c	[WIP]	2021-12-14 22:19:15 +09:00
tom5079	ddbfd0a201	Copyright	2021-12-12 19:19:26 +09:00
tom5079	6c13a624a9	Shows Image	2021-12-01 17:18:19 +09:00
tom5079	70452ba7a6	Dependency update	2021-11-25 10:17:05 +09:00
tom5079	14c64299ec	WIP	2021-09-18 14:48:55 +09:00
tom5079	c2626cdee4	[Reader] Implemented Fullscreen	2021-09-17 18:26:45 +09:00
tom5079	52a945d0d9	Floating Menu	2021-09-17 17:25:21 +09:00
tom5079	29aefa4197	Floating Menu	2021-09-17 17:22:41 +09:00
tom5079	cfe6a814d4	[FAB] WIP	2021-09-17 10:22:30 +09:00
tom5079	9ef7852bab	WIP	2021-09-16 23:04:32 +09:00
tom5079	0a1e0a2dcf	WIP	2021-09-15 11:15:09 +09:00
tom5079	5b9a83cbcc	dependency update	2021-07-24 13:06:20 +09:00
tom5079	fc61522955	Migrate to Kotlin DSL	2021-07-24 12:41:26 +09:00
tom5079	35ee438376	Reimplemented sort [WIP] ImHentai	2021-07-24 09:48:54 +09:00
tom5079	8cc89101e7	changed di() to closestDI()	2021-07-14 09:04:38 +09:00
tom5079	2150d086e0	Migrated to Ktor-client	2021-07-12 08:44:43 +09:00
tom5079	a9a07ddcfa	Simplify Source definition	2021-07-03 23:22:41 +09:00
tom5079	32d49833d8	LF to CRLF	2021-07-03 09:01:56 +09:00
tom5079	2a92d287af	Download tab	2021-06-25 14:45:10 +09:00
tom5079	975b98e4dc	Show progress drawable when backup	2021-06-24 19:15:19 +09:00
tom5079	237d5accc5	WIP	2021-06-18 07:27:33 +09:00
tom5079	760194bde8	[WIP] Downloads	2021-06-08 18:24:52 +09:00
tom5079	ff0df0d9cc	Fixed radio button acting up	2021-06-08 15:57:22 +09:00
tom5079	dd60a1fdfb	Source settings	2021-05-18 10:39:35 +09:00
tom5079	5a19fb8336	show languages in local name	2021-05-15 19:27:07 +09:00
tom5079	51851addc1	Dependency update / Dropped features that supports <Android 21 / Dropped support for hiyobi.me	2021-05-15 06:43:14 +09:00
tom5079	00c8078642	fixed SavedCollections not inserting first item	2021-04-04 15:43:42 +09:00
tom5079	ca54fb6eb0	Fixed Proxy dialog	2021-04-04 08:38:50 +09:00
tom5079	1107cf1a9c	Dependency update	2021-04-04 08:28:22 +09:00
tom5079	1dea88a135	Dependency update	2021-03-14 14:34:59 +09:00
tom5079	6fae9e9a30	Dependency update	2021-03-11 12:32:34 +09:00
tom5079	a1c6d87c54	Added History	2021-02-21 10:34:26 +09:00
tom5079	80b7293879	Patched memory leak	2021-02-17 20:20:32 +09:00
tom5079	2f57ee4c83	Handle backpress	2021-02-17 19:25:45 +09:00
tom5079	3f8aa744e7	Fixed app crashing on invoking MainViewModel.sourceName.value	2021-02-17 19:12:42 +09:00
tom5079	fb11149b78	Dependency update	2021-02-13 17:19:52 +09:00
tom5079	8b41c706b6	WIP	2021-02-11 19:27:02 +09:00
tom5079	5a61fcf6ee	WIP	2021-02-11 19:24:40 +09:00
tom5079	c7b3ae7ed1	Gallery Dialog	2021-01-29 19:44:09 +09:00
tom5079	4aea7d08ce	fixed cleanup() deleting .cache fixed empty tag showing up	2021-01-18 22:17:48 +09:00
tom5079	2f16838e1e	Cache	2021-01-18 21:50:21 +09:00
tom5079	619730e2ab	WIP	2021-01-09 19:18:26 +09:00
tom5079	c8aa26e2d9	SAF	2020-12-27 19:36:23 +09:00
tom5079	8703fde9b1	WIP	2020-12-27 13:39:57 +09:00
tom5079	3051d800bd	WIP	2020-12-23 17:09:48 +09:00
tom5079	521f3ad809	Images	2020-12-04 01:09:22 +09:00
tom5079	730a3baedc	Suggestion	2020-12-02 09:57:16 +09:00
tom5079	26c5e07f04	Minor fix	2020-11-29 15:23:16 +09:00
tom5079	3feae80359	Implemented Source Selector	2020-11-29 14:09:34 +09:00
tom5079	24aedfc400	Minor fix	2020-11-29 14:09:34 +09:00
tom5079	aa6cc80172	Rebase source onto dev	2020-11-29 14:02:49 +09:00
tom5079	74ed9e9e42	Fixed `show extra tags` button not showing up & version up	2020-11-29 14:02:47 +09:00
tom5079	2b7b86da96	fixed gallery import	2020-11-29 14:02:42 +09:00
tom5079	9f9a4c81b3	migrated to ViewBinding	2020-11-29 14:01:56 +09:00
tom5079	d567b30f4b	Fixed typo & Built apk	2020-11-29 14:01:56 +09:00
tom5079	6d7c4ce0ab	Fixed `show extra tags` button not showing up & version up	2020-11-29 14:01:51 +09:00
tom5079	e062b8f9e9	Implemented proper Page Turn without relying on RecyclerView	2020-11-29 14:01:46 +09:00
tom5079	08403b7a4e	fixed gallery import	2020-11-29 14:01:41 +09:00
tom5079	c6ed5d35e7	ProgressCard	2020-11-29 14:01:25 +09:00
tom5079	dba3460b60	Fixes unable to recursively delete when the download folder is not not SAF based	2020-11-29 14:01:09 +09:00
tom5079	f07f624fcf	search bug fix	2020-10-25 00:15:21 +09:00
tom5079	48ff2f328f	search bug fix	2020-10-24 23:55:50 +09:00
tom5079	9ae2423a40	search bug fix	2020-10-24 23:05:11 +09:00
tom5079	2bc3c78c75	search bug fix	2020-10-24 23:04:49 +09:00
tom5079	18e9fe75fb	hiyobi.me fix	2020-10-24 11:48:14 +09:00
tom5079	880a741a44	hiyobi.me fix	2020-10-24 11:25:16 +09:00
tom5079	2c6ddcc64b	hitomi.la image not loading fix	2020-10-21 14:42:07 +09:00
tom5079	8f2e757b77	Update README.md	2020-10-15 15:53:30 +09:00
tom5079	ff177955b3	Update README.md	2020-10-15 15:49:07 +09:00
tom5079	8bb8066a98	Apk built	2020-10-15 14:37:13 +09:00
tom5079	2747ddbf65	Adjust gallery_id margin	2020-10-15 14:32:36 +09:00
tom5079	b939e9424d	Translate tag by default	2020-10-15 14:29:22 +09:00
tom5079	fb9dea5d1e	Copy galleryID by clicking galleryblock_id	2020-10-15 12:52:38 +09:00
tom5079	da4d5d711b	Prefetch Resolves #109	2020-10-15 10:20:36 +09:00
tom5079	331cbec5f1	Bug fix	2020-10-14 18:36:36 +09:00
tom5079	7f02284285	Update README.md	2020-10-14 00:26:06 +09:00
tom5079	ac2c3a6d97	Merge remote-tracking branch 'origin/master' into master	2020-10-14 00:25:44 +09:00
tom5079	c3bc80fec6	Bug fix	2020-10-14 00:24:38 +09:00
tom5079	09779a0710	Update README.md	2020-10-13 23:47:56 +09:00
tom5079	e82c6ef866	App built Possible build time optimization	2020-10-13 23:40:53 +09:00
tom5079	861ae9be64	Merge remote-tracking branch 'origin/dev' into dev	2020-10-13 23:34:28 +09:00
tom5079	96108bc1ec	Improves Scroll Jitter	2020-10-13 23:34:16 +09:00
tom5079	016f217db0	Merge pull request #108 from klx7007/patch-1 Fix FloatingSearchView imeOptions to only affect keyboard visibility	2020-10-13 23:05:34 +09:00
tom5079	0688294f18	Dependency update Support non external storage document Uris Support non external storage document Uris	2020-10-13 22:59:29 +09:00
klx7007	9ad008255d	FloatingSearchView imeOptions 수정 imeOption을 덮어씌워서 search할때 키보드만 숨겨짐	2020-10-13 22:58:13 +09:00
tom5079	4c5a862dd6	Update README.md	2020-10-13 17:57:19 +09:00
tom5079	b165a2308f	Merge remote-tracking branch 'origin/master' into master	2020-10-13 17:13:10 +09:00
tom5079	8757b08cd2	Fixed pagecount not showing up	2020-10-13 17:12:53 +09:00
tom5079	3800543fba	Update README.md	2020-10-13 13:59:02 +09:00
tom5079	02ef60c818	Update README.md	2020-10-13 13:57:23 +09:00
tom5079	88f3b30266	Merge branch 'dev' into master	2020-10-13 13:52:34 +09:00
tom5079	9203dc0112	Tag translation	2020-10-13 13:51:53 +09:00
tom5079	4c683bec68	Dependency update Fixes concurrentmodificationexception	2020-10-13 08:34:04 +09:00
tom5079	0cfd1eb453	Update README.md	2020-10-04 23:05:30 +09:00
tom5079	19744dab37	Merge remote-tracking branch 'origin/master' into master	2020-10-04 23:04:30 +09:00
tom5079	12d58e5aa7	Don't cancel download onPause	2020-10-04 23:04:12 +09:00
tom5079	e46dd37a26	Update README.md	2020-10-04 22:47:45 +09:00
tom5079	49c3ebc36b	Concurrency issue fixed Don't cancel download onPause Limit folder length to 127 characters	2020-10-04 22:44:31 +09:00
tom5079	11e9bc2235	Added five entries per page option	2020-10-04 20:39:33 +09:00
tom5079	3029b3bf0e	Update README.md	2020-10-03 20:20:41 +09:00
tom5079	9a6c6f67ce	Merge branch 'dev' into master	2020-10-03 20:18:53 +09:00
tom5079	a6ed0baef2	Fix auto cache cleanup	2020-10-03 20:18:20 +09:00
tom5079	d3b43d80da	Update README.md	2020-10-03 10:06:17 +09:00
tom5079	46d4316d49	Merge remote-tracking branch 'origin/master' into master	2020-10-03 10:05:30 +09:00
tom5079	ade2864351	Fix auto cache cleanup	2020-10-03 10:03:57 +09:00
tom5079	365fc56e9d	Update README.md	2020-10-02 13:09:46 +09:00
tom5079	54a5cd21ea	Merge branch 'dev' into master	2020-10-02 13:00:02 +09:00
tom5079	38c0399b09	App built	2020-10-02 12:59:32 +09:00
tom5079	2b67858453	Auto cache clean	2020-10-02 12:51:59 +09:00
tom5079	87fdbdbb6e	Open GalleryDialog first instead of opening Reader directly	2020-10-02 00:19:56 +09:00
tom5079	bab77a4116	(KO) Added support link	2020-10-02 00:13:34 +09:00
tom5079	d20756ab96	Reset security mode	2020-10-01 22:51:52 +09:00
tom5079	dc75a753c3	Minimum thumbnail height	2020-10-01 22:46:03 +09:00
tom5079	4712d47903	Show 10 tags maximum	2020-10-01 22:20:49 +09:00
tom5079	c5561801e1	Add group name to GalleryBlock	2020-10-01 21:32:42 +09:00
tom5079	5c259fa07a	Dependency update Fixed duplicated download file Better download progress update handling TODO: Add group name to GalleryBlock	2020-10-01 21:24:32 +09:00
tom5079	60e8b18702	Update README.md	2020-09-29 16:53:15 +09:00
tom5079	a8317824a9	Merge remote-tracking branch 'origin/master' into master	2020-09-27 21:40:32 +09:00
tom5079	0c3c78cc72	Fixed app crashing when loading thumbnail	2020-09-27 21:40:22 +09:00
tom5079	cfd4a8faac	Update README.md	2020-09-27 21:39:05 +09:00
tom5079	7f3fb0db0d	Update README.md	2020-09-27 20:30:47 +09:00
tom5079	385d3f0d1b	Update README.md	2020-09-27 20:29:50 +09:00
tom5079	8fa6bd12a2	Update README.md	2020-09-27 20:27:29 +09:00
tom5079	57c2004e46	Update README.md	2020-09-27 20:21:45 +09:00
tom5079	c6b069bbfb	Update README.md	2020-09-27 20:19:53 +09:00
tom5079	c18bffd08f	Fixed app crashing when thumbnail is null	2020-09-27 20:18:04 +09:00
tom5079	47ec181439	Fixed app crashing when thumbnail is null	2020-09-27 20:15:43 +09:00
tom5079	90ad40b1b7	Update README.md	2020-09-27 19:32:18 +09:00
tom5079	4d3f20cf98	Update README.md	2020-09-27 19:31:30 +09:00
tom5079	86df9d52bc	Update README.md	2020-09-27 19:15:46 +09:00
tom5079	1bd025e070	Fixed ProxyDialog not showing up	2020-09-27 15:09:19 +09:00
tom5079	86ee239c71	App built	2020-09-27 14:39:47 +09:00
tom5079	27d0c01e1f	Don't refresh onResume	2020-09-27 14:37:16 +09:00
tom5079	7a9507be01	Somewhat working	2020-09-27 14:29:02 +09:00
tom5079	1490035893	Does not work	2020-09-27 10:04:26 +09:00
tom5079	a6afcb0ed0	Consistent usage of quotation marks	2020-09-26 22:41:51 +09:00
tom5079	ea7e8584cb	Consistent usage of quotation marks	2020-09-26 22:36:48 +09:00
tom5079	608c6e6a1d	App built	2020-09-26 21:01:36 +09:00
tom5079	bb2c91145f	Dependency update	2020-09-26 20:58:46 +09:00
tom5079	db074df0f7	Fixed Download Concurrency issue Fixed image not showing up after reader is paused and resumed	2020-09-26 11:07:35 +09:00
tom5079	f7c45df9a6	Tag favorite bug fix	2020-09-26 09:36:20 +09:00
tom5079	44e3d16cd6	Merge branch 'dev' into master	2020-09-26 09:08:29 +09:00
tom5079	a973cdfe0b	Download Bug fix Added favorite to TagChip Improved eyeblink recognition	2020-09-26 09:07:52 +09:00
tom5079	fca42c79a8	Updated startActivityForResult to launchers	2020-09-25 15:39:07 +09:00
tom5079	f236775599	Bug fix Remember thin mode preference TagChip favorites	2020-09-25 15:17:05 +09:00
tom5079	360decd37c	FloatingSearchView migration	2020-09-16 14:31:45 +09:00
tom5079	998433479b	Merge branch 'dev' into master	2020-09-15 23:20:01 +09:00
tom5079	c7e75aacf0	Layout fix History fix	2020-09-15 23:19:26 +09:00
tom5079	690338273a	Merge branch 'dev' into master	2020-09-15 02:42:33 +09:00
tom5079	4207ea494d	Bug fix	2020-09-15 02:42:18 +09:00
				`@@ -0,0 +1 @@`
				`{"installed":{"client_id":"644157827114-rnbcmlqiaqgg295o45kavchnvi3dedbo.apps.googleusercontent.com","project_id":"pupil-1598439316578","auth_uri":"https://accounts.google.com/o/oauth2/auth","token_uri":"https://oauth2.googleapis.com/token","auth_provider_x509_cert_url":"https://www.googleapis.com/oauth2/v1/certs","redirect_uris":["urn:ietf:wg:oauth:2.0:oob","http://localhost"]}}`