Update version name

.gitignore

@@ -4,6 +4,7 @@
 /.idea/caches
 /.idea/libraries
 /.idea/modules.xml
+/.idea/misc.xml
 /.idea/workspace.xml
 /.idea/navEditor.xml
 /.idea/assetWizardSettings.xml

.idea/compiler.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="CompilerConfiguration">
-    <bytecodeTargetLevel target="1.8" />
+    <bytecodeTargetLevel target="11" />
   </component>
 </project>

.idea/deploymentTargetDropDown.xml

@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="deploymentTargetDropDown">
+    <targetSelectedWithDropDown>
+      <Target>
+        <type value="QUICK_BOOT_TARGET" />
+        <deviceKey>
+          <Key>
+            <type value="VIRTUAL_DEVICE_PATH" />
+            <value value="$USER_HOME$/.android/avd/Pixel_API_S.avd" />
+          </Key>
+        </deviceKey>
+      </Target>
+    </targetSelectedWithDropDown>
+    <timeTargetWasSelectedWithDropDown value="2021-02-19T19:02:37.198775Z" />
+  </component>
+</project>

.idea/dictionaries/admin.xml

@@ -1,12 +1,14 @@
 <component name="ProjectDictionaryState">
   <dictionary name="admin">
     <words>
+      <w>amoled</w>
       <w>chucker</w>
       <w>desu</w>
       <w>failsafe</w>
       <w>koin</w>
       <w>kotatsu</w>
       <w>manga</w>
+      <w>snackbar</w>
       <w>upsert</w>
       <w>webtoon</w>
     </words>

.idea/gradle.xml

@@ -4,10 +4,9 @@
   <component name="GradleSettings">
     <option name="linkedExternalProjectsSettings">
       <GradleProjectSettings>
-        <option name="testRunner" value="PLATFORM" />
+        <option name="testRunner" value="GRADLE" />
         <option name="distributionType" value="DEFAULT_WRAPPED" />
         <option name="externalProjectPath" value="$PROJECT_DIR$" />
-        <option name="gradleJvm" value="1.8" />
         <option name="modules">
           <set>
             <option value="$PROJECT_DIR$" />
@@ -15,7 +14,6 @@
           </set>
         </option>
         <option name="resolveModulePerSourceSet" value="false" />
-        <option name="useQualifiedModuleNames" value="true" />
       </GradleProjectSettings>
     </option>
   </component>

.idea/inspectionProfiles/Project_Default.xml

@@ -2,6 +2,8 @@
   <profile version="1.0">
     <option name="myName" value="Project Default" />
     <inspection_tool class="BooleanLiteralArgument" enabled="true" level="WEAK WARNING" enabled_by_default="true" />
+    <inspection_tool class="KeySetIterationMayUseEntrySet" enabled="true" level="WARNING" enabled_by_default="true" />
     <inspection_tool class="TrailingComma" enabled="true" level="INFORMATION" enabled_by_default="true" />
+    <inspection_tool class="ZeroLengthArrayInitialization" enabled="true" level="WARNING" enabled_by_default="true" />
   </profile>
 </component>

.idea/misc.xml

@@ -1,6 +1,35 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" default="true" project-jdk-name="1.8" project-jdk-type="JavaSDK">
+  <component name="DesignSurface">
+    <option name="filePathToZoomLevelMap">
+      <map>
+        <entry key="../../../../../../layout/custom_preview.xml" value="0.1" />
+        <entry key="../../../../../../opt/usr/android-sdk/platforms/android-30/data/res/drawable/list_divider_material.xml" value="0.28512820512820514" />
+        <entry key="../../../../../../opt/usr/android-sdk/platforms/android-30/data/res/layout/simple_dropdown_item_1line.xml" value="0.24739583333333334" />
+        <entry key="app/src/main/res/drawable/tab_indicator.xml" value="0.28512820512820514" />
+        <entry key="app/src/main/res/drawable/tabs_background.xml" value="0.28512820512820514" />
+        <entry key="app/src/main/res/layout-w600dp/fragment_details.xml" value="0.14583333333333334" />
+        <entry key="app/src/main/res/layout-w600dp/fragment_list.xml" value="0.14635416666666667" />
+        <entry key="app/src/main/res/layout/dialog_favorite_categories.xml" value="0.2601851851851852" />
+        <entry key="app/src/main/res/layout/dialog_list_mode.xml" value="0.2601851851851852" />
+        <entry key="app/src/main/res/layout/fragment_chapters.xml" value="0.24739583333333334" />
+        <entry key="app/src/main/res/layout/fragment_details.xml" value="0.26145833333333335" />
+        <entry key="app/src/main/res/layout/fragment_favourites.xml" value="0.26296296296296295" />
+        <entry key="app/src/main/res/layout/fragment_feed.xml" value="0.2601851851851852" />
+        <entry key="app/src/main/res/layout/fragment_list.xml" value="0.2601851851851852" />
+        <entry key="app/src/main/res/layout/item_branch.xml" value="0.24739583333333334" />
+        <entry key="app/src/main/res/layout/item_branch_dropdown.xml" value="0.25743589743589745" />
+        <entry key="app/src/main/res/layout/item_category_checkable.xml" value="0.2601851851851852" />
+        <entry key="app/src/main/res/layout/item_manga_grid.xml" value="0.26042632066728455" />
+        <entry key="app/src/main/res/layout/item_manga_list_details.xml" value="0.2601851851851852" />
+        <entry key="app/src/main/res/layout/item_page_thumb.xml" value="0.2601851851851852" />
+        <entry key="app/src/main/res/layout/item_recent.xml" value="0.2601851851851852" />
+        <entry key="app/src/main/res/layout/sheet_pages.xml" value="0.2601851851851852" />
+        <entry key="app/src/main/res/menu/popup_category.xml" value="0.2601851851851852" />
+      </map>
+    </option>
+  </component>
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_11" default="true" project-jdk-name="11" project-jdk-type="JavaSDK">
     <output url="file://$PROJECT_DIR$/build/classes" />
   </component>
   <component name="ProjectType">

.idea/runConfigurations.xml

@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="RunConfigurationProducerService">
-    <option name="ignoredProducers">
-      <set>
-        <option value="org.jetbrains.plugins.gradle.execution.test.runner.AllInPackageGradleConfigurationProducer" />
-        <option value="org.jetbrains.plugins.gradle.execution.test.runner.TestClassGradleConfigurationProducer" />
-        <option value="org.jetbrains.plugins.gradle.execution.test.runner.TestMethodGradleConfigurationProducer" />
-      </set>
-    </option>
-  </component>
-</project>

.travis.yml

@@ -1,15 +1,11 @@
 language: android
 dist: trusty
-jdk:
-  - oraclejdk8
 android:
   components:
-    - tools
-    - platform-tools-30.0.3
-    - build-tools-30.0.2
     - android-30
-  licenses:
-    - android-sdk-preview-license-.+
-    - android-sdk-license-.+
-    - google-gdk-license-.+
+    - build-tools-30.0.3
+    - platform-tools-30.0.5
+    - tools
+before_install:
+  - yes | sdkmanager "platforms;android-30"
 script: ./gradlew -Dorg.gradle.jvmargs=-Xmx1536m assembleDebug lintDebug

README.md

@@ -15,20 +15,20 @@ Legacy build (Android 4.1+): [available here](https://github.com/nv95/Kotatsu/re
 * Online manga catalogues
 * Search manga by name and genre
 * Reading history
-* Favourites with custom categories
-* Saving manga and reading it offline
-* Tablet-optimized modern UI
-* Reading third-party comics from CBZ
+* Favourites organized by user-defined categories
+* Downloading manga and reading it offline. Third-party CBZ archives also supported
+* Tablet-optimized material design UI
 * Standard and Webtoon-optimized reader
-* Notifications about new chapters
-* Updates feed
-* Global search
+* Notifications about new chapters with updates feed
 
 ### Screenshots
 
-| ![Screenshot_20200226-210337](https://user-images.githubusercontent.com/8948226/80315102-3478db00-87fe-11ea-9ce8-4bbd1c254b2b.png) | ![Screenshot_20200226-210310](https://user-images.githubusercontent.com/8948226/80315110-3f337000-87fe-11ea-95df-944c196b6667.png) | ![Screenshot_20200226-210232](https://user-images.githubusercontent.com/8948226/80315121-49ee0500-87fe-11ea-8d9b-537a041bbf2f.png) |
+| ![Screenshot_20200226-210337](https://github.com/nv95/Kotatsu/raw/devel/metadata/en-US/images/phoneScreenshots/1.png) | ![](https://github.com/nv95/Kotatsu/raw/devel/metadata/en-US/images/phoneScreenshots/2.png) | ![Screenshot_20200226-210232](https://github.com/nv95/Kotatsu/raw/devel/metadata/en-US/images/phoneScreenshots/3.png) |
 |---|---|---|
-| ![Screenshot_20200226-210405](https://user-images.githubusercontent.com/8948226/80315130-55d9c700-87fe-11ea-8350-2c8452906eb7.png)  | ![Screenshot_20200226-210151](https://user-images.githubusercontent.com/8948226/80315135-612cf280-87fe-11ea-984c-aa18567d5bbc.png) | ![Screenshot_20200226-210223](https://user-images.githubusercontent.com/8948226/80315146-6be78780-87fe-11ea-8439-ca1ca578172b.png) |
+| ![Screenshot_20200226-210405](https://github.com/nv95/Kotatsu/raw/devel/metadata/en-US/images/phoneScreenshots/4.png)  | ![Screenshot_20200226-210151](https://github.com/nv95/Kotatsu/raw/devel/metadata/en-US/images/phoneScreenshots/5.png) | ![Screenshot_20200226-210223](https://github.com/nv95/Kotatsu/raw/devel/metadata/en-US/images/phoneScreenshots/6.png) |
+
+| ![](https://github.com/nv95/Kotatsu/raw/devel/metadata/en-US/images/tenInchScreenshots/1.png) | ![](https://github.com/nv95/Kotatsu/raw/devel/metadata/en-US/images/tenInchScreenshots/2.png) |
+|---|---|
 
 ### License
 [![GNU GPLv3 Image](https://www.gnu.org/graphics/gplv3-127x51.png)](http://www.gnu.org/licenses/gpl-3.0.en.html)  

app/build.gradle

@@ -1,22 +1,22 @@
 plugins {
 	id 'com.android.application'
 	id 'kotlin-android'
-	id 'kotlin-android-extensions'
 	id 'kotlin-kapt'
+	id 'kotlin-parcelize'
 }
 
 def gitCommits = 'git rev-list --count HEAD'.execute([], rootDir).text.trim().toInteger()
 
 android {
 	compileSdkVersion 30
-	buildToolsVersion '30.0.2'
+	buildToolsVersion '30.0.3'
 
 	defaultConfig {
 		applicationId 'org.koitharu.kotatsu'
 		minSdkVersion 21
 		targetSdkVersion 30
 		versionCode gitCommits
-		versionName '0.5.2'
+		versionName '1.0'
 
 		kapt {
 			arguments {
@@ -39,67 +39,70 @@ android {
 			proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
 		}
 	}
+	buildFeatures {
+		viewBinding true
+	}
 	lintOptions {
 		disable 'MissingTranslation'
 		abortOnError false
 	}
 	testOptions {
 		unitTests.includeAndroidResources = true
-		unitTests.returnDefaultValues = true
+		unitTests.returnDefaultValues = false
 	}
 }
-androidExtensions {
-	experimental = true
-}
 tasks.withType(org.jetbrains.kotlin.gradle.tasks.KotlinCompile).all {
 	kotlinOptions {
 		jvmTarget = JavaVersion.VERSION_1_8.toString()
-		freeCompilerArgs += ['-Xopt-in=kotlinx.coroutines.ExperimentalCoroutinesApi', '-Xjvm-default=all']
+		freeCompilerArgs += [
+				'-Xopt-in=kotlinx.coroutines.ExperimentalCoroutinesApi',
+				'-Xopt-in=org.koin.core.component.KoinApiExtension'
+		]
 	}
 }
 dependencies {
 	implementation fileTree(dir: 'libs', include: ['*.jar', '*.aar'])
-	implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
-	implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-core:1.3.9'
-	implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-android:1.3.9'
+	implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-core:1.4.2'
+	implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-android:1.4.2'
 
-	implementation 'androidx.core:core-ktx:1.5.0-alpha03'
-	implementation 'androidx.activity:activity-ktx:1.2.0-alpha08'
-	implementation 'androidx.fragment:fragment-ktx:1.3.0-alpha08'
-	implementation 'androidx.lifecycle:lifecycle-runtime-ktx:2.3.0-alpha07'
-	implementation 'androidx.constraintlayout:constraintlayout:2.0.1'
+	implementation 'androidx.core:core-ktx:1.5.0-rc01'
+	implementation 'androidx.activity:activity-ktx:1.2.2'
+	implementation 'androidx.fragment:fragment-ktx:1.3.2'
+	implementation 'androidx.lifecycle:lifecycle-runtime-ktx:2.3.1'
+	implementation 'androidx.lifecycle:lifecycle-viewmodel-ktx:2.3.1'
+	implementation 'androidx.lifecycle:lifecycle-livedata-ktx:2.3.1'
+	implementation 'androidx.lifecycle:lifecycle-service:2.3.1'
+	implementation 'androidx.lifecycle:lifecycle-process:2.3.1'
+	implementation 'androidx.constraintlayout:constraintlayout:2.0.4'
 	implementation 'androidx.swiperefreshlayout:swiperefreshlayout:1.1.0'
-	implementation 'androidx.recyclerview:recyclerview:1.2.0-alpha05'
+	implementation 'androidx.recyclerview:recyclerview:1.2.0-rc01'
 	implementation 'androidx.viewpager2:viewpager2:1.1.0-alpha01'
 	implementation 'androidx.preference:preference-ktx:1.1.1'
-	implementation 'androidx.work:work-runtime-ktx:2.4.0'
-	implementation 'com.google.android.material:material:1.3.0-alpha02'
+	implementation 'androidx.work:work-runtime-ktx:2.5.0'
+	implementation 'com.google.android.material:material:1.3.0'
 	//noinspection LifecycleAnnotationProcessorWithJava8
-	kapt 'androidx.lifecycle:lifecycle-compiler:2.3.0-alpha07'
+	kapt 'androidx.lifecycle:lifecycle-compiler:2.3.1'
 
-	implementation 'androidx.room:room-runtime:2.2.5'
-	implementation 'androidx.room:room-ktx:2.2.5'
-	kapt 'androidx.room:room-compiler:2.2.5'
-
-	implementation 'com.github.moxy-community:moxy:2.1.2'
-	implementation 'com.github.moxy-community:moxy-androidx:2.1.2'
-	implementation 'com.github.moxy-community:moxy-material:2.1.2'
-	implementation 'com.github.moxy-community:moxy-ktx:2.1.2'
-	kapt 'com.github.moxy-community:moxy-compiler:2.1.2'
+	implementation 'androidx.room:room-runtime:2.2.6'
+	implementation 'androidx.room:room-ktx:2.2.6'
+	kapt 'androidx.room:room-compiler:2.2.6'
 
 	implementation 'com.squareup.okhttp3:okhttp:4.9.0'
-	implementation 'com.squareup.okio:okio:2.8.0'
+	implementation 'com.squareup.okio:okio:2.10.0'
 	implementation 'org.jsoup:jsoup:1.13.1'
 
-	implementation 'org.koin:koin-android:2.2.0-beta-1'
-	implementation 'io.coil-kt:coil:1.0.0-rc2'
-	implementation 'com.davemorrissey.labs:subsampling-scale-image-view:3.10.0'
+	implementation 'com.hannesdorfmann:adapterdelegates4-kotlin-dsl:4.3.0'
+	implementation 'com.hannesdorfmann:adapterdelegates4-kotlin-dsl-viewbinding:4.3.0'
+
+	implementation 'org.koin:koin-android:2.2.2'
+	implementation 'org.koin:koin-androidx-viewmodel:2.2.2'
+	implementation 'io.coil-kt:coil-base:1.1.1'
+	implementation 'com.davemorrissey.labs:subsampling-scale-image-view-androidx:3.10.0'
 	implementation 'com.tomclaw.cache:cache:1.0'
 
-	debugImplementation 'com.squareup.leakcanary:leakcanary-android:2.3'
-	debugImplementation 'com.github.ChuckerTeam.Chucker:library:3.2.0'
-	releaseImplementation 'com.github.ChuckerTeam.Chucker:library-no-op:3.2.0'
+	debugImplementation 'com.squareup.leakcanary:leakcanary-android:2.6'
 
-	testImplementation 'junit:junit:4.13'
-	testImplementation 'org.json:json:20200518'
+	testImplementation 'junit:junit:4.13.2'
+	testImplementation 'org.json:json:20201115'
+	testImplementation 'org.koin:koin-test:2.2.2'
 }

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

@@ -0,0 +1,3 @@
+<resources>
+	<string name="app_name" translatable="false">Kotatsu Dev</string>
+</resources>

app/src/main/AndroidManifest.xml

@@ -23,7 +23,7 @@
 		android:theme="@style/AppTheme"
 		android:usesCleartextTraffic="true"
 		tools:ignore="UnusedAttribute">
-		<activity android:name=".ui.list.MainActivity">
+		<activity android:name="org.koitharu.kotatsu.main.ui.MainActivity">
 			<intent-filter>
 				<action android:name="android.intent.action.MAIN" />
 				<category android:name="android.intent.category.LAUNCHER" />
@@ -32,58 +32,66 @@
 				android:name="android.app.default_searchable"
 				android:value=".ui.search.SearchActivity" />
 		</activity>
-		<activity android:name=".ui.details.MangaDetailsActivity">
+		<activity android:name="org.koitharu.kotatsu.details.ui.DetailsActivity">
 			<intent-filter>
 				<action android:name="${applicationId}.action.VIEW_MANGA" />
 			</intent-filter>
 		</activity>
-		<activity android:name=".ui.reader.ReaderActivity" />
+		<activity android:name="org.koitharu.kotatsu.reader.ui.ReaderActivity">
+			<intent-filter>
+				<action android:name="${applicationId}.action.READ_MANGA" />
+			</intent-filter>
+		</activity>
 		<activity
-			android:name=".ui.search.SearchActivity"
+			android:name="org.koitharu.kotatsu.search.ui.SearchActivity"
 			android:label="@string/search" />
 		<activity
-			android:name=".ui.settings.SettingsActivity"
+			android:name="org.koitharu.kotatsu.settings.SettingsActivity"
 			android:label="@string/settings" />
 		<activity
-			android:name=".ui.reader.SimpleSettingsActivity"
+			android:name="org.koitharu.kotatsu.reader.ui.SimpleSettingsActivity"
 			android:label="@string/settings">
 			<intent-filter>
 				<action android:name="android.intent.action.MANAGE_NETWORK_USAGE" />
 				<category android:name="android.intent.category.DEFAULT" />
 			</intent-filter>
 		</activity>
-		<activity android:name=".ui.browser.BrowserActivity" />
+		<activity android:name="org.koitharu.kotatsu.browser.BrowserActivity" />
 		<activity
-			android:name=".ui.utils.CrashActivity"
+			android:name="org.koitharu.kotatsu.core.ui.CrashActivity"
 			android:label="@string/error_occurred"
-			android:theme="@android:style/Theme.DeviceDefault.Dialog"
+			android:theme="@android:style/Theme.DeviceDefault"
 			android:windowSoftInputMode="stateAlwaysHidden" />
 		<activity
-			android:name="org.koitharu.kotatsu.ui.list.favourites.categories.CategoriesActivity"
+			android:name="org.koitharu.kotatsu.favourites.ui.categories.CategoriesActivity"
 			android:label="@string/favourites_categories"
 			android:windowSoftInputMode="stateAlwaysHidden" />
 		<activity
-			android:name=".ui.widget.shelf.ShelfConfigActivity"
+			android:name="org.koitharu.kotatsu.widget.shelf.ShelfConfigActivity"
 			android:label="@string/manga_shelf">
 			<intent-filter>
 				<action android:name="android.appwidget.action.APPWIDGET_CONFIGURE" />
 			</intent-filter>
 		</activity>
-		<activity android:name=".ui.search.global.GlobalSearchActivity"
+		<activity
+			android:name="org.koitharu.kotatsu.search.ui.global.GlobalSearchActivity"
 			android:label="@string/search" />
+		<activity
+			android:name="org.koitharu.kotatsu.main.ui.protect.ProtectActivity"
+			android:windowSoftInputMode="adjustResize" />
 
 		<service
-			android:name=".ui.download.DownloadService"
+			android:name="org.koitharu.kotatsu.download.DownloadService"
 			android:foregroundServiceType="dataSync" />
 		<service
-			android:name=".ui.widget.shelf.ShelfWidgetService"
+			android:name="org.koitharu.kotatsu.widget.shelf.ShelfWidgetService"
 			android:permission="android.permission.BIND_REMOTEVIEWS" />
 		<service
-			android:name=".ui.widget.recent.RecentWidgetService"
+			android:name="org.koitharu.kotatsu.widget.recent.RecentWidgetService"
 			android:permission="android.permission.BIND_REMOTEVIEWS" />
 
 		<provider
-			android:name=".ui.search.MangaSuggestionsProvider"
+			android:name="org.koitharu.kotatsu.search.ui.MangaSuggestionsProvider"
 			android:authorities="${applicationId}.MangaSuggestionsProvider"
 			android:exported="false" />
 		<provider
@@ -97,7 +105,8 @@
 		</provider>
 
 		<receiver
-			android:name=".ui.widget.shelf.ShelfWidgetProvider"
+			android:name="org.koitharu.kotatsu.widget.shelf.ShelfWidgetProvider"
+			android:exported="true"
 			android:label="@string/manga_shelf">
 			<intent-filter>
 				<action android:name="android.appwidget.action.APPWIDGET_UPDATE" />
@@ -107,7 +116,8 @@
 				android:resource="@xml/widget_shelf" />
 		</receiver>
 		<receiver
-			android:name=".ui.widget.recent.RecentWidgetProvider"
+			android:name="org.koitharu.kotatsu.widget.recent.RecentWidgetProvider"
+			android:exported="true"
 			android:label="@string/recent_manga">
 			<intent-filter>
 				<action android:name="android.appwidget.action.APPWIDGET_UPDATE" />
@@ -117,6 +127,11 @@
 				android:resource="@xml/widget_recent" />
 		</receiver>
 
+		<meta-data android:name="android.webkit.WebView.EnableSafeBrowsing"
+			android:value="false" />
+		<meta-data android:name="android.webkit.WebView.MetricsOptOut"
+			android:value="true" />
+
 	</application>
 
 </manifest>

app/src/main/java/org/koitharu/kotatsu/KotatsuApp.kt

@@ -3,70 +3,58 @@ package org.koitharu.kotatsu
 import android.app.Application
 import android.os.StrictMode
 import androidx.appcompat.app.AppCompatDelegate
-import androidx.room.Room
-import coil.Coil
-import coil.ComponentRegistry
-import coil.ImageLoader
-import coil.util.CoilUtils
-import com.chuckerteam.chucker.api.ChuckerCollector
-import com.chuckerteam.chucker.api.ChuckerInterceptor
-import okhttp3.OkHttpClient
+import org.koin.android.ext.android.get
 import org.koin.android.ext.koin.androidContext
-import org.koin.android.ext.koin.androidLogger
 import org.koin.core.context.startKoin
-import org.koin.core.logger.Level
-import org.koin.dsl.module
-import org.koitharu.kotatsu.core.db.DatabasePrePopulateCallback
-import org.koitharu.kotatsu.core.db.MangaDatabase
-import org.koitharu.kotatsu.core.db.migrations.*
-import org.koitharu.kotatsu.core.local.CbzFetcher
-import org.koitharu.kotatsu.core.local.PagesCache
-import org.koitharu.kotatsu.core.local.cookies.PersistentCookieJar
-import org.koitharu.kotatsu.core.local.cookies.cache.SetCookieCache
-import org.koitharu.kotatsu.core.local.cookies.persistence.SharedPrefsCookiePersistor
-import org.koitharu.kotatsu.core.parser.LocalMangaRepository
-import org.koitharu.kotatsu.core.parser.UserAgentInterceptor
+import org.koitharu.kotatsu.base.domain.MangaLoaderContext
+import org.koitharu.kotatsu.core.db.databaseModule
+import org.koitharu.kotatsu.core.github.githubModule
+import org.koitharu.kotatsu.core.network.networkModule
+import org.koitharu.kotatsu.core.parser.parserModule
 import org.koitharu.kotatsu.core.prefs.AppSettings
-import org.koitharu.kotatsu.domain.MangaLoaderContext
-import org.koitharu.kotatsu.domain.favourites.FavouritesRepository
-import org.koitharu.kotatsu.domain.history.HistoryRepository
-import org.koitharu.kotatsu.ui.utils.AppCrashHandler
-import org.koitharu.kotatsu.ui.widget.WidgetUpdater
-import org.koitharu.kotatsu.utils.CacheUtils
-import java.util.concurrent.TimeUnit
+import org.koitharu.kotatsu.core.ui.AppCrashHandler
+import org.koitharu.kotatsu.core.ui.uiModule
+import org.koitharu.kotatsu.details.detailsModule
+import org.koitharu.kotatsu.favourites.domain.FavouritesRepository
+import org.koitharu.kotatsu.favourites.favouritesModule
+import org.koitharu.kotatsu.history.domain.HistoryRepository
+import org.koitharu.kotatsu.history.historyModule
+import org.koitharu.kotatsu.local.data.PagesCache
+import org.koitharu.kotatsu.local.domain.LocalMangaRepository
+import org.koitharu.kotatsu.local.localModule
+import org.koitharu.kotatsu.main.mainModule
+import org.koitharu.kotatsu.reader.readerModule
+import org.koitharu.kotatsu.remotelist.remoteListModule
+import org.koitharu.kotatsu.search.searchModule
+import org.koitharu.kotatsu.settings.settingsModule
+import org.koitharu.kotatsu.tracker.trackerModule
+import org.koitharu.kotatsu.widget.WidgetUpdater
+import org.koitharu.kotatsu.widget.appWidgetModule
 
 class KotatsuApp : Application() {
 
-	private val cookieJar by lazy {
-		PersistentCookieJar(SetCookieCache(), SharedPrefsCookiePersistor(applicationContext))
-	}
-
-	private val chuckerCollector by lazy(LazyThreadSafetyMode.NONE) {
-		ChuckerCollector(applicationContext)
-	}
-
 	override fun onCreate() {
 		super.onCreate()
 		if (BuildConfig.DEBUG) {
-			StrictMode.setThreadPolicy(StrictMode.ThreadPolicy.Builder()
-				.detectAll()
-				.penaltyLog()
-				.build())
-			StrictMode.setVmPolicy(StrictMode.VmPolicy.Builder()
-				.detectAll()
-				.setClassInstanceLimit(LocalMangaRepository::class.java, 1)
-				.setClassInstanceLimit(PagesCache::class.java, 1)
-				.setClassInstanceLimit(MangaLoaderContext::class.java, 1)
-				.penaltyLog()
-				.build())
+			StrictMode.setThreadPolicy(
+				StrictMode.ThreadPolicy.Builder()
+					.detectAll()
+					.penaltyLog()
+					.build()
+			)
+			StrictMode.setVmPolicy(
+				StrictMode.VmPolicy.Builder()
+					.detectAll()
+					.setClassInstanceLimit(LocalMangaRepository::class.java, 1)
+					.setClassInstanceLimit(PagesCache::class.java, 1)
+					.setClassInstanceLimit(MangaLoaderContext::class.java, 1)
+					.penaltyLog()
+					.build()
+			)
 		}
 		initKoin()
-		initCoil()
 		Thread.setDefaultUncaughtExceptionHandler(AppCrashHandler(applicationContext))
-		if (BuildConfig.DEBUG) {
-			initErrorHandler()
-		}
-		AppCompatDelegate.setDefaultNightMode(AppSettings(this).theme)
+		AppCompatDelegate.setDefaultNightMode(get<AppSettings>().theme)
 		val widgetUpdater = WidgetUpdater(applicationContext)
 		FavouritesRepository.subscribe(widgetUpdater)
 		HistoryRepository.subscribe(widgetUpdater)
@@ -74,71 +62,25 @@ class KotatsuApp : Application() {
 
 	private fun initKoin() {
 		startKoin {
-			androidLogger(Level.ERROR)
-			androidContext(applicationContext)
+			androidContext(this@KotatsuApp)
 			modules(
-				module {
-					factory {
-						okHttp()
-							.cache(CacheUtils.createHttpCache(applicationContext))
-							.build()
-					}
-					single {
-						mangaDb().build()
-					}
-					single {
-						MangaLoaderContext()
-					}
-					single {
-						AppSettings(applicationContext)
-					}
-					single {
-						PagesCache(applicationContext)
-					}
-				}
+				networkModule,
+				databaseModule,
+				githubModule,
+				uiModule,
+				parserModule,
+				mainModule,
+				searchModule,
+				localModule,
+				favouritesModule,
+				historyModule,
+				remoteListModule,
+				detailsModule,
+				trackerModule,
+				settingsModule,
+				readerModule,
+				appWidgetModule
 			)
 		}
 	}
-
-	private fun initCoil() {
-		Coil.setImageLoader(
-			ImageLoader.Builder(applicationContext)
-				.okHttpClient(
-					okHttp()
-						.cache(CoilUtils.createDefaultCache(applicationContext))
-						.build()
-				).componentRegistry(
-					ComponentRegistry.Builder()
-						.add(CbzFetcher())
-						.build()
-				)
-				.build()
-		)
-	}
-
-	private fun initErrorHandler() {
-		val exceptionHandler = Thread.getDefaultUncaughtExceptionHandler()
-		Thread.setDefaultUncaughtExceptionHandler { t, e ->
-			chuckerCollector.onError("CRASH", e)
-			exceptionHandler?.uncaughtException(t, e)
-		}
-	}
-
-	private fun okHttp() = OkHttpClient.Builder().apply {
-		connectTimeout(20, TimeUnit.SECONDS)
-		readTimeout(60, TimeUnit.SECONDS)
-		writeTimeout(20, TimeUnit.SECONDS)
-		cookieJar(cookieJar)
-		addInterceptor(UserAgentInterceptor)
-		if (BuildConfig.DEBUG) {
-			addInterceptor(ChuckerInterceptor(applicationContext, collector = chuckerCollector))
-		}
-	}
-
-	private fun mangaDb() = Room.databaseBuilder(
-		applicationContext,
-		MangaDatabase::class.java,
-		"kotatsu-db"
-	).addMigrations(Migration1To2, Migration2To3, Migration3To4, Migration4To5, Migration5To6)
-		.addCallback(DatabasePrePopulateCallback(resources))
 }

app/src/main/java/org/koitharu/kotatsu/base/domain/MangaDataRepository.kt

@@ -1,8 +1,6 @@
-package org.koitharu.kotatsu.domain
+package org.koitharu.kotatsu.base.domain
 
 import androidx.room.withTransaction
-import org.koin.core.KoinComponent
-import org.koin.core.inject
 import org.koitharu.kotatsu.core.db.MangaDatabase
 import org.koitharu.kotatsu.core.db.entity.MangaEntity
 import org.koitharu.kotatsu.core.db.entity.MangaPrefsEntity
@@ -10,9 +8,7 @@ import org.koitharu.kotatsu.core.db.entity.TagEntity
 import org.koitharu.kotatsu.core.model.Manga
 import org.koitharu.kotatsu.core.prefs.ReaderMode
 
-class MangaDataRepository : KoinComponent {
-
-	private val db: MangaDatabase by inject()
+class MangaDataRepository(private val db: MangaDatabase) {
 
 	suspend fun savePreferences(manga: Manga, mode: ReaderMode) {
 		val tags = manga.tags.map(TagEntity.Companion::fromMangaTag)
@@ -36,6 +32,12 @@ class MangaDataRepository : KoinComponent {
 		return db.mangaDao.find(mangaId)?.toManga()
 	}
 
+	suspend fun resolveIntent(intent: MangaIntent): Manga? = when {
+		intent.manga != null -> intent.manga
+		intent.mangaId != MangaIntent.ID_NONE -> db.mangaDao.find(intent.mangaId)?.toManga()
+		else -> null // TODO resolve uri
+	}
+
 	suspend fun storeManga(manga: Manga) {
 		val tags = manga.tags.map(TagEntity.Companion::fromMangaTag)
 		db.withTransaction {

app/src/main/java/org/koitharu/kotatsu/base/domain/MangaIntent.kt

@@ -0,0 +1,33 @@
+package org.koitharu.kotatsu.base.domain
+
+import android.content.Intent
+import android.net.Uri
+import android.os.Bundle
+import org.koitharu.kotatsu.core.model.Manga
+
+data class MangaIntent(
+	val manga: Manga?,
+	val mangaId: Long,
+	val uri: Uri?
+) {
+
+	companion object {
+
+		fun from(intent: Intent?) = MangaIntent(
+			manga = intent?.getParcelableExtra(KEY_MANGA),
+			mangaId = intent?.getLongExtra(KEY_ID, ID_NONE) ?: ID_NONE,
+			uri = intent?.data
+		)
+
+		fun from(args: Bundle?) = MangaIntent(
+			manga = args?.getParcelable(KEY_MANGA),
+			mangaId = args?.getLong(KEY_ID, ID_NONE) ?: ID_NONE,
+			uri = null
+		)
+
+		const val ID_NONE = 0L
+
+		const val KEY_MANGA = "manga"
+		const val KEY_ID = "id"
+	}
+}

app/src/main/java/org/koitharu/kotatsu/base/domain/MangaLoaderContext.kt

@@ -0,0 +1,71 @@
+package org.koitharu.kotatsu.base.domain
+
+import okhttp3.*
+import org.koin.core.component.KoinComponent
+import org.koin.core.component.get
+import org.koitharu.kotatsu.core.model.MangaSource
+import org.koitharu.kotatsu.core.prefs.SourceSettings
+import org.koitharu.kotatsu.utils.ext.await
+
+open class MangaLoaderContext(
+	private val okHttp: OkHttpClient,
+	private val cookieJar: CookieJar
+) : KoinComponent {
+
+	suspend fun httpGet(url: String): Response {
+		val request = Request.Builder()
+			.get()
+			.url(url)
+		return okHttp.newCall(request.build()).await()
+	}
+
+	suspend fun httpPost(
+		url: String,
+		form: Map<String, String>
+	): Response {
+		val body = FormBody.Builder()
+		form.forEach { (k, v) ->
+			body.addEncoded(k, v)
+		}
+		val request = Request.Builder()
+			.post(body.build())
+			.url(url)
+		return okHttp.newCall(request.build()).await()
+	}
+
+	suspend fun httpPost(
+		url: String,
+		payload: String
+	): Response {
+		val body = FormBody.Builder()
+		payload.split('&').forEach {
+			val pos = it.indexOf('=')
+			if (pos != -1) {
+				val k = it.substring(0, pos)
+				val v = it.substring(pos + 1)
+				body.addEncoded(k, v)
+			}
+		}
+		val request = Request.Builder()
+			.post(body.build())
+			.url(url)
+		return okHttp.newCall(request.build()).await()
+	}
+
+	open fun getSettings(source: MangaSource) = SourceSettings(get(), source)
+
+	fun insertCookies(domain: String, vararg cookies: String) {
+		val url = HttpUrl.Builder()
+			.scheme(SCHEME_HTTP)
+			.host(domain)
+			.build()
+		cookieJar.saveFromResponse(url, cookies.mapNotNull {
+			Cookie.parse(url, it)
+		})
+	}
+
+	private companion object {
+
+		private const val SCHEME_HTTP = "http"
+	}
+}

app/src/main/java/org/koitharu/kotatsu/base/domain/MangaProviderFactory.kt

@@ -0,0 +1,24 @@
+package org.koitharu.kotatsu.base.domain
+
+import org.koitharu.kotatsu.core.model.MangaSource
+import org.koitharu.kotatsu.core.prefs.AppSettings
+
+object MangaProviderFactory {
+
+	fun getSources(settings: AppSettings, includeHidden: Boolean): List<MangaSource> {
+		val list = MangaSource.values().toList() - MangaSource.LOCAL
+		val order = settings.sourcesOrder
+		val hidden = settings.hiddenSources
+		val sorted = list.sortedBy { x ->
+			val e = order.indexOf(x.ordinal)
+			if (e == -1) order.size + x.ordinal else e
+		}
+		return if (includeHidden) {
+			sorted
+		} else {
+			sorted.filterNot { x ->
+				x.name in hidden
+			}
+		}
+	}
+}

app/src/main/java/org/koitharu/kotatsu/base/domain/MangaUtils.kt

@@ -1,4 +1,4 @@
-package org.koitharu.kotatsu.domain
+package org.koitharu.kotatsu.base.domain
 
 import android.graphics.BitmapFactory
 import android.net.Uri
@@ -6,11 +6,12 @@ import android.util.Size
 import androidx.annotation.WorkerThread
 import okhttp3.OkHttpClient
 import okhttp3.Request
-import org.koin.core.KoinComponent
-import org.koin.core.get
+import org.koin.core.component.KoinComponent
+import org.koin.core.component.get
 import org.koitharu.kotatsu.BuildConfig
 import org.koitharu.kotatsu.core.model.MangaPage
-import org.koitharu.kotatsu.core.prefs.ReaderMode
+import org.koitharu.kotatsu.core.network.CommonHeaders
+import org.koitharu.kotatsu.utils.CacheUtils
 import org.koitharu.kotatsu.utils.ext.await
 import org.koitharu.kotatsu.utils.ext.medianOrNull
 import java.io.InputStream
@@ -24,10 +25,10 @@ object MangaUtils : KoinComponent {
 	 */
 	@WorkerThread
 	@Suppress("BlockingMethodInNonBlockingContext")
-	suspend fun determineReaderMode(pages: List<MangaPage>): ReaderMode? {
+	suspend fun determineMangaIsWebtoon(pages: List<MangaPage>): Boolean? {
 		try {
 			val page = pages.medianOrNull() ?: return null
-			val url = MangaProviderFactory.create(page.source).getPageFullUrl(page)
+			val url = page.source.repository.getPageUrl(page)
 			val uri = Uri.parse(url)
 			val size = if (uri.scheme == "cbz") {
 				val zip = ZipFile(uri.schemeSpecificPart)
@@ -40,15 +41,14 @@ object MangaUtils : KoinComponent {
 				val request = Request.Builder()
 					.url(url)
 					.get()
+					.header(CommonHeaders.REFERER, page.referer)
+					.cacheControl(CacheUtils.CONTROL_DISABLED)
 					.build()
 				client.newCall(request).await().use {
 					getBitmapSize(it.body?.byteStream())
 				}
 			}
-			return when {
-				size.width * 2 < size.height -> ReaderMode.WEBTOON
-				else -> ReaderMode.STANDARD
-			}
+			return size.width * 2 < size.height
 		} catch (e: Exception) {
 			if (BuildConfig.DEBUG) {
 				e.printStackTrace()
@@ -57,7 +57,6 @@ object MangaUtils : KoinComponent {
 		}
 	}
 
-	@JvmStatic
 	private fun getBitmapSize(input: InputStream?): Size {
 		val options = BitmapFactory.Options().apply {
 			inJustDecodeBounds = true

app/src/main/java/org/koitharu/kotatsu/base/ui/AlertDialogFragment.kt

@@ -0,0 +1,47 @@
+package org.koitharu.kotatsu.base.ui
+
+import android.app.Dialog
+import android.os.Bundle
+import android.view.LayoutInflater
+import android.view.ViewGroup
+import androidx.annotation.CallSuper
+import androidx.appcompat.app.AlertDialog
+import androidx.fragment.app.DialogFragment
+import androidx.viewbinding.ViewBinding
+import com.google.android.material.dialog.MaterialAlertDialogBuilder
+
+abstract class AlertDialogFragment<B : ViewBinding> : DialogFragment() {
+
+	private var viewBinding: B? = null
+
+	protected val binding: B
+		get() = checkNotNull(viewBinding)
+
+	final override fun onCreateDialog(savedInstanceState: Bundle?): Dialog {
+		val inflater = activity?.layoutInflater ?: LayoutInflater.from(requireContext())
+		val binding = onInflateView(inflater, null)
+		viewBinding = binding
+		return MaterialAlertDialogBuilder(requireContext(), theme)
+			.setView(binding.root)
+			.also(::onBuildDialog)
+			.create()
+	}
+
+	final override fun onCreateView(
+		inflater: LayoutInflater,
+		container: ViewGroup?,
+		savedInstanceState: Bundle?
+	) = viewBinding?.root
+
+	@CallSuper
+	override fun onDestroyView() {
+		viewBinding = null
+		super.onDestroyView()
+	}
+
+	open fun onBuildDialog(builder: AlertDialog.Builder) = Unit
+
+	protected fun bindingOrNull(): B? = viewBinding
+
+	protected abstract fun onInflateView(inflater: LayoutInflater, container: ViewGroup?): B
+}

app/src/main/java/org/koitharu/kotatsu/base/ui/BaseActivity.kt

@@ -0,0 +1,113 @@
+package org.koitharu.kotatsu.base.ui
+
+import android.os.Build
+import android.os.Bundle
+import android.view.KeyEvent
+import android.view.MenuItem
+import android.view.View
+import android.view.ViewGroup
+import androidx.appcompat.app.AppCompatActivity
+import androidx.appcompat.view.ActionMode
+import androidx.appcompat.widget.ActionBarContextView
+import androidx.appcompat.widget.Toolbar
+import androidx.core.app.ActivityCompat
+import androidx.core.content.ContextCompat
+import androidx.core.graphics.Insets
+import androidx.core.view.*
+import androidx.viewbinding.ViewBinding
+import org.koin.android.ext.android.get
+import org.koitharu.kotatsu.BuildConfig
+import org.koitharu.kotatsu.R
+import org.koitharu.kotatsu.core.exceptions.resolve.ExceptionResolver
+import org.koitharu.kotatsu.core.prefs.AppSettings
+import org.koitharu.kotatsu.utils.ext.getThemeColor
+
+abstract class BaseActivity<B : ViewBinding> : AppCompatActivity(), OnApplyWindowInsetsListener {
+
+	protected lateinit var binding: B
+		private set
+
+
+	protected val exceptionResolver by lazy(LazyThreadSafetyMode.NONE) {
+		ExceptionResolver(this, supportFragmentManager)
+	}
+
+	override fun onCreate(savedInstanceState: Bundle?) {
+		if (get<AppSettings>().isAmoledTheme) {
+			setTheme(R.style.AppTheme_Amoled)
+		}
+		super.onCreate(savedInstanceState)
+		WindowCompat.setDecorFitsSystemWindows(window, false)
+	}
+
+	@Deprecated("Use ViewBinding", level = DeprecationLevel.ERROR)
+	override fun setContentView(layoutResID: Int) {
+		super.setContentView(layoutResID)
+		setupToolbar()
+	}
+
+	@Deprecated("Use ViewBinding", level = DeprecationLevel.ERROR)
+	override fun setContentView(view: View?) {
+		super.setContentView(view)
+		setupToolbar()
+	}
+
+	protected fun setContentView(binding: B) {
+		this.binding = binding
+		super.setContentView(binding.root)
+		(binding.root.findViewById<View>(R.id.toolbar) as? Toolbar)?.let(this::setSupportActionBar)
+		ViewCompat.setOnApplyWindowInsetsListener(binding.root, this)
+	}
+
+	override fun onApplyWindowInsets(v: View, insets: WindowInsetsCompat): WindowInsetsCompat {
+		onWindowInsetsChanged(insets.getInsets(WindowInsetsCompat.Type.systemBars()))
+		return insets
+	}
+
+	override fun onOptionsItemSelected(item: MenuItem) = if (item.itemId == android.R.id.home) {
+		onBackPressed()
+		true
+	} else super.onOptionsItemSelected(item)
+
+	override fun onKeyDown(keyCode: Int, event: KeyEvent?): Boolean {
+		if (BuildConfig.DEBUG && keyCode == KeyEvent.KEYCODE_VOLUME_UP) { // TODO remove
+			ActivityCompat.recreate(this)
+			return true
+		}
+		return super.onKeyDown(keyCode, event)
+	}
+
+	protected abstract fun onWindowInsetsChanged(insets: Insets)
+
+	private fun setupToolbar() {
+		(findViewById<View>(R.id.toolbar) as? Toolbar)?.let(this::setSupportActionBar)
+	}
+
+	override fun onSupportActionModeStarted(mode: ActionMode) {
+		super.onSupportActionModeStarted(mode)
+		val insets = ViewCompat.getRootWindowInsets(binding.root)
+			?.getInsets(WindowInsetsCompat.Type.systemBars()) ?: return
+		val view = findViewById<ActionBarContextView?>(androidx.appcompat.R.id.action_mode_bar)
+		view?.updateLayoutParams<ViewGroup.MarginLayoutParams> {
+			topMargin = insets.top
+		}
+		window?.statusBarColor = ContextCompat.getColor(this, R.color.grey_dark)
+	}
+
+	override fun onSupportActionModeFinished(mode: ActionMode) {
+		super.onSupportActionModeFinished(mode)
+		window?.statusBarColor = getThemeColor(android.R.attr.statusBarColor)
+	}
+
+	override fun onBackPressed() {
+		if ( // https://issuetracker.google.com/issues/139738913
+			Build.VERSION.SDK_INT == Build.VERSION_CODES.Q &&
+			isTaskRoot &&
+			supportFragmentManager.backStackEntryCount == 0
+		) {
+			finishAfterTransition()
+		} else {
+			super.onBackPressed()
+		}
+	}
+}

app/src/main/java/org/koitharu/kotatsu/base/ui/BaseBottomSheet.kt

@@ -0,0 +1,43 @@
+package org.koitharu.kotatsu.base.ui
+
+import android.app.Dialog
+import android.os.Bundle
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import androidx.appcompat.app.AppCompatDialog
+import androidx.viewbinding.ViewBinding
+import com.google.android.material.bottomsheet.BottomSheetDialogFragment
+import org.koitharu.kotatsu.R
+
+abstract class BaseBottomSheet<B : ViewBinding> :
+	BottomSheetDialogFragment() {
+
+	private var viewBinding: B? = null
+
+	protected val binding: B
+		get() = checkNotNull(viewBinding)
+
+	final override fun onCreateView(
+		inflater: LayoutInflater,
+		container: ViewGroup?,
+		savedInstanceState: Bundle?
+	): View {
+		val binding = onInflateView(inflater, container)
+		viewBinding = binding
+		return binding.root
+	}
+
+	override fun onDestroyView() {
+		viewBinding = null
+		super.onDestroyView()
+	}
+
+	override fun onCreateDialog(savedInstanceState: Bundle?): Dialog {
+		return if (resources.getBoolean(R.bool.is_tablet)) {
+			AppCompatDialog(context, theme)
+		} else super.onCreateDialog(savedInstanceState)
+	}
+
+	protected abstract fun onInflateView(inflater: LayoutInflater, container: ViewGroup?): B
+}

app/src/main/java/org/koitharu/kotatsu/base/ui/BaseFragment.kt

@@ -0,0 +1,66 @@
+package org.koitharu.kotatsu.base.ui
+
+import android.content.Context
+import android.os.Bundle
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import androidx.core.graphics.Insets
+import androidx.core.view.OnApplyWindowInsetsListener
+import androidx.core.view.ViewCompat
+import androidx.core.view.WindowInsetsCompat
+import androidx.fragment.app.Fragment
+import androidx.viewbinding.ViewBinding
+import org.koitharu.kotatsu.core.exceptions.resolve.ExceptionResolver
+
+abstract class BaseFragment<B : ViewBinding> : Fragment(), OnApplyWindowInsetsListener {
+
+	private var viewBinding: B? = null
+
+	protected val binding: B
+		get() = checkNotNull(viewBinding)
+
+	protected val exceptionResolver by lazy(LazyThreadSafetyMode.NONE) {
+		ExceptionResolver(viewLifecycleOwner, childFragmentManager)
+	}
+
+	override fun onCreateView(
+		inflater: LayoutInflater,
+		container: ViewGroup?,
+		savedInstanceState: Bundle?
+	): View? {
+		val binding = onInflateView(inflater, container)
+		viewBinding = binding
+		return binding.root
+	}
+
+	override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+		super.onViewCreated(view, savedInstanceState)
+		ViewCompat.setOnApplyWindowInsetsListener(view, this)
+	}
+
+	override fun onDestroyView() {
+		viewBinding = null
+		super.onDestroyView()
+	}
+
+	open fun getTitle(): CharSequence? = null
+
+	override fun onAttach(context: Context) {
+		super.onAttach(context)
+		getTitle()?.let {
+			activity?.title = it
+		}
+	}
+
+	override fun onApplyWindowInsets(v: View?, insets: WindowInsetsCompat): WindowInsetsCompat {
+		onWindowInsetsChanged(insets.getInsets(WindowInsetsCompat.Type.systemBars()))
+		return insets
+	}
+
+	protected fun bindingOrNull() = viewBinding
+
+	protected abstract fun onInflateView(inflater: LayoutInflater, container: ViewGroup?): B
+
+	protected abstract fun onWindowInsetsChanged(insets: Insets)
+}

app/src/main/java/org/koitharu/kotatsu/base/ui/BaseFullscreenActivity.kt

@@ -0,0 +1,57 @@
+package org.koitharu.kotatsu.base.ui
+
+import android.graphics.Color
+import android.os.Build
+import android.os.Bundle
+import android.view.View
+import android.view.WindowManager
+import androidx.viewbinding.ViewBinding
+
+
+abstract class BaseFullscreenActivity<B : ViewBinding> : BaseActivity<B>(),
+	View.OnSystemUiVisibilityChangeListener {
+
+	override fun onCreate(savedInstanceState: Bundle?) {
+		super.onCreate(savedInstanceState)
+		with(window) {
+			statusBarColor = Color.TRANSPARENT
+			navigationBarColor = Color.TRANSPARENT
+			if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.P) {
+				attributes.layoutInDisplayCutoutMode =
+					WindowManager.LayoutParams.LAYOUT_IN_DISPLAY_CUTOUT_MODE_SHORT_EDGES
+			}
+			decorView.setOnSystemUiVisibilityChangeListener(this@BaseFullscreenActivity)
+		}
+		showSystemUI()
+	}
+
+	final override fun onSystemUiVisibilityChange(visibility: Int) {
+		onSystemUiVisibilityChanged(visibility and View.SYSTEM_UI_FLAG_FULLSCREEN == 0)
+	}
+
+	// TODO WindowInsetsControllerCompat works incorrect
+	protected fun hideSystemUI() {
+		window.decorView.systemUiVisibility = SYSTEM_UI_FLAGS_HIDDEN
+	}
+
+	protected fun showSystemUI() {
+		window.decorView.systemUiVisibility = SYSTEM_UI_FLAGS_SHOWN
+	}
+
+	protected open fun onSystemUiVisibilityChanged(isVisible: Boolean) = Unit
+
+	@Suppress("DEPRECATION")
+	private companion object {
+
+		const val SYSTEM_UI_FLAGS_SHOWN = View.SYSTEM_UI_FLAG_LAYOUT_STABLE or
+				View.SYSTEM_UI_FLAG_LAYOUT_HIDE_NAVIGATION or
+				View.SYSTEM_UI_FLAG_LAYOUT_FULLSCREEN
+
+		const val SYSTEM_UI_FLAGS_HIDDEN = View.SYSTEM_UI_FLAG_LAYOUT_STABLE or
+				View.SYSTEM_UI_FLAG_LAYOUT_HIDE_NAVIGATION or
+				View.SYSTEM_UI_FLAG_LAYOUT_FULLSCREEN or
+				View.SYSTEM_UI_FLAG_HIDE_NAVIGATION or
+				View.SYSTEM_UI_FLAG_FULLSCREEN or
+				View.SYSTEM_UI_FLAG_IMMERSIVE_STICKY
+	}
+}

app/src/main/java/org/koitharu/kotatsu/base/ui/BasePreferenceFragment.kt

@@ -0,0 +1,39 @@
+package org.koitharu.kotatsu.base.ui
+
+import android.os.Bundle
+import android.view.View
+import androidx.annotation.StringRes
+import androidx.core.view.OnApplyWindowInsetsListener
+import androidx.core.view.ViewCompat
+import androidx.core.view.WindowInsetsCompat
+import androidx.core.view.updatePadding
+import androidx.preference.PreferenceFragmentCompat
+import org.koin.android.ext.android.inject
+import org.koitharu.kotatsu.core.prefs.AppSettings
+
+abstract class BasePreferenceFragment(@StringRes private val titleId: Int) :
+	PreferenceFragmentCompat(), OnApplyWindowInsetsListener {
+
+	protected val settings by inject<AppSettings>()
+
+	override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+		super.onViewCreated(view, savedInstanceState)
+		listView.clipToPadding = false
+		ViewCompat.setOnApplyWindowInsetsListener(view, this)
+	}
+
+	override fun onResume() {
+		super.onResume()
+		activity?.setTitle(titleId)
+	}
+
+	override fun onApplyWindowInsets(v: View?, insets: WindowInsetsCompat): WindowInsetsCompat {
+		val systemBars = insets.getInsets(WindowInsetsCompat.Type.systemBars())
+		listView.updatePadding(
+			left = systemBars.left,
+			right = systemBars.right,
+			bottom = systemBars.bottom
+		)
+		return insets
+	}
+}

app/src/main/java/org/koitharu/kotatsu/base/ui/BaseService.kt

@@ -0,0 +1,5 @@
+package org.koitharu.kotatsu.base.ui
+
+import androidx.lifecycle.LifecycleService
+
+abstract class BaseService : LifecycleService()

app/src/main/java/org/koitharu/kotatsu/base/ui/BaseViewModel.kt

@@ -0,0 +1,44 @@
+package org.koitharu.kotatsu.base.ui
+
+import androidx.lifecycle.MutableLiveData
+import androidx.lifecycle.ViewModel
+import androidx.lifecycle.viewModelScope
+import kotlinx.coroutines.*
+import org.koitharu.kotatsu.BuildConfig
+import org.koitharu.kotatsu.utils.SingleLiveEvent
+import kotlin.coroutines.CoroutineContext
+import kotlin.coroutines.EmptyCoroutineContext
+
+abstract class BaseViewModel : ViewModel() {
+
+	val onError = SingleLiveEvent<Throwable>()
+	val isLoading = MutableLiveData(false)
+
+	protected fun launchJob(
+		context: CoroutineContext = EmptyCoroutineContext,
+		start: CoroutineStart = CoroutineStart.DEFAULT,
+		block: suspend CoroutineScope.() -> Unit
+	): Job = viewModelScope.launch(context + createErrorHandler(), start, block)
+
+	protected fun launchLoadingJob(
+		context: CoroutineContext = EmptyCoroutineContext,
+		start: CoroutineStart = CoroutineStart.DEFAULT,
+		block: suspend CoroutineScope.() -> Unit
+	): Job = viewModelScope.launch(context + createErrorHandler(), start) {
+		isLoading.postValue(true)
+		try {
+			block()
+		} finally {
+			isLoading.postValue(false)
+		}
+	}
+
+	private fun createErrorHandler() = CoroutineExceptionHandler { _, throwable ->
+		if (BuildConfig.DEBUG) {
+			throwable.printStackTrace()
+		}
+		if (throwable !is CancellationException) {
+			onError.postCall(throwable)
+		}
+	}
+}

app/src/main/java/org/koitharu/kotatsu/base/ui/dialog/CheckBoxAlertDialog.kt

@@ -1,15 +1,13 @@
-package org.koitharu.kotatsu.ui.common.dialog
+package org.koitharu.kotatsu.base.ui.dialog
 
-import android.annotation.SuppressLint
 import android.content.Context
 import android.content.DialogInterface
 import android.view.LayoutInflater
 import androidx.annotation.DrawableRes
 import androidx.annotation.StringRes
 import androidx.appcompat.app.AlertDialog
-import com.google.android.material.checkbox.MaterialCheckBox
 import com.google.android.material.dialog.MaterialAlertDialogBuilder
-import org.koitharu.kotatsu.R
+import org.koitharu.kotatsu.databinding.DialogCheckboxBinding
 
 class CheckBoxAlertDialog private constructor(private val delegate: AlertDialog) :
 	DialogInterface by delegate {
@@ -18,13 +16,10 @@ class CheckBoxAlertDialog private constructor(private val delegate: AlertDialog)
 
 	class Builder(context: Context) {
 
-		@SuppressLint("InflateParams")
-		private val view = LayoutInflater.from(context)
-			.inflate(R.layout.dialog_checkbox, null, false)
-		private val checkBox = view.findViewById<MaterialCheckBox>(android.R.id.checkbox)
+		private val binding = DialogCheckboxBinding.inflate(LayoutInflater.from(context))
 
 		private val delegate = MaterialAlertDialogBuilder(context)
-			.setView(view)
+			.setView(binding.root)
 
 		fun setTitle(@StringRes titleResId: Int): Builder {
 			delegate.setTitle(titleResId)
@@ -47,12 +42,12 @@ class CheckBoxAlertDialog private constructor(private val delegate: AlertDialog)
 		}
 
 		fun setCheckBoxText(@StringRes textId: Int): Builder {
-			checkBox.setText(textId)
+			binding.checkbox.setText(textId)
 			return this
 		}
 
 		fun setCheckBoxChecked(isChecked: Boolean): Builder {
-			checkBox.isChecked = isChecked
+			binding.checkbox.isChecked = isChecked
 			return this
 		}
 
@@ -66,7 +61,7 @@ class CheckBoxAlertDialog private constructor(private val delegate: AlertDialog)
 			listener: (DialogInterface, Boolean) -> Unit
 		): Builder {
 			delegate.setPositiveButton(textId) { dialog, _ ->
-				listener(dialog, checkBox.isChecked)
+				listener(dialog, binding.checkbox.isChecked)
 			}
 			return this
 		}

app/src/main/java/org/koitharu/kotatsu/base/ui/dialog/StorageSelectDialog.kt

@@ -1,4 +1,4 @@
-package org.koitharu.kotatsu.ui.common.dialog
+package org.koitharu.kotatsu.base.ui.dialog
 
 import android.content.Context
 import android.content.DialogInterface
@@ -8,9 +8,9 @@ import android.widget.BaseAdapter
 import androidx.annotation.StringRes
 import androidx.appcompat.app.AlertDialog
 import com.google.android.material.dialog.MaterialAlertDialogBuilder
-import kotlinx.android.synthetic.main.item_storage.view.*
 import org.koitharu.kotatsu.R
-import org.koitharu.kotatsu.core.parser.LocalMangaRepository
+import org.koitharu.kotatsu.databinding.ItemStorageBinding
+import org.koitharu.kotatsu.local.domain.LocalMangaRepository
 import org.koitharu.kotatsu.utils.ext.getStorageName
 import org.koitharu.kotatsu.utils.ext.inflate
 import org.koitharu.kotatsu.utils.ext.longHashCode
@@ -65,8 +65,9 @@ class StorageSelectDialog private constructor(private val delegate: AlertDialog)
 		override fun getView(position: Int, convertView: View?, parent: ViewGroup): View {
 			val view = convertView ?: parent.inflate(R.layout.item_storage)
 			val item = volumes[position]
-			view.textView_title.text = item.second
-			view.textView_subtitle.text = item.first.path
+			val binding = ItemStorageBinding.bind(view)
+			binding.textViewTitle.text = item.second
+			binding.textViewSubtitle.text = item.first.path
 			return view
 		}
 
@@ -78,14 +79,13 @@ class StorageSelectDialog private constructor(private val delegate: AlertDialog)
 
 	}
 
-	interface OnStorageSelectListener {
+	fun interface OnStorageSelectListener {
 
 		fun onStorageSelected(file: File)
 	}
 
 	private companion object {
 
-		@JvmStatic
 		fun getAvailableVolumes(context: Context): List<Pair<File, String>> {
 			return LocalMangaRepository.getAvailableStorageDirs(context).map {
 				it to it.getStorageName(context)

app/src/main/java/org/koitharu/kotatsu/base/ui/dialog/TextInputDialog.kt

@@ -1,6 +1,5 @@
-package org.koitharu.kotatsu.ui.common.dialog
+package org.koitharu.kotatsu.base.ui.dialog
 
-import android.annotation.SuppressLint
 import android.content.Context
 import android.content.DialogInterface
 import android.text.InputFilter
@@ -8,21 +7,20 @@ import android.view.LayoutInflater
 import androidx.annotation.StringRes
 import androidx.appcompat.app.AlertDialog
 import com.google.android.material.dialog.MaterialAlertDialogBuilder
-import kotlinx.android.synthetic.main.dialog_input.view.*
-import org.koitharu.kotatsu.R
+import org.koitharu.kotatsu.databinding.DialogInputBinding
 
-class TextInputDialog private constructor(private val delegate: AlertDialog) :
-	DialogInterface by delegate {
+class TextInputDialog private constructor(
+	private val delegate: AlertDialog
+) : DialogInterface by delegate {
 
 	fun show() = delegate.show()
 
 	class Builder(context: Context) {
 
-		@SuppressLint("InflateParams")
-		private val view = LayoutInflater.from(context).inflate(R.layout.dialog_input, null, false)
+		private val binding = DialogInputBinding.inflate(LayoutInflater.from(context))
 
 		private val delegate = MaterialAlertDialogBuilder(context)
-			.setView(view)
+			.setView(binding.root)
 
 		fun setTitle(@StringRes titleResId: Int): Builder {
 			delegate.setTitle(titleResId)
@@ -35,44 +33,55 @@ class TextInputDialog private constructor(private val delegate: AlertDialog) :
 		}
 
 		fun setHint(@StringRes hintResId: Int): Builder {
-			view.inputLayout.hint = view.context.getString(hintResId)
+			binding.inputLayout.hint = binding.root.context.getString(hintResId)
 			return this
 		}
 
 		fun setMaxLength(maxLength: Int, strict: Boolean): Builder {
-			with(view.inputLayout) {
+			with(binding.inputLayout) {
 				counterMaxLength = maxLength
 				isCounterEnabled = maxLength > 0
 			}
 			if (strict && maxLength > 0) {
-				view.inputEdit.filters += InputFilter.LengthFilter(maxLength)
+				binding.inputEdit.filters += InputFilter.LengthFilter(maxLength)
 			}
 			return this
 		}
 
 		fun setInputType(inputType: Int): Builder {
-			view.inputEdit.inputType = inputType
+			binding.inputEdit.inputType = inputType
 			return this
 		}
 
 		fun setText(text: String): Builder {
-			view.inputEdit.setText(text)
-			view.inputEdit.setSelection(text.length)
+			binding.inputEdit.setText(text)
+			binding.inputEdit.setSelection(text.length)
 			return this
 		}
 
-		fun setPositiveButton(@StringRes textId: Int, listener: (DialogInterface, String) -> Unit): Builder {
+		fun setPositiveButton(
+			@StringRes textId: Int,
+			listener: (DialogInterface, String) -> Unit
+		): Builder {
 			delegate.setPositiveButton(textId) { dialog, _ ->
-				listener(dialog, view.inputEdit.text?.toString().orEmpty())
+				listener(dialog, binding.inputEdit.text.toString().orEmpty())
 			}
 			return this
 		}
 
-		fun setNegativeButton(@StringRes textId: Int, listener: DialogInterface.OnClickListener? = null): Builder {
+		fun setNegativeButton(
+			@StringRes textId: Int,
+			listener: DialogInterface.OnClickListener? = null
+		): Builder {
 			delegate.setNegativeButton(textId, listener)
 			return this
 		}
 
+		fun setOnCancelListener(listener: DialogInterface.OnCancelListener): Builder {
+			delegate.setOnCancelListener(listener)
+			return this
+		}
+
 		fun create() =
 			TextInputDialog(delegate.create())
 

app/src/main/java/org/koitharu/kotatsu/base/ui/list/AdapterUpdater.kt

@@ -1,9 +1,10 @@
-package org.koitharu.kotatsu.ui.common.list
+package org.koitharu.kotatsu.base.ui.list
 
 import androidx.recyclerview.widget.DiffUtil
 import androidx.recyclerview.widget.RecyclerView
 import java.util.*
 
+@Deprecated("")
 class AdapterUpdater<T>(oldList: List<T>, newList: List<T>, getId: (T) -> Long) {
 
 	private val diff = DiffUtil.calculateDiff(object : DiffUtil.Callback() {

app/src/main/java/org/koitharu/kotatsu/base/ui/list/BaseViewHolder.kt

@@ -0,0 +1,28 @@
+package org.koitharu.kotatsu.base.ui.list
+
+import androidx.recyclerview.widget.RecyclerView
+import androidx.viewbinding.ViewBinding
+import org.koin.core.component.KoinComponent
+
+@Deprecated("")
+abstract class BaseViewHolder<T, E, B : ViewBinding> protected constructor(val binding: B) :
+	RecyclerView.ViewHolder(binding.root), KoinComponent {
+
+	var boundData: T? = null
+		private set
+
+	val context get() = itemView.context!!
+
+	fun bind(data: T, extra: E) {
+		boundData = data
+		onBind(data, extra)
+	}
+
+	fun requireData(): T {
+		return boundData ?: throw IllegalStateException("Calling requireData() before bind()")
+	}
+
+	open fun onRecycled() = Unit
+
+	abstract fun onBind(data: T, extra: E)
+}

app/src/main/java/org/koitharu/kotatsu/base/ui/list/BoundsScrollListener.kt

@@ -1,4 +1,4 @@
-package org.koitharu.kotatsu.ui.common.list
+package org.koitharu.kotatsu.base.ui.list
 
 import androidx.recyclerview.widget.LinearLayoutManager
 import androidx.recyclerview.widget.RecyclerView

app/src/main/java/org/koitharu/kotatsu/base/ui/list/OnListItemClickListener.kt

@@ -0,0 +1,10 @@
+package org.koitharu.kotatsu.base.ui.list
+
+import android.view.View
+
+interface OnListItemClickListener<I> {
+
+	fun onItemClick(item: I, view: View)
+
+	fun onItemLongClick(item: I, view: View) = false
+}

app/src/main/java/org/koitharu/kotatsu/base/ui/list/PaginationScrollListener.kt

@@ -0,0 +1,18 @@
+package org.koitharu.kotatsu.base.ui.list
+
+import androidx.recyclerview.widget.RecyclerView
+
+class PaginationScrollListener(offset: Int, private val callback: Callback) :
+	BoundsScrollListener(0, offset) {
+
+	override fun onScrolledToStart(recyclerView: RecyclerView) = Unit
+
+	override fun onScrolledToEnd(recyclerView: RecyclerView) {
+		callback.onScrolledToEnd()
+	}
+
+	interface Callback {
+
+		fun onScrolledToEnd()
+	}
+}

app/src/main/java/org/koitharu/kotatsu/base/ui/list/decor/ItemTypeDividerDecoration.kt

@@ -1,4 +1,4 @@
-package org.koitharu.kotatsu.ui.common.list.decor
+package org.koitharu.kotatsu.base.ui.list.decor
 
 import android.content.Context
 import android.graphics.Canvas

app/src/main/java/org/koitharu/kotatsu/base/ui/list/decor/SectionItemDecoration.kt

@@ -1,4 +1,4 @@
-package org.koitharu.kotatsu.ui.common.list.decor
+package org.koitharu.kotatsu.base.ui.list.decor
 
 import android.graphics.Canvas
 import android.graphics.Rect

app/src/main/java/org/koitharu/kotatsu/base/ui/list/decor/SpacingItemDecoration.kt

@@ -0,0 +1,18 @@
+package org.koitharu.kotatsu.base.ui.list.decor
+
+import android.graphics.Rect
+import android.view.View
+import androidx.annotation.Px
+import androidx.recyclerview.widget.RecyclerView
+
+class SpacingItemDecoration(@Px private val spacing: Int) : RecyclerView.ItemDecoration() {
+
+	override fun getItemOffsets(
+		outRect: Rect,
+		view: View,
+		parent: RecyclerView,
+		state: RecyclerView.State
+	) {
+		outRect.set(spacing, spacing, spacing, spacing)
+	}
+}

app/src/main/java/org/koitharu/kotatsu/base/ui/widgets/CheckableImageView.kt

@@ -1,4 +1,4 @@
-package org.koitharu.kotatsu.ui.common.widgets
+package org.koitharu.kotatsu.base.ui.widgets
 
 import android.content.Context
 import android.util.AttributeSet
@@ -54,14 +54,13 @@ class CheckableImageView @JvmOverloads constructor(
 		return state
 	}
 
-	interface OnCheckedChangeListener {
+	fun interface OnCheckedChangeListener {
 
 		fun onCheckedChanged(view: CheckableImageView, isChecked: Boolean)
 	}
 
 	private companion object {
 
-		@JvmStatic
 		private val CHECKED_STATE_SET = intArrayOf(android.R.attr.state_checked)
 	}
 }

app/src/main/java/org/koitharu/kotatsu/base/ui/widgets/ChipsView.kt

@@ -0,0 +1,96 @@
+package org.koitharu.kotatsu.base.ui.widgets
+
+import android.content.Context
+import android.util.AttributeSet
+import android.view.View.OnClickListener
+import androidx.annotation.DrawableRes
+import androidx.core.view.children
+import com.google.android.material.R
+import com.google.android.material.chip.Chip
+import com.google.android.material.chip.ChipGroup
+import org.koitharu.kotatsu.utils.ext.getThemeColor
+
+class ChipsView @JvmOverloads constructor(
+	context: Context,
+	attrs: AttributeSet? = null,
+	defStyleAttr: Int = R.attr.chipGroupStyle
+) : ChipGroup(context, attrs, defStyleAttr) {
+
+	private var isLayoutSuppressedCompat = false
+	private var isLayoutCalledOnSuppressed = false
+	private var chipOnClickListener = OnClickListener {
+		onChipClickListener?.onChipClick(it as Chip, it.tag)
+	}
+	var onChipClickListener: OnChipClickListener? = null
+		set(value) {
+			field = value
+			val isChipClickable = value != null
+			children.forEach { it.isClickable = isChipClickable }
+		}
+
+	override fun requestLayout() {
+		if (isLayoutSuppressedCompat) {
+			isLayoutCalledOnSuppressed = true
+		} else {
+			super.requestLayout()
+		}
+	}
+
+	fun setChips(items: List<ChipModel>) {
+		suppressLayoutCompat(true)
+		try {
+			for ((i, model) in items.withIndex()) {
+				val chip = getChildAt(i) as Chip? ?: addChip()
+				bindChip(chip, model)
+			}
+			for (i in items.size until childCount) {
+				removeViewAt(i)
+			}
+		} finally {
+			suppressLayoutCompat(false)
+		}
+	}
+
+	private fun bindChip(chip: Chip, model: ChipModel) {
+		chip.text = model.title
+		if (model.icon == 0) {
+			chip.isChipIconVisible = false
+		} else {
+			chip.isCheckedIconVisible = true
+			chip.setChipIconResource(model.icon)
+		}
+		chip.tag = model.data
+	}
+
+	private fun addChip(): Chip {
+		val chip = Chip(context)
+		chip.setTextColor(context.getThemeColor(android.R.attr.textColorPrimary))
+		chip.isCloseIconVisible = false
+		chip.setEnsureMinTouchTargetSize(false)
+		chip.setOnClickListener(chipOnClickListener)
+		chip.isClickable = onChipClickListener != null
+		addView(chip)
+		return chip
+	}
+
+	private fun suppressLayoutCompat(suppress: Boolean) {
+		isLayoutSuppressedCompat = suppress
+		if (!suppress) {
+			if (isLayoutCalledOnSuppressed) {
+				requestLayout()
+				isLayoutCalledOnSuppressed = false
+			}
+		}
+	}
+
+	data class ChipModel(
+		@DrawableRes val icon: Int,
+		val title: CharSequence,
+		val data: Any? = null
+	)
+
+	fun interface OnChipClickListener {
+
+		fun onChipClick(chip: Chip, data: Any?)
+	}
+}

app/src/main/java/org/koitharu/kotatsu/base/ui/widgets/CoverImageView.kt

@@ -1,10 +1,10 @@
-package org.koitharu.kotatsu.ui.common.widgets
+package org.koitharu.kotatsu.base.ui.widgets
 
 import android.content.Context
 import android.util.AttributeSet
 import android.widget.LinearLayout
 import androidx.appcompat.widget.AppCompatImageView
-import androidx.core.content.res.use
+import androidx.core.content.withStyledAttributes
 import org.koitharu.kotatsu.R
 
 
@@ -15,10 +15,9 @@ class CoverImageView @JvmOverloads constructor(
 	private var orientation: Int = HORIZONTAL
 
 	init {
-		context.theme.obtainStyledAttributes(attrs, R.styleable.CoverImageView, defStyleAttr, 0)
-			.use {
-				orientation = it.getInt(R.styleable.CoverImageView_android_orientation, HORIZONTAL)
-			}
+		context.withStyledAttributes(attrs, R.styleable.CoverImageView, defStyleAttr) {
+			orientation = getInt(R.styleable.CoverImageView_android_orientation, HORIZONTAL)
+		}
 	}
 
 	override fun onMeasure(widthMeasureSpec: Int, heightMeasureSpec: Int) {

app/src/main/java/org/koitharu/kotatsu/base/ui/widgets/SquareLayout.kt

@@ -1,4 +1,4 @@
-package org.koitharu.kotatsu.ui.common.widgets
+package org.koitharu.kotatsu.base.ui.widgets
 
 import android.content.Context
 import android.util.AttributeSet

app/src/main/java/org/koitharu/kotatsu/browser/BrowserActivity.kt

@@ -1,4 +1,4 @@
-package org.koitharu.kotatsu.ui.browser
+package org.koitharu.kotatsu.browser
 
 import android.annotation.SuppressLint
 import android.content.ActivityNotFoundException
@@ -8,30 +8,36 @@ import android.net.Uri
 import android.os.Bundle
 import android.view.Menu
 import android.view.MenuItem
+import androidx.core.graphics.Insets
 import androidx.core.view.isVisible
-import kotlinx.android.synthetic.main.activity_browser.*
+import androidx.core.view.updatePadding
 import org.koitharu.kotatsu.R
-import org.koitharu.kotatsu.ui.common.BaseActivity
+import org.koitharu.kotatsu.base.ui.BaseActivity
+import org.koitharu.kotatsu.databinding.ActivityBrowserBinding
 
 @SuppressLint("SetJavaScriptEnabled")
-class BrowserActivity : BaseActivity(), BrowserCallback {
+class BrowserActivity : BaseActivity<ActivityBrowserBinding>(), BrowserCallback {
 
 	override fun onCreate(savedInstanceState: Bundle?) {
 		super.onCreate(savedInstanceState)
-		setContentView(R.layout.activity_browser)
+		setContentView(ActivityBrowserBinding.inflate(layoutInflater))
 		supportActionBar?.run {
 			setDisplayHomeAsUpEnabled(true)
 			setHomeAsUpIndicator(R.drawable.ic_cross)
 		}
-		with(webView.settings) {
+		with(binding.webView.settings) {
 			javaScriptEnabled = true
 		}
-		webView.webViewClient = BrowserClient(this)
+		binding.webView.webViewClient = BrowserClient(this)
 		val url = intent?.dataString
 		if (url.isNullOrEmpty()) {
 			finishAfterTransition()
 		} else {
-			webView.loadUrl(url)
+			onTitleChanged(
+				intent?.getStringExtra(EXTRA_TITLE) ?: getString(R.string.loading_),
+				url
+			)
+			binding.webView.loadUrl(url)
 		}
 	}
 
@@ -42,13 +48,13 @@ class BrowserActivity : BaseActivity(), BrowserCallback {
 
 	override fun onOptionsItemSelected(item: MenuItem): Boolean = when (item.itemId) {
 		android.R.id.home -> {
-			webView.stopLoading()
+			binding.webView.stopLoading()
 			finishAfterTransition()
 			true
 		}
 		R.id.action_browser -> {
 			val intent = Intent(Intent.ACTION_VIEW)
-			intent.data = Uri.parse(webView.url)
+			intent.data = Uri.parse(binding.webView.url)
 			try {
 				startActivity(Intent.createChooser(intent, item.title))
 			} catch (_: ActivityNotFoundException) {
@@ -59,25 +65,25 @@ class BrowserActivity : BaseActivity(), BrowserCallback {
 	}
 
 	override fun onBackPressed() {
-		if (webView.canGoBack()) {
-			webView.goBack()
+		if (binding.webView.canGoBack()) {
+			binding.webView.goBack()
 		} else {
 			super.onBackPressed()
 		}
 	}
 
 	override fun onPause() {
-		webView.onPause()
+		binding.webView.onPause()
 		super.onPause()
 	}
 
 	override fun onResume() {
 		super.onResume()
-		webView.onResume()
+		binding.webView.onResume()
 	}
 
 	override fun onLoadingStateChanged(isLoading: Boolean) {
-		progressBar.isVisible = isLoading
+		binding.progressBar.isVisible = isLoading
 	}
 
 	override fun onTitleChanged(title: CharSequence, subtitle: CharSequence?) {
@@ -85,10 +91,19 @@ class BrowserActivity : BaseActivity(), BrowserCallback {
 		supportActionBar?.subtitle = subtitle
 	}
 
+	override fun onWindowInsetsChanged(insets: Insets) {
+		binding.appbar.updatePadding(top = insets.top)
+		binding.webView.updatePadding(bottom = insets.bottom)
+	}
+
 	companion object {
 
-		@JvmStatic
-		fun newIntent(context: Context, url: String) = Intent(context, BrowserActivity::class.java)
-			.setData(Uri.parse(url))
+		private const val EXTRA_TITLE = "title"
+
+		fun newIntent(context: Context, url: String, title: String?): Intent {
+			return Intent(context, BrowserActivity::class.java)
+				.setData(Uri.parse(url))
+				.putExtra(EXTRA_TITLE, title)
+		}
 	}
 }

app/src/main/java/org/koitharu/kotatsu/browser/BrowserCallback.kt

@@ -1,4 +1,4 @@
-package org.koitharu.kotatsu.ui.browser
+package org.koitharu.kotatsu.browser
 
 interface BrowserCallback {
 

app/src/main/java/org/koitharu/kotatsu/browser/BrowserClient.kt

@@ -0,0 +1,45 @@
+package org.koitharu.kotatsu.browser
+
+import android.graphics.Bitmap
+import android.webkit.WebResourceResponse
+import android.webkit.WebView
+import okhttp3.OkHttpClient
+import okhttp3.Request
+import org.koin.core.component.KoinComponent
+import org.koin.core.component.inject
+import org.koitharu.kotatsu.core.network.WebViewClientCompat
+
+class BrowserClient(private val callback: BrowserCallback) : WebViewClientCompat(), KoinComponent {
+
+	private val okHttp by inject<OkHttpClient>()
+
+	override fun onPageFinished(webView: WebView, url: String) {
+		super.onPageFinished(webView, url)
+		callback.onLoadingStateChanged(isLoading = false)
+	}
+
+	override fun onPageStarted(view: WebView?, url: String?, favicon: Bitmap?) {
+		super.onPageStarted(view, url, favicon)
+		callback.onLoadingStateChanged(isLoading = true)
+	}
+
+	override fun onPageCommitVisible(view: WebView, url: String?) {
+		super.onPageCommitVisible(view, url)
+		callback.onTitleChanged(view.title.orEmpty(), url)
+	}
+
+	override fun shouldInterceptRequestCompat(view: WebView, url: String): WebResourceResponse? {
+		return runCatching {
+			val request = Request.Builder()
+				.url(url)
+				.build()
+			val response = okHttp.newCall(request).execute()
+			val ct = response.body?.contentType()
+			WebResourceResponse(
+				"${ct?.type}/${ct?.subtype}",
+				ct?.charset()?.name() ?: "utf-8",
+				response.body?.byteStream()
+			)
+		}.getOrNull()
+	}
+}

app/src/main/java/org/koitharu/kotatsu/browser/cloudflare/CloudFlareCallback.kt

@@ -0,0 +1,8 @@
+package org.koitharu.kotatsu.browser.cloudflare
+
+interface CloudFlareCallback {
+
+	fun onPageLoaded()
+
+	fun onCheckPassed()
+}

app/src/main/java/org/koitharu/kotatsu/browser/cloudflare/CloudFlareClient.kt

@@ -0,0 +1,47 @@
+package org.koitharu.kotatsu.browser.cloudflare
+
+import android.graphics.Bitmap
+import android.webkit.WebView
+import okhttp3.HttpUrl.Companion.toHttpUrl
+import org.koitharu.kotatsu.core.network.AndroidCookieJar
+import org.koitharu.kotatsu.core.network.WebViewClientCompat
+
+class CloudFlareClient(
+	private val cookieJar: AndroidCookieJar,
+	private val callback: CloudFlareCallback,
+	private val targetUrl: String
+) : WebViewClientCompat() {
+
+	init {
+		cookieJar.remove(targetUrl, CF_UID, CF_CLEARANCE)
+	}
+
+	override fun onPageStarted(view: WebView, url: String?, favicon: Bitmap?) {
+		super.onPageStarted(view, url, favicon)
+		checkClearance()
+	}
+
+	override fun onPageCommitVisible(view: WebView?, url: String?) {
+		super.onPageCommitVisible(view, url)
+		callback.onPageLoaded()
+	}
+
+	override fun onPageFinished(view: WebView?, url: String?) {
+		super.onPageFinished(view, url)
+		callback.onPageLoaded()
+	}
+
+	private fun checkClearance() {
+		val cookies = cookieJar.loadForRequest(targetUrl.toHttpUrl())
+		if (cookies.any { it.name == CF_CLEARANCE }) {
+			callback.onCheckPassed()
+		}
+
+	}
+
+	private companion object {
+
+		const val CF_UID = "__cfduid"
+		const val CF_CLEARANCE = "cf_clearance"
+	}
+}

app/src/main/java/org/koitharu/kotatsu/browser/cloudflare/CloudFlareDialog.kt

@@ -0,0 +1,93 @@
+package org.koitharu.kotatsu.browser.cloudflare
+
+import android.annotation.SuppressLint
+import android.content.DialogInterface
+import android.os.Bundle
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import android.webkit.CookieManager
+import android.webkit.WebSettings
+import androidx.appcompat.app.AlertDialog
+import androidx.core.view.isInvisible
+import androidx.fragment.app.setFragmentResult
+import org.koin.android.ext.android.get
+import org.koitharu.kotatsu.base.ui.AlertDialogFragment
+import org.koitharu.kotatsu.core.network.UserAgentInterceptor
+import org.koitharu.kotatsu.databinding.FragmentCloudflareBinding
+import org.koitharu.kotatsu.utils.ext.stringArgument
+import org.koitharu.kotatsu.utils.ext.withArgs
+
+class CloudFlareDialog : AlertDialogFragment<FragmentCloudflareBinding>(), CloudFlareCallback {
+
+	private val url by stringArgument(ARG_URL)
+	private val pendingResult = Bundle(1)
+
+	override fun onInflateView(
+		inflater: LayoutInflater,
+		container: ViewGroup?
+	) = FragmentCloudflareBinding.inflate(inflater, container, false)
+
+	@SuppressLint("SetJavaScriptEnabled")
+	override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+		super.onViewCreated(view, savedInstanceState)
+		with(binding.webView.settings) {
+			javaScriptEnabled = true
+			cacheMode = WebSettings.LOAD_DEFAULT
+			domStorageEnabled = true
+			databaseEnabled = true
+			userAgentString = UserAgentInterceptor.userAgent
+		}
+		binding.webView.webViewClient = CloudFlareClient(get(), this, url.orEmpty())
+		CookieManager.getInstance().setAcceptThirdPartyCookies(binding.webView, true)
+		if (url.isNullOrEmpty()) {
+			dismissAllowingStateLoss()
+		} else {
+			binding.webView.loadUrl(url.orEmpty())
+		}
+	}
+
+	override fun onDestroyView() {
+		binding.webView.stopLoading()
+		super.onDestroyView()
+	}
+
+	override fun onBuildDialog(builder: AlertDialog.Builder) {
+		builder.setNegativeButton(android.R.string.cancel, null)
+	}
+
+	override fun onResume() {
+		super.onResume()
+		binding.webView.onResume()
+	}
+
+	override fun onPause() {
+		binding.webView.onPause()
+		super.onPause()
+	}
+
+	override fun onDismiss(dialog: DialogInterface) {
+		setFragmentResult(TAG, pendingResult)
+		super.onDismiss(dialog)
+	}
+
+	override fun onPageLoaded() {
+		bindingOrNull()?.progressBar?.isInvisible = true
+	}
+
+	override fun onCheckPassed() {
+		pendingResult.putBoolean(EXTRA_RESULT, true)
+		dismiss()
+	}
+
+	companion object {
+
+		const val TAG = "CloudFlareDialog"
+		const val EXTRA_RESULT = "result"
+		private const val ARG_URL = "url"
+
+		fun newInstance(url: String) = CloudFlareDialog().withArgs(1) {
+			putString(ARG_URL, url)
+		}
+	}
+}

app/src/main/java/org/koitharu/kotatsu/core/backup/BackupArchive.kt

@@ -0,0 +1,51 @@
+package org.koitharu.kotatsu.core.backup
+
+import android.content.Context
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.withContext
+import org.json.JSONArray
+import org.koitharu.kotatsu.R
+import org.koitharu.kotatsu.utils.MutableZipFile
+import org.koitharu.kotatsu.utils.ext.format
+import java.io.File
+import java.util.*
+
+class BackupArchive(file: File) : MutableZipFile(file) {
+
+	init {
+		if (!dir.exists()) {
+			dir.mkdirs()
+		}
+	}
+
+	suspend fun put(entry: BackupEntry) {
+		put(entry.name, entry.data.toString(2))
+	}
+
+	suspend fun getEntry(name: String): BackupEntry {
+		val json = withContext(Dispatchers.Default) {
+			JSONArray(getContent(name))
+		}
+		return BackupEntry(name, json)
+	}
+
+	companion object {
+
+		private const val DIR_BACKUPS = "backups"
+
+		@Suppress("BlockingMethodInNonBlockingContext")
+		suspend fun createNew(context: Context): BackupArchive = withContext(Dispatchers.IO) {
+			val dir = context.run {
+				getExternalFilesDir(DIR_BACKUPS) ?: File(filesDir, DIR_BACKUPS)
+			}
+			dir.mkdirs()
+			val filename = buildString {
+				append(context.getString(R.string.app_name).toLowerCase(Locale.ROOT))
+				append('_')
+				append(Date().format("ddMMyyyy"))
+				append(".bak")
+			}
+			BackupArchive(File(dir, filename))
+		}
+	}
+}

app/src/main/java/org/koitharu/kotatsu/core/backup/BackupEntry.kt

@@ -0,0 +1,17 @@
+package org.koitharu.kotatsu.core.backup
+
+import org.json.JSONArray
+
+data class BackupEntry(
+	val name: String,
+	val data: JSONArray
+) {
+
+	companion object Names {
+
+		const val INDEX = "index"
+		const val HISTORY = "history"
+		const val CATEGORIES = "categories"
+		const val FAVOURITES = "favourites"
+	}
+}

app/src/main/java/org/koitharu/kotatsu/core/backup/BackupRepository.kt

@@ -0,0 +1,135 @@
+package org.koitharu.kotatsu.core.backup
+
+import org.json.JSONArray
+import org.json.JSONObject
+import org.koitharu.kotatsu.BuildConfig
+import org.koitharu.kotatsu.core.db.MangaDatabase
+import org.koitharu.kotatsu.core.db.entity.MangaEntity
+import org.koitharu.kotatsu.core.db.entity.TagEntity
+import org.koitharu.kotatsu.favourites.data.FavouriteCategoryEntity
+import org.koitharu.kotatsu.favourites.data.FavouriteEntity
+import org.koitharu.kotatsu.history.data.HistoryEntity
+
+class BackupRepository(private val db: MangaDatabase) {
+
+	suspend fun dumpHistory(): BackupEntry {
+		var offset = 0
+		val entry = BackupEntry(BackupEntry.HISTORY, JSONArray())
+		while (true) {
+			val history = db.historyDao.findAll(offset, PAGE_SIZE)
+			if (history.isEmpty()) {
+				break
+			}
+			offset += history.size
+			for (item in history) {
+				val manga = item.manga.toJson()
+				val tags = JSONArray()
+				item.tags.forEach { tags.put(it.toJson()) }
+				manga.put("tags", tags)
+				val json = item.history.toJson()
+				json.put("manga", manga)
+				entry.data.put(json)
+			}
+		}
+		return entry
+	}
+
+	suspend fun dumpCategories(): BackupEntry {
+		val entry = BackupEntry(BackupEntry.CATEGORIES, JSONArray())
+		val categories = db.favouriteCategoriesDao.findAll()
+		for (item in categories) {
+			entry.data.put(item.toJson())
+		}
+		return entry
+	}
+
+	suspend fun dumpFavourites(): BackupEntry {
+		var offset = 0
+		val entry = BackupEntry(BackupEntry.FAVOURITES, JSONArray())
+		while (true) {
+			val favourites = db.favouritesDao.findAll(offset, PAGE_SIZE)
+			if (favourites.isEmpty()) {
+				break
+			}
+			offset += favourites.size
+			for (item in favourites) {
+				val manga = item.manga.toJson()
+				val tags = JSONArray()
+				item.tags.forEach { tags.put(it.toJson()) }
+				manga.put("tags", tags)
+				val json = item.favourite.toJson()
+				json.put("manga", manga)
+				entry.data.put(json)
+			}
+		}
+		return entry
+	}
+
+	suspend fun createIndex(): BackupEntry {
+		val entry = BackupEntry(BackupEntry.INDEX, JSONArray())
+		val json = JSONObject()
+		json.put("app_id", BuildConfig.APPLICATION_ID)
+		json.put("app_version", BuildConfig.VERSION_CODE)
+		json.put("created_at", System.currentTimeMillis())
+		entry.data.put(json)
+		return entry
+	}
+
+	private fun MangaEntity.toJson(): JSONObject {
+		val jo = JSONObject()
+		jo.put("id", id)
+		jo.put("title", title)
+		jo.put("alt_title", altTitle)
+		jo.put("url", url)
+		jo.put("public_url", publicUrl)
+		jo.put("rating", rating)
+		jo.put("cover_url", coverUrl)
+		jo.put("large_cover_url", largeCoverUrl)
+		jo.put("state", state)
+		jo.put("author", author)
+		jo.put("source", source)
+		return jo
+	}
+
+	private fun TagEntity.toJson(): JSONObject {
+		val jo = JSONObject()
+		jo.put("id", id)
+		jo.put("title", title)
+		jo.put("key", key)
+		jo.put("source", source)
+		return jo
+	}
+
+	private fun HistoryEntity.toJson(): JSONObject {
+		val jo = JSONObject()
+		jo.put("manga_id", mangaId)
+		jo.put("created_at", createdAt)
+		jo.put("updated_at", updatedAt)
+		jo.put("chapter_id", chapterId)
+		jo.put("page", page)
+		jo.put("scroll", scroll)
+		return jo
+	}
+
+	private fun FavouriteCategoryEntity.toJson(): JSONObject {
+		val jo = JSONObject()
+		jo.put("category_id", categoryId)
+		jo.put("created_at", createdAt)
+		jo.put("sort_key", sortKey)
+		jo.put("title", title)
+		return jo
+	}
+
+	private fun FavouriteEntity.toJson(): JSONObject {
+		val jo = JSONObject()
+		jo.put("manga_id", mangaId)
+		jo.put("category_id", categoryId)
+		jo.put("created_at", createdAt)
+		return jo
+	}
+
+	private companion object {
+
+		const val PAGE_SIZE = 10
+	}
+}

app/src/main/java/org/koitharu/kotatsu/core/backup/CompositeResult.kt

@@ -0,0 +1,39 @@
+package org.koitharu.kotatsu.core.backup
+
+class CompositeResult {
+
+	private var successCount: Int = 0
+	private val errors = ArrayList<Throwable?>()
+
+	val size: Int
+		get() = successCount + errors.size
+
+	val failures: List<Throwable>
+		get() = errors.filterNotNull()
+
+	val isAllSuccess: Boolean
+		get() = errors.none { it != null }
+
+	val isAllFailed: Boolean
+		get() = successCount == 0 && errors.isNotEmpty()
+
+	operator fun plusAssign(result: Result<*>) {
+		when {
+			result.isSuccess -> successCount++
+			result.isFailure -> errors.add(result.exceptionOrNull())
+		}
+	}
+
+	operator fun plusAssign(other: CompositeResult) {
+		this.successCount += other.successCount
+		this.errors += other.errors
+	}
+
+	operator fun plus(other: CompositeResult): CompositeResult {
+		val result = CompositeResult()
+		result.successCount = this.successCount + other.successCount
+		result.errors.addAll(this.errors)
+		result.errors.addAll(other.errors)
+		return result
+	}
+}

app/src/main/java/org/koitharu/kotatsu/core/backup/RestoreRepository.kt

@@ -0,0 +1,110 @@
+package org.koitharu.kotatsu.core.backup
+
+import androidx.room.withTransaction
+import org.json.JSONObject
+import org.koitharu.kotatsu.core.db.MangaDatabase
+import org.koitharu.kotatsu.core.db.entity.MangaEntity
+import org.koitharu.kotatsu.core.db.entity.TagEntity
+import org.koitharu.kotatsu.favourites.data.FavouriteCategoryEntity
+import org.koitharu.kotatsu.favourites.data.FavouriteEntity
+import org.koitharu.kotatsu.history.data.HistoryEntity
+import org.koitharu.kotatsu.utils.ext.getStringOrNull
+import org.koitharu.kotatsu.utils.ext.iterator
+import org.koitharu.kotatsu.utils.ext.map
+
+class RestoreRepository(private val db: MangaDatabase) {
+
+	suspend fun upsertHistory(entry: BackupEntry): CompositeResult {
+		val result = CompositeResult()
+		for (item in entry.data) {
+			val mangaJson = item.getJSONObject("manga")
+			val manga = parseManga(mangaJson)
+			val tags = mangaJson.getJSONArray("tags").map {
+				parseTag(it)
+			}
+			val history = parseHistory(item)
+			result += runCatching {
+				db.withTransaction {
+					db.tagsDao.upsert(tags)
+					db.mangaDao.upsert(manga, tags)
+					db.historyDao.upsert(history)
+				}
+			}
+		}
+		return result
+	}
+
+	suspend fun upsertCategories(entry: BackupEntry): CompositeResult {
+		val result = CompositeResult()
+		for (item in entry.data) {
+			val category = parseCategory(item)
+			result += runCatching {
+				db.favouriteCategoriesDao.upsert(category)
+			}
+		}
+		return result
+	}
+
+	suspend fun upsertFavourites(entry: BackupEntry): CompositeResult {
+		val result = CompositeResult()
+		for (item in entry.data) {
+			val mangaJson = item.getJSONObject("manga")
+			val manga = parseManga(mangaJson)
+			val tags = mangaJson.getJSONArray("tags").map {
+				parseTag(it)
+			}
+			val favourite = parseFavourite(item)
+			result += runCatching {
+				db.withTransaction {
+					db.tagsDao.upsert(tags)
+					db.mangaDao.upsert(manga, tags)
+					db.favouritesDao.upsert(favourite)
+				}
+			}
+		}
+		return result
+	}
+
+	private fun parseManga(json: JSONObject) = MangaEntity(
+		id = json.getLong("id"),
+		title = json.getString("title"),
+		altTitle = json.getStringOrNull("alt_title"),
+		url = json.getString("url"),
+		publicUrl = json.getStringOrNull("public_url").orEmpty(),
+		rating = json.getDouble("rating").toFloat(),
+		coverUrl = json.getString("cover_url"),
+		largeCoverUrl = json.getStringOrNull("large_cover_url"),
+		state = json.getStringOrNull("state"),
+		author = json.getStringOrNull("author"),
+		source = json.getString("source")
+	)
+
+	private fun parseTag(json: JSONObject) = TagEntity(
+		id = json.getLong("id"),
+		title = json.getString("title"),
+		key = json.getString("key"),
+		source = json.getString("source")
+	)
+
+	private fun parseHistory(json: JSONObject) = HistoryEntity(
+		mangaId = json.getLong("manga_id"),
+		createdAt = json.getLong("created_at"),
+		updatedAt = json.getLong("updated_at"),
+		chapterId = json.getLong("chapter_id"),
+		page = json.getInt("page"),
+		scroll = json.getDouble("scroll").toFloat()
+	)
+
+	private fun parseCategory(json: JSONObject) = FavouriteCategoryEntity(
+		categoryId = json.getInt("category_id"),
+		createdAt = json.getLong("created_at"),
+		sortKey = json.getInt("sort_key"),
+		title = json.getString("title")
+	)
+
+	private fun parseFavourite(json: JSONObject) = FavouriteEntity(
+		mangaId = json.getLong("manga_id"),
+		categoryId = json.getLong("category_id"),
+		createdAt = json.getLong("created_at")
+	)
+}

app/src/main/java/org/koitharu/kotatsu/core/db/DatabaseModule.kt

@@ -0,0 +1,26 @@
+package org.koitharu.kotatsu.core.db
+
+import androidx.room.Room
+import org.koin.android.ext.koin.androidContext
+import org.koin.dsl.module
+import org.koitharu.kotatsu.core.db.migrations.*
+
+val databaseModule
+	get() = module {
+		single {
+			Room.databaseBuilder(
+				androidContext(),
+				MangaDatabase::class.java,
+				"kotatsu-db"
+			).addMigrations(
+				Migration1To2(),
+				Migration2To3(),
+				Migration3To4(),
+				Migration4To5(),
+				Migration5To6(),
+				Migration6To7()
+			).addCallback(
+				DatabasePrePopulateCallback(androidContext().resources)
+			).build()
+		}
+	}

app/src/main/java/org/koitharu/kotatsu/core/db/FavouritesDao.kt

@@ -1,39 +0,0 @@
-package org.koitharu.kotatsu.core.db
-
-import androidx.room.*
-import org.koitharu.kotatsu.core.db.entity.FavouriteEntity
-import org.koitharu.kotatsu.core.db.entity.FavouriteManga
-import org.koitharu.kotatsu.core.db.entity.MangaEntity
-
-@Dao
-abstract class FavouritesDao {
-
-	@Transaction
-	@Query("SELECT * FROM favourites GROUP BY manga_id ORDER BY created_at")
-	abstract suspend fun findAll(): List<FavouriteManga>
-
-	@Transaction
-	@Query("SELECT * FROM favourites GROUP BY manga_id ORDER BY created_at LIMIT :limit OFFSET :offset")
-	abstract suspend fun findAll(offset: Int, limit: Int): List<FavouriteManga>
-
-	@Transaction
-	@Query("SELECT * FROM favourites WHERE category_id = :categoryId GROUP BY manga_id ORDER BY created_at")
-	abstract suspend fun findAll(categoryId: Long): List<FavouriteManga>
-
-	@Transaction
-	@Query("SELECT * FROM favourites WHERE category_id = :categoryId GROUP BY manga_id ORDER BY created_at LIMIT :limit OFFSET :offset")
-	abstract suspend fun findAll(categoryId: Long, offset: Int, limit: Int): List<FavouriteManga>
-
-	@Query("SELECT * FROM manga WHERE manga_id IN (SELECT manga_id FROM favourites)")
-	abstract suspend fun findAllManga(): List<MangaEntity>
-
-	@Transaction
-	@Query("SELECT * FROM favourites WHERE manga_id = :id GROUP BY manga_id")
-	abstract suspend fun find(id: Long): FavouriteManga?
-
-	@Insert(onConflict = OnConflictStrategy.IGNORE)
-	abstract suspend fun add(favourite: FavouriteEntity)
-
-	@Query("DELETE FROM favourites WHERE manga_id = :mangaId AND category_id = :categoryId")
-	abstract suspend fun delete(categoryId: Long, mangaId: Long)
-}

app/src/main/java/org/koitharu/kotatsu/core/db/HistoryDao.kt

@@ -1,47 +0,0 @@
-package org.koitharu.kotatsu.core.db
-
-import androidx.room.*
-import org.koitharu.kotatsu.core.db.entity.HistoryEntity
-import org.koitharu.kotatsu.core.db.entity.HistoryWithManga
-import org.koitharu.kotatsu.core.db.entity.MangaEntity
-
-
-@Dao
-abstract class HistoryDao {
-
-    /**
-     * @hide
-     */
-    @Transaction
-    @Query("SELECT * FROM history ORDER BY updated_at DESC LIMIT :limit OFFSET :offset")
-    abstract suspend fun findAll(offset: Int, limit: Int): List<HistoryWithManga>
-
-    @Query("SELECT * FROM manga WHERE manga_id IN (SELECT manga_id FROM history)")
-    abstract suspend fun findAllManga(): List<MangaEntity>
-
-    @Query("SELECT * FROM history WHERE manga_id = :id")
-    abstract suspend fun find(id: Long): HistoryEntity?
-
-    @Query("DELETE FROM history")
-    abstract suspend fun clear()
-
-    @Insert(onConflict = OnConflictStrategy.IGNORE)
-    abstract suspend fun insert(entity: HistoryEntity): Long
-
-    @Query("UPDATE history SET page = :page, chapter_id = :chapterId, scroll = :scroll, updated_at = :updatedAt WHERE manga_id = :mangaId")
-    abstract suspend fun update(mangaId: Long, page: Int, chapterId: Long, scroll: Float, updatedAt: Long): Int
-
-    @Query("DELETE FROM history WHERE manga_id = :mangaId")
-    abstract suspend fun delete(mangaId: Long)
-
-    suspend fun update(entity: HistoryEntity) = update(entity.mangaId, entity.page, entity.chapterId, entity.scroll, entity.updatedAt)
-
-    @Transaction
-    open suspend fun upsert(entity: HistoryEntity): Boolean {
-        return if (update(entity) == 0) {
-            insert(entity)
-            true
-        } else false
-    }
-
-}

app/src/main/java/org/koitharu/kotatsu/core/db/MangaDatabase.kt

@@ -2,14 +2,21 @@ package org.koitharu.kotatsu.core.db
 
 import androidx.room.Database
 import androidx.room.RoomDatabase
+import org.koitharu.kotatsu.core.db.dao.*
 import org.koitharu.kotatsu.core.db.entity.*
+import org.koitharu.kotatsu.favourites.data.FavouriteCategoriesDao
+import org.koitharu.kotatsu.favourites.data.FavouriteCategoryEntity
+import org.koitharu.kotatsu.favourites.data.FavouriteEntity
+import org.koitharu.kotatsu.favourites.data.FavouritesDao
+import org.koitharu.kotatsu.history.data.HistoryDao
+import org.koitharu.kotatsu.history.data.HistoryEntity
 
 @Database(
 	entities = [
 		MangaEntity::class, TagEntity::class, HistoryEntity::class, MangaTagsEntity::class,
 		FavouriteCategoryEntity::class, FavouriteEntity::class, MangaPrefsEntity::class,
 		TrackEntity::class, TrackLogEntity::class
-	], version = 6
+	], version = 7
 )
 abstract class MangaDatabase : RoomDatabase() {
 

app/src/main/java/org/koitharu/kotatsu/core/db/dao/MangaDao.kt

@@ -1,4 +1,4 @@
-package org.koitharu.kotatsu.core.db
+package org.koitharu.kotatsu.core.db.dao
 
 import androidx.room.*
 import org.koitharu.kotatsu.core.db.entity.MangaEntity

app/src/main/java/org/koitharu/kotatsu/core/db/dao/PreferencesDao.kt

@@ -1,4 +1,4 @@
-package org.koitharu.kotatsu.core.db
+package org.koitharu.kotatsu.core.db.dao
 
 import androidx.room.*
 import org.koitharu.kotatsu.core.db.entity.MangaPrefsEntity

app/src/main/java/org/koitharu/kotatsu/core/db/dao/TagsDao.kt

@@ -1,4 +1,4 @@
-package org.koitharu.kotatsu.core.db
+package org.koitharu.kotatsu.core.db.dao
 
 import androidx.room.*
 import org.koitharu.kotatsu.core.db.entity.TagEntity

app/src/main/java/org/koitharu/kotatsu/core/db/dao/TrackLogsDao.kt

@@ -1,4 +1,4 @@
-package org.koitharu.kotatsu.core.db
+package org.koitharu.kotatsu.core.db.dao
 
 import androidx.room.*
 import org.koitharu.kotatsu.core.db.entity.TrackLogEntity

app/src/main/java/org/koitharu/kotatsu/core/db/dao/TracksDao.kt

@@ -1,4 +1,4 @@
-package org.koitharu.kotatsu.core.db
+package org.koitharu.kotatsu.core.db.dao
 
 import androidx.room.*
 import org.koitharu.kotatsu.core.db.entity.TrackEntity

app/src/main/java/org/koitharu/kotatsu/core/db/entity/MangaEntity.kt

@@ -15,6 +15,7 @@ data class MangaEntity(
 	@ColumnInfo(name = "title") val title: String,
 	@ColumnInfo(name = "alt_title") val altTitle: String? = null,
 	@ColumnInfo(name = "url") val url: String,
+	@ColumnInfo(name = "public_url") val publicUrl: String,
 	@ColumnInfo(name = "rating") val rating: Float = Manga.NO_RATING, //normalized value [0..1] or -1
 	@ColumnInfo(name = "cover_url") val coverUrl: String,
 	@ColumnInfo(name = "large_cover_url") val largeCoverUrl: String? = null,
@@ -30,6 +31,7 @@ data class MangaEntity(
 		state = this.state?.let { MangaState.valueOf(it) },
 		rating = this.rating,
 		url = this.url,
+		publicUrl = this.publicUrl,
 		coverUrl = this.coverUrl,
 		largeCoverUrl = this.largeCoverUrl,
 		author = this.author,
@@ -42,6 +44,7 @@ data class MangaEntity(
 		fun from(manga: Manga) = MangaEntity(
 			id = manga.id,
 			url = manga.url,
+			publicUrl = manga.publicUrl,
 			source = manga.source.name,
 			largeCoverUrl = manga.largeCoverUrl,
 			coverUrl = manga.coverUrl,

app/src/main/java/org/koitharu/kotatsu/core/db/entity/MangaWithTags.kt

@@ -3,6 +3,7 @@ package org.koitharu.kotatsu.core.db.entity
 import androidx.room.Embedded
 import androidx.room.Junction
 import androidx.room.Relation
+import org.koitharu.kotatsu.utils.ext.mapToSet
 
 data class MangaWithTags(
 	@Embedded val manga: MangaEntity,
@@ -14,7 +15,7 @@ data class MangaWithTags(
 	val tags: List<TagEntity>
 ) {
 
-	fun toManga() = manga.toManga(tags.map {
+	fun toManga() = manga.toManga(tags.mapToSet {
 		it.toMangaTag()
-	}.toSet())
+	})
 }

app/src/main/java/org/koitharu/kotatsu/core/db/entity/TrackEntity.kt

@@ -15,7 +15,7 @@ import androidx.room.PrimaryKey
 		)
 	]
 )
-data class TrackEntity (
+data class TrackEntity(
 	@PrimaryKey(autoGenerate = false)
 	@ColumnInfo(name = "manga_id") val mangaId: Long,
 	@ColumnInfo(name = "chapters_total") val totalChapters: Int,

app/src/main/java/org/koitharu/kotatsu/core/db/entity/TrackLogWithManga.kt

@@ -4,6 +4,7 @@ import androidx.room.Embedded
 import androidx.room.Junction
 import androidx.room.Relation
 import org.koitharu.kotatsu.core.model.TrackingLogItem
+import org.koitharu.kotatsu.utils.ext.mapToSet
 import java.util.*
 
 data class TrackLogWithManga(
@@ -24,7 +25,7 @@ data class TrackLogWithManga(
 	fun toTrackingLogItem() = TrackingLogItem(
 		id = trackLog.id,
 		chapters = trackLog.chapters.split('\n').filterNot { x -> x.isEmpty() },
-		manga = manga.toManga(tags.map { x -> x.toMangaTag() }.toSet()),
+		manga = manga.toManga(tags.mapToSet { x -> x.toMangaTag() }),
 		createdAt = Date(trackLog.createdAt)
 	)
 }

app/src/main/java/org/koitharu/kotatsu/core/db/migrations/Migration1To2.kt

@@ -3,7 +3,7 @@ package org.koitharu.kotatsu.core.db.migrations
 import androidx.room.migration.Migration
 import androidx.sqlite.db.SupportSQLiteDatabase
 
-object Migration1To2 : Migration(1, 2) {
+class Migration1To2 : Migration(1, 2) {
 	/**
 	 * Adding foreign keys
 	 */

app/src/main/java/org/koitharu/kotatsu/core/db/migrations/Migration2To3.kt

@@ -3,7 +3,7 @@ package org.koitharu.kotatsu.core.db.migrations
 import androidx.room.migration.Migration
 import androidx.sqlite.db.SupportSQLiteDatabase
 
-object Migration2To3 : Migration(2, 3) {
+class Migration2To3 : Migration(2, 3) {
 
 	override fun migrate(database: SupportSQLiteDatabase) {
 		database.execSQL("ALTER TABLE history ADD COLUMN scroll REAL NOT NULL DEFAULT 0")

app/src/main/java/org/koitharu/kotatsu/core/db/migrations/Migration3To4.kt

@@ -3,7 +3,7 @@ package org.koitharu.kotatsu.core.db.migrations
 import androidx.room.migration.Migration
 import androidx.sqlite.db.SupportSQLiteDatabase
 
-object Migration3To4 : Migration(3, 4) {
+class Migration3To4 : Migration(3, 4) {
 
 	override fun migrate(database: SupportSQLiteDatabase) {
 		database.execSQL("CREATE TABLE IF NOT EXISTS tracks (manga_id INTEGER NOT NULL, chapters_total INTEGER NOT NULL, last_chapter_id INTEGER NOT NULL, chapters_new INTEGER NOT NULL, last_check INTEGER NOT NULL, last_notified_id INTEGER NOT NULL, PRIMARY KEY(manga_id), FOREIGN KEY(manga_id) REFERENCES manga(manga_id) ON UPDATE NO ACTION ON DELETE CASCADE )")

app/src/main/java/org/koitharu/kotatsu/core/db/migrations/Migration4To5.kt

@@ -3,7 +3,7 @@ package org.koitharu.kotatsu.core.db.migrations
 import androidx.room.migration.Migration
 import androidx.sqlite.db.SupportSQLiteDatabase
 
-object Migration4To5 : Migration(4, 5) {
+class Migration4To5 : Migration(4, 5) {
 
 	override fun migrate(database: SupportSQLiteDatabase) {
 		database.execSQL("ALTER TABLE favourite_categories ADD COLUMN sort_key INTEGER NOT NULL DEFAULT 0")

app/src/main/java/org/koitharu/kotatsu/core/db/migrations/Migration5To6.kt

@@ -3,7 +3,7 @@ package org.koitharu.kotatsu.core.db.migrations
 import androidx.room.migration.Migration
 import androidx.sqlite.db.SupportSQLiteDatabase
 
-object Migration5To6 : Migration(5, 6) {
+class Migration5To6 : Migration(5, 6) {
 
 	override fun migrate(database: SupportSQLiteDatabase) {
 		database.execSQL("CREATE TABLE IF NOT EXISTS track_logs (id INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, manga_id INTEGER NOT NULL, chapters TEXT NOT NULL, created_at INTEGER NOT NULL, FOREIGN KEY(manga_id) REFERENCES manga(manga_id) ON UPDATE NO ACTION ON DELETE CASCADE)")

app/src/main/java/org/koitharu/kotatsu/core/db/migrations/Migration6To7.kt

@@ -0,0 +1,11 @@
+package org.koitharu.kotatsu.core.db.migrations
+
+import androidx.room.migration.Migration
+import androidx.sqlite.db.SupportSQLiteDatabase
+
+class Migration6To7 : Migration(6, 7) {
+
+	override fun migrate(database: SupportSQLiteDatabase) {
+		database.execSQL("ALTER TABLE manga ADD COLUMN public_url TEXT NOT NULL DEFAULT ''")
+	}
+}

app/src/main/java/org/koitharu/kotatsu/core/exceptions/AuthRequiredException.kt

@@ -0,0 +1,13 @@
+package org.koitharu.kotatsu.core.exceptions
+
+import androidx.annotation.StringRes
+import org.koitharu.kotatsu.R
+import org.koitharu.kotatsu.core.exceptions.resolve.ResolvableException
+
+class AuthRequiredException(
+	val url: String
+) : RuntimeException("Authorization required"), ResolvableException {
+
+	@StringRes
+	override val resolveTextId: Int = R.string.sign_in
+}

app/src/main/java/org/koitharu/kotatsu/core/exceptions/CloudFlareProtectedException.kt

@@ -0,0 +1,14 @@
+package org.koitharu.kotatsu.core.exceptions
+
+import androidx.annotation.StringRes
+import okio.IOException
+import org.koitharu.kotatsu.R
+import org.koitharu.kotatsu.core.exceptions.resolve.ResolvableException
+
+class CloudFlareProtectedException(
+	val url: String
+) : IOException("Protected by CloudFlare"), ResolvableException {
+
+	@StringRes
+	override val resolveTextId: Int = R.string.captcha_solve
+}

app/src/main/java/org/koitharu/kotatsu/core/exceptions/ParseException.kt

@@ -1,3 +1,4 @@
 package org.koitharu.kotatsu.core.exceptions
 
-class ParseException(message: String? = null, cause: Throwable? = null) : RuntimeException(message, cause)
+class ParseException(message: String? = null, cause: Throwable? = null) :
+	RuntimeException(message, cause)

app/src/main/java/org/koitharu/kotatsu/core/exceptions/WrongPasswordException.kt

@@ -0,0 +1,3 @@
+package org.koitharu.kotatsu.core.exceptions
+
+class WrongPasswordException : SecurityException()

app/src/main/java/org/koitharu/kotatsu/core/exceptions/resolve/ExceptionResolver.kt

@@ -0,0 +1,40 @@
+package org.koitharu.kotatsu.core.exceptions.resolve
+
+import android.util.ArrayMap
+import androidx.fragment.app.FragmentManager
+import androidx.lifecycle.LifecycleOwner
+import kotlinx.coroutines.suspendCancellableCoroutine
+import org.koitharu.kotatsu.browser.cloudflare.CloudFlareDialog
+import org.koitharu.kotatsu.core.exceptions.AuthRequiredException
+import org.koitharu.kotatsu.core.exceptions.CloudFlareProtectedException
+import kotlin.coroutines.Continuation
+import kotlin.coroutines.resume
+
+class ExceptionResolver(
+	private val lifecycleOwner: LifecycleOwner,
+	private val fm: FragmentManager
+) {
+
+	private val continuations = ArrayMap<String, Continuation<Boolean>>(1)
+
+	suspend fun resolve(e: ResolvableException): Boolean = when (e) {
+		is CloudFlareProtectedException -> resolveCF(e.url)
+		is AuthRequiredException -> false //TODO
+		else -> false
+	}
+
+	private suspend fun resolveCF(url: String) = suspendCancellableCoroutine<Boolean> { cont ->
+		val dialog = CloudFlareDialog.newInstance(url)
+		fm.clearFragmentResult(CloudFlareDialog.TAG)
+		continuations[CloudFlareDialog.TAG] = cont
+		fm.setFragmentResultListener(CloudFlareDialog.TAG, lifecycleOwner) { key, result ->
+			continuations.remove(key)?.resume(result.getBoolean(CloudFlareDialog.EXTRA_RESULT))
+		}
+		dialog.show(fm, CloudFlareDialog.TAG)
+		cont.invokeOnCancellation {
+			continuations.remove(CloudFlareDialog.TAG, cont)
+			fm.clearFragmentResultListener(CloudFlareDialog.TAG)
+			dialog.dismiss()
+		}
+	}
+}

app/src/main/java/org/koitharu/kotatsu/core/exceptions/resolve/ResolvableException.kt

@@ -0,0 +1,6 @@
+package org.koitharu.kotatsu.core.exceptions.resolve
+
+interface ResolvableException {
+
+	val resolveTextId: Int
+}

app/src/main/java/org/koitharu/kotatsu/core/github/AppVersion.kt

@@ -1,7 +1,7 @@
 package org.koitharu.kotatsu.core.github
 
 import android.os.Parcelable
-import kotlinx.android.parcel.Parcelize
+import kotlinx.parcelize.Parcelize
 
 @Parcelize
 data class AppVersion(

app/src/main/java/org/koitharu/kotatsu/core/github/GithubModule.kt

@@ -0,0 +1,10 @@
+package org.koitharu.kotatsu.core.github
+
+import org.koin.dsl.module
+
+val githubModule
+	get() = module {
+		single {
+			GithubRepository(get())
+		}
+	}

app/src/main/java/org/koitharu/kotatsu/core/github/GithubRepository.kt

@@ -2,14 +2,10 @@ package org.koitharu.kotatsu.core.github
 
 import okhttp3.OkHttpClient
 import okhttp3.Request
-import org.koin.core.KoinComponent
-import org.koin.core.inject
 import org.koitharu.kotatsu.utils.ext.await
 import org.koitharu.kotatsu.utils.ext.parseJson
 
-class GithubRepository : KoinComponent {
-
-	private val okHttp by inject<OkHttpClient>()
+class GithubRepository(private val okHttp: OkHttpClient) {
 
 	suspend fun getLatestVersion(): AppVersion {
 		val request = Request.Builder()

app/src/main/java/org/koitharu/kotatsu/core/github/VersionId.kt

@@ -32,7 +32,6 @@ data class VersionId(
 
 	companion object {
 
-		@JvmStatic
 		private fun variantWeight(variantType: String) =
 			when (variantType.toLowerCase(Locale.ROOT)) {
 				"a", "alpha" -> 1
@@ -42,7 +41,6 @@ data class VersionId(
 				else -> 0
 			}
 
-		@JvmStatic
 		fun parse(versionName: String): VersionId {
 			val parts = versionName.substringBeforeLast('-').split('.')
 			val variant = versionName.substringAfterLast('-', "")

app/src/main/java/org/koitharu/kotatsu/core/local/CbzFilter.kt

@@ -1,10 +0,0 @@
-package org.koitharu.kotatsu.core.local
-
-import java.io.File
-import java.io.FilenameFilter
-
-class CbzFilter : FilenameFilter {
-
-	override fun accept(dir: File, name: String) =
-		name.endsWith(".cbz", ignoreCase = true) || name.endsWith(".zip", ignoreCase = true)
-}

app/src/main/java/org/koitharu/kotatsu/core/local/cookies/ClearableCookieJar.kt

@@ -1,34 +0,0 @@
-/*
- * Copyright (C) 2016 Francisco José Montiel Navarro.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.koitharu.kotatsu.core.local.cookies
-
-import okhttp3.CookieJar
-
-/**
- * This interface extends [okhttp3.CookieJar] and adds methods to clear the cookies.
- */
-interface ClearableCookieJar : CookieJar {
-
-	/**
-	 * Clear all the session cookies while maintaining the persisted ones.
-	 */
-	fun clearSession()
-
-	/**
-	 * Clear all the cookies from persistence and from the cache.
-	 */
-	fun clear()
-}

app/src/main/java/org/koitharu/kotatsu/core/local/cookies/PersistentCookieJar.kt

@@ -1,87 +0,0 @@
-/*
- * Copyright (C) 2016 Francisco José Montiel Navarro.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.koitharu.kotatsu.core.local.cookies
-
-import org.koitharu.kotatsu.core.local.cookies.persistence.CookiePersistor
-import okhttp3.Cookie
-import okhttp3.HttpUrl
-import org.koitharu.kotatsu.core.local.cookies.cache.CookieCache
-import java.util.*
-
-class PersistentCookieJar(
-	private val cache: CookieCache,
-	private val persistor: CookiePersistor
-) : ClearableCookieJar {
-
-	init {
-		cache.addAll(persistor.loadAll())
-	}
-
-	@Synchronized
-	override fun saveFromResponse(url: HttpUrl, cookies: List<Cookie>) {
-		cache.addAll(cookies)
-		persistor.saveAll(filterPersistentCookies(cookies))
-	}
-
-	@Synchronized
-	override fun loadForRequest(url: HttpUrl): List<Cookie> {
-		val cookiesToRemove: MutableList<Cookie> = ArrayList()
-		val validCookies: MutableList<Cookie> = ArrayList()
-		val it = cache.iterator()
-		while (it.hasNext()) {
-			val currentCookie = it.next()
-			if (isCookieExpired(currentCookie)) {
-				cookiesToRemove.add(currentCookie)
-				it.remove()
-			} else if (currentCookie.matches(url)) {
-				validCookies.add(currentCookie)
-			}
-		}
-		persistor.removeAll(cookiesToRemove)
-		return validCookies
-	}
-
-	@Synchronized
-	override fun clearSession() {
-		cache.clear()
-		cache.addAll(persistor.loadAll())
-	}
-
-	@Synchronized
-	override fun clear() {
-		cache.clear()
-		persistor.clear()
-	}
-
-	private companion object {
-
-		@JvmStatic
-		fun filterPersistentCookies(cookies: List<Cookie>): List<Cookie> {
-			val persistentCookies: MutableList<Cookie> = ArrayList()
-			for (cookie in cookies) {
-				if (cookie.persistent) {
-					persistentCookies.add(cookie)
-				}
-			}
-			return persistentCookies
-		}
-
-		@JvmStatic
-		fun isCookieExpired(cookie: Cookie): Boolean {
-			return cookie.expiresAt < System.currentTimeMillis()
-		}
-	}
-}

app/src/main/java/org/koitharu/kotatsu/core/local/cookies/cache/CookieCache.kt

@@ -1,35 +0,0 @@
-/*
- * Copyright (C) 2016 Francisco José Montiel Navarro.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.koitharu.kotatsu.core.local.cookies.cache
-
-import okhttp3.Cookie
-
-/**
- * A CookieCache handles the volatile cookie session storage.
- */
-interface CookieCache : MutableIterable<Cookie> {
-	/**
-	 * Add all the new cookies to the session, existing cookies will be overwritten.
-	 *
-	 * @param newCookies
-	 */
-	fun addAll(newCookies: Collection<Cookie>)
-
-	/**
-	 * Clear all the cookies from the session.
-	 */
-	fun clear()
-}

app/src/main/java/org/koitharu/kotatsu/core/local/cookies/cache/IdentifiableCookie.kt

@@ -1,60 +0,0 @@
-/*
- * Copyright (C) 2016 Francisco José Montiel Navarro.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.koitharu.kotatsu.core.local.cookies.cache
-
-import okhttp3.Cookie
-import java.util.*
-
-/**
- * This class decorates a Cookie to re-implements equals() and hashcode() methods in order to identify
- * the cookie by the following attributes: name, domain, path, secure & hostOnly.
- *
- *
- *
- * This new behaviour will be useful in determining when an already existing cookie in session must be overwritten.
- */
-internal class IdentifiableCookie(val cookie: Cookie) {
-
-	override fun equals(other: Any?): Boolean {
-		if (other !is IdentifiableCookie) return false
-		return other.cookie.name == cookie.name && other.cookie.domain == cookie.domain
-				&& other.cookie.path == cookie.path && other.cookie.secure == cookie.secure
-				&& other.cookie.hostOnly == cookie.hostOnly
-	}
-
-	override fun hashCode(): Int {
-		var hash = 17
-		hash = 31 * hash + cookie.name.hashCode()
-		hash = 31 * hash + cookie.domain.hashCode()
-		hash = 31 * hash + cookie.path.hashCode()
-		hash = 31 * hash + if (cookie.secure) 0 else 1
-		hash = 31 * hash + if (cookie.hostOnly) 0 else 1
-		return hash
-	}
-
-	companion object {
-
-		@JvmStatic
-		fun decorateAll(cookies: Collection<Cookie>): List<IdentifiableCookie> {
-			val identifiableCookies: MutableList<IdentifiableCookie> = ArrayList(cookies.size)
-			for (cookie in cookies) {
-				identifiableCookies.add(IdentifiableCookie(cookie))
-			}
-			return identifiableCookies
-		}
-	}
-
-}

app/src/main/java/org/koitharu/kotatsu/core/local/cookies/cache/SetCookieCache.kt

@@ -1,57 +0,0 @@
-/*
- * Copyright (C) 2016 Francisco José Montiel Navarro.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.koitharu.kotatsu.core.local.cookies.cache
-
-import okhttp3.Cookie
-import org.koitharu.kotatsu.core.local.cookies.cache.IdentifiableCookie.Companion.decorateAll
-import java.util.*
-import java.util.concurrent.ConcurrentHashMap
-
-class SetCookieCache : CookieCache {
-
-	private val cookies: MutableSet<IdentifiableCookie> = Collections.newSetFromMap(ConcurrentHashMap())
-
-	override fun addAll(newCookies: Collection<Cookie>) {
-		for (cookie in decorateAll(newCookies)) {
-			cookies.remove(cookie)
-			cookies.add(cookie)
-		}
-	}
-
-	override fun clear() {
-		cookies.clear()
-	}
-
-	override fun iterator(): MutableIterator<Cookie> = SetCookieCacheIterator()
-
-	private inner class SetCookieCacheIterator : MutableIterator<Cookie> {
-
-		private val iterator = cookies.iterator()
-
-		override fun hasNext(): Boolean {
-			return iterator.hasNext()
-		}
-
-		override fun next(): Cookie {
-			return iterator.next().cookie
-		}
-
-		override fun remove() {
-			iterator.remove()
-		}
-
-	}
-}

app/src/main/java/org/koitharu/kotatsu/core/local/cookies/persistence/CookiePersistor.kt

@@ -1,44 +0,0 @@
-/*
- * Copyright (C) 2016 Francisco José Montiel Navarro.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.koitharu.kotatsu.core.local.cookies.persistence
-
-import okhttp3.Cookie
-
-/**
- * A CookiePersistor handles the persistent cookie storage.
- */
-interface CookiePersistor {
-
-	fun loadAll(): List<Cookie>
-	/**
-	 * Persist all cookies, existing cookies will be overwritten.
-	 *
-	 * @param cookies cookies persist
-	 */
-	fun saveAll(cookies: Collection<Cookie>)
-
-	/**
-	 * Removes indicated cookies from persistence.
-	 *
-	 * @param cookies cookies to remove from persistence
-	 */
-	fun removeAll(cookies: Collection<Cookie>)
-
-	/**
-	 * Clear all cookies from persistence.
-	 */
-	fun clear()
-}

app/src/main/java/org/koitharu/kotatsu/core/local/cookies/persistence/SerializableCookie.kt

@@ -1,150 +0,0 @@
-/*
- * Copyright (C) 2016 Francisco José Montiel Navarro.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.koitharu.kotatsu.core.local.cookies.persistence
-
-import android.util.Log
-import okhttp3.Cookie
-import java.io.*
-
-class SerializableCookie : Serializable {
-
-	@Transient
-	private var cookie: Cookie? = null
-
-	fun encode(cookie: Cookie?): String? {
-		this.cookie = cookie
-		val byteArrayOutputStream = ByteArrayOutputStream()
-		var objectOutputStream: ObjectOutputStream? = null
-		try {
-			objectOutputStream = ObjectOutputStream(byteArrayOutputStream)
-			objectOutputStream.writeObject(this)
-		} catch (e: IOException) {
-			Log.d(TAG, "IOException in encodeCookie", e)
-			return null
-		} finally {
-			if (objectOutputStream != null) {
-				try { // Closing a ByteArrayOutputStream has no effect, it can be used later (and is used in the return statement)
-					objectOutputStream.close()
-				} catch (e: IOException) {
-					Log.d(TAG, "Stream not closed in encodeCookie", e)
-				}
-			}
-		}
-		return byteArrayToHexString(byteArrayOutputStream.toByteArray())
-	}
-
-	fun decode(encodedCookie: String): Cookie? {
-		val bytes = hexStringToByteArray(encodedCookie)
-		val byteArrayInputStream = ByteArrayInputStream(
-				bytes)
-		var cookie: Cookie? = null
-		var objectInputStream: ObjectInputStream? = null
-		try {
-			objectInputStream = ObjectInputStream(byteArrayInputStream)
-			cookie = (objectInputStream.readObject() as SerializableCookie).cookie
-		} catch (e: IOException) {
-			Log.d(TAG, "IOException in decodeCookie", e)
-		} catch (e: ClassNotFoundException) {
-			Log.d(TAG, "ClassNotFoundException in decodeCookie", e)
-		} finally {
-			if (objectInputStream != null) {
-				try {
-					objectInputStream.close()
-				} catch (e: IOException) {
-					Log.d(TAG, "Stream not closed in decodeCookie", e)
-				}
-			}
-		}
-		return cookie
-	}
-
-	@Throws(IOException::class)
-	private fun writeObject(out: ObjectOutputStream) {
-		out.writeObject(cookie!!.name)
-		out.writeObject(cookie!!.value)
-		out.writeLong(if (cookie!!.persistent) cookie!!.expiresAt else NON_VALID_EXPIRES_AT)
-		out.writeObject(cookie!!.domain)
-		out.writeObject(cookie!!.path)
-		out.writeBoolean(cookie!!.secure)
-		out.writeBoolean(cookie!!.httpOnly)
-		out.writeBoolean(cookie!!.hostOnly)
-	}
-
-	@Throws(IOException::class, ClassNotFoundException::class)
-	private fun readObject(`in`: ObjectInputStream) {
-		val builder = Cookie.Builder()
-		builder.name((`in`.readObject() as String))
-		builder.value((`in`.readObject() as String))
-		val expiresAt = `in`.readLong()
-		if (expiresAt != NON_VALID_EXPIRES_AT) {
-			builder.expiresAt(expiresAt)
-		}
-		val domain = `in`.readObject() as String
-		builder.domain(domain)
-		builder.path((`in`.readObject() as String))
-		if (`in`.readBoolean()) builder.secure()
-		if (`in`.readBoolean()) builder.httpOnly()
-		if (`in`.readBoolean()) builder.hostOnlyDomain(domain)
-		cookie = builder.build()
-	}
-
-	private companion object {
-
-		private val TAG = SerializableCookie::class.java.simpleName
-
-		const val serialVersionUID = -8594045714036645534L
-		private const val NON_VALID_EXPIRES_AT = -1L
-		/**
-		 * Using some super basic byte array <-> hex conversions so we don't
-		 * have to rely on any large Base64 libraries. Can be overridden if you
-		 * like!
-		 *
-		 * @param bytes byte array to be converted
-		 * @return string containing hex values
-		 */
-		@JvmStatic
-		private fun byteArrayToHexString(bytes: ByteArray): String {
-			val sb = StringBuilder(bytes.size * 2)
-			for (element in bytes) {
-				val v: Int = element.toInt() and 0xff
-				if (v < 16) {
-					sb.append('0')
-				}
-				sb.append(Integer.toHexString(v))
-			}
-			return sb.toString()
-		}
-
-		/**
-		 * Converts hex values from strings to byte array
-		 *
-		 * @param hexString string of hex-encoded values
-		 * @return decoded byte array
-		 */
-		@JvmStatic
-		private fun hexStringToByteArray(hexString: String): ByteArray {
-			val len = hexString.length
-			val data = ByteArray(len / 2)
-			var i = 0
-			while (i < len) {
-				data[i / 2] = ((Character.digit(hexString[i], 16) shl 4) + Character
-						.digit(hexString[i + 1], 16)).toByte()
-				i += 2
-			}
-			return data
-		}
-	}
-}

app/src/main/java/org/koitharu/kotatsu/core/local/cookies/persistence/SharedPrefsCookiePersistor.kt

@@ -1,71 +0,0 @@
-/*
- * Copyright (C) 2016 Francisco José Montiel Navarro.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.koitharu.kotatsu.core.local.cookies.persistence
-
-import android.annotation.SuppressLint
-import android.content.Context
-import android.content.SharedPreferences
-import okhttp3.Cookie
-import java.util.*
-
-@SuppressLint("CommitPrefEdits")
-class SharedPrefsCookiePersistor(private val sharedPreferences: SharedPreferences) :
-	CookiePersistor {
-
-	constructor(context: Context) : this(context.getSharedPreferences("cookies", Context.MODE_PRIVATE))
-
-	override fun loadAll(): List<Cookie> {
-		val cookies: MutableList<Cookie> = ArrayList(sharedPreferences.all.size)
-		for ((_, value) in sharedPreferences.all) {
-			val serializedCookie = value as? String
-			if (serializedCookie != null) {
-				val cookie = SerializableCookie().decode(serializedCookie)
-				if (cookie != null) {
-					cookies.add(cookie)
-				}
-			}
-		}
-		return cookies
-	}
-
-	override fun saveAll(cookies: Collection<Cookie>) {
-		val editor = sharedPreferences.edit()
-		for (cookie in cookies) {
-			editor.putString(createCookieKey(cookie), SerializableCookie().encode(cookie))
-		}
-		editor.apply()
-	}
-
-	override fun removeAll(cookies: Collection<Cookie>) {
-		val editor = sharedPreferences.edit()
-		for (cookie in cookies) {
-			editor.remove(createCookieKey(cookie))
-		}
-		editor.apply()
-	}
-
-	override fun clear() {
-		sharedPreferences.edit().clear().apply()
-	}
-
-	private companion object {
-
-		fun createCookieKey(cookie: Cookie): String {
-			return (if (cookie.secure) "https" else "http") + "://" + cookie.domain + cookie.path + "|" + cookie.name
-		}
-	}
-
-}

app/src/main/java/org/koitharu/kotatsu/core/model/FavouriteCategory.kt

@@ -1,7 +1,7 @@
 package org.koitharu.kotatsu.core.model
 
 import android.os.Parcelable
-import kotlinx.android.parcel.Parcelize
+import kotlinx.parcelize.Parcelize
 import java.util.*
 
 @Parcelize

app/src/main/java/org/koitharu/kotatsu/core/model/Manga.kt

@@ -1,14 +1,15 @@
 package org.koitharu.kotatsu.core.model
 
 import android.os.Parcelable
-import kotlinx.android.parcel.Parcelize
+import kotlinx.parcelize.Parcelize
 
 @Parcelize
 data class Manga(
 	val id: Long,
 	val title: String,
 	val altTitle: String? = null,
-	val url: String,
+	val url: String, // relative url for internal use
+	val publicUrl: String,
 	val rating: Float = NO_RATING, //normalized value [0..1] or -1
 	val coverUrl: String,
 	val largeCoverUrl: String? = null,

app/src/main/java/org/koitharu/kotatsu/core/model/MangaChapter.kt

@@ -1,7 +1,7 @@
 package org.koitharu.kotatsu.core.model
 
 import android.os.Parcelable
-import kotlinx.android.parcel.Parcelize
+import kotlinx.parcelize.Parcelize
 
 @Parcelize
 data class MangaChapter(
@@ -9,5 +9,6 @@ data class MangaChapter(
 	val name: String,
 	val number: Int,
 	val url: String,
+	val branch: String? = null,
 	val source: MangaSource
 ) : Parcelable

app/src/main/java/org/koitharu/kotatsu/core/model/MangaFilter.kt

@@ -1,7 +1,7 @@
 package org.koitharu.kotatsu.core.model
 
 import android.os.Parcelable
-import kotlinx.android.parcel.Parcelize
+import kotlinx.parcelize.Parcelize
 
 @Parcelize
 data class MangaFilter(

app/src/main/java/org/koitharu/kotatsu/core/model/MangaHistory.kt

@@ -1,7 +1,7 @@
 package org.koitharu.kotatsu.core.model
 
 import android.os.Parcelable
-import kotlinx.android.parcel.Parcelize
+import kotlinx.parcelize.Parcelize
 import java.util.*
 
 @Parcelize

app/src/main/java/org/koitharu/kotatsu/core/model/MangaPage.kt

@@ -1,12 +1,13 @@
 package org.koitharu.kotatsu.core.model
 
 import android.os.Parcelable
-import kotlinx.android.parcel.Parcelize
+import kotlinx.parcelize.Parcelize
 
 @Parcelize
 data class MangaPage(
 	val id: Long,
 	val url: String,
+	val referer: String,
 	val preview: String? = null,
 	val source: MangaSource
 ) : Parcelable

app/src/main/java/org/koitharu/kotatsu/core/model/MangaSource.kt

@@ -1,10 +1,13 @@
 package org.koitharu.kotatsu.core.model
 
 import android.os.Parcelable
-import kotlinx.android.parcel.Parcelize
-import org.koitharu.kotatsu.core.parser.LocalMangaRepository
+import kotlinx.parcelize.Parcelize
+import org.koin.core.context.GlobalContext
+import org.koin.core.error.NoBeanDefFoundException
+import org.koin.core.qualifier.named
 import org.koitharu.kotatsu.core.parser.MangaRepository
 import org.koitharu.kotatsu.core.parser.site.*
+import org.koitharu.kotatsu.local.domain.LocalMangaRepository
 
 @Suppress("SpellCheckingInspection")
 @Parcelize
@@ -22,6 +25,15 @@ enum class MangaSource(
 	HENCHAN("Хентай-тян", "ru", HenChanRepository::class.java),
 	YAOICHAN("Яой-тян", "ru", YaoiChanRepository::class.java),
 	MANGATOWN("MangaTown", "en", MangaTownRepository::class.java),
-	MANGALIB("MangaLib", "ru", MangaLibRepository::class.java)
-	// HENTAILIB("HentaiLib", "ru", HentaiLibRepository::class.java)
+	MANGALIB("MangaLib", "ru", MangaLibRepository::class.java),
+
+	// NUDEMOON("Nude-Moon", "ru", NudeMoonRepository::class.java),
+	MANGAREAD("MangaRead", "en", MangareadRepository::class.java),
+	REMANGA("Remanga", "ru", RemangaRepository::class.java),
+	HENTAILIB("HentaiLib", "ru", HentaiLibRepository::class.java);
+
+	@get:Throws(NoBeanDefFoundException::class)
+	@Deprecated("")
+	val repository: MangaRepository
+		get() = GlobalContext.get().get(named(this))
 }

app/src/main/java/org/koitharu/kotatsu/core/model/MangaTag.kt

@@ -1,7 +1,7 @@
 package org.koitharu.kotatsu.core.model
 
 import android.os.Parcelable
-import kotlinx.android.parcel.Parcelize
+import kotlinx.parcelize.Parcelize
 
 @Parcelize
 data class MangaTag(

app/src/main/java/org/koitharu/kotatsu/core/model/MangaTracking.kt

@@ -1,14 +1,14 @@
 package org.koitharu.kotatsu.core.model
 
 import android.os.Parcelable
-import kotlinx.android.parcel.Parcelize
+import kotlinx.parcelize.Parcelize
 import java.util.*
 
 @Parcelize
-data class MangaTracking (
+data class MangaTracking(
 	val manga: Manga,
 	val knownChaptersCount: Int,
 	val lastChapterId: Long,
 	val lastNotifiedChapterId: Long,
 	val lastCheck: Date?
-): Parcelable
+) : Parcelable