Merge pull request #72 from tom5079/dev

Modified proguard rules to fix error occurs on Android 4

.gitignore

@@ -14,3 +14,6 @@
 
 #Github pages
 /gh-pages
+
+#Private files
+**/google-services.json

.idea/codeStyles/Project.xml

@@ -1,18 +1,10 @@
 <component name="ProjectCodeStyleConfiguration">
   <code_scheme name="Project" version="173">
-    <AndroidXmlCodeStyleSettings>
-      <option name="USE_CUSTOM_SETTINGS" value="true" />
-    </AndroidXmlCodeStyleSettings>
+    <option name="RIGHT_MARGIN" value="120" />
     <JetCodeStyleSettings>
       <option name="CODE_STYLE_DEFAULTS" value="KOTLIN_OFFICIAL" />
     </JetCodeStyleSettings>
-    <XML>
-      <option name="XML_KEEP_LINE_BREAKS" value="false" />
-      <option name="XML_ALIGN_ATTRIBUTES" value="false" />
-      <option name="XML_SPACE_INSIDE_EMPTY_TAG" value="true" />
-    </XML>
     <codeStyleSettings language="XML">
-      <option name="FORCE_REARRANGE_MODE" value="1" />
       <indentOptions>
         <option name="CONTINUATION_INDENT_SIZE" value="4" />
       </indentOptions>
@@ -23,6 +15,7 @@
               <match>
                 <AND>
                   <NAME>xmlns:android</NAME>
+                  <XML_ATTRIBUTE />
                   <XML_NAMESPACE>^$</XML_NAMESPACE>
                 </AND>
               </match>
@@ -33,6 +26,7 @@
               <match>
                 <AND>
                   <NAME>xmlns:.*</NAME>
+                  <XML_ATTRIBUTE />
                   <XML_NAMESPACE>^$</XML_NAMESPACE>
                 </AND>
               </match>
@@ -44,6 +38,7 @@
               <match>
                 <AND>
                   <NAME>.*:id</NAME>
+                  <XML_ATTRIBUTE />
                   <XML_NAMESPACE>http://schemas.android.com/apk/res/android</XML_NAMESPACE>
                 </AND>
               </match>
@@ -54,6 +49,7 @@
               <match>
                 <AND>
                   <NAME>.*:name</NAME>
+                  <XML_ATTRIBUTE />
                   <XML_NAMESPACE>http://schemas.android.com/apk/res/android</XML_NAMESPACE>
                 </AND>
               </match>
@@ -64,6 +60,7 @@
               <match>
                 <AND>
                   <NAME>name</NAME>
+                  <XML_ATTRIBUTE />
                   <XML_NAMESPACE>^$</XML_NAMESPACE>
                 </AND>
               </match>
@@ -74,6 +71,7 @@
               <match>
                 <AND>
                   <NAME>style</NAME>
+                  <XML_ATTRIBUTE />
                   <XML_NAMESPACE>^$</XML_NAMESPACE>
                 </AND>
               </match>
@@ -84,6 +82,7 @@
               <match>
                 <AND>
                   <NAME>.*</NAME>
+                  <XML_ATTRIBUTE />
                   <XML_NAMESPACE>^$</XML_NAMESPACE>
                 </AND>
               </match>
@@ -95,6 +94,7 @@
               <match>
                 <AND>
                   <NAME>.*</NAME>
+                  <XML_ATTRIBUTE />
                   <XML_NAMESPACE>http://schemas.android.com/apk/res/android</XML_NAMESPACE>
                 </AND>
               </match>
@@ -106,6 +106,7 @@
               <match>
                 <AND>
                   <NAME>.*</NAME>
+                  <XML_ATTRIBUTE />
                   <XML_NAMESPACE>.*</XML_NAMESPACE>
                 </AND>
               </match>

.idea/copyright/Apache.xml

@@ -0,0 +1,6 @@
+<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

@@ -0,0 +1,6 @@
+<component name="CopyrightManager">
+  <copyright>
+    <option name="notice" value="    Pupil, Hitomi.la viewer for Android&#10;    Copyright (C) &amp;#36;today.year  tom5079&#10;&#10;    This program is free software: you can redistribute it and/or modify&#10;    it under the terms of the GNU General Public License as published by&#10;    the Free Software Foundation, either version 3 of the License, or&#10;    (at your option) any later version.&#10;&#10;    This program is distributed in the hope that it will be useful,&#10;    but WITHOUT ANY WARRANTY; without even the implied warranty of&#10;    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the&#10;    GNU General Public License for more details.&#10;&#10;    You should have received a copy of the GNU General Public License&#10;    along with this program.  If not, see &lt;http://www.gnu.org/licenses/&gt;." />
+    <option name="myName" value="GPL" />
+  </copyright>
+</component>

.idea/copyright/profiles_settings.xml

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

.idea/gradle.xml

@@ -1,8 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
+  <component name="GradleMigrationSettings" migrationVersion="1" />
   <component name="GradleSettings">
     <option name="linkedExternalProjectsSettings">
       <GradleProjectSettings>
+        <option name="delegatedBuild" value="false" />
+        <option name="testRunner" value="PLATFORM" />
         <option name="distributionType" value="DEFAULT_WRAPPED" />
         <option name="externalProjectPath" value="$PROJECT_DIR$" />
         <option name="modules">
@@ -13,7 +16,6 @@
           </set>
         </option>
         <option name="resolveModulePerSourceSet" value="false" />
-        <option name="useQualifiedModuleNames" value="true" />
       </GradleProjectSettings>
     </option>
   </component>

.idea/inspectionProfiles/Project_Default.xml

@@ -1,10 +0,0 @@
-<component name="InspectionProjectProfileManager">
-  <profile version="1.0">
-    <option name="myName" value="Project Default" />
-    <inspection_tool class="SpellCheckingInspection" enabled="false" level="TYPO" enabled_by_default="false">
-      <option name="processCode" value="true" />
-      <option name="processLiterals" value="true" />
-      <option name="processComments" value="true" />
-    </inspection_tool>
-  </profile>
-</component>

.idea/kotlinCodeInsightSettings.xml

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

.idea/kotlinc.xml

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

.idea/misc.xml

@@ -1,6 +1,9 @@
 <?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$/classes" />
+    <output url="file://$PROJECT_DIR$/build/classes" />
+  </component>
+  <component name="ProjectType">
+    <option name="id" value="Android" />
   </component>
 </project>

.idea/scopes/Pupil.xml

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

.idea/scopes/libpupil.xml

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

.idea/vcs.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="VcsDirectoryMappings">
-    <mapping directory="$PROJECT_DIR$" vcs="Git" />
+    <mapping directory="" vcs="Git" />
   </component>
 </project>

README.md

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

app/build.gradle

@@ -1,10 +1,17 @@
 apply plugin: 'com.android.application'
 apply plugin: 'kotlin-android'
+apply plugin: 'kotlin-kapt'
 apply plugin: 'kotlin-android-extensions'
 apply plugin: 'kotlinx-serialization'
-apply plugin: 'com.google.gms.google-services'
-apply plugin: 'io.fabric'
-apply plugin: 'com.google.firebase.firebase-perf'
+
+if (file("google-services.json").exists() && file("src/debug/google-services.json").exists()) {
+    logger.lifecycle("Firebase Enabled")
+    apply plugin: 'com.google.gms.google-services'
+    apply plugin: 'io.fabric'
+    apply plugin: 'com.google.firebase.firebase-perf'
+} else {
+    logger.lifecycle("Firebase Disabled")
+}
 
 android {
     compileSdkVersion 29
@@ -12,21 +19,37 @@ android {
         applicationId "xyz.quaver.pupil"
         minSdkVersion 16
         targetSdkVersion 29
-        versionCode 20
-        versionName "2.11.1"
+        versionCode 48
+        versionName "4.12"
         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 {
-            minifyEnabled false
+            minifyEnabled true
+            shrinkResources true
+
+            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.2'
 }
 
 dependencies {
@@ -35,26 +58,33 @@ dependencies {
     implementation fileTree(dir: 'libs', include: ['*.jar'])
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version"
     implementation "org.jetbrains.kotlin:kotlin-reflect:$kotlin_version"
-    implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-core:1.2.1'
-    implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-android:1.2.1'
-    implementation "org.jetbrains.kotlinx:kotlinx-serialization-runtime:0.11.0"
-    implementation 'androidx.appcompat:appcompat:1.0.2'
+    implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-core:1.3.3'
+    implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-android:1.3.3'
+    implementation "org.jetbrains.kotlinx:kotlinx-serialization-runtime:0.14.0"
+    implementation 'androidx.appcompat:appcompat:1.1.0'
     implementation 'androidx.constraintlayout:constraintlayout:1.1.3'
-    implementation 'androidx.preference:preference:1.1.0-beta01'
-    implementation 'androidx.constraintlayout:constraintlayout:1.1.3'
-    implementation 'androidx.lifecycle:lifecycle-extensions:2.0.0'
-    implementation 'androidx.lifecycle:lifecycle-viewmodel-ktx:2.0.0'
-    implementation 'androidx.legacy:legacy-support-v4:1.0.0'
-    implementation 'com.android.support:multidex:1.0.3'
-    implementation 'com.google.android.material:material:1.0.0'
-    implementation 'com.google.firebase:firebase-core:17.0.0'
-    implementation 'com.google.firebase:firebase-perf:18.0.1'
+    implementation 'androidx.preference:preference:1.1.0'
+    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.2.0-alpha05'
+    implementation 'com.google.firebase:firebase-core:17.2.2'
+    implementation 'com.google.firebase:firebase-perf:19.0.5'
     implementation 'com.crashlytics.sdk.android:crashlytics:2.10.1'
     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'
+    annotationProcessor 'com.github.bumptech.glide:compiler:4.11.0'
+    kapt 'com.github.bumptech.glide:compiler:4.11.0'
+    implementation ("com.github.bumptech.glide:recyclerview-integration:4.11.0") {
+        transitive = false
+    }
+    implementation 'net.rdrei.android.dirchooser:library:3.2@aar'
+    implementation 'com.github.chrisbanes:PhotoView:2.3.0'
     implementation 'com.andrognito.patternlockview:patternlockview:1.0.0'
     implementation "ru.noties.markwon:core:${markwonVersion}"
-    testImplementation 'junit:junit:4.12'
+    testImplementation 'junit:junit:4.13'
     androidTestImplementation 'androidx.test.ext:junit:1.1.1'
     androidTestImplementation 'androidx.test:rules:1.2.0'
     androidTestImplementation 'androidx.test:runner:1.2.0'

app/proguard-rules.pro

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

app/release/output.json

@@ -1 +1 @@
-[{"outputType":{"type":"APK"},"apkData":{"type":"MAIN","splits":[],"versionCode":20,"versionName":"2.11.1","enabled":true,"outputFile":"app-release.apk","fullName":"release","baseName":"release"},"path":"app-release.apk","properties":{}}]
+[{"outputType":{"type":"APK"},"apkData":{"type":"MAIN","splits":[],"versionCode":48,"versionName":"4.12","enabled":true,"outputFile":"app-release.apk","fullName":"release","baseName":"release","dirName":""},"path":"app-release.apk","properties":{}}]

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

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

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

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

app/src/main/AndroidManifest.xml

@@ -1,9 +1,14 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
     package="xyz.quaver.pupil">
 
     <uses-permission android:name="android.permission.INTERNET" />
-    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
+    <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"/>
+
 
     <application
         android:name=".Pupil"
@@ -13,8 +18,23 @@
         android:label="@string/app_name"
         android:roundIcon="@mipmap/ic_launcher_round"
         android:supportsRtl="true"
-        android:theme="@style/AppTheme">
-        <activity android:name=".ui.LockActivity"/>
+        android:theme="@style/AppTheme"
+        tools:replace="android:theme"
+        android:requestLegacyExternalStorage="true">
+
+        <provider
+            android:authorities="${applicationId}.provider"
+            android:name="androidx.core.content.FileProvider"
+            android:exported="false"
+            android:grantUriPermissions="true">
+
+            <meta-data
+                android:name="android.support.FILE_PROVIDER_PATHS"
+                android:resource="@xml/file_paths" />
+
+        </provider>
+
+        <activity android:name=".ui.LockActivity" />
         <activity
             android:name=".ui.ReaderActivity"
             android:configChanges="keyboardHidden|orientation|screenSize"
@@ -37,18 +57,7 @@
                 <category android:name="android.intent.category.BROWSABLE" />
 
                 <data
-                    android:host="히요비.asia"
-                    android:pathPrefix="/reader"
-                    android:scheme="https" />
-            </intent-filter>
-            <intent-filter>
-                <action android:name="android.intent.action.VIEW" />
-
-                <category android:name="android.intent.category.DEFAULT" />
-                <category android:name="android.intent.category.BROWSABLE" />
-
-                <data
-                    android:host="xn--9w3b15m8vo.asia"
+                    android:host="hiyobi.me"
                     android:pathPrefix="/reader"
                     android:scheme="https" />
             </intent-filter>
@@ -81,20 +90,9 @@
                 <category android:name="android.intent.category.BROWSABLE" />
 
                 <data
-                    android:host="히요비.asia"
-                    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="xn--9w3b15m8vo.asia"
-                    android:pathPrefix="/reader"
-                    android:scheme="http" />
+                    android:host="hiyobi.me"
+                    android:scheme="http"
+                    android:pathPrefix="/reader" />
             </intent-filter>
             <intent-filter>
                 <action android:name="android.intent.action.VIEW" />
@@ -122,6 +120,7 @@
                 <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
         </activity>
+        <activity android:name="net.rdrei.android.dirchooser.DirectoryChooserActivity" />
     </application>
 
 </manifest>

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

@@ -1,3 +1,21 @@
+/*
+ *     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
 
 import android.app.Notification
@@ -12,13 +30,15 @@ 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 xyz.quaver.proxy
 import xyz.quaver.pupil.util.Histories
+import xyz.quaver.pupil.util.getProxy
 import java.io.File
 
 class Pupil : MultiDexApplication() {
 
     lateinit var histories: Histories
-    lateinit var downloads: Histories
     lateinit var favorites: Histories
 
     init {
@@ -28,10 +48,20 @@ class Pupil : MultiDexApplication() {
     override fun onCreate() {
         val preference = PreferenceManager.getDefaultSharedPreferences(this)
 
+        proxy = getProxy(this)
+
+        try {
+            preference.getString("dl_location", null)
+        } catch (e: Exception) {
+            preference.edit().remove("dl_location").apply()
+        }
+
         histories = Histories(File(ContextCompat.getDataDir(this), "histories.json"))
-        downloads = Histories(File(ContextCompat.getDataDir(this), "downloads.json"))
         favorites = Histories(File(ContextCompat.getDataDir(this), "favorites.json"))
 
+        if (BuildConfig.DEBUG)
+            FirebaseAnalytics.getInstance(this).setAnalyticsCollectionEnabled(false)
+
         try {
             ProviderInstaller.installIfNeeded(this)
         } catch (e: GooglePlayServicesRepairableException) {
@@ -40,21 +70,23 @@ class Pupil : MultiDexApplication() {
             e.printStackTrace()
         }
 
-        if (!preference.getBoolean("channel_created", false)) {
-            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
-                val manager = getSystemService(Context.NOTIFICATION_SERVICE) as NotificationManager
-                val channel = NotificationChannel("download", getString(R.string.channel_download), NotificationManager.IMPORTANCE_LOW).apply {
-                    description = getString(R.string.channel_download_description)
-                    enableLights(false)
-                    enableVibration(false)
-                    lockscreenVisibility = Notification.VISIBILITY_SECRET
-                }
-                manager.createNotificationChannel(channel)
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
+            val manager = getSystemService(Context.NOTIFICATION_SERVICE) as NotificationManager
+            val channel = NotificationChannel("download", getString(R.string.channel_download), NotificationManager.IMPORTANCE_MIN).apply {
+                description = getString(R.string.channel_download_description)
+                enableLights(false)
+                enableVibration(false)
+                lockscreenVisibility = Notification.VISIBILITY_SECRET
             }
-
-            preference.edit().putBoolean("channel_created", true).apply()
+            manager.createNotificationChannel(channel)
         }
 
+        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/adapters/GalleryBlockAdapter.kt

@@ -1,43 +1,60 @@
+/*
+ *     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.AlertDialog
-import android.graphics.BitmapFactory
+import android.content.Context
 import android.graphics.drawable.Drawable
-import android.util.Log
+import android.util.Base64
 import android.util.SparseBooleanArray
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
-import android.widget.ArrayAdapter
 import android.widget.LinearLayout
 import androidx.cardview.widget.CardView
 import androidx.core.content.ContextCompat
 import androidx.recyclerview.widget.RecyclerView
+import androidx.swiperefreshlayout.widget.CircularProgressDrawable
 import androidx.vectordrawable.graphics.drawable.Animatable2Compat
 import androidx.vectordrawable.graphics.drawable.AnimatedVectorDrawableCompat
+import com.bumptech.glide.Glide
+import com.bumptech.glide.load.engine.DiskCacheStrategy
+import com.daimajia.swipe.SwipeLayout
+import com.daimajia.swipe.adapters.RecyclerSwipeAdapter
+import com.daimajia.swipe.interfaces.SwipeAdapterInterface
 import com.google.android.material.chip.Chip
 import kotlinx.android.synthetic.main.item_galleryblock.view.*
 import kotlinx.coroutines.CoroutineScope
-import kotlinx.coroutines.Deferred
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
-import kotlinx.serialization.json.Json
-import kotlinx.serialization.json.JsonConfiguration
-import kotlinx.serialization.list
 import xyz.quaver.hitomi.GalleryBlock
-import xyz.quaver.hitomi.ReaderItem
+import xyz.quaver.pupil.BuildConfig
 import xyz.quaver.pupil.Pupil
 import xyz.quaver.pupil.R
 import xyz.quaver.pupil.types.Tag
 import xyz.quaver.pupil.util.Histories
-import xyz.quaver.pupil.util.getCachedGallery
-import java.io.File
+import xyz.quaver.pupil.util.download.Cache
+import xyz.quaver.pupil.util.wordCapitalize
 import java.util.*
 import kotlin.collections.ArrayList
-import kotlin.collections.HashMap
 import kotlin.concurrent.schedule
 
-class GalleryBlockAdapter(private val galleries: List<Pair<GalleryBlock, Deferred<String>>>) : RecyclerView.Adapter<RecyclerView.ViewHolder>() {
+class GalleryBlockAdapter(private val context: Context, private val galleries: List<GalleryBlock>) : RecyclerSwipeAdapter<RecyclerView.ViewHolder>(), SwipeAdapterInterface {
 
     enum class ViewType {
         NEXT,
@@ -45,10 +62,57 @@ class GalleryBlockAdapter(private val galleries: List<Pair<GalleryBlock, Deferre
         PREV
     }
 
+    private val glide = Glide.with(context)
     private lateinit var favorites: Histories
 
-    inner class GalleryViewHolder(private val view: CardView) : RecyclerView.ViewHolder(view) {
-        fun bind(item: Pair<GalleryBlock, Deferred<String>>) {
+    val timer = Timer()
+
+    var isThin = false
+
+    inner class GalleryViewHolder(val view: View) : RecyclerView.ViewHolder(view) {
+        var timerTask: TimerTask? = null
+
+        private fun updateProgress(context: Context, galleryID: Int) {
+            val reader = Cache(context).getReaderOrNull(galleryID)
+
+            CoroutineScope(Dispatchers.Main).launch {
+                if (reader == null) {
+                    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 {
@@ -57,89 +121,62 @@ class GalleryBlockAdapter(private val galleries: List<Pair<GalleryBlock, Deferre
                     }
                 }.toMap()
 
-                val (galleryBlock: GalleryBlock, thumbnail: Deferred<String>) = item
-
                 val artists = galleryBlock.artists
                 val series = galleryBlock.series
 
-                CoroutineScope(Dispatchers.Default).launch {
-                    val cache = thumbnail.await()
+                if (isThin)
+                    galleryblock_thumbnail.layoutParams.width = context.resources.getDimensionPixelSize(
+                        R.dimen.galleryblock_thumbnail_thin
+                    )
+                galleryblock_thumbnail.setImageDrawable(CircularProgressDrawable(context).also {
+                    it.start()
+                })
 
-                    if (!File(cache).exists())
-                        return@launch
+                CoroutineScope(Dispatchers.Main).launch {
+                    val thumbnail = Cache(context).getThumbnail(galleryBlock.id).let {
+                        if (it != null)
+                            Base64.decode(it, Base64.DEFAULT)
+                        else
+                            null
+                    }
 
-                    val bitmap = BitmapFactory.decodeFile(thumbnail.await())
-
-                    launch(Dispatchers.Main) {
-                        galleryblock_thumbnail.setImageBitmap(bitmap)
+                    galleryblock_thumbnail.post {
+                        glide
+                            .load(thumbnail)
+                            .skipMemoryCache(true)
+                            .diskCacheStrategy(DiskCacheStrategy.NONE)
+                            .error(R.drawable.image_broken_variant)
+                            .apply {
+                                if (BuildConfig.CENSOR)
+                                    override(5, 8)
+                            }
+                            .into(galleryblock_thumbnail)
                     }
                 }
 
                 //Check cache
-                val readerCache = { File(getCachedGallery(context, galleryBlock.id), "reader.json") }
-                val imageCache = { File(getCachedGallery(context, galleryBlock.id), "images") }
+                val cache = Cache(context).getCachedGallery(galleryBlock.id)
+                val reader = Cache(context).getReaderOrNull(galleryBlock.id)
 
-                if (readerCache.invoke().exists()) {
-                    val reader = Json(JsonConfiguration.Stable)
-                        .parse(ReaderItem.serializer().list, readerCache.invoke().readText())
+                if (reader != null) {
+                    val count = cache.listFiles()?.count {
+                        Regex("^[0-9]+.+\$").matches(it.name)
+                    } ?: 0
 
                     with(galleryblock_progressbar) {
-                        max = reader.size
-                        progress = imageCache.invoke().list()?.size ?: 0
+                        max = reader.galleryInfo.files.size
+                        progress = count
 
                         visibility = View.VISIBLE
                     }
-                } else {
+                } else
                     galleryblock_progressbar.visibility = View.GONE
-                }
 
-                if (refreshTasks[this@GalleryViewHolder] == null) {
-                    val refresh = Timer(false).schedule(0, 1000) {
-                        post {
-                            with(view.galleryblock_progressbar) {
-                                progress = imageCache.invoke().list()?.size ?: 0
-
-                                if (!readerCache.invoke().exists()) {
-                                    visibility = View.GONE
-                                    max = 0
-                                    progress = 0
-
-                                    view.galleryblock_progress_complete.visibility = View.INVISIBLE
-                                } else {
-                                    if (visibility == View.GONE) {
-                                        val reader = Json(JsonConfiguration.Stable)
-                                            .parse(ReaderItem.serializer().list, readerCache.invoke().readText())
-                                        max = reader.size
-                                        visibility = View.VISIBLE
-                                    }
-
-                                    if (progress == max) {
-                                        if (completeFlag.get(galleryBlock.id, false)) {
-                                            with(view.galleryblock_progress_complete) {
-                                                setImageResource(R.drawable.ic_progressbar)
-                                                visibility = View.VISIBLE
-                                            }
-                                        } else {
-                                            with(view.galleryblock_progress_complete) {
-                                                setImageDrawable(AnimatedVectorDrawableCompat.create(context, R.drawable.ic_progressbar_complete).apply {
-                                                    this?.start()
-                                                })
-                                                visibility = View.VISIBLE
-                                            }
-                                            completeFlag.put(galleryBlock.id, true)
-                                        }
-                                    } else
-                                        view.galleryblock_progress_complete.visibility = View.INVISIBLE
-
-                                    null
-                                }
-                            }
-                        }
+                if (timerTask == null)
+                    timerTask = timer.schedule(0, 1000) {
+                        updateProgress(context, galleryBlock.id)
                     }
 
-                    refreshTasks[this@GalleryViewHolder] = refresh
-                }
-
                 galleryblock_title.text = galleryBlock.title
                 with(galleryblock_artist) {
                     text = artists.joinToString(", ") { it.wordCapitalize() }
@@ -147,19 +184,6 @@ class GalleryBlockAdapter(private val galleries: List<Pair<GalleryBlock, Deferre
                         artists.isNotEmpty() -> View.VISIBLE
                         else -> View.GONE
                     }
-                    setOnClickListener {
-                        if (artists.size > 1) {
-                            AlertDialog.Builder(context).apply {
-                                setAdapter(ArrayAdapter(context, android.R.layout.select_dialog_item, artists)) { _, index ->
-                                    for (callback in onChipClickedHandler)
-                                        callback.invoke(Tag("artist", artists[index]))
-                                }
-                            }.show()
-                        } else {
-                            for(callback in onChipClickedHandler)
-                                callback.invoke(Tag("artist", artists.first()))
-                        }
-                    }
                 }
                 with(galleryblock_series) {
                     text =
@@ -170,31 +194,8 @@ class GalleryBlockAdapter(private val galleries: List<Pair<GalleryBlock, Deferre
                         series.isNotEmpty() -> View.VISIBLE
                         else -> View.GONE
                     }
-                    setOnClickListener {
-                        setOnClickListener {
-                            if (series.size > 1) {
-                                AlertDialog.Builder(context).apply {
-                                    setAdapter(ArrayAdapter(context, android.R.layout.select_dialog_item, series)) { _, index ->
-                                        for (callback in onChipClickedHandler)
-                                            callback.invoke(Tag("series", series[index]))
-                                    }
-                                }.show()
-                            } else {
-                                for(callback in onChipClickedHandler)
-                                    callback.invoke(Tag("series", series.first()))
-                            }
-                        }
-                    }
-                }
-                with(galleryblock_type) {
-                    text = resources.getString(R.string.galleryblock_type, galleryBlock.type).wordCapitalize()
-                    setOnClickListener {
-                        setOnClickListener {
-                            for(callback in onChipClickedHandler)
-                                callback.invoke(Tag("type", galleryBlock.type))
-                        }
-                    }
                 }
+                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])
@@ -202,48 +203,38 @@ class GalleryBlockAdapter(private val galleries: List<Pair<GalleryBlock, Deferre
                         galleryBlock.language.isNotEmpty() -> View.VISIBLE
                         else -> View.GONE
                     }
-                    setOnClickListener {
-                        setOnClickListener {
-                            for(callback in onChipClickedHandler)
-                                callback.invoke(Tag("language", galleryBlock.language))
-                        }
-                    }
                 }
 
                 galleryblock_tag_group.removeAllViews()
                 galleryBlock.relatedTags.forEach {
-                    val tag = Tag.parse(it).let {  tag ->
-                        when {
-                            tag.area != null -> tag
-                            else -> Tag("tag", it)
+                    galleryblock_tag_group.addView(Chip(context).apply {
+                        val tag = Tag.parse(it).let {  tag ->
+                            when {
+                                tag.area != null -> tag
+                                else -> Tag("tag", it)
+                            }
                         }
-                    }
 
-                    val chip = LayoutInflater.from(context)
-                        .inflate(R.layout.tag_chip, this, false) as Chip
-
-                    val icon = when(tag.area) {
-                        "male" -> {
-                            chip.setChipBackgroundColorResource(R.color.material_blue_700)
-                            chip.setTextColor(ContextCompat.getColor(context, android.R.color.white))
-                            ContextCompat.getDrawable(context, R.drawable.ic_gender_male_white)
+                        chipIcon = when(tag.area) {
+                            "male" -> {
+                                setChipBackgroundColorResource(R.color.material_blue_700)
+                                setTextColor(ContextCompat.getColor(context, android.R.color.white))
+                                ContextCompat.getDrawable(context, R.drawable.ic_gender_male_white)
+                            }
+                            "female" -> {
+                                setChipBackgroundColorResource(R.color.material_pink_600)
+                                setTextColor(ContextCompat.getColor(context, android.R.color.white))
+                                ContextCompat.getDrawable(context, R.drawable.ic_gender_female_white)
+                            }
+                            else -> null
                         }
-                        "female" -> {
-                            chip.setChipBackgroundColorResource(R.color.material_pink_600)
-                            chip.setTextColor(ContextCompat.getColor(context, android.R.color.white))
-                            ContextCompat.getDrawable(context, R.drawable.ic_gender_female_white)
+                        text = tag.tag.wordCapitalize()
+                        setEnsureMinTouchTargetSize(false)
+                        setOnClickListener {
+                            for (callback in onChipClickedHandler)
+                                callback.invoke(tag)
                         }
-                        else -> null
-                    }
-
-                    chip.chipIcon = icon
-                    chip.text = tag.tag.wordCapitalize()
-                    chip.setOnClickListener {
-                        for (callback in onChipClickedHandler)
-                            callback.invoke(tag)
-                    }
-
-                    galleryblock_tag_group.addView(chip)
+                    })
                 }
 
                 galleryblock_id.text = galleryBlock.id.toString()
@@ -277,6 +268,14 @@ class GalleryBlockAdapter(private val galleries: List<Pair<GalleryBlock, Deferre
                         }
                     }
                 }
+
+
+                // 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
+                }
             }
         }
     }
@@ -295,19 +294,11 @@ class GalleryBlockAdapter(private val galleries: List<Pair<GalleryBlock, Deferre
         }
     }
 
-    private fun String.wordCapitalize() : String {
-        val result = ArrayList<String>()
-
-        for (word in this.split(" "))
-            result.add(word.capitalize())
-
-        return result.joinToString(" ")
-    }
-
-    private val refreshTasks = HashMap<GalleryViewHolder, TimerTask>()
     val completeFlag = SparseBooleanArray()
 
     val onChipClickedHandler = ArrayList<((Tag) -> Unit)>()
+    var onDownloadClickedHandler: ((Int) -> Unit)? = null
+    var onDeleteClickedHandler: ((Int) -> Unit)? = null
 
     var showNext = false
     var showPrev = false
@@ -333,18 +324,56 @@ class GalleryBlockAdapter(private val galleries: List<Pair<GalleryBlock, Deferre
     }
 
     override fun onBindViewHolder(holder: RecyclerView.ViewHolder, position: Int) {
-        if (holder is GalleryViewHolder)
-            holder.bind(galleries[position-(if (showPrev) 1 else 0)])
+        if (holder is GalleryViewHolder) {
+            val gallery = galleries[position-(if (showPrev) 1 else 0)]
+
+            holder.bind(gallery)
+
+            with(holder.view.galleryblock_primary) {
+                setOnClickListener {
+                    holder.view.performClick()
+                }
+                setOnLongClickListener {
+                    holder.view.performLongClick()
+                }
+            }
+
+            holder.view.galleryblock_download.setOnClickListener {
+                onDownloadClickedHandler?.invoke(position)
+            }
+
+            holder.view.galleryblock_delete.setOnClickListener {
+                onDeleteClickedHandler?.invoke(position)
+            }
+
+            mItemManger.bindView(holder.view, position)
+
+            holder.view.galleryblock_swipe_layout.addSwipeListener(object: SwipeLayout.SwipeListener {
+                override fun onStartOpen(layout: SwipeLayout?) {
+                    mItemManger.closeAllExcept(layout)
+
+                    holder.view.galleryblock_download.text =
+                        if (Cache(context).isDownloading(gallery.id))
+                            holder.view.context.getString(android.R.string.cancel)
+                        else
+                            holder.view.context.getString(R.string.main_download)
+                }
+
+                override fun onClose(layout: SwipeLayout?) {}
+                override fun onHandRelease(layout: SwipeLayout?, xvel: Float, yvel: Float) {}
+                override fun onOpen(layout: SwipeLayout?) {}
+                override fun onStartClose(layout: SwipeLayout?) {}
+                override fun onUpdate(layout: SwipeLayout?, leftOffset: Int, topOffset: Int) {}
+            })
+        }
     }
 
     override fun onViewDetachedFromWindow(holder: RecyclerView.ViewHolder) {
         super.onViewDetachedFromWindow(holder)
 
         if (holder is GalleryViewHolder) {
-            val task = refreshTasks[holder] ?: return
-
-            task.cancel()
-            refreshTasks.remove(holder)
+            holder.timerTask?.cancel()
+            holder.timerTask = null
         }
     }
 
@@ -360,4 +389,6 @@ class GalleryBlockAdapter(private val galleries: List<Pair<GalleryBlock, Deferre
             else -> ViewType.GALLERY
         }.ordinal
     }
+
+    override fun getSwipeLayoutResourceId(position: Int) = R.id.galleryblock_swipe_layout
 }

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

@@ -0,0 +1,85 @@
+/*
+ *     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.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
+
+    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,73 +1,166 @@
+/*
+ *     Pupil, Hitomi.la viewer for Android
+ *     Copyright (C) 2019  tom5079
+ *
+ *     This program is free software: you can redistribute it and/or modify
+ *     it under the terms of the GNU General Public License as published by
+ *     the Free Software Foundation, either version 3 of the License, or
+ *     (at your option) any later version.
+ *
+ *     This program is distributed in the hope that it will be useful,
+ *     but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *     GNU General Public License for more details.
+ *
+ *     You should have received a copy of the GNU General Public License
+ *     along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
 package xyz.quaver.pupil.adapters
 
-import android.graphics.Bitmap
-import android.graphics.BitmapFactory
-import android.util.Log
+import android.content.Context
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
-import android.widget.ImageView
+import androidx.constraintlayout.widget.ConstraintLayout
 import androidx.recyclerview.widget.RecyclerView
+import com.bumptech.glide.Glide
+import com.bumptech.glide.ListPreloader
+import com.bumptech.glide.RequestBuilder
+import com.bumptech.glide.integration.recyclerview.RecyclerViewPreloader
+import com.crashlytics.android.Crashlytics
+import io.fabric.sdk.android.Fabric
+import kotlinx.android.synthetic.main.item_reader.view.*
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.launch
+import xyz.quaver.hitomi.Reader
+import xyz.quaver.pupil.BuildConfig
 import xyz.quaver.pupil.R
+import xyz.quaver.pupil.util.download.Cache
+import xyz.quaver.pupil.util.download.DownloadWorker
+import java.io.File
+import java.util.*
+import kotlin.concurrent.schedule
+import kotlin.math.roundToInt
 
-class ReaderAdapter(private val images: List<String>) : RecyclerView.Adapter<ReaderAdapter.ViewHolder>() {
+class ReaderAdapter(private val context: Context,
+                    private val galleryID: Int) : RecyclerView.Adapter<ReaderAdapter.ViewHolder>() {
+
+    val glide = Glide.with(context)
+
+    //region Glide.RecyclerView
+    val sizeProvider = ListPreloader.PreloadSizeProvider<File> { _, _, position ->
+        Cache(context).getReaderOrNull(galleryID)?.galleryInfo?.files?.getOrNull(position)?.let {
+            arrayOf(it.width, it.height).toIntArray()
+        }
+    }
+    val modelProvider = object: ListPreloader.PreloadModelProvider<File> {
+        override fun getPreloadItems(position: Int): MutableList<File> {
+            return listOf(Cache(context).getImages(galleryID)?.getOrNull(position)).filterNotNullTo(mutableListOf())
+        }
+
+        override fun getPreloadRequestBuilder(item: File): RequestBuilder<*>? {
+            return glide
+                .load(item)
+                .fitCenter()
+                .error(R.drawable.image_broken_variant)
+                .apply {
+                    if (BuildConfig.CENSOR)
+                        override(5, 8)
+                }
+        }
+    }
+    val preloader = RecyclerViewPreloader<File>(glide, modelProvider, sizeProvider, 10)
+    //endregion
+
+    var reader: Reader? = null
+    val timer = Timer()
 
     var isFullScreen = false
 
+    var onItemClickListener : ((Int) -> (Unit))? = null
+
     class ViewHolder(val view: View) : RecyclerView.ViewHolder(view)
 
     override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): ViewHolder {
-        LayoutInflater.from(parent.context).inflate(
+        return LayoutInflater.from(parent.context).inflate(
             R.layout.item_reader, parent, false
         ).let {
-            return ViewHolder(it)
+            ViewHolder(it)
         }
     }
 
     override fun onBindViewHolder(holder: ViewHolder, position: Int) {
+        holder.view as ConstraintLayout
 
-        fun calculateInSampleSize(options: BitmapFactory.Options, reqWidth: Int, reqHeight: Int): Int {
-            // Raw height and width of image
-            val (height: Int, width: Int) = options.run { outHeight to outWidth }
-            var inSampleSize = 1
+        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
 
-            if (height > reqHeight || width > reqWidth) {
-
-                val halfHeight: Int = height / 2
-                val halfWidth: Int = width / 2
-
-                // Calculate the largest inSampleSize value that is a power of 2 and keeps both
-                // height and width larger than the requested height and width.
-                while (halfHeight / inSampleSize >= reqHeight && halfWidth / inSampleSize >= reqWidth) {
-                    inSampleSize *= 2
-                }
-            }
-
-            return inSampleSize
+            (holder.view.container.layoutParams as ConstraintLayout.LayoutParams)
+                .dimensionRatio = "W,${reader!!.galleryInfo.files[position].width}:${reader!!.galleryInfo.files[position].height}"
         }
 
-        with(holder.view as ImageView) {
-            val options = BitmapFactory.Options()
+        holder.view.image.setOnPhotoTapListener { _, _, _ ->
+            onItemClickListener?.invoke(position)
+        }
 
-            options.inJustDecodeBounds = true
-            BitmapFactory.decodeFile(images[position], options)
+        holder.view.container.setOnClickListener {
+            onItemClickListener?.invoke(position)
+        }
 
-            val (reqWidth, reqHeight) = context.resources.displayMetrics.let {
-                Pair(it.widthPixels, it.heightPixels)
+        holder.view.reader_index.text = (position+1).toString()
+
+        val images = Cache(context).getImage(galleryID, position)
+        val progress = DownloadWorker.getInstance(context).progress[galleryID]?.get(position)
+
+        if (progress?.isInfinite() == true && images != null) {
+            holder.view.reader_item_progressbar.visibility = View.INVISIBLE
+
+            holder.view.image.post {
+                glide
+                    .load(images)
+                    .fitCenter()
+                    .error(R.drawable.image_broken_variant)
+                    .into(holder.view.image)
             }
 
-            options.inSampleSize = calculateInSampleSize(options, reqWidth, reqHeight)
+        } else {
+            holder.view.reader_item_progressbar.visibility = View.VISIBLE
 
-            options.inPreferredConfig = Bitmap.Config.RGB_565
+            glide.clear(holder.view.image)
 
-            options.inJustDecodeBounds = false
+            if (progress?.isNaN() == true) {
+                if (Fabric.isInitialized())
+                    Crashlytics.logException(DownloadWorker.getInstance(context).exception[galleryID]?.get(position))
 
-            val image = BitmapFactory.decodeFile(images[position], options)
+                glide
+                    .load(R.drawable.image_broken_variant)
+                    .into(holder.view.image)
 
-            setImageBitmap(image)
+                return
+            } else {
+                holder.view.reader_item_progressbar.progress =
+                    if (progress?.isInfinite() == true)
+                        100
+                    else
+                        progress?.roundToInt() ?: 0
+
+                holder.view.image.setImageDrawable(null)
+            }
+
+            timer.schedule(1000) {
+                CoroutineScope(Dispatchers.Main).launch {
+                    notifyItemChanged(position)
+                }
+            }
         }
     }
 
-    override fun getItemCount() = images.size
+    override fun getItemCount() = reader?.galleryInfo?.files?.size ?: 0
 
 }

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

@@ -0,0 +1,47 @@
+/*
+ *     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 xyz.quaver.pupil.BuildConfig
+
+class ThumbnailAdapter(private val glide: RequestManager, private val 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])
+            .apply {
+                if (BuildConfig.CENSOR)
+                    override(5, 8)
+            }
+            .into(holder.view)
+    }
+
+    override fun getItemCount() = thumbnails.size
+
+}

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

@@ -1,3 +1,21 @@
+/*
+ *     Pupil, Hitomi.la viewer for Android
+ *     Copyright (C) 2019  tom5079
+ *
+ *     This program is free software: you can redistribute it and/or modify
+ *     it under the terms of the GNU General Public License as published by
+ *     the Free Software Foundation, either version 3 of the License, or
+ *     (at your option) any later version.
+ *
+ *     This program is distributed in the hope that it will be useful,
+ *     but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *     GNU General Public License for more details.
+ *
+ *     You should have received a copy of the GNU General Public License
+ *     along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
 package xyz.quaver.pupil.types
 
 import com.arlib.floatingsearchview.suggestions.model.SearchSuggestion
@@ -5,7 +23,7 @@ import kotlinx.android.parcel.Parcelize
 import xyz.quaver.hitomi.Suggestion
 
 @Parcelize
-data class TagSuggestion constructor(val s: String, val t: Int, val u: String, val n: String) : SearchSuggestion {
+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 {

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

@@ -1,3 +1,21 @@
+/*
+ *     Pupil, Hitomi.la viewer for Android
+ *     Copyright (C) 2019  tom5079
+ *
+ *     This program is free software: you can redistribute it and/or modify
+ *     it under the terms of the GNU General Public License as published by
+ *     the Free Software Foundation, either version 3 of the License, or
+ *     (at your option) any later version.
+ *
+ *     This program is distributed in the hope that it will be useful,
+ *     but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *     GNU General Public License for more details.
+ *
+ *     You should have received a copy of the GNU General Public License
+ *     along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
 package xyz.quaver.pupil.types
 
 import kotlinx.serialization.Serializable
@@ -90,8 +108,8 @@ class Tags(tag: List<Tag?>?) : ArrayList<Tag>() {
         }
     }
 
-    fun removeByArea(area: String) {
-        filter { it.area == area }.forEach {
+    fun removeByArea(area: String, isNegative: Boolean? = null) {
+        filter { it.area == area && (if(isNegative == null) true else (it.isNegative == isNegative)) }.forEach {
             remove(it)
         }
     }

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

@@ -1,6 +1,25 @@
+/*
+ *     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 androidx.appcompat.app.AppCompatActivity
 import com.andrognito.patternlockview.PatternLockView
@@ -8,6 +27,7 @@ import com.google.android.material.snackbar.Snackbar
 import kotlinx.android.synthetic.main.activity_lock.*
 import kotlinx.android.synthetic.main.fragment_pattern_lock.*
 import xyz.quaver.pupil.R
+import xyz.quaver.pupil.ui.fragment.PatternLockFragment
 import xyz.quaver.pupil.util.Lock
 import xyz.quaver.pupil.util.LockManager
 
@@ -17,7 +37,18 @@ class LockActivity : AppCompatActivity() {
         super.onCreate(savedInstanceState)
         setContentView(R.layout.activity_lock)
 
-        val lockManager = LockManager(this)
+        val 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
+        }
 
         val mode = intent.getStringExtra("mode")
 
@@ -28,9 +59,10 @@ class LockActivity : AppCompatActivity() {
 
         when(mode) {
             null -> {
-                if (lockManager.empty()) {
+                if (lockManager.isEmpty()) {
                     setResult(RESULT_OK)
                     finish()
+                    return
                 }
             }
             "add_lock" -> {

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

@@ -1,3 +1,21 @@
+/*
+ *     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
@@ -7,6 +25,7 @@ import android.os.Bundle
 import android.view.*
 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
@@ -15,31 +34,23 @@ import androidx.vectordrawable.graphics.drawable.Animatable2Compat
 import androidx.vectordrawable.graphics.drawable.AnimatedVectorDrawableCompat
 import com.crashlytics.android.Crashlytics
 import com.google.android.material.snackbar.Snackbar
+import io.fabric.sdk.android.Fabric
 import kotlinx.android.synthetic.main.activity_reader.*
 import kotlinx.android.synthetic.main.activity_reader.view.*
 import kotlinx.android.synthetic.main.dialog_numberpicker.view.*
-import kotlinx.coroutines.CoroutineScope
-import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.launch
-import kotlinx.coroutines.runBlocking
-import kotlinx.io.IOException
-import kotlinx.serialization.ImplicitReflectionSerializer
-import kotlinx.serialization.json.Json
-import kotlinx.serialization.json.JsonConfiguration
-import xyz.quaver.hitomi.GalleryBlock
-import xyz.quaver.hitomi.getGalleryBlock
+import xyz.quaver.Code
 import xyz.quaver.pupil.Pupil
 import xyz.quaver.pupil.R
 import xyz.quaver.pupil.adapters.ReaderAdapter
-import xyz.quaver.pupil.util.GalleryDownloader
 import xyz.quaver.pupil.util.Histories
-import xyz.quaver.pupil.util.ItemClickSupport
+import xyz.quaver.pupil.util.download.Cache
+import xyz.quaver.pupil.util.download.DownloadWorker
+import java.util.*
+import kotlin.concurrent.schedule
 
 class ReaderActivity : AppCompatActivity() {
 
-    private val images = ArrayList<String>()
-    private lateinit var galleryBlock: GalleryBlock
-    private var gallerySize = 0
+    private var galleryID = 0
     private var currentPage = 0
 
     private var isScroll = true
@@ -55,7 +66,7 @@ class ReaderActivity : AppCompatActivity() {
         }
     }
 
-    private lateinit var downloader: GalleryDownloader
+    private val timer = Timer()
 
     private val snapHelper = PagerSnapHelper()
 
@@ -66,6 +77,9 @@ class ReaderActivity : AppCompatActivity() {
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
 
+        title = getString(R.string.reader_loading)
+        supportActionBar?.setDisplayHomeAsUpEnabled(false)
+
         favorites = (application as Pupil).favorites
 
         window.setFlags(
@@ -76,22 +90,16 @@ class ReaderActivity : AppCompatActivity() {
 
         handleIntent(intent)
 
-        Crashlytics.setInt("GalleryID", galleryBlock.id)
+        if (Fabric.isInitialized())
+            Crashlytics.setInt("GalleryID", galleryID)
 
-        if (!::galleryBlock.isInitialized) {
+        if (galleryID == 0) {
             onBackPressed()
             return
         }
 
-        supportActionBar?.title = galleryBlock.title
-        supportActionBar?.setDisplayHomeAsUpEnabled(false)
-
-        initDownloader()
-
         initView()
-
-        if (!downloader.download)
-            downloader.start()
+        initDownloader()
     }
 
     override fun onNewIntent(intent: Intent) {
@@ -106,25 +114,16 @@ class ReaderActivity : AppCompatActivity() {
             if (uri != null && lastPathSegment != null) {
                 val nonNumber = Regex("[^-?0-9]+")
 
-                val galleryID = when (uri.host) {
+                galleryID = when (uri.host) {
                     "hitomi.la" -> lastPathSegment.replace(nonNumber, "").toInt()
                     "히요비.asia" -> lastPathSegment.toInt()
                     "xn--9w3b15m8vo.asia" -> lastPathSegment.toInt()
                     "e-hentai.org" -> uri.pathSegments[1].toInt()
                     else -> return
                 }
-
-                runBlocking {
-                    CoroutineScope(Dispatchers.IO).launch {
-                        galleryBlock = getGalleryBlock(galleryID) ?: return@launch
-                    }.join()
-                }
             }
         } else {
-            galleryBlock = Json(JsonConfiguration.Stable).parse(
-                GalleryBlock.serializer(),
-                intent.getStringExtra("galleryblock")!!
-            )
+            galleryID = intent.getIntExtra("galleryID", 0)
         }
     }
 
@@ -141,14 +140,13 @@ class ReaderActivity : AppCompatActivity() {
         super.onResume()
     }
 
-    @UseExperimental(ImplicitReflectionSerializer::class)
     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(galleryBlock.id))
+            if (favorites.contains(galleryID))
                 (icon as Animatable).start()
         }
 
@@ -162,7 +160,7 @@ class ReaderActivity : AppCompatActivity() {
                 val view = LayoutInflater.from(this).inflate(R.layout.dialog_numberpicker, findViewById(android.R.id.content), false)
                 with(view.dialog_number_picker) {
                     minValue=1
-                    maxValue=gallerySize
+                    maxValue=reader_recyclerview?.adapter?.itemCount ?: 0
                     value=currentPage
                 }
                 val dialog = AlertDialog.Builder(this).apply {
@@ -176,7 +174,7 @@ class ReaderActivity : AppCompatActivity() {
                 dialog.show()
             }
             R.id.reader_menu_favorite -> {
-                val id = galleryBlock.id
+                val id = galleryID
                 val favorite = menu?.findItem(R.id.reader_menu_favorite) ?: return true
 
                 if (favorites.contains(id)) {
@@ -195,8 +193,11 @@ class ReaderActivity : AppCompatActivity() {
     override fun onDestroy() {
         super.onDestroy()
 
-        if (::downloader.isInitialized && !downloader.download)
-            downloader.cancel()
+        timer.cancel()
+        (reader_recyclerview?.adapter as? ReaderAdapter)?.timer?.cancel()
+
+        if (!Cache(this).isDownloading(galleryID))
+            DownloadWorker.getInstance(this@ReaderActivity).cancel(galleryID)
     }
 
     override fun onBackPressed() {
@@ -214,121 +215,79 @@ class ReaderActivity : AppCompatActivity() {
         }
     }
 
+    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() {
-        var d: GalleryDownloader? = GalleryDownloader.get(galleryBlock.id)
-
-        if (d == null) {
-            try {
-                d = GalleryDownloader(this, galleryBlock)
-            } catch (e: IOException) {
-                Snackbar.make(reader_layout, R.string.unable_to_connect, Snackbar.LENGTH_LONG).show()
-                finish()
-                return
-            }
+        val worker = DownloadWorker.getInstance(this).apply {
+            queue.add(galleryID)
         }
 
-        downloader = d.apply {
-            onReaderLoadedHandler = {
-                CoroutineScope(Dispatchers.Main).launch {
-                    with(reader_download_progressbar) {
-                        max = it.size
-                        progress = 0
-                    }
-                    with(reader_progressbar) {
-                        max = it.size
-                        progress = 0
-                    }
+        timer.schedule(1000, 1000) {
+            if (worker.progress.indexOfKey(galleryID) < 0)  //loading
+                return@schedule
 
-                    gallerySize = it.size
-                    menu?.findItem(R.id.reader_menu_page_indicator)?.title = "$currentPage/${it.size}"
-                }
+            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()
             }
-            onProgressHandler = {
-                CoroutineScope(Dispatchers.Main).launch {
-                    reader_download_progressbar.progress = it
-                    menu?.findItem(R.id.reader_menu_use_hiyobi)?.isVisible = downloader.useHiyobi
-                }
-            }
-            onDownloadedHandler = {
-                val item = it.toList()
-                CoroutineScope(Dispatchers.Main).launch {
-                    if (images.isEmpty()) {
-                        images.addAll(item)
-                        reader_recyclerview.adapter?.notifyDataSetChanged()
-                    } else {
-                        images.add(item.last())
-                        reader_recyclerview.adapter?.notifyItemInserted(images.size-1)
-                    }
-                }
-            }
-            onErrorHandler = {
-                if (it is IOException)
-                    Snackbar.make(reader_layout, R.string.unable_to_connect, Snackbar.LENGTH_LONG).show()
-                downloader.download = false
-            }
-            onCompleteHandler = {
-                CoroutineScope(Dispatchers.Main).launch {
-                    reader_download_progressbar.visibility = View.GONE
-                }
-            }
-            onNotifyChangedHandler = { notify ->
-                val fab = reader_fab_download
 
-                runOnUiThread {
-                    if (notify) {
-                        val icon = AnimatedVectorDrawableCompat.create(this, R.drawable.ic_downloading)
-                        icon?.registerAnimationCallback(object: Animatable2Compat.AnimationCallback() {
-                            override fun onAnimationEnd(drawable: Drawable?) {
-                                if (downloader.download)
-                                    fab.post {
-                                        icon.start()
-                                        fab.labelText = getString(R.string.reader_fab_download_cancel)
-                                    }
-                                else
-                                    fab.post {
-                                        fab.setImageResource(R.drawable.ic_download)
-                                        fab.labelText = getString(R.string.reader_fab_download)
-                                    }
-                            }
-                        })
+            runOnUiThread {
+                reader_download_progressbar.max = reader_recyclerview.adapter?.itemCount ?: 0
+                reader_download_progressbar.progress = worker.progress[galleryID]?.count { !it.isFinite() } ?: 0
+                reader_progressbar.max = reader_recyclerview.adapter?.itemCount ?: 0
 
-                        fab.setImageDrawable(icon)
-                        icon?.start()
-                    } else {
-                        runOnUiThread {
-                            fab.setImageResource(R.drawable.ic_download)
+                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 (downloader.download) {
-            downloader.invokeOnReaderLoaded()
-            downloader.invokeOnNotifyChanged()
+                if (worker.progress[galleryID]?.all { !it.isFinite() } == true) {   //Download finished
+                    reader_download_progressbar.visibility = View.GONE
+
+                    animateDownloadFAB(false)
+                }
+            }
         }
     }
 
     private fun initView() {
         with(reader_recyclerview) {
-            adapter = ReaderAdapter(images)
-
-            addOnScrollListener(object: RecyclerView.OnScrollListener() {
-                override fun onScrolled(recyclerView: RecyclerView, dx: Int, dy: Int) {
-                    super.onScrolled(recyclerView, dx, dy)
-
-                    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/$gallerySize"
-                    this@ReaderActivity.reader_progressbar.progress = currentPage
-                }
-            })
-
-            ItemClickSupport.addTo(this)
-                .setOnItemClickListener { _, _, _ ->
+            adapter = ReaderAdapter(this@ReaderActivity, galleryID).apply {
+                onItemClickListener = {
                     if (isScroll) {
                         isScroll = false
                         isFullscreen = true
@@ -336,23 +295,55 @@ class ReaderActivity : AppCompatActivity() {
                         scrollMode(false)
                         fullscreen(true)
                     } else {
-                        (reader_recyclerview.layoutManager as LinearLayoutManager?)?.scrollToPosition(currentPage)
+                        (reader_recyclerview.layoutManager as LinearLayoutManager?)?.scrollToPosition(currentPage) //Moves to next page because currentPage is 1-based indexing
                     }
                 }
+            }
+
+            addOnScrollListener((adapter as ReaderAdapter).preloader)
+            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
+                }
+            })
         }
 
-        reader_fab_fullscreen.setOnClickListener {
-            isFullscreen = true
-            fullscreen(isFullscreen)
+        with(reader_fab_download) {
+            animateDownloadFAB(Cache(context).isDownloading(galleryID)) //If download in progress, animate button
 
-            reader_fab.close(true)
+            setOnClickListener {
+                if (Cache(context).isDownloading(galleryID)) {
+                   Cache(context).setDownloading(galleryID, false)
+
+                    animateDownloadFAB(false)
+                } else {
+                    Cache(context).setDownloading(galleryID, true)
+                    animateDownloadFAB(true)
+                }
+            }
         }
 
-        reader_fab_download.setOnClickListener {
-            downloader.download = !downloader.download
+        with(reader_fab_fullscreen) {
+            setImageResource(R.drawable.ic_fullscreen)
+            setOnClickListener {
+                isFullscreen = true
+                fullscreen(isFullscreen)
 
-            if (!downloader.download)
-                downloader.clearNotification()
+                this@ReaderActivity.reader_fab.close(true)
+            }
         }
     }
 
@@ -370,6 +361,8 @@ class ReaderActivity : AppCompatActivity() {
 
             window.attributes = this
         }
+
+        reader_recyclerview.adapter = reader_recyclerview.adapter   // Force to redraw
     }
 
     private fun scrollMode(isScroll: Boolean) {
@@ -383,4 +376,34 @@ class ReaderActivity : AppCompatActivity() {
 
         (reader_recyclerview.layoutManager as LinearLayoutManager).scrollToPositionWithOffset(currentPage-1, 0)
     }
+
+    private fun animateDownloadFAB(animate: Boolean) {
+        with(reader_fab_download) {
+            if (animate) {
+                val icon = AnimatedVectorDrawableCompat.create(context, R.drawable.ic_downloading)
+
+                icon?.registerAnimationCallback(object : Animatable2Compat.AnimationCallback() {
+                    override fun onAnimationEnd(drawable: Drawable?) {
+                        val worker = DownloadWorker.getInstance(context)
+                        if (worker.progress[galleryID]?.all { !it.isFinite() } == true) // If download is finished, stop animating
+                            post {
+                                setImageResource(R.drawable.ic_download)
+                                labelText = getString(R.string.reader_fab_download_cancel)
+                            }
+                        else                                                            // Or continue animate
+                            post {
+                                icon.start()
+                                labelText = getString(R.string.reader_fab_download_cancel)
+                            }
+                    }
+                })
+
+                setImageDrawable(icon)
+                icon?.start()
+            } else {
+                setImageResource(R.drawable.ic_download)
+                labelText = getString(R.string.reader_fab_download)
+            }
+        }
+    }
 }

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

@@ -1,34 +1,48 @@
+/*
+ *     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.text.Editable
-import android.text.TextWatcher
-import android.view.LayoutInflater
 import android.view.MenuItem
 import android.view.WindowManager
-import android.widget.ArrayAdapter
-import android.widget.LinearLayout
-import android.widget.TextView
-import androidx.appcompat.app.AlertDialog
 import androidx.appcompat.app.AppCompatActivity
-import androidx.preference.Preference
-import androidx.preference.PreferenceFragmentCompat
 import androidx.preference.PreferenceManager
-import kotlinx.android.synthetic.main.dialog_default_query.view.*
+import com.google.android.material.snackbar.Snackbar
+import kotlinx.android.synthetic.main.settings_activity.*
+import kotlinx.serialization.list
+import kotlinx.serialization.serializer
+import net.rdrei.android.dirchooser.DirectoryChooserActivity
 import xyz.quaver.pupil.Pupil
 import xyz.quaver.pupil.R
-import xyz.quaver.pupil.types.Tags
-import xyz.quaver.pupil.util.Lock
-import xyz.quaver.pupil.util.LockManager
-import xyz.quaver.pupil.util.getDownloadDirectory
+import xyz.quaver.pupil.ui.fragment.LockFragment
+import xyz.quaver.pupil.ui.fragment.SettingsFragment
+import xyz.quaver.pupil.util.*
 import java.io.File
+import java.nio.charset.Charset
 
 class SettingsActivity : AppCompatActivity() {
 
-    val REQUEST_LOCK = 38238
-
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
 
@@ -56,325 +70,6 @@ class SettingsActivity : AppCompatActivity() {
         super.onResume()
     }
 
-    class SettingsFragment : PreferenceFragmentCompat() {
-
-        private val suffix = listOf(
-            "B",
-            "kB",
-            "MB",
-            "GB",
-            "TB" //really?
-        )
-
-        override fun onResume() {
-            super.onResume()
-
-            val lockManager = LockManager(context!!)
-
-            findPreference<Preference>("app_lock")?.summary = if (lockManager.locks.isNullOrEmpty()) {
-                getString(R.string.settings_lock_none)
-            } else {
-                lockManager.locks?.joinToString(", ") {
-                    when(it.type) {
-                        Lock.Type.PATTERN -> getString(R.string.settings_lock_pattern)
-                        Lock.Type.PIN -> getString(R.string.settings_lock_pin)
-                        Lock.Type.PASSWORD -> getString(R.string.settings_lock_password)
-                    }
-                }
-            }
-        }
-
-        private fun getDirSize(dir: File) : String {
-            var size = dir.walk().map { it.length() }.sum()
-            var suffixIndex = 0
-
-            while (size >= 1024) {
-                size /= 1024
-                suffixIndex++
-            }
-
-            return getString(R.string.settings_clear_summary, size, suffix[suffixIndex])
-        }
-
-        override fun onCreatePreferences(savedInstanceState: Bundle?, rootKey: String?) {
-            setPreferencesFromResource(R.xml.root_preferences, rootKey)
-
-            with(findPreference<Preference>("app_version")) {
-                this!!
-
-                val manager = context.packageManager
-                val info = manager.getPackageInfo(context.packageName, 0)
-
-                summary = info.versionName
-            }
-
-            with(findPreference<Preference>("delete_cache")) {
-                this!!
-
-                val dir = File(context.cacheDir, "imageCache")
-
-                summary = getDirSize(dir)
-
-                onPreferenceClickListener = Preference.OnPreferenceClickListener {
-                    AlertDialog.Builder(context).apply {
-                        setTitle(R.string.warning)
-                        setMessage(R.string.settings_clear_cache_alert_message)
-                        setPositiveButton(android.R.string.yes) { _, _ ->
-                            if (dir.exists())
-                                dir.deleteRecursively()
-
-                            summary = getDirSize(dir)
-                        }
-                        setNegativeButton(android.R.string.no) { _, _ -> }
-                    }.show()
-
-                    true
-                }
-            }
-
-            with(findPreference<Preference>("delete_downloads")) {
-                this!!
-
-                val dir = getDownloadDirectory(context)!!
-
-                summary = getDirSize(dir)
-
-                onPreferenceClickListener = Preference.OnPreferenceClickListener {
-                    AlertDialog.Builder(context).apply {
-                        setTitle(R.string.warning)
-                        setMessage(R.string.settings_clear_downloads_alert_message)
-                        setPositiveButton(android.R.string.yes) { _, _ ->
-                            if (dir.exists())
-                                dir.deleteRecursively()
-
-                            val downloads = (activity!!.application as Pupil).downloads
-
-                            downloads.clear()
-
-                            summary = getDirSize(dir)
-                        }
-                        setNegativeButton(android.R.string.no) { _, _ -> }
-                    }.show()
-
-                    true
-                }
-            }
-            with(findPreference<Preference>("clear_history")) {
-                this!!
-
-                val histories = (activity!!.application as Pupil).histories
-
-                summary = getString(R.string.settings_clear_history_summary, histories.size)
-
-                onPreferenceClickListener = Preference.OnPreferenceClickListener {
-                    AlertDialog.Builder(context).apply {
-                        setTitle(R.string.warning)
-                        setMessage(R.string.settings_clear_history_alert_message)
-                        setPositiveButton(android.R.string.yes) { _, _ ->
-                            histories.clear()
-                            summary = getString(R.string.settings_clear_history_summary, histories.size)
-                        }
-                        setNegativeButton(android.R.string.no) { _, _ -> }
-                    }.show()
-
-                    true
-                }
-            }
-
-            with(findPreference<Preference>("default_query")) {
-                this!!
-
-                val preferences = PreferenceManager.getDefaultSharedPreferences(context)
-
-                summary = preferences.getString("default_query", "") ?: ""
-
-                val languages = resources.getStringArray(R.array.languages).map {
-                    it.split("|").let { split ->
-                        Pair(split[0], split[1])
-                    }
-                }.toMap()
-                val reverseLanguages = languages.entries.associate { (k, v) -> v to k }
-
-                val excludeBL = "-male:yaoi"
-                val excludeGuro = listOf("-female:guro", "-male:guro")
-
-                onPreferenceClickListener = Preference.OnPreferenceClickListener {
-                    val dialogView = LayoutInflater.from(context).inflate(
-                        R.layout.dialog_default_query,
-                        LinearLayout(context),
-                        false
-                    )
-
-                    val tags = Tags.parse(
-                        preferences.getString("default_query", "") ?: ""
-                    )
-
-                    summary = tags.toString()
-
-                    with(dialogView.default_query_dialog_language_selector) {
-                        adapter =
-                            ArrayAdapter(
-                                context,
-                                android.R.layout.simple_spinner_dropdown_item,
-                                arrayListOf(
-                                    getString(R.string.default_query_dialog_language_selector_none)
-                                ).apply {
-                                    addAll(languages.values)
-                                }
-                            )
-                        if (tags.any { it.area == "language" }) {
-                            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")
-                            }
-                        }
-                    }
-
-                    with(dialogView.default_query_dialog_BL_checkbox) {
-                        isChecked = tags.contains(excludeBL)
-                        if (tags.contains(excludeBL))
-                            tags.remove(excludeBL)
-                    }
-
-                    with(dialogView.default_query_dialog_guro_checkbox) {
-                        isChecked = excludeGuro.all { tags.contains(it) }
-                        if (excludeGuro.all { tags.contains(it) })
-                            excludeGuro.forEach {
-                                tags.remove(it)
-                            }
-                    }
-
-                    with(dialogView.default_query_dialog_edittext) {
-                        setText(tags.toString(), TextView.BufferType.EDITABLE)
-                        addTextChangedListener(object : TextWatcher {
-                            override fun beforeTextChanged(s: CharSequence?, start: Int, count: Int, after: Int) {}
-
-                            override fun onTextChanged(s: CharSequence?, start: Int, before: Int, count: Int) {}
-
-                            override fun afterTextChanged(s: Editable?) {
-                                s ?: return
-
-                                if (s.any { it.isUpperCase() })
-                                    s.replace(0, s.length, s.toString().toLowerCase())
-                            }
-                        })
-                    }
-
-                    val dialog = AlertDialog.Builder(context!!).apply {
-                        setView(dialogView)
-                    }.create()
-
-                    dialogView.default_query_dialog_ok.setOnClickListener {
-                        val newTags = Tags.parse(dialogView.default_query_dialog_edittext.text.toString())
-
-                        with(dialogView.default_query_dialog_language_selector) {
-                            if (selectedItemPosition != 0)
-                                newTags.add("language:${reverseLanguages[selectedItem]}")
-                        }
-
-                        if (dialogView.default_query_dialog_BL_checkbox.isChecked)
-                            newTags.add(excludeBL)
-
-                        if (dialogView.default_query_dialog_guro_checkbox.isChecked)
-                            excludeGuro.forEach { tag ->
-                                newTags.add(tag)
-                            }
-
-                        preferenceManager.sharedPreferences.edit().putString("default_query", newTags.toString()).apply()
-                        summary = preferences.getString("default_query", "") ?: ""
-                        tags.clear()
-                        tags.addAll(newTags)
-                        dialog.dismiss()
-                    }
-
-                    dialog.show()
-
-                    true
-                }
-            }
-            with(findPreference<Preference>("app_lock")) {
-                this!!
-
-                val lockManager = LockManager(context)
-
-                summary = if (lockManager.locks.isNullOrEmpty()) {
-                    getString(R.string.settings_lock_none)
-                } else {
-                    lockManager.locks?.joinToString(", ") {
-                        when(it.type) {
-                            Lock.Type.PATTERN -> getString(R.string.settings_lock_pattern)
-                            Lock.Type.PIN -> getString(R.string.settings_lock_pin)
-                            Lock.Type.PASSWORD -> getString(R.string.settings_lock_password)
-                        }
-                    }
-                }
-
-                onPreferenceClickListener = Preference.OnPreferenceClickListener {
-                    val intent = Intent(context, LockActivity::class.java)
-                    activity?.startActivityForResult(intent, (activity as SettingsActivity).REQUEST_LOCK)
-
-                    true
-                }
-            }
-        }
-    }
-
-    class LockFragment : PreferenceFragmentCompat() {
-
-        override fun onResume() {
-            super.onResume()
-
-            val lockManager = LockManager(context!!)
-
-            findPreference<Preference>("lock_pattern")?.summary =
-                if (lockManager.contains(Lock.Type.PATTERN))
-                    getString(R.string.settings_lock_enabled)
-                else
-                    ""
-        }
-
-        override fun onCreatePreferences(savedInstanceState: Bundle?, rootKey: String?) {
-            setPreferencesFromResource(R.xml.lock_preferences, rootKey)
-
-            with(findPreference<Preference>("lock_pattern")) {
-                this!!
-
-                if (LockManager(context!!).contains(Lock.Type.PATTERN))
-                    summary = getString(R.string.settings_lock_enabled)
-
-                onPreferenceClickListener = Preference.OnPreferenceClickListener {
-                    val lockManager = LockManager(context!!)
-
-                    if (lockManager.contains(Lock.Type.PATTERN)) {
-                        AlertDialog.Builder(context).apply {
-                            setTitle(R.string.warning)
-                            setMessage(R.string.settings_lock_remove_message)
-
-                            setPositiveButton(android.R.string.yes) { _, _ ->
-                                lockManager.remove(Lock.Type.PATTERN)
-                                onResume()
-                            }
-                            setNegativeButton(android.R.string.no) { _, _ -> }
-                        }.show()
-                    } else {
-                        val intent = Intent(context, LockActivity::class.java).apply {
-                            putExtra("mode", "add_lock")
-                            putExtra("type", "pattern")
-                        }
-
-                        startActivity(intent)
-                    }
-
-                    true
-                }
-            }
-        }
-    }
-
     override fun onOptionsItemSelected(item: MenuItem?): Boolean {
         when (item?.itemId) {
             android.R.id.home -> onBackPressed()
@@ -394,7 +89,89 @@ class SettingsActivity : AppCompatActivity() {
                         .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()
+                }
+            }
             else -> super.onActivityResult(requestCode, resultCode, data)
         }
     }
+
+    @SuppressLint("InlinedApi")
+    override fun onRequestPermissionsResult(requestCode: Int, permissions: Array<out String>, grantResults: IntArray) {
+        when (requestCode) {
+            REQUEST_WRITE_PERMISSION_AND_SAF -> {
+                if (grantResults.firstOrNull() == PackageManager.PERMISSION_GRANTED) {
+                    val intent = Intent(Intent.ACTION_OPEN_DOCUMENT_TREE).apply {
+                        putExtra("android.content.extra.SHOW_ADVANCED", true)
+                    }
+
+                    startActivityForResult(intent, REQUEST_DOWNLOAD_FOLDER)
+                }
+            }
+        }
+    }
 }

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

@@ -0,0 +1,152 @@
+/*
+ *     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")
+
+    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)
+                }
+
+            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_edittext) {
+            setText(tags.toString(), android.widget.TextView.BufferType.EDITABLE)
+            addTextChangedListener(object : TextWatcher {
+                override fun beforeTextChanged(
+                    s: CharSequence?,
+                    start: Int,
+                    count: Int,
+                    after: Int
+                ) {
+                }
+
+                override fun onTextChanged(s: CharSequence?, start: Int, before: Int, count: Int) {}
+
+                override fun afterTextChanged(s: Editable?) {
+                    s ?: return
+
+                    if (s.any { it.isUpperCase() })
+                        s.replace(
+                            0,
+                            s.length,
+                            s.toString().toLowerCase(java.util.Locale.getDefault())
+                        )
+                }
+            })
+        }
+
+        return view
+    }
+
+}

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

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

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

@@ -0,0 +1,284 @@
+/*
+ *     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.GridLayoutManager
+import androidx.recyclerview.widget.LinearLayoutManager
+import androidx.recyclerview.widget.RecyclerView
+import com.bumptech.glide.Glide
+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.gallery_details.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.ThumbnailAdapter
+import xyz.quaver.pupil.types.Tag
+import xyz.quaver.pupil.ui.ReaderActivity
+import xyz.quaver.pupil.util.ItemClickSupport
+import xyz.quaver.pupil.util.download.Cache
+import xyz.quaver.pupil.util.wordCapitalize
+
+class GalleryDialog(context: Context, private val galleryID: Int) : Dialog(context) {
+
+    private val languages = context.resources.getStringArray(R.array.languages).map {
+        it.split("|").let { split ->
+            Pair(split[0], split[1])
+        }
+    }.toMap()
+
+    private val glide = Glide.with(context)
+
+    val onChipClickedHandler = ArrayList<((Tag) -> (Unit))>()
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        setContentView(R.layout.dialog_gallery)
+
+        window?.attributes.apply {
+            this ?: return@apply
+
+            width = LayoutParams.MATCH_PARENT
+            height = LayoutParams.MATCH_PARENT
+        }
+
+        with(gallery_fab) {
+            setImageDrawable(ContextCompat.getDrawable(context, R.drawable.arrow_right))
+            setOnClickListener {
+                context.startActivity(Intent(context, ReaderActivity::class.java).apply {
+                    putExtra("galleryID", galleryID)
+                })
+                (context.applicationContext as Pupil).histories.add(galleryID)
+            }
+        }
+
+        CoroutineScope(Dispatchers.IO).launch {
+            try {
+                val gallery = getGallery(galleryID)
+
+                launch(Dispatchers.Main) {
+                    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.with(context)
+                        .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.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.ic_gender_male_white)
+                                    }
+                                    "female" -> {
+                                        setChipBackgroundColorResource(R.color.material_pink_600)
+                                        setTextColor(ContextCompat.getColor(context, android.R.color.white))
+                                        ContextCompat.getDrawable(context, R.drawable.ic_gender_female_white)
+                                    }
+                                    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.gallery_details, gallery_contents, false).apply {
+            gallery_details.setText(R.string.gallery_thumbnails)
+
+            RecyclerView(context).apply {
+                layoutManager = GridLayoutManager(context, 3)
+                adapter = ThumbnailAdapter(glide, gallery.thumbnails)
+            }.let {
+                gallery_details_contents.addView(it, LayoutParams(LayoutParams.MATCH_PARENT, LayoutParams.WRAP_CONTENT))
+            }
+        }.let {
+            gallery_contents.addView(it)
+        }
+    }
+
+    private fun addRelated(gallery: Gallery) {
+        val inflater = LayoutInflater.from(context)
+        val galleries = ArrayList<GalleryBlock>()
+
+        val adapter = GalleryBlockAdapter(context, 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.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,
+                            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

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

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

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

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

@@ -0,0 +1,81 @@
+/*
+ *     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 androidx.appcompat.app.AlertDialog
+import androidx.preference.Preference
+import androidx.preference.PreferenceFragmentCompat
+import xyz.quaver.pupil.R
+import xyz.quaver.pupil.ui.LockActivity
+import xyz.quaver.pupil.util.Lock
+import xyz.quaver.pupil.util.LockManager
+
+class LockFragment : PreferenceFragmentCompat() {
+
+    override fun onResume() {
+        super.onResume()
+
+        val lockManager = LockManager(context!!)
+
+        findPreference<Preference>("lock_pattern")?.summary =
+            if (lockManager.contains(Lock.Type.PATTERN))
+                getString(R.string.settings_lock_enabled)
+            else
+                ""
+    }
+
+    override fun onCreatePreferences(savedInstanceState: Bundle?, rootKey: String?) {
+        setPreferencesFromResource(R.xml.lock_preferences, rootKey)
+
+        with(findPreference<Preference>("lock_pattern")) {
+            this!!
+
+            if (LockManager(context!!).contains(Lock.Type.PATTERN))
+                summary = getString(R.string.settings_lock_enabled)
+
+            onPreferenceClickListener = Preference.OnPreferenceClickListener {
+                val lockManager = LockManager(context!!)
+
+                if (lockManager.contains(Lock.Type.PATTERN)) {
+                    AlertDialog.Builder(context).apply {
+                        setTitle(R.string.warning)
+                        setMessage(R.string.settings_lock_remove_message)
+
+                        setPositiveButton(android.R.string.yes) { _, _ ->
+                            lockManager.remove(Lock.Type.PATTERN)
+                            onResume()
+                        }
+                        setNegativeButton(android.R.string.no) { _, _ -> }
+                    }.show()
+                } else {
+                    val intent = Intent(context, LockActivity::class.java).apply {
+                        putExtra("mode", "add_lock")
+                        putExtra("type", "pattern")
+                    }
+
+                    startActivity(intent)
+                }
+
+                true
+            }
+        }
+    }
+}

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

@@ -1,4 +1,22 @@
-package xyz.quaver.pupil.ui
+/*
+ *     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
@@ -11,8 +29,6 @@ import com.andrognito.patternlockview.utils.PatternLockUtils
 import kotlinx.android.synthetic.main.fragment_pattern_lock.*
 import kotlinx.android.synthetic.main.fragment_pattern_lock.view.*
 import xyz.quaver.pupil.R
-import xyz.quaver.pupil.util.hash
-import xyz.quaver.pupil.util.hashWithSalt
 
 class PatternLockFragment : Fragment(), PatternLockViewListener {
 

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

@@ -0,0 +1,306 @@
+/*
+ *     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.content.SharedPreferences
+import android.os.Bundle
+import androidx.appcompat.app.AlertDialog
+import androidx.appcompat.app.AppCompatDelegate
+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 xyz.quaver.pupil.Pupil
+import xyz.quaver.pupil.R
+import xyz.quaver.pupil.ui.LockActivity
+import xyz.quaver.pupil.ui.SettingsActivity
+import xyz.quaver.pupil.ui.dialog.DefaultQueryDialog
+import xyz.quaver.pupil.ui.dialog.DownloadLocationDialog
+import xyz.quaver.pupil.ui.dialog.MirrorDialog
+import xyz.quaver.pupil.ui.dialog.ProxyDialog
+import xyz.quaver.pupil.util.*
+import java.io.File
+
+
+class SettingsFragment :
+    PreferenceFragmentCompat(),
+    Preference.OnPreferenceClickListener,
+    Preference.OnPreferenceChangeListener,
+    SharedPreferences.OnSharedPreferenceChangeListener {
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+
+        PreferenceManager.getDefaultSharedPreferences(context).registerOnSharedPreferenceChangeListener(this)
+    }
+
+    override fun onResume() {
+        super.onResume()
+
+        val lockManager = LockManager(context!!)
+
+        findPreference<Preference>("app_lock")?.summary = if (lockManager.locks.isNullOrEmpty()) {
+            getString(R.string.settings_lock_none)
+        } else {
+            lockManager.locks?.joinToString(", ") {
+                when(it.type) {
+                    Lock.Type.PATTERN -> getString(R.string.settings_lock_pattern)
+                    Lock.Type.PIN -> getString(R.string.settings_lock_pin)
+                    Lock.Type.PASSWORD -> getString(R.string.settings_lock_password)
+                }
+            }
+        }
+    }
+
+    private fun getDirSize(dir: File) : String {
+        val size = dir.walk().map { it.length() }.sum()
+
+        return getString(R.string.settings_clear_summary, byteToString(size))
+    }
+
+    override fun onPreferenceClick(preference: Preference?): Boolean {
+        with (preference) {
+            this ?: return false
+
+            when (key) {
+                "app_version" -> {
+                    checkUpdate(activity as SettingsActivity, true)
+                }
+                "delete_cache" -> {
+                    val dir = File(context.cacheDir, "imageCache")
+
+                    AlertDialog.Builder(context).apply {
+                        setTitle(R.string.warning)
+                        setMessage(R.string.settings_clear_cache_alert_message)
+                        setPositiveButton(android.R.string.yes) { _, _ ->
+                            if (dir.exists())
+                                dir.deleteRecursively()
+
+                            summary = getDirSize(dir)
+                        }
+                        setNegativeButton(android.R.string.no) { _, _ -> }
+                    }.show()
+                }
+                "delete_downloads" -> {
+                    val dir = getDownloadDirectory(context)
+
+                    AlertDialog.Builder(context).apply {
+                        setTitle(R.string.warning)
+                        setMessage(R.string.settings_clear_downloads_alert_message)
+                        setPositiveButton(android.R.string.yes) { _, _ ->
+                            if (dir.exists())
+                                dir.deleteRecursively()
+
+                            summary = getDirSize(dir)
+                        }
+                        setNegativeButton(android.R.string.no) { _, _ -> }
+                    }.show()
+                }
+                "clear_history" -> {
+                    val histories = (context.applicationContext as Pupil).histories
+
+                    AlertDialog.Builder(context).apply {
+                        setTitle(R.string.warning)
+                        setMessage(R.string.settings_clear_history_alert_message)
+                        setPositiveButton(android.R.string.yes) { _, _ ->
+                            histories.clear()
+                            summary = getString(R.string.settings_clear_history_summary, histories.size)
+                        }
+                        setNegativeButton(android.R.string.no) { _, _ -> }
+                    }.show()
+                }
+                "dl_location" -> {
+                    DownloadLocationDialog(activity!!).show()
+                }
+                "default_query" -> {
+                    DefaultQueryDialog(context).apply {
+                        onPositiveButtonClickListener = { newTags ->
+                            sharedPreferences.edit().putString("default_query", newTags.toString()).apply()
+                            summary = newTags.toString()
+                        }
+                    }.show()
+                }
+                "app_lock" -> {
+                    val intent = Intent(context, LockActivity::class.java)
+                    activity?.startActivityForResult(intent, REQUEST_LOCK)
+                }
+                "mirrors" -> {
+                    MirrorDialog(context)
+                        .show()
+                }
+                "proxy" -> {
+                    ProxyDialog(context)
+                        .show()
+                }
+                "backup" -> {
+                    File(ContextCompat.getDataDir(context), "favorites.json").copyTo(
+                        File(getDownloadDirectory(context), "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)
+                }
+                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(context).type.name
+                }
+                "dl_location" -> {
+                    summary = getDownloadDirectory(context!!).canonicalPath
+                }
+            }
+        }
+    }
+
+    override fun onCreatePreferences(savedInstanceState: Bundle?, rootKey: String?) {
+        setPreferencesFromResource(R.xml.root_preferences, rootKey)
+
+        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 = context.packageManager
+                            val info = manager.getPackageInfo(context.packageName, 0)
+                            summary = context.getString(R.string.settings_app_version_description, info.versionName)
+
+                            onPreferenceClickListener = this@SettingsFragment
+                        }
+                        "delete_cache" -> {
+                            val dir = File(context.cacheDir, "imageCache")
+                            summary = getDirSize(dir)
+
+                            onPreferenceClickListener = this@SettingsFragment
+                        }
+                        "delete_downloads" -> {
+                            val dir = getDownloadDirectory(context)
+                            summary = getDirSize(dir)
+
+                            onPreferenceClickListener = this@SettingsFragment
+                        }
+                        "clear_history" -> {
+                            val histories = (activity!!.application as Pupil).histories
+                            summary = getString(R.string.settings_clear_history_summary, histories.size)
+
+                            onPreferenceClickListener = this@SettingsFragment
+                        }
+                        "dl_location" -> {
+                            summary = getDownloadDirectory(context).canonicalPath
+
+                            onPreferenceClickListener = this@SettingsFragment
+                        }
+                        "default_query" -> {
+                            summary = PreferenceManager.getDefaultSharedPreferences(context).getString("default_query", "") ?: ""
+
+                            onPreferenceClickListener = this@SettingsFragment
+                        }
+                        "app_lock" -> {
+                            val lockManager = LockManager(context)
+                            summary =
+                                if (lockManager.locks.isNullOrEmpty()) {
+                                    getString(R.string.settings_lock_none)
+                                } else {
+                                    lockManager.locks?.joinToString(", ") {
+                                        when (it.type) {
+                                            Lock.Type.PATTERN -> getString(R.string.settings_lock_pattern)
+                                            Lock.Type.PIN -> getString(R.string.settings_lock_pin)
+                                            Lock.Type.PASSWORD -> getString(R.string.settings_lock_password)
+                                        }
+                                    }
+                                }
+
+                            onPreferenceClickListener = this@SettingsFragment
+                        }
+                        "mirrors" -> {
+                            onPreferenceClickListener = this@SettingsFragment
+                        }
+                        "proxy" -> {
+                            summary = getProxyInfo(context).type.name
+
+                            onPreferenceClickListener = this@SettingsFragment
+                        }
+                        "dark_mode" -> {
+                            onPreferenceChangeListener = this@SettingsFragment
+                        }
+                        "backup" -> {
+                            onPreferenceClickListener = this@SettingsFragment
+                        }
+                        "restore" -> {
+                            onPreferenceClickListener = this@SettingsFragment
+                        }
+                    }
+
+                }
+            }
+        }
+    }
+}

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

@@ -0,0 +1,30 @@
+/*
+ *     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
+
+const val REQUEST_LOCK = 38238
+const val REQUEST_RESTORE = 16546
+const val REQUEST_DOWNLOAD_FOLDER = 3874
+const val REQUEST_DOWNLOAD_FOLDER_OLD = 3425
+const val REQUEST_WRITE_PERMISSION_AND_SAF = 13900
+
+val json = Json(JsonConfiguration.Stable)

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

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

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

@@ -0,0 +1,277 @@
+/*
+ *     Pupil, Hitomi.la viewer for Android
+ *     Copyright (C) 2020  tom5079
+ *
+ *     This program is free software: you can redistribute it and/or modify
+ *     it under the terms of the GNU General Public License as published by
+ *     the Free Software Foundation, either version 3 of the License, or
+ *     (at your option) any later version.
+ *
+ *     This program is distributed in the hope that it will be useful,
+ *     but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *     GNU General Public License for more details.
+ *
+ *     You should have received a copy of the GNU General Public License
+ *     along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package xyz.quaver.pupil.util.download
+
+import android.content.Context
+import android.content.ContextWrapper
+import android.util.Base64
+import android.util.Log
+import android.util.SparseArray
+import androidx.preference.PreferenceManager
+import com.crashlytics.android.Crashlytics
+import kotlinx.coroutines.*
+import kotlinx.io.InputStream
+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.File
+import java.io.FileOutputStream
+import java.net.URL
+import java.util.concurrent.locks.Lock
+import java.util.concurrent.locks.ReentrantLock
+
+class Cache(context: Context) : ContextWrapper(context) {
+
+    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) {
+        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)
+
+        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 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 (metadata?.reader == null) {
+            CoroutineScope(Dispatchers.IO).async {
+                var retval: Reader? = null
+
+                for (source in sources) {
+                    retval = try {
+                        source.value.invoke()
+                    } catch (e: Exception) {
+                        Crashlytics.logException(e)
+                        null
+                    }
+
+                    if (retval != null)
+                        break
+                }
+
+                retval
+            }.await() ?: return null
+        } else
+            metadata.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) {
+        val cache = File(getCachedGallery(galleryID), "%05d.$ext".format(index)).also {
+            if (!it.exists())
+                it.createNewFile()
+        }
+
+        data.use {
+            it.copyTo(FileOutputStream(cache))
+        }
+    }
+
+    fun moveToDownload(galleryID: Int) = CoroutineScope(Dispatchers.IO).launch {
+        val cache = getCachedGallery(galleryID).also {
+            if (!it.exists())
+                return@launch
+        }
+        val download = File(getDownloadDirectory(this@Cache), galleryID.toString())
+
+        if (download.isParentOf(cache))
+            return@launch
+
+        Log.i("PUPILD", "MOVING ${cache.canonicalPath} --> ${download.canonicalPath}")
+
+        cache.copyRecursively(download, true) { file, err ->
+            Log.i("PUPILD", "MOVING ERROR ${file.canonicalPath} ${err.message}")
+            OnErrorAction.SKIP
+        }
+        Log.i("PUPILD", "MOVED ${cache.canonicalPath}")
+
+        Log.i("PUPILD", "DELETING ${cache.canonicalPath}")
+        cache.deleteRecursively()
+        Log.i("PUPILD", "DELETED ${cache.canonicalPath}")
+    }
+
+    fun isDownloading(galleryID: Int) = getCachedMetadata(galleryID)?.isDownloading == true
+
+    fun setDownloading(galleryID: Int, isDownloading: Boolean) {
+        setCachedMetadata(galleryID, Metadata(getCachedMetadata(galleryID), isDownloading = isDownloading))
+    }
+
+}

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

@@ -0,0 +1,429 @@
+/*
+ *     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.crashlytics.android.Crashlytics
+import io.fabric.sdk.android.Fabric
+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.Executors
+import java.util.concurrent.LinkedBlockingQueue
+import java.util.concurrent.TimeUnit
+
+@UseExperimental(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() ?: null
+
+        override fun source(): BufferedSource {
+            if (bufferedSource == null)
+                bufferedSource = Okio.buffer(source(responseBody.source()))
+
+            return bufferedSource!!
+        }
+
+        private fun source(source: Source) = object: ForwardingSource(source) {
+
+            var totalBytesRead = 0L
+
+            override fun read(sink: Buffer, byteCount: Long): Long {
+                val bytesRead = super.read(sink, byteCount)
+
+                totalBytesRead += if (bytesRead == -1L) 0L else bytesRead
+                progressListener.update(tag, totalBytesRead, responseBody.contentLength(), bytesRead == -1L)
+
+                return bytesRead
+            }
+
+        }
+    }
+    //endregion
+
+    //region Singleton
+    companion object {
+
+        @Volatile private var instance: DownloadWorker? = null
+
+        fun getInstance(context: Context) =
+            instance ?: synchronized(this) {
+                instance ?: DownloadWorker(context).also { instance = it }
+            }
+    }
+    //endregion
+
+    val notificationManager = NotificationManagerCompat.from(context)
+
+    val queue = LinkedBlockingQueue<Int>()
+
+    /*
+    * KEY
+    *  primary galleryID
+    *  secondary index
+    * PRIMARY VALUE
+    *  MutableList -> Download in progress
+    *  null -> Loading / Gallery doesn't exist
+    * SECONDARY VALUE
+    *  0 <= value < 100 -> Download in progress
+    *  Float.POSITIVE_INFINITY -> Download completed
+    *  Float.NaN -> Exception
+    */
+    val progress = SparseArray<MutableList<Float>?>()
+    /*
+    * KEY
+    *  primary galleryID
+    *  secondary index
+    * PRIMARY VALUE
+    *  MutableList -> Download in progress / Loading
+    *  null -> Gallery doesn't exist
+    * SECONDARY VALUE
+    *  Throwable -> Exception
+    *  null -> Download in progress / Loading
+    */
+    val exception = SparseArray<MutableList<Throwable?>?>()
+    val notification = SparseArray<NotificationCompat.Builder>()
+
+    private val loop = loop()
+    private val worker = SparseArray<Job?>()
+
+    val interceptor = Interceptor { chain ->
+        val request = chain.request()
+        val response = chain.proceed(request)
+
+        response.newBuilder()
+            .body(ProgressResponseBody(request.tag(), response.body(), progressListener))
+            .build()
+    }
+    val client =
+        OkHttpClient.Builder()
+            .addInterceptor(interceptor)
+            .connectTimeout(0, TimeUnit.SECONDS)
+            .readTimeout(0, TimeUnit.SECONDS)
+            .dispatcher(Dispatcher(Executors.newFixedThreadPool(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().cancelAll()
+
+        progress.clear()
+        exception.clear()
+        notification.clear()
+        notificationManager.cancelAll()
+    }
+
+    fun cancel(galleryID: Int) {
+        queue.remove(galleryID)
+        worker[galleryID]?.cancel()
+
+        client.dispatcher().queuedCalls().filter {
+            ((it.request().tag() as Pair<*, *>).first as Int) == galleryID
+        }.forEach {
+            it.cancel()
+        }
+
+        progress.remove(galleryID)
+        exception.remove(galleryID)
+        notification.remove(galleryID)
+        notificationManager.cancel(galleryID)
+
+        if (progress.indexOfKey(galleryID) >= 0)
+            Cache(this@DownloadWorker).setDownloading(galleryID, false)
+    }
+
+    fun isCompleted(galleryID: Int) = progress[galleryID]?.all { !it.isFinite() } == true
+
+    private fun queueDownload(galleryID: Int, reader: Reader, index: Int, callback: Callback) {
+        val lowQuality = preferences.getBoolean("low_quality", false)
+
+        val request = Request.Builder().apply {
+            when (reader.code) {
+                Code.HITOMI -> {
+                    url(
+                        imageUrlFromImage(
+                            galleryID,
+                            reader.galleryInfo.files[index],
+                            lowQuality
+                        )
+                    )
+                    addHeader("Referer", getReferer(galleryID))
+                }
+                Code.HIYOBI -> {
+                    url(createImgList(galleryID, reader, lowQuality)[index].path)
+                    addHeader("User-Agent", user_agent)
+                    addHeader("Cookie", cookie)
+                }
+                else -> {
+                    //shouldn't be called anyway
+                }
+            }
+            tag(galleryID to index)
+        }.build()
+
+        client.newCall(request).enqueue(callback)
+    }
+
+    private fun download(galleryID: Int) = CoroutineScope(Dispatchers.IO).launch {
+        val reader = Cache(this@DownloadWorker).getReader(galleryID)
+
+        //gallery doesn't exist
+        if (reader == null) {
+            progress.put(galleryID, null)
+            exception.put(galleryID, null)
+
+            Cache(this@DownloadWorker).setDownloading(galleryID, false)
+            return@launch
+        }
+
+        val cache = Cache(this@DownloadWorker).getImages(galleryID)
+
+        progress.put(galleryID, reader.galleryInfo.files.indices.map { index ->
+            if (cache?.firstOrNull { it?.nameWithoutExtension?.toIntOrNull()  == index } != null)
+                Float.POSITIVE_INFINITY
+            else
+                0F
+        }.toMutableList())
+        exception.put(galleryID, reader.galleryInfo.files.map { null }.toMutableList())
+
+        if (notification[galleryID] == null)
+            initNotification(galleryID)
+
+        notification[galleryID].setContentTitle(reader.galleryInfo.title)
+        notify(galleryID)
+
+        if (isCompleted(galleryID)) {
+            with(Cache(this@DownloadWorker)) {
+                if (isDownloading(galleryID)) {
+                    moveToDownload(galleryID)
+                    setDownloading(galleryID, false)
+                }
+            }
+
+            return@launch
+        }
+
+        for (i in reader.galleryInfo.files.indices) {
+            val callback = object : Callback {
+                override fun onFailure(call: Call, e: IOException) {
+                    Log.i("PUPILD", "FAIL ${call.request().tag()} (${e.message})")
+                    if (Fabric.isInitialized() && e.message != "Canceled")
+                        Crashlytics.logException(e)
+
+                    progress[galleryID]?.set(i, Float.NaN)
+                    exception[galleryID]?.set(i, e)
+
+                    notify(galleryID)
+
+                    CoroutineScope(Dispatchers.IO).launch {
+                        if (isCompleted(galleryID)) {
+                            with(Cache(this@DownloadWorker)) {
+                                if (isDownloading(galleryID)) {
+                                    moveToDownload(galleryID)
+                                    setDownloading(galleryID, false)
+                                }
+                            }
+                        }
+                    }
+                }
+
+                override fun onResponse(call: Call, response: Response) {
+                    Log.i("PUPILD", "OK ${call.request().tag()}")
+
+                    val ext = call.request().url().encodedPath().split('.').last()
+
+                    try {
+                        response.body().use {
+                            Cache(this@DownloadWorker).putImage(galleryID, i, ext, it.byteStream())
+                        }
+                        progress[galleryID]?.set(i, Float.POSITIVE_INFINITY)
+
+                        notify(galleryID)
+
+                        CoroutineScope(Dispatchers.IO).launch {
+                            if (isCompleted(galleryID)) {
+                                with(Cache(this@DownloadWorker)) {
+                                    if (isDownloading(galleryID)) {
+                                        moveToDownload(galleryID)
+                                        setDownloading(galleryID, false)
+                                    }
+                                }
+                            }
+                        }
+
+                        Log.i("PUPILD", "SUCCESS ${call.request().tag()}")
+                    } catch (e: Exception) {
+
+                        progress[galleryID]?.set(i, Float.NaN)
+                        exception[galleryID]?.set(i, e)
+
+                        notify(galleryID)
+
+                        CoroutineScope(Dispatchers.IO).launch {
+                            if (isCompleted(galleryID)) {
+                                with(Cache(this@DownloadWorker)) {
+                                    if (isDownloading(galleryID)) {
+                                        moveToDownload(galleryID)
+                                        setDownloading(galleryID, false)
+                                    }
+                                }
+                            }
+                        }
+
+                        File(Cache(this@DownloadWorker).getCachedGallery(galleryID), "%05d.$ext".format(i)).delete()
+
+                        Log.i("PUPILD", "FAIL ON OK ${call.request().tag()} (${e.message})")
+                    }
+                }
+            }
+
+            if (progress[galleryID]?.get(i)?.isFinite() == true) {
+                queueDownload(galleryID, reader, i, callback)
+                Log.i("PUPILD", "$galleryID QUEUED $i")
+            } else {
+                Log.i("PUPILD", "$galleryID SKIPPED $i (${progress[galleryID]?.get(i)})")
+            }
+        }
+    }
+
+    private fun notify(galleryID: Int) {
+        val max = progress[galleryID]?.size ?: 0
+        val progress = progress[galleryID]?.count { !it.isFinite() } ?: 0
+
+        Log.i("PUPILD", "NOTIFY $galleryID ${isCompleted(galleryID)} $progress/$max")
+
+        if (isCompleted(galleryID)) {
+            notification[galleryID]
+                ?.setContentText(getString(R.string.reader_notification_complete))
+                ?.setSmallIcon(android.R.drawable.stat_sys_download_done)
+                ?.setProgress(0, 0, false)
+                ?.setOngoing(false)
+
+            notificationManager.cancel(galleryID)
+        } else
+            notification[galleryID]
+                ?.setProgress(max, progress, false)
+                ?.setContentText("$progress/$max")
+
+        if (Cache(this).isDownloading(galleryID) && notification[galleryID] != null)
+            notificationManager.notify(galleryID, notification[galleryID].build())
+        else
+            notificationManager.cancel(galleryID)
+    }
+
+    private fun initNotification(galleryID: Int) {
+        val intent = Intent(this, ReaderActivity::class.java).apply {
+            putExtra("galleryID", galleryID)
+        }
+        val pendingIntent = TaskStackBuilder.create(this).run {
+            addNextIntentWithParentStack(intent)
+            getPendingIntent(galleryID, PendingIntent.FLAG_UPDATE_CURRENT)
+        }
+
+        notification.put(galleryID, NotificationCompat.Builder(this, "download").apply {
+            setContentTitle(getString(R.string.reader_loading))
+            setContentText(getString(R.string.reader_notification_text))
+            setSmallIcon(android.R.drawable.stat_sys_download)                                  // had to use this because old android doesn't support VectorDrawable on Notification :P
+            setContentIntent(pendingIntent)
+            setProgress(0, 0, true)
+            setOngoing(true)
+        })
+    }
+
+    private fun loop() = CoroutineScope(Dispatchers.Default).launch {
+        while (true) {
+            if (queue.isEmpty())
+                continue
+
+            val galleryID = queue.peek() ?: continue
+
+            if (progress.indexOfKey(galleryID) >= 0)    // Gallery already downloading!
+                continue
+
+            if (notification[galleryID] == null)
+                initNotification(galleryID)
+
+            if (Cache(this@DownloadWorker).isDownloading(galleryID))
+                notificationManager.notify(galleryID, notification[galleryID].build())
+
+            Log.i("PUPILD", "QUEUED $galleryID")
+
+            worker.put(galleryID, download(galleryID))
+            queue.poll()
+        }
+    }
+
+}

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

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

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

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

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

@@ -1,17 +1,34 @@
+/*
+ *     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.ImplicitReflectionSerializer
-import kotlinx.serialization.json.Json
-import kotlinx.serialization.json.JsonConfiguration
-import kotlinx.serialization.parseList
-import kotlinx.serialization.stringify
+import kotlinx.serialization.list
+import kotlinx.serialization.serializer
 import java.io.File
 
 class Histories(private val file: File) : ArrayList<Int>() {
 
+    val serializer = Int.serializer().list
+
     init {
         if (!file.exists())
-            file.parentFile.mkdirs()
+            file.parentFile?.mkdirs()
 
         try {
             load()
@@ -20,21 +37,20 @@ class Histories(private val file: File) : ArrayList<Int>() {
         }
     }
 
-    @UseExperimental(ImplicitReflectionSerializer::class)
     fun load() : Histories {
         return apply {
             super.clear()
             addAll(
-                Json(JsonConfiguration.Stable).parseList(
+                json.parse(
+                    serializer,
                     file.bufferedReader().use { it.readText() }
                 )
             )
         }
     }
 
-    @UseExperimental(ImplicitReflectionSerializer::class)
     fun save() {
-        file.writeText(Json(JsonConfiguration.Stable).stringify(this))
+        file.writeText(json.stringify(serializer, this))
     }
 
     override fun add(element: Int): Boolean {

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

@@ -1,11 +1,30 @@
+/*
+ *     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.*
+import kotlinx.serialization.Serializable
 import kotlinx.serialization.json.Json
 import kotlinx.serialization.json.JsonConfiguration
+import kotlinx.serialization.list
 import java.io.File
 import java.security.MessageDigest
 
@@ -55,7 +74,6 @@ class LockManager(base: Context): ContextWrapper(base) {
         load()
     }
 
-    @UseExperimental(ImplicitReflectionSerializer::class)
     private fun load() {
         val lock = File(ContextCompat.getDataDir(this), "lock.json")
 
@@ -64,17 +82,16 @@ class LockManager(base: Context): ContextWrapper(base) {
             lock.writeText("[]")
         }
 
-        locks = ArrayList(Json(JsonConfiguration.Stable).parseList(lock.readText()))
+        locks = ArrayList(json.parse(Lock.serializer().list, lock.readText()))
     }
 
-    @UseExperimental(ImplicitReflectionSerializer::class)
     private fun save() {
         val lock = File(ContextCompat.getDataDir(this), "lock.json")
 
         if (!lock.exists())
             lock.createNewFile()
 
-        lock.writeText(Json(JsonConfiguration.Stable).stringify(locks?.toList() ?: listOf()))
+        lock.writeText(json.stringify(Lock.serializer().list, locks?.toList() ?: listOf()))
     }
 
     fun add(lock: Lock) {
@@ -94,10 +111,12 @@ class LockManager(base: Context): ContextWrapper(base) {
         }
     }
 
-    fun empty(): Boolean {
+    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

@@ -0,0 +1,54 @@
+/*
+ *     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
+
+@UseExperimental(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

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

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

@@ -1,39 +1,210 @@
+/*
+ *     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.util.Log
-import kotlinx.serialization.json.*
+import android.app.PendingIntent
+import android.content.Context
+import android.content.Intent
+import android.webkit.MimeTypeMap
+import androidx.appcompat.app.AlertDialog
+import androidx.appcompat.app.AppCompatActivity
+import androidx.core.app.NotificationCompat
+import androidx.core.app.NotificationManagerCompat
+import androidx.core.content.FileProvider
+import androidx.lifecycle.Lifecycle
+import androidx.preference.PreferenceManager
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.launch
+import kotlinx.serialization.json.JsonArray
+import kotlinx.serialization.json.JsonObject
+import kotlinx.serialization.json.boolean
+import kotlinx.serialization.json.content
+import ru.noties.markwon.Markwon
+import xyz.quaver.pupil.BuildConfig
+import xyz.quaver.pupil.R
+import java.io.File
 import java.net.URL
+import java.util.*
 
 fun getReleases(url: String) : JsonArray {
     return try {
         URL(url).readText().let {
-            Json(JsonConfiguration.Stable).parse(JsonArray.serializer(), it)
+            json.parse(JsonArray.serializer(), it)
         }
     } catch (e: Exception) {
         JsonArray(emptyList())
     }
 }
 
-fun checkUpdate(url: String, currentVersion: String) : JsonObject? {
+fun checkUpdate(context: Context, url: String) : JsonObject? {
     val releases = getReleases(url)
 
     if (releases.isEmpty())
         return null
 
-    val latestVersion = releases[0].jsonObject["tag_name"]?.content
+    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
+    }
+}
 
-    return when {
-        currentVersion.split('-').size == 1 -> {
-            when {
-                currentVersion != latestVersion -> releases[0].jsonObject
-                else -> null
+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: AppCompatActivity, 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")
             }
         }
-        else -> {
-            when {
-                (currentVersion.split('-')[0] == latestVersion) -> releases[0].jsonObject
-                else -> null
+
+        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 notificationManager = NotificationManagerCompat.from(context)
+                val builder = NotificationCompat.Builder(context, "download").apply {
+                    setContentTitle(context.getString(R.string.update_notification_description))
+                    setSmallIcon(android.R.drawable.stat_sys_download)
+                    priority = NotificationCompat.PRIORITY_LOW
+                    setOngoing(true)
+                }
+
+                CoroutineScope(Dispatchers.IO).launch io@{
+                    val target = File(getDownloadDirectory(context), "Pupil.apk")
+
+                    try {
+                        URL(url).download(target) { progress, fileSize ->
+                            builder.setProgress(fileSize.toInt(), progress.toInt(), false)
+                            notificationManager.notify(UPDATE_NOTIFICATION_ID, builder.build())
+                        }
+                    } catch (e: Exception) {
+                        builder.apply {
+                            setContentText(context.getString(R.string.update_failed))
+                            setMessage(context.getString(R.string.update_failed_message))
+                            setSmallIcon(android.R.drawable.stat_sys_download_done)
+                            setOngoing(false)
+                        }
+
+                        notificationManager.cancel(UPDATE_NOTIFICATION_ID)
+                        notificationManager.notify(UPDATE_NOTIFICATION_ID, builder.build())
+
+                        return@io
+                    }
+
+                    val install = Intent(Intent.ACTION_VIEW).apply {
+                        flags = Intent.FLAG_ACTIVITY_CLEAR_TOP or Intent.FLAG_GRANT_READ_URI_PERMISSION
+                        setDataAndType(FileProvider.getUriForFile(context, context.applicationContext.packageName + ".provider", target), MimeTypeMap.getSingleton().getMimeTypeFromExtension("apk"))
+                    }
+
+                    builder.apply {
+                        setContentIntent(PendingIntent.getActivity(context, 0, install, 0))
+                        setProgress(0, 0, false)
+                        setSmallIcon(android.R.drawable.stat_sys_download_done)
+                        setContentTitle(context.getString(R.string.update_download_completed))
+                        setContentText(context.getString(R.string.update_download_completed_description))
+                        setOngoing(false)
+                    }
+
+                    notificationManager.cancel(UPDATE_NOTIFICATION_ID)
+
+                    if (context.lifecycle.currentState.isAtLeast(Lifecycle.State.RESUMED))
+                        context.startActivity(install)
+                    else
+                        notificationManager.notify(UPDATE_NOTIFICATION_ID, builder.build())
+                }
             }
+            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()
         }
     }
 }

app/src/main/res/drawable-anydpi/ic_email.xml

@@ -1,10 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24"
-    android:tint="#333333">
-    <path
-        android:fillColor="#FF000000"
-        android:pathData="M20,4L4,4c-1.1,0 -1.99,0.9 -1.99,2L2,18c0,1.1 0.9,2 2,2h16c1.1,0 2,-0.9 2,-2L22,6c0,-1.1 -0.9,-2 -2,-2zM20,8l-8,5 -8,-5L4,6l8,5 8,-5v2z"/>
-</vector>

app/src/main/res/drawable-anydpi/ic_expand.xml

@@ -1,10 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24"
-    android:tint="#333333">
-    <path
-        android:fillColor="#FF000000"
-        android:pathData="M16.59,8.59L12,13.17 7.41,8.59 6,10l6,6 6,-6z"/>
-</vector>

app/src/main/res/drawable-anydpi/ic_fullscreen.xml

@@ -1,10 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24"
-    android:tint="#FFFFFF">
-    <path
-        android:fillColor="#FF000000"
-        android:pathData="M7,14L5,14v5h5v-2L7,17v-3zM5,10h2L7,7h3L10,5L5,5v5zM17,17h-3v2h5v-5h-2v3zM14,5v2h3v3h2L19,5h-5z"/>
-</vector>

app/src/main/res/drawable-anydpi/ic_help.xml

@@ -1,10 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24"
-    android:tint="#333333">
-    <path
-        android:fillColor="#FF000000"
-        android:pathData="M12,2C6.48,2 2,6.48 2,12s4.48,10 10,10 10,-4.48 10,-10S17.52,2 12,2zM13,19h-2v-2h2v2zM15.07,11.25l-0.9,0.92C13.45,12.9 13,13.5 13,15h-2v-0.5c0,-1.1 0.45,-2.1 1.17,-2.83l1.24,-1.26c0.37,-0.36 0.59,-0.86 0.59,-1.41 0,-1.1 -0.9,-2 -2,-2s-2,0.9 -2,2L8,9c0,-2.21 1.79,-4 4,-4s4,1.79 4,4c0,0.88 -0.36,1.68 -0.93,2.25z"/>
-</vector>

app/src/main/res/drawable-anydpi/ic_history.xml

@@ -1,10 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24"
-    android:tint="#333333">
-    <path
-        android:fillColor="#FF000000"
-        android:pathData="M13,3c-4.97,0 -9,4.03 -9,9L1,12l3.89,3.89 0.07,0.14L9,12L6,12c0,-3.87 3.13,-7 7,-7s7,3.13 7,7 -3.13,7 -7,7c-1.93,0 -3.68,-0.79 -4.94,-2.06l-1.42,1.42C8.27,19.99 10.51,21 13,21c4.97,0 9,-4.03 9,-9s-4.03,-9 -9,-9zM12,8v5l4.28,2.54 0.72,-1.21 -3.5,-2.08L13.5,8L12,8z"/>
-</vector>

app/src/main/res/drawable-anydpi/ic_home.xml

@@ -1,10 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24"
-    android:tint="#333333">
-    <path
-        android:fillColor="#FF000000"
-        android:pathData="M10,20v-6h4v6h5v-8h3L12,3 2,12h3v8z"/>
-</vector>

app/src/main/res/drawable-anydpi/ic_placeholder.xml

@@ -1,10 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24"
-    android:tint="#333333">
-    <path
-        android:fillColor="#FF000000"
-        android:pathData="M21,5v6.59l-3,-3.01 -4,4.01 -4,-4 -4,4 -3,-3.01L3,5c0,-1.1 0.9,-2 2,-2h14c1.1,0 2,0.9 2,2zM18,11.42l3,3.01L21,19c0,1.1 -0.9,2 -2,2L5,21c-1.1,0 -2,-0.9 -2,-2v-6.58l3,2.99 4,-4 4,4 4,-3.99z"/>
-</vector>

app/src/main/res/drawable-anydpi/ic_search.xml

@@ -1,10 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24"
-    android:tint="#FFFFFF">
-    <path
-        android:fillColor="#FF000000"
-        android:pathData="M15.5,14h-0.79l-0.28,-0.27C15.41,12.59 16,11.11 16,9.5 16,5.91 13.09,3 9.5,3S3,5.91 3,9.5 5.91,16 9.5,16c1.61,0 3.09,-0.59 4.23,-1.57l0.27,0.28v0.79l5,4.99L20.49,19l-4.99,-5zM9.5,14C7.01,14 5,11.99 5,9.5S7.01,5 9.5,5 14,7.01 14,9.5 11.99,14 9.5,14z"/>
-</vector>

app/src/main/res/drawable-anydpi/ic_settings.xml

@@ -1,10 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24"
-    android:tint="#FFFFFF">
-    <path
-        android:fillColor="#FF000000"
-        android:pathData="M19.1,12.9a2.8,2.8 0,0 0,0.1 -0.9,2.8 2.8,0 0,0 -0.1,-0.9l2.1,-1.6a0.7,0.7 0,0 0,0.1 -0.6L19.4,5.5a0.7,0.7 0,0 0,-0.6 -0.2l-2.4,1a6.5,6.5 0,0 0,-1.6 -0.9l-0.4,-2.6a0.5,0.5 0,0 0,-0.5 -0.4H10.1a0.5,0.5 0,0 0,-0.5 0.4L9.3,5.4a5.6,5.6 0,0 0,-1.7 0.9l-2.4,-1a0.4,0.4 0,0 0,-0.5 0.2l-2,3.4c-0.1,0.2 0,0.4 0.2,0.6l2,1.6a2.8,2.8 0,0 0,-0.1 0.9,2.8 2.8,0 0,0 0.1,0.9L2.8,14.5a0.7,0.7 0,0 0,-0.1 0.6l1.9,3.4a0.7,0.7 0,0 0,0.6 0.2l2.4,-1a6.5,6.5 0,0 0,1.6 0.9l0.4,2.6a0.5,0.5 0,0 0,0.5 0.4h3.8a0.5,0.5 0,0 0,0.5 -0.4l0.3,-2.6a5.6,5.6 0,0 0,1.7 -0.9l2.4,1a0.4,0.4 0,0 0,0.5 -0.2l2,-3.4c0.1,-0.2 0,-0.4 -0.2,-0.6ZM12,15.6A3.6,3.6 0,1 1,15.6 12,3.6 3.6,0 0,1 12,15.6Z"/>
-</vector>

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

@@ -0,0 +1,8 @@
+<!-- drawable/arrow_right.xml -->
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:height="24dp"
+    android:width="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <path android:fillColor="#fff" android:pathData="M4,11V13H16L10.5,18.5L11.92,19.92L19.84,12L11.92,4.08L10.5,5.5L16,11H4Z" />
+</vector>

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

@@ -13,14 +13,14 @@
             <path
                 android:name="path"
                 android:pathData="M 12 15.39 L 8.24 17.66 L 9.23 13.38 L 5.91 10.5 L 10.29 10.13 L 12 6.09 L 13.71 10.13 L 18.09 10.5 L 14.77 13.38 L 15.76 17.66 M 22 9.24 L 14.81 8.63 L 12 2 L 9.19 8.63 L 2 9.24 L 7.45 13.97 L 5.82 21 L 12 17.27 L 18.18 21 L 16.54 13.97 L 22 9.24 Z"
-                android:fillColor="#000"/>
+                android:fillColor="@color/material_orange_500"/>
             <clip-path
                 android:name="clip"
                 android:pathData="M 2 21 L 2 21 L 22 21 L 22 21 Z"/>
             <path
                 android:name="path_1"
                 android:pathData="M 12 17.27 L 18.18 21 L 16.54 13.97 L 22 9.24 L 14.81 8.62 L 12 2 L 9.19 8.62 L 2 9.24 L 7.45 13.97 L 5.82 21 L 12 17.27 Z"
-                android:fillColor="#000"/>
+                android:fillColor="@color/material_orange_500"/>
         </vector>
     </aapt:attr>
     <target android:name="clip">

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

@@ -0,0 +1,8 @@
+<!-- drawable/cancel.xml -->
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:height="24dp"
+    android:width="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <path android:fillColor="#fff" android:pathData="M12,2A10,10 0 0,1 22,12A10,10 0 0,1 12,22A10,10 0 0,1 2,12A10,10 0 0,1 12,2M12,4A8,8 0 0,0 4,12C4,13.85 4.63,15.55 5.68,16.91L16.91,5.68C15.55,4.63 13.85,4 12,4M12,20A8,8 0 0,0 20,12C20,10.15 19.37,8.45 18.32,7.09L7.09,18.32C8.45,19.37 10.15,20 12,20Z" />
+</vector>

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

@@ -1,5 +1,5 @@
-<vector android:height="24dp" android:tint="#fff"
+<vector android:height="24dp"
     android:viewportHeight="24.0" android:viewportWidth="24.0"
     android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillColor="#ff000000" android:pathData="M19,9h-4V3H9v6H5l7,7 7,-7zM5,18v2h14v-2H5z"/>
+    <path android:fillColor="#fff" android:pathData="M19,9h-4V3H9v6H5l7,7 7,-7zM5,18v2h14v-2H5z"/>
 </vector>

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

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

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

@@ -1,8 +0,0 @@
-<!-- drawable/numeric.xml -->
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:height="24dp"
-    android:width="24dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24">
-    <path android:fillColor="#000" android:pathData="M4,17V9H2V7H6V17H4M22,15C22,16.11 21.1,17 20,17H16V15H20V13H18V11H20V9H16V7H20A2,2 0 0,1 22,9V10.5A1.5,1.5 0 0,1 20.5,12A1.5,1.5 0 0,1 22,13.5V15M14,15V17H8V13C8,11.89 8.9,11 10,11H12V9H8V7H12A2,2 0 0,1 14,9V11C14,12.11 13.1,13 12,13H10V15H14Z" />
-</vector>

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

@@ -1,4 +1,4 @@
 <vector android:height="24dp" android:width="24dp"
     android:viewportHeight="24.0" android:viewportWidth="24.0" xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillColor="#000" android:pathData="M 12 15.39 L 8.24 17.66 L 9.23 13.38 L 5.91 10.5 L 10.29 10.13 L 12 6.09 L 13.71 10.13 L 18.09 10.5 L 14.77 13.38 L 15.76 17.66 M 22 9.24 L 14.81 8.63 L 12 2 L 9.19 8.63 L 2 9.24 L 7.45 13.97 L 5.82 21 L 12 17.27 L 18.18 21 L 16.54 13.97 L 22 9.24 Z"/>
+    <path android:fillColor="@color/material_orange_500" android:pathData="M 12 15.39 L 8.24 17.66 L 9.23 13.38 L 5.91 10.5 L 10.29 10.13 L 12 6.09 L 13.71 10.13 L 18.09 10.5 L 14.77 13.38 L 15.76 17.66 M 22 9.24 L 14.81 8.63 L 12 2 L 9.19 8.63 L 2 9.24 L 7.45 13.97 L 5.82 21 L 12 17.27 L 18.18 21 L 16.54 13.97 L 22 9.24 Z"/>
 </vector>

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

@@ -1,4 +1,4 @@
 <vector android:height="24dp" android:width="24dp"
     android:viewportHeight="24.0" android:viewportWidth="24.0" xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillColor="#000" android:pathData="M 12 17.27 L 18.18 21 L 16.54 13.97 L 22 9.24 L 14.81 8.62 L 12 2 L 9.19 8.62 L 2 9.24 L 7.45 13.97 L 5.82 21 L 12 17.27 Z"/>
+    <path android:fillColor="@color/material_orange_500" android:pathData="M 12 17.27 L 18.18 21 L 16.54 13.97 L 22 9.24 L 14.81 8.62 L 12 2 L 9.19 8.62 L 2 9.24 L 7.45 13.97 L 5.82 21 L 12 17.27 Z"/>
 </vector>

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

@@ -0,0 +1,8 @@
+<!-- drawable/image_broken_variant.xml -->
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:height="24dp"
+    android:width="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <path android:fillColor="#000" android:pathData="M21,5V11.59L18,8.58L14,12.59L10,8.59L6,12.59L3,9.58V5A2,2 0 0,1 5,3H19A2,2 0 0,1 21,5M18,11.42L21,14.43V19A2,2 0 0,1 19,21H5A2,2 0 0,1 3,19V12.42L6,15.41L10,11.41L14,15.41" />
+</vector>

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

@@ -0,0 +1,8 @@
+<!-- drawable/menu.xml -->
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:height="24dp"
+    android:width="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <path android:fillColor="#fff" android:pathData="M3,6H21V8H3V6M3,11H21V13H3V11M3,16H21V18H3V16Z" />
+</vector>

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

@@ -4,5 +4,5 @@
     android:width="24dp"
     android:viewportWidth="24"
     android:viewportHeight="24">
-    <path android:fillColor="#000" android:pathData="M4,17V9H2V7H6V17H4M22,15C22,16.11 21.1,17 20,17H16V15H20V13H18V11H20V9H16V7H20A2,2 0 0,1 22,9V10.5A1.5,1.5 0 0,1 20.5,12A1.5,1.5 0 0,1 22,13.5V15M14,15V17H8V13C8,11.89 8.9,11 10,11H12V9H8V7H12A2,2 0 0,1 14,9V11C14,12.11 13.1,13 12,13H10V15H14Z" />
+    <path android:fillColor="#fff" android:pathData="M4,17V9H2V7H6V17H4M22,15C22,16.11 21.1,17 20,17H16V15H20V13H18V11H20V9H16V7H20A2,2 0 0,1 22,9V10.5A1.5,1.5 0 0,1 20.5,12A1.5,1.5 0 0,1 22,13.5V15M14,15V17H8V13C8,11.89 8.9,11 10,11H12V9H8V7H12A2,2 0 0,1 14,9V11C14,12.11 13.1,13 12,13H10V15H14Z" />
 </vector>

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

@@ -0,0 +1,34 @@
+<?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/>.
+  -->
+
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
+    <item
+        android:bottom="1dp"
+        android:left="1dp"
+        android:right="1dp"
+        android:top="1dp">
+        <shape android:shape="rectangle" >
+            <stroke
+                android:width="1dp"
+                android:color="#555555" />
+
+            <solid android:color="@color/transparent" />
+        </shape>
+    </item>
+</layer-list>

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

@@ -0,0 +1,8 @@
+<!-- drawable/sort_variant.xml -->
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:height="24dp"
+    android:width="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <path android:fillColor="#fff" android:pathData="M3,13H15V11H3M3,6V8H21V6M3,18H9V16H3V18Z" />
+</vector>

app/src/main/res/layout/activity_lock.xml

@@ -1,4 +1,22 @@
 <?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~     Pupil, Hitomi.la viewer for Android
+  ~     Copyright (C) 2019  tom5079
+  ~
+  ~     This program is free software: you can redistribute it and/or modify
+  ~     it under the terms of the GNU General Public License as published by
+  ~     the Free Software Foundation, either version 3 of the License, or
+  ~     (at your option) any later version.
+  ~
+  ~     This program is distributed in the hope that it will be useful,
+  ~     but WITHOUT ANY WARRANTY; without even the implied warranty of
+  ~     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  ~     GNU General Public License for more details.
+  ~
+  ~     You should have received a copy of the GNU General Public License
+  ~     along with this program.  If not, see <http://www.gnu.org/licenses/>.
+  -->
+
 <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
@@ -11,7 +29,29 @@
         android:layout_width="match_parent"
         android:layout_height="0dp"
         app:layout_constraintTop_toTopOf="parent"
-        app:layout_constraintBottom_toTopOf="@id/lock_button_layout"/>
+        app:layout_constraintBottom_toTopOf="@id/lock_fingerprint_layout"/>
+
+    <LinearLayout
+        android:id="@+id/lock_fingerprint_layout"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="16dp"
+        android:layout_marginBottom="32dp"
+        android:gravity="center"
+        app:layout_constraintTop_toBottomOf="@id/lock_content"
+        app:layout_constraintBottom_toTopOf="@id/lock_button_layout">
+
+        <com.google.android.material.floatingactionbutton.FloatingActionButton
+            android:id="@+id/lock_fingerprint"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            app:srcCompat="@drawable/fingerprint"
+            android:layout_marginLeft="8dp"
+            android:layout_marginRight="8dp"
+            app:backgroundTint="@color/dark_gray"
+            app:fabSize="mini"/>
+
+    </LinearLayout>
 
     <LinearLayout
         android:id="@+id/lock_button_layout"
@@ -19,7 +59,7 @@
         android:layout_height="wrap_content"
         android:layout_marginTop="16dp"
         android:layout_marginBottom="32dp"
-        app:layout_constraintTop_toBottomOf="@id/lock_content"
+        app:layout_constraintTop_toBottomOf="@id/lock_fingerprint_layout"
         app:layout_constraintBottom_toBottomOf="parent"
         android:gravity="center">
 
@@ -41,16 +81,6 @@
             app:backgroundTint="@color/dark_gray"
             app:fabSize="mini"/>
 
-        <com.google.android.material.floatingactionbutton.FloatingActionButton
-            android:id="@+id/lock_fingerprint"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            app:srcCompat="@drawable/fingerprint"
-            android:layout_marginLeft="8dp"
-            android:layout_marginRight="8dp"
-            app:backgroundTint="@color/dark_gray"
-            app:fabSize="mini"/>
-
         <com.google.android.material.floatingactionbutton.FloatingActionButton
             android:id="@+id/lock_password"
             android:layout_width="wrap_content"

app/src/main/res/layout/activity_main.xml

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

app/src/main/res/layout/activity_main_content.xml

@@ -1,4 +1,22 @@
 <?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~     Pupil, Hitomi.la viewer for Android
+  ~     Copyright (C) 2019  tom5079
+  ~
+  ~     This program is free software: you can redistribute it and/or modify
+  ~     it under the terms of the GNU General Public License as published by
+  ~     the Free Software Foundation, either version 3 of the License, or
+  ~     (at your option) any later version.
+  ~
+  ~     This program is distributed in the hope that it will be useful,
+  ~     but WITHOUT ANY WARRANTY; without even the implied warranty of
+  ~     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  ~     GNU General Public License for more details.
+  ~
+  ~     You should have received a copy of the GNU General Public License
+  ~     along with this program.  If not, see <http://www.gnu.org/licenses/>.
+  -->
+
 <RelativeLayout
     android:id="@+id/main_layout"
     xmlns:android="http://schemas.android.com/apk/res/android"
@@ -56,12 +74,44 @@
             android:scrollbars="vertical"
             app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"/>
 
+        <com.github.clans.fab.FloatingActionMenu
+                android:id="@+id/main_fab"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="bottom|end"
+                android:layout_margin="16dp"
+                app:menu_colorNormal="@color/colorAccent">
+
+            <com.github.clans.fab.FloatingActionButton
+                android:id="@+id/main_fab_cancel"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                app:fab_label="@string/main_fab_cancel"
+                app:fab_size="mini"/>
+
+            <com.github.clans.fab.FloatingActionButton
+                android:id="@+id/main_fab_jump"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                app:fab_label="@string/main_jump_title"
+                app:fab_size="mini"/>
+
+            <com.github.clans.fab.FloatingActionButton
+                android:id="@+id/main_fab_id"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                app:fab_label="@string/main_open_gallery_by_id"
+                app:fab_size="mini"/>
+
+        </com.github.clans.fab.FloatingActionMenu>
+
     </androidx.coordinatorlayout.widget.CoordinatorLayout>
 
     <com.arlib.floatingsearchview.FloatingSearchView
         android:id="@+id/main_searchview"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
+        app:floatingSearch_backgroundColor="?attr/colorSurface"
         app:floatingSearch_searchBarMarginLeft="8dp"
         app:floatingSearch_searchBarMarginRight="8dp"
         app:floatingSearch_searchBarMarginTop="8dp"

app/src/main/res/layout/activity_reader.xml

@@ -1,4 +1,22 @@
 <?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~     Pupil, Hitomi.la viewer for Android
+  ~     Copyright (C) 2019  tom5079
+  ~
+  ~     This program is free software: you can redistribute it and/or modify
+  ~     it under the terms of the GNU General Public License as published by
+  ~     the Free Software Foundation, either version 3 of the License, or
+  ~     (at your option) any later version.
+  ~
+  ~     This program is distributed in the hope that it will be useful,
+  ~     but WITHOUT ANY WARRANTY; without even the implied warranty of
+  ~     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  ~     GNU General Public License for more details.
+  ~
+  ~     You should have received a copy of the GNU General Public License
+  ~     along with this program.  If not, see <http://www.gnu.org/licenses/>.
+  -->
+
 <androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:id="@+id/reader_layout"
     xmlns:app="http://schemas.android.com/apk/res-auto"
@@ -8,18 +26,11 @@
     android:background="@color/dark_gray"
     tools:context=".ui.ReaderActivity">
 
-    <LinearLayout
+    <androidx.recyclerview.widget.RecyclerView
+        android:id="@+id/reader_recyclerview"
         android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_gravity="center_vertical">
-
-        <androidx.recyclerview.widget.RecyclerView
-            android:id="@+id/reader_recyclerview"
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"/>
-
-    </LinearLayout>
+        android:layout_height="match_parent"
+        app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"/>
 
     <LinearLayout
         android:layout_width="match_parent"
@@ -39,6 +50,7 @@
             android:layout_width="match_parent"
             android:layout_height="4dp"
             android:progressTint="@color/material_green_a700"
+            tools:ignore="UnusedAttribute"
             android:visibility="gone"/>
 
     </LinearLayout>
@@ -55,7 +67,6 @@
             android:id="@+id/reader_fab_download"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            app:srcCompat="@drawable/ic_downloading"
             app:fab_label="@string/reader_fab_download"
             app:fab_size="mini"/>
 
@@ -63,7 +74,6 @@
             android:id="@+id/reader_fab_fullscreen"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            app:srcCompat="@drawable/ic_fullscreen"
             app:fab_label="@string/reader_fab_fullscreen"
             app:fab_size="mini"/>
 

app/src/main/res/layout/dialog_default_query.xml

@@ -1,20 +1,29 @@
 <?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~     Pupil, Hitomi.la viewer for Android
+  ~     Copyright (C) 2019  tom5079
+  ~
+  ~     This program is free software: you can redistribute it and/or modify
+  ~     it under the terms of the GNU General Public License as published by
+  ~     the Free Software Foundation, either version 3 of the License, or
+  ~     (at your option) any later version.
+  ~
+  ~     This program is distributed in the hope that it will be useful,
+  ~     but WITHOUT ANY WARRANTY; without even the implied warranty of
+  ~     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  ~     GNU General Public License for more details.
+  ~
+  ~     You should have received a copy of the GNU General Public License
+  ~     along with this program.  If not, see <http://www.gnu.org/licenses/>.
+  -->
+
 <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="wrap_content"
-    android:layout_height="wrap_content"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:padding="16dp">
 
-    <TextView
-        android:id="@+id/default_query_dialog_title"
-        style="@style/TextAppearance.AppCompat.Large"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:text="@string/default_query_dialog_title"
-        app:layout_constraintTop_toTopOf="parent"
-        app:layout_constraintStart_toStartOf="parent"/>
-
     <EditText
         tools:ignore="Autofill"
         android:inputType="text"
@@ -22,7 +31,7 @@
         android:id="@+id/default_query_dialog_edittext"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
-        app:layout_constraintTop_toBottomOf="@id/default_query_dialog_title"
+        app:layout_constraintTop_toTopOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintEnd_toEndOf="parent"/>
 
@@ -98,14 +107,4 @@
 
     </LinearLayout>
 
-    <Button
-        android:id="@+id/default_query_dialog_ok"
-        style="?borderlessButtonStyle"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        app:layout_constraintTop_toBottomOf="@id/default_query_dialog_guro_layout"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toEndOf="parent"
-        android:text="@android:string/ok"/>
-
 </androidx.constraintlayout.widget.ConstraintLayout>

app/src/main/res/layout/dialog_dl_location.xml

@@ -0,0 +1,25 @@
+<?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/>.
+  -->
+
+<LinearLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="vertical"
+    android:padding="16dp"/>

app/src/main/res/layout/dialog_gallery.xml

@@ -0,0 +1,132 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~     Pupil, Hitomi.la viewer for Android
+  ~     Copyright (C) 2019  tom5079
+  ~
+  ~     This program is free software: you can redistribute it and/or modify
+  ~     it under the terms of the GNU General Public License as published by
+  ~     the Free Software Foundation, either version 3 of the License, or
+  ~     (at your option) any later version.
+  ~
+  ~     This program is distributed in the hope that it will be useful,
+  ~     but WITHOUT ANY WARRANTY; without even the implied warranty of
+  ~     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  ~     GNU General Public License for more details.
+  ~
+  ~     You should have received a copy of the GNU General Public License
+  ~     along with this program.  If not, see <http://www.gnu.org/licenses/>.
+  -->
+
+<androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/gallery_layout"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:orientation="vertical">
+
+    <com.google.android.material.appbar.AppBarLayout
+        android:id="@+id/gallery_toolbar"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content">
+
+        <com.google.android.material.appbar.CollapsingToolbarLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            app:layout_scrollFlags="scroll|exitUntilCollapsed">
+
+            <androidx.constraintlayout.widget.ConstraintLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:padding="8dp">
+
+                <ImageView
+                    android:id="@+id/gallery_cover"
+                    android:layout_width="150dp"
+                    android:layout_height="wrap_content"
+                    android:adjustViewBounds="true"
+                    app:layout_constraintTop_toTopOf="parent"
+                    app:layout_constraintBottom_toBottomOf="parent"
+                    app:layout_constraintLeft_toLeftOf="parent"
+                    app:layout_constraintRight_toLeftOf="@id/gallery_title"/>
+
+                <TextView
+                    android:id="@+id/gallery_title"
+                    style="@style/TextAppearance.AppCompat.Headline"
+                    android:layout_width="0dp"
+                    android:layout_height="wrap_content"
+                    app:layout_constraintTop_toTopOf="parent"
+                    app:layout_constraintLeft_toRightOf="@id/gallery_cover"
+                    app:layout_constraintRight_toRightOf="parent"
+                    android:layout_marginLeft="8dp"
+                    android:layout_marginStart="8dp"/>
+
+                <TextView
+                    style="@style/TextAppearance.AppCompat.Medium"
+                    android:id="@+id/gallery_artist"
+                    android:layout_width="0dp"
+                    android:layout_height="wrap_content"
+                    app:layout_constraintTop_toBottomOf="@id/gallery_title"
+                    app:layout_constraintLeft_toRightOf="@id/gallery_cover"
+                    app:layout_constraintRight_toRightOf="parent"
+                    android:layout_marginLeft="8dp"
+                    android:layout_marginStart="8dp"/>
+
+                <View
+                    android:id="@+id/gallery_padding"
+                    android:layout_width="match_parent"
+                    android:layout_height="0dp"
+                    app:layout_constraintTop_toBottomOf="@id/gallery_artist"
+                    app:layout_constraintBottom_toTopOf="@id/gallery_type"/>
+
+                <com.google.android.material.chip.Chip
+                    android:id="@+id/gallery_type"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    app:layout_constraintBottom_toBottomOf="parent"
+                    app:layout_constraintLeft_toRightOf="@id/gallery_cover"
+                    android:layout_marginLeft="8dp"
+                    android:layout_marginStart="8dp"/>
+
+            </androidx.constraintlayout.widget.ConstraintLayout>
+
+        </com.google.android.material.appbar.CollapsingToolbarLayout>
+
+    </com.google.android.material.appbar.AppBarLayout>
+
+    <androidx.core.widget.NestedScrollView
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        app:layout_behavior="@string/appbar_scrolling_view_behavior">
+
+        <LinearLayout
+            android:id="@+id/gallery_contents"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:orientation="vertical"/>
+
+    </androidx.core.widget.NestedScrollView>
+
+    <androidx.constraintlayout.widget.ConstraintLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent">
+
+        <ProgressBar
+            android:id="@+id/gallery_progressbar"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            app:layout_constraintLeft_toLeftOf="parent"
+            app:layout_constraintRight_toRightOf="parent"
+            app:layout_constraintTop_toTopOf="parent"
+            app:layout_constraintBottom_toBottomOf="parent"/>
+
+    </androidx.constraintlayout.widget.ConstraintLayout>
+
+    <com.google.android.material.floatingactionbutton.FloatingActionButton
+        android:id="@+id/gallery_fab"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_margin="16dp"
+        app:layout_anchor="@id/gallery_toolbar"
+        app:layout_anchorGravity="bottom|end"/>
+
+</androidx.coordinatorlayout.widget.CoordinatorLayout>

app/src/main/res/layout/dialog_galleryblock.xml

@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    android:padding="16dp">
-
-    <Button
-        android:id="@+id/main_dialog_download"
-        style="?borderlessButtonStyle"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        app:layout_constraintTop_toTopOf="parent"/>
-
-    <Button
-        android:id="@+id/main_dialog_delete"
-        style="?borderlessButtonStyle"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:text="@string/main_dialog_delete"
-        app:layout_constraintTop_toBottomOf="@id/main_dialog_download"/>
-
-</androidx.constraintlayout.widget.ConstraintLayout>

app/src/main/res/layout/dialog_numberpicker.xml

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

app/src/main/res/layout/dialog_proxy.xml

@@ -0,0 +1,123 @@
+<?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/>.
+  -->
+
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:padding="16dp">
+
+    <TextView
+        android:id="@+id/proxy_title"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:paddingBottom="16dp"
+        style="@style/TextAppearance.AppCompat.Large"
+        android:text="@string/settings_proxy_title"
+        app:layout_constraintTop_toTopOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintLeft_toLeftOf="parent"/>
+
+    <TextView
+        android:id="@+id/proxy_type_text"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        app:layout_constraintTop_toBottomOf="@id/proxy_title"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintLeft_toLeftOf="parent"
+        android:text="@string/proxy_dialog_type"
+        android:textAppearance="?android:attr/listSeparatorTextViewStyle"/>
+
+    <Spinner
+        android:id="@+id/proxy_type_selector"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        app:layout_constraintTop_toBottomOf="@id/proxy_type_text"/>
+
+    <TextView
+        android:id="@+id/proxy_server_text"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        app:layout_constraintTop_toBottomOf="@id/proxy_type_selector"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintLeft_toLeftOf="parent"
+        android:text="@string/proxy_dialog_server"
+        android:textAppearance="?android:attr/listSeparatorTextViewStyle"/>
+
+    <LinearLayout
+        android:id="@+id/proxy_address_layout"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        app:layout_constraintTop_toBottomOf="@id/proxy_server_text">
+
+        <androidx.appcompat.widget.AppCompatEditText
+            android:id="@+id/proxy_addr"
+            android:layout_width="0dp"
+            android:layout_weight="2"
+            android:layout_height="wrap_content"
+            android:hint="@string/proxy_dialog_addr_hint"/>
+
+        <androidx.appcompat.widget.AppCompatEditText
+            android:id="@+id/proxy_port"
+            android:layout_width="0dp"
+            android:layout_weight="1"
+            android:layout_height="wrap_content"
+            android:hint="@string/proxy_dialog_port_hint"/>
+
+    </LinearLayout>
+
+    <androidx.appcompat.widget.AppCompatEditText
+        android:id="@+id/proxy_username"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        app:layout_constraintTop_toBottomOf="@id/proxy_address_layout"
+        android:hint="@string/proxy_dialog_username_hint"
+        android:enabled="false"/>
+
+    <androidx.appcompat.widget.AppCompatEditText
+        android:id="@+id/proxy_password"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        app:layout_constraintTop_toBottomOf="@id/proxy_username"
+        android:hint="@string/proxy_dialog_password_hint"
+        android:enabled="false"/>
+
+    <Button
+        android:id="@+id/proxy_cancel"
+        style="?borderlessButtonStyle"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="@android:string/cancel"
+        app:layout_constraintTop_toBottomOf="@id/proxy_password"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toStartOf="@id/proxy_ok"
+        app:layout_constraintRight_toLeftOf="@id/proxy_ok"/>
+
+    <Button
+        android:id="@+id/proxy_ok"
+        style="?borderlessButtonStyle"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="@android:string/ok"
+        app:layout_constraintTop_toBottomOf="@id/proxy_password"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintRight_toRightOf="parent"/>
+
+</androidx.constraintlayout.widget.ConstraintLayout>

app/src/main/res/layout/fragment_pattern_lock.xml

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

app/src/main/res/layout/gallery_details.xml

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

app/src/main/res/layout/item_dl_location.xml

@@ -0,0 +1,51 @@
+<?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/>.
+  -->
+
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:orientation="horizontal" android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:clickable="true"
+    android:focusable="true">
+
+    <RadioButton
+        android:id="@+id/button"
+        android:clickable="false"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"/>
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:orientation="vertical"
+        android:layout_gravity="center_vertical">
+
+        <TextView
+            android:id="@+id/location_type"
+            style="@style/MaterialAlertDialog.MaterialComponents.Title.Text"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"/>
+
+        <TextView
+            android:id="@+id/location_available"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"/>
+
+    </LinearLayout>
+
+</LinearLayout>

app/src/main/res/layout/item_gallery_details.xml

@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~     Pupil, Hitomi.la viewer for Android
+  ~     Copyright (C) 2019  tom5079
+  ~
+  ~     This program is free software: you can redistribute it and/or modify
+  ~     it under the terms of the GNU General Public License as published by
+  ~     the Free Software Foundation, either version 3 of the License, or
+  ~     (at your option) any later version.
+  ~
+  ~     This program is distributed in the hope that it will be useful,
+  ~     but WITHOUT ANY WARRANTY; without even the implied warranty of
+  ~     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  ~     GNU General Public License for more details.
+  ~
+  ~     You should have received a copy of the GNU General Public License
+  ~     along with this program.  If not, see <http://www.gnu.org/licenses/>.
+  -->
+
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:orientation="vertical"
+    android:layout_width="wrap_content"
+    android:layout_height="wrap_content"
+    android:padding="8dp">
+
+    <TextView
+        style="@style/TextAppearance.MaterialComponents.Body2"
+        android:id="@+id/gallery_details_type"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:paddingBottom="8dp"/>
+
+    <com.google.android.material.chip.ChipGroup
+        android:id="@+id/gallery_details_tags"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        app:chipSpacingVertical="4dp"/>
+
+</LinearLayout>

app/src/main/res/layout/item_gallery_thumbnails.xml

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

app/src/main/res/layout/item_galleryblock.xml

@@ -1,173 +1,225 @@
 <?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~     Pupil, Hitomi.la viewer for Android
+  ~     Copyright (C) 2019  tom5079
+  ~
+  ~     This program is free software: you can redistribute it and/or modify
+  ~     it under the terms of the GNU General Public License as published by
+  ~     the Free Software Foundation, either version 3 of the License, or
+  ~     (at your option) any later version.
+  ~
+  ~     This program is distributed in the hope that it will be useful,
+  ~     but WITHOUT ANY WARRANTY; without even the implied warranty of
+  ~     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  ~     GNU General Public License for more details.
+  ~
+  ~     You should have received a copy of the GNU General Public License
+  ~     along with this program.  If not, see <http://www.gnu.org/licenses/>.
+  -->
+
 <androidx.cardview.widget.CardView
 	xmlns:android="http://schemas.android.com/apk/res/android"
 	xmlns:app="http://schemas.android.com/apk/res-auto"
 	android:layout_width="match_parent"
 	android:layout_height="wrap_content"
 	android:layout_margin="8dp"
-	android:paddingStart="0dp"
-	android:paddingLeft="0dp"
-	android:paddingEnd="8dp"
-	android:paddingRight="8dp"
 	app:cardCornerRadius="8dp"
-	android:foreground="?attr/selectableItemBackground"
-	android:focusable="true"
-	android:clickable="true">
+	android:clipChildren="true">
 
-	<LinearLayout
+	<com.daimajia.swipe.SwipeLayout
+		android:id="@+id/galleryblock_swipe_layout"
 		android:layout_width="match_parent"
 		android:layout_height="wrap_content"
-		android:orientation="vertical">
-
-		<androidx.constraintlayout.widget.ConstraintLayout
-			android:layout_width="match_parent"
-			android:layout_height="wrap_content">
-
-			<ProgressBar
-				style="@style/Widget.AppCompat.ProgressBar.Horizontal"
-				android:id="@+id/galleryblock_progressbar"
-				android:layout_width="match_parent"
-				android:layout_height="4dp"
-				android:visibility="gone"
-				app:layout_constraintTop_toTopOf="parent"/>
-
-			<ImageView
-				android:id="@+id/galleryblock_progress_complete"
-				android:layout_width="match_parent"
-				android:layout_height="4dp"
-				android:visibility="invisible"
-				android:scaleType="fitXY"
-				android:contentDescription="@string/reader_imageview_description"
-				app:layout_constraintTop_toTopOf="parent"/>
-
-			<ImageView
-				android:id="@+id/galleryblock_thumbnail"
-				android:layout_width="150dp"
-				android:layout_height="wrap_content"
-				android:contentDescription="@string/galleryblock_thumbnail_description"
-				android:adjustViewBounds="true"
-				app:layout_constraintLeft_toLeftOf="parent"
-				app:layout_constraintTop_toBottomOf="@id/galleryblock_progressbar"
-				app:layout_constraintBottom_toBottomOf="parent"/>
-
-			<TextView
-				style="@style/TextAppearance.AppCompat.Headline"
-				android:id="@+id/galleryblock_title"
-				android:layout_width="0dp"
-				android:layout_height="wrap_content"
-				android:layout_marginTop="8dp"
-				android:layout_marginStart="8dp"
-				android:layout_marginLeft="8dp"
-				app:layout_constraintLeft_toRightOf="@id/galleryblock_thumbnail"
-				app:layout_constraintRight_toRightOf="parent"
-				app:layout_constraintTop_toTopOf="parent"/>
-
-			<TextView
-				style="@style/TextAppearance.AppCompat.Medium"
-				android:id="@+id/galleryblock_artist"
-				android:layout_width="0dp"
-				android:layout_height="wrap_content"
-				android:layout_marginStart="8dp"
-				android:layout_marginLeft="8dp"
-				android:clickable="true"
-				android:focusable="true"
-				app:layout_constraintLeft_toRightOf="@id/galleryblock_thumbnail"
-				app:layout_constraintRight_toRightOf="parent"
-				app:layout_constraintTop_toBottomOf="@id/galleryblock_title"/>
-
-			<TextView
-				android:id="@+id/galleryblock_series"
-				android:layout_width="0dp"
-				android:layout_height="wrap_content"
-				android:layout_marginStart="8dp"
-				android:layout_marginLeft="8dp"
-				android:clickable="true"
-				android:focusable="true"
-				app:layout_constraintTop_toBottomOf="@id/galleryblock_artist"
-				app:layout_constraintStart_toEndOf="@id/galleryblock_thumbnail"
-				app:layout_constraintEnd_toEndOf="parent"/>
-
-			<TextView
-				android:id="@+id/galleryblock_type"
-				android:layout_width="wrap_content"
-				android:layout_height="wrap_content"
-				android:layout_marginStart="8dp"
-				android:layout_marginLeft="8dp"
-				android:clickable="true"
-				android:focusable="true"
-				app:layout_constraintTop_toBottomOf="@id/galleryblock_series"
-				app:layout_constraintStart_toEndOf="@id/galleryblock_thumbnail" />
-
-			<TextView
-				android:id="@+id/galleryblock_language"
-				android:layout_width="wrap_content"
-				android:layout_height="wrap_content"
-				android:layout_marginStart="8dp"
-				android:layout_marginLeft="8dp"
-				android:layout_marginBottom="8dp"
-				android:clickable="true"
-				android:focusable="true"
-				app:layout_constraintTop_toBottomOf="@id/galleryblock_type"
-				app:layout_constraintBottom_toTopOf="@id/galleryblock_padding"
-				app:layout_constraintStart_toEndOf="@id/galleryblock_thumbnail" />
-
-			<View
-				android:id="@+id/galleryblock_padding"
-				android:layout_width="0dp"
-				android:layout_height="0dp"
-				app:layout_constraintEnd_toEndOf="parent"
-				app:layout_constraintTop_toBottomOf="@id/galleryblock_language"
-				app:layout_constraintBottom_toTopOf="@id/galleryblock_tag_group"/>
-
-			<com.google.android.material.chip.ChipGroup
-				android:id="@+id/galleryblock_tag_group"
-				android:layout_width="0dp"
-				android:layout_height="wrap_content"
-				android:layout_marginLeft="8dp"
-				android:layout_marginStart="8dp"
-				android:layout_marginTop="16dp"
-				android:layout_marginBottom="16dp"
-				app:layout_constraintTop_toBottomOf="@id/galleryblock_padding"
-				app:layout_constraintLeft_toRightOf="@id/galleryblock_thumbnail"
-				app:layout_constraintRight_toRightOf="parent"
-				app:layout_constraintBottom_toBottomOf="parent"/>
-
-		</androidx.constraintlayout.widget.ConstraintLayout>
-
-		<View
-			android:layout_width="match_parent"
-			android:layout_height="1dp"
-			android:layout_margin="8dp"
-			android:background="@android:color/darker_gray"/>
+		app:drag_edge="right"
+		app:show_mode="pull_out">
 
 		<LinearLayout
-			android:layout_width="match_parent"
-			android:layout_height="wrap_content"
-			android:paddingLeft="8dp"
-			android:paddingRight="8dp"
-			android:paddingBottom="8dp"
-			android:orientation="horizontal">
+			android:id="@+id/galleryblock_secondary"
+			android:layout_width="wrap_content"
+			android:layout_height="match_parent">
 
 			<TextView
-				android:id="@+id/galleryblock_id"
+				android:id="@+id/galleryblock_download"
 				android:layout_width="wrap_content"
-				android:layout_height="wrap_content"/>
+				android:layout_height="match_parent"
+				android:minWidth="70dp"
+				android:padding="8dp"
+				android:gravity="center"
+				android:background="@android:color/holo_blue_dark"
+				android:textColor="@android:color/white"
+				android:text="@string/main_download"
+				android:foreground="?attr/selectableItemBackground"
+				android:focusable="true"
+				android:clickable="true"/>
 
-			<View
-				android:layout_width="0dp"
-				android:layout_height="1dp"
-				android:layout_weight="1"/>
-
-			<ImageView
-				android:id="@+id/galleryblock_favorite"
-				android:contentDescription="@string/app_name"
-				android:layout_width="32dp"
-				android:layout_height="32dp"
-				app:srcCompat="@drawable/ic_star_empty"
-				app:backgroundTint="@color/material_orange_500"/>
+			<TextView
+				android:id="@+id/galleryblock_delete"
+				android:layout_width="wrap_content"
+				android:layout_height="match_parent"
+				android:minWidth="70dp"
+				android:padding="8dp"
+				android:gravity="center"
+				android:background="@android:color/holo_red_dark"
+				android:textColor="@android:color/white"
+				android:text="@string/main_delete"
+				android:foreground="?attr/selectableItemBackground"
+				android:focusable="true"
+				android:clickable="true"/>
 
 		</LinearLayout>
 
-	</LinearLayout>
+		<LinearLayout
+			android:id="@+id/galleryblock_primary"
+			android:layout_width="match_parent"
+			android:layout_height="wrap_content"
+			android:orientation="vertical"
+			android:foreground="?attr/selectableItemBackground"
+			android:focusable="true"
+			android:clickable="true">
+
+			<androidx.constraintlayout.widget.ConstraintLayout
+				android:layout_width="match_parent"
+				android:layout_height="wrap_content">
+
+				<ProgressBar
+					style="@style/Widget.AppCompat.ProgressBar.Horizontal"
+					android:id="@+id/galleryblock_progressbar"
+					android:layout_width="match_parent"
+					android:layout_height="4dp"
+					android:visibility="gone"
+					app:layout_constraintTop_toTopOf="parent"/>
+
+				<ImageView
+					android:id="@+id/galleryblock_progress_complete"
+					android:layout_width="match_parent"
+					android:layout_height="4dp"
+					android:visibility="invisible"
+					android:scaleType="fitXY"
+					android:contentDescription="@string/reader_imageview_description"
+					app:layout_constraintTop_toTopOf="parent"/>
+
+				<ImageView
+					android:id="@+id/galleryblock_thumbnail"
+					android:layout_width="150dp"
+					android:layout_height="wrap_content"
+					android:contentDescription="@string/galleryblock_thumbnail_description"
+					android:adjustViewBounds="true"
+					app:layout_constraintLeft_toLeftOf="parent"
+					app:layout_constraintTop_toBottomOf="@id/galleryblock_progressbar"
+					app:layout_constraintBottom_toBottomOf="parent"/>
+
+				<TextView
+					style="@style/TextAppearance.AppCompat.Headline"
+					android:id="@+id/galleryblock_title"
+					android:layout_width="0dp"
+					android:layout_height="wrap_content"
+					android:layout_marginTop="8dp"
+					android:layout_marginStart="8dp"
+					android:layout_marginLeft="8dp"
+					app:layout_constraintLeft_toRightOf="@id/galleryblock_thumbnail"
+					app:layout_constraintRight_toRightOf="parent"
+					app:layout_constraintTop_toTopOf="parent"/>
+
+				<TextView
+					style="@style/TextAppearance.AppCompat.Medium"
+					android:id="@+id/galleryblock_artist"
+					android:layout_width="0dp"
+					android:layout_height="wrap_content"
+					android:layout_marginStart="8dp"
+					android:layout_marginLeft="8dp"
+					app:layout_constraintLeft_toRightOf="@id/galleryblock_thumbnail"
+					app:layout_constraintRight_toRightOf="parent"
+					app:layout_constraintTop_toBottomOf="@id/galleryblock_title"/>
+
+				<TextView
+					android:id="@+id/galleryblock_series"
+					android:layout_width="0dp"
+					android:layout_height="wrap_content"
+					android:layout_marginStart="8dp"
+					android:layout_marginLeft="8dp"
+					app:layout_constraintTop_toBottomOf="@id/galleryblock_artist"
+					app:layout_constraintStart_toEndOf="@id/galleryblock_thumbnail"
+					app:layout_constraintEnd_toEndOf="parent"/>
+
+				<TextView
+					android:id="@+id/galleryblock_type"
+					android:layout_width="wrap_content"
+					android:layout_height="wrap_content"
+					android:layout_marginStart="8dp"
+					android:layout_marginLeft="8dp"
+					app:layout_constraintTop_toBottomOf="@id/galleryblock_series"
+					app:layout_constraintStart_toEndOf="@id/galleryblock_thumbnail" />
+
+				<TextView
+					android:id="@+id/galleryblock_language"
+					android:layout_width="wrap_content"
+					android:layout_height="wrap_content"
+					android:layout_marginStart="8dp"
+					android:layout_marginLeft="8dp"
+					android:layout_marginBottom="8dp"
+					app:layout_constraintTop_toBottomOf="@id/galleryblock_type"
+					app:layout_constraintBottom_toTopOf="@id/galleryblock_padding"
+					app:layout_constraintStart_toEndOf="@id/galleryblock_thumbnail" />
+
+				<View
+					android:id="@+id/galleryblock_padding"
+					android:layout_width="0dp"
+					android:layout_height="0dp"
+					app:layout_constraintEnd_toEndOf="parent"
+					app:layout_constraintTop_toBottomOf="@id/galleryblock_language"
+					app:layout_constraintBottom_toTopOf="@id/galleryblock_tag_group"/>
+
+				<com.google.android.material.chip.ChipGroup
+					android:id="@+id/galleryblock_tag_group"
+					android:layout_width="0dp"
+					android:layout_height="wrap_content"
+					android:layout_marginLeft="8dp"
+					android:layout_marginStart="8dp"
+					android:layout_marginTop="16dp"
+					android:layout_marginBottom="16dp"
+					app:chipSpacing="4dp"
+					app:layout_constraintTop_toBottomOf="@id/galleryblock_padding"
+					app:layout_constraintLeft_toRightOf="@id/galleryblock_thumbnail"
+					app:layout_constraintRight_toRightOf="parent"
+					app:layout_constraintBottom_toBottomOf="parent"/>
+
+			</androidx.constraintlayout.widget.ConstraintLayout>
+
+			<View
+				android:layout_width="match_parent"
+				android:layout_height="1dp"
+				android:layout_margin="8dp"
+				android:background="@android:color/darker_gray"/>
+
+			<LinearLayout
+				android:layout_width="match_parent"
+				android:layout_height="wrap_content"
+				android:paddingLeft="8dp"
+				android:paddingRight="8dp"
+				android:paddingBottom="8dp"
+				android:orientation="horizontal">
+
+				<TextView
+					android:id="@+id/galleryblock_id"
+					android:layout_width="wrap_content"
+					android:layout_height="wrap_content"/>
+
+				<View
+					android:layout_width="0dp"
+					android:layout_height="1dp"
+					android:layout_weight="1"/>
+
+				<ImageView
+					android:id="@+id/galleryblock_favorite"
+					android:contentDescription="@string/app_name"
+					android:layout_width="32dp"
+					android:layout_height="32dp"
+					app:srcCompat="@drawable/ic_star_empty"/>
+
+			</LinearLayout>
+
+		</LinearLayout>
+
+	</com.daimajia.swipe.SwipeLayout>
 
 </androidx.cardview.widget.CardView>

app/src/main/res/layout/item_mirrors.xml

@@ -0,0 +1,49 @@
+<?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/>.
+  -->
+
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:paddingStart="32dp"
+    android:paddingLeft="32dp"
+    android:paddingEnd="32dp"
+    android:paddingRight="32dp"
+    android:paddingTop="16dp">
+
+    <TextView
+        android:id="@+id/mirror_name"
+        style="@style/TextAppearance.MaterialComponents.Headline6"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
+        app:layout_constraintBottom_toBottomOf="parent"/>
+
+    <ImageView
+        android:id="@+id/mirror_button"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        app:srcCompat="@drawable/menu"
+        app:tint="?attr/colorControlNormal"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
+        app:layout_constraintBottom_toBottomOf="parent"/>
+
+</androidx.constraintlayout.widget.ConstraintLayout>

app/src/main/res/layout/item_next.xml

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

app/src/main/res/layout/item_prev.xml

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

app/src/main/res/layout/item_progressbar.xml

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

app/src/main/res/layout/item_reader.xml

@@ -1,8 +1,77 @@
 <?xml version="1.0" encoding="utf-8"?>
-<ImageView xmlns:android="http://schemas.android.com/apk/res/android"
-    android:contentDescription="@string/reader_imageview_description"
+<!--
+  ~     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/>.
+  -->
+
+
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:paddingBottom="8dp"
-    android:scaleType="fitCenter"
-    android:adjustViewBounds="true"/>
+    xmlns:app="http://schemas.android.com/apk/res-auto">
+
+    <androidx.constraintlayout.widget.ConstraintLayout
+        android:id="@+id/container"
+        android:layout_width="0dp"
+        android:layout_height="0dp"
+        app:layout_constraintHeight_max="2000dp"
+        app:layout_constraintTop_toTopOf="parent"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintLeft_toLeftOf="parent"
+        app:layout_constraintRight_toRightOf="parent"
+        android:background="@drawable/reader_item_boundary">
+
+        <LinearLayout
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            app:layout_constraintTop_toTopOf="parent"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintEnd_toEndOf="parent"
+            android:gravity="center_horizontal"
+            android:orientation="vertical">
+
+            <ProgressBar
+                android:id="@+id/reader_item_progressbar"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                style="?android:progressBarStyleHorizontal"
+                android:indeterminate="false"
+                android:progress="0"
+                android:max="100"
+                android:visibility="visible"/>
+
+            <TextView
+                android:id="@+id/reader_index"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                style="@style/TextAppearance.AppCompat.Caption"/>
+
+        </LinearLayout>
+
+        <com.github.chrisbanes.photoview.PhotoView
+            android:id="@+id/image"
+            android:adjustViewBounds="true"
+            android:scaleType="fitCenter"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            app:layout_constraintTop_toTopOf="parent"
+            app:layout_constraintLeft_toLeftOf="parent"
+            android:paddingBottom="8dp"/>
+
+    </androidx.constraintlayout.widget.ConstraintLayout>
+
+</androidx.constraintlayout.widget.ConstraintLayout>

app/src/main/res/layout/nav_header_main.xml

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

app/src/main/res/layout/settings_activity.xml

@@ -1,3 +1,21 @@
+<!--
+  ~     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/>.
+  -->
+
 <LinearLayout
 		xmlns:android="http://schemas.android.com/apk/res/android"
 		android:layout_width="match_parent"

app/src/main/res/layout/tag_chip.xml

@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<com.google.android.material.chip.Chip
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    android:layout_width="wrap_content"
-    android:layout_height="24dp"
-    app:chipIconSize="16dp"
-    app:chipStartPadding="8dp"
-    app:chipCornerRadius="100dp"/>

app/src/main/res/menu/activity_main_drawer.xml

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

app/src/main/res/menu/gallery.xml

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