tag suggestion

Pupil 116 Favorite tag backup

.gitignore

@@ -1,19 +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
+# Google Services (e.g. APIs or Firebase)
+google-services.json
+
+# Android Profiling
+*.hprof

.idea/codeStyles/Project.xml

@@ -1,123 +0,0 @@
-<component name="ProjectCodeStyleConfiguration">
-  <code_scheme name="Project" version="173">
-    <option name="RIGHT_MARGIN" value="120" />
-    <JetCodeStyleSettings>
-      <option name="CODE_STYLE_DEFAULTS" value="KOTLIN_OFFICIAL" />
-    </JetCodeStyleSettings>
-    <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>

.idea/codeStyles/codeStyleConfig.xml

@@ -1,5 +0,0 @@
-<component name="ProjectCodeStyleConfiguration">
-  <state>
-    <option name="USE_PER_PROJECT_SETTINGS" value="true" />
-  </state>
-</component>

.idea/copyright/Apache.xml

@@ -1,6 +0,0 @@
-<component name="CopyrightManager">
-  <copyright>
-    <option name="notice" value="   Copyright &amp;#36;today.year tom5079&#10;&#10;   Licensed under the Apache License, Version 2.0 (the &quot;License&quot;);&#10;   you may not use this file except in compliance with the License.&#10;   You may obtain a copy of the License at&#10;&#10;     http://www.apache.org/licenses/LICENSE-2.0&#10;&#10;   Unless required by applicable law or agreed to in writing, software&#10;   distributed under the License is distributed on an &quot;AS IS&quot; BASIS,&#10;   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.&#10;   See the License for the specific language governing permissions and&#10;   limitations under the License." />
-    <option name="myName" value="Apache" />
-  </copyright>
-</component>

.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>

.idea/copyright/profiles_settings.xml

@@ -1,8 +0,0 @@
-<component name="CopyrightManager">
-  <settings>
-    <module2copyright>
-      <element module="Pupil" copyright="GPL" />
-      <element module="libpupil" copyright="Apache" />
-    </module2copyright>
-  </settings>
-</component>

.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>

.idea/gradle.xml

@@ -1,21 +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" />
-            <option value="$PROJECT_DIR$/libpupil" />
-          </set>
-        </option>
-        <option name="resolveModulePerSourceSet" value="false" />
-      </GradleProjectSettings>
-    </option>
-  </component>
-</project>

.idea/jarRepositories.xml

@@ -1,55 +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>
-  </component>
-</project>

.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>

.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>

.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>

.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>

.idea/scopes/Pupil.xml

@@ -1,3 +0,0 @@
-<component name="DependencyValidationManager">
-  <scope name="Pupil" pattern="file[app]:*/" />
-</component>

.idea/scopes/libpupil.xml

@@ -1,3 +0,0 @@
-<component name="DependencyValidationManager">
-  <scope name="libpupil" pattern="file[libpupil]:*/" />
-</component>

.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>

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://discordapp.com/api/guilds/610452916612104194/embed.png?style=banner2)](https://discord.gg/Stj4b5v)  
+![](https://img.shields.io/github/downloads/tom5079/Pupil/total)  
+[![](https://img.shields.io/github/downloads/tom5079/Pupil/5.3.8-hotfix1/Pupil-v5.3.8-hotfix1.apk?color=%234fc3f7&label=DOWNLOAD%20APP&style=for-the-badge)](https://github.com/tom5079/Pupil/releases/download/5.3.8-hotfix1/Pupil-v5.3.8-hotfix1.apk)  
+[![](https://discordapp.com/api/guilds/610452916612104194/embed.png?style=banner2)](https://discord.gg/Stj4b5v)
 
-# 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 appreciated. Feel free to leave PR!
+
+## Tag Translation
+Head over to [tags branch](https://github.com/tom5079/Pupil/tree/tags)

app/build.gradle

@@ -1,98 +0,0 @@
-apply plugin: 'com.android.application'
-apply plugin: 'kotlin-android'
-apply plugin: 'kotlin-kapt'
-apply plugin: 'kotlin-android-extensions'
-apply plugin: 'kotlinx-serialization'
-
-if (file("google-services.json").exists() && file("src/debug/google-services.json").exists()) {
-    logger.lifecycle("Firebase Enabled")
-    apply plugin: 'com.google.gms.google-services'
-    apply plugin: 'com.google.firebase.crashlytics'
-    apply plugin: 'com.google.firebase.firebase-perf'
-} else {
-    logger.lifecycle("Firebase Disabled")
-}
-
-android {
-    compileSdkVersion 29
-    defaultConfig {
-        applicationId "xyz.quaver.pupil"
-        minSdkVersion 16
-        targetSdkVersion 29
-        versionCode 57
-        versionName "4.20"
-        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
-        multiDexEnabled true
-        vectorDrawables.useSupportLibrary = true
-    }
-    buildTypes {
-        debug {
-            debuggable true
-            applicationIdSuffix ".debug"
-            versionNameSuffix "-DEBUG"
-
-            buildConfigField('Boolean', 'CENSOR', 'false')
-            proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
-        }
-        release {
-            buildConfigField('Boolean', 'CENSOR', 'false')
-            proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
-        }
-    }
-    kotlinOptions {
-        freeCompilerArgs += '-Xuse-experimental=kotlin.Experimental'
-    }
-    compileOptions {
-        sourceCompatibility JavaVersion.VERSION_1_8
-        targetCompatibility JavaVersion.VERSION_1_8
-    }
-    buildToolsVersion = '29.0.3'
-}
-
-dependencies {
-    def markwonVersion = '3.1.0'
-
-    implementation fileTree(dir: 'libs', include: ['*.jar', '*.aar'])
-    implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version"
-    implementation "org.jetbrains.kotlinx:kotlinx-coroutines-core:1.3.7"
-    implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:1.3.7"
-    implementation "org.jetbrains.kotlinx:kotlinx-serialization-runtime:0.20.0"
-    implementation 'androidx.appcompat:appcompat:1.1.0'
-    implementation 'androidx.constraintlayout:constraintlayout:1.1.3'
-    implementation 'androidx.preference:preference:1.1.1'
-    implementation 'androidx.gridlayout:gridlayout:1.0.0'
-    implementation "androidx.biometric:biometric:1.0.1"
-    implementation 'androidx.multidex:multidex:2.0.1'
-    implementation "com.daimajia.swipelayout:library:1.2.0@aar"
-    implementation 'com.google.android.material:material:1.3.0-alpha02'
-    implementation 'com.google.firebase:firebase-core:17.4.4'
-    implementation 'com.google.firebase:firebase-analytics:17.4.4'
-    implementation 'com.google.firebase:firebase-crashlytics:17.1.1'
-    implementation 'com.google.firebase:firebase-perf:19.0.8'
-    implementation 'com.github.arimorty:floatingsearchview:2.1.1'
-    implementation 'com.github.clans:fab:1.6.4'
-    implementation 'com.github.bumptech.glide:glide:4.11.0'
-    implementation "com.github.bumptech.glide:okhttp3-integration:4.11.0"
-    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 '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:${markwonVersion}"
-    testImplementation 'junit:junit:4.13'
-    androidTestImplementation 'androidx.test.ext:junit:1.1.1'
-    androidTestImplementation 'androidx.test:rules:1.2.0'
-    androidTestImplementation 'androidx.test:runner:1.2.0'
-    androidTestImplementation 'androidx.test.espresso:espresso-core:3.2.0'
-    implementation project(path: ':libpupil')
-}
-
-androidExtensions {
-    experimental = true
-}

app/build.gradle.kts

@@ -0,0 +1,95 @@
+plugins {
+    alias(libs.plugins.org.jetbrains.kotlin.android)
+    alias(libs.plugins.android.application)
+    alias(libs.plugins.compose.compiler)
+    alias(libs.plugins.googleServices)
+    alias(libs.plugins.ksp)
+    alias(libs.plugins.hilt)
+    alias(libs.plugins.kotlinx.serialization)
+    alias(libs.plugins.crashlytics)
+}
+
+android {
+    namespace = "xyz.quaver.pupil"
+    defaultConfig {
+        applicationId = "xyz.quaver.pupil"
+        minSdk = libs.versions.android.minSdk.get().toInt()
+        compileSdk = libs.versions.android.compileSdk.get().toInt()
+        targetSdk = libs.versions.android.targetSdk.get().toInt()
+        versionCode = 69
+        versionName = "6.0.0"
+        testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
+    }
+    buildTypes {
+        getByName("debug") {
+            isMinifyEnabled = false
+            isShrinkResources = false
+            isDebuggable = true
+            applicationIdSuffix = ".debug"
+            versionNameSuffix = "-DEBUG"
+            ext.set("enableCrashlytics", false)
+            ext.set("alwaysUpdateBuildId", false)
+        }
+        getByName("release") {
+            isMinifyEnabled = true
+            isShrinkResources = true
+            proguardFiles(
+                getDefaultProguardFile("proguard-android-optimize.txt"),
+                "proguard-rules.pro"
+            )
+        }
+    }
+    buildFeatures {
+        compose = true
+    }
+    compileOptions {
+        isCoreLibraryDesugaringEnabled = true
+        sourceCompatibility = JavaVersion.VERSION_17
+        targetCompatibility = JavaVersion.VERSION_17
+    }
+    kotlinOptions {
+        jvmTarget = "17"
+    }
+}
+
+dependencies {
+    coreLibraryDesugaring(libs.android.desugaring)
+
+    implementation(libs.kotlinx.serialization)
+    implementation(libs.kotlinx.coroutines)
+    implementation(libs.kotlinx.datetime)
+
+    implementation(libs.androidx.core)
+    implementation(libs.androidx.activity)
+    implementation(libs.androidx.activity.compose)
+    implementation(libs.androidx.lifecycle.runtime.compose)
+    implementation(libs.androidx.navigation.compose)
+
+    implementation(platform(libs.androidx.compose.bom))
+    implementation(libs.androidx.compose.material3)
+    implementation(libs.androidx.compose.material3.windowSizeClass)
+    implementation(libs.androidx.compose.foundation)
+    debugImplementation(libs.androidx.compose.ui.tooling)
+    implementation(libs.androidx.compose.ui.tooling.preview)
+    implementation(libs.androidx.compose.material.icons.extended)
+
+    implementation(libs.androidx.room.runtime)
+    ksp(libs.androidx.room.compiler)
+
+    implementation(libs.accompanist.adaptive)
+
+    implementation(libs.coil)
+
+    implementation(platform(libs.firebase.bom))
+    implementation(libs.firebase.analytics)
+    implementation(libs.firebase.crashlytics)
+    implementation(libs.firebase.perf)
+
+    implementation(libs.hilt.android)
+    ksp(libs.hilt.compiler)
+
+    implementation(libs.ktor.client)
+    implementation(libs.ktor.client.okhttp)
+
+    implementation(libs.documentFileX)
+}

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,17 +22,14 @@
 
 -dontobfuscate
 
--keep public class * implements com.bumptech.glide.module.GlideModule
--keep class * extends com.bumptech.glide.module.AppGlideModule {
- <init>(...);
+-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
+    *** Companion;
 }
--keep public enum com.bumptech.glide.load.ImageHeaderParser$** {
-  **[] $VALUES;
-  public *;
+-keepclasseswithmembers class xyz.quaver.pupil.** { # <-- change package name to your app's
+    kotlinx.serialization.KSerializer serializer(...);
 }
--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
+-keep class xyz.quaver.pupil.** { *; }
+-dontwarn org.slf4j.impl.StaticLoggerBinder

app/release/output-metadata.json

@@ -1,5 +1,5 @@
 {
-  "version": 1,
+  "version": 3,
   "artifactType": {
     "type": "APK",
     "kind": "Directory"
@@ -10,11 +10,11 @@
     {
       "type": "SINGLE",
       "filters": [],
-      "properties": [],
-      "versionCode": 57,
-      "versionName": "4.20",
-      "enabled": true,
+      "attributes": [],
+      "versionCode": 69,
+      "versionName": "6.0.0",
       "outputFile": "app-release.apk"
     }
-  ]
+  ],
+  "elementType": "File"
 }

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

@@ -22,23 +22,16 @@ package xyz.quaver.pupil
 
 import android.util.Log
 import androidx.test.ext.junit.runners.AndroidJUnit4
-import androidx.test.platform.app.InstrumentationRegistry
-import androidx.test.rule.ActivityTestRule
 import kotlinx.coroutines.runBlocking
+import okhttp3.OkHttpClient
+import okhttp3.Request
+import org.junit.Assert.assertEquals
+import org.junit.Before
 import org.junit.Test
 import org.junit.runner.RunWith
-import xyz.quaver.hitomi.getGalleryIDsFromNozomi
-import xyz.quaver.hiyobi.cookie
-import xyz.quaver.hiyobi.createImgList
-import xyz.quaver.hiyobi.getReader
-import xyz.quaver.hiyobi.user_agent
-import xyz.quaver.pupil.ui.LockActivity
-import xyz.quaver.pupil.util.download.Cache
-import xyz.quaver.pupil.util.download.DownloadWorker
-import xyz.quaver.pupil.util.getDownloadDirectory
-import java.io.InputStreamReader
-import java.net.URL
-import javax.net.ssl.HttpsURLConnection
+import xyz.quaver.pupil.hitomi.*
+import java.util.*
+import java.util.concurrent.TimeUnit
 
 /**
  * Instrumented test, which will execute on an Android device.
@@ -47,78 +40,144 @@ import javax.net.ssl.HttpsURLConnection
  */
 @RunWith(AndroidJUnit4::class)
 class ExampleInstrumentedTest {
+//    @Before
+//    fun init() {
+//        val appContext = InstrumentationRegistry.getInstrumentation().targetContext
+//    }
 
-    @Test
-    fun useAppContext() {
-        // Context of the app under test.
-        val appContext = InstrumentationRegistry.getInstrumentation().targetContext
-    }
+    @Before
+    fun init() {
+        clientBuilder = OkHttpClient.Builder()
+            .readTimeout(0, TimeUnit.SECONDS)
+            .writeTimeout(0, TimeUnit.SECONDS)
+            .callTimeout(0, TimeUnit.SECONDS)
+            .connectTimeout(0, TimeUnit.SECONDS)
+            .addInterceptor { chain ->
+                val request = chain.request().newBuilder()
+                    .header("Referer", "https://hitomi.la/")
+                    .build()
 
-    @Test
-    fun checkCacheDir() {
-        val activityTestRule = ActivityTestRule(LockActivity::class.java)
-        val appContext = InstrumentationRegistry.getInstrumentation().targetContext
-
-        Runtime.getRuntime().exec("du -hs " + getDownloadDirectory(appContext)).let {
-            InputStreamReader(it.inputStream).readLines().forEach { res ->
-                Log.i("PUPILD", res)
+                chain.proceed(request)
             }
-        }
     }
 
+    @Test
+    fun test_empty() {
+        print(
+            "".trim()
+                .replace(Regex("""^\?"""), "")
+                .lowercase(Locale.getDefault())
+                .split(Regex("\\s+"))
+                .map {
+                    it.replace('_', ' ')
+                })
+    }
     @Test
     fun test_nozomi() {
         val nozomi = getGalleryIDsFromNozomi(null, "index", "all")
 
-        Log.i("PUPILD", nozomi.size.toString())
+        Log.d("PUPILD", nozomi.size.toString())
+    }
+
+    @Test
+    fun test_search() {
+        val ids = getGalleryIDsForQuery("language:korean").reversed()
+
+        print(ids.size)
+    }
+
+    @Test
+    fun test_suggestions() {
+        val suggestions = getSuggestionsForQuery("language:g")
+
+        print(suggestions)
     }
 
     @Test
     fun test_doSearch() {
-        val reader = getReader( 1426382)
-
-        val data: ByteArray
-
-        with(URL(createImgList(1426382, reader)[0].path).openConnection() as HttpsURLConnection) {
-            setRequestProperty("User-Agent", user_agent)
-            setRequestProperty("Cookie", cookie)
-
-            data = inputStream.readBytes()
+        val r = runBlocking {
+            doSearch("language:korean")
         }
 
-        Log.d("Pupil", data.size.toString())
+        Log.d("PUPILD", r.take(10).toString())
+    }
+
+//    @Test
+//    fun test_getBlock() {
+//        val galleryBlock = getGalleryBlock(2097576)
+//
+//        print(galleryBlock)
+//    }
+//
+//    @Test
+//    fun test_getGallery() {
+//        val gallery = getGallery(2097751)
+//
+//        print(gallery)
+//    }
+
+    @Test
+    fun test_getGalleryInfo() {
+        val info = getGalleryInfo(1469394)
+
+        print(info)
     }
 
     @Test
-    fun test_downloadWorker() {
-        val context = InstrumentationRegistry.getInstrumentation().targetContext
+    fun test_getReader() {
+        val reader = getGalleryInfo(2128654)
 
-        val galleryID = 515515
-
-        val worker = DownloadWorker.getInstance(context)
-
-        worker.queue.add(galleryID)
-
-        while(worker.progress.indexOfKey(galleryID) < 0 || worker.progress[galleryID] != null) {
-            Log.i("PUPILD", worker.progress[galleryID]?.joinToString(" ") ?: "null")
-
-            if (worker.progress[galleryID]?.all { it.isInfinite() } == true)
-                break
-        }
-
-        Log.i("PUPILD", "DONE!!")
+        Log.d("PUPILD", reader.toString())
     }
 
     @Test
-    fun test_getReaderOrNull() {
-        val context = InstrumentationRegistry.getInstrumentation().targetContext
+    fun test_getImages() { runBlocking {
+        val galleryID = 2128654
 
-        val galleryID = 1561552
-
-        runBlocking {
-            Log.i("PUPILD", Cache(context).getReader(galleryID)?.galleryInfo?.title ?: "null")
+        val images = getGalleryInfo(galleryID).files.map {
+            imageUrlFromImage(galleryID, it,false)
         }
 
-        Log.i("PUPILD", Cache(context).getReaderOrNull(galleryID)?.galleryInfo?.title ?: "null")
-    }
+        Log.d("PUPILD", images.toString())
+
+//        images.forEachIndexed { index, image ->
+//            println("Testing $index/${images.size}: $image")
+//            val response = client.newCall(
+//                Request.Builder()
+//                    .url(image)
+//                    .header("Referer", "https://hitomi.la/")
+//                    .build()
+//            ).execute()
+//
+//            assertEquals(200, response.code())
+//
+//            println("$index/${images.size} Passed")
+//        }
+    } }
+
+//    @Test
+//    fun test_urlFromUrlFromHash() {
+//        val url = urlFromUrlFromHash(1531795, GalleryFiles(
+//            212, "719d46a7556be0d0021c5105878507129b5b3308b02cf67f18901b69dbb3b5ef", 1, "00.jpg", 300
+//        ), "webp")
+//
+//        print(url)
+//    }
+
+//    @Test
+//    suspend fun test_doSearch_extreme() {
+//        val query = "language:korean -tag:sample -female:humiliation -female:diaper -female:strap-on -female:squirting -female:lizard_girl -female:voyeurism -type:artistcg -female:blood -female:ryona -male:blood -male:ryona -female:crotch_tattoo -male:urethra_insertion -female:living_clothes -male:tentacles -female:slave -female:gag -male:gag -female:wooden_horse -male:exhibitionism -male:miniguy -female:mind_break -male:mind_break -male:unbirth -tag:scanmark -tag:no_penetration -tag:nudity_only -female:enema -female:brain_fuck -female:navel_fuck -tag:novel -tag:mosaic_censorship -tag:webtoon -male:rape -female:rape -female:yuri -male:anal -female:anal -female:futanari -female:huge_breasts -female:big_areolae -male:torture -male:stuck_in_wall -female:stuck_in_wall -female:torture -female:birth -female:pregnant -female:drugs -female:bdsm -female:body_writing -female:cbt -male:dark_skin -male:insect -female:insect -male:vore -female:vore -female:vomit -female:urination -female:urethra_insertion -tag:mmf_threesome -female:sex_toys -female:double_penetration -female:eggs -female:prolapse -male:smell -male:bestiality -female:bestiality -female:big_ass -female:milf -female:mother -male:dilf -male:netorare -female:netorare -female:cosplaying -female:filming -female:armpit_sex -female:armpit_licking -female:tickling -female:lactation -male:skinsuit -female:skinsuit -male:bbm -female:prostitution -female:double_penetration -female:females_only -male:males_only -female:tentacles -female:tentacles -female:stomach_deformation -female:hairy_armpits -female:large_insertions -female:mind_control -male:orc -female:dark_skin -male:yandere -female:yandere -female:scat -female:toddlercon -female:bbw -female:hairy -male:cuntboy -male:lactation -male:drugs -female:body_modification -female:monoeye -female:chikan -female:long_tongue -female:harness -female:fisting -female:glory_hole -female:latex -male:latex -female:unbirth -female:giantess -female:sole_dickgirl -female:robot -female:doll_joints -female:machine -tag:artbook -male:cbt -female:farting -male:farting -male:midget -female:midget -female:exhibitionism  -male:monster -female:big_nipples -female:big_clit -female:gyaru -female:piercing -female:necrophilia -female:snuff -female:smell -male:cheating -female:cheating -male:snuff -female:harem -male:harem"
+//        print(doSearch(query).size)
+//    }
+
+//    @Test
+//    suspend fun test_parse() {
+//        print(doSearch("-male:yaoi -female:yaoi -female:loli").size)
+//    }
+
+//    @Test
+//    fun test_subdomainFromUrl() {
+//        val galleryInfo = getGalleryInfo(1929109).files[2]
+//        print(urlFromUrlFromHash(1929109, galleryInfo, "webp", null, "a"))
+//    }
 }

app/src/main/AndroidManifest.xml

@@ -1,15 +1,20 @@
 <?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"/>
-    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
-    <uses-permission android:name="android.permission.FOREGROUND_SERVICE"/>
+    <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" android:maxSdkVersion="23"/>
+    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" android:maxSdkVersion="23"/>
+    <uses-permission android:name="android.permission.FOREGROUND_SERVICE" />
+    <uses-permission android:name="android.permission.CAMERA" />
+    <uses-permission android:name="android.permission.VIBRATE"/>
+    <uses-permission android:name="android.permission.POST_NOTIFICATIONS"/>
+    <uses-permission android:name="android.permission.RUN_USER_INITIATED_JOBS" />
 
+    <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"
@@ -19,10 +24,12 @@
         android:label="@string/app_name"
         android:roundIcon="@mipmap/ic_launcher_round"
         android:supportsRtl="true"
-        android:theme="@style/AppTheme"
-        tools:replace="android:theme"
-        android:requestLegacyExternalStorage="true"
-        tools:ignore="UnusedAttribute">
+        android:networkSecurityConfig="@xml/network_security_config"
+        tools:ignore="UnusedAttribute" >
+
+        <meta-data
+            android:name="com.google.mlkit.vision.DEPENDENCIES"
+            android:value="face" />
 
         <provider
             android:authorities="${applicationId}.provider"
@@ -36,179 +43,16 @@
 
         </provider>
 
-        <receiver android:name=".BroadcastReciever" android:exported="true">
-            <intent-filter>
-                <action android:name="android.intent.action.DOWNLOAD_COMPLETE"/>
-            </intent-filter>
-        </receiver>
+        <service android:name=".services.ImageCacheService"
+            android:permission="android.permission.BIND_JOB_SERVICE"
+            android:exported="false" />
 
-        <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" />
         <activity
             android:name=".ui.MainActivity"
             android:configChanges="keyboardHidden|orientation|screenSize"
-            android:theme="@style/NoActionBarAppTheme">
+            android:theme="@android:style/Theme.Material.Light.NoActionBar"
+            android:windowSoftInputMode="adjustResize"
+            android:exported="true">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
                 <action android:name="android.intent.action.VIEW" />
@@ -216,7 +60,6 @@
                 <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
         </activity>
-        <activity android:name="net.rdrei.android.dirchooser.DirectoryChooserActivity" />
     </application>
 
 </manifest>

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

@@ -1,35 +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.os.Parcelable
-import android.util.AttributeSet
-
-class FloatingSearchViewDayNight @JvmOverloads constructor(
-    context: Context,
-    attrs: AttributeSet? = null)
-    : FloatingSearchView(context, attrs) {
-
-    // hack to remove color attributes which should not be reused
-    override fun onSaveInstanceState(): Parcelable? {
-        super.onSaveInstanceState()
-        return null
-    }
-}

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

@@ -1,103 +0,0 @@
-/*
- *     Pupil, Hitomi.la viewer for Android
- *     Copyright (C) 2020  tom5079
- *
- *     This program is free software: you can redistribute it and/or modify
- *     it under the terms of the GNU General Public License as published by
- *     the Free Software Foundation, either version 3 of the License, or
- *     (at your option) any later version.
- *
- *     This program is distributed in the hope that it will be useful,
- *     but WITHOUT ANY WARRANTY; without even the implied warranty of
- *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *     GNU General Public License for more details.
- *
- *     You should have received a copy of the GNU General Public License
- *     along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-package xyz.quaver.pupil
-
-import android.app.DownloadManager
-import android.app.PendingIntent
-import android.content.BroadcastReceiver
-import android.content.Context
-import android.content.Intent
-import android.net.Uri
-import android.webkit.MimeTypeMap
-import androidx.core.app.NotificationCompat
-import androidx.core.app.NotificationManagerCompat
-import androidx.core.content.FileProvider
-import androidx.preference.PreferenceManager
-import xyz.quaver.pupil.util.NOTIFICATION_ID_UPDATE
-import xyz.quaver.pupil.util.cancelImport
-import java.io.File
-
-class BroadcastReciever : BroadcastReceiver() {
-
-    companion object {
-        const val ACTION_CANCEL_IMPORT = "ACTION_CANCEL_IMPORT"
-
-        const val EXTRA_IMPORT_NOTIFICATION_ID = "EXTRA_IMPORT_NOTIFICATION_ID"
-    }
-
-    override fun onReceive(context: Context?, intent: Intent?) {
-        context ?: return
-
-        when (intent?.action) {
-            DownloadManager.ACTION_DOWNLOAD_COMPLETE -> {
-
-                // Validate download
-
-                val preference = PreferenceManager.getDefaultSharedPreferences(context)
-                val downloadID = preference.getLong("update_download_id", -1)
-                val downloadManager = context.getSystemService(Context.DOWNLOAD_SERVICE) as DownloadManager
-
-                if (intent.getLongExtra(DownloadManager.EXTRA_DOWNLOAD_ID, -1) != downloadID)
-                    return
-
-                // Get target uri
-
-                val query = DownloadManager.Query()
-                    .setFilterById(downloadID)
-
-                val uri = downloadManager.query(query).use { cursor ->
-                    cursor.moveToFirst()
-
-                    cursor.getString(cursor.getColumnIndex(DownloadManager.COLUMN_LOCAL_URI)).let {
-                        val uri = Uri.parse(it)
-
-                        when (uri.scheme) {
-                            "file" ->
-                                FileProvider.getUriForFile(context, context.applicationContext.packageName + ".provider", File(uri.path!!))
-                            "content" -> uri
-                            else -> return
-                        }
-                    }
-                }
-
-                // Build Notification
-
-                val notificationManager = NotificationManagerCompat.from(context)
-
-                val pendingIntent = PendingIntent.getActivity(context, 0, Intent(Intent.ACTION_VIEW).apply {
-                    flags = Intent.FLAG_ACTIVITY_CLEAR_TOP or Intent.FLAG_GRANT_READ_URI_PERMISSION or Intent.FLAG_ACTIVITY_NEW_TASK
-                    setDataAndType(uri, MimeTypeMap.getSingleton().getMimeTypeFromExtension("apk"))
-                }, 0)
-
-                val notification = NotificationCompat.Builder(context, "update")
-                    .setSmallIcon(android.R.drawable.stat_sys_download_done)
-                    .setContentTitle(context.getText(R.string.update_download_completed))
-                    .setContentText(context.getText(R.string.update_download_completed_description))
-                    .setContentIntent(pendingIntent)
-                    .build()
-
-                notificationManager.notify(NOTIFICATION_ID_UPDATE, notification)
-            }
-            ACTION_CANCEL_IMPORT -> {
-                cancelImport = true
-            }
-        }
-    }
-
-}

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

@@ -18,72 +18,24 @@
 
 package xyz.quaver.pupil
 
+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.multidex.MultiDexApplication
-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.FirebaseApp
 import com.google.firebase.crashlytics.FirebaseCrashlytics
-import xyz.quaver.proxy
-import xyz.quaver.pupil.util.Histories
-import xyz.quaver.pupil.util.getProxy
-import java.io.File
-import java.util.*
-
-class Pupil : MultiDexApplication() {
-
-    lateinit var histories: Histories
-    lateinit var favorites: Histories
-
-    init {
-        AppCompatDelegate.setCompatVectorFromResourcesEnabled(true)
-    }
+import dagger.hilt.android.HiltAndroidApp
+import xyz.quaver.io.FileX
+import java.util.UUID
 
+@HiltAndroidApp
+class Pupil : Application() {
     override fun onCreate() {
-        val preference = PreferenceManager.getDefaultSharedPreferences(this)
-
-        val userID =
-            if (preference.getString("user_id", "").isNullOrEmpty()) {
-                UUID.randomUUID().toString().also {
-                    preference.edit().putString("user_id", it).apply()
-                }
-            } else
-                preference.getString("user_id", "") ?: ""
-
-        FirebaseCrashlytics.getInstance().setUserId(userID)
-
-        proxy = getProxy(this)
-
-        try {
-            preference.getString("dl_location", null).also {
-                if (!File(it!!).canWrite())
-                    throw Exception()
-            }
-        } catch (e: Exception) {
-            preference.edit().remove("dl_location").apply()
-        }
-
-        histories = Histories(File(ContextCompat.getDataDir(this), "histories.json"))
-        favorites = Histories(File(ContextCompat.getDataDir(this), "favorites.json"))
-
-        if (BuildConfig.DEBUG)
-            FirebaseAnalytics.getInstance(this).setAnalyticsCollectionEnabled(false)
-
-        try {
-            ProviderInstaller.installIfNeeded(this)
-        } catch (e: GooglePlayServicesRepairableException) {
-            e.printStackTrace()
-        } catch (e: GooglePlayServicesNotAvailableException) {
-            e.printStackTrace()
-        }
+        FirebaseApp.initializeApp(this)
 
         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
             val manager = getSystemService(Context.NOTIFICATION_SERVICE) as NotificationManager
@@ -95,6 +47,13 @@ class Pupil : MultiDexApplication() {
                 lockscreenVisibility = Notification.VISIBILITY_SECRET
             })
 
+            manager.createNotificationChannel(NotificationChannel("downloader", getString(R.string.channel_downloader), NotificationManager.IMPORTANCE_LOW).apply {
+                description = getString(R.string.channel_downloader_description)
+                enableLights(false)
+                enableVibration(false)
+                lockscreenVisibility = Notification.VISIBILITY_SECRET
+            })
+
             manager.createNotificationChannel(NotificationChannel("update", getString(R.string.channel_update), NotificationManager.IMPORTANCE_HIGH).apply {
                 description = getString(R.string.channel_update_description)
                 enableLights(true)
@@ -102,7 +61,7 @@ class Pupil : MultiDexApplication() {
                 lockscreenVisibility = Notification.VISIBILITY_SECRET
             })
 
-            manager.createNotificationChannel(NotificationChannel("import", getString(R.string.channel_update), NotificationManager.IMPORTANCE_HIGH).apply {
+            manager.createNotificationChannel(NotificationChannel("import", getString(R.string.channel_update), NotificationManager.IMPORTANCE_LOW).apply {
                 description = getString(R.string.channel_update_description)
                 enableLights(false)
                 enableVibration(false)
@@ -110,13 +69,6 @@ class Pupil : MultiDexApplication() {
             })
         }
 
-        AppCompatDelegate.setCompatVectorFromResourcesEnabled(true)
-        AppCompatDelegate.setDefaultNightMode(when (preference.getBoolean("dark_mode", false)) {
-            true -> AppCompatDelegate.MODE_NIGHT_YES
-            false -> AppCompatDelegate.MODE_NIGHT_NO
-        })
-
         super.onCreate()
     }
-
 }

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

@@ -1,42 +0,0 @@
-/*
- *     Pupil, Hitomi.la viewer for Android
- *     Copyright (C) 2020  tom5079
- *
- *     This program is free software: you can redistribute it and/or modify
- *     it under the terms of the GNU General Public License as published by
- *     the Free Software Foundation, either version 3 of the License, or
- *     (at your option) any later version.
- *
- *     This program is distributed in the hope that it will be useful,
- *     but WITHOUT ANY WARRANTY; without even the implied warranty of
- *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *     GNU General Public License for more details.
- *
- *     You should have received a copy of the GNU General Public License
- *     along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-package xyz.quaver.pupil
-
-import android.content.Context
-import com.bumptech.glide.Glide
-import com.bumptech.glide.Registry
-import com.bumptech.glide.annotation.GlideModule
-import com.bumptech.glide.integration.okhttp3.OkHttpUrlLoader
-import com.bumptech.glide.load.model.GlideUrl
-import com.bumptech.glide.module.AppGlideModule
-import xyz.quaver.pupil.util.download.DownloadWorker
-import java.io.InputStream
-
-@GlideModule
-class PupilGlideModule : AppGlideModule() {
-
-    override fun registerComponents(context: Context, glide: Glide, registry: Registry) {
-        registry.append(
-            GlideUrl::class.java,
-            InputStream::class.java,
-            OkHttpUrlLoader.Factory(DownloadWorker.getInstance(context).client)
-        )
-    }
-
-}

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

@@ -1,405 +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.Base64
-import android.util.SparseBooleanArray
-import android.view.LayoutInflater
-import android.view.View
-import android.view.ViewGroup
-import android.widget.LinearLayout
-import androidx.cardview.widget.CardView
-import androidx.core.content.ContextCompat
-import androidx.preference.PreferenceManager
-import androidx.recyclerview.widget.RecyclerView
-import androidx.swiperefreshlayout.widget.CircularProgressDrawable
-import androidx.vectordrawable.graphics.drawable.Animatable2Compat
-import androidx.vectordrawable.graphics.drawable.AnimatedVectorDrawableCompat
-import com.bumptech.glide.RequestManager
-import com.bumptech.glide.load.engine.DiskCacheStrategy
-import com.daimajia.swipe.SwipeLayout
-import com.daimajia.swipe.adapters.RecyclerSwipeAdapter
-import com.daimajia.swipe.interfaces.SwipeAdapterInterface
-import com.google.android.material.chip.Chip
-import kotlinx.android.synthetic.main.item_galleryblock.view.*
-import kotlinx.coroutines.CoroutineScope
-import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.launch
-import kotlinx.coroutines.withContext
-import xyz.quaver.hitomi.GalleryBlock
-import xyz.quaver.hitomi.getReader
-import xyz.quaver.pupil.BuildConfig
-import xyz.quaver.pupil.Pupil
-import xyz.quaver.pupil.R
-import xyz.quaver.pupil.types.Tag
-import xyz.quaver.pupil.util.Histories
-import xyz.quaver.pupil.util.download.Cache
-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<GalleryBlock>) : RecyclerSwipeAdapter<RecyclerView.ViewHolder>(), SwipeAdapterInterface {
-
-    enum class ViewType {
-        NEXT,
-        GALLERY,
-        PREV
-    }
-
-    private lateinit var favorites: Histories
-
-    val timer = Timer()
-
-    var isThin = false
-
-    inner class GalleryViewHolder(val view: View) : RecyclerView.ViewHolder(view) {
-        var timerTask: TimerTask? = null
-
-        private fun updateProgress(context: Context, galleryID: Int) {
-            val reader = Cache(context).getReaderOrNull(galleryID)
-
-            CoroutineScope(Dispatchers.Main).launch {
-                if (reader == null || PreferenceManager.getDefaultSharedPreferences(context).getBoolean("cache_disable", false)) {
-                    view.galleryblock_progressbar.visibility = View.GONE
-                    view.galleryblock_progress_complete.visibility = View.GONE
-                    return@launch
-                }
-
-                with(view.galleryblock_progressbar) {
-
-                    progress = Cache(context).getImages(galleryID)?.size ?: 0
-
-                    if (visibility == View.GONE) {
-                        visibility = View.VISIBLE
-                        max = reader.galleryInfo.files.size
-                    }
-
-                    if (progress == max) {
-                        if (completeFlag.get(galleryID, false)) {
-                            with(view.galleryblock_progress_complete) {
-                                setImageResource(R.drawable.ic_progressbar)
-                                visibility = View.VISIBLE
-                            }
-                        } else {
-                            with(view.galleryblock_progress_complete) {
-                                setImageDrawable(AnimatedVectorDrawableCompat.create(context, R.drawable.ic_progressbar_complete).apply {
-                                    this?.start()
-                                })
-                                visibility = View.VISIBLE
-                            }
-                            completeFlag.put(galleryID, true)
-                        }
-                    } else
-                        view.galleryblock_progress_complete.visibility = View.INVISIBLE
-                }
-            }
-        }
-
-        fun bind(galleryBlock: GalleryBlock) {
-            with(view) {
-                val resources = context.resources
-                val languages = resources.getStringArray(R.array.languages).map {
-                    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.Main).launch {
-                    val thumbnail = Cache(context).getThumbnail(galleryBlock.id).let {
-                        if (it != null)
-                            Base64.decode(it, Base64.DEFAULT)
-                        else
-                            null
-                    }
-
-                    galleryblock_thumbnail.post {
-                        glide
-                            .load(thumbnail)
-                            .skipMemoryCache(true)
-                            .diskCacheStrategy(DiskCacheStrategy.NONE)
-                            .error(R.drawable.image_broken_variant)
-                            .apply {
-                                if (BuildConfig.CENSOR)
-                                    override(5, 8)
-                            }
-                            .into(galleryblock_thumbnail)
-                    }
-                }
-
-                //Check cache
-                val cache = Cache(context).getCachedGallery(galleryBlock.id)
-                val reader = Cache(context).getReaderOrNull(galleryBlock.id)
-
-                if (reader != null) {
-                    val count = cache.listFiles()?.count {
-                        Regex("^[0-9]+.+\$").matches(it.name)
-                    } ?: 0
-
-                    with(galleryblock_progressbar) {
-                        max = reader.galleryInfo.files.size
-                        progress = count
-
-                        visibility = View.VISIBLE
-                    }
-                } else
-                    galleryblock_progressbar.visibility = View.GONE
-
-                if (timerTask == null)
-                    timerTask = timer.schedule(0, 1000) {
-                        updateProgress(context, galleryBlock.id)
-                    }
-
-                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()
-                galleryBlock.relatedTags.forEach {
-                    galleryblock_tag_group.addView(Chip(context).apply {
-                        val tag = Tag.parse(it).let {  tag ->
-                            when {
-                                tag.area != null -> tag
-                                else -> Tag("tag", it)
-                            }
-                        }
-
-                        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)
-                            }
-                            "female" -> {
-                                setChipBackgroundColorResource(R.color.material_pink_600)
-                                setTextColor(ContextCompat.getColor(context, android.R.color.white))
-                                ContextCompat.getDrawable(context, R.drawable.gender_female)
-                            }
-                            else -> null
-                        }
-                        text = tag.tag.wordCapitalize()
-                        setEnsureMinTouchTargetSize(false)
-                        setOnClickListener {
-                            for (callback in onChipClickedHandler)
-                                callback.invoke(tag)
-                        }
-                    })
-                }
-
-                galleryblock_id.text = galleryBlock.id.toString()
-                galleryblock_pagecount.text = "-"
-                CoroutineScope(Dispatchers.IO).launch {
-                    val pageCount = kotlin.runCatching {
-                        getReader(galleryBlock.id).galleryInfo.files.size
-                    }.getOrNull() ?: return@launch
-                    withContext(Dispatchers.Main) {
-                        galleryblock_pagecount.text = context.getString(R.string.galleryblock_pagecount, pageCount)
-                    }
-                }
-
-                if (!::favorites.isInitialized)
-                    favorites = (context.applicationContext as Pupil).favorites
-
-                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 gallery = galleries[position-(if (showPrev) 1 else 0)]
-
-            holder.bind(gallery)
-
-            with(holder.view.galleryblock_primary) {
-                setOnClickListener {
-                    holder.view.performClick()
-                }
-                setOnLongClickListener {
-                    holder.view.performLongClick()
-                }
-            }
-
-            holder.view.galleryblock_download.setOnClickListener {
-                onDownloadClickedHandler?.invoke(position)
-            }
-
-            holder.view.galleryblock_delete.setOnClickListener {
-                onDeleteClickedHandler?.invoke(position)
-            }
-
-            mItemManger.bindView(holder.view, position)
-
-            holder.view.galleryblock_swipe_layout.addSwipeListener(object: SwipeLayout.SwipeListener {
-                override fun onStartOpen(layout: SwipeLayout?) {
-                    mItemManger.closeAllExcept(layout)
-
-                    holder.view.galleryblock_download.text =
-                        if (Cache(holder.view.context).isDownloading(gallery.id))
-                            holder.view.context.getString(android.R.string.cancel)
-                        else
-                            holder.view.context.getString(R.string.main_download)
-                }
-
-                override fun onClose(layout: SwipeLayout?) {}
-                override fun onHandRelease(layout: SwipeLayout?, xvel: Float, yvel: Float) {}
-                override fun onOpen(layout: SwipeLayout?) {}
-                override fun onStartClose(layout: SwipeLayout?) {}
-                override fun onUpdate(layout: SwipeLayout?, leftOffset: Int, topOffset: Int) {}
-            })
-        }
-    }
-
-    override fun onViewDetachedFromWindow(holder: RecyclerView.ViewHolder) {
-        super.onViewDetachedFromWindow(holder)
-
-        if (holder is GalleryViewHolder) {
-            holder.timerTask?.cancel()
-            holder.timerTask = null
-        }
-    }
-
-    override fun getItemCount() =
-        (if (galleries.isEmpty()) 0 else 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
-}

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

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

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

@@ -1,170 +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.app.Activity
-import android.view.LayoutInflater
-import android.view.View
-import android.view.ViewGroup
-import androidx.constraintlayout.widget.ConstraintLayout
-import androidx.preference.PreferenceManager
-import androidx.recyclerview.widget.RecyclerView
-import com.bumptech.glide.RequestManager
-import com.bumptech.glide.load.engine.DiskCacheStrategy
-import com.bumptech.glide.load.model.GlideUrl
-import com.bumptech.glide.load.model.LazyHeaders
-import kotlinx.android.synthetic.main.item_reader.view.*
-import kotlinx.coroutines.CoroutineScope
-import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.launch
-import xyz.quaver.Code
-import xyz.quaver.hitomi.Reader
-import xyz.quaver.hitomi.getReferer
-import xyz.quaver.hitomi.imageUrlFromImage
-import xyz.quaver.hiyobi.cookie
-import xyz.quaver.hiyobi.createImgList
-import xyz.quaver.hiyobi.user_agent
-import xyz.quaver.pupil.R
-import xyz.quaver.pupil.util.download.Cache
-import xyz.quaver.pupil.util.download.DownloadWorker
-import java.util.*
-import kotlin.concurrent.schedule
-import kotlin.math.roundToInt
-
-class ReaderAdapter(private val glide: RequestManager,
-                    private val galleryID: Int,
-                    private val activity: Activity) : RecyclerView.Adapter<ReaderAdapter.ViewHolder>() {
-
-    var reader: Reader? = null
-    val timer = Timer()
-
-    var isFullScreen = false
-
-    var onItemClickListener : ((Int) -> (Unit))? = null
-
-    class ViewHolder(val view: View) : RecyclerView.ViewHolder(view)
-
-    var downloadWorker: DownloadWorker? = null
-
-    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): ViewHolder {
-        return LayoutInflater.from(parent.context).inflate(
-            R.layout.item_reader, parent, false
-        ).let {
-            ViewHolder(it)
-        }
-    }
-
-    override fun onBindViewHolder(holder: ViewHolder, position: Int) {
-        holder.view as ConstraintLayout
-
-        if (downloadWorker == null)
-            downloadWorker = DownloadWorker.getInstance(holder.view.context)
-
-        if (isFullScreen) {
-            holder.view.layoutParams.height = RecyclerView.LayoutParams.MATCH_PARENT
-            holder.view.container.layoutParams.height = ConstraintLayout.LayoutParams.MATCH_PARENT
-        } else {
-            holder.view.layoutParams.height = RecyclerView.LayoutParams.WRAP_CONTENT
-            holder.view.container.layoutParams.height = 0
-
-            (holder.view.container.layoutParams as ConstraintLayout.LayoutParams)
-                .dimensionRatio = "W,${reader!!.galleryInfo.files[position].width}:${reader!!.galleryInfo.files[position].height}"
-        }
-
-        holder.view.image.setOnPhotoTapListener { _, _, _ ->
-            onItemClickListener?.invoke(position)
-        }
-
-        holder.view.container.setOnClickListener {
-            onItemClickListener?.invoke(position)
-        }
-
-        holder.view.reader_index.text = (position+1).toString()
-
-        val preferences = PreferenceManager.getDefaultSharedPreferences(holder.view.context)
-        if (preferences.getBoolean("cache_disable", false)) {
-            val lowQuality = preferences.getBoolean("low_quality", false)
-
-            val url = when (reader!!.code) {
-                Code.HITOMI ->
-                    GlideUrl(
-                        imageUrlFromImage(
-                            galleryID,
-                            reader!!.galleryInfo.files[position],
-                            !lowQuality
-                        )
-                    , LazyHeaders.Builder().addHeader("Referer", getReferer(galleryID)).build())
-                Code.HIYOBI ->
-                    GlideUrl(createImgList(galleryID, reader!!, lowQuality)[position].path, LazyHeaders.Builder()
-                        .addHeader("User-Agent", user_agent)
-                        .addHeader("Cookie", cookie)
-                        .build())
-                else -> null
-            }
-            holder.view.image.post {
-                glide
-                    .load(url!!)
-                    .diskCacheStrategy(DiskCacheStrategy.NONE)
-                    .skipMemoryCache(false)
-                    .fitCenter()
-                    .error(R.drawable.image_broken_variant)
-                    .into(holder.view.image)
-            }
-        } else {
-            val image = Cache(holder.view.context).getImage(galleryID, position)
-            val progress = downloadWorker!!.progress[galleryID]?.get(position)
-
-            if (progress?.isInfinite() == true && image != null) {
-                holder.view.reader_item_progressbar.visibility = View.INVISIBLE
-
-                holder.view.image.post {
-                    glide
-                        .load(image)
-                        .diskCacheStrategy(DiskCacheStrategy.NONE)
-                        .skipMemoryCache(true)
-                        .fitCenter()
-                        .error(R.drawable.image_broken_variant)
-                        .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
-
-}

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
-
-}

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
-
-}

app/src/main/java/xyz/quaver/pupil/di/SingletonModule.kt

@@ -0,0 +1,24 @@
+package xyz.quaver.pupil.di
+
+import android.content.Context
+import dagger.Module
+import dagger.Provides
+import dagger.hilt.InstallIn
+import dagger.hilt.android.qualifiers.ApplicationContext
+import dagger.hilt.components.SingletonComponent
+import xyz.quaver.pupil.networking.FileImageCache
+import xyz.quaver.pupil.networking.ImageCache
+import java.io.File
+import javax.inject.Singleton
+
+@Module
+@InstallIn(SingletonComponent::class)
+object SingletonModule {
+    @Singleton
+    @Provides
+    fun provideImageCache(
+        @ApplicationContext context: Context
+    ): ImageCache {
+        return FileImageCache(File(context.cacheDir, "image_cache"))
+    }
+}

app/src/main/java/xyz/quaver/pupil/networking/GalleryInfo.kt

@@ -0,0 +1,110 @@
+package xyz.quaver.pupil.networking
+
+import android.os.BaseBundle
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Serializable
+
+interface TagLike {
+    fun toTag(): SearchQuery.Tag
+}
+
+@Serializable
+data class Artist(val artist: String): TagLike {
+    override fun toTag() = SearchQuery.Tag("artist", artist)
+}
+
+@Serializable
+data class Group(val group: String): TagLike {
+    override fun toTag() = SearchQuery.Tag("group", group)
+}
+
+@Serializable
+data class Series(@SerialName("parody") val series: String): TagLike {
+    override fun toTag() = SearchQuery.Tag("series", series)
+}
+
+@Serializable
+data class Character(val character: String): TagLike {
+    override fun toTag() = SearchQuery.Tag("character", character)
+}
+
+@Serializable
+data class GalleryTag(
+    val tag: String,
+    val female: String? = null,
+    val male: String? = null
+): TagLike {
+    override fun toTag() = SearchQuery.Tag(
+        if (female.isNullOrEmpty() && male.isNullOrEmpty()) {
+            "tag"
+        } else if (male.isNullOrEmpty()) {
+            "female"
+        } else {
+            "male"
+        },
+        tag
+    )
+}
+
+@Serializable
+data class Language(
+    @SerialName("galleryid") val galleryID: String,
+    val name: String
+)
+
+@Serializable
+data class GalleryFile(
+    @SerialName("haswebp") val hasWebP: Int = 0,
+    @SerialName("hasavif") val hasAVIF: Int = 0,
+    @SerialName("hasjxl") val hasJXL: Int = 0,
+    val height: Int,
+    val width: Int,
+    val hash: String,
+    val name: String,
+) {
+    fun writeToBundle(bundle: BaseBundle) {
+        bundle.putInt("hasWebP", hasWebP)
+        bundle.putInt("hasAVIF", hasAVIF)
+        bundle.putInt("hasJXL", hasJXL)
+        bundle.putInt("height", height)
+        bundle.putInt("width", width)
+        bundle.putString("hash", hash)
+        bundle.putString("name", name)
+    }
+
+    companion object {
+        fun fromBundle(bundle: BaseBundle) = GalleryFile(
+            bundle.getInt("hasWebP"),
+            bundle.getInt("hasAVIF"),
+            bundle.getInt("hasJXL"),
+            bundle.getInt("height"),
+            bundle.getInt("width"),
+            bundle.getString("hash")!!,
+            bundle.getString("name")!!
+        )
+    }
+}
+
+@Serializable
+data class GalleryInfo(
+    val id: String,
+    val title: String,
+    @SerialName("japanese_title") val japaneseTitle: String? = null,
+    val language: String? = null,
+    val type: String,
+    val date: String,
+    val artists: List<Artist>? = null,
+    val groups: List<Group>? = null,
+    @SerialName("parodys") val series: List<Series>? = null,
+    val tags: List<GalleryTag>? = null,
+    val related: List<Int> = emptyList(),
+    val languages: List<Language> = emptyList(),
+    val characters: List<Character>? = null,
+    @SerialName("scene_indexes") val sceneIndices: List<Int>? = emptyList(),
+    val files: List<GalleryFile> = emptyList()
+)
+
+@JvmName("joinToCapitalizedStringArtist")
+fun List<Artist>.joinToCapitalizedString() = joinToString { it.artist.replaceFirstChar(Char::titlecase) }
+@JvmName("joinToCapitalizedStringGroup")
+fun List<Group>.joinToCapitalizedString() = joinToString { it.group.replaceFirstChar(Char::titlecase) }

app/src/main/java/xyz/quaver/pupil/networking/GallerySearchSource.kt

@@ -0,0 +1,36 @@
+package xyz.quaver.pupil.networking
+
+import kotlinx.coroutines.Job
+import kotlinx.coroutines.async
+import kotlinx.coroutines.coroutineScope
+
+class GallerySearchSource(val query: SearchQuery?) {
+    private var searchResult: List<Int>? = null
+    private var job: Job? = null
+
+    suspend fun load(range: IntRange): Result<Pair<List<GalleryInfo>, Int>> = runCatching {
+        val searchResult = searchResult ?: (
+            HitomiHttpClient
+                .search(query)
+                .getOrThrow()
+                .toList()
+                .also { searchResult = it }
+        )
+
+        val galleryResults = coroutineScope {
+            searchResult.slice(range).map { galleryID ->
+                async {
+                    HitomiHttpClient.getGalleryInfo(galleryID)
+                }
+            }
+        }
+
+        val galleries = galleryResults.map { result ->
+            result.await().getOrThrow()
+        }
+
+        Pair(galleries, searchResult.size)
+    }
+
+    fun cancel() = job?.cancel()
+}

app/src/main/java/xyz/quaver/pupil/networking/HitomiHttpClient.kt

@@ -0,0 +1,402 @@
+package xyz.quaver.pupil.networking
+
+import io.ktor.client.HttpClient
+import io.ktor.client.call.body
+import io.ktor.client.engine.okhttp.OkHttp
+import io.ktor.client.plugins.onDownload
+import io.ktor.client.request.get
+import io.ktor.client.request.header
+import io.ktor.client.statement.HttpResponse
+import io.ktor.client.statement.bodyAsText
+import io.ktor.utils.io.ByteReadChannel
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.async
+import kotlinx.coroutines.coroutineScope
+import kotlinx.coroutines.sync.Mutex
+import kotlinx.coroutines.sync.withLock
+import kotlinx.coroutines.withContext
+import kotlinx.datetime.Clock.System.now
+import kotlinx.datetime.Instant
+import kotlinx.serialization.json.Json
+import kotlinx.serialization.json.contentOrNull
+import kotlinx.serialization.json.jsonArray
+import kotlinx.serialization.json.jsonPrimitive
+import java.nio.ByteBuffer
+import java.nio.IntBuffer
+import kotlin.time.Duration
+import kotlin.time.Duration.Companion.minutes
+
+const val domain = "ltn.hitomi.la"
+const val nozomiExtension = ".nozomi"
+
+const val compressedNozomiPrefix = "n"
+
+const val B = 16
+const val indexDir = "tagindex"
+const val maxNodeSize = 464
+const val galleriesIndexDir = "galleriesindex"
+const val tagIndexDomain = "tagindex.hitomi.la"
+
+const val separator = "-"
+const val extension = ".html"
+
+data class Suggestion(
+    val tag: SearchQuery.Tag,
+    val count: Int,
+)
+
+fun IntBuffer.toSet(): Set<Int> {
+    val result = LinkedHashSet<Int>()
+
+    while (this.hasRemaining()) {
+        result.add(this.get())
+    }
+
+    return result
+}
+
+private val json = Json {
+    isLenient = true
+    ignoreUnknownKeys = true
+}
+
+class ImagePathResolver(ggjs: String) {
+    private val defaultPrefix: Int = Regex("var o = (\\d)").find(ggjs)!!.groupValues[1].toInt()
+    private val prefixMap: Map<Int, Int> = buildMap {
+        val o = Regex("o = (\\d); break;").find(ggjs)!!.groupValues[1].toInt()
+
+        Regex("case (\\d+):").findAll(ggjs).forEach {
+            val case = it.groupValues[1].toInt()
+            put(case, o)
+        }
+    }
+
+    private val imageBaseDir: String = Regex("b: '(.+)'").find(ggjs)!!.groupValues[1]
+
+    fun decodeSubdomain(hash: String, thumbnail: Boolean): String {
+        val key = (hash.last() + hash.dropLast(1).takeLast(2)).toInt(16)
+        val base = if (thumbnail) "tn" else "a"
+
+        return "${'a' + (prefixMap[key] ?: defaultPrefix)}$base"
+    }
+
+    fun decodeImagePath(hash: String, thumbnail: Boolean): String {
+        val key = hash.last() to hash.dropLast(1).takeLast(2)
+
+        return if (thumbnail) {
+            "${key.first}/${key.second}/$hash"
+        } else {
+            "$imageBaseDir/${(key.first + key.second).toInt(16)}/$hash"
+        }
+    }
+}
+
+class ExpirableEntry<T>(
+    private val expiryDuration: Duration,
+    private val action: suspend () -> T,
+) {
+    private var value: T? = null
+    private var expiresAt: Instant = now()
+
+    private val mutex = Mutex()
+
+    suspend fun getValue(): T = mutex.withLock {
+        value?.let { if (expiresAt > now()) value else null } ?: action().also {
+            expiresAt = now() + expiryDuration
+            value = it
+        }
+    }
+}
+
+object HitomiHttpClient {
+    private val httpClient = HttpClient(OkHttp) {
+        engine {
+            config {
+                sslSocketFactory(SSLSettings.sslContext!!.socketFactory, SSLSettings.trustManager!!)
+            }
+        }
+    }
+
+    private var imagePathResolver = ExpirableEntry(1.minutes) {
+        ImagePathResolver(httpClient.get("https://ltn.hitomi.la/gg.js").bodyAsText())
+    }
+
+    private val tagIndexVersion = ExpirableEntry(1.minutes) { getIndexVersion("tagindex") }
+    private val galleriesIndexVersion =
+        ExpirableEntry(1.minutes) { getIndexVersion("galleriesindex") }
+
+    private suspend fun getIndexVersion(name: String): String = withContext(Dispatchers.IO) {
+        httpClient.get("https://$domain/$name/version?_=${System.currentTimeMillis()}").bodyAsText()
+    }
+
+    private suspend fun getURLAtRange(url: String, range: LongRange): ByteBuffer {
+        val response: HttpResponse = withContext(Dispatchers.IO) {
+            httpClient.get(url) {
+                header("Range", "bytes=${range.first}-${range.last}")
+            }
+        }
+
+        val result: ByteArray = response.body()
+
+        return ByteBuffer.wrap(result)
+    }
+
+    private suspend fun getNodeAtAddress(field: String, address: Long): Node {
+        val url = when (field) {
+            "galleries" -> "https://$domain/$galleriesIndexDir/galleries.${galleriesIndexVersion.getValue()}.index"
+            "languages" -> "https://$domain/$galleriesIndexDir/languages.${galleriesIndexVersion.getValue()}.index"
+            "nozomiurl" -> "https://$domain/$galleriesIndexDir/nozomiurl.${galleriesIndexVersion.getValue()}.index"
+            else -> "https://$domain/$indexDir/$field.${tagIndexVersion.getValue()}.index"
+        }
+
+        return Node.decodeNode(
+            getURLAtRange(url, address..<address + maxNodeSize)
+        )
+    }
+
+    private suspend fun bSearch(
+        field: String,
+        key: Node.Key,
+        node: Node,
+    ): Node.Data? {
+        if (node.keys.isEmpty()) {
+            return null
+        }
+
+        val (matched, index) = node.locateKey(key)
+
+        if (matched) {
+            return node.datas[index]
+        } else if (node.isLeaf) {
+            return null
+        }
+
+        val nextNode = getNodeAtAddress(field, node.subNodeAddresses[index])
+        return bSearch(field, key, nextNode)
+    }
+
+    private suspend fun getGalleryIDsFromData(offset: Long, length: Int): IntBuffer {
+        val url =
+            "https://$domain/$galleriesIndexDir/galleries.${galleriesIndexVersion.getValue()}.data"
+        if (length > 100000000 || length <= 0) {
+            error("length $length is too long")
+        }
+
+        return getURLAtRange(url, offset until (offset + length)).asIntBuffer()
+    }
+
+    private fun encodeSearchQueryForUrl(s: Char) =
+        when (s) {
+            ' ' -> "_"
+            '/' -> "slash"
+            '.' -> "dot"
+            else -> s.toString()
+        }
+
+    private fun sanitize(s: String) = s.replace(Regex("[/#]"), "")
+
+    private suspend fun getGalleryIDsFromNozomi(
+        area: String?,
+        tag: String,
+        language: String,
+    ): IntBuffer {
+        val nozomiAddress = if (area == null) {
+            "https://$domain/$compressedNozomiPrefix/$tag-$language$nozomiExtension"
+        } else {
+            "https://$domain/$compressedNozomiPrefix/$area/$tag-$language$nozomiExtension"
+        }
+
+        val response: HttpResponse = withContext(Dispatchers.IO) {
+            httpClient.get(nozomiAddress)
+        }
+
+        val result: ByteArray = response.body()
+
+        return ByteBuffer.wrap(result).asIntBuffer()
+    }
+
+    private suspend fun getGalleryIDsForQuery(
+        query: SearchQuery.Tag,
+        language: String = "all",
+    ): IntBuffer = when (query.namespace) {
+        "female", "male" -> getGalleryIDsFromNozomi("tag", query.toString(), language)
+        "language" -> getGalleryIDsFromNozomi(null, "index", query.tag)
+        null -> {
+            val key = Node.Key(query.tag)
+
+            val node = getNodeAtAddress("galleries", 0)
+            val data = bSearch("galleries", key, node)
+
+            if (data != null) getGalleryIDsFromData(
+                data.offset,
+                data.length
+            ) else IntBuffer.allocate(0)
+        }
+
+        else -> getGalleryIDsFromNozomi(query.namespace, query.tag, language)
+    }
+
+    suspend fun getSuggestionsForQuery(query: SearchQuery.Tag): Result<List<Suggestion>> =
+        runCatching {
+            val field = query.namespace ?: "global"
+            val chars = query.tag.map(::encodeSearchQueryForUrl)
+
+            val suggestions = json.parseToJsonElement(
+                withContext(Dispatchers.IO) {
+                    httpClient.get(
+                        "https://$tagIndexDomain/$field${
+                            if (chars.isNotEmpty()) "/${
+                                chars.joinToString(
+                                    "/"
+                                )
+                            }" else ""
+                        }.json"
+                    ).bodyAsText()
+                }
+            )
+
+            buildList {
+                suggestions.jsonArray.forEach { suggestionRaw ->
+                    val suggestion = suggestionRaw.jsonArray
+                    if (suggestion.size < 3) {
+                        return@forEach
+                    }
+                    val namespace = suggestion[2].jsonPrimitive.contentOrNull ?: ""
+
+                    val tag =
+                        sanitize(suggestion[0].jsonPrimitive.contentOrNull ?: return@forEach)
+
+                    add(
+                        Suggestion(
+                            SearchQuery.Tag(
+                                namespace,
+                                tag
+                            ),
+                            suggestion[1].jsonPrimitive.contentOrNull?.toIntOrNull() ?: 0,
+                        )
+                    )
+                }
+            }
+        }
+
+    suspend fun getGalleryInfo(galleryID: Int) = runCatching {
+        withContext(Dispatchers.IO) {
+            json.decodeFromString<GalleryInfo>(
+                httpClient.get("https://$domain/galleries/$galleryID.js").bodyAsText()
+                    .replace("var galleryinfo = ", "")
+            )
+        }
+    }
+
+    suspend fun search(query: SearchQuery?): Result<Set<Int>> = runCatching {
+        when (query) {
+            is SearchQuery.Tag -> getGalleryIDsForQuery(query).toSet()
+            is SearchQuery.Not -> coroutineScope {
+                val allGalleries = async {
+                    getGalleryIDsFromNozomi(null, "index", "all")
+                }
+
+                val queriedGalleries = search(query.query).getOrThrow()
+
+                val result = LinkedHashSet<Int>()
+
+                with(allGalleries.await()) {
+                    while (this.hasRemaining()) {
+                        val gallery = this.get()
+
+                        if (gallery in queriedGalleries) {
+                            result.add(gallery)
+                        }
+                    }
+                }
+
+                result
+            }
+
+            is SearchQuery.And -> coroutineScope {
+                val queries = query.queries.map { query ->
+                    async {
+                        search(query).getOrThrow()
+                    }
+                }
+
+                val result = queries.first().await().toMutableSet()
+
+                queries.drop(1).forEach {
+                    val queryResult = it.await()
+
+                    result.retainAll(queryResult)
+                }
+
+                result
+            }
+
+            is SearchQuery.Or -> coroutineScope {
+                val queries = query.queries.map { query ->
+                    async {
+                        search(query).getOrThrow()
+                    }
+                }
+
+                val result = LinkedHashSet<Int>()
+
+                queries.forEach {
+                    val queryResult = it.await()
+                    result.addAll(queryResult)
+                }
+
+                result
+            }
+
+            null -> getGalleryIDsFromNozomi(null, "index", "all").toSet()
+        }
+    }
+
+    suspend fun getImageURL(galleryFile: GalleryFile, thumbnail: Boolean = false): List<String> =
+        buildList {
+            val imagePathResolver = imagePathResolver.getValue()
+
+            listOf("webp", "avif", "jxl").forEach { type ->
+                val available = when {
+                    thumbnail && type != "jxl" -> true
+                    type == "webp" -> galleryFile.hasWebP != 0
+                    type == "avif" -> galleryFile.hasAVIF != 0
+                    !thumbnail && type == "jxl" -> galleryFile.hasJXL != 0
+                    else -> false
+                }
+
+                if (!available) return@forEach
+
+                val url = buildString {
+                    append("https://")
+                    append(imagePathResolver.decodeSubdomain(galleryFile.hash, thumbnail))
+                    append(".hitomi.la/")
+                    append(type)
+                    if (thumbnail) append("bigtn")
+                    append('/')
+                    append(imagePathResolver.decodeImagePath(galleryFile.hash, thumbnail))
+                    append('.')
+                    append(type)
+                }
+
+                add(url)
+            }
+        }
+
+    suspend fun loadImage(
+        galleryFile: GalleryFile,
+        thumbnail: Boolean = false,
+        acceptImage: (String) -> Boolean = { true },
+        onDownload: (bytesSentTotal: Long, contentLength: Long?) -> Unit = { _, _ -> },
+    ): Result<Pair<ByteReadChannel, String>> {
+        return runCatching {
+            withContext(Dispatchers.IO) {
+                val url = getImageURL(galleryFile, thumbnail).firstOrNull(acceptImage)
+                    ?: error("No available image")
+                val channel: ByteReadChannel = httpClient.get(url) { onDownload(onDownload) }.body()
+                Pair(channel, url)
+            }
+        }
+    }
+
+}

app/src/main/java/xyz/quaver/pupil/networking/ImageCache.kt

@@ -0,0 +1,135 @@
+package xyz.quaver.pupil.networking
+
+import com.google.firebase.crashlytics.FirebaseCrashlytics
+import io.ktor.util.cio.writeChannel
+import io.ktor.utils.io.copyAndClose
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.Job
+import kotlinx.coroutines.cancelAndJoin
+import kotlinx.coroutines.coroutineScope
+import kotlinx.coroutines.flow.MutableStateFlow
+import kotlinx.coroutines.flow.StateFlow
+import kotlinx.coroutines.launch
+import kotlinx.coroutines.sync.Mutex
+import kotlinx.coroutines.sync.withLock
+import kotlinx.coroutines.withContext
+import java.io.File
+
+sealed class ImageLoadProgress {
+    data object NotStarted : ImageLoadProgress()
+    data class Progress(val bytesSent: Long, val contentLength: Long?) : ImageLoadProgress()
+    data class Finished(val file: File) : ImageLoadProgress()
+    data class Error(val exception: Throwable) : ImageLoadProgress()
+}
+
+interface ImageCache {
+    suspend fun load(
+        galleryFile: GalleryFile,
+        forceDownload: Boolean = false,
+    ): StateFlow<ImageLoadProgress>
+
+    suspend fun free(vararg files: GalleryFile)
+    suspend fun clear()
+}
+
+class FileImageCache(
+    private val cacheDir: File,
+    private val cacheLimit: Long = 128 * 1024 * 1024, // 128MB
+) : ImageCache {
+    private val mutex = Mutex()
+
+    private val requests = mutableMapOf<String, Pair<Job, StateFlow<ImageLoadProgress>>>()
+    private val activeFiles = mutableMapOf<String, File>()
+
+    private suspend fun cleanup() = withContext(Dispatchers.IO) {
+        mutex.withLock {
+            val size = cacheDir.listFiles()?.sumOf { it.length() } ?: 0
+
+            if (size > cacheLimit) {
+                cacheDir.listFiles { file ->
+                    file.nameWithoutExtension !in activeFiles
+                }?.forEach { file ->
+                    file.delete()
+                }
+            }
+        }
+    }
+
+    override suspend fun free(vararg files: GalleryFile) = withContext(Dispatchers.IO) {
+        mutex.withLock {
+            files.forEach { file ->
+                val hash = file.hash
+
+                requests[hash]?.let { (job, _) ->
+                    job.cancel()
+                }
+
+                requests.remove(hash)
+                activeFiles.remove(hash)
+            }
+        }
+    }
+
+    override suspend fun clear(): Unit = withContext(Dispatchers.IO) {
+        mutex.withLock {
+            requests.forEach { _, (job, _) -> job.cancel() }
+            activeFiles.clear()
+            cacheDir.deleteRecursively()
+        }
+    }
+
+    override suspend fun load(
+        galleryFile: GalleryFile,
+        forceDownload: Boolean,
+    ): StateFlow<ImageLoadProgress> {
+        val hash = galleryFile.hash
+
+        mutex.withLock {
+            val file = activeFiles[hash]
+            if (!forceDownload && file != null) {
+                return MutableStateFlow(ImageLoadProgress.Finished(file))
+            }
+        }
+
+        cleanup()
+
+        mutex.withLock {
+            requests[hash]?.first?.cancelAndJoin()
+            activeFiles[hash]?.delete()
+
+            val flow = MutableStateFlow<ImageLoadProgress>(ImageLoadProgress.NotStarted)
+            val job = coroutineScope {
+                launch {
+                    runCatching {
+                        val (channel, url) = HitomiHttpClient.loadImage(galleryFile) { sent, total ->
+                            flow.value = ImageLoadProgress.Progress(sent, total)
+                        }.onFailure {
+                            FirebaseCrashlytics.getInstance().recordException(it)
+                            flow.value = ImageLoadProgress.Error(it)
+                        }.getOrThrow()
+
+                        val file = File(cacheDir, "$hash.${url.substringAfterLast('.')}")
+
+                        mutex.withLock {
+                            activeFiles.put(hash, file)
+                        }
+
+                        channel.copyAndClose(file.writeChannel())
+
+                        file
+                    }.onSuccess { file ->
+                        flow.value = ImageLoadProgress.Finished(file)
+                    }.onFailure {
+                        activeFiles.remove(hash)
+                        FirebaseCrashlytics.getInstance().recordException(it)
+                        flow.value = ImageLoadProgress.Error(it)
+                    }
+                }
+            }
+
+            requests[hash] = job to flow
+
+            return flow
+        }
+    }
+}

app/src/main/java/xyz/quaver/pupil/networking/Node.kt

@@ -0,0 +1,107 @@
+@file:OptIn(ExperimentalUnsignedTypes::class)
+
+package xyz.quaver.pupil.networking
+
+import java.nio.ByteBuffer
+import java.security.MessageDigest
+import kotlin.math.min
+
+private fun sha256(data: ByteArray): ByteArray =
+    MessageDigest.getInstance("SHA-256").digest(data)
+
+private fun hashTerm(term: String): UByteArray =
+    sha256(term.toByteArray()).sliceArray(0..<4).toUByteArray()
+
+data class Node(
+    val keys: List<Key>,
+    val datas: List<Data>,
+    val subNodeAddresses: List<Long>
+) {
+    data class Key(
+        private val key: UByteArray
+    ): Comparable<Key> {
+
+        constructor(term: String): this(hashTerm(term))
+
+        override fun compareTo(other: Key): Int {
+            val minSize = min(this.key.size, other.key.size)
+
+            for (i in 0..<minSize) {
+                if (this.key[i] < other.key[i]) {
+                    return -1
+                } else if(this.key[i] > other.key[i]) {
+                    return 1
+                }
+            }
+
+            return 0
+        }
+
+        override fun equals(other: Any?): Boolean {
+            if (this === other) return true
+            if (javaClass != other?.javaClass) return false
+
+            other as Key
+
+            return key.contentEquals(other.key)
+        }
+
+        override fun hashCode(): Int {
+            return key.contentHashCode()
+        }
+    }
+
+    data class Data(
+        val offset: Long,
+        val length: Int
+    )
+
+    companion object {
+        fun decodeNode(buffer: ByteBuffer): Node {
+            val numberOfKeys = buffer.int
+            val keys = mutableListOf<Node.Key>()
+
+            for (i in 0..<numberOfKeys) {
+                val keySize = buffer.int
+
+                val key = ByteArray(keySize)
+                buffer.get(key)
+
+                keys.add(Node.Key(key.toUByteArray()))
+            }
+
+            val numberOfDatas = buffer.int
+            val datas = mutableListOf<Data>()
+
+            for (i in 0..<numberOfDatas) {
+                val offset = buffer.long
+                val length = buffer.int
+
+                datas.add(Data(offset, length))
+            }
+
+            val numberOfSubNodeAddresses = B+1
+            val subNodeAddresses = mutableListOf<Long>()
+
+            for (i in 0..<numberOfSubNodeAddresses) {
+                val subNodeAddress = buffer.long
+                subNodeAddresses.add(subNodeAddress)
+            }
+
+            return Node(keys, datas, subNodeAddresses)
+        }
+    }
+
+    val isLeaf: Boolean = subNodeAddresses.all { it == 0L }
+
+    fun locateKey(target: Key): Pair<Boolean, Int> {
+        val index = keys.indexOfFirst { key -> target <= key }
+
+        if (index == -1) {
+            return Pair(false, keys.size)
+        }
+
+        return Pair(keys[index] == target, index)
+    }
+}
+

app/src/main/java/xyz/quaver/pupil/networking/SSL.kt

@@ -0,0 +1,80 @@
+package xyz.quaver.pupil.networking
+
+import android.content.res.Resources
+import java.io.ByteArrayInputStream
+import java.security.KeyStore
+import java.security.SecureRandom
+import java.security.cert.CertificateFactory
+import javax.net.ssl.SSLContext
+import javax.net.ssl.TrustManagerFactory
+import javax.net.ssl.X509TrustManager
+
+const val ISRG_ROOT_X1 = """-----BEGIN CERTIFICATE-----
+MIIFazCCA1OgAwIBAgIRAIIQz7DSQONZRGPgu2OCiwAwDQYJKoZIhvcNAQELBQAw
+TzELMAkGA1UEBhMCVVMxKTAnBgNVBAoTIEludGVybmV0IFNlY3VyaXR5IFJlc2Vh
+cmNoIEdyb3VwMRUwEwYDVQQDEwxJU1JHIFJvb3QgWDEwHhcNMTUwNjA0MTEwNDM4
+WhcNMzUwNjA0MTEwNDM4WjBPMQswCQYDVQQGEwJVUzEpMCcGA1UEChMgSW50ZXJu
+ZXQgU2VjdXJpdHkgUmVzZWFyY2ggR3JvdXAxFTATBgNVBAMTDElTUkcgUm9vdCBY
+MTCCAiIwDQYJKoZIhvcNAQEBBQADggIPADCCAgoCggIBAK3oJHP0FDfzm54rVygc
+h77ct984kIxuPOZXoHj3dcKi/vVqbvYATyjb3miGbESTtrFj/RQSa78f0uoxmyF+
+0TM8ukj13Xnfs7j/EvEhmkvBioZxaUpmZmyPfjxwv60pIgbz5MDmgK7iS4+3mX6U
+A5/TR5d8mUgjU+g4rk8Kb4Mu0UlXjIB0ttov0DiNewNwIRt18jA8+o+u3dpjq+sW
+T8KOEUt+zwvo/7V3LvSye0rgTBIlDHCNAymg4VMk7BPZ7hm/ELNKjD+Jo2FR3qyH
+B5T0Y3HsLuJvW5iB4YlcNHlsdu87kGJ55tukmi8mxdAQ4Q7e2RCOFvu396j3x+UC
+B5iPNgiV5+I3lg02dZ77DnKxHZu8A/lJBdiB3QW0KtZB6awBdpUKD9jf1b0SHzUv
+KBds0pjBqAlkd25HN7rOrFleaJ1/ctaJxQZBKT5ZPt0m9STJEadao0xAH0ahmbWn
+OlFuhjuefXKnEgV4We0+UXgVCwOPjdAvBbI+e0ocS3MFEvzG6uBQE3xDk3SzynTn
+jh8BCNAw1FtxNrQHusEwMFxIt4I7mKZ9YIqioymCzLq9gwQbooMDQaHWBfEbwrbw
+qHyGO0aoSCqI3Haadr8faqU9GY/rOPNk3sgrDQoo//fb4hVC1CLQJ13hef4Y53CI
+rU7m2Ys6xt0nUW7/vGT1M0NPAgMBAAGjQjBAMA4GA1UdDwEB/wQEAwIBBjAPBgNV
+HRMBAf8EBTADAQH/MB0GA1UdDgQWBBR5tFnme7bl5AFzgAiIyBpY9umbbjANBgkq
+hkiG9w0BAQsFAAOCAgEAVR9YqbyyqFDQDLHYGmkgJykIrGF1XIpu+ILlaS/V9lZL
+ubhzEFnTIZd+50xx+7LSYK05qAvqFyFWhfFQDlnrzuBZ6brJFe+GnY+EgPbk6ZGQ
+3BebYhtF8GaV0nxvwuo77x/Py9auJ/GpsMiu/X1+mvoiBOv/2X/qkSsisRcOj/KK
+NFtY2PwByVS5uCbMiogziUwthDyC3+6WVwW6LLv3xLfHTjuCvjHIInNzktHCgKQ5
+ORAzI4JMPJ+GslWYHb4phowim57iaztXOoJwTdwJx4nLCgdNbOhdjsnvzqvHu7Ur
+TkXWStAmzOVyyghqpZXjFaH3pO3JLF+l+/+sKAIuvtd7u+Nxe5AW0wdeRlN8NwdC
+jNPElpzVmbUq4JUagEiuTDkHzsxHpFKVK7q4+63SM1N95R1NbdWhscdCb+ZAJzVc
+oyi3B43njTOQ5yOf+1CceWxG1bQVs5ZufpsMljq4Ui0/1lvh+wjChP4kqKOJ2qxq
+4RgqsahDYVvTH9w7jXbyLeiNdd8XM2w9U/t7y0Ff/9yi0GE44Za4rF2LN9d11TPA
+mRGunUHBcnWEvgJBQl9nJEiU0Zsnvgc/ubhPgXRR4Xq37Z0j4r7g1SgEEzwxA57d
+emyPxgcYxn/eR44/KJ4EBs+lVDR3veyJm+kXQ99b21/+jh5Xos1AnX5iItreGCc=
+-----END CERTIFICATE-----"""
+
+object SSLSettings {
+    val keyStore: KeyStore by lazy {
+        KeyStore.getInstance(KeyStore.getDefaultType()).apply {
+            load(null, null)
+
+            val certificateFactory = CertificateFactory.getInstance("X.509")
+            val certificate = certificateFactory.generateCertificate(ISRG_ROOT_X1.byteInputStream())
+
+            setCertificateEntry("isrgrootx1", certificate)
+
+            TrustManagerFactory.getInstance(TrustManagerFactory.getDefaultAlgorithm()).apply {
+                init(null as KeyStore?)
+                trustManagers.filterIsInstance<X509TrustManager>().forEach { trustManager ->
+                    trustManager.acceptedIssuers.forEach { acceptedIssuer ->
+                        setCertificateEntry(acceptedIssuer.subjectDN.name, acceptedIssuer)
+                    }
+                }
+            }
+        }
+    }
+
+    val trustManagerFactory: TrustManagerFactory? by lazy {
+        TrustManagerFactory.getInstance(TrustManagerFactory.getDefaultAlgorithm()).apply {
+            init(keyStore)
+        }
+    }
+
+    val sslContext: SSLContext? by lazy {
+        SSLContext.getInstance("TLS").apply {
+            init(null, trustManagerFactory?.trustManagers, null)
+        }
+    }
+
+    val trustManager: X509TrustManager? by lazy {
+        trustManagerFactory?.trustManagers?.filterIsInstance<X509TrustManager>()?.firstOrNull()
+    }
+}

app/src/main/java/xyz/quaver/pupil/networking/SearchQuery.kt

@@ -0,0 +1,90 @@
+package xyz.quaver.pupil.networking
+
+import androidx.compose.ui.tooling.preview.PreviewParameterProvider
+
+val validNamespace = listOf(
+    "female",
+    "male",
+    "artist",
+    "group",
+    "character",
+    "series",
+    "type",
+    "language",
+    "tag"
+)
+
+class SearchQueryPreviewParameterProvider: PreviewParameterProvider<SearchQuery> {
+    override val values = sequenceOf(
+        SearchQuery.And(listOf(
+            SearchQuery.Or(listOf(
+                SearchQuery.And(listOf(
+                    SearchQuery.Tag("language", "thisisareallylongtagyoucantevenseetheendofthis"),
+                    SearchQuery.Tag("language", "korean"),
+                    SearchQuery.Tag("female", "unusual pupil"),
+                    SearchQuery.Tag("female", "collar")
+                )),
+                SearchQuery.And(listOf(
+                    SearchQuery.Tag("language", "japanese"),
+                    SearchQuery.Tag("female", "unusual pupil"),
+                    SearchQuery.Tag("female", "collar")
+                ))
+            )),
+            SearchQuery.Not(
+                SearchQuery.And(listOf(
+                    SearchQuery.Tag("male", "yaoi"),
+                    SearchQuery.Tag("group", "zenmai kourogi")
+                ))
+            )
+        ))
+    )
+}
+
+sealed interface SearchQuery {
+    data class Tag(
+        val namespace: String? = null,
+        val tag: String
+    ): SearchQuery, TagLike {
+        companion object {
+            fun parseTag(tag: String): Tag {
+                val splitTag = tag.split(':', limit =  1)
+
+                return if (splitTag.size == 1) {
+                    Tag(null, tag)
+                } else {
+                    Tag(splitTag[0], splitTag[1])
+                }
+            }
+        }
+
+        override fun toString() = if (namespace == null) tag else "$namespace:$tag"
+
+        override fun toTag() = this
+    }
+
+
+    data class And(
+        val queries: List<SearchQuery>
+    ): SearchQuery {
+        init {
+            if (queries.isEmpty()) {
+                error("queries cannot be empty")
+            }
+        }
+    }
+
+    data class Or(
+        val queries: List<SearchQuery>
+    ): SearchQuery {
+        init {
+            if (queries.isEmpty()) {
+                error("queries cannot be empty")
+            }
+        }
+    }
+
+    data class Not(
+        val query: SearchQuery
+    ): SearchQuery
+
+}

app/src/main/java/xyz/quaver/pupil/services/ImageCacheService.kt

@@ -0,0 +1,57 @@
+/*
+ *     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.job.JobParameters
+import android.app.job.JobService
+import com.google.firebase.crashlytics.FirebaseCrashlytics
+import dagger.hilt.android.AndroidEntryPoint
+import io.ktor.util.cio.writeChannel
+import io.ktor.util.collections.ConcurrentMap
+import io.ktor.util.collections.ConcurrentSet
+import io.ktor.utils.io.copyAndClose
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.Job
+import kotlinx.coroutines.SupervisorJob
+import kotlinx.coroutines.cancelAndJoin
+import kotlinx.coroutines.coroutineScope
+import kotlinx.coroutines.flow.MutableStateFlow
+import kotlinx.coroutines.flow.StateFlow
+import kotlinx.coroutines.launch
+import kotlinx.coroutines.sync.Mutex
+import kotlinx.coroutines.sync.withLock
+import kotlinx.coroutines.withContext
+import xyz.quaver.pupil.Pupil
+import xyz.quaver.pupil.networking.GalleryFile
+import xyz.quaver.pupil.networking.HitomiHttpClient
+import java.io.File
+
+@SuppressLint("SpecifyJobSchedulerIdRange")
+@AndroidEntryPoint
+class ImageCacheService : JobService() {
+    override fun onStartJob(params: JobParameters?): Boolean {
+        return false
+    }
+
+    override fun onStopJob(params: JobParameters?): Boolean {
+        return false
+    }
+}

app/src/main/java/xyz/quaver/pupil/types/SendLogException.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
@@ -18,15 +18,5 @@
 
 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
-    }
-}
+class SendLogException : Exception()
+class JavascriptException(message: String?) : Exception(message)

app/src/main/java/xyz/quaver/pupil/types/Tags.kt

@@ -24,7 +24,7 @@ import kotlinx.serialization.Serializable
 data class Tag(val area: String?, val tag: String, val isNegative: Boolean = false) {
     companion object {
         fun parse(tag: String) : Tag {
-            if (tag.first() == '-') {
+            if (tag.firstOrNull() == '-') {
                 tag.substring(1).split(Regex(":"), 2).let {
                     return when(it.size) {
                         2 -> Tag(it[0], it[1], true)
@@ -62,12 +62,10 @@ data class Tag(val area: String?, val tag: String, val isNegative: Boolean = fal
         return false
     }
 
-    override fun hashCode(): Int {
-        return super.hashCode()
-    }
+    override fun hashCode() = toString().hashCode()
 }
 
-class Tags(tag: List<Tag?>?) : ArrayList<Tag>() {
+class Tags(val tags: MutableSet<Tag> = mutableSetOf()) : MutableSet<Tag> by tags {
 
     companion object {
         fun parse(tags: String) : Tags {
@@ -77,20 +75,13 @@ class Tags(tag: List<Tag?>?) : ArrayList<Tag>() {
                         Tag.parse(it)
                     else
                         null
-                }
+                }.filterNotNull().toMutableSet()
             )
         }
     }
 
-    init {
-        tag?.forEach {
-            if (it != null)
-                add(it)
-        }
-    }
-
     fun contains(element: String): Boolean {
-        forEach {
+        tags.forEach {
             if (it.toString() == element)
                 return true
         }
@@ -99,23 +90,22 @@ class Tags(tag: List<Tag?>?) : ArrayList<Tag>() {
     }
 
     fun add(element: String): Boolean {
-        return super.add(Tag.parse(element))
+        return tags.add(Tag.parse(element))
     }
 
     fun remove(element: String) {
-        filter { it.toString() == element }.forEach {
-            remove(it)
+        tags.filter { it.toString() == element }.forEach {
+            tags.remove(it)
         }
     }
 
     fun removeByArea(area: String, isNegative: Boolean? = null) {
-        filter { it.area == area && (if(isNegative == null) true else (it.isNegative == isNegative)) }.forEach {
-            remove(it)
+        tags.filter { it.area == area && (if(isNegative == null) true else (it.isNegative == isNegative)) }.forEach {
+            tags.remove(it)
         }
     }
 
     override fun toString(): String {
-        return joinToString(" ") { it.toString() }
+        return tags.joinToString(" ") { it.toString() }
     }
-
 }

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

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

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

@@ -1,453 +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.content.Intent
-import android.graphics.drawable.Animatable
-import android.graphics.drawable.Drawable
-import android.os.Bundle
-import android.view.*
-import android.widget.Toast
-import androidx.appcompat.app.AlertDialog
-import androidx.appcompat.app.AppCompatActivity
-import androidx.core.content.ContextCompat
-import androidx.preference.PreferenceManager
-import androidx.recyclerview.widget.LinearLayoutManager
-import androidx.recyclerview.widget.PagerSnapHelper
-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 kotlinx.android.synthetic.main.activity_reader.*
-import kotlinx.android.synthetic.main.activity_reader.view.*
-import kotlinx.android.synthetic.main.dialog_numberpicker.view.*
-import kotlinx.coroutines.CoroutineScope
-import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.launch
-import xyz.quaver.Code
-import xyz.quaver.pupil.Pupil
-import xyz.quaver.pupil.R
-import xyz.quaver.pupil.adapters.ReaderAdapter
-import xyz.quaver.pupil.util.Histories
-import xyz.quaver.pupil.util.download.Cache
-import xyz.quaver.pupil.util.download.DownloadWorker
-import java.util.*
-import kotlin.concurrent.schedule
-
-class ReaderActivity : AppCompatActivity() {
-
-    private var galleryID = 0
-    private 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 val timer = Timer()
-
-    private val snapHelper = PagerSnapHelper()
-
-    private var menu: Menu? = null
-
-    private lateinit var favorites: Histories
-
-    override fun onCreate(savedInstanceState: Bundle?) {
-        super.onCreate(savedInstanceState)
-
-        title = getString(R.string.reader_loading)
-        supportActionBar?.setDisplayHomeAsUpEnabled(false)
-
-        favorites = (application as Pupil).favorites
-
-        window.setFlags(
-            WindowManager.LayoutParams.FLAG_SECURE,
-            WindowManager.LayoutParams.FLAG_SECURE)
-
-        setContentView(R.layout.activity_reader)
-
-        handleIntent(intent)
-
-        FirebaseCrashlytics.getInstance().setCustomKey("GalleryID", galleryID)
-
-        if (galleryID == 0) {
-            onBackPressed()
-            return
-        }
-
-        initView()
-        if (PreferenceManager.getDefaultSharedPreferences(this).getBoolean("cache_disable", false)) {
-            reader_download_progressbar.visibility = View.GONE
-            CoroutineScope(Dispatchers.IO).launch {
-                val reader = Cache(this@ReaderActivity).getReader(galleryID)
-
-                launch(Dispatchers.Main) initDownloader@{
-                    if (reader == null) {
-                        Snackbar
-                            .make(reader_layout, R.string.reader_failed_to_find_gallery, Snackbar.LENGTH_INDEFINITE)
-                            .show()
-                        return@initDownloader
-                    }
-
-                    (reader_recyclerview.adapter as ReaderAdapter).apply {
-                        this.reader = reader
-                        notifyDataSetChanged()
-                    }
-                    title = reader.galleryInfo.title ?: ""
-                    menu?.findItem(R.id.reader_menu_page_indicator)?.title = "$currentPage/${reader.galleryInfo.files.size}"
-
-                    menu?.findItem(R.id.reader_type)?.icon = ContextCompat.getDrawable(this@ReaderActivity,
-                        when (reader.code) {
-                            Code.HITOMI -> R.drawable.hitomi
-                            Code.HIYOBI -> R.drawable.ic_hiyobi
-                            else -> android.R.color.transparent
-                        })
-                }
-            }
-        } else
-            initDownloader()
-    }
-
-    override fun onNewIntent(intent: Intent) {
-        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 onResume() {
-        val preferences = PreferenceManager.getDefaultSharedPreferences(this)
-
-        if (preferences.getBoolean("security_mode", false))
-            window.setFlags(
-                WindowManager.LayoutParams.FLAG_SECURE,
-                WindowManager.LayoutParams.FLAG_SECURE)
-        else
-            window.clearFlags(WindowManager.LayoutParams.FLAG_SECURE)
-
-        super.onResume()
-    }
-
-    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(context).getReaderOrNull(galleryID)?.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 onDestroy() {
-        super.onDestroy()
-
-        timer.cancel()
-        (reader_recyclerview?.adapter as? ReaderAdapter)?.timer?.cancel()
-
-        if (!Cache(this).isDownloading(galleryID))
-            DownloadWorker.getInstance(this@ReaderActivity).cancel(galleryID)
-    }
-
-    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() {
-        val worker = DownloadWorker.getInstance(this).apply {
-            cancel(galleryID)
-            queue.add(galleryID)
-        }
-
-        timer.schedule(1000, 1000) {
-            if (worker.progress.indexOfKey(galleryID) < 0)  //loading
-                return@schedule
-
-            if (worker.progress[galleryID] == null) {      //Gallery not found
-                timer.cancel()
-                Snackbar
-                    .make(reader_layout, R.string.reader_failed_to_find_gallery, Snackbar.LENGTH_INDEFINITE)
-                    .show()
-            }
-
-            runOnUiThread {
-                reader_download_progressbar.max = reader_recyclerview.adapter?.itemCount ?: 0
-                reader_download_progressbar.progress = worker.progress[galleryID]?.count { it.isInfinite() } ?: 0
-                reader_progressbar.max = reader_recyclerview.adapter?.itemCount ?: 0
-
-                if (title == getString(R.string.reader_loading)) {
-                    val reader = Cache(this@ReaderActivity).getReaderOrNull(galleryID)
-
-                    if (reader != null) {
-
-                        with (reader_recyclerview.adapter as ReaderAdapter) {
-                            this.reader = reader
-                            notifyDataSetChanged()
-                        }
-
-                        title = reader.galleryInfo.title
-                        menu?.findItem(R.id.reader_menu_page_indicator)?.title = "$currentPage/${reader.galleryInfo.files.size}"
-
-                        menu?.findItem(R.id.reader_type)?.icon = ContextCompat.getDrawable(this@ReaderActivity,
-                            when (reader.code) {
-                                Code.HITOMI -> R.drawable.hitomi
-                                Code.HIYOBI -> R.drawable.ic_hiyobi
-                                else -> android.R.color.transparent
-                            })
-                    }
-                }
-
-                if (worker.progress[galleryID]?.all { it.isInfinite() } == true) {   //Download finished
-                    reader_download_progressbar.visibility = View.GONE
-
-                    animateDownloadFAB(false)
-                }
-            }
-        }
-    }
-
-    private fun initView() {
-        with(reader_recyclerview) {
-            adapter = ReaderAdapter(Glide.with(this@ReaderActivity), galleryID, this@ReaderActivity).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(Cache(context).isDownloading(galleryID)) //If download in progress, animate button
-
-            setOnClickListener {
-                if (PreferenceManager.getDefaultSharedPreferences(context).getBoolean("cache_disable", false))
-                    Toast.makeText(context, R.string.settings_download_when_cache_disable_warning, Toast.LENGTH_SHORT).show()
-                else {
-                    if (Cache(context).isDownloading(galleryID)) {
-                        Cache(context).setDownloading(galleryID, false)
-
-                        animateDownloadFAB(false)
-                    } else {
-                        Cache(context).setDownloading(galleryID, true)
-                        animateDownloadFAB(true)
-                    }
-                }
-            }
-        }
-
-        with(reader_fab_retry) {
-            setImageResource(R.drawable.refresh)
-            setOnClickListener {
-                DownloadWorker.getInstance(context).let {
-                    it.cancel(galleryID)
-                    it.queue.add(galleryID)
-                }
-            }
-        }
-
-        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
-            } else {
-                flags = flags and WindowManager.LayoutParams.FLAG_FULLSCREEN.inv()
-                supportActionBar?.show()
-                this@ReaderActivity.reader_fab.visibility = View.VISIBLE
-            }
-
-            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, false)
-        }
-
-        (reader_recyclerview.layoutManager as LinearLayoutManager).scrollToPositionWithOffset(currentPage-1, 0)
-    }
-
-    private fun animateDownloadFAB(animate: Boolean) {
-        with(reader_fab_download) {
-            if (animate) {
-                val icon = AnimatedVectorDrawableCompat.create(context, R.drawable.ic_downloading)
-
-                icon?.registerAnimationCallback(object : Animatable2Compat.AnimationCallback() {
-                    override fun onAnimationEnd(drawable: Drawable?) {
-                        val worker = DownloadWorker.getInstance(context)
-                        if (worker.progress[galleryID]?.all { it.isInfinite() } == true) // If download is finished, stop animating
-                            post {
-                                setImageResource(R.drawable.ic_download)
-                                labelText = getString(R.string.reader_fab_download_cancel)
-                            }
-                        else                                                            // Or continue animate
-                            post {
-                                icon.start()
-                                labelText = getString(R.string.reader_fab_download_cancel)
-                            }
-                    }
-                })
-
-                setImageDrawable(icon)
-                icon?.start()
-            } else {
-                setImageResource(R.drawable.ic_download)
-                labelText = getString(R.string.reader_fab_download)
-            }
-        }
-    }
-}

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

@@ -1,214 +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.Build
-import android.os.Bundle
-import android.view.MenuItem
-import android.view.WindowManager
-import androidx.appcompat.app.AppCompatActivity
-import androidx.preference.PreferenceManager
-import com.google.android.material.snackbar.Snackbar
-import kotlinx.android.synthetic.main.settings_activity.*
-import kotlinx.serialization.builtins.list
-import kotlinx.serialization.builtins.serializer
-import net.rdrei.android.dirchooser.DirectoryChooserActivity
-import xyz.quaver.pupil.Pupil
-import xyz.quaver.pupil.R
-import xyz.quaver.pupil.ui.fragment.LockSettingsFragment
-import xyz.quaver.pupil.ui.fragment.SettingsFragment
-import xyz.quaver.pupil.util.*
-import java.io.File
-import java.nio.charset.Charset
-
-class SettingsActivity : AppCompatActivity() {
-
-    override fun onCreate(savedInstanceState: Bundle?) {
-        super.onCreate(savedInstanceState)
-
-        window.setFlags(
-            WindowManager.LayoutParams.FLAG_SECURE,
-            WindowManager.LayoutParams.FLAG_SECURE)
-
-        setContentView(R.layout.settings_activity)
-        supportFragmentManager
-            .beginTransaction()
-            .replace(R.id.settings, SettingsFragment())
-            .commit()
-        supportActionBar?.setDisplayHomeAsUpEnabled(true)
-    }
-
-    override fun onResume() {
-        val preferences = PreferenceManager.getDefaultSharedPreferences(this)
-
-        if (preferences.getBoolean("security_mode", false))
-            window.setFlags(
-                WindowManager.LayoutParams.FLAG_SECURE,
-                WindowManager.LayoutParams.FLAG_SECURE)
-        else
-            window.clearFlags(WindowManager.LayoutParams.FLAG_SECURE)
-        super.onResume()
-    }
-
-    override fun onOptionsItemSelected(item: MenuItem?): Boolean {
-        when (item?.itemId) {
-            android.R.id.home -> onBackPressed()
-        }
-
-        return true
-    }
-
-    override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?) {
-        when(requestCode) {
-            REQUEST_LOCK -> {
-                if (resultCode == Activity.RESULT_OK) {
-                    supportFragmentManager
-                        .beginTransaction()
-                        .replace(R.id.settings, LockSettingsFragment())
-                        .addToBackStack("Lock")
-                        .commitAllowingStateLoss()
-                }
-            }
-            REQUEST_RESTORE -> {
-                if (resultCode == Activity.RESULT_OK) {
-                    val uri = data?.data ?: return
-
-                    try {
-                        val str = contentResolver.openInputStream(uri).use { inputStream ->
-                            inputStream!!
-
-                            inputStream.readBytes().toString(Charset.defaultCharset())
-                        }
-
-                        (application as Pupil).favorites.addAll(json.parse(Int.serializer().list, str).also {
-                            Snackbar.make(
-                                window.decorView,
-                                getString(R.string.settings_restore_successful, it.size),
-                                Snackbar.LENGTH_LONG
-                            ).show()
-                        })
-                    } catch (e: Exception) {
-                        Snackbar.make(
-                            window.decorView,
-                            R.string.settings_restore_failed,
-                            Snackbar.LENGTH_LONG
-                        ).show()
-                    }
-                }
-            }
-            REQUEST_DOWNLOAD_FOLDER -> {
-                if (resultCode == Activity.RESULT_OK) {
-                    data?.data?.also { uri ->
-                        val takeFlags: Int =
-                            intent.flags and (Intent.FLAG_GRANT_READ_URI_PERMISSION or Intent.FLAG_GRANT_WRITE_URI_PERMISSION)
-
-                        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.KITKAT)
-                            contentResolver.takePersistableUriPermission(uri, takeFlags)
-
-                        val file = uri.toFile(this)
-
-                        if (file?.canWrite() != true)
-                            Snackbar.make(
-                                settings,
-                                R.string.settings_dl_location_not_writable,
-                                Snackbar.LENGTH_LONG
-                            ).show()
-                        else
-                            PreferenceManager.getDefaultSharedPreferences(this).edit()
-                                .putString("dl_location", file.canonicalPath)
-                                .apply()
-                    }
-                }
-            }
-            REQUEST_DOWNLOAD_FOLDER_OLD -> {
-                if (resultCode == DirectoryChooserActivity.RESULT_CODE_DIR_SELECTED) {
-                    val directory = data?.getStringExtra(DirectoryChooserActivity.RESULT_SELECTED_DIR)!!
-
-                    if (!File(directory).canWrite())
-                        Snackbar.make(
-                            settings,
-                            R.string.settings_dl_location_not_writable,
-                            Snackbar.LENGTH_LONG
-                        ).show()
-                    else
-                        PreferenceManager.getDefaultSharedPreferences(this).edit()
-                            .putString("dl_location", File(directory).canonicalPath)
-                            .apply()
-                }
-            }
-            REQUEST_IMPORT_OLD_GALLERIES -> {
-                if (resultCode == Activity.RESULT_OK) {
-                    data?.data?.also { uri ->
-                        val takeFlags: Int =
-                            intent.flags and (Intent.FLAG_GRANT_READ_URI_PERMISSION or Intent.FLAG_GRANT_WRITE_URI_PERMISSION)
-
-                        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.KITKAT)
-                            contentResolver.takePersistableUriPermission(uri, takeFlags)
-
-                        val file = uri.toFile(this)
-
-                        if (file?.canRead() != true)
-                            Snackbar.make(
-                                settings,
-                                resources.getText(R.string.import_old_galleries_folder_not_readable),
-                                Snackbar.LENGTH_LONG
-                            ).show()
-                        else
-                            importOldGalleries(this, file)
-                    }
-                }
-            }
-            REQUEST_IMPORT_OLD_GALLERIES_OLD -> {
-                if (resultCode == DirectoryChooserActivity.RESULT_CODE_DIR_SELECTED) {
-                    val directory = data?.getStringExtra(DirectoryChooserActivity.RESULT_SELECTED_DIR)!!
-
-                    if (!File(directory).canRead())
-                        Snackbar.make(
-                            settings,
-                            resources.getText(R.string.import_old_galleries_folder_not_readable),
-                            Snackbar.LENGTH_LONG
-                        ).show()
-                    else {
-                        importOldGalleries(this, File(directory))
-                    }
-                }
-            }
-            else -> super.onActivityResult(requestCode, resultCode, data)
-        }
-    }
-
-    @SuppressLint("InlinedApi")
-    override fun onRequestPermissionsResult(requestCode: Int, permissions: Array<out String>, grantResults: IntArray) {
-        when (requestCode) {
-            REQUEST_WRITE_PERMISSION_AND_SAF -> {
-                if (grantResults.firstOrNull() == PackageManager.PERMISSION_GRANTED) {
-                    val intent = Intent(Intent.ACTION_OPEN_DOCUMENT_TREE).apply {
-                        putExtra("android.content.extra.SHOW_ADVANCED", true)
-                    }
-
-                    startActivityForResult(intent, REQUEST_DOWNLOAD_FOLDER)
-                }
-            }
-        }
-    }
-}

app/src/main/java/xyz/quaver/pupil/ui/composable/ContentType.kt

@@ -0,0 +1,5 @@
+package xyz.quaver.pupil.ui.composable
+
+enum class ContentType {
+    SINGLE_PANE, DUAL_PANE
+}

app/src/main/java/xyz/quaver/pupil/ui/composable/DevicePosture.kt

@@ -0,0 +1,34 @@
+package xyz.quaver.pupil.ui.composable
+
+import android.graphics.Rect
+import androidx.window.layout.FoldingFeature
+import kotlin.contracts.ExperimentalContracts
+import kotlin.contracts.contract
+
+sealed interface DevicePosture {
+    data object NormalPosture: DevicePosture
+
+    data class BookPosture(
+        val hingePosition: Rect
+    ): DevicePosture
+
+    data class Separating(
+        val hingePosition: Rect,
+        val orientation: FoldingFeature.Orientation
+    ): DevicePosture
+}
+
+@OptIn(ExperimentalContracts::class)
+fun isBookPosture(foldingFeature: FoldingFeature?): Boolean {
+    contract { returns(true) implies (foldingFeature != null) }
+
+    return foldingFeature?.state == FoldingFeature.State.HALF_OPENED &&
+            foldingFeature.orientation == FoldingFeature.Orientation.VERTICAL
+}
+
+@OptIn(ExperimentalContracts::class)
+fun isSeparating(foldingFeature: FoldingFeature?): Boolean {
+    contract { returns(true) implies (foldingFeature != null) }
+
+    return foldingFeature?.state == FoldingFeature.State.FLAT && foldingFeature.isSeparating
+}

app/src/main/java/xyz/quaver/pupil/ui/composable/Gallery.kt

@@ -0,0 +1,504 @@
+package xyz.quaver.pupil.ui.composable
+
+import androidx.compose.foundation.Image
+import androidx.compose.foundation.background
+import androidx.compose.foundation.layout.Arrangement
+import androidx.compose.foundation.layout.Box
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.ExperimentalLayoutApi
+import androidx.compose.foundation.layout.FlowRow
+import androidx.compose.foundation.layout.Row
+import androidx.compose.foundation.layout.Spacer
+import androidx.compose.foundation.layout.aspectRatio
+import androidx.compose.foundation.layout.fillMaxHeight
+import androidx.compose.foundation.layout.fillMaxSize
+import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.height
+import androidx.compose.foundation.layout.heightIn
+import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.layout.size
+import androidx.compose.foundation.shape.RoundedCornerShape
+import androidx.compose.foundation.text.InlineTextContent
+import androidx.compose.foundation.text.appendInlineContent
+import androidx.compose.material.icons.Icons
+import androidx.compose.material.icons.filled.BrokenImage
+import androidx.compose.material.icons.filled.QuestionMark
+import androidx.compose.material.icons.filled.StarOutline
+import androidx.compose.material3.Card
+import androidx.compose.material3.CircularProgressIndicator
+import androidx.compose.material3.HorizontalDivider
+import androidx.compose.material3.Icon
+import androidx.compose.material3.MaterialTheme
+import androidx.compose.material3.Surface
+import androidx.compose.material3.Text
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.LaunchedEffect
+import androidx.compose.runtime.getValue
+import androidx.compose.runtime.mutableStateOf
+import androidx.compose.runtime.remember
+import androidx.compose.runtime.setValue
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.draw.clip
+import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.platform.LocalContext
+import androidx.compose.ui.res.painterResource
+import androidx.compose.ui.res.stringResource
+import androidx.compose.ui.text.Placeholder
+import androidx.compose.ui.text.PlaceholderVerticalAlign
+import androidx.compose.ui.text.buildAnnotatedString
+import androidx.compose.ui.tooling.preview.Preview
+import androidx.compose.ui.tooling.preview.PreviewParameter
+import androidx.compose.ui.tooling.preview.PreviewParameterProvider
+import androidx.compose.ui.unit.dp
+import androidx.compose.ui.unit.sp
+import coil.compose.SubcomposeAsyncImage
+import coil.request.ImageRequest
+import xyz.quaver.pupil.R
+import xyz.quaver.pupil.networking.Artist
+import xyz.quaver.pupil.networking.Character
+import xyz.quaver.pupil.networking.GalleryFile
+import xyz.quaver.pupil.networking.GalleryInfo
+import xyz.quaver.pupil.networking.GalleryTag
+import xyz.quaver.pupil.networking.Group
+import xyz.quaver.pupil.networking.HitomiHttpClient
+import xyz.quaver.pupil.networking.Language
+import xyz.quaver.pupil.networking.SearchQuery
+import xyz.quaver.pupil.networking.Series
+import xyz.quaver.pupil.networking.joinToCapitalizedString
+import xyz.quaver.pupil.ui.theme.Blue500
+import xyz.quaver.pupil.ui.theme.Green500
+import xyz.quaver.pupil.ui.theme.Purple500
+import xyz.quaver.pupil.ui.theme.Red500
+import xyz.quaver.pupil.ui.theme.Yellow500
+
+private val languageMap = mapOf(
+    "indonesian" to "Bahasa Indonesia",
+    "catalan" to "català",
+    "cebuano" to "Cebuano",
+    "czech" to "Čeština",
+    "danish" to "Dansk",
+    "german" to "Deutsch",
+    "estonian" to "eesti",
+    "english" to "English",
+    "spanish" to "Español",
+    "esperanto" to "Esperanto",
+    "french" to "Français",
+    "italian" to "Italiano",
+    "latin" to "Latina",
+    "hungarian" to "magyar",
+    "dutch" to "Nederlands",
+    "norwegian" to "norsk",
+    "polish" to "polski",
+    "portuguese" to "Português",
+    "romanian" to "română",
+    "albanian" to "shqip",
+    "slovak" to "Slovenčina",
+    "finnish" to "Suomi",
+    "swedish" to "Svenska",
+    "tagalog" to "Tagalog",
+    "vietnamese" to "tiếng việt",
+    "turkish" to "Türkçe",
+    "greek" to "Ελληνικά",
+    "mongolian" to "Монгол",
+    "russian" to "Русский",
+    "ukrainian" to "Українська",
+    "hebrew" to "עברית",
+    "arabic" to "العربية",
+    "persian" to "فارسی",
+    "thai" to "ไทย",
+    "korean" to "한국어",
+    "chinese" to "中文",
+    "japanese" to "日本語"
+)
+
+private val galleryTypeStringMap = mapOf(
+    "doujinshi" to R.string.doujinshi,
+    "manga" to R.string.manga,
+    "artistcg" to R.string.artist_cg,
+    "gamecg" to R.string.game_cg,
+    "imageset" to R.string.image_set
+)
+
+private val galleryTypeColorMap = mapOf(
+    "doujinshi" to Red500,
+    "manga" to Yellow500,
+    "artistcg" to Purple500,
+    "gamecg" to Green500,
+    "imageset" to Blue500
+)
+
+class GalleryInfoProvider: PreviewParameterProvider<GalleryInfo> {
+    override val values = sequenceOf(
+        GalleryInfo(
+            id = "2296437",
+            title = "Kakyuu Majutsushi, Inmon ni Somaru | 하급 마술사, 음문에 물들다",
+            language = "korean",
+            type = "doujinshi",
+            date = "2022-08-11 07:14:00-05",
+            artists = listOf(Artist("wagashi")),
+            groups = listOf(Group("dagashiya")),
+            series = listOf(Series("original")),
+            tags = listOf(
+                GalleryTag("ahegao", female="1"),
+                GalleryTag("big penis", male="1"),
+                GalleryTag("bike shorts", female="1"),
+                GalleryTag("blowjob", female="1"),
+                GalleryTag("blowjob face", female="1"),
+                GalleryTag("bukkake", female="1"),
+                GalleryTag("bunny girl", female="1"),
+                GalleryTag("clone", male="1"),
+                GalleryTag("corruption", female="1"),
+                GalleryTag("crotch tattoo", female="1"),
+                GalleryTag("gloves", female="1"),
+                GalleryTag("gokkun", female="1"),
+                GalleryTag("group"),
+                GalleryTag("kemonomimi", female="1"),
+                GalleryTag("leotard", female="1"),
+                GalleryTag("lingerie", female="1"),
+                GalleryTag("loli", female="1"),
+                GalleryTag("masked face", female="1"),
+                GalleryTag("masturbation", female="1"),
+                GalleryTag("mind control", female="1"),
+                GalleryTag("mmf threesome"),
+                GalleryTag("moral degeneration", female="1"),
+                GalleryTag("mouth mask", female="1"),
+                GalleryTag("nakadashi", female="1"),
+                GalleryTag("prostitution", female="1"),
+                GalleryTag("smell", male="1"),
+                GalleryTag("unusual pupils", female="1"),
+            ),
+            related = listOf(2806924, 2806923, 2319091, 1647024, 2580808),
+            languages = listOf(
+                Language(galleryID="2806923", name="korean"),
+                Language(galleryID="2609305", name="english"),
+                Language(galleryID="2302333", name="spanish"),
+                Language(galleryID="2392785", name="portuguese"),
+                Language(galleryID="2303940", name="russian"),
+                Language(galleryID="2736129", name="chinese"),
+                Language(galleryID="2295647", name="japanese")
+            ),
+            characters = listOf(Character("Kakyuu Majutsushi")),
+            files = listOf(
+                GalleryFile(name="01.jpg", hash="d441383396a6ba41a2db914328dc80d16b5191e53d23a5f0f9f8a0cd8f2e7cef", width=4185, height=6000, hasWebP=1, hasAVIF=1, hasJXL=0),
+                GalleryFile(name="02.png", hash="a42517a19c7db6369749807bbc6676906e35709be07f780247f2e68d516ed1d5", width=4535, height=6307, hasWebP=1, hasAVIF=1, hasJXL=0),
+                GalleryFile(name="03.png", hash="ee0841953755f34a0a146a7f757cf2993c678384f53e88715b1c97a00abe5c27", width=4535, height=6307, hasWebP=1, hasAVIF=1, hasJXL=0),
+                GalleryFile(name="04.png", hash="66fafca77a7ed0287666e77fe268a02f75b4e27c2b9b77e6577bb3132396132b", width=4535, height=6307, hasWebP=1, hasAVIF=1, hasJXL=0),
+                GalleryFile(name="05.png", hash="0ef8081ad9eef5093077c8551e87903e8b275e607634717857c2986e8d3c51a9", width=4535, height=6307, hasWebP=1, hasAVIF=1, hasJXL=0),
+                GalleryFile(name="06.png", hash="2e59ffd59fa761355ea855a9e0f366cb39569207165a99659a9f0868cbba7e94", width=4535, height=6307, hasWebP=1, hasAVIF=1, hasJXL=0),
+                GalleryFile(name="07.png", hash="5dc19fb97a2f1c64cae5634cd651f593d022b3114bbacaab15ba114be581cbea", width=4535, height=6307, hasWebP=1, hasAVIF=1, hasJXL=0),
+                GalleryFile(name="08.png", hash="9121781d4f8fb1aaaee124f82c2ab98c97eb3e1f9508bab7c1d8771bb5eddfdb", width=4520, height=6295, hasWebP=1, hasAVIF=1, hasJXL=0),
+                GalleryFile(name="09.png", hash="e5ceae4da5e497bd95a79a607f2c85bb3e8dc7386e041086cd5ccb9a9fb4dcb1", width=4535, height=6307, hasWebP=1, hasAVIF=1, hasJXL=0),
+                GalleryFile(name="10.png", hash="be56219811a29f86dfcf5a7af0b25addc7436b134acd1a94d51c69c987da9d1b", width=4535, height=6307, hasWebP=1, hasAVIF=1, hasJXL=0),
+                GalleryFile(name="11.png", hash="4e3b09ac015360ad4daffcea46265f3eb319bbe638ce90f26d4cbae37dc8c0f1", width=4535, height=6307, hasWebP=1, hasAVIF=1, hasJXL=0),
+                GalleryFile(name="12.png", hash="5d57c0a0cd00604382eeaf0b32446b938dafc9d980eb086673e1fa0307166e39", width=4535, height=6307, hasWebP=1, hasAVIF=1, hasJXL=0),
+                GalleryFile(name="13.png", hash="1ff2313fe979b52b826d482be90699a7c086afc251fa22306e92dfc582611f10", width=4535, height=6307, hasWebP=1, hasAVIF=1, hasJXL=0),
+                GalleryFile(name="14.png", hash="7ad92a9408a059afafc68d3086c5f6a070c7e0d550bc2d328b5c9e16a62be01c", width=4535, height=6307, hasWebP=1, hasAVIF=1, hasJXL=0),
+                GalleryFile(name="15.png", hash="4a6db95b7111b647e450c155af07c617d28313c02871ed94ad0c5986d3c5d1aa", width=4535, height=6307, hasWebP=1, hasAVIF=1, hasJXL=0),
+                GalleryFile(name="16.png", hash="d4b53bf416c9bd2f72850e80ddaaf8467c663c72433c8ebebf3a70742fea7c32", width=4535, height=6307, hasWebP=1, hasAVIF=1, hasJXL=0),
+                GalleryFile(name="17.png", hash="d189d5321f18414de816c049d3e2d72a7d31124d628037ca9f7da4572025cf01", width=4535, height=6307, hasWebP=1, hasAVIF=1, hasJXL=0),
+                GalleryFile(name="18.png", hash="3ff372d7ba4e34cff9f7b46f5323e60b36f9b9df3dd5d02be4c71de4a7ee23c7", width=4535, height=6307, hasWebP=1, hasAVIF=1, hasJXL=0),
+                GalleryFile(name="19.png", hash="2965852c2000fb17f756263b47ca196563995be2d03143f64c297f5930248d1e", width=4535, height=6307, hasWebP=1, hasAVIF=1, hasJXL=0),
+                GalleryFile(name="20.png", hash="3713f95947cc6df0b67af5532a440f023c99ee37d483f3f9252400168e3a55ad", width=4535, height=6307, hasWebP=1, hasAVIF=1, hasJXL=0),
+                GalleryFile(name="21.png", hash="c0b2b2d5ee79c3dc3b737c0eaff19ed1a731d81495adc2c94260de7ebbd85415", width=4535, height=6307, hasWebP=1, hasAVIF=1, hasJXL=0),
+                GalleryFile(name="22.png", hash="8835fe309a26fce6882c0fcdf37cbd5f5bcc69dd2c32e436deb644891ca8499b", width=4535, height=6307, hasWebP=1, hasAVIF=1, hasJXL=0),
+                GalleryFile(name="23.png", hash="5eb28619c1919ad29b86fb6cdaeccd50ad2ad857c81f56c060e8b66a2ed315d0", width=4535, height=6307, hasWebP=1, hasAVIF=1, hasJXL=0),
+                GalleryFile(name="24.png", hash="7ea3ecf4c0b0e5e632163a5b0dc2475a071e1209a0fed8e8e49243093c35babb", width=4535, height=6307, hasWebP=1, hasAVIF=1, hasJXL=0),
+                GalleryFile(name="25.png", hash="d01355724eb60c41e43159607652812d1fbbbac12962b2f9068a9e620ee0c246", width=4535, height=6307, hasWebP=1, hasAVIF=1, hasJXL=0),
+                GalleryFile(name="26.png", hash="58a33c1d709b005a17600f7beb14a81711a106619bdb029d30646a9060c245c7", width=4535, height=6307, hasWebP=1, hasAVIF=1, hasJXL=0),
+                GalleryFile(name="27.png", hash="0b18753f2fe7ea97c2e2c13a082a5a675f36085558bcd3fb7be916b6118c6000", width=4535, height=6307, hasWebP=1, hasAVIF=1, hasJXL=0),
+                GalleryFile(name="28.png", hash="e8f0a2f9d35ec2c1974a4aea07eefd792462049e7b0972bf8cd5532dd82cee21", width=4535, height=6307, hasWebP=1, hasAVIF=1, hasJXL=0),
+                GalleryFile(name="29.png", hash="90ec7a13aedf22c1f9317f75e843a4ace4e236d6100a8c8bb5aeb8160ff1cd00", width=4535, height=6307, hasWebP=1, hasAVIF=1, hasJXL=0),
+                GalleryFile(name="30.png", hash="3229400975e6cef763c54a82a4ce0e6f51ec41c9b674072e74f66b41e325b655", width=4535, height=6307, hasWebP=1, hasAVIF=1, hasJXL=0),
+                GalleryFile(name="31.png", hash="4e04efa56981804f7d13858a98935038fe421956367dcabba8e9118d273135d5", width=4535, height=6307, hasWebP=1, hasAVIF=1, hasJXL=0),
+                GalleryFile(name="32.png", hash="e0d8641127aaaf587ec5e3040c49edee9cda866a5f1f377e567b908514b1eb68", width=4535, height=6307, hasWebP=1, hasAVIF=1, hasJXL=0),
+                GalleryFile(name="33.png", hash="00125ab9090be7d3462fd6943c209bc68c236ef50ca0f1552530fd8253d87f7d", width=4535, height=6307, hasWebP=1, hasAVIF=1, hasJXL=0),
+                GalleryFile(name="34.png", hash="1ea303198badaecfcf66a438baa6867690416d77a542f1ff0181b1895df95ccb", width=4535, height=6307, hasWebP=1, hasAVIF=1, hasJXL=0),
+                GalleryFile(name="35.png", hash="40181ac057808a16716e640c462cc2b992822999ab8db43d454bb331d50bd39f", width=4535, height=6307, hasWebP=1, hasAVIF=1, hasJXL=0),
+                GalleryFile(name="36.png", hash="92cbe1067c1c554c5a2e01b58b6fb86677a523cba586dfa209d61b4af70b2f54", width=4535, height=6307, hasWebP=1, hasAVIF=1, hasJXL=0),
+                GalleryFile(name="37.png", hash="4fbbdc6d5450eb1f2f7e45a97ce8360d43e199454a8eb9e536740309c2067999", width=4535, height=6307, hasWebP=1, hasAVIF=1, hasJXL=0),
+                GalleryFile(name="38.png", hash="0cb74b8af27e51604c728a26cf4788899fa04f854853badea9884b008c024e94", width=4535, height=6307, hasWebP=1, hasAVIF=1, hasJXL=0),
+                GalleryFile(name="39.png", hash="254676c13ab418ce1110a9bad009554abc72af7e2ff9d719409881ea3c635d46", width=4535, height=6307, hasWebP=1, hasAVIF=1, hasJXL=0),
+                GalleryFile(name="40.png", hash="33527e1171b9cf21ab164be2b76cb5b9daa91980a3330f2441dd9bf911e2e05b", width=4535, height=6307, hasWebP=1, hasAVIF=1, hasJXL=0),
+                GalleryFile(name="41.png", hash="4dc331acb058665500aa308143c106efb6999855d1c3b0665c1dd331c8364430", width=4535, height=6307, hasWebP=1, hasAVIF=1, hasJXL=0),
+                GalleryFile(name="42.png", hash="7674f03fa02cf96a20f1e192caf76d85e7e556add0cdb65aabdc86d417093d39", width=4535, height=6307, hasWebP=1, hasAVIF=1, hasJXL=0),
+                GalleryFile(name="43.png", hash="27a4a280483142b213b26d53f06b991be35122cb263c69a87435e624b2a307fd", width=4535, height=6307, hasWebP=1, hasAVIF=1, hasJXL=0),
+                GalleryFile(name="44.png", hash="3114ba3bff094abbae9160656894d462e0567cea23e6fa2693469c5e7defa6fe", width=4535, height=6307, hasWebP=1, hasAVIF=1, hasJXL=0),
+                GalleryFile(name="45.png", hash="dc22ffed6a678a560e781f795b3ee0876ec8726ae2af942226710102758d44db", width=4535, height=6307, hasWebP=1, hasAVIF=1, hasJXL=0),
+                GalleryFile(name="46.png", hash="4f7257ad75b990cc2b8dad0c5a09a831cb1670e7aaeadc71809f4bd7400f0071", width=4535, height=6307, hasWebP=1, hasAVIF=1, hasJXL=0),
+                GalleryFile(name="47.png", hash="bf74fcd74ce77b5089bac98dc9f5737ba1fe87cdcfb01ad80e63024c93f82692", width=4535, height=6307, hasWebP=1, hasAVIF=1, hasJXL=0),
+                GalleryFile(name="48.png", hash="d0baed210584183efa654ca7a483c558afe9eb18b71452ed2cfd4264b269ffca", width=4535, height=6307, hasWebP=1, hasAVIF=1, hasJXL=0),
+                GalleryFile(name="49.png", hash="2b9c90a038e4e918655dffa84fbbb08cbedfce642277b1140d070aa9a711ebac", width=4535, height=6307, hasWebP=1, hasAVIF=1, hasJXL=0),
+                GalleryFile(name="50.png", hash="cdfba6a9b8a570f2f317fb01e66ebc72ede5735a41256b326a38af2296799095", width=4535, height=6307, hasWebP=1, hasAVIF=1, hasJXL=0),
+                GalleryFile(name="51.png", hash="84ad9d51aab2e8ae1cbb5a0918cc3f62473e98512db9f473ab1ffe3a4f7aa75a", width=4535, height=6307, hasWebP=1, hasAVIF=1, hasJXL=0),
+                GalleryFile(name="52.png", hash="0d7a420aa23e23cee7f8e124b12080e309cffb3d7269389f23e1ac3d5b7363a5", width=4535, height=6307, hasWebP=1, hasAVIF=1, hasJXL=0),
+                GalleryFile(name="53.png", hash="575cf99346f9786d6e30bc163dc6d5fa439bd157a9ffce90586bfc5657121981", width=4535, height=6307, hasWebP=1, hasAVIF=1, hasJXL=0),
+                GalleryFile(name="54.png", hash="9004d3fd46dc278b79cf7a5bf72002dd4b0b03ad6bded30ceebcb633185b49ce", width=4535, height=6307, hasWebP=1, hasAVIF=1, hasJXL=0),
+                GalleryFile(name="55.png", hash="8e53c301e2c2b539783c7b8c4f5028f221198d33e114dcc40e6a0025aee840ab", width=4535, height=6307, hasWebP=1, hasAVIF=1, hasJXL=0),
+                GalleryFile(name="56.png", hash="576764073554fcf644c12d80f26b3bae42f39f3516ed7841c9e297248324b237", width=4535, height=6307, hasWebP=1, hasAVIF=1, hasJXL=0),
+                GalleryFile(name="57.png", hash="110da01b9ae7ed4a145792f55498a5efa22cebec4da84f6220904840b508c75e", width=4535, height=6307, hasWebP=1, hasAVIF=1, hasJXL=0),
+                GalleryFile(name="58.jpg", hash="3ae38577135465b6224e0487c0cdcd37cf11764883f3b78a67545d48c6beade5", width=4260, height=6000, hasWebP=1, hasAVIF=1, hasJXL=0),
+            )
+        )
+    )
+}
+
+@OptIn(ExperimentalLayoutApi::class)
+@Composable
+fun TagGroup(tags: List<SearchQuery.Tag>, folded: Boolean = false) {
+    var isFolded by remember { mutableStateOf(folded) }
+
+    FlowRow(
+        horizontalArrangement = Arrangement.spacedBy(4.dp),
+        verticalArrangement = Arrangement.spacedBy(4.dp)
+    ) {
+        tags.sortedBy {
+            when(it.namespace) {
+                "female" -> 1
+                "male" -> 2
+                else -> 3
+            }
+        }.let {
+            if (isFolded) it.take(10) else it
+        }.forEach { tag ->
+            TagChip(tag = tag.toTag())
+        }
+
+        if (isFolded && tags.size > 10)
+            Surface(
+                modifier = Modifier.height(32.dp),
+                color = MaterialTheme.colorScheme.surface,
+                shape = RoundedCornerShape(16.dp),
+                onClick = { isFolded = false }
+            ) {
+                Text(
+                    "…",
+                    modifier = Modifier.padding(16.dp, 8.dp),
+                    color = MaterialTheme.colorScheme.onSurface,
+                    style = MaterialTheme.typography.bodyMedium
+                )
+            }
+    }
+}
+
+@Composable
+fun GalleryTypeIndicator(galleryType: String) {
+    Surface(
+        modifier = Modifier.height(32.dp),
+        color = galleryTypeColorMap[galleryType] ?: MaterialTheme.colorScheme.surface,
+        shape = RoundedCornerShape(16.dp)
+    ) {
+        Box(Modifier.fillMaxHeight()) {
+            Text(
+                galleryTypeStringMap[galleryType]?.let { stringResource(it) } ?: galleryType,
+                modifier = Modifier
+                    .padding(horizontal = 16.dp)
+                    .align(Alignment.Center),
+                style = MaterialTheme.typography.bodyMedium,
+                color = Color.White
+            )
+        }
+    }
+}
+
+@Composable
+fun LanguageTitle(title: String, language: String?) {
+    val icon = languageIconMap[language]
+
+    if (icon != null) {
+        Text(
+            buildAnnotatedString {
+                appendInlineContent("language", "<language>")
+                append(' ')
+                append(title)
+            },
+            style = MaterialTheme.typography.headlineSmall,
+            inlineContent = mapOf(
+                "language" to InlineTextContent(
+                    Placeholder(
+                        width = 20.sp,
+                        height = 20.sp,
+                        placeholderVerticalAlign = PlaceholderVerticalAlign.Center
+                    )
+                ) {
+                    Icon(
+                        painterResource(icon),
+                        contentDescription = null,
+                        tint = Color.Unspecified
+                    )
+                }
+            )
+        )
+    } else {
+        Text(title, style = MaterialTheme.typography.headlineSmall)
+    }
+}
+
+@Composable
+fun DetailedGalleryInfoHeader(galleryInfo: GalleryInfo, thumbnailUrl: String?) {
+    val thumbnailFile = galleryInfo.files.first()
+    val aspectRatio = thumbnailFile.let { it.width / it.height.toFloat() }
+
+    if (thumbnailFile.let { it.width > it.height }) {
+        Column {
+            if (thumbnailUrl != null) {
+                SubcomposeAsyncImage(
+                    model = ImageRequest.Builder(LocalContext.current)
+                        .data(thumbnailUrl)
+                        .setHeader("Referer", "https://hitomi.la/")
+                        .build(),
+                    modifier = Modifier
+                        .fillMaxWidth()
+                        .aspectRatio(aspectRatio)
+                        .clip(RoundedCornerShape(8.dp)),
+                    loading = { CircularProgressIndicator(Modifier.align(Alignment.Center)) },
+                    error = {
+                        Icon(
+                            Icons.Default.BrokenImage,
+                            contentDescription = null,
+                        )
+                    },
+                    contentDescription = "Thumbnail"
+                )
+            } else {
+                Box(
+                    Modifier
+                        .fillMaxWidth()
+                        .aspectRatio(aspectRatio)) {
+                    CircularProgressIndicator(Modifier.align(Alignment.Center))
+                }
+            }
+
+            Spacer(Modifier.height(8.dp))
+
+            LanguageTitle(galleryInfo.title, galleryInfo.language)
+
+            val artistsAndGroups = buildString {
+                if (!galleryInfo.artists.isNullOrEmpty())
+                    append(galleryInfo.artists.joinToCapitalizedString())
+
+                if (!galleryInfo.groups.isNullOrEmpty()) {
+                    if (this.isNotEmpty()) append(' ')
+                    append('(')
+                    append(galleryInfo.groups.joinToCapitalizedString())
+                    append(')')
+                }
+            }
+
+            if (artistsAndGroups.isNotEmpty()) {
+                Text(
+                    artistsAndGroups,
+                    style = MaterialTheme.typography.labelLarge,
+                )
+            }
+        }
+    } else {
+        Row(
+            horizontalArrangement = Arrangement.spacedBy(8.dp),
+            verticalAlignment = Alignment.CenterVertically
+        ) {
+            if (thumbnailUrl != null) {
+                SubcomposeAsyncImage(
+                    model = ImageRequest.Builder(LocalContext.current)
+                        .data(thumbnailUrl)
+                        .setHeader("Referer", "https://hitomi.la/")
+                        .build(),
+                    modifier = Modifier
+                        .height(200.dp)
+                        .aspectRatio(aspectRatio)
+                        .clip(RoundedCornerShape(8.dp)),
+                    loading = { CircularProgressIndicator(Modifier.align(Alignment.Center)) },
+                    error = {
+                        Icon(
+                            Icons.Default.BrokenImage,
+                            contentDescription = null,
+                        )
+                    },
+                    contentDescription = "Thumbnail"
+                )
+            } else {
+                Box(
+                    Modifier
+                        .height(200.dp)
+                        .aspectRatio(aspectRatio)) {
+                    CircularProgressIndicator(Modifier.align(Alignment.Center))
+                }
+            }
+            Column(Modifier.heightIn(min = 200.dp)) {
+                LanguageTitle(galleryInfo.title, galleryInfo.language)
+
+                val artistsAndGroups = buildString {
+                    if (!galleryInfo.artists.isNullOrEmpty())
+                        append(galleryInfo.artists.joinToCapitalizedString())
+
+                    if (!galleryInfo.groups.isNullOrEmpty()) {
+                        if (this.isNotEmpty()) append(' ')
+                        append('(')
+                        append(galleryInfo.groups.joinToCapitalizedString())
+                        append(')')
+                    }
+                }
+
+                if (artistsAndGroups.isNotEmpty()) {
+                    Text(
+                        artistsAndGroups,
+                        style = MaterialTheme.typography.labelLarge
+                    )
+                }
+            }
+        }
+    }
+}
+
+@Preview
+@Composable
+fun DetailedGalleryInfo(
+    @PreviewParameter(GalleryInfoProvider::class) galleryInfo: GalleryInfo,
+    modifier: Modifier = Modifier,
+) {
+    var thumbnailUrl by remember { mutableStateOf<String?>(null) }
+    
+    LaunchedEffect(galleryInfo) {
+        thumbnailUrl = galleryInfo.files.firstOrNull()?.let {
+            HitomiHttpClient.getImageURL(it, true).firstOrNull()
+        } ?: ""
+    }
+    
+    Card(modifier) {
+        Column(Modifier.padding(8.dp), verticalArrangement = Arrangement.spacedBy(8.dp)) {
+            DetailedGalleryInfoHeader(galleryInfo, thumbnailUrl)
+
+            GalleryTypeIndicator(galleryInfo.type)
+
+            if (galleryInfo.tags?.isNotEmpty() == true) {
+                TagGroup(galleryInfo.tags.map { it.toTag() }, folded = true)
+            }
+
+            HorizontalDivider()
+
+            Box(
+                Modifier
+                    .fillMaxWidth()
+                    .padding(4.dp)) {
+                Text(
+                    modifier = Modifier.align(Alignment.CenterStart),
+                    text = galleryInfo.id,
+                    style = MaterialTheme.typography.bodyMedium
+                )
+                Text(
+                    modifier = Modifier.align(Alignment.Center),
+                    text = "${galleryInfo.files.size}P",
+                    style = MaterialTheme.typography.bodyMedium
+                )
+                Icon(
+                    modifier = Modifier
+                        .align(Alignment.CenterEnd)
+                        .size(32.dp),
+                    imageVector = Icons.Default.StarOutline,
+                    contentDescription = null,
+                    tint = Yellow500
+                )
+            }
+        }
+    }
+}

app/src/main/java/xyz/quaver/pupil/ui/composable/MainApp.kt

@@ -0,0 +1,306 @@
+package xyz.quaver.pupil.ui.composable
+
+import android.util.Log
+import androidx.compose.animation.AnimatedVisibility
+import androidx.compose.foundation.background
+import androidx.compose.foundation.layout.Arrangement
+import androidx.compose.foundation.layout.Box
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.Row
+import androidx.compose.foundation.layout.WindowInsets
+import androidx.compose.foundation.layout.consumeWindowInsets
+import androidx.compose.foundation.layout.fillMaxSize
+import androidx.compose.foundation.layout.ime
+import androidx.compose.foundation.layout.navigationBars
+import androidx.compose.material3.DrawerValue
+import androidx.compose.material3.MaterialTheme
+import androidx.compose.material3.ModalNavigationDrawer
+import androidx.compose.material3.PermanentNavigationDrawer
+import androidx.compose.material3.Text
+import androidx.compose.material3.rememberDrawerState
+import androidx.compose.material3.windowsizeclass.WindowHeightSizeClass
+import androidx.compose.material3.windowsizeclass.WindowSizeClass
+import androidx.compose.material3.windowsizeclass.WindowWidthSizeClass
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.getValue
+import androidx.compose.runtime.rememberCoroutineScope
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.res.stringResource
+import androidx.compose.ui.text.style.TextAlign
+import androidx.compose.ui.unit.dp
+import androidx.navigation.NavHostController
+import androidx.navigation.activity
+import androidx.navigation.compose.NavHost
+import androidx.navigation.compose.composable
+import androidx.navigation.compose.currentBackStackEntryAsState
+import androidx.window.layout.DisplayFeature
+import androidx.window.layout.FoldingFeature
+import kotlinx.coroutines.launch
+import xyz.quaver.pupil.R
+import xyz.quaver.pupil.networking.GalleryInfo
+import xyz.quaver.pupil.networking.SearchQuery
+import xyz.quaver.pupil.ui.viewmodel.SearchState
+
+@Composable
+fun MainApp(
+    windowSize: WindowSizeClass,
+    displayFeatures: List<DisplayFeature>,
+    uiState: SearchState,
+    navController: NavHostController,
+    openGalleryDetails: (GalleryInfo) -> Unit,
+    closeGalleryDetails: () -> Unit,
+    onQueryChange: (SearchQuery?) -> Unit,
+    loadSearchResult: (IntRange) -> Unit,
+) {
+    val navigationType: NavigationType
+    val contentType: ContentType
+
+    val foldingFeature: FoldingFeature? = displayFeatures.filterIsInstance<FoldingFeature>().firstOrNull()
+    val foldingDevicePosture = when {
+        isBookPosture(foldingFeature) -> DevicePosture.BookPosture(foldingFeature.bounds)
+        isSeparating(foldingFeature) -> DevicePosture.Separating(foldingFeature.bounds, foldingFeature.orientation)
+        else -> DevicePosture.NormalPosture
+    }
+
+    when (windowSize.widthSizeClass) {
+        WindowWidthSizeClass.Compact -> {
+            navigationType = NavigationType.BOTTOM_NAVIGATION
+            contentType = ContentType.SINGLE_PANE
+        }
+        WindowWidthSizeClass.Medium -> {
+            navigationType = NavigationType.NAVIGATION_RAIL
+            contentType = if (foldingDevicePosture != DevicePosture.NormalPosture) {
+                ContentType.DUAL_PANE
+            } else {
+                ContentType.SINGLE_PANE
+            }
+        }
+        WindowWidthSizeClass.Expanded -> {
+            navigationType = if (foldingDevicePosture is DevicePosture.BookPosture) {
+                NavigationType.NAVIGATION_RAIL
+            } else {
+                NavigationType.PERMANENT_NAVIGATION_DRAWER
+            }
+            contentType = ContentType.DUAL_PANE
+        }
+        else -> {
+            navigationType = NavigationType.BOTTOM_NAVIGATION
+            contentType = ContentType.SINGLE_PANE
+        }
+    }
+
+    val navigationContentPosition = when (windowSize.heightSizeClass) {
+        WindowHeightSizeClass.Compact -> NavigationContentPosition.TOP
+        WindowHeightSizeClass.Medium,
+        WindowHeightSizeClass.Expanded -> NavigationContentPosition.CENTER
+        else -> NavigationContentPosition.TOP
+    }
+
+    MainNavigationWrapper(
+        navigationType,
+        contentType,
+        displayFeatures,
+        navigationContentPosition,
+        uiState,
+        navController,
+        openGalleryDetails = openGalleryDetails,
+        closeGalleryDetails = closeGalleryDetails,
+        onQueryChange = onQueryChange,
+        loadSearchResult = loadSearchResult
+    )
+}
+
+@Composable
+private fun MainNavigationWrapper(
+    navigationType: NavigationType,
+    contentType: ContentType,
+    displayFeatures: List<DisplayFeature>,
+    navigationContentPosition: NavigationContentPosition,
+    uiState: SearchState,
+    navController: NavHostController,
+    openGalleryDetails: (GalleryInfo) -> Unit,
+    closeGalleryDetails: () -> Unit,
+    onQueryChange: (SearchQuery?) -> Unit,
+    loadSearchResult: (IntRange) -> Unit
+) {
+    val drawerState = rememberDrawerState(initialValue = DrawerValue.Closed)
+    val coroutineScope = rememberCoroutineScope()
+
+    val navBackStackEntry by navController.currentBackStackEntryAsState()
+    val currentRoute = navBackStackEntry?.destination?.route
+
+    val openDrawer: () -> Unit = {
+        coroutineScope.launch {
+            drawerState.open()
+        }
+    }
+
+    if (navigationType == NavigationType.PERMANENT_NAVIGATION_DRAWER) {
+        PermanentNavigationDrawer(
+            drawerContent = {
+                PermanentNavigationDrawerContent(
+                    selectedDestination = currentRoute,
+                    navigateToDestination = { navController.navigate(it.route) {
+                        popUpTo(MainDestination.Search.route)
+                        launchSingleTop = true
+                    } },
+                    navigationContentPosition = navigationContentPosition,
+                )
+            }
+        ) {
+            MainContent(
+                navigationType = navigationType,
+                contentType = contentType,
+                displayFeatures = displayFeatures,
+                uiState = uiState,
+                navController = navController,
+                onDrawerClicked = openDrawer,
+                openGalleryDetails = openGalleryDetails,
+                closeGalleryDetails = closeGalleryDetails,
+                onQueryChange = onQueryChange,
+                loadSearchResult = loadSearchResult,
+            )
+        }
+    } else {
+        ModalNavigationDrawer(
+            drawerContent = {
+                ModalNavigationDrawerContent(
+                    selectedDestination = currentRoute,
+                    navigateToDestination = { navController.navigate(it.route) {
+                        popUpTo(MainDestination.Search.route)
+                        launchSingleTop = true
+                    } },
+                    navigationContentPosition = navigationContentPosition,
+                    onDrawerClicked = {
+                        coroutineScope.launch {
+                            drawerState.close()
+                        }
+                    }
+                )
+            },
+            drawerState = drawerState
+        ) {
+            MainContent(
+                navigationType = navigationType,
+                contentType = contentType,
+                displayFeatures = displayFeatures,
+                uiState = uiState,
+                navController = navController,
+                onDrawerClicked = openDrawer,
+                openGalleryDetails = openGalleryDetails,
+                closeGalleryDetails = closeGalleryDetails,
+                onQueryChange = onQueryChange,
+                loadSearchResult = loadSearchResult,
+            )
+        }
+    }
+}
+
+@Composable
+fun NotImplemented() {
+    Box(Modifier.fillMaxSize()) {
+        Column(
+            Modifier.align(Alignment.Center),
+            horizontalAlignment = Alignment.CenterHorizontally,
+            verticalArrangement = Arrangement.spacedBy(16.dp)
+        ) {
+            Text("(⁄ ⁄•⁄ω⁄•⁄ ⁄)", style = MaterialTheme.typography.headlineMedium, color = MaterialTheme.colorScheme.onSurface.copy(alpha = 0.5f))
+            Text(stringResource(R.string.not_implemented), textAlign = TextAlign.Center)
+        }
+    }
+}
+
+@Composable
+fun MainContent(
+    navigationType: NavigationType,
+    contentType: ContentType,
+    displayFeatures: List<DisplayFeature>,
+    uiState: SearchState,
+    navController: NavHostController,
+    onDrawerClicked: () -> Unit,
+    openGalleryDetails: (GalleryInfo) -> Unit,
+    closeGalleryDetails: () -> Unit,
+    onQueryChange: (SearchQuery?) -> Unit,
+    loadSearchResult: (IntRange) -> Unit,
+) {
+    val navBackStackEntry by navController.currentBackStackEntryAsState()
+    val currentRoute = navBackStackEntry?.destination?.route
+
+    Row(modifier = Modifier.fillMaxSize()) {
+        AnimatedVisibility(visible = navigationType == NavigationType.NAVIGATION_RAIL) {
+            MainNavigationRail(
+                selectedDestination = currentRoute,
+                navigateToDestination = { navController.navigate(it.route) {
+                    popUpTo(MainDestination.Search.route)
+                    launchSingleTop = true
+                } },
+                onDrawerClicked = onDrawerClicked
+            )
+        }
+        Column(
+            modifier = Modifier
+                .fillMaxSize()
+                .background(MaterialTheme.colorScheme.inverseOnSurface)
+        ) {
+            Box(
+                modifier = Modifier
+                    .weight(1f)
+                    .run {
+                        if (navigationType == NavigationType.BOTTOM_NAVIGATION) {
+                            this
+                                .consumeWindowInsets(WindowInsets.ime)
+                                .consumeWindowInsets(WindowInsets.navigationBars)
+                        } else this
+                    }
+            ) {
+                NavHost(
+                    modifier = Modifier.fillMaxSize(),
+                    navController = navController,
+                    startDestination = MainDestination.Search.route
+                ) {
+                    composable(MainDestination.Search.route) {
+                        SearchScreen(
+                            contentType = contentType,
+                            displayFeatures = displayFeatures,
+                            uiState = uiState,
+                            openGalleryDetails = openGalleryDetails,
+                            closeGalleryDetails = closeGalleryDetails,
+                            onQueryChange = onQueryChange,
+                            loadSearchResult = loadSearchResult,
+                            openGallery = {
+                                navController.navigate(MainDestination.ImageViewer(it.id).route) {
+                                    launchSingleTop = true
+                                }
+                            }
+                        )
+                    }
+                    composable(MainDestination.History.route) {
+                        NotImplemented()
+                    }
+                    composable(MainDestination.Downloads.route) {
+                        NotImplemented()
+                    }
+                    composable(MainDestination.Favorites.route) {
+                        NotImplemented()
+                    }
+                    composable(MainDestination.Settings.route) {
+                        NotImplemented()
+                    }
+                    composable(MainDestination.ImageViewer.commonRoute) {
+                        NotImplemented()
+                    }
+                }
+            }
+            AnimatedVisibility(visible = navigationType == NavigationType.BOTTOM_NAVIGATION) {
+                BottomNavigationBar(
+                    selectedDestination = currentRoute,
+                    navigateToDestination = { navController.navigate(it.route) {
+                        popUpTo(MainDestination.Search.route)
+                        launchSingleTop = true
+                    } }
+                )
+            }
+        }
+    }
+}

app/src/main/java/xyz/quaver/pupil/ui/composable/MainNavigationActions.kt

@@ -0,0 +1,67 @@
+package xyz.quaver.pupil.ui.composable
+
+import androidx.compose.material.icons.Icons
+import androidx.compose.material.icons.automirrored.filled.MenuBook
+import androidx.compose.material.icons.filled.Download
+import androidx.compose.material.icons.filled.Favorite
+import androidx.compose.material.icons.filled.History
+import androidx.compose.material.icons.filled.MenuBook
+import androidx.compose.material.icons.filled.Search
+import androidx.compose.material.icons.filled.Settings
+import androidx.compose.material.icons.filled.Star
+import androidx.compose.ui.graphics.vector.ImageVector
+import xyz.quaver.pupil.R
+
+sealed interface MainDestination {
+    val route: String
+    val icon: ImageVector
+    val textId: Int
+
+    data object Search: MainDestination {
+        override val route = "search"
+        override val icon = Icons.Default.Search
+        override val textId = R.string.main_destination_search
+    }
+
+    data object History: MainDestination {
+        override val route = "history"
+        override val icon = Icons.Default.History
+        override val textId = R.string.main_destination_history
+    }
+
+    data object Downloads: MainDestination {
+        override val route = "downloads"
+        override val icon = Icons.Default.Download
+        override val textId = R.string.main_destination_downloads
+    }
+
+    data object Favorites: MainDestination {
+        override val route = "favorites"
+        override val icon = Icons.Default.Favorite
+        override val textId = R.string.main_destination_favorites
+    }
+
+    data object Settings: MainDestination {
+        override val route = "settings"
+        override val icon = Icons.Default.Settings
+        override val textId = R.string.main_destination_settings
+    }
+
+    class ImageViewer(galleryID: String): MainDestination {
+        override val route = "image_viewer/$galleryID"
+        override val icon = Icons.AutoMirrored.Filled.MenuBook
+        override val textId = R.string.main_destination_image_viewer
+
+        companion object {
+            val commonRoute = "image_viewer/{galleryID}"
+        }
+    }
+}
+
+val mainDestinations = listOf(
+    MainDestination.Search,
+    MainDestination.History,
+    MainDestination.Downloads,
+    MainDestination.Favorites,
+    MainDestination.Settings
+)

app/src/main/java/xyz/quaver/pupil/ui/composable/NavigationContentPosition.kt

@@ -0,0 +1,5 @@
+package xyz.quaver.pupil.ui.composable
+
+enum class NavigationContentPosition {
+    TOP, CENTER
+}

app/src/main/java/xyz/quaver/pupil/ui/composable/NavigationDrawerContent.kt

@@ -0,0 +1,294 @@
+package xyz.quaver.pupil.ui.composable
+
+import androidx.compose.foundation.background
+import androidx.compose.foundation.layout.Arrangement
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.Row
+import androidx.compose.foundation.layout.WindowInsets
+import androidx.compose.foundation.layout.fillMaxHeight
+import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.ime
+import androidx.compose.foundation.layout.navigationBars
+import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.layout.size
+import androidx.compose.foundation.layout.sizeIn
+import androidx.compose.foundation.layout.union
+import androidx.compose.foundation.rememberScrollState
+import androidx.compose.foundation.verticalScroll
+import androidx.compose.material.icons.Icons
+import androidx.compose.material.icons.automirrored.filled.MenuOpen
+import androidx.compose.material.icons.filled.Menu
+import androidx.compose.material3.Icon
+import androidx.compose.material3.IconButton
+import androidx.compose.material3.MaterialTheme
+import androidx.compose.material3.ModalDrawerSheet
+import androidx.compose.material3.NavigationBar
+import androidx.compose.material3.NavigationBarItem
+import androidx.compose.material3.NavigationDrawerItem
+import androidx.compose.material3.NavigationDrawerItemDefaults
+import androidx.compose.material3.NavigationRail
+import androidx.compose.material3.NavigationRailItem
+import androidx.compose.material3.PermanentDrawerSheet
+import androidx.compose.material3.Text
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.layout.Layout
+import androidx.compose.ui.layout.Measurable
+import androidx.compose.ui.layout.MeasurePolicy
+import androidx.compose.ui.layout.layoutId
+import androidx.compose.ui.res.painterResource
+import androidx.compose.ui.res.stringResource
+import androidx.compose.ui.text.font.FontWeight
+import androidx.compose.ui.unit.dp
+import androidx.compose.ui.unit.offset
+import androidx.navigation.NavDestination
+import xyz.quaver.pupil.R
+
+@Composable
+fun PermanentNavigationDrawerContent(
+    selectedDestination: String?,
+    navigateToDestination: (MainDestination) -> Unit,
+    navigationContentPosition: NavigationContentPosition,
+) {
+    PermanentDrawerSheet(
+        modifier = Modifier.sizeIn(minWidth = 200.dp, maxWidth = 300.dp),
+        drawerContainerColor = MaterialTheme.colorScheme.inverseOnSurface
+    ) {
+        Layout(
+            modifier = Modifier
+                .background(MaterialTheme.colorScheme.inverseOnSurface)
+                .padding(16.dp),
+            content = {
+                Row(
+                    modifier = Modifier.layoutId(LayoutType.HEADER),
+                    verticalAlignment = Alignment.CenterVertically
+                ) {
+                    Icon(
+                        modifier = Modifier.size(32.dp),
+                        painter = painterResource(R.drawable.app_icon),
+                        tint = Color.Unspecified,
+                        contentDescription = "app icon"
+                    )
+                    Text(
+                        modifier = Modifier.padding(16.dp),
+                        text = "Pupil",
+                        style = MaterialTheme.typography.titleLarge.copy(fontWeight = FontWeight.Bold),
+                        color = MaterialTheme.colorScheme.primary
+                    )
+                }
+                Column(
+                    modifier = Modifier
+                        .layoutId(LayoutType.CONTENT)
+                        .verticalScroll(rememberScrollState()),
+                    horizontalAlignment = Alignment.CenterHorizontally
+                ) {
+                    mainDestinations.forEach { destination ->
+                        NavigationDrawerItem(
+                            label = {
+                                Text(
+                                    text = stringResource(destination.textId),
+                                    modifier = Modifier.padding(16.dp)
+                                )
+                            },
+                            icon = {
+                                Icon(
+                                    imageVector = destination.icon,
+                                    contentDescription = stringResource(destination.textId)
+                                )
+                            },
+                            selected = selectedDestination == destination.route,
+                            colors = NavigationDrawerItemDefaults.colors(
+                                unselectedContainerColor = Color.Transparent
+                            ),
+                            onClick = { navigateToDestination(destination) }
+                        )
+                    }
+                }
+            },
+            measurePolicy = navigationMeasurePolicy(navigationContentPosition)
+        )
+    }
+}
+
+@Composable
+fun ModalNavigationDrawerContent(
+    selectedDestination: String?,
+    navigationContentPosition: NavigationContentPosition,
+    navigateToDestination: (MainDestination) -> Unit,
+    onDrawerClicked: () -> Unit
+) {
+    ModalDrawerSheet {
+        Layout(
+            modifier = Modifier
+                .background(MaterialTheme.colorScheme.inverseOnSurface)
+                .padding(16.dp),
+            content = {
+                Row(
+                    modifier = Modifier
+                        .layoutId(LayoutType.HEADER)
+                        .fillMaxWidth()
+                        .padding(16.dp),
+                    horizontalArrangement = Arrangement.SpaceBetween,
+                    verticalAlignment = Alignment.CenterVertically
+                ) {
+                    Row(
+                        verticalAlignment = Alignment.CenterVertically
+                    ) {
+                        Icon(
+                            modifier = Modifier.size(32.dp),
+                            painter = painterResource(R.drawable.app_icon),
+                            tint = Color.Unspecified,
+                            contentDescription = "app icon"
+                        )
+                        Text(
+                            modifier = Modifier.padding(16.dp),
+                            text = "Pupil",
+                            style = MaterialTheme.typography.titleLarge.copy(fontWeight = FontWeight.Bold),
+                            color = MaterialTheme.colorScheme.primary
+                        )
+                    }
+
+                    IconButton(onClick = onDrawerClicked) {
+                        Icon(
+                            imageVector = Icons.AutoMirrored.Default.MenuOpen,
+                            contentDescription = stringResource(R.string.main_open_navigation_drawer)
+                        )
+                    }
+                }
+
+                Column (
+                    modifier = Modifier
+                        .layoutId(LayoutType.CONTENT)
+                        .verticalScroll(rememberScrollState()),
+                    horizontalAlignment = Alignment.CenterHorizontally
+                ) {
+                    mainDestinations.forEach { destination ->
+                        NavigationDrawerItem(
+                            label = {
+                                Text(
+                                    text = stringResource(destination.textId),
+                                    modifier = Modifier.padding(16.dp)
+                                )
+                            },
+                            icon = {
+                                Icon(
+                                    imageVector = destination.icon,
+                                    contentDescription = stringResource(destination.textId)
+                                )
+                            },
+                            selected = selectedDestination == destination.route,
+                            colors = NavigationDrawerItemDefaults.colors(
+                                unselectedContainerColor = Color.Transparent
+                            ),
+                            onClick = { navigateToDestination(destination) }
+                        )
+                    }
+                }
+            },
+            measurePolicy = navigationMeasurePolicy(navigationContentPosition)
+        )
+    }
+}
+
+@Composable
+fun MainNavigationRail(
+    selectedDestination: String?,
+    navigateToDestination: (MainDestination) -> Unit,
+    onDrawerClicked: () -> Unit
+) {
+    NavigationRail (
+        modifier = Modifier.fillMaxHeight(),
+        containerColor = MaterialTheme.colorScheme.inverseOnSurface
+    ) {
+        NavigationRailItem(
+            selected = false,
+            onClick = onDrawerClicked,
+            icon = { 
+                Icon(
+                    imageVector = Icons.Default.Menu,
+                    contentDescription = stringResource(R.string.main_open_navigation_drawer)
+                )
+            }
+        )
+        
+        Column(
+            modifier = Modifier.verticalScroll(rememberScrollState()),
+            horizontalAlignment = Alignment.CenterHorizontally,
+            verticalArrangement = Arrangement.spacedBy(4.dp)
+        ) {
+            mainDestinations.forEach { destination ->
+                NavigationRailItem(
+                    selected = selectedDestination == destination.route,
+                    onClick = { navigateToDestination(destination) },
+                    icon = { 
+                        Icon(
+                            imageVector = destination.icon,
+                            contentDescription = stringResource(destination.textId)
+                        )
+                    }
+                )
+            }
+        }
+    }
+}
+
+@Composable
+fun BottomNavigationBar(
+    selectedDestination: String?,
+    navigateToDestination: (MainDestination) -> Unit
+) {
+    NavigationBar(modifier = Modifier.fillMaxWidth(), windowInsets = WindowInsets.ime.union(WindowInsets.navigationBars)) {
+        mainDestinations.forEach { destination ->
+            NavigationBarItem(
+                selected = selectedDestination == destination.route,
+                onClick = { navigateToDestination(destination) },
+                icon = {
+                    Icon(
+                        imageVector = destination.icon,
+                        contentDescription = stringResource(destination.textId)
+                    )
+                }
+            )
+        }
+    }
+}
+
+fun navigationMeasurePolicy(
+    navigationContentPosition: NavigationContentPosition,
+): MeasurePolicy {
+    return MeasurePolicy { measurables, constraints ->
+        lateinit var headerMeasurable: Measurable
+        lateinit var contentMeasurable: Measurable
+        measurables.forEach {
+            when (it.layoutId) {
+                LayoutType.HEADER -> headerMeasurable = it
+                LayoutType.CONTENT -> contentMeasurable = it
+                else -> error("Unknown layoutId encountered!")
+            }
+        }
+
+        val headerPlaceable = headerMeasurable.measure(constraints)
+        val contentPlaceable = contentMeasurable.measure(
+            constraints.offset(vertical = -headerPlaceable.height)
+        )
+        layout(constraints.maxWidth, constraints.maxHeight) {
+            headerPlaceable.placeRelative(0, 0)
+
+            val nonContentVerticalSpace = constraints.maxHeight - contentPlaceable.height
+
+            val contentPlaceableY = when (navigationContentPosition) {
+                NavigationContentPosition.TOP -> 0
+                NavigationContentPosition.CENTER -> nonContentVerticalSpace / 2
+            }.coerceAtLeast(headerPlaceable.height)
+
+            contentPlaceable.placeRelative(0, contentPlaceableY)
+        }
+    }
+}
+
+enum class LayoutType {
+    HEADER, CONTENT
+}
+

app/src/main/java/xyz/quaver/pupil/ui/composable/NavigationType.kt

@@ -0,0 +1,5 @@
+package xyz.quaver.pupil.ui.composable
+
+enum class NavigationType {
+    NAVIGATION_RAIL, PERMANENT_NAVIGATION_DRAWER, BOTTOM_NAVIGATION
+}

app/src/main/java/xyz/quaver/pupil/ui/composable/OverscrollPager.kt

@@ -0,0 +1,217 @@
+package xyz.quaver.pupil.ui.composable
+
+import androidx.compose.animation.core.animateFloatAsState
+import androidx.compose.foundation.Canvas
+import androidx.compose.foundation.gestures.awaitEachGesture
+import androidx.compose.foundation.gestures.awaitFirstDown
+import androidx.compose.foundation.layout.Box
+import androidx.compose.foundation.layout.Row
+import androidx.compose.foundation.layout.fillMaxHeight
+import androidx.compose.foundation.layout.fillMaxSize
+import androidx.compose.foundation.layout.offset
+import androidx.compose.foundation.layout.size
+import androidx.compose.material.icons.Icons
+import androidx.compose.material.icons.automirrored.filled.NavigateBefore
+import androidx.compose.material.icons.automirrored.filled.NavigateNext
+import androidx.compose.material3.Icon
+import androidx.compose.material3.MaterialTheme
+import androidx.compose.material3.Text
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.LaunchedEffect
+import androidx.compose.runtime.getValue
+import androidx.compose.runtime.mutableStateOf
+import androidx.compose.runtime.remember
+import androidx.compose.runtime.setValue
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.geometry.Offset
+import androidx.compose.ui.geometry.Size
+import androidx.compose.ui.hapticfeedback.HapticFeedbackType
+import androidx.compose.ui.input.nestedscroll.NestedScrollConnection
+import androidx.compose.ui.input.nestedscroll.NestedScrollSource
+import androidx.compose.ui.input.nestedscroll.nestedScroll
+import androidx.compose.ui.input.pointer.changedToUpIgnoreConsumed
+import androidx.compose.ui.input.pointer.pointerInput
+import androidx.compose.ui.input.pointer.positionChange
+import androidx.compose.ui.layout.onGloballyPositioned
+import androidx.compose.ui.platform.LocalDensity
+import androidx.compose.ui.platform.LocalHapticFeedback
+import androidx.compose.ui.res.stringResource
+import androidx.compose.ui.unit.Dp
+import androidx.compose.ui.unit.dp
+import androidx.compose.ui.unit.toSize
+import androidx.compose.ui.util.fastFirstOrNull
+import xyz.quaver.pupil.R
+import xyz.quaver.pupil.ui.theme.Blue300
+import kotlin.math.abs
+import kotlin.math.max
+import kotlin.math.min
+
+@Composable
+fun OverscrollPager(
+    prevPage: Int?,
+    nextPage: Int?,
+    onPageTurn: (Int) -> Unit,
+    prevPageTurnIndicatorOffset: Dp = 0.dp,
+    nextPageTurnIndicatorOffset: Dp = 0.dp,
+    content: @Composable () -> Unit
+) {
+    val haptic = LocalHapticFeedback.current
+    val pageTurnIndicatorHeight = LocalDensity.current.run { 64.dp.toPx() }
+
+    var overscroll: Float? by remember { mutableStateOf(null) }
+
+    var size: Size? by remember { mutableStateOf(null) }
+    val circleRadius = (size?.width ?: 0f) / 2
+
+    val topCircleRadius by animateFloatAsState(if (overscroll?.let { it >= pageTurnIndicatorHeight } == true) circleRadius else 0f, label = "topCircleRadius")
+    val bottomCircleRadius by animateFloatAsState(if (overscroll?.let { it <= -pageTurnIndicatorHeight } == true) circleRadius else 0f, label = "bottomCircleRadius")
+
+    val prevPageTurnIndicatorOffsetPx = LocalDensity.current.run { prevPageTurnIndicatorOffset.toPx() }
+    val nextPageTurnIndicatorOffsetPx = LocalDensity.current.run { nextPageTurnIndicatorOffset.toPx() }
+
+    if (topCircleRadius != 0f || bottomCircleRadius != 0f)
+        Canvas(modifier = Modifier.fillMaxSize()) {
+            drawCircle(
+                Blue300,
+                center = Offset(this.center.x, prevPageTurnIndicatorOffsetPx),
+                radius = topCircleRadius
+            )
+            drawCircle(
+                Blue300,
+                center = Offset(this.center.x, this.size.height-nextPageTurnIndicatorOffsetPx),
+                radius = bottomCircleRadius
+            )
+        }
+
+    val isOverscrollOverHeight = overscroll?.let { abs(it) >= pageTurnIndicatorHeight } == true
+    LaunchedEffect(isOverscrollOverHeight) {
+        if (isOverscrollOverHeight) haptic.performHapticFeedback(HapticFeedbackType.LongPress)
+    }
+
+    Box(
+        Modifier
+            .fillMaxHeight()
+            .onGloballyPositioned {
+                size = it.size.toSize()
+            }
+    ) {
+        overscroll?.let { overscroll ->
+            if (overscroll > 0f && prevPage != null) {
+                Row(
+                    modifier = Modifier
+                        .align(Alignment.TopCenter)
+                        .offset(0.dp, prevPageTurnIndicatorOffset),
+                    verticalAlignment = Alignment.CenterVertically
+                ) {
+                    Icon(
+                        Icons.AutoMirrored.Filled.NavigateBefore,
+                        contentDescription = null,
+                        tint = MaterialTheme.colorScheme.secondary,
+                        modifier = Modifier.size(48.dp)
+                    )
+                    Text(stringResource(R.string.move_to_page, prevPage))
+                }
+            }
+
+            if (overscroll < 0f && nextPage != null) {
+                Row(
+                    modifier = Modifier
+                        .align(Alignment.BottomCenter)
+                        .offset(0.dp, -nextPageTurnIndicatorOffset),
+                    verticalAlignment = Alignment.CenterVertically
+                ) {
+                    Text(stringResource(R.string.move_to_page, nextPage))
+                    Icon(
+                        Icons.AutoMirrored.Filled.NavigateNext,
+                        contentDescription = null,
+                        tint = MaterialTheme.colorScheme.secondary,
+                        modifier = Modifier.size(48.dp)
+                    )
+                }
+            }
+        }
+
+        Box(
+            modifier = Modifier
+                .offset(
+                    0.dp,
+                    overscroll
+                        ?.coerceIn(-pageTurnIndicatorHeight, pageTurnIndicatorHeight)
+                        ?.let { overscroll -> LocalDensity.current.run { overscroll.toDp() } }
+                        ?: 0.dp)
+                .nestedScroll(object : NestedScrollConnection {
+                    override fun onPreScroll(
+                        available: Offset,
+                        source: NestedScrollSource
+                    ): Offset {
+                        val overscrollSnapshot = overscroll
+
+                        return if (overscrollSnapshot == null || overscrollSnapshot == 0f) {
+                            Offset.Zero
+                        } else {
+                            val newOverscroll =
+                                if (overscrollSnapshot > 0f && available.y < 0f)
+                                    max(overscrollSnapshot + available.y, 0f)
+                                else if (overscrollSnapshot < 0f && available.y > 0f)
+                                    min(overscrollSnapshot + available.y, 0f)
+                                else
+                                    overscrollSnapshot
+
+                            Offset(0f, newOverscroll - overscrollSnapshot).also {
+                                overscroll = newOverscroll
+                            }
+                        }
+                    }
+
+                    override fun onPostScroll(
+                        consumed: Offset,
+                        available: Offset,
+                        source: NestedScrollSource
+                    ): Offset {
+                        if (
+                            available.y == 0f ||
+                            prevPage == null && available.y > 0f ||
+                            nextPage == null && available.y < 0f
+                        ) return Offset.Zero
+
+                        return overscroll?.let {
+                            overscroll = it + available.y
+                            Offset(0f, available.y)
+                        } ?: Offset.Zero
+                    }
+                })
+                .pointerInput(prevPage, nextPage) {
+                    awaitEachGesture {
+                        val down = awaitFirstDown(requireUnconsumed = false)
+                        var pointer = down.id
+                        overscroll = 0f
+
+                        while (true) {
+                            val event = awaitPointerEvent()
+                            val dragEvent =
+                                event.changes.fastFirstOrNull { it.id == pointer }!!
+
+                            if (dragEvent.changedToUpIgnoreConsumed()) {
+                                val otherDown = event.changes.fastFirstOrNull { it.pressed }
+                                if (otherDown == null) {
+                                    if (dragEvent.positionChange() != Offset.Zero) dragEvent.consume()
+                                    overscroll?.let {
+                                        if (abs(it) > pageTurnIndicatorHeight) {
+                                            if (it > 0 && prevPage != null) onPageTurn(prevPage)
+                                            if (it < 0 && nextPage != null) onPageTurn(nextPage)
+                                        }
+                                    }
+                                    overscroll = null
+                                    break
+                                } else
+                                    pointer = otherDown.id
+                            }
+                        }
+                    }
+                }
+        ) {
+            content()
+        }
+    }
+}

app/src/main/java/xyz/quaver/pupil/ui/composable/QueryEditor.kt

@@ -0,0 +1,793 @@
+package xyz.quaver.pupil.ui.composable
+
+import androidx.compose.animation.AnimatedContent
+import androidx.compose.animation.animateColorAsState
+import androidx.compose.animation.core.Spring
+import androidx.compose.animation.core.spring
+import androidx.compose.foundation.clickable
+import androidx.compose.foundation.gestures.animateScrollBy
+import androidx.compose.foundation.horizontalScroll
+import androidx.compose.foundation.layout.Arrangement
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.Row
+import androidx.compose.foundation.layout.RowScope
+import androidx.compose.foundation.layout.Spacer
+import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.height
+import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.layout.size
+import androidx.compose.foundation.layout.width
+import androidx.compose.foundation.rememberScrollState
+import androidx.compose.foundation.shape.RoundedCornerShape
+import androidx.compose.foundation.text.KeyboardActions
+import androidx.compose.foundation.text.KeyboardOptions
+import androidx.compose.foundation.verticalScroll
+import androidx.compose.material.icons.Icons
+import androidx.compose.material.icons.automirrored.filled.ArrowBack
+import androidx.compose.material.icons.filled.AddCircleOutline
+import androidx.compose.material.icons.filled.RemoveCircleOutline
+import androidx.compose.material3.Card
+import androidx.compose.material3.CardColors
+import androidx.compose.material3.CircularProgressIndicator
+import androidx.compose.material3.HorizontalDivider
+import androidx.compose.material3.Icon
+import androidx.compose.material3.IconButton
+import androidx.compose.material3.LocalContentColor
+import androidx.compose.material3.LocalTextStyle
+import androidx.compose.material3.MaterialTheme
+import androidx.compose.material3.OutlinedTextField
+import androidx.compose.material3.Surface
+import androidx.compose.material3.Text
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.CompositionLocalProvider
+import androidx.compose.runtime.LaunchedEffect
+import androidx.compose.runtime.getValue
+import androidx.compose.runtime.mutableFloatStateOf
+import androidx.compose.runtime.mutableStateOf
+import androidx.compose.runtime.remember
+import androidx.compose.runtime.rememberCoroutineScope
+import androidx.compose.runtime.setValue
+import androidx.compose.runtime.toMutableStateList
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.focus.FocusRequester
+import androidx.compose.ui.focus.focusRequester
+import androidx.compose.ui.focus.onFocusChanged
+import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.graphics.vector.ImageVector
+import androidx.compose.ui.input.key.Key
+import androidx.compose.ui.input.key.key
+import androidx.compose.ui.input.key.onKeyEvent
+import androidx.compose.ui.layout.onGloballyPositioned
+import androidx.compose.ui.layout.positionInRoot
+import androidx.compose.ui.platform.LocalDensity
+import androidx.compose.ui.res.stringResource
+import androidx.compose.ui.text.TextRange
+import androidx.compose.ui.text.input.ImeAction
+import androidx.compose.ui.text.input.KeyboardCapitalization
+import androidx.compose.ui.text.input.TextFieldValue
+import androidx.compose.ui.unit.dp
+import kotlinx.coroutines.delay
+import kotlinx.coroutines.launch
+import xyz.quaver.pupil.R
+import xyz.quaver.pupil.networking.HitomiHttpClient
+import xyz.quaver.pupil.networking.SearchQuery
+import xyz.quaver.pupil.networking.Suggestion
+import xyz.quaver.pupil.networking.validNamespace
+import xyz.quaver.pupil.ui.theme.Blue300
+import xyz.quaver.pupil.ui.theme.Blue600
+import xyz.quaver.pupil.ui.theme.Gray300
+import xyz.quaver.pupil.ui.theme.Pink600
+import xyz.quaver.pupil.ui.theme.Red300
+import xyz.quaver.pupil.ui.theme.Yellow400
+
+private fun SearchQuery.toEditableStateInternal(): EditableSearchQueryState = when (this) {
+    is SearchQuery.Tag -> EditableSearchQueryState.Tag(namespace, tag)
+    is SearchQuery.And -> EditableSearchQueryState.And(queries.map { it.toEditableStateInternal() })
+    is SearchQuery.Or -> EditableSearchQueryState.Or(queries.map { it.toEditableStateInternal() })
+    is SearchQuery.Not -> EditableSearchQueryState.Not(query.toEditableStateInternal())
+}
+
+fun SearchQuery?.toEditableState(): EditableSearchQueryState.Root =
+    EditableSearchQueryState.Root(this?.toEditableStateInternal())
+
+private fun EditableSearchQueryState.Tag.toSearchQueryInternal(): SearchQuery.Tag? =
+    if (namespace.value != null || tag.value.isNotBlank()) SearchQuery.Tag(
+        namespace.value,
+        tag.value.lowercase().trim()
+    ) else null
+
+private fun EditableSearchQueryState.And.toSearchQueryInternal(): SearchQuery.And? =
+    queries.mapNotNull { it.toSearchQueryInternal() }
+        .let { if (it.isNotEmpty()) SearchQuery.And(it) else null }
+
+private fun EditableSearchQueryState.Or.toSearchQueryInternal(): SearchQuery.Or? =
+    queries.mapNotNull { it.toSearchQueryInternal() }
+        .let { if (it.isNotEmpty()) SearchQuery.Or(it) else null }
+
+private fun EditableSearchQueryState.Not.toSearchQueryInternal(): SearchQuery.Not? =
+    query.value?.toSearchQueryInternal()?.let { SearchQuery.Not(it) }
+
+private fun EditableSearchQueryState.toSearchQueryInternal(): SearchQuery? = when (this) {
+    is EditableSearchQueryState.Tag -> this.toSearchQueryInternal()
+    is EditableSearchQueryState.And -> this.toSearchQueryInternal()
+    is EditableSearchQueryState.Or -> this.toSearchQueryInternal()
+    is EditableSearchQueryState.Not -> this.toSearchQueryInternal()
+}
+
+fun EditableSearchQueryState.Root.toSearchQuery(): SearchQuery? =
+    query.value?.toSearchQueryInternal()
+
+fun coalesceTags(
+    oldTag: EditableSearchQueryState.Tag?,
+    newTag: EditableSearchQueryState?,
+): EditableSearchQueryState? = if (oldTag != null) {
+    when (newTag) {
+        is EditableSearchQueryState.Tag,
+        is EditableSearchQueryState.Not,
+            -> EditableSearchQueryState.And(listOf(oldTag, newTag))
+
+        is EditableSearchQueryState.And -> newTag.apply { queries.add(oldTag) }
+        is EditableSearchQueryState.Or -> newTag.apply { queries.add(oldTag) }
+        null -> oldTag
+    }
+} else newTag
+
+sealed interface EditableSearchQueryState {
+    class Tag(
+        namespace: String? = null,
+        tag: String = "",
+        expanded: Boolean = false,
+    ) : EditableSearchQueryState {
+        val namespace = mutableStateOf(namespace)
+        val tag = mutableStateOf(tag)
+        val expanded = mutableStateOf(expanded)
+    }
+
+    class And(
+        queries: List<EditableSearchQueryState> = emptyList(),
+    ) : EditableSearchQueryState {
+        val queries = queries.toMutableStateList()
+    }
+
+    class Or(
+        queries: List<EditableSearchQueryState> = emptyList(),
+    ) : EditableSearchQueryState {
+        val queries = queries.toMutableStateList()
+    }
+
+    class Not(
+        query: EditableSearchQueryState? = null,
+    ) : EditableSearchQueryState {
+        val query = mutableStateOf(query)
+    }
+
+    class Root(
+        query: EditableSearchQueryState? = null,
+    ) {
+        val query = mutableStateOf(query)
+    }
+
+}
+
+@Composable
+fun TagSuggestionList(
+    state: EditableSearchQueryState.Tag,
+) {
+    var suggestionList: List<Suggestion>? by remember { mutableStateOf(null) }
+
+    var namespace by state.namespace
+    var tag by state.tag
+    var expanded by state.expanded
+
+    LaunchedEffect(namespace, tag) {
+        suggestionList = null
+
+        val searchQuery = state.toSearchQueryInternal()
+
+        suggestionList = if (searchQuery != null) {
+            HitomiHttpClient.getSuggestionsForQuery(searchQuery)
+                .getOrDefault(emptyList())
+                .filterNot { it.tag == SearchQuery.Tag(namespace, tag) }
+        } else {
+            emptyList()
+        }
+    }
+
+    val suggestionListSnapshot = suggestionList
+    if (suggestionListSnapshot == null) {
+        Row(
+            Modifier.padding(16.dp),
+            horizontalArrangement = Arrangement.spacedBy(8.dp),
+            verticalAlignment = Alignment.CenterVertically
+        ) {
+            CircularProgressIndicator(Modifier.size(24.dp))
+            Text("Loading")
+        }
+    } else if (suggestionListSnapshot.isNotEmpty()) {
+        Column(
+            modifier = Modifier.padding(8.dp),
+            verticalArrangement = Arrangement.spacedBy(4.dp)
+        ) {
+            suggestionListSnapshot.forEach { suggestion ->
+                TagChip(
+                    tag = suggestion.tag,
+                    onClick = {
+                        namespace = it.namespace
+                        tag = it.tag
+                        expanded = false
+                    }
+                )
+            }
+        }
+    }
+}
+
+@Composable
+fun EditableTagChip(
+    state: EditableSearchQueryState.Tag,
+    isFavorite: Boolean = false,
+    autoFocus: Boolean = true,
+    requestScrollTo: (Float) -> Unit,
+    leftIcon: @Composable RowScope.(SearchQuery.Tag) -> Unit = { tag -> TagChipIcon(tag) },
+    rightIcon: @Composable RowScope.(SearchQuery.Tag) -> Unit = { _ -> Spacer(Modifier.width(16.dp)) },
+    content: @Composable RowScope.(SearchQuery.Tag) -> Unit = { tag ->
+        Text(
+            modifier = Modifier
+                .weight(1f, fill = false)
+                .horizontalScroll(rememberScrollState()),
+            text = tag.tag.ifBlank { stringResource(R.string.search_bar_edit_tag) }
+        )
+    },
+) {
+    val coroutineScope = rememberCoroutineScope()
+
+    var namespace by state.namespace
+    var tag by state.tag
+    var expanded by state.expanded
+    var wasFocused by remember { mutableStateOf(false) }
+
+    var positionY by remember { mutableFloatStateOf(0f) }
+
+    LaunchedEffect(expanded) {
+        if (!expanded) {
+            wasFocused = false
+        }
+    }
+
+    val surfaceColor by animateColorAsState(
+        when {
+            expanded -> MaterialTheme.colorScheme.surface
+            isFavorite -> Yellow400
+            namespace == "male" -> Blue600
+            namespace == "female" -> Pink600
+            else -> MaterialTheme.colorScheme.surface
+        }, label = "tag surface color"
+    )
+
+    val contentColor by animateColorAsState(
+        when {
+            expanded -> Color.White
+            isFavorite -> Color.White
+            namespace == "male" -> Color.White
+            namespace == "female" -> Color.White
+            else -> MaterialTheme.colorScheme.onSurface
+        }, label = "tag content color"
+    )
+
+    Surface(
+        modifier = Modifier.onGloballyPositioned {
+            positionY = it.positionInRoot().y
+        },
+        shape = RoundedCornerShape(16.dp),
+        color = surfaceColor,
+        shadowElevation = 4.dp
+    ) {
+        AnimatedContent(targetState = expanded, label = "open tag editor") { targetExpanded ->
+            if (!targetExpanded) {
+                CompositionLocalProvider(
+                    LocalContentColor provides contentColor,
+                    LocalTextStyle provides MaterialTheme.typography.bodyMedium
+                ) {
+                    val queryTag = SearchQuery.Tag(namespace, tag)
+
+                    Row(
+                        modifier = Modifier
+                            .height(32.dp)
+                            .clickable { expanded = true },
+                        verticalAlignment = Alignment.CenterVertically
+                    ) {
+                        leftIcon(queryTag)
+                        content(queryTag)
+                        rightIcon(queryTag)
+                    }
+                }
+            } else {
+                Column(
+                    Modifier
+                        .fillMaxWidth()
+                        .padding(top = 8.dp, bottom = 8.dp, end = 8.dp)
+                ) {
+                    Row(
+                        verticalAlignment = Alignment.CenterVertically
+                    ) {
+                        IconButton(
+                            onClick = {
+                                expanded = false
+                            }
+                        ) {
+                            Icon(
+                                imageVector = Icons.AutoMirrored.Filled.ArrowBack,
+                                contentDescription = "close tag editor"
+                            )
+                        }
+
+                        var selection by remember(tag) { mutableStateOf(TextRange(tag.length)) }
+                        var composition by remember { mutableStateOf<TextRange?>(null) }
+
+                        val focusRequester = remember { FocusRequester() }
+
+                        val textFieldValue = remember(tag, selection, composition) {
+                            TextFieldValue(tag, selection, composition)
+                        }
+
+                        LaunchedEffect(expanded) {
+                            if (autoFocus && expanded) {
+                                focusRequester.requestFocus()
+                            }
+                        }
+
+                        OutlinedTextField(
+                            value = textFieldValue,
+                            singleLine = true,
+                            keyboardOptions = KeyboardOptions(
+                                capitalization = KeyboardCapitalization.None,
+                                autoCorrectEnabled = false,
+                                imeAction = ImeAction.Done
+                            ),
+                            leadingIcon = {
+                                TagChipIcon(SearchQuery.Tag(namespace, tag))
+                            },
+                            modifier = Modifier
+                                .fillMaxWidth()
+                                .onKeyEvent { event ->
+                                    if (event.key == Key.Backspace && tag.isEmpty()) {
+                                        val newTag = namespace?.dropLast(1) ?: ""
+                                        namespace = null
+                                        tag = newTag
+                                        selection = TextRange(newTag.length)
+                                        composition = null
+                                        true
+                                    } else false
+                                }
+                                .focusRequester(focusRequester)
+                                .onFocusChanged { event ->
+                                    if (event.isFocused) {
+                                        wasFocused = true
+                                        coroutineScope.launch {
+                                            delay(300)
+                                            requestScrollTo(positionY)
+                                        }
+                                    } else if (wasFocused) {
+                                        expanded = false
+                                    }
+                                },
+                            keyboardActions = KeyboardActions(
+                                onDone = {
+                                    expanded = false
+                                }
+                            ),
+                            onValueChange = { newTextValue ->
+                                val newTag = newTextValue.text
+                                val possibleNamespace = newTag.dropLast(1).lowercase().trim()
+                                tag =
+                                    if (namespace == null && newTag.endsWith(':') && possibleNamespace in validNamespace) {
+                                        namespace = possibleNamespace
+                                        ""
+                                    } else newTag
+                                selection = newTextValue.selection
+                                composition = newTextValue.composition
+                            }
+                        )
+                    }
+
+                    TagSuggestionList(state)
+                }
+            }
+        }
+    }
+}
+
+@Composable
+fun NewQueryChip(
+    currentQuery: EditableSearchQueryState?,
+    onNewQuery: (EditableSearchQueryState) -> Unit,
+) {
+    var opened by remember { mutableStateOf(false) }
+
+    @Composable
+    fun NewQueryRow(
+        modifier: Modifier = Modifier,
+        icon: ImageVector = Icons.Default.AddCircleOutline,
+        text: String,
+        onClick: () -> Unit,
+    ) {
+        Row(
+            modifier = modifier
+                .height(32.dp)
+                .clickable(onClick = onClick),
+            verticalAlignment = Alignment.CenterVertically
+        ) {
+            Icon(
+                modifier = Modifier
+                    .padding(8.dp)
+                    .size(16.dp),
+                imageVector = icon,
+                contentDescription = text
+            )
+            Text(
+                modifier = Modifier.padding(end = 16.dp),
+                text = text,
+                style = MaterialTheme.typography.bodyMedium
+            )
+        }
+    }
+
+    Surface(shape = RoundedCornerShape(16.dp), shadowElevation = 4.dp) {
+        AnimatedContent(targetState = opened, label = "add new query") { targetOpened ->
+            if (targetOpened) {
+                Column {
+                    NewQueryRow(
+                        modifier = Modifier.fillMaxWidth(),
+                        icon = Icons.Default.RemoveCircleOutline,
+                        text = stringResource(android.R.string.cancel)
+                    ) {
+                        opened = false
+                    }
+                    HorizontalDivider()
+                    if (currentQuery != null && currentQuery !is EditableSearchQueryState.Tag && currentQuery !is EditableSearchQueryState.And) {
+                        NewQueryRow(
+                            modifier = Modifier.fillMaxWidth(),
+                            text = stringResource(R.string.search_add_query_item_tag)
+                        ) {
+                            opened = false
+                            onNewQuery(EditableSearchQueryState.Tag(expanded = true))
+                        }
+                    }
+                    if (currentQuery !is EditableSearchQueryState.And) {
+                        HorizontalDivider()
+                        NewQueryRow(modifier = Modifier.fillMaxWidth(), text = "AND") {
+                            opened = false
+                            onNewQuery(EditableSearchQueryState.And())
+                        }
+                    }
+                    if (currentQuery !is EditableSearchQueryState.Or) {
+                        HorizontalDivider()
+                        NewQueryRow(modifier = Modifier.fillMaxWidth(), text = "OR") {
+                            opened = false
+                            onNewQuery(EditableSearchQueryState.Or())
+                        }
+                    }
+                    if (currentQuery !is EditableSearchQueryState.Not || currentQuery.query.value != null) {
+                        HorizontalDivider()
+                        NewQueryRow(modifier = Modifier.fillMaxWidth(), text = "NOT") {
+                            opened = false
+                            onNewQuery(EditableSearchQueryState.Not())
+                        }
+                    }
+                }
+            } else {
+                NewQueryRow(text = stringResource(R.string.search_add_query_item)) {
+                    opened = true
+                }
+            }
+        }
+    }
+}
+
+@Composable
+fun QueryEditorQueryView(
+    state: EditableSearchQueryState,
+    onQueryRemove: (EditableSearchQueryState) -> Unit,
+    requestScrollTo: (Float) -> Unit,
+    requestScrollBy: (Float) -> Unit,
+) {
+    when (state) {
+        is EditableSearchQueryState.Tag -> {
+            EditableTagChip(
+                state,
+                requestScrollTo = requestScrollTo,
+                rightIcon = {
+                    Icon(
+                        modifier = Modifier
+                            .padding(8.dp)
+                            .size(16.dp)
+                            .clickable {
+                                onQueryRemove(state)
+                            },
+                        imageVector = Icons.Default.RemoveCircleOutline,
+                        contentDescription = stringResource(R.string.search_remove_query_item_description)
+                    )
+                }
+            )
+        }
+
+        is EditableSearchQueryState.Or -> {
+            Card(
+                colors = CardColors(
+                    containerColor = Blue300,
+                    contentColor = Color.Black,
+                    disabledContainerColor = Blue300,
+                    disabledContentColor = Color.Black
+                )
+            ) {
+                Column(
+                    modifier = Modifier
+                        .fillMaxWidth()
+                        .padding(8.dp),
+                    verticalArrangement = Arrangement.spacedBy(8.dp),
+                    horizontalAlignment = Alignment.Start,
+                ) {
+                    Row(
+                        modifier = Modifier.fillMaxWidth(),
+                        verticalAlignment = Alignment.CenterVertically,
+                        horizontalArrangement = Arrangement.SpaceBetween
+                    ) {
+                        Text(
+                            "OR",
+                            modifier = Modifier.padding(horizontal = 8.dp),
+                            style = MaterialTheme.typography.labelMedium
+                        )
+                        Icon(
+                            modifier = Modifier
+                                .size(16.dp)
+                                .clickable { onQueryRemove(state) },
+                            imageVector = Icons.Default.RemoveCircleOutline,
+                            contentDescription = stringResource(R.string.search_remove_query_item_description)
+                        )
+                    }
+                    state.queries.forEachIndexed { index, subQueryState ->
+                        if (index != 0) {
+                            Text("+", modifier = Modifier.padding(horizontal = 8.dp))
+                        }
+                        QueryEditorQueryView(
+                            subQueryState,
+                            onQueryRemove = { state.queries.remove(it) },
+                            requestScrollTo = requestScrollTo,
+                            requestScrollBy = requestScrollBy
+                        )
+                    }
+                    NewQueryChip(state) { newQueryState ->
+                        state.queries.add(newQueryState)
+                    }
+                }
+            }
+        }
+
+        is EditableSearchQueryState.And -> {
+            Card(
+                colors = CardColors(
+                    containerColor = Gray300,
+                    contentColor = Color.Black,
+                    disabledContainerColor = Gray300,
+                    disabledContentColor = Color.Black
+                )
+            ) {
+                Column(
+                    modifier = Modifier
+                        .fillMaxWidth()
+                        .padding(8.dp),
+                    verticalArrangement = Arrangement.spacedBy(8.dp),
+                    horizontalAlignment = Alignment.Start,
+                ) {
+                    val newSearchQuery = remember { EditableSearchQueryState.Tag() }
+
+                    var newQueryNamespace by newSearchQuery.namespace
+                    var newQueryTag by newSearchQuery.tag
+                    var newQueryExpanded by newSearchQuery.expanded
+
+                    val offset = with(LocalDensity.current) { 40.dp.toPx() }
+
+                    LaunchedEffect(newQueryExpanded) {
+                        if (!newQueryExpanded && (newQueryNamespace != null || newQueryTag.isNotBlank())) {
+                            state.queries.add(
+                                EditableSearchQueryState.Tag(
+                                    newQueryNamespace,
+                                    newQueryTag
+                                )
+                            )
+                            newQueryNamespace = null
+                            newQueryTag = ""
+                            newQueryExpanded = true
+                            requestScrollBy(offset)
+                        }
+                    }
+
+                    Row(
+                        modifier = Modifier.fillMaxWidth(),
+                        verticalAlignment = Alignment.CenterVertically,
+                        horizontalArrangement = Arrangement.SpaceBetween
+                    ) {
+                        Text(
+                            "AND",
+                            modifier = Modifier.padding(horizontal = 8.dp),
+                            style = MaterialTheme.typography.labelMedium
+                        )
+                        Icon(
+                            modifier = Modifier
+                                .size(16.dp)
+                                .clickable { onQueryRemove(state) },
+                            imageVector = Icons.Default.RemoveCircleOutline,
+                            contentDescription = stringResource(R.string.search_remove_query_item_description)
+                        )
+                    }
+                    state.queries.forEach { subQuery ->
+                        QueryEditorQueryView(
+                            subQuery,
+                            onQueryRemove = { state.queries.remove(it) },
+                            requestScrollTo = requestScrollTo,
+                            requestScrollBy = requestScrollBy
+                        )
+                    }
+                    EditableTagChip(
+                        newSearchQuery,
+                        requestScrollTo = requestScrollTo,
+                    )
+                    NewQueryChip(state) { newQueryState ->
+                        state.queries.add(newQueryState)
+                    }
+                }
+            }
+        }
+
+        is EditableSearchQueryState.Not -> {
+            var subQueryState by state.query
+
+            Card(
+                colors = CardColors(
+                    containerColor = Red300,
+                    contentColor = Color.Black,
+                    disabledContainerColor = Red300,
+                    disabledContentColor = Color.Black
+                )
+            ) {
+                Column(
+                    modifier = Modifier
+                        .fillMaxWidth()
+                        .padding(8.dp),
+                    verticalArrangement = Arrangement.spacedBy(8.dp),
+                    horizontalAlignment = Alignment.Start,
+                ) {
+                    Row(
+                        modifier = Modifier.fillMaxWidth(),
+                        verticalAlignment = Alignment.CenterVertically,
+                        horizontalArrangement = Arrangement.SpaceBetween
+                    ) {
+                        Text(
+                            "-",
+                            modifier = Modifier.padding(horizontal = 8.dp),
+                            style = MaterialTheme.typography.labelMedium
+                        )
+                        Icon(
+                            modifier = Modifier
+                                .size(16.dp)
+                                .clickable { onQueryRemove(state) },
+                            imageVector = Icons.Default.RemoveCircleOutline,
+                            contentDescription = stringResource(R.string.search_remove_query_item_description)
+                        )
+                    }
+                    val subQueryStateSnapshot = subQueryState
+                    if (subQueryStateSnapshot != null) {
+                        QueryEditorQueryView(
+                            subQueryStateSnapshot,
+                            onQueryRemove = { subQueryState = null },
+                            requestScrollTo = requestScrollTo,
+                            requestScrollBy = requestScrollBy,
+                        )
+                    }
+
+                    if (subQueryStateSnapshot == null) {
+                        NewQueryChip(state) { newQueryState ->
+                            subQueryState = newQueryState
+                        }
+                    }
+
+                    if (subQueryStateSnapshot is EditableSearchQueryState.Tag) {
+                        NewQueryChip(state) { newQueryState ->
+                            subQueryState = coalesceTags(subQueryStateSnapshot, newQueryState)
+                        }
+                    }
+                }
+            }
+        }
+    }
+}
+
+@Composable
+fun QueryEditor(
+    state: EditableSearchQueryState.Root,
+) {
+    var rootQuery by state.query
+
+    val scrollState = rememberScrollState()
+    var topY by remember { mutableFloatStateOf(0f) }
+
+    val scrollOffset = with(LocalDensity.current) { 16.dp.toPx() }
+
+    val coroutineScope = rememberCoroutineScope()
+
+    Column(
+        modifier = Modifier
+            .onGloballyPositioned {
+                topY = it.positionInRoot().y
+            }
+            .verticalScroll(scrollState)
+            .padding(8.dp),
+        verticalArrangement = Arrangement.spacedBy(4.dp)
+    ) {
+        val rootQuerySnapshot = rootQuery
+
+        val requestScrollTo: (Float) -> Unit = { target ->
+            val topYSnapshot = topY
+
+            coroutineScope.launch {
+                scrollState.animateScrollBy(
+                    target - topYSnapshot - scrollOffset,
+                    spring(stiffness = Spring.StiffnessLow)
+                )
+            }
+        }
+
+        val requestScrollBy: (Float) -> Unit = { value ->
+            coroutineScope.launch {
+                scrollState.animateScrollBy(value)
+            }
+        }
+
+        if (rootQuerySnapshot != null) {
+            QueryEditorQueryView(
+                state = rootQuerySnapshot,
+                onQueryRemove = { rootQuery = null },
+                requestScrollTo = requestScrollTo,
+                requestScrollBy = requestScrollBy
+            )
+        }
+
+        if (rootQuerySnapshot is EditableSearchQueryState.Tag?) {
+            val newSearchQuery = remember { EditableSearchQueryState.Tag(expanded = true) }
+
+            var newQueryNamespace by newSearchQuery.namespace
+            var newQueryTag by newSearchQuery.tag
+            var newQueryExpanded by newSearchQuery.expanded
+
+            val offset = with(LocalDensity.current) { 40.dp.toPx() }
+
+            LaunchedEffect(newQueryExpanded) {
+                if (!newQueryExpanded && (newQueryNamespace != null || newQueryTag.isNotBlank())) {
+                    rootQuery = if (rootQuerySnapshot == null) {
+                        EditableSearchQueryState.Tag(newQueryNamespace, newQueryTag)
+                    } else {
+                        EditableSearchQueryState.And(
+                            listOf(
+                                rootQuerySnapshot,
+                                EditableSearchQueryState.Tag(newQueryNamespace, newQueryTag)
+                            )
+                        )
+                    }
+                    newQueryNamespace = null
+                    newQueryTag = ""
+                    newQueryExpanded = true
+                    requestScrollBy(offset)
+                }
+            }
+
+            EditableTagChip(
+                newSearchQuery,
+                requestScrollTo = requestScrollTo
+            )
+            NewQueryChip(rootQuerySnapshot) { newState ->
+                rootQuery = coalesceTags(rootQuerySnapshot, newState)
+            }
+        }
+    }
+}

app/src/main/java/xyz/quaver/pupil/ui/composable/SearchScreen.kt

@@ -0,0 +1,703 @@
+package xyz.quaver.pupil.ui.composable
+
+import androidx.activity.compose.BackHandler
+import androidx.compose.animation.AnimatedVisibility
+import androidx.compose.animation.core.AnimationState
+import androidx.compose.animation.core.VectorConverter
+import androidx.compose.animation.core.animateDpAsState
+import androidx.compose.animation.core.animateFloatAsState
+import androidx.compose.animation.core.animateTo
+import androidx.compose.animation.fadeIn
+import androidx.compose.animation.fadeOut
+import androidx.compose.foundation.background
+import androidx.compose.foundation.border
+import androidx.compose.foundation.clickable
+import androidx.compose.foundation.horizontalScroll
+import androidx.compose.foundation.interaction.MutableInteractionSource
+import androidx.compose.foundation.layout.Arrangement
+import androidx.compose.foundation.layout.Box
+import androidx.compose.foundation.layout.BoxWithConstraints
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.PaddingValues
+import androidx.compose.foundation.layout.Row
+import androidx.compose.foundation.layout.RowScope
+import androidx.compose.foundation.layout.Spacer
+import androidx.compose.foundation.layout.WindowInsets
+import androidx.compose.foundation.layout.absoluteOffset
+import androidx.compose.foundation.layout.asPaddingValues
+import androidx.compose.foundation.layout.calculateEndPadding
+import androidx.compose.foundation.layout.calculateStartPadding
+import androidx.compose.foundation.layout.fillMaxSize
+import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.height
+import androidx.compose.foundation.layout.heightIn
+import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.layout.safeDrawingPadding
+import androidx.compose.foundation.layout.size
+import androidx.compose.foundation.layout.systemBars
+import androidx.compose.foundation.layout.width
+import androidx.compose.foundation.layout.windowInsetsTopHeight
+import androidx.compose.foundation.layout.wrapContentHeight
+import androidx.compose.foundation.lazy.LazyColumn
+import androidx.compose.foundation.lazy.items
+import androidx.compose.foundation.lazy.rememberLazyListState
+import androidx.compose.foundation.rememberScrollState
+import androidx.compose.foundation.shape.RoundedCornerShape
+import androidx.compose.foundation.verticalScroll
+import androidx.compose.material.icons.Icons
+import androidx.compose.material.icons.automirrored.filled.ArrowBack
+import androidx.compose.material.icons.automirrored.filled.Label
+import androidx.compose.material.icons.filled.Book
+import androidx.compose.material.icons.filled.Brush
+import androidx.compose.material.icons.filled.Face
+import androidx.compose.material.icons.filled.Female
+import androidx.compose.material.icons.filled.Folder
+import androidx.compose.material.icons.filled.Group
+import androidx.compose.material.icons.filled.Male
+import androidx.compose.material.icons.filled.Translate
+import androidx.compose.material3.Button
+import androidx.compose.material3.Card
+import androidx.compose.material3.CardDefaults
+import androidx.compose.material3.CircularProgressIndicator
+import androidx.compose.material3.FilledTonalButton
+import androidx.compose.material3.Icon
+import androidx.compose.material3.IconButton
+import androidx.compose.material3.LocalContentColor
+import androidx.compose.material3.LocalTextStyle
+import androidx.compose.material3.MaterialTheme
+import androidx.compose.material3.Surface
+import androidx.compose.material3.Text
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.CompositionLocalProvider
+import androidx.compose.runtime.LaunchedEffect
+import androidx.compose.runtime.getValue
+import androidx.compose.runtime.mutableIntStateOf
+import androidx.compose.runtime.mutableStateOf
+import androidx.compose.runtime.remember
+import androidx.compose.runtime.setValue
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.geometry.Offset
+import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.input.nestedscroll.NestedScrollConnection
+import androidx.compose.ui.input.nestedscroll.NestedScrollSource
+import androidx.compose.ui.input.nestedscroll.nestedScroll
+import androidx.compose.ui.layout.onGloballyPositioned
+import androidx.compose.ui.layout.positionInRoot
+import androidx.compose.ui.platform.LocalLayoutDirection
+import androidx.compose.ui.res.painterResource
+import androidx.compose.ui.res.stringResource
+import androidx.compose.ui.text.style.TextAlign
+import androidx.compose.ui.unit.Dp
+import androidx.compose.ui.unit.IntOffset
+import androidx.compose.ui.unit.dp
+import androidx.window.layout.DisplayFeature
+import com.google.accompanist.adaptive.HorizontalTwoPaneStrategy
+import com.google.accompanist.adaptive.TwoPane
+import xyz.quaver.pupil.R
+import xyz.quaver.pupil.networking.GalleryInfo
+import xyz.quaver.pupil.networking.HitomiHttpClient
+import xyz.quaver.pupil.networking.SearchQuery
+import xyz.quaver.pupil.ui.theme.Blue600
+import xyz.quaver.pupil.ui.theme.Pink600
+import xyz.quaver.pupil.ui.theme.Yellow400
+import xyz.quaver.pupil.ui.viewmodel.SearchState
+import kotlin.math.roundToInt
+
+private val iconMap = mapOf(
+    "female" to Icons.Default.Female,
+    "male" to Icons.Default.Male,
+    "artist" to Icons.Default.Brush,
+    "group" to Icons.Default.Group,
+    "character" to Icons.Default.Face,
+    "series" to Icons.Default.Book,
+    "type" to Icons.Default.Folder,
+    "language" to Icons.Default.Translate,
+    "tag" to Icons.AutoMirrored.Filled.Label,
+)
+
+val languageIconMap = mapOf(
+    "indonesian" to R.drawable.language_indonesian,
+    "javanese" to R.drawable.language_javanese,
+    "catalan" to R.drawable.language_catalan,
+    "cebuano" to R.drawable.language_philippines,
+    "czech" to R.drawable.language_czech,
+    "danish" to R.drawable.language_danish,
+    "german" to R.drawable.language_german,
+    "estonian" to R.drawable.language_estonian,
+    "english" to R.drawable.language_english,
+    "spanish" to R.drawable.language_spanish,
+    "french" to R.drawable.language_french,
+    "italian" to R.drawable.language_italian,
+    "latin" to R.drawable.language_latin,
+    "hungarian" to R.drawable.language_hungarian,
+    "dutch" to R.drawable.language_dutch,
+    "norwegian" to R.drawable.language_norwegian,
+    "polish" to R.drawable.language_polish,
+    "portuguese" to R.drawable.language_portuguese,
+    "romanian" to R.drawable.language_romanian,
+    "albanian" to R.drawable.language_albanian,
+    "slovak" to R.drawable.language_slovak,
+    "finnish" to R.drawable.language_finnish,
+    "swedish" to R.drawable.language_swedish,
+    "tagalog" to R.drawable.language_philippines,
+    "vietnamese" to R.drawable.language_vietnamese,
+    "turkish" to R.drawable.language_turkish,
+    "greek" to R.drawable.language_greek,
+    "mongolian" to R.drawable.language_mongolian,
+    "russian" to R.drawable.language_russian,
+    "ukrainian" to R.drawable.language_ukrainian,
+    "hebrew" to R.drawable.language_hebrew,
+    "persian" to R.drawable.language_persian,
+    "thai" to R.drawable.language_thai,
+    "korean" to R.drawable.language_korean,
+    "chinese" to R.drawable.language_chinese,
+    "japanese" to R.drawable.language_japanese,
+)
+
+@Composable
+fun TagChipIcon(tag: SearchQuery.Tag) {
+    val icon = iconMap[tag.namespace]
+
+    if (icon != null) {
+        if (tag.namespace == "language" && languageIconMap.contains(tag.tag)) {
+            Icon(
+                painter = painterResource(languageIconMap[tag.tag]!!),
+                contentDescription = "icon",
+                modifier = Modifier
+                    .padding(4.dp)
+                    .size(24.dp),
+                tint = Color.Unspecified
+            )
+        } else {
+            Icon(
+                icon,
+                contentDescription = "icon",
+                modifier = Modifier
+                    .padding(4.dp)
+                    .size(24.dp)
+            )
+        }
+    } else {
+        Spacer(Modifier.width(16.dp))
+    }
+}
+
+@Composable
+fun TagChip(
+    tag: SearchQuery.Tag,
+    isFavorite: Boolean = false,
+    enabled: Boolean = true,
+    onClick: (SearchQuery.Tag) -> Unit = { },
+    leftIcon: @Composable (SearchQuery.Tag) -> Unit = { TagChipIcon(it) },
+    rightIcon: @Composable (SearchQuery.Tag) -> Unit = { Spacer(Modifier.width(16.dp)) },
+    content: @Composable RowScope.(SearchQuery.Tag) -> Unit = {
+        Text(
+            it.tag,
+            modifier = Modifier
+                .weight(1f, fill = false)
+                .horizontalScroll(rememberScrollState())
+        )
+    },
+) {
+    val surfaceColor = if (isFavorite) Yellow400 else when (tag.namespace) {
+        "male" -> Blue600
+        "female" -> Pink600
+        else -> MaterialTheme.colorScheme.surface
+    }
+
+    val contentColor =
+        if (surfaceColor == MaterialTheme.colorScheme.surface)
+            MaterialTheme.colorScheme.onSurface
+        else
+            Color.White
+
+    val inner = @Composable {
+        CompositionLocalProvider(
+            LocalContentColor provides contentColor,
+            LocalTextStyle provides MaterialTheme.typography.bodyMedium
+        ) {
+            Row(
+                verticalAlignment = Alignment.CenterVertically
+            ) {
+                leftIcon(tag)
+                content(tag)
+                rightIcon(tag)
+            }
+        }
+    }
+
+    val modifier = Modifier.height(32.dp)
+    val shape = RoundedCornerShape(16.dp)
+
+    if (enabled)
+        Surface(
+            modifier = modifier,
+            shape = shape,
+            color = surfaceColor,
+            onClick = { onClick(tag) },
+            content = inner,
+            shadowElevation = 4.dp
+        )
+    else
+        Surface(
+            modifier,
+            shape = shape,
+            color = surfaceColor,
+            content = inner,
+            shadowElevation = 4.dp
+        )
+}
+
+@Composable
+fun QueryView(
+    query: SearchQuery?,
+    topLevel: Boolean = true,
+) {
+    val modifier = if (topLevel) {
+        Modifier
+    } else {
+        Modifier.border(
+            width = 0.5.dp,
+            color = LocalContentColor.current,
+            shape = CardDefaults.shape
+        )
+    }
+
+    when (query) {
+        null -> {
+            Text(
+                modifier = Modifier
+                    .height(60.dp)
+                    .wrapContentHeight()
+                    .padding(horizontal = 16.dp),
+                text = stringResource(id = R.string.search_hint),
+                color = MaterialTheme.colorScheme.onSurface.copy(alpha = 0.7f)
+            )
+        }
+
+        is SearchQuery.Tag -> {
+            TagChip(
+                query,
+                enabled = false
+            )
+        }
+
+        is SearchQuery.Or -> {
+            Row(
+                modifier = modifier.padding(vertical = 2.dp, horizontal = 4.dp),
+                verticalAlignment = Alignment.CenterVertically,
+                horizontalArrangement = Arrangement.spacedBy(4.dp),
+            ) {
+                query.queries.forEachIndexed { index, subQuery ->
+                    if (index != 0) {
+                        Text("+")
+                    }
+                    QueryView(subQuery, topLevel = false)
+                }
+            }
+        }
+
+        is SearchQuery.And -> {
+            Row(
+                horizontalArrangement = Arrangement.spacedBy(4.dp),
+                verticalAlignment = Alignment.CenterVertically
+            ) {
+                query.queries.forEach { subQuery ->
+                    QueryView(subQuery, topLevel = false)
+                }
+            }
+        }
+
+        is SearchQuery.Not -> {
+            Row(
+                modifier = modifier.padding(vertical = 2.dp, horizontal = 4.dp),
+                horizontalArrangement = Arrangement.spacedBy(4.dp),
+                verticalAlignment = Alignment.CenterVertically
+            ) {
+                Text("-")
+                QueryView(query.query, topLevel = false)
+            }
+        }
+    }
+}
+
+@Composable
+fun SearchBar(
+    contentType: ContentType,
+    query: SearchQuery?,
+    onQueryChange: (SearchQuery?) -> Unit,
+    onSearchBarPositioned: (Int) -> Unit,
+    topOffset: Int,
+    onTopOffsetChange: (Int) -> Unit,
+    content: @Composable () -> Unit,
+) {
+    var focused by remember { mutableStateOf(false) }
+    val scrimAlpha: Float by animateFloatAsState(
+        if (focused && contentType == ContentType.SINGLE_PANE) 0.3f else 0f,
+        label = "scrim alpha"
+    )
+
+    val interactionSource = remember { MutableInteractionSource() }
+
+    val state = remember(query) { query.toEditableState() }
+
+    LaunchedEffect(focused) {
+        if (!focused) {
+            onQueryChange(state.toSearchQuery())
+        } else {
+            AnimationState(Int.VectorConverter, topOffset).animateTo(0) { onTopOffsetChange(value) }
+        }
+    }
+
+    if (focused) {
+        BackHandler {
+            focused = false
+        }
+    }
+
+    BoxWithConstraints(
+        modifier = Modifier
+            .fillMaxSize()
+            .clickable(
+                interactionSource = interactionSource,
+                indication = null
+            ) {
+                focused = false
+            }
+    ) {
+        val height: Dp by animateDpAsState(
+            if (focused) maxHeight else 60.dp,
+            label = "searchbar height"
+        )
+        val cardShape = RoundedCornerShape(30.dp)
+
+        content()
+
+        Box(
+            Modifier
+                .fillMaxSize()
+                .background(Color.Black.copy(alpha = scrimAlpha))
+        )
+
+        Card(
+            modifier = Modifier
+                .safeDrawingPadding()
+                .padding(16.dp)
+                .fillMaxWidth()
+                .height(height)
+                .clickable(
+                    interactionSource = interactionSource,
+                    indication = null
+                ) {
+                    focused = true
+                }
+                .onGloballyPositioned {
+                    onSearchBarPositioned(it.positionInRoot().y.roundToInt() + it.size.height)
+                }
+                .absoluteOffset { IntOffset(0, topOffset) },
+            shape = cardShape,
+            elevation = CardDefaults.cardElevation(6.dp)
+        ) {
+            Box {
+                androidx.compose.animation.AnimatedVisibility(
+                    !focused,
+                    enter = fadeIn(),
+                    exit = fadeOut()
+                ) {
+                    Row(
+                        modifier = Modifier
+                            .heightIn(min = 60.dp)
+                            .horizontalScroll(rememberScrollState()),
+                        verticalAlignment = Alignment.CenterVertically
+                    ) {
+                        Box(Modifier.size(8.dp))
+                        QueryView(query)
+                        Box(Modifier.size(8.dp))
+                    }
+                }
+                androidx.compose.animation.AnimatedVisibility(
+                    focused,
+                    enter = fadeIn(),
+                    exit = fadeOut()
+                ) {
+                    Column(
+                        Modifier
+                            .fillMaxSize()
+                            .padding(top = 8.dp, start = 8.dp, end = 8.dp)
+                    ) {
+                        IconButton(
+                            onClick = {
+                                focused = false
+                            }
+                        ) {
+                            Icon(
+                                imageVector = Icons.AutoMirrored.Filled.ArrowBack,
+                                contentDescription = "close search bar"
+                            )
+                        }
+                        QueryEditor(state = state)
+                    }
+                }
+            }
+        }
+    }
+}
+
+@Composable
+fun GalleryList(
+    contentType: ContentType,
+    galleries: List<GalleryInfo>,
+    query: SearchQuery?,
+    currentPage: Int,
+    maxPage: Int,
+    loading: Boolean = false,
+    error: Boolean = false,
+    onPageChange: (Int) -> Unit,
+    onQueryChange: (SearchQuery?) -> Unit = {},
+    openGalleryDetails: (GalleryInfo) -> Unit,
+) {
+    val listState = rememberLazyListState()
+    var topOffset by remember { mutableIntStateOf(0) }
+    var searchBarPosition by remember { mutableIntStateOf(0) }
+
+    val listModifier = Modifier.nestedScroll(object : NestedScrollConnection {
+        override fun onPreScroll(available: Offset, source: NestedScrollSource): Offset {
+            topOffset = (topOffset + available.y.roundToInt()).coerceIn(-searchBarPosition, 0)
+            return Offset.Zero
+        }
+    })
+
+    LaunchedEffect(galleries) {
+        listState.animateScrollToItem(0)
+        topOffset = 0
+    }
+
+    SearchBar(
+        contentType = contentType,
+        query = query,
+        onQueryChange = onQueryChange,
+        onSearchBarPositioned = { searchBarPosition = it },
+        topOffset = topOffset,
+        onTopOffsetChange = { topOffset = it },
+    ) {
+        AnimatedVisibility(loading, enter = fadeIn(), exit = fadeOut()) {
+            Box(Modifier.fillMaxSize()) {
+                CircularProgressIndicator(Modifier.align(Alignment.Center))
+            }
+        }
+        AnimatedVisibility(error, enter = fadeIn(), exit = fadeOut()) {
+            Box(Modifier.fillMaxSize()) {
+                Column(
+                    Modifier.align(Alignment.Center),
+                    horizontalAlignment = Alignment.CenterHorizontally,
+                    verticalArrangement = Arrangement.spacedBy(16.dp)
+                ) {
+                    Text(
+                        "(´∇｀)",
+                        style = MaterialTheme.typography.headlineMedium,
+                        color = MaterialTheme.colorScheme.onSurface.copy(alpha = 0.5f)
+                    )
+                    Text("No sources found!\nLet's go download one.", textAlign = TextAlign.Center)
+                }
+            }
+        }
+        AnimatedVisibility(!loading && !error, enter = fadeIn(), exit = fadeOut()) {
+            OverscrollPager(
+                prevPage = if (currentPage != 0) currentPage else null,
+                nextPage = if (currentPage < maxPage) currentPage + 2 else null,
+                onPageTurn = { onPageChange(it - 1) }
+            ) {
+                LazyColumn(
+                    modifier = listModifier,
+                    contentPadding = WindowInsets.systemBars.asPaddingValues()
+                        .let { systemBarPaddingValues ->
+                            val layoutDirection = LocalLayoutDirection.current
+                            PaddingValues(
+                                top = systemBarPaddingValues.calculateTopPadding() + 96.dp,
+                                bottom = systemBarPaddingValues.calculateBottomPadding(),
+                                start = systemBarPaddingValues.calculateStartPadding(layoutDirection),
+                                end = systemBarPaddingValues.calculateEndPadding(layoutDirection),
+                            )
+                        },
+                    verticalArrangement = Arrangement.spacedBy(8.dp),
+                    state = listState
+                ) {
+                    items(galleries, key = { it.id }) { galleryInfo ->
+                        DetailedGalleryInfo(
+                            modifier = Modifier
+                                .fillMaxWidth()
+                                .padding(horizontal = 4.dp)
+                                .clickable { openGalleryDetails(galleryInfo) },
+                            galleryInfo = galleryInfo
+                        )
+                    }
+                }
+            }
+        }
+    }
+}
+
+@Composable
+fun DetailScreen(
+    galleryInfo: GalleryInfo,
+    closeGalleryDetails: () -> Unit = { },
+    openGallery: (GalleryInfo) -> Unit = { },
+) {
+    var thumbnailUrl by remember { mutableStateOf<String?>(null) }
+
+    LaunchedEffect(galleryInfo) {
+        thumbnailUrl = galleryInfo.files.firstOrNull()?.let {
+            HitomiHttpClient.getImageURL(it, true).firstOrNull()
+        } ?: ""
+    }
+
+    Column(
+        Modifier
+            .padding(horizontal = 8.dp)
+            .verticalScroll(rememberScrollState()),
+        verticalArrangement = Arrangement.spacedBy(16.dp)
+    ) {
+        Spacer(Modifier.windowInsetsTopHeight(WindowInsets.systemBars))
+        IconButton(onClick = closeGalleryDetails) {
+            Icon(Icons.AutoMirrored.Filled.ArrowBack, contentDescription = "Close Detail")
+        }
+
+        DetailedGalleryInfoHeader(galleryInfo, thumbnailUrl)
+
+        Row(Modifier.fillMaxWidth()) {
+            FilledTonalButton(
+                modifier = Modifier
+                    .weight(1f)
+                    .padding(horizontal = 4.dp),
+                onClick = { /*TODO*/ }
+            ) {
+                Text(stringResource(R.string.download))
+            }
+
+            Button(
+                modifier = Modifier
+                    .weight(1f)
+                    .padding(horizontal = 4.dp),
+                onClick = { openGallery(galleryInfo) }
+            ) {
+                Text("Open")
+            }
+        }
+
+        GalleryTypeIndicator(galleryInfo.type)
+
+        if (galleryInfo.series?.isNotEmpty() == true) {
+            TagGroup(galleryInfo.series.map { it.toTag() })
+        }
+
+        if (galleryInfo.characters?.isNotEmpty() == true) {
+            TagGroup(galleryInfo.characters.map { it.toTag() })
+        }
+
+        if (galleryInfo.tags?.isNotEmpty() == true) {
+            TagGroup(galleryInfo.tags.map { it.toTag() })
+        }
+    }
+}
+
+@Composable
+fun SearchScreen(
+    contentType: ContentType,
+    displayFeatures: List<DisplayFeature>,
+    uiState: SearchState,
+    openGalleryDetails: (GalleryInfo) -> Unit,
+    closeGalleryDetails: () -> Unit,
+    onQueryChange: (SearchQuery?) -> Unit,
+    loadSearchResult: (IntRange) -> Unit,
+    openGallery: (GalleryInfo) -> Unit,
+) {
+    val itemsPerPage by remember { mutableIntStateOf(20) }
+
+    val pageToRange: (Int) -> IntRange = remember(itemsPerPage) {
+        { page ->
+            page * itemsPerPage..<(page + 1) * itemsPerPage
+        }
+    }
+
+    val currentPage = remember(uiState) {
+        if (uiState.currentRange != IntRange.EMPTY) {
+            uiState.currentRange.first / itemsPerPage
+        } else 0
+    }
+
+    val maxPage = remember(itemsPerPage, uiState) {
+        if (uiState.galleryCount != null) {
+            uiState.galleryCount / itemsPerPage + if (uiState.galleryCount % itemsPerPage != 0) 1 else 0
+        } else 0
+    }
+
+    val loadResult: (Int) -> Unit = remember(loadSearchResult) {
+        { page ->
+            loadSearchResult(pageToRange(page))
+        }
+    }
+
+    LaunchedEffect(uiState.query) { loadSearchResult(pageToRange(currentPage)) }
+
+    LaunchedEffect(contentType) {
+        if (contentType == ContentType.SINGLE_PANE && !uiState.isDetailOnlyOpen) {
+            closeGalleryDetails()
+        }
+    }
+
+    if (contentType == ContentType.SINGLE_PANE && uiState.isDetailOnlyOpen) {
+        BackHandler {
+            closeGalleryDetails()
+        }
+    }
+
+    if (contentType == ContentType.DUAL_PANE) {
+        TwoPane(
+            first = {
+                GalleryList(
+                    contentType = contentType,
+                    galleries = uiState.galleries,
+                    query = uiState.query,
+                    currentPage = currentPage,
+                    maxPage = maxPage,
+                    loading = uiState.loading,
+                    error = uiState.error,
+                    onQueryChange = onQueryChange,
+                    onPageChange = loadResult,
+                    openGalleryDetails = openGalleryDetails
+                )
+            },
+            second = {
+
+            },
+            strategy = HorizontalTwoPaneStrategy(splitFraction = 0.5f, gapWidth = 16.dp),
+            displayFeatures = displayFeatures
+        )
+    } else {
+        val detailGallery = uiState.openedGallery
+        AnimatedVisibility(!uiState.isDetailOnlyOpen || detailGallery == null) {
+            GalleryList(
+                contentType = contentType,
+                galleries = uiState.galleries,
+                query = uiState.query,
+                currentPage = currentPage,
+                maxPage = maxPage,
+                loading = uiState.loading,
+                error = uiState.error,
+                onQueryChange = onQueryChange,
+                onPageChange = loadResult,
+                openGalleryDetails = openGalleryDetails
+            )
+        }
+        AnimatedVisibility(uiState.isDetailOnlyOpen && detailGallery != null) {
+            if (detailGallery != null) {
+                DetailScreen(
+                    galleryInfo = detailGallery,
+                    closeGalleryDetails = closeGalleryDetails,
+                    openGallery = openGallery
+                )
+            }
+        }
+    }
+}

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

@@ -1,166 +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 androidx.preference.PreferenceManager
-import kotlinx.android.synthetic.main.dialog_default_query.*
-import kotlinx.android.synthetic.main.dialog_default_query.view.*
-import xyz.quaver.pupil.R
-import xyz.quaver.pupil.types.Tags
-
-class DefaultQueryDialog(context : Context) : AlertDialog(context) {
-
-    private val languages = context.resources.getStringArray(R.array.languages).map {
-        it.split("|").let { split ->
-            Pair(split[0], split[1])
-        }
-    }.toMap()
-    private val reverseLanguages = languages.entries.associate { (k, v) -> v to k }
-
-    private val excludeBL = "-male:yaoi"
-    private val excludeGuro = listOf("-female:guro", "-male:guro")
-    private val excludeLoli = listOf("-female:loli", "-male:shota")
-
-    var onPositiveButtonClickListener : ((Tags) -> (Unit))? = null
-
-    @SuppressLint("InflateParams")
-    override fun onCreate(savedInstanceState: Bundle?) {
-        setTitle(R.string.default_query_dialog_title)
-        setView(build())
-        setButton(Dialog.BUTTON_POSITIVE, context.getString(android.R.string.ok)) { _, _ ->
-            val newTags = Tags.parse(default_query_dialog_edittext.text.toString())
-
-            with(default_query_dialog_language_selector) {
-                if (selectedItemPosition != 0)
-                    newTags.add("language:${reverseLanguages[selectedItem]}")
-            }
-
-            if (default_query_dialog_BL_checkbox.isChecked)
-                newTags.add(excludeBL)
-
-            if (default_query_dialog_guro_checkbox.isChecked)
-                excludeGuro.forEach { tag ->
-                    newTags.add(tag)
-                }
-
-            if (default_query_dialog_loli_checkbox.isChecked)
-                excludeLoli.forEach { tag ->
-                    newTags.add(tag)
-                }
-
-            onPositiveButtonClickListener?.invoke(newTags)
-        }
-
-        super.onCreate(savedInstanceState)
-    }
-
-    @SuppressLint("InflateParams")
-    private fun build() : View {
-        val preferences = PreferenceManager.getDefaultSharedPreferences(context)
-        val tags = Tags.parse(
-            preferences.getString("default_query", "") ?: ""
-        )
-
-        val view = LayoutInflater.from(context).inflate(R.layout.dialog_default_query, null)
-
-        with(view.default_query_dialog_language_selector) {
-            adapter =
-                ArrayAdapter(
-                    context,
-                    android.R.layout.simple_spinner_dropdown_item,
-                    arrayListOf(
-                        context.getString(R.string.default_query_dialog_language_selector_none)
-                    ).apply {
-                        addAll(languages.values)
-                    }
-                )
-            if (tags.any { it.area == "language" && !it.isNegative }) {
-                val tag = languages[tags.first { it.area == "language" }.tag]
-                if (tag != null) {
-                    setSelection(
-                        @Suppress("UNCHECKED_CAST")
-                        (adapter as ArrayAdapter<String>).getPosition(tag)
-                    )
-                    tags.removeByArea("language", false)
-                }
-            }
-        }
-
-        with(view.default_query_dialog_BL_checkbox) {
-            isChecked = tags.contains(excludeBL)
-            if (tags.contains(excludeBL))
-                tags.remove(excludeBL)
-        }
-
-        with(view.default_query_dialog_guro_checkbox) {
-            isChecked = excludeGuro.all { tags.contains(it) }
-            if (excludeGuro.all { tags.contains(it) })
-                excludeGuro.forEach {
-                    tags.remove(it)
-                }
-        }
-
-        with(view.default_query_dialog_loli_checkbox) {
-            isChecked = excludeLoli.all { tags.contains(it) }
-            if (excludeLoli.all { tags.contains(it) })
-                excludeLoli.forEach {
-                    tags.remove(it)
-                }
-        }
-
-        with(view.default_query_dialog_edittext) {
-            setText(tags.toString(), android.widget.TextView.BufferType.EDITABLE)
-            addTextChangedListener(object : TextWatcher {
-                override fun beforeTextChanged(
-                    s: CharSequence?,
-                    start: Int,
-                    count: Int,
-                    after: Int
-                ) {
-                }
-
-                override fun onTextChanged(s: CharSequence?, start: Int, before: Int, count: Int) {}
-
-                override fun afterTextChanged(s: Editable?) {
-                    s ?: return
-
-                    if (s.any { it.isUpperCase() })
-                        s.replace(
-                            0,
-                            s.length,
-                            s.toString().toLowerCase(java.util.Locale.getDefault())
-                        )
-                }
-            })
-        }
-
-        return view
-    }
-
-}

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

@@ -1,138 +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.Manifest
-import android.annotation.SuppressLint
-import android.app.Activity
-import android.app.Dialog
-import android.content.Intent
-import android.content.pm.PackageManager
-import android.os.Build
-import android.os.Bundle
-import android.view.View
-import android.widget.LinearLayout
-import android.widget.RadioButton
-import androidx.appcompat.app.AlertDialog
-import androidx.core.app.ActivityCompat
-import androidx.core.content.ContextCompat
-import androidx.preference.PreferenceManager
-import kotlinx.android.synthetic.main.item_dl_location.view.*
-import net.rdrei.android.dirchooser.DirectoryChooserActivity
-import net.rdrei.android.dirchooser.DirectoryChooserConfig
-import xyz.quaver.pupil.R
-import xyz.quaver.pupil.util.*
-import java.io.File
-
-@SuppressLint("InflateParams")
-class DownloadLocationDialog(val activity: Activity) : AlertDialog(activity) {
-
-    private val preference = PreferenceManager.getDefaultSharedPreferences(context)
-    private val buttons = mutableListOf<Pair<RadioButton, File?>>()
-
-    override fun onCreate(savedInstanceState: Bundle?) {
-        setTitle(R.string.settings_dl_location)
-
-        setView(build())
-
-        setButton(Dialog.BUTTON_POSITIVE, context.getText(android.R.string.ok)) { _, _ -> }
-
-        super.onCreate(savedInstanceState)
-    }
-
-    private fun build() : View {
-        val view = layoutInflater.inflate(R.layout.dialog_dl_location, null) as LinearLayout
-
-        val externalFilesDirs = ContextCompat.getExternalFilesDirs(context, null)
-
-        externalFilesDirs.forEachIndexed { index, dir ->
-
-            dir ?: return@forEachIndexed
-
-            view.addView(layoutInflater.inflate(R.layout.item_dl_location, view, false).apply {
-                location_type.text = context.getString(when (index) {
-                    0 -> R.string.settings_dl_location_internal
-                    else -> R.string.settings_dl_location_removable
-                })
-                location_available.text = context.getString(
-                    R.string.settings_dl_location_available,
-                    byteToString(dir.freeSpace)
-                )
-                setOnClickListener {
-                    buttons.forEach { pair ->
-                        pair.first.isChecked = false
-                    }
-                    button.performClick()
-                    preference.edit().putString("dl_location", dir.canonicalPath).apply()
-                }
-                buttons.add(button to dir)
-            })
-        }
-
-        view.addView(layoutInflater.inflate(R.layout.item_dl_location, view, false).apply {
-            location_type.text = context.getString(R.string.settings_dl_location_custom)
-            setOnClickListener {
-                buttons.forEach { pair ->
-                    pair.first.isChecked = false
-                }
-                button.performClick()
-
-                if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
-
-                    if (ContextCompat.checkSelfPermission(context, Manifest.permission.WRITE_EXTERNAL_STORAGE) != PackageManager.PERMISSION_GRANTED)
-                        ActivityCompat.requestPermissions(activity, arrayOf(Manifest.permission.WRITE_EXTERNAL_STORAGE), REQUEST_WRITE_PERMISSION_AND_SAF)
-                    else {
-                        val intent = Intent(Intent.ACTION_OPEN_DOCUMENT_TREE).apply {
-                            putExtra("android.content.extra.SHOW_ADVANCED", true)
-                        }
-
-                        activity.startActivityForResult(intent, REQUEST_DOWNLOAD_FOLDER)
-                    }
-
-                    dismiss()
-                } else {    // Can't use SAF on old Androids!
-                    val config = DirectoryChooserConfig.builder()
-                        .newDirectoryName("Pupil")
-                        .allowNewDirectoryNameModification(true)
-                        .build()
-
-                    val intent = Intent(context, DirectoryChooserActivity::class.java).apply {
-                        putExtra(DirectoryChooserActivity.EXTRA_CONFIG, config)
-                    }
-
-                    activity.startActivityForResult(intent, REQUEST_DOWNLOAD_FOLDER_OLD)
-                    dismiss()
-                }
-            }
-            buttons.add(button to null)
-        })
-
-        externalFilesDirs.indexOfFirst {
-            it.canonicalPath == getDownloadDirectory(context).canonicalPath
-        }.let { index ->
-            if (index < 0)
-                buttons.first().first.isChecked = true
-            else
-                buttons[index].first.isChecked = true
-        }
-
-        return view
-    }
-
-}

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

@@ -1,290 +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.app.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.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.chip.Chip
-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.async
-import kotlinx.coroutines.launch
-import xyz.quaver.hitomi.Gallery
-import xyz.quaver.hitomi.GalleryBlock
-import xyz.quaver.hitomi.getGallery
-import xyz.quaver.pupil.BuildConfig
-import xyz.quaver.pupil.Pupil
-import xyz.quaver.pupil.R
-import xyz.quaver.pupil.adapters.GalleryBlockAdapter
-import xyz.quaver.pupil.adapters.ThumbnailPageAdapter
-import xyz.quaver.pupil.types.Tag
-import xyz.quaver.pupil.ui.ReaderActivity
-import xyz.quaver.pupil.util.ItemClickSupport
-import xyz.quaver.pupil.util.download.Cache
-import xyz.quaver.pupil.util.wordCapitalize
-
-class GalleryDialog(context: Context, private val glide: RequestManager, private val galleryID: Int) : Dialog(context) {
-
-    private val languages = context.resources.getStringArray(R.array.languages).map {
-        it.split("|").let { split ->
-            Pair(split[0], split[1])
-        }
-    }.toMap()
-
-    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)
-                })
-                (context.applicationContext as Pupil).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(
-                            Chip(context).apply {
-                                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)
-                                    }
-                                    "female" -> {
-                                        setChipBackgroundColorResource(R.color.material_pink_600)
-                                        setTextColor(ContextCompat.getColor(context, android.R.color.white))
-                                        ContextCompat.getDrawable(context, R.drawable.gender_female)
-                                    }
-                                    else -> null
-                                }
-
-                                text = when (tag.area) {
-                                    "language" -> languages[tag.tag]
-                                    else -> tag.tag.wordCapitalize()
-                                }
-
-                                setEnsureMinTouchTargetSize(false)
-
-                                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<GalleryBlock>()
-
-        val adapter = GalleryBlockAdapter(glide, galleries).apply {
-            onChipClickedHandler.add { tag ->
-                this@GalleryDialog.onChipClickedHandler.forEach { handler ->
-                    handler.invoke(tag)
-                }
-            }
-        }
-
-        CoroutineScope(Dispatchers.Main).launch {
-            gallery.related.forEachIndexed { i, galleryID ->
-                async(Dispatchers.IO) {
-                    Cache(context).getGalleryBlock(galleryID)
-                }.let {
-                    val galleryBlock = it.await() ?: return@let
-
-                    galleries.add(galleryBlock)
-                    adapter.notifyItemInserted(i)
-                }
-            }
-        }
-
-        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)
-                    .setOnItemClickListener { _, position, _ ->
-                        context.startActivity(Intent(context, ReaderActivity::class.java).apply {
-                            putExtra("galleryID", galleries[position].id)
-                        })
-                        (context.applicationContext as Pupil).histories.add(galleries[position].id)
-                    }
-                    .setOnItemLongClickListener { _, position, _ ->
-                        GalleryDialog(
-                            context,
-                            glide,
-                            galleries[position].id
-                        ).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)
-        }
-    }
-
-}

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

@@ -1,94 +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.preference.PreferenceManager
-import androidx.recyclerview.widget.DividerItemDecoration
-import androidx.recyclerview.widget.ItemTouchHelper
-import androidx.recyclerview.widget.LinearLayoutManager
-import androidx.recyclerview.widget.RecyclerView
-import xyz.quaver.pupil.R
-import xyz.quaver.pupil.adapters.MirrorAdapter
-
-class MirrorDialog(context: Context) : AlertDialog(context) {
-
-    class ItemTouchHelperCallback : ItemTouchHelper.Callback() {
-
-        var onMoveItem : ((Int, Int) -> (Unit))? = null
-
-        override fun getMovementFlags(
-            recyclerView: RecyclerView,
-            viewHolder: RecyclerView.ViewHolder
-        ) = makeMovementFlags(ItemTouchHelper.UP or ItemTouchHelper.DOWN, 0)
-
-        override fun onMove(
-            recyclerView: RecyclerView,
-            viewHolder: RecyclerView.ViewHolder,
-            target: RecyclerView.ViewHolder
-        ): Boolean {
-            onMoveItem?.invoke(viewHolder.adapterPosition, target.adapterPosition)
-            return true
-        }
-
-        override fun onSwiped(viewHolder: RecyclerView.ViewHolder, direction: Int) {
-
-        }
-    }
-
-    @SuppressLint("InflateParams")
-    override fun onCreate(savedInstanceState: Bundle?) {
-        setTitle(R.string.settings_mirror_title)
-        setView(build())
-        setButton(Dialog.BUTTON_POSITIVE, context.getString(android.R.string.ok)) { _, _ -> }
-
-        super.onCreate(savedInstanceState)
-    }
-
-    private fun build() : View {
-        return RecyclerView(context).apply recyclerview@{
-            addItemDecoration(DividerItemDecoration(context, DividerItemDecoration.VERTICAL))
-            layoutManager = LinearLayoutManager(context)
-            adapter = MirrorAdapter(context).apply adapter@{
-                val itemTouchHelper = ItemTouchHelper(ItemTouchHelperCallback().apply {
-                    onMoveItem = this@adapter.onItemMove
-                }).apply {
-                    attachToRecyclerView(this@recyclerview)
-                }
-
-                onStartDrag = {
-                    itemTouchHelper.startDrag(it)
-                }
-
-                onItemMoved = {
-                    PreferenceManager.getDefaultSharedPreferences(context)
-                        .edit()
-                        .putString("mirrors", it.joinToString(">"))
-                        .apply()
-                }
-            }
-        }
-    }
-
-}

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

@@ -1,133 +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.preference.PreferenceManager
-import kotlinx.android.synthetic.main.dialog_proxy.view.*
-import xyz.quaver.proxy
-import xyz.quaver.pupil.R
-import xyz.quaver.pupil.util.ProxyInfo
-import xyz.quaver.pupil.util.getProxyInfo
-import xyz.quaver.pupil.util.json
-import java.net.Proxy
-
-class ProxyDialog(context: Context) : Dialog(context) {
-
-    override fun onCreate(savedInstanceState: Bundle?) {
-        val view = build()
-
-        setTitle(R.string.settings_proxy_title)
-        setContentView(view)
-
-        window?.attributes?.width = ViewGroup.LayoutParams.MATCH_PARENT
-
-        super.onCreate(savedInstanceState)
-    }
-
-    @SuppressLint("InflateParams")
-    private fun build() : View {
-        val proxyInfo = getProxyInfo(context)
-
-        val view = LayoutInflater.from(context).inflate(R.layout.dialog_proxy, null)
-
-        val enabler = { enable: Boolean ->
-            view?.proxy_addr?.isEnabled = enable
-            view?.proxy_port?.isEnabled = enable
-            view?.proxy_username?.isEnabled = enable
-            view?.proxy_password?.isEnabled = enable
-
-            if (!enable) {
-                view?.proxy_addr?.text = null
-                view?.proxy_port?.text = null
-                view?.proxy_username?.text = null
-                view?.proxy_password?.text = null
-            }
-        }
-
-        with(view.proxy_type_selector) {
-            adapter = ArrayAdapter(
-                context,
-                android.R.layout.simple_spinner_dropdown_item,
-                context.resources.getStringArray(R.array.proxy_type)
-            )
-
-            setSelection(proxyInfo.type.ordinal)
-
-            onItemSelectedListener = object: AdapterView.OnItemSelectedListener {
-                override fun onItemSelected(parent: AdapterView<*>?, view: View?, position: Int, id: Long) {
-                    enabler.invoke(position != 0)
-                }
-
-                override fun onNothingSelected(parent: AdapterView<*>?) {}
-            }
-        }
-
-        view.proxy_addr.setText(proxyInfo.host)
-        view.proxy_port.setText(proxyInfo.port?.toString())
-        view.proxy_username.setText(proxyInfo.username)
-        view.proxy_password.setText(proxyInfo.password)
-
-        enabler.invoke(proxyInfo.type != Proxy.Type.DIRECT)
-
-        view.proxy_cancel.setOnClickListener {
-            dismiss()
-        }
-
-        view.proxy_ok.setOnClickListener {
-            val type = Proxy.Type.values()[view.proxy_type_selector.selectedItemPosition]
-            val addr = view.proxy_addr.text?.toString()
-            val port = view.proxy_port.text?.toString()?.toIntOrNull()
-            val username = view.proxy_username.text?.toString()
-            val password = view.proxy_password.text?.toString()
-
-            if (type != Proxy.Type.DIRECT) {
-                if (addr == null || addr.isEmpty())
-                    view.proxy_addr.error = context.getText(R.string.proxy_dialog_error)
-                if (port == null)
-                    view.proxy_port.error = context.getText(R.string.proxy_dialog_error)
-
-                if (addr == null || addr.isEmpty() || port == null)
-                    return@setOnClickListener
-            }
-
-            ProxyInfo(type, addr, port, username, password).let {
-
-                PreferenceManager.getDefaultSharedPreferences(context).edit().putString("proxy",
-                    json.stringify(ProxyInfo.serializer(), it)
-                ).apply()
-
-                proxy = it.proxy()
-            }
-
-            dismiss()
-        }
-
-        return view
-    }
-
-}

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

@@ -1,147 +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.PreferenceManager
-import androidx.preference.SwitchPreferenceCompat
-import xyz.quaver.pupil.R
-import xyz.quaver.pupil.ui.LockActivity
-import xyz.quaver.pupil.util.Lock
-import xyz.quaver.pupil.util.LockManager
-
-class LockSettingsFragment :
-    PreferenceFragmentCompat() {
-
-    override fun onResume() {
-        super.onResume()
-
-        val lockManager = LockManager(requireContext())
-
-        findPreference<Preference>("lock_pattern")?.summary =
-            if (lockManager.contains(Lock.Type.PATTERN))
-                getString(R.string.settings_lock_enabled)
-            else
-                ""
-
-        findPreference<Preference>("lock_pin")?.summary =
-            if (lockManager.contains(Lock.Type.PIN))
-                getString(R.string.settings_lock_enabled)
-            else
-                ""
-
-        if (lockManager.isEmpty()) {
-            (findPreference<Preference>("lock_fingerprint") as SwitchPreferenceCompat).isChecked = false
-
-            PreferenceManager.getDefaultSharedPreferences(context).edit().putBoolean("lock_fingerprint", false).apply()
-        }
-    }
-
-    override fun onCreatePreferences(savedInstanceState: Bundle?, rootKey: String?) {
-        setPreferencesFromResource(R.xml.lock_preferences, rootKey)
-
-        with(findPreference<Preference>("lock_pattern")) {
-            this!!
-
-            if (LockManager(requireContext()).contains(Lock.Type.PATTERN))
-                summary = getString(R.string.settings_lock_enabled)
-
-            onPreferenceClickListener = Preference.OnPreferenceClickListener {
-                val lockManager = LockManager(requireContext())
-
-                if (lockManager.contains(Lock.Type.PATTERN)) {
-                    AlertDialog.Builder(requireContext()).apply {
-                        setTitle(R.string.warning)
-                        setMessage(R.string.settings_lock_remove_message)
-
-                        setPositiveButton(android.R.string.yes) { _, _ ->
-                            lockManager.remove(Lock.Type.PATTERN)
-                            onResume()
-                        }
-                        setNegativeButton(android.R.string.no) { _, _ -> }
-                    }.show()
-                } else {
-                    val intent = Intent(requireContext(), LockActivity::class.java).apply {
-                        putExtra("mode", "add_lock")
-                        putExtra("type", "pattern")
-                    }
-
-                    startActivity(intent)
-                }
-
-                true
-            }
-        }
-
-        with(findPreference<Preference>("lock_pin")) {
-            this!!
-
-            if (LockManager(requireContext()).contains(Lock.Type.PIN))
-                summary = getString(R.string.settings_lock_enabled)
-
-            onPreferenceClickListener = Preference.OnPreferenceClickListener {
-                val lockManager = LockManager(requireContext())
-
-                if (lockManager.contains(Lock.Type.PIN)) {
-                    AlertDialog.Builder(requireContext()).apply {
-                        setTitle(R.string.warning)
-                        setMessage(R.string.settings_lock_remove_message)
-
-                        setPositiveButton(android.R.string.yes) { _, _ ->
-                            lockManager.remove(Lock.Type.PIN)
-                            onResume()
-                        }
-                        setNegativeButton(android.R.string.no) { _, _ -> }
-                    }.show()
-                } else {
-                    val intent = Intent(requireContext(), LockActivity::class.java).apply {
-                        putExtra("mode", "add_lock")
-                        putExtra("type", "pin")
-                    }
-
-                    startActivity(intent)
-                }
-
-                true
-            }
-        }
-
-        with(findPreference<Preference>("lock_fingerprint")) {
-            this!!
-
-            setOnPreferenceChangeListener { _, newValue ->
-                this as SwitchPreferenceCompat
-
-                if (newValue == true && LockManager(requireContext()).isEmpty()) {
-                    isChecked = false
-
-                    Toast.makeText(requireContext(), R.string.settings_lock_fingerprint_without_lock, Toast.LENGTH_SHORT).show()
-                } else
-                    isChecked = newValue as Boolean
-
-                false
-            }
-        }
-    }
-}

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

@@ -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?) {
-
-    }
-
-}

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() {
-
-    }
-
-}

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

@@ -1,390 +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.Manifest
-import android.content.*
-import android.content.pm.PackageManager
-import android.os.Build
-import android.os.Bundle
-import android.widget.Toast
-import androidx.appcompat.app.AlertDialog
-import androidx.appcompat.app.AppCompatDelegate
-import androidx.core.app.ActivityCompat
-import androidx.core.content.ContextCompat
-import androidx.preference.Preference
-import androidx.preference.PreferenceCategory
-import androidx.preference.PreferenceFragmentCompat
-import androidx.preference.PreferenceManager
-import com.google.android.material.snackbar.Snackbar
-import kotlinx.coroutines.CoroutineScope
-import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.launch
-import net.rdrei.android.dirchooser.DirectoryChooserActivity
-import net.rdrei.android.dirchooser.DirectoryChooserConfig
-import xyz.quaver.pupil.Pupil
-import xyz.quaver.pupil.R
-import xyz.quaver.pupil.ui.LockActivity
-import xyz.quaver.pupil.ui.SettingsActivity
-import xyz.quaver.pupil.ui.dialog.DefaultQueryDialog
-import xyz.quaver.pupil.ui.dialog.DownloadLocationDialog
-import xyz.quaver.pupil.ui.dialog.MirrorDialog
-import xyz.quaver.pupil.ui.dialog.ProxyDialog
-import xyz.quaver.pupil.util.*
-import java.io.BufferedReader
-import java.io.File
-import java.io.InputStreamReader
-
-
-class SettingsFragment :
-    PreferenceFragmentCompat(),
-    Preference.OnPreferenceClickListener,
-    Preference.OnPreferenceChangeListener,
-    SharedPreferences.OnSharedPreferenceChangeListener {
-
-    lateinit var sharedPreference: SharedPreferences
-
-    override fun onResume() {
-        super.onResume()
-
-        val lockManager = LockManager(requireContext())
-
-        findPreference<Preference>("app_lock")?.summary = if (lockManager.locks.isNullOrEmpty()) {
-            getString(R.string.settings_lock_none)
-        } else {
-            lockManager.locks?.joinToString(", ") {
-                when(it.type) {
-                    Lock.Type.PATTERN -> getString(R.string.settings_lock_pattern)
-                    Lock.Type.PIN -> getString(R.string.settings_lock_pin)
-                    Lock.Type.PASSWORD -> getString(R.string.settings_lock_password)
-                }
-            }
-        }
-    }
-
-    private fun getDirSize(dir: File) : String {
-        return getString(R.string.settings_storage_usage,
-            Runtime.getRuntime().exec("du -hs " + dir.absolutePath).let {
-                BufferedReader(InputStreamReader(it.inputStream)).use { reader ->
-                    reader.readLine().split('\t').firstOrNull() ?: "0"
-                }
-            }
-        )
-    }
-
-    override fun onPreferenceClick(preference: Preference?): Boolean {
-        with (preference) {
-            this ?: return false
-
-            when (key) {
-                "app_version" -> {
-                    checkUpdate(activity as SettingsActivity, true)
-                }
-                "delete_cache" -> {
-                    val dir = File(requireContext().cacheDir, "imageCache")
-
-                    AlertDialog.Builder(requireContext()).apply {
-                        setTitle(R.string.warning)
-                        setMessage(R.string.settings_clear_cache_alert_message)
-                        setPositiveButton(android.R.string.yes) { _, _ ->
-                            if (dir.exists())
-                                dir.deleteRecursively()
-
-                            CoroutineScope(Dispatchers.IO).launch {
-                                summary = getString(R.string.settings_storage_usage_loading)
-
-                                launch(Dispatchers.Main) {
-                                    this@with.summary = getDirSize(dir)
-                                }
-                            }
-                        }
-                        setNegativeButton(android.R.string.no) { _, _ -> }
-                    }.show()
-                }
-                "delete_downloads" -> {
-                    val dir = getDownloadDirectory(requireContext())
-
-                    AlertDialog.Builder(requireContext()).apply {
-                        setTitle(R.string.warning)
-                        setMessage(R.string.settings_clear_downloads_alert_message)
-                        setPositiveButton(android.R.string.yes) { _, _ ->
-                            if (dir.exists())
-                                dir.deleteRecursively()
-
-                            CoroutineScope(Dispatchers.IO).launch {
-                                summary = getString(R.string.settings_storage_usage_loading)
-
-                                launch(Dispatchers.Main) {
-                                    this@with.summary = getDirSize(dir)
-                                }
-                            }
-                        }
-                        setNegativeButton(android.R.string.no) { _, _ -> }
-                    }.show()
-                }
-                "clear_history" -> {
-                    val histories = (requireContext().applicationContext as Pupil).histories
-
-                    AlertDialog.Builder(requireContext()).apply {
-                        setTitle(R.string.warning)
-                        setMessage(R.string.settings_clear_history_alert_message)
-                        setPositiveButton(android.R.string.yes) { _, _ ->
-                            histories.clear()
-                            summary = getString(R.string.settings_clear_history_summary, histories.size)
-                        }
-                        setNegativeButton(android.R.string.no) { _, _ -> }
-                    }.show()
-                }
-                "dl_location" -> {
-                    DownloadLocationDialog(requireActivity()).show()
-                }
-                "default_query" -> {
-                    DefaultQueryDialog(requireContext()).apply {
-                        onPositiveButtonClickListener = { newTags ->
-                            sharedPreferences.edit().putString("default_query", newTags.toString()).apply()
-                            summary = newTags.toString()
-                        }
-                    }.show()
-                }
-                "app_lock" -> {
-                    val intent = Intent(requireContext(), LockActivity::class.java)
-                    activity?.startActivityForResult(intent, REQUEST_LOCK)
-                }
-                "mirrors" -> {
-                    MirrorDialog(requireContext())
-                        .show()
-                }
-                "proxy" -> {
-                    ProxyDialog(requireContext())
-                        .show()
-                }
-                "nomedia" -> {
-                    File(getDownloadDirectory(context), ".nomedia").createNewFile()
-                }
-                "backup" -> {
-                    File(ContextCompat.getDataDir(requireContext()), "favorites.json").copyTo(
-                        File(getDownloadDirectory(requireContext()), "favorites.json"),
-                        true
-                    )
-
-                    Snackbar.make(this@SettingsFragment.listView, R.string.settings_backup_snackbar, Snackbar.LENGTH_LONG)
-                        .show()
-                }
-                "restore" -> {
-                    val intent = Intent(Intent.ACTION_GET_CONTENT).apply {
-                        addCategory(Intent.CATEGORY_OPENABLE)
-                        type = "*/*"
-                    }
-
-                    activity?.startActivityForResult(intent, REQUEST_RESTORE)
-                }
-                "old_import_galleries" -> {
-                    if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
-
-                        if (ContextCompat.checkSelfPermission(requireContext(), Manifest.permission.WRITE_EXTERNAL_STORAGE) != PackageManager.PERMISSION_GRANTED)
-                            ActivityCompat.requestPermissions(requireActivity(), arrayOf(Manifest.permission.WRITE_EXTERNAL_STORAGE), REQUEST_WRITE_PERMISSION_AND_SAF)
-                        else {
-                            val intent = Intent(Intent.ACTION_OPEN_DOCUMENT_TREE).apply {
-                                putExtra("android.content.extra.SHOW_ADVANCED", true)
-                            }
-
-                            activity?.startActivityForResult(intent, REQUEST_IMPORT_OLD_GALLERIES)
-                        }
-                    } else {    // Can't use SAF on old Androids!
-                        val config = DirectoryChooserConfig.builder()
-                            .newDirectoryName("Pupil")
-                            .allowNewDirectoryNameModification(true)
-                            .build()
-
-                        val intent = Intent(requireContext(), DirectoryChooserActivity::class.java).apply {
-                            putExtra(DirectoryChooserActivity.EXTRA_CONFIG, config)
-                        }
-
-                        activity?.startActivityForResult(intent, REQUEST_IMPORT_OLD_GALLERIES_OLD)
-                    }
-                }
-                "user_id" -> {
-                    (context.getSystemService(Context.CLIPBOARD_SERVICE) as ClipboardManager).setPrimaryClip(
-                        ClipData.newPlainText("user_id", sharedPreference.getString("user_id", ""))
-                    )
-                    Toast.makeText(context, R.string.settings_user_id_toast, Toast.LENGTH_SHORT).show()
-                }
-                else -> return false
-            }
-        }
-
-        return true
-    }
-
-    override fun onPreferenceChange(preference: Preference?, newValue: Any?): Boolean {
-        with (preference) {
-            this ?: return false
-
-            when (key) {
-                "dark_mode" -> {
-                    AppCompatDelegate.setDefaultNightMode(when (newValue as Boolean) {
-                        true -> AppCompatDelegate.MODE_NIGHT_YES
-                        false -> AppCompatDelegate.MODE_NIGHT_NO
-                    })
-                }
-                else -> return false
-            }
-        }
-
-        return true
-    }
-
-    override fun onSharedPreferenceChanged(sharedPreferences: SharedPreferences?, key: String?) {
-        key ?: return
-
-        with(findPreference<Preference>(key)) {
-            this ?: return
-
-            when (key) {
-                "proxy" -> {
-                    summary = getProxyInfo(requireContext()).type.name
-                }
-                "dl_location" -> {
-                    summary = getDownloadDirectory(requireContext()).canonicalPath
-                }
-            }
-        }
-    }
-
-    override fun onCreatePreferences(savedInstanceState: Bundle?, rootKey: String?) {
-        setPreferencesFromResource(R.xml.root_preferences, rootKey)
-
-        sharedPreference = PreferenceManager.getDefaultSharedPreferences(requireContext())
-        sharedPreference.registerOnSharedPreferenceChangeListener(this)
-
-        initPreferences()
-    }
-
-    private fun initPreferences() {
-        for (i in 0 until preferenceScreen.preferenceCount) {
-
-            preferenceScreen.getPreference(i).run {
-                if (this is PreferenceCategory)
-                    (0 until preferenceCount).map { getPreference(it) }
-                else
-                    listOf(this)
-            }.forEach { preference ->
-                with (preference) {
-
-                    when (key) {
-                        "app_version" -> {
-                            val manager = requireContext().packageManager
-                            val info = manager.getPackageInfo(requireContext().packageName, 0)
-                            summary = requireContext().getString(R.string.settings_app_version_description, info.versionName)
-
-                            onPreferenceClickListener = this@SettingsFragment
-                        }
-                        "delete_cache" -> {
-                            val dir = File(requireContext().cacheDir, "imageCache")
-
-                            CoroutineScope(Dispatchers.IO).launch {
-                                summary = getString(R.string.settings_storage_usage_loading)
-
-                                launch(Dispatchers.Main) {
-                                    this@with.summary = getDirSize(dir)
-                                }
-                            }
-
-                            onPreferenceClickListener = this@SettingsFragment
-                        }
-                        "delete_downloads" -> {
-                            val dir = getDownloadDirectory(requireContext())
-
-                            CoroutineScope(Dispatchers.IO).launch {
-                                summary = getString(R.string.settings_storage_usage_loading)
-
-                                launch(Dispatchers.Main) {
-                                    this@with.summary = getDirSize(dir)
-                                }
-                            }
-
-                            onPreferenceClickListener = this@SettingsFragment
-                        }
-                        "clear_history" -> {
-                            val histories = (requireActivity().application as Pupil).histories
-                            summary = getString(R.string.settings_clear_history_summary, histories.size)
-
-                            onPreferenceClickListener = this@SettingsFragment
-                        }
-                        "dl_location" -> {
-                            summary = getDownloadDirectory(requireContext()).canonicalPath
-
-                            onPreferenceClickListener = this@SettingsFragment
-                        }
-                        "default_query" -> {
-                            summary = sharedPreference.getString("default_query", "") ?: ""
-
-                            onPreferenceClickListener = this@SettingsFragment
-                        }
-                        "app_lock" -> {
-                            val lockManager = LockManager(requireContext())
-                            summary =
-                                if (lockManager.locks.isNullOrEmpty()) {
-                                    getString(R.string.settings_lock_none)
-                                } else {
-                                    lockManager.locks?.joinToString(", ") {
-                                        when (it.type) {
-                                            Lock.Type.PATTERN -> getString(R.string.settings_lock_pattern)
-                                            Lock.Type.PIN -> getString(R.string.settings_lock_pin)
-                                            Lock.Type.PASSWORD -> getString(R.string.settings_lock_password)
-                                        }
-                                    }
-                                }
-
-                            onPreferenceClickListener = this@SettingsFragment
-                        }
-                        "mirrors" -> {
-                            onPreferenceClickListener = this@SettingsFragment
-                        }
-                        "proxy" -> {
-                            summary = getProxyInfo(requireContext()).type.name
-
-                            onPreferenceClickListener = this@SettingsFragment
-                        }
-                        "dark_mode" -> {
-                            onPreferenceChangeListener = this@SettingsFragment
-                        }
-                        "nomedia" -> {
-                            onPreferenceClickListener = this@SettingsFragment
-                        }
-                        "backup" -> {
-                            onPreferenceClickListener = this@SettingsFragment
-                        }
-                        "restore" -> {
-                            onPreferenceClickListener = this@SettingsFragment
-                        }
-                        "old_import_galleries" -> {
-                            onPreferenceClickListener = this@SettingsFragment
-                        }
-                        "user_id" -> {
-                            summary = sharedPreference.getString("user_id", "")
-                            onPreferenceClickListener = this@SettingsFragment
-                        }
-                    }
-
-                }
-            }
-        }
-    }
-}

app/src/main/java/xyz/quaver/pupil/ui/theme/Color.kt

@@ -0,0 +1,148 @@
+package xyz.quaver.pupil.ui.theme
+import androidx.compose.ui.graphics.Color
+
+val md_theme_light_primary = Color(0xFF006688)
+val md_theme_light_onPrimary = Color(0xFFFFFFFF)
+val md_theme_light_primaryContainer = Color(0xFFC2E8FF)
+val md_theme_light_onPrimaryContainer = Color(0xFF001E2B)
+val md_theme_light_secondary = Color(0xFF4E616D)
+val md_theme_light_onSecondary = Color(0xFFFFFFFF)
+val md_theme_light_secondaryContainer = Color(0xFFD1E5F3)
+val md_theme_light_onSecondaryContainer = Color(0xFF091E28)
+val md_theme_light_tertiary = Color(0xFF5F5A7D)
+val md_theme_light_onTertiary = Color(0xFFFFFFFF)
+val md_theme_light_tertiaryContainer = Color(0xFFE5DEFF)
+val md_theme_light_onTertiaryContainer = Color(0xFF1C1736)
+val md_theme_light_error = Color(0xFFBA1A1A)
+val md_theme_light_errorContainer = Color(0xFFFFDAD6)
+val md_theme_light_onError = Color(0xFFFFFFFF)
+val md_theme_light_onErrorContainer = Color(0xFF410002)
+val md_theme_light_background = Color(0xFFFBFCFE)
+val md_theme_light_onBackground = Color(0xFF191C1E)
+val md_theme_light_surface = Color(0xFFFBFCFE)
+val md_theme_light_onSurface = Color(0xFF191C1E)
+val md_theme_light_surfaceVariant = Color(0xFFDCE3E9)
+val md_theme_light_onSurfaceVariant = Color(0xFF40484D)
+val md_theme_light_outline = Color(0xFF71787D)
+val md_theme_light_inverseOnSurface = Color(0xFFF0F1F3)
+val md_theme_light_inverseSurface = Color(0xFF2E3133)
+val md_theme_light_inversePrimary = Color(0xFF75D1FF)
+val md_theme_light_shadow = Color(0xFF000000)
+val md_theme_light_surfaceTint = Color(0xFF006688)
+val md_theme_light_outlineVariant = Color(0xFFC0C7CD)
+val md_theme_light_scrim = Color(0xFF000000)
+
+val md_theme_dark_primary = Color(0xFF75D1FF)
+val md_theme_dark_onPrimary = Color(0xFF003548)
+val md_theme_dark_primaryContainer = Color(0xFF004D67)
+val md_theme_dark_onPrimaryContainer = Color(0xFFC2E8FF)
+val md_theme_dark_secondary = Color(0xFFB5C9D7)
+val md_theme_dark_onSecondary = Color(0xFF20333D)
+val md_theme_dark_secondaryContainer = Color(0xFF364954)
+val md_theme_dark_onSecondaryContainer = Color(0xFFD1E5F3)
+val md_theme_dark_tertiary = Color(0xFFC9C2EA)
+val md_theme_dark_onTertiary = Color(0xFF312C4C)
+val md_theme_dark_tertiaryContainer = Color(0xFF474364)
+val md_theme_dark_onTertiaryContainer = Color(0xFFE5DEFF)
+val md_theme_dark_error = Color(0xFFFFB4AB)
+val md_theme_dark_errorContainer = Color(0xFF93000A)
+val md_theme_dark_onError = Color(0xFF690005)
+val md_theme_dark_onErrorContainer = Color(0xFFFFDAD6)
+val md_theme_dark_background = Color(0xFF191C1E)
+val md_theme_dark_onBackground = Color(0xFFE1E2E5)
+val md_theme_dark_surface = Color(0xFF191C1E)
+val md_theme_dark_onSurface = Color(0xFFE1E2E5)
+val md_theme_dark_surfaceVariant = Color(0xFF40484D)
+val md_theme_dark_onSurfaceVariant = Color(0xFFC0C7CD)
+val md_theme_dark_outline = Color(0xFF8A9297)
+val md_theme_dark_inverseOnSurface = Color(0xFF191C1E)
+val md_theme_dark_inverseSurface = Color(0xFFE1E2E5)
+val md_theme_dark_inversePrimary = Color(0xFF006688)
+val md_theme_dark_shadow = Color(0xFF000000)
+val md_theme_dark_surfaceTint = Color(0xFF75D1FF)
+val md_theme_dark_outlineVariant = Color(0xFF40484D)
+val md_theme_dark_scrim = Color(0xFF000000)
+
+
+val seed = Color(0xFF4FC3F7)
+
+val Gray50 = Color(0xFFF9FAFB)
+val Gray100 = Color(0xFFF3F4F6)
+val Gray200 = Color(0xFFE5E7EB)
+val Gray300 = Color(0xFFD1D5DB)
+val Gray400 = Color(0xFF9CA3AF)
+val Gray500 = Color(0xFF6B7280)
+val Gray600 = Color(0xFF4B5563)
+val Gray700 = Color(0xFF374151)
+val Gray800 = Color(0xFF1F2937)
+val Gray900 = Color(0xFF111827)
+val Red50 = Color(0xFFFEF2F2)
+val Red100 = Color(0xFFFEE2E2)
+val Red200 = Color(0xFFFECACA)
+val Red300 = Color(0xFFFCA5A5)
+val Red400 = Color(0xFFF87171)
+val Red500 = Color(0xFFEF4444)
+val Red600 = Color(0xFFDC2626)
+val Red700 = Color(0xFFB91C1C)
+val Red800 = Color(0xFF991B1B)
+val Red900 = Color(0xFF7F1D1D)
+val Yellow50 = Color(0xFFFFFBEB)
+val Yellow100 = Color(0xFFFEF3C7)
+val Yellow200 = Color(0xFFFDE68A)
+val Yellow300 = Color(0xFFFCD34D)
+val Yellow400 = Color(0xFFFBBF24)
+val Yellow500 = Color(0xFFF59E0B)
+val Yellow600 = Color(0xFFD97706)
+val Yellow700 = Color(0xFFB45309)
+val Yellow800 = Color(0xFF92400E)
+val Yellow900 = Color(0xFF78350F)
+val Green50 = Color(0xFFECFDF5)
+val Green100 = Color(0xFFD1FAE5)
+val Green200 = Color(0xFFA7F3D0)
+val Green300 = Color(0xFF6EE7B7)
+val Green400 = Color(0xFF34D399)
+val Green500 = Color(0xFF10B981)
+val Green600 = Color(0xFF059669)
+val Green700 = Color(0xFF047857)
+val Green800 = Color(0xFF065F46)
+val Green900 = Color(0xFF064E3B)
+val Blue50 = Color(0xFFEFF6FF)
+val Blue100 = Color(0xFFDBEAFE)
+val Blue200 = Color(0xFFBFDBFE)
+val Blue300 = Color(0xFF93C5FD)
+val Blue400 = Color(0xFF60A5FA)
+val Blue500 = Color(0xFF3B82F6)
+val Blue600 = Color(0xFF2563EB)
+val Blue700 = Color(0xFF1D4ED8)
+val Blue800 = Color(0xFF1E40AF)
+val Blue900 = Color(0xFF1E3A8A)
+val Indigo50 = Color(0xFFEEF2FF)
+val Indigo100 = Color(0xFFE0E7FF)
+val Indigo200 = Color(0xFFC7D2FE)
+val Indigo300 = Color(0xFFA5B4FC)
+val Indigo400 = Color(0xFF818CF8)
+val Indigo500 = Color(0xFF6366F1)
+val Indigo600 = Color(0xFF4F46E5)
+val Indigo700 = Color(0xFF4338CA)
+val Indigo800 = Color(0xFF3730A3)
+val Indigo900 = Color(0xFF312E81)
+val Purple50 = Color(0xFFF5F3FF)
+val Purple100 = Color(0xFFEDE9FE)
+val Purple200 = Color(0xFFDDD6FE)
+val Purple300 = Color(0xFFC4B5FD)
+val Purple400 = Color(0xFFA78BFA)
+val Purple500 = Color(0xFF8B5CF6)
+val Purple600 = Color(0xFF7C3AED)
+val Purple700 = Color(0xFF6D28D9)
+val Purple800 = Color(0xFF5B21B6)
+val Purple900 = Color(0xFF4C1D95)
+val Pink50 = Color(0xFFFDF2F8)
+val Pink100 = Color(0xFFFCE7F3)
+val Pink200 = Color(0xFFFBCFE8)
+val Pink300 = Color(0xFFF9A8D4)
+val Pink400 = Color(0xFFF472B6)
+val Pink500 = Color(0xFFEC4899)
+val Pink600 = Color(0xFFDB2777)
+val Pink700 = Color(0xFFBE185D)
+val Pink800 = Color(0xFF9D174D)
+val Pink900 = Color(0xFF831843)

app/src/main/java/xyz/quaver/pupil/ui/theme/Theme.kt

@@ -0,0 +1,90 @@
+package xyz.quaver.pupil.ui.theme
+
+import androidx.compose.foundation.isSystemInDarkTheme
+import androidx.compose.material3.MaterialTheme
+import androidx.compose.material3.lightColorScheme
+import androidx.compose.material3.darkColorScheme
+import androidx.compose.runtime.Composable
+
+
+private val LightColors = lightColorScheme(
+    primary = md_theme_light_primary,
+    onPrimary = md_theme_light_onPrimary,
+    primaryContainer = md_theme_light_primaryContainer,
+    onPrimaryContainer = md_theme_light_onPrimaryContainer,
+    secondary = md_theme_light_secondary,
+    onSecondary = md_theme_light_onSecondary,
+    secondaryContainer = md_theme_light_secondaryContainer,
+    onSecondaryContainer = md_theme_light_onSecondaryContainer,
+    tertiary = md_theme_light_tertiary,
+    onTertiary = md_theme_light_onTertiary,
+    tertiaryContainer = md_theme_light_tertiaryContainer,
+    onTertiaryContainer = md_theme_light_onTertiaryContainer,
+    error = md_theme_light_error,
+    errorContainer = md_theme_light_errorContainer,
+    onError = md_theme_light_onError,
+    onErrorContainer = md_theme_light_onErrorContainer,
+    background = md_theme_light_background,
+    onBackground = md_theme_light_onBackground,
+    surface = md_theme_light_surface,
+    onSurface = md_theme_light_onSurface,
+    surfaceVariant = md_theme_light_surfaceVariant,
+    onSurfaceVariant = md_theme_light_onSurfaceVariant,
+    outline = md_theme_light_outline,
+    inverseOnSurface = md_theme_light_inverseOnSurface,
+    inverseSurface = md_theme_light_inverseSurface,
+    inversePrimary = md_theme_light_inversePrimary,
+    surfaceTint = md_theme_light_surfaceTint,
+    outlineVariant = md_theme_light_outlineVariant,
+    scrim = md_theme_light_scrim,
+)
+
+
+private val DarkColors = darkColorScheme(
+    primary = md_theme_dark_primary,
+    onPrimary = md_theme_dark_onPrimary,
+    primaryContainer = md_theme_dark_primaryContainer,
+    onPrimaryContainer = md_theme_dark_onPrimaryContainer,
+    secondary = md_theme_dark_secondary,
+    onSecondary = md_theme_dark_onSecondary,
+    secondaryContainer = md_theme_dark_secondaryContainer,
+    onSecondaryContainer = md_theme_dark_onSecondaryContainer,
+    tertiary = md_theme_dark_tertiary,
+    onTertiary = md_theme_dark_onTertiary,
+    tertiaryContainer = md_theme_dark_tertiaryContainer,
+    onTertiaryContainer = md_theme_dark_onTertiaryContainer,
+    error = md_theme_dark_error,
+    errorContainer = md_theme_dark_errorContainer,
+    onError = md_theme_dark_onError,
+    onErrorContainer = md_theme_dark_onErrorContainer,
+    background = md_theme_dark_background,
+    onBackground = md_theme_dark_onBackground,
+    surface = md_theme_dark_surface,
+    onSurface = md_theme_dark_onSurface,
+    surfaceVariant = md_theme_dark_surfaceVariant,
+    onSurfaceVariant = md_theme_dark_onSurfaceVariant,
+    outline = md_theme_dark_outline,
+    inverseOnSurface = md_theme_dark_inverseOnSurface,
+    inverseSurface = md_theme_dark_inverseSurface,
+    inversePrimary = md_theme_dark_inversePrimary,
+    surfaceTint = md_theme_dark_surfaceTint,
+    outlineVariant = md_theme_dark_outlineVariant,
+    scrim = md_theme_dark_scrim,
+)
+
+@Composable
+fun AppTheme(
+  useDarkTheme: Boolean = isSystemInDarkTheme(),
+  content: @Composable() () -> Unit
+) {
+  val colors = if (!useDarkTheme) {
+    LightColors
+  } else {
+    DarkColors
+  }
+
+  MaterialTheme(
+    colorScheme = colors,
+    content = content
+  )
+}

app/src/main/java/xyz/quaver/pupil/ui/viewmodel/MainViewModel.kt

@@ -0,0 +1,86 @@
+package xyz.quaver.pupil.ui.viewmodel
+
+import android.util.Log
+import androidx.lifecycle.ViewModel
+import androidx.lifecycle.viewModelScope
+import kotlinx.coroutines.Job
+import kotlinx.coroutines.flow.MutableStateFlow
+import kotlinx.coroutines.flow.StateFlow
+import kotlinx.coroutines.launch
+import xyz.quaver.pupil.networking.GalleryInfo
+import xyz.quaver.pupil.networking.GallerySearchSource
+import xyz.quaver.pupil.networking.SearchQuery
+import kotlin.math.max
+import kotlin.math.min
+
+class MainViewModel : ViewModel() {
+    private val _uiState = MutableStateFlow(SearchState())
+    val searchState: StateFlow<SearchState> = _uiState
+    private var searchSource: GallerySearchSource = GallerySearchSource(null)
+    private var job: Job? = null
+
+    fun openGalleryDetails(galleryInfo: GalleryInfo) {
+        _uiState.value = _uiState.value.copy(
+            openedGallery = galleryInfo,
+            isDetailOnlyOpen = true
+        )
+    }
+
+    fun closeGalleryDetails() {
+        _uiState.value = _uiState.value.copy(
+            isDetailOnlyOpen = false
+        )
+    }
+
+    fun onQueryChange(query: SearchQuery?) {
+        _uiState.value = _uiState.value.copy(
+            query = query,
+            galleryCount = null,
+            currentRange = IntRange.EMPTY
+        )
+
+        searchSource = GallerySearchSource(query)
+    }
+
+    fun loadSearchResult(range: IntRange) {
+        Thread.dumpStack()
+        job?.cancel()
+        job = viewModelScope.launch {
+            val sanitizedRange = max(range.first, 0) .. min(range.last, searchState.value.galleryCount ?: Int.MAX_VALUE)
+            _uiState.value = _uiState.value.copy(
+                loading = true,
+                error = false,
+                currentRange = sanitizedRange
+            )
+
+            var error = false
+            val (galleries, galleryCount) = searchSource.load(range).getOrElse {
+                error = true
+                it.printStackTrace()
+                emptyList<GalleryInfo>() to 0
+            }
+
+            _uiState.value = _uiState.value.copy(
+                galleries = galleries,
+                galleryCount = galleryCount,
+                error = error,
+                loading = false
+            )
+        }
+    }
+
+    fun navigateToDetail() {
+
+    }
+}
+
+data class SearchState(
+    val query: SearchQuery? = null,
+    val galleries: List<GalleryInfo> = emptyList(),
+    val loading: Boolean = false,
+    val error: Boolean = false,
+    val galleryCount: Int? = null,
+    val currentRange: IntRange = IntRange.EMPTY,
+    val openedGallery: GalleryInfo? = null,
+    val isDetailOnlyOpen: Boolean = false
+)

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

@@ -1,39 +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.json.Json
-import kotlinx.serialization.json.JsonConfiguration
-import okhttp3.Dispatcher
-import okhttp3.OkHttpClient
-import xyz.quaver.proxy
-import java.util.concurrent.Executors
-import java.util.concurrent.TimeUnit
-
-const val REQUEST_LOCK = 38238
-const val REQUEST_RESTORE = 16546
-const val REQUEST_IMPORT_OLD_GALLERIES = 6458
-const val REQUEST_IMPORT_OLD_GALLERIES_OLD = 5946
-const val REQUEST_DOWNLOAD_FOLDER = 3874
-const val REQUEST_DOWNLOAD_FOLDER_OLD = 3425
-const val REQUEST_WRITE_PERMISSION_AND_SAF = 13900
-
-const val NOTIFICATION_ID_UPDATE = 2345
-
-val json = Json(JsonConfiguration.Stable)

app/src/main/java/xyz/quaver/pupil/util/ItemClickSupport.java

@@ -1,107 +0,0 @@
-package xyz.quaver.pupil.util;
-
-import android.view.View;
-import androidx.annotation.NonNull;
-import androidx.recyclerview.widget.RecyclerView;
-import xyz.quaver.pupil.R;
-
-/*
-  Source: http://www.littlerobots.nl/blog/Handle-Android-RecyclerView-Clicks/
-  USAGE:
-
-  ItemClickSupport.addTo(mRecyclerView).setOnItemClickListener(new ItemClickSupport.OnItemClickListener() {
-      @Override
-      public void onItemClicked(RecyclerView recyclerView, int position, View v) {
-          // do it
-      }
-  });
-
-*/
-public class ItemClickSupport {
-    private final RecyclerView mRecyclerView;
-    private OnItemClickListener mOnItemClickListener;
-    private OnItemLongClickListener mOnItemLongClickListener;
-    private View.OnClickListener mOnClickListener = new View.OnClickListener() {
-        @Override
-        public void onClick(View v) {
-            if (mOnItemClickListener != null) {
-                RecyclerView.ViewHolder holder = mRecyclerView.getChildViewHolder(v);
-                mOnItemClickListener.onItemClicked(mRecyclerView, holder.getAdapterPosition(), v);
-            }
-        }
-    };
-    private View.OnLongClickListener mOnLongClickListener = new View.OnLongClickListener() {
-        @Override
-        public boolean onLongClick(View v) {
-            if (mOnItemLongClickListener != null) {
-                RecyclerView.ViewHolder holder = mRecyclerView.getChildViewHolder(v);
-                return mOnItemLongClickListener.onItemLongClicked(mRecyclerView, holder.getAdapterPosition(), v);
-            }
-            return false;
-        }
-    };
-    private RecyclerView.OnChildAttachStateChangeListener mAttachListener
-            = new RecyclerView.OnChildAttachStateChangeListener() {
-        @Override
-        public void onChildViewAttachedToWindow(@NonNull View view) {
-            if (mOnItemClickListener != null) {
-                view.setOnClickListener(mOnClickListener);
-            }
-            if (mOnItemLongClickListener != null) {
-                view.setOnLongClickListener(mOnLongClickListener);
-            }
-        }
-
-        @Override
-        public void onChildViewDetachedFromWindow(@NonNull View view) {
-
-        }
-    };
-
-    private ItemClickSupport(RecyclerView recyclerView) {
-        mRecyclerView = recyclerView;
-        mRecyclerView.setTag(R.id.item_click_support, this);
-        mRecyclerView.addOnChildAttachStateChangeListener(mAttachListener);
-    }
-
-    public static ItemClickSupport addTo(RecyclerView view) {
-        ItemClickSupport support = (ItemClickSupport) view.getTag(R.id.item_click_support);
-        if (support == null) {
-            support = new ItemClickSupport(view);
-        }
-        return support;
-    }
-
-    public static ItemClickSupport removeFrom(RecyclerView view) {
-        ItemClickSupport support = (ItemClickSupport) view.getTag(R.id.item_click_support);
-        if (support != null) {
-            support.detach(view);
-        }
-        return support;
-    }
-
-    public ItemClickSupport setOnItemClickListener(OnItemClickListener listener) {
-        mOnItemClickListener = listener;
-        return this;
-    }
-
-    public ItemClickSupport setOnItemLongClickListener(OnItemLongClickListener listener) {
-        mOnItemLongClickListener = listener;
-        return this;
-    }
-
-    private void detach(RecyclerView view) {
-        view.removeOnChildAttachStateChangeListener(mAttachListener);
-        view.setTag(R.id.item_click_support, null);
-    }
-
-    public interface OnItemClickListener {
-
-        void onItemClicked(RecyclerView recyclerView, int position, View v);
-    }
-
-    public interface OnItemLongClickListener {
-
-        boolean onItemLongClicked(RecyclerView recyclerView, int position, View v);
-    }
-}

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
-        }
-    }
-}

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

@@ -1,311 +0,0 @@
-/*
- *     Pupil, Hitomi.la viewer for Android
- *     Copyright (C) 2020  tom5079
- *
- *     This program is free software: you can redistribute it and/or modify
- *     it under the terms of the GNU General Public License as published by
- *     the Free Software Foundation, either version 3 of the License, or
- *     (at your option) any later version.
- *
- *     This program is distributed in the hope that it will be useful,
- *     but WITHOUT ANY WARRANTY; without even the implied warranty of
- *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *     GNU General Public License for more details.
- *
- *     You should have received a copy of the GNU General Public License
- *     along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-package xyz.quaver.pupil.util.download
-
-import android.content.Context
-import android.content.ContextWrapper
-import android.util.Base64
-import android.util.SparseArray
-import androidx.preference.PreferenceManager
-import com.google.firebase.crashlytics.FirebaseCrashlytics
-import kotlinx.coroutines.*
-import xyz.quaver.Code
-import xyz.quaver.hitomi.GalleryBlock
-import xyz.quaver.hitomi.Reader
-import xyz.quaver.proxy
-import xyz.quaver.pupil.util.getCachedGallery
-import xyz.quaver.pupil.util.getDownloadDirectory
-import xyz.quaver.pupil.util.isParentOf
-import xyz.quaver.pupil.util.json
-import java.io.BufferedInputStream
-import java.io.File
-import java.io.FileOutputStream
-import java.io.InputStream
-import java.net.URL
-import java.util.*
-import java.util.concurrent.locks.Lock
-import java.util.concurrent.locks.ReentrantLock
-
-class Cache(context: Context) : ContextWrapper(context) {
-
-    companion object {
-        private val moving = mutableListOf<Int>()
-        private val readers = SparseArray<Reader?>()
-    }
-
-    private val locks = SparseArray<Lock>()
-    private fun lock(galleryID: Int) {
-        synchronized(locks) {
-            if (locks.indexOfKey(galleryID) < 0)
-                locks.put(galleryID, ReentrantLock())
-        }
-
-        locks[galleryID].lock()
-    }
-
-    private fun unlock(galleryID: Int) {
-        locks[galleryID]?.unlock()
-    }
-
-    private val preference = PreferenceManager.getDefaultSharedPreferences(this)
-
-    // Search in this order
-    // Download -> Cache
-    fun getCachedGallery(galleryID: Int) = getCachedGallery(this, galleryID).also {
-        if (!it.exists())
-            it.mkdirs()
-    }
-
-    fun getCachedMetadata(galleryID: Int) : Metadata? {
-        val file = File(getCachedGallery(galleryID), ".metadata")
-
-        if (!file.exists())
-            return null
-
-        return try {
-            json.parse(Metadata.serializer(), file.readText())
-        } catch (e: Exception) {
-            //File corrupted
-            file.delete()
-            null
-        }
-    }
-
-    fun setCachedMetadata(galleryID: Int, metadata: Metadata) {
-        if (preference.getBoolean("cache_disable", false))
-            return
-
-        val file = File(getCachedGallery(galleryID), ".metadata").also {
-            if (!it.exists())
-                it.createNewFile()
-        }
-
-        file.writeText(json.stringify(Metadata.serializer(), metadata))
-    }
-
-    suspend fun getThumbnail(galleryID: Int): String? {
-        val metadata = Cache(this).getCachedMetadata(galleryID)
-
-        @Suppress("BlockingMethodInNonBlockingContext")
-        val thumbnail = if (metadata?.thumbnail == null)
-            withContext(Dispatchers.IO) {
-                val thumbnails = getGalleryBlock(galleryID)?.thumbnails
-                try {
-                    Base64.encodeToString(URL(thumbnails?.firstOrNull()).openConnection(proxy).getInputStream().use {
-                        it.readBytes()
-                    }, Base64.DEFAULT)
-                } catch (e: Exception) {
-                    null
-                }
-            }
-        else
-            metadata.thumbnail
-
-        setCachedMetadata(
-            galleryID,
-            Metadata(Cache(this).getCachedMetadata(galleryID), thumbnail = thumbnail)
-        )
-
-        return thumbnail
-    }
-
-    suspend fun getGalleryBlock(galleryID: Int): GalleryBlock? {
-        val metadata = Cache(this).getCachedMetadata(galleryID)
-
-        val sources = listOf(
-            { xyz.quaver.hitomi.getGalleryBlock(galleryID) },
-            { xyz.quaver.hiyobi.getGalleryBlock(galleryID) }
-        )
-
-        val galleryBlock = if (metadata?.galleryBlock == null) {
-            CoroutineScope(Dispatchers.IO).async {
-                var galleryBlock: GalleryBlock? = null
-
-                for (source in sources) {
-                    galleryBlock = try {
-                        source.invoke()
-                    } catch (e: Exception) {
-                        null
-                    }
-
-                    if (galleryBlock != null)
-                        break
-                }
-
-                galleryBlock
-            }.await() ?: return null
-        }
-        else
-            metadata.galleryBlock
-
-        setCachedMetadata(
-            galleryID,
-            Metadata(Cache(this).getCachedMetadata(galleryID), galleryBlock = galleryBlock)
-        )
-
-        return galleryBlock
-    }
-
-    fun getReaderOrNull(galleryID: Int): Reader? {
-        return readers[galleryID] ?: getCachedMetadata(galleryID)?.reader
-    }
-
-    suspend fun getReader(galleryID: Int): Reader? {
-        val metadata = getCachedMetadata(galleryID)
-        val mirrors = preference.getString("mirrors", null)?.split('>') ?: listOf()
-
-        val sources = mapOf(
-            Code.HITOMI to { xyz.quaver.hitomi.getReader(galleryID) },
-            Code.HIYOBI to { xyz.quaver.hiyobi.getReader(galleryID) }
-        ).let {
-            if (mirrors.isNotEmpty())
-                it.toSortedMap(
-                    Comparator { o1, o2 ->
-                        mirrors.indexOf(o1.name) - mirrors.indexOf(o2.name)
-                    }
-                )
-            else
-                it
-        }
-
-        val reader =
-            if (readers[galleryID] != null)
-                return readers[galleryID]
-            else if (metadata?.reader == null) {
-                var retval: Reader? = null
-
-                for (source in sources) {
-                    retval = try {
-                        withContext(Dispatchers.IO) {
-                            withTimeoutOrNull(1000) {
-                                    source.value.invoke()
-                            }
-                        }
-                    } catch (e: Exception) {
-                        FirebaseCrashlytics.getInstance().recordException(e)
-                        null
-                    }
-
-                    if (retval != null)
-                        break
-                }
-
-                retval
-            } else
-                metadata.reader
-
-        readers.put(galleryID, reader)
-
-        setCachedMetadata(
-            galleryID,
-            Metadata(Cache(this).getCachedMetadata(galleryID), readers = reader)
-        )
-
-        return reader
-    }
-
-    val imageNameRegex = Regex("""^\d+\..+$""")
-    fun getImages(galleryID: Int): List<File?>? {
-        val gallery = getCachedGallery(galleryID)
-
-        return gallery.list { _, name ->
-            imageNameRegex.matches(name)
-        }?.map {
-            File(gallery, it)
-        }
-    }
-
-    val imageExtensions = listOf(
-        "png",
-        "jpg",
-        "webp",
-        "gif"
-    )
-    fun getImage(galleryID: Int, index: Int): File? {
-        val gallery = getCachedGallery(galleryID)
-
-        for (ext in imageExtensions) {
-            File(gallery, "%05d.$ext".format(index)).let {
-                if (it.exists())
-                    return it
-            }
-        }
-
-        return null
-    }
-
-
-    fun putImage(galleryID: Int, index: Int, ext: String, data: InputStream) {
-        if (preference.getBoolean("cache_disable", false))
-            return
-
-        val cache = File(getCachedGallery(galleryID), "%05d.$ext".format(index)).also {
-            if (!it.exists())
-                it.createNewFile()
-        }
-
-        try {
-            BufferedInputStream(data).use { inputStream ->
-                FileOutputStream(cache).use { outputStream ->
-                    inputStream.copyTo(outputStream)
-                }
-            }
-        } catch (e: Exception) {
-            cache.delete()
-        }
-    }
-
-    fun moveToDownload(galleryID: Int) {
-        if (preference.getBoolean("cache_disable", false))
-            return
-
-        if (moving.contains(galleryID))
-            return
-
-        CoroutineScope(Dispatchers.IO).launch {
-            val cache = getCachedGallery(galleryID).also {
-                if (!it.exists())
-                    return@launch
-            }
-            val download = File(getDownloadDirectory(this@Cache), galleryID.toString())
-
-            if (download.isParentOf(cache))
-                return@launch
-
-            FirebaseCrashlytics.getInstance().log("MOVING ${cache.canonicalPath} --> ${download.canonicalPath}")
-
-            cache.copyRecursively(download, true) { file, err ->
-                FirebaseCrashlytics.getInstance().log("MOVING ERROR ${file.canonicalPath} ${err.message}")
-                OnErrorAction.SKIP
-            }
-            FirebaseCrashlytics.getInstance().log("MOVED ${cache.canonicalPath}")
-
-            FirebaseCrashlytics.getInstance().log("DELETING ${cache.canonicalPath}")
-            cache.deleteRecursively()
-            FirebaseCrashlytics.getInstance().log("DELETED ${cache.canonicalPath}")
-        }
-    }
-
-    fun isDownloading(galleryID: Int) = getCachedMetadata(galleryID)?.isDownloading == true
-
-    fun setDownloading(galleryID: Int, isDownloading: Boolean) {
-        setCachedMetadata(galleryID, Metadata(getCachedMetadata(galleryID), isDownloading = isDownloading))
-    }
-
-}

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

@@ -1,393 +0,0 @@
-/*
- *     Pupil, Hitomi.la viewer for Android
- *     Copyright (C) 2020  tom5079
- *
- *     This program is free software: you can redistribute it and/or modify
- *     it under the terms of the GNU General Public License as published by
- *     the Free Software Foundation, either version 3 of the License, or
- *     (at your option) any later version.
- *
- *     This program is distributed in the hope that it will be useful,
- *     but WITHOUT ANY WARRANTY; without even the implied warranty of
- *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *     GNU General Public License for more details.
- *
- *     You should have received a copy of the GNU General Public License
- *     along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-package xyz.quaver.pupil.util.download
-
-import android.app.PendingIntent
-import android.content.Context
-import android.content.ContextWrapper
-import android.content.Intent
-import android.content.SharedPreferences
-import android.util.Log
-import android.util.SparseArray
-import androidx.core.app.NotificationCompat
-import androidx.core.app.NotificationManagerCompat
-import androidx.core.app.TaskStackBuilder
-import androidx.preference.PreferenceManager
-import com.google.firebase.crashlytics.FirebaseCrashlytics
-import kotlinx.coroutines.*
-import okhttp3.*
-import okio.*
-import xyz.quaver.Code
-import xyz.quaver.hitomi.Reader
-import xyz.quaver.hitomi.getReferer
-import xyz.quaver.hitomi.imageUrlFromImage
-import xyz.quaver.hiyobi.cookie
-import xyz.quaver.hiyobi.createImgList
-import xyz.quaver.hiyobi.user_agent
-import xyz.quaver.proxy
-import xyz.quaver.pupil.R
-import xyz.quaver.pupil.ui.ReaderActivity
-import java.io.File
-import java.io.IOException
-import java.util.concurrent.LinkedBlockingQueue
-import java.util.concurrent.TimeUnit
-
-@OptIn(ExperimentalCoroutinesApi::class)
-class DownloadWorker private constructor(context: Context) : ContextWrapper(context) {
-
-    private val preferences : SharedPreferences = PreferenceManager.getDefaultSharedPreferences(this)
-
-    //region ProgressListener
-    @Suppress("UNCHECKED_CAST")
-    private val progressListener = object: ProgressListener {
-        override fun update(tag: Any?, bytesRead: Long, contentLength: Long, done: Boolean) {
-            val (galleryID, index) = (tag as? Pair<Int, Int>) ?: return
-
-            if (!done && progress[galleryID]?.get(index)?.isFinite() == true)
-                progress[galleryID]?.set(index, bytesRead * 100F / contentLength)
-        }
-    }
-
-    interface ProgressListener {
-        fun update(tag: Any?, bytesRead : Long, contentLength: Long, done: Boolean)
-    }
-
-    class ProgressResponseBody(
-        val tag: Any?,
-        val responseBody: ResponseBody,
-        val progressListener : ProgressListener
-    ) : ResponseBody() {
-        private var bufferedSource : BufferedSource? = null
-
-        override fun contentLength() = responseBody.contentLength()
-        override fun contentType() = responseBody.contentType()
-
-        override fun source(): BufferedSource {
-            if (bufferedSource == null)
-                bufferedSource = Okio.buffer(source(responseBody.source()))
-
-            return bufferedSource!!
-        }
-
-        private fun source(source: Source) = object: ForwardingSource(source) {
-
-            var totalBytesRead = 0L
-
-            override fun read(sink: Buffer, byteCount: Long): Long {
-                val bytesRead = super.read(sink, byteCount)
-
-                totalBytesRead += if (bytesRead == -1L) 0L else bytesRead
-                progressListener.update(tag, totalBytesRead, responseBody.contentLength(), bytesRead == -1L)
-
-                return bytesRead
-            }
-
-        }
-    }
-    //endregion
-
-    //region Singleton
-    companion object {
-
-        @Volatile private var instance: DownloadWorker? = null
-
-        fun getInstance(context: Context) =
-            instance ?: synchronized(this) {
-                instance ?: DownloadWorker(context).also { instance = it }
-            }
-    }
-    //endregion
-
-    val notificationManager = NotificationManagerCompat.from(context)
-
-    val queue = LinkedBlockingQueue<Int>()
-
-    /*
-    * KEY
-    *  primary galleryID
-    *  secondary index
-    * PRIMARY VALUE
-    *  MutableList -> Download in progress
-    *  null -> Loading / Gallery doesn't exist
-    * SECONDARY VALUE
-    *  0 <= value < 100 -> Download in progress
-    *  Float.POSITIVE_INFINITY -> Download completed
-    */
-    val progress = SparseArray<MutableList<Float>?>()
-    val notification = SparseArray<NotificationCompat.Builder?>()
-
-    private val loop = loop()
-    private val worker = SparseArray<Job?>()
-
-    val interceptor = Interceptor { chain ->
-        val request = chain.request()
-        var response = chain.proceed(request)
-
-        var retry = 5
-        while (!response.isSuccessful && retry > 0) {
-            response = chain.proceed(request)
-            retry--
-        }
-
-        response.newBuilder()
-            .body(response.body()?.let {
-                ProgressResponseBody(request.tag(), it, progressListener)
-            }).build()
-    }
-
-    val client =
-        OkHttpClient.Builder()
-            .connectTimeout(0, TimeUnit.SECONDS)
-            .addInterceptor(interceptor)
-            .readTimeout(0, TimeUnit.SECONDS)
-            .dispatcher(Dispatcher().apply {
-                maxRequests = 4
-                maxRequestsPerHost = 4
-            })
-            .proxy(proxy)
-            .build()
-
-    fun stop() {
-        queue.clear()
-
-        loop.cancel()
-        for (i in 0 until worker.size()) {
-            val galleryID = worker.keyAt(i)
-
-            Cache(this@DownloadWorker).setDownloading(galleryID, false)
-            worker[galleryID]?.cancel()
-        }
-
-        client.dispatcher().queuedCalls().filter {
-            it.request().tag() is Pair<*, *>
-        }.forEach {
-            it.cancel()
-        }
-
-        progress.clear()
-        notification.clear()
-        notificationManager.cancelAll()
-    }
-
-    fun cancel(galleryID: Int) {
-        queue.remove(galleryID)
-        worker[galleryID]?.cancel()
-
-        client.dispatcher().queuedCalls().filter {
-            ((it.request().tag() as Pair<*, *>).first as Int) == galleryID
-        }.forEach {
-            it.cancel()
-        }
-
-        progress.remove(galleryID)
-        notification.remove(galleryID)
-        notificationManager.cancel(galleryID)
-    }
-
-    fun isCompleted(galleryID: Int) = progress[galleryID]?.all { it.isInfinite() } == true
-
-    private fun queueDownload(galleryID: Int, reader: Reader, index: Int, callback: Callback) {
-        val lowQuality = preferences.getBoolean("low_quality", false)
-
-        val request = Request.Builder().apply {
-            when (reader.code) {
-                Code.HITOMI -> {
-                    url(
-                        imageUrlFromImage(
-                            galleryID,
-                            reader.galleryInfo.files[index],
-                            !lowQuality
-                        )
-                    )
-                    addHeader("Referer", getReferer(galleryID))
-                }
-                Code.HIYOBI -> {
-                    url(createImgList(galleryID, reader, lowQuality)[index].path)
-                    addHeader("User-Agent", user_agent)
-                    addHeader("Cookie", cookie)
-                }
-                else -> {
-                    //shouldn't be called anyway
-                }
-            }
-            tag(galleryID to index)
-        }.build()
-
-        client.newCall(request).enqueue(callback)
-    }
-
-    private fun download(galleryID: Int) = CoroutineScope(Dispatchers.IO).launch {
-        val reader = Cache(this@DownloadWorker).getReader(galleryID)
-
-        //gallery doesn't exist
-        if (reader == null) {
-            progress.put(galleryID, null)
-
-            Cache(this@DownloadWorker).setDownloading(galleryID, false)
-            return@launch
-        }
-
-        val cache = Cache(this@DownloadWorker).getImages(galleryID)
-
-        progress.put(galleryID, reader.galleryInfo.files.indices.map { index ->
-            if (cache?.firstOrNull { it?.nameWithoutExtension?.toIntOrNull()  == index } != null)
-                Float.POSITIVE_INFINITY
-            else
-                0F
-        }.toMutableList())
-
-        if (notification[galleryID] == null)
-            initNotification(galleryID)
-
-        notification[galleryID]?.setContentTitle(reader.galleryInfo.title)
-        notify(galleryID)
-
-        if (isCompleted(galleryID)) {
-            with(Cache(this@DownloadWorker)) {
-                if (isDownloading(galleryID)) {
-                    moveToDownload(galleryID)
-                    setDownloading(galleryID, false)
-                }
-            }
-
-            return@launch
-        }
-
-        for (i in reader.galleryInfo.files.indices) {
-            val callback = object : Callback {
-                override fun onFailure(call: Call, e: IOException) {
-                    if (e.message?.contains("cancel", true) != false)
-                        return
-
-                    Log.i("PUPILD", "FAIL ${call.request().tag()} (${e.message})")
-                    FirebaseCrashlytics.getInstance().apply {
-                        log("FAIL ${call.request().tag()} (${e.message})")
-                        setCustomKey("POS", "FAIL")
-                        recordException(e)
-                    }
-
-                    cancel(galleryID)
-                    queue.add(galleryID)
-                }
-
-                override fun onResponse(call: Call, response: Response) {
-                    val ext = call.request().url().encodedPath().split('.').last()
-
-                    try {
-                        response.body().use {
-                            Cache(this@DownloadWorker).putImage(galleryID, i, ext, it!!.byteStream())
-                        }
-                        progress[galleryID]?.set(i, Float.POSITIVE_INFINITY)
-
-                        notify(galleryID)
-
-                        CoroutineScope(Dispatchers.IO).launch {
-                            if (isCompleted(galleryID)) {
-                                with(Cache(this@DownloadWorker)) {
-                                    if (isDownloading(galleryID)) {
-                                        moveToDownload(galleryID)
-                                        setDownloading(galleryID, false)
-                                    }
-                                }
-                            }
-                        }
-                    } catch (e: Exception) {
-                        FirebaseCrashlytics.getInstance().apply {
-                            log("FAIL ON OK ${call.request().tag()} (${e.message})")
-                            setCustomKey("POS", "FAIL ON OK")
-                            recordException(e)
-                        }
-
-                        File(Cache(this@DownloadWorker).getCachedGallery(galleryID), "%05d.$ext".format(i)).delete()
-
-                        cancel(galleryID)
-                        queue.add(galleryID)
-                    }
-                }
-            }
-
-            if (progress[galleryID]?.get(i)?.isFinite() == true)
-                queueDownload(galleryID, reader, i, callback)
-        }
-    }
-
-    private fun notify(galleryID: Int) {
-        val max = progress[galleryID]?.size ?: 0
-        val progress = progress[galleryID]?.count { it.isInfinite() } ?: 0
-
-        if (isCompleted(galleryID)) {
-            notification[galleryID]
-                ?.setContentText(getString(R.string.reader_notification_complete))
-                ?.setSmallIcon(android.R.drawable.stat_sys_download_done)
-                ?.setProgress(0, 0, false)
-                ?.setOngoing(false)
-
-            notificationManager.cancel(galleryID)
-        } else
-            notification[galleryID]
-                ?.setProgress(max, progress, false)
-                ?.setContentText("$progress/$max")
-
-        if (Cache(this).isDownloading(galleryID) && notification[galleryID] != null)
-            notification[galleryID]?.let { notificationManager.notify(galleryID, it.build()) }
-        else
-            notificationManager.cancel(galleryID)
-    }
-
-    private fun initNotification(galleryID: Int) {
-        val intent = Intent(this, ReaderActivity::class.java).apply {
-            putExtra("galleryID", galleryID)
-        }
-        val pendingIntent = TaskStackBuilder.create(this).run {
-            addNextIntentWithParentStack(intent)
-            getPendingIntent(galleryID, PendingIntent.FLAG_UPDATE_CURRENT)
-        }
-
-        notification.put(galleryID, NotificationCompat.Builder(this, "download").apply {
-            setContentTitle(getString(R.string.reader_loading))
-            setContentText(getString(R.string.reader_notification_text))
-            setSmallIcon(android.R.drawable.stat_sys_download)                                  // had to use this because old android doesn't support VectorDrawable on Notification :P
-            setContentIntent(pendingIntent)
-            setProgress(0, 0, true)
-            setOngoing(true)
-        })
-    }
-
-    private fun loop() = CoroutineScope(Dispatchers.Default).launch {
-        while (true) {
-            if (queue.isEmpty())
-                continue
-
-            val galleryID = queue.peek() ?: continue
-
-            if (progress.indexOfKey(galleryID) >= 0)    // Gallery already downloading!
-                cancel(galleryID)
-
-            if (notification[galleryID] == null)
-                initNotification(galleryID)
-
-            if (Cache(this@DownloadWorker).isDownloading(galleryID))
-                notification[galleryID]?.let { notificationManager.notify(galleryID, it.build()) }
-
-            worker.put(galleryID, download(galleryID))
-            queue.poll()
-        }
-    }
-
-}

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

@@ -1,44 +0,0 @@
-/*
- *     Pupil, Hitomi.la viewer for Android
- *     Copyright (C) 2020  tom5079
- *
- *     This program is free software: you can redistribute it and/or modify
- *     it under the terms of the GNU General Public License as published by
- *     the Free Software Foundation, either version 3 of the License, or
- *     (at your option) any later version.
- *
- *     This program is distributed in the hope that it will be useful,
- *     but WITHOUT ANY WARRANTY; without even the implied warranty of
- *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *     GNU General Public License for more details.
- *
- *     You should have received a copy of the GNU General Public License
- *     along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-package xyz.quaver.pupil.util.download
-
-import kotlinx.serialization.Serializable
-import xyz.quaver.hitomi.GalleryBlock
-import xyz.quaver.hitomi.Reader
-
-@Serializable
-data class Metadata(
-    val thumbnail: String? = null,
-    val galleryBlock: GalleryBlock? = null,
-    val reader: Reader? = null,
-    val isDownloading: Boolean? = null
-) {
-    constructor(
-        metadata: Metadata?,
-        thumbnail: String? = null,
-        galleryBlock: GalleryBlock? = null,
-        readers: Reader? = null,
-        isDownloading: Boolean? = null
-    ) : this(
-        thumbnail ?: metadata?.thumbnail,
-        galleryBlock ?: metadata?.galleryBlock,
-        readers ?: metadata?.reader,
-        isDownloading ?: metadata?.isDownloading
-    )
-}

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

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

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

@@ -1,96 +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 kotlinx.serialization.KSerializer
-import kotlinx.serialization.builtins.list
-import kotlinx.serialization.builtins.serializer
-import java.io.File
-
-class Histories(private val file: File) : ArrayList<Int>() {
-
-    val serializer: KSerializer<List<Int>> = Int.serializer().list
-
-    init {
-        if (!file.exists())
-            file.parentFile?.mkdirs()
-
-        try {
-            load()
-        } catch (e: Exception) {
-            save()
-        }
-    }
-
-    fun load() : Histories {
-        return apply {
-            super.clear()
-            super.addAll(
-                json.parse(
-                    serializer,
-                    file.bufferedReader().use { it.readText() }
-                )
-            )
-        }
-    }
-
-    fun save() {
-        file.writeText(json.stringify(serializer, this))
-    }
-
-    override fun add(element: Int): Boolean {
-        load()
-
-        if (contains(element))
-            super.remove(element)
-
-        super.add(0, element)
-
-        save()
-
-        return true
-    }
-
-    override fun addAll(elements: Collection<Int>): Boolean {
-        load()
-
-        for (e in elements) {
-            if (contains(e))
-                super.remove(e)
-            super.add(0, e)
-        }
-
-        save()
-
-        return true
-    }
-
-    override fun remove(element: Int): Boolean {
-        load()
-        val retval = super.remove(element)
-        save()
-
-        return retval
-    }
-
-    override fun clear() {
-        super.clear()
-        save()
-    }
-}

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

@@ -1,122 +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.builtins.list
-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)
-}
-
-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 = ArrayList(json.parse(Lock.serializer().list, lock.readText()))
-    }
-
-    private fun save() {
-        val lock = File(ContextCompat.getDataDir(this), "lock.json")
-
-        if (!lock.exists())
-            lock.createNewFile()
-
-        lock.writeText(json.stringify(Lock.serializer().list, 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
-    }
-
-}

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

@@ -1,54 +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 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(" ")
-}
-
-fun byteToString(byte: Long, precision : Int = 1) : String {
-
-    val suffix = listOf(
-        "B",
-        "kB",
-        "MB",
-        "GB",
-        "TB" //really?
-    )
-    var size = byte.toDouble(); var suffixIndex = 0
-
-    while (size >= 1024) {
-        size /= 1024
-        suffixIndex++
-    }
-
-    return "%.${precision}f ${suffix[suffixIndex]}".format(size)
-
-}

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

@@ -1,63 +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 androidx.preference.PreferenceManager
-import kotlinx.serialization.Serializable
-import okhttp3.Authenticator
-import okhttp3.Credentials
-import java.net.InetSocketAddress
-import java.net.Proxy
-
-@Serializable
-data class ProxyInfo(
-    val type: Proxy.Type,
-    val host: String? = null,
-    val port: Int? = null,
-    val username: String? = null,
-    val password: String? = null
-) {
-    fun proxy() : Proxy {
-        return if (host == null || port == null)
-            return Proxy.NO_PROXY
-        else
-            Proxy(type, InetSocketAddress.createUnresolved(host, port))
-    }
-
-    fun authenticator() = Authenticator { _, response ->
-        val credential = Credentials.basic(username ?: "", password ?: "")
-
-        response.request().newBuilder()
-            .header("Proxy-Authorization", credential)
-            .build()
-    }
-
-}
-
-fun getProxy(context: Context) =
-    getProxyInfo(context).proxy()
-
-fun getProxyInfo(context: Context) =
-    PreferenceManager.getDefaultSharedPreferences(context).getString("proxy", null).let {
-        if (it == null)
-            ProxyInfo(Proxy.Type.DIRECT)
-        else
-            json.parse(ProxyInfo.serializer(), it)
-    }

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

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

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

@@ -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" />

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" />

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>