Fix old api compatibility

2020-04-25 21:29:46 +03:00
2095 changed files with 15721 additions and 132909 deletions
--- a/.editorconfig
+++ b/.editorconfig
@@ -1,21 +0,0 @@
-root = true
-
-[*]
-charset = utf-8
-end_of_line = lf
-indent_size = 4
-indent_style = space
-insert_final_newline = true
-max_line_length = 120
-tab_width = 4
-# noinspection EditorConfigKeyCorrectness
-disabled_rules = no-wildcard-imports, no-unused-imports
-
-[{*.ant,*.fxml,*.jhm,*.jnlp,*.jrxml,*.rng,*.tld,*.wsdl,*.xml,*.xsd,*.xsl,*.xslt,*.xul}]
-ij_continuation_indent_size = 4
-ij_xml_attribute_wrap = on_every_item
-
-[{*.kt,*.kts}]
-ij_kotlin_allow_trailing_comma_on_call_site = true
-ij_kotlin_allow_trailing_comma = true
-ij_kotlin_code_style_defaults = KOTLIN_OFFICIAL
--- a/.github/FUNDING.yml
+++ b/.github/FUNDING.yml
@@ -0,0 +1 @@
+custom: ["https://money.yandex.ru/to/410012543938752"]
--- a/.github/ISSUE_TEMPLATE.md
+++ b/.github/ISSUE_TEMPLATE.md
@@ -1,29 +0,0 @@
-**PLEASE READ THIS**
-
-I acknowledge that:
-
- I have updated to the latest version of the app (https://github.com/KotatsuApp/Kotatsu/releases/latest)
- If this is an issue with a parser, that I should be opening an issue in https://github.com/KotatsuApp/kotatsu-parsers
- I have searched the existing issues and this is new ticket **NOT** a duplicate or related to another open or closed issue
- I will fill out the title and the information in this template
-
-Note that the issue will be automatically closed if you do not fill out the title or requested information.
-
-**DELETE THIS SECTION IF YOU HAVE READ AND ACKNOWLEDGED IT**
-
---
-
-## Device information
-* Kotatsu version: ?
-* Android version: ?
-* Device: ?
-
-## Steps to reproduce
-1. First step
-2. Second step
-
-## Issue/Request
-?
-
-## Other details
-Additional details and attachments.
--- a/.github/ISSUE_TEMPLATE/config.yml
+++ b/.github/ISSUE_TEMPLATE/config.yml
@@ -1,5 +0,0 @@
-blank_issues_enabled: false
-contact_links:
-    - name: ⚠️ Source issue
-      url: https://github.com/KotatsuApp/kotatsu-parsers/issues/new
-      about: If you have a problem with a specific **manga source** or want to propose a new one, please open an issue in the kotatsu-parsers repository instead
--- a/.github/ISSUE_TEMPLATE/report_bug.yml
+++ b/.github/ISSUE_TEMPLATE/report_bug.yml
@@ -1,66 +0,0 @@
-name: 🐞 Bug report
-description: Report a bug in Kotatsu
-labels: [bug]
-body:
-
-    - type: textarea
-      id: summary
-      attributes:
-          label: Brief summary
-          description: Please describe, what went wrong
-      validations:
-          required: true
-
-    - type: textarea
-      id: reproduce-steps
-      attributes:
-          label: Steps to reproduce
-          description: Please provide a way to reproduce this issue. Screenshots or videos can be very helpful
-          placeholder: |
-              Example:
-                1. First step
-                2. Second step
-                3. Issue here
-      validations:
-          required: false
-
-
-    - type: input
-      id: kotatsu-version
-      attributes:
-          label: Kotatsu version
-          description: You can find your Kotatsu version in **Settings → About**.
-          placeholder: |
-              Example: "3.3"
-      validations:
-          required: true
-
-    - type: input
-      id: android-version
-      attributes:
-          label: Android version
-          description: You can find this somewhere in your Android settings.
-          placeholder: |
-              Example: "12.0"
-      validations:
-          required: true
-
-    - type: input
-      id: device
-      attributes:
-          label: Device
-          description: List your device and model.
-          placeholder: |
-              Example: "LG Nexus 5X"
-      validations:
-          required: false
-
-    - type: checkboxes
-      id: acknowledgements
-      attributes:
-          label: Acknowledgements
-          options:
-              - label: This is not a duplicate of an existing issue. Please look through the list of [open issues](https://github.com/KotatsuApp/Kotatsu/issues) before creating a new one.
-                required: true
-              - label: This is not an issue with a specific manga source. Otherwise, you have to open an issue in the [parsers repository](https://github.com/KotatsuApp/kotatsu-parsers/issues/new/choose).
-                required: true
--- a/.github/ISSUE_TEMPLATE/request_feature.yml
+++ b/.github/ISSUE_TEMPLATE/request_feature.yml
@@ -1,24 +0,0 @@
-name: ⭐ Feature request
-description: Suggest a new idea how to improve Kotatsu
-labels: [feature request]
-body:
-
-    - type: textarea
-      id: feature-description
-      attributes:
-          label: Describe your suggested feature
-          description: How can Kotatsu be improved?
-          placeholder: |
-              Example:
-                "It should work like this..."
-      validations:
-          required: true
-
-    - type: checkboxes
-      id: acknowledgements
-      attributes:
-          label: Acknowledgements
-          description: Read this carefully, we will close and ignore your issue if you skimmed through this.
-          options:
-              - label: This is not a duplicate of an existing issue. Please look through the list of [open issues](https://github.com/KotatsuApp/Kotatsu/issues) before creating a new one.
-                required: true
--- a/.github/assets/vtuber.png
+++ b/.github/assets/vtuber.png
--- a/.github/workflows/issue_moderator.yml
+++ b/.github/workflows/issue_moderator.yml
@@ -1,29 +0,0 @@
-name: Issue moderator
-
-on:
-  issues:
-    types: [opened, edited, reopened]
-  issue_comment:
-    types: [created]
-
-jobs:
-  moderate:
-    runs-on: ubuntu-latest
-    steps:
-      - name: Moderate issues
-        uses: tachiyomiorg/issue-moderator-action@v1
-        with:
-           repo-token: ${{ secrets.GITHUB_TOKEN }}
-           auto-close-rules: |
-             [
-               {
-                 "type": "body",
-                 "regex": ".*DELETE THIS SECTION IF YOU HAVE READ AND ACKNOWLEDGED IT.*",
-                 "message": "The acknowledgment section was not removed."
-               },
-               {
-                 "type": "body",
-                 "regex": ".*\\* (Kotatsu version|Android version|Device): \\?.*",
-                 "message": "Requested information in the template was not filled out."
-               }
-             ]
--- a/.github/workflows/trigger-site-deploy.yml
+++ b/.github/workflows/trigger-site-deploy.yml
@@ -1,16 +0,0 @@
-name: Trigger Site Update
-
-on:
-  release:
-    types: [published]
-
-jobs:
-  trigger-site:
-    runs-on: ubuntu-latest
-    steps:
-      - name: Send repository_dispatch to site-repo
-        uses: peter-evans/repository-dispatch@v3
-        with:
-          token: ${{ secrets.SITE_REPO_TOKEN }}
-          repository: KotatsuApp/website
-          event-type: app-release
--- a/.gitignore
+++ b/.gitignore
@@ -3,28 +3,12 @@
 /local.properties
 /.idea/caches
 /.idea/libraries
-/.idea/dictionaries
 /.idea/modules.xml
-/.idea/misc.xml
-/.idea/markdown.xml
-/.idea/discord.xml
-/.idea/compiler.xml
 /.idea/workspace.xml
 /.idea/navEditor.xml
-/.idea/ktlint-plugin.xml
 /.idea/assetWizardSettings.xml
-/.idea/kotlinScripting.xml
-/.idea/kotlinc.xml
-/.idea/deploymentTargetDropDown.xml
-/.idea/androidTestResultsUserPreferences.xml
-/.idea/deploymentTargetSelector.xml
-/.idea/render.experimental.xml
-/.idea/inspectionProfiles/
 .DS_Store
 /build
 /captures
 .externalNativeBuild
 .cxx
-/.idea/deviceManager.xml
-/.kotlin/
-/.idea/AndroidProjectSystem.xml
--- a/.idea/.gitignore
+++ b/.idea/.gitignore
@@ -1,7 +0,0 @@
-# Default ignored files
-/shelf/
-/workspace.xml
-/migrations.xml
-/runConfigurations.xml
-/appInsightsSettings.xml
-/kotlinCodeInsightSettings.xml
--- a/.idea/AndroidProjectSystem.xml
+++ b/.idea/AndroidProjectSystem.xml
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="AndroidProjectSystem">
-    <option name="providerId" value="com.android.tools.idea.GradleProjectSystem" />
-  </component>
-</project>
--- a/.idea/appInsightsSettings.xml
+++ b/.idea/appInsightsSettings.xml
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="AppInsightsSettings">
-    <option name="tabSettings">
-      <map>
-        <entry key="Firebase Crashlytics">
-          <value>
-            <InsightsFilterSettings>
-              <option name="connection">
-                <ConnectionSetting>
-                  <option name="appId" value="PLACEHOLDER" />
-                  <option name="mobileSdkAppId" value="" />
-                  <option name="projectId" value="" />
-                  <option name="projectNumber" value="" />
-                </ConnectionSetting>
-              </option>
-              <option name="signal" value="SIGNAL_UNSPECIFIED" />
-              <option name="timeIntervalDays" value="THIRTY_DAYS" />
-              <option name="visibilityType" value="ALL" />
-            </InsightsFilterSettings>
-          </value>
-        </entry>
-      </map>
-    </option>
-  </component>
-</project>
--- a/.idea/codeStyles/Project.xml
+++ b/.idea/codeStyles/Project.xml
@@ -1,7 +1,9 @@
 <component name="ProjectCodeStyleConfiguration">
  <code_scheme name="Project" version="173">
    <option name="OTHER_INDENT_OPTIONS">
-      <value />
+      <value>
+        <option name="USE_TAB_CHARACTER" value="true" />
+      </value>
    </option>
    <AndroidXmlCodeStyleSettings>
      <option name="LAYOUT_SETTINGS">
@@ -20,46 +22,39 @@
        </value>
      </option>
    </AndroidXmlCodeStyleSettings>
-    <JavaCodeStyleSettings>
-      <option name="IMPORT_LAYOUT_TABLE">
-        <value>
-          <package name="android" withSubpackages="true" static="true" />
-          <package name="androidx" withSubpackages="true" static="true" />
-          <package name="com" withSubpackages="true" static="true" />
-          <package name="junit" withSubpackages="true" static="true" />
-          <package name="net" withSubpackages="true" static="true" />
-          <package name="org" withSubpackages="true" static="true" />
-          <package name="java" withSubpackages="true" static="true" />
-          <package name="javax" withSubpackages="true" static="true" />
-          <package name="" withSubpackages="true" static="true" />
-          <emptyLine />
-          <package name="android" withSubpackages="true" static="false" />
-          <emptyLine />
-          <package name="androidx" withSubpackages="true" static="false" />
-          <emptyLine />
-          <package name="com" withSubpackages="true" static="false" />
-          <emptyLine />
-          <package name="junit" withSubpackages="true" static="false" />
-          <emptyLine />
-          <package name="net" withSubpackages="true" static="false" />
-          <emptyLine />
-          <package name="org" withSubpackages="true" static="false" />
-          <emptyLine />
-          <package name="java" withSubpackages="true" static="false" />
-          <emptyLine />
-          <package name="javax" withSubpackages="true" static="false" />
-          <emptyLine />
-          <package name="" withSubpackages="true" static="false" />
-          <emptyLine />
-        </value>
-      </option>
-    </JavaCodeStyleSettings>
    <JetCodeStyleSettings>
-      <option name="ALLOW_TRAILING_COMMA" value="true" />
-      <option name="ALLOW_TRAILING_COMMA_COLLECTION_LITERAL_EXPRESSION" value="true" />
-      <option name="ALLOW_TRAILING_COMMA_VALUE_ARGUMENT_LIST" value="true" />
      <option name="CODE_STYLE_DEFAULTS" value="KOTLIN_OFFICIAL" />
    </JetCodeStyleSettings>
+    <codeStyleSettings language="CMake">
+      <indentOptions>
+        <option name="USE_TAB_CHARACTER" value="true" />
+      </indentOptions>
+    </codeStyleSettings>
+    <codeStyleSettings language="Groovy">
+      <indentOptions>
+        <option name="USE_TAB_CHARACTER" value="true" />
+      </indentOptions>
+    </codeStyleSettings>
+    <codeStyleSettings language="HTML">
+      <indentOptions>
+        <option name="USE_TAB_CHARACTER" value="true" />
+      </indentOptions>
+    </codeStyleSettings>
+    <codeStyleSettings language="JAVA">
+      <indentOptions>
+        <option name="USE_TAB_CHARACTER" value="true" />
+      </indentOptions>
+    </codeStyleSettings>
+    <codeStyleSettings language="JSON">
+      <indentOptions>
+        <option name="USE_TAB_CHARACTER" value="true" />
+      </indentOptions>
+    </codeStyleSettings>
+    <codeStyleSettings language="ObjectiveC">
+      <indentOptions>
+        <option name="USE_TAB_CHARACTER" value="true" />
+      </indentOptions>
+    </codeStyleSettings>
    <codeStyleSettings language="Shell Script">
      <indentOptions>
        <option name="USE_TAB_CHARACTER" value="true" />
@@ -68,6 +63,7 @@
    <codeStyleSettings language="XML">
      <indentOptions>
        <option name="CONTINUATION_INDENT_SIZE" value="4" />
+        <option name="USE_TAB_CHARACTER" value="true" />
      </indentOptions>
      <arrangement>
        <rules>
@@ -182,6 +178,9 @@
      <option name="LINE_COMMENT_AT_FIRST_COLUMN" value="false" />
      <option name="BLOCK_COMMENT_AT_FIRST_COLUMN" value="false" />
      <option name="LINE_COMMENT_ADD_SPACE" value="true" />
+      <indentOptions>
+        <option name="USE_TAB_CHARACTER" value="true" />
+      </indentOptions>
    </codeStyleSettings>
  </code_scheme>
 </component>
--- a/.idea/compiler.xml
+++ b/.idea/compiler.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="CompilerConfiguration">
+    <bytecodeTargetLevel>
+      <module name="Kotatsu.app" target="1.8" />
+    </bytecodeTargetLevel>
+  </component>
+</project>
--- a/.idea/dictionaries/admin.xml
+++ b/.idea/dictionaries/admin.xml
@@ -0,0 +1,13 @@
+<component name="ProjectDictionaryState">
+  <dictionary name="admin">
+    <words>
+      <w>chucker</w>
+      <w>desu</w>
+      <w>koin</w>
+      <w>kotatsu</w>
+      <w>manga</w>
+      <w>upsert</w>
+      <w>webtoon</w>
+    </words>
+  </dictionary>
+</component>
--- a/.idea/gradle.xml
+++ b/.idea/gradle.xml
@@ -4,16 +4,19 @@
  <component name="GradleSettings">
    <option name="linkedExternalProjectsSettings">
      <GradleProjectSettings>
-        <option name="testRunner" value="CHOOSE_PER_TEST" />
+        <option name="testRunner" value="PLATFORM" />
+        <option name="distributionType" value="DEFAULT_WRAPPED" />
        <option name="externalProjectPath" value="$PROJECT_DIR$" />
-        <option name="gradleJvm" value="#GRADLE_LOCAL_JAVA_HOME" />
+        <option name="gradleJvm" value="1.8" />
        <option name="modules">
          <set>
            <option value="$PROJECT_DIR$" />
            <option value="$PROJECT_DIR$/app" />
          </set>
        </option>
+        <option name="resolveModulePerSourceSet" value="false" />
+        <option name="useQualifiedModuleNames" value="true" />
      </GradleProjectSettings>
    </option>
  </component>
-</project>
+</project>
--- a/.idea/icon.svg
+++ b/.idea/icon.svg
@@ -1,287 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   inkscape:export-ydpi="39.689999"
-   inkscape:export-xdpi="39.689999"
-   inkscape:export-filename="/home/admin/Documents/projects/graphics/k/icon4.png"
-   width="512mm"
-   height="512mm"
-   viewBox="0 0 512 512.00002"
-   version="1.1"
-   id="svg8"
-   inkscape:version="1.0 (4035a4fb49, 2020-05-01)"
-   sodipodi:docname="icon4.svg">
-  <defs
-     id="defs2">
-    <filter
-       style="color-interpolation-filters:sRGB;"
-       inkscape:label="Drop Shadow"
-       id="filter1266">
-      <feFlood
-         flood-opacity="0.498039"
-         flood-color="rgb(0,0,0)"
-         result="flood"
-         id="feFlood1256" />
-      <feComposite
-         in="flood"
-         in2="SourceGraphic"
-         operator="in"
-         result="composite1"
-         id="feComposite1258" />
-      <feGaussianBlur
-         in="composite1"
-         stdDeviation="3"
-         result="blur"
-         id="feGaussianBlur1260" />
-      <feOffset
-         dx="6"
-         dy="6"
-         result="offset"
-         id="feOffset1262" />
-      <feComposite
-         in="SourceGraphic"
-         in2="offset"
-         operator="over"
-         result="composite2"
-         id="feComposite1264" />
-    </filter>
-    <filter
-       style="color-interpolation-filters:sRGB;"
-       inkscape:label="Drop Shadow"
-       id="filter1059">
-      <feFlood
-         flood-opacity="0.498039"
-         flood-color="rgb(0,0,0)"
-         result="flood"
-         id="feFlood1049" />
-      <feComposite
-         in="flood"
-         in2="SourceGraphic"
-         operator="in"
-         result="composite1"
-         id="feComposite1051" />
-      <feGaussianBlur
-         in="composite1"
-         stdDeviation="3"
-         result="blur"
-         id="feGaussianBlur1053" />
-      <feOffset
-         dx="6"
-         dy="6"
-         result="offset"
-         id="feOffset1055" />
-      <feComposite
-         in="SourceGraphic"
-         in2="offset"
-         operator="over"
-         result="composite2"
-         id="feComposite1057" />
-    </filter>
-    <filter
-       style="color-interpolation-filters:sRGB;"
-       inkscape:label="Drop Shadow"
-       id="filter1071">
-      <feFlood
-         flood-opacity="0.498039"
-         flood-color="rgb(0,0,0)"
-         result="flood"
-         id="feFlood1061" />
-      <feComposite
-         in="flood"
-         in2="SourceGraphic"
-         operator="in"
-         result="composite1"
-         id="feComposite1063" />
-      <feGaussianBlur
-         in="composite1"
-         stdDeviation="3"
-         result="blur"
-         id="feGaussianBlur1065" />
-      <feOffset
-         dx="6"
-         dy="6"
-         result="offset"
-         id="feOffset1067" />
-      <feComposite
-         in="SourceGraphic"
-         in2="offset"
-         operator="over"
-         result="composite2"
-         id="feComposite1069" />
-    </filter>
-  </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#0d47a1"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="0.175"
-     inkscape:cx="-361.03654"
-     inkscape:cy="630.78782"
-     inkscape:document-units="mm"
-     inkscape:current-layer="layer1"
-     inkscape:document-rotation="0"
-     showgrid="false"
-     inkscape:window-width="1600"
-     inkscape:window-height="838"
-     inkscape:window-x="0"
-     inkscape:window-y="0"
-     inkscape:window-maximized="1"
-     fit-margin-top="20"
-     fit-margin-left="20"
-     fit-margin-right="20"
-     fit-margin-bottom="20" />
-  <metadata
-     id="metadata5">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     inkscape:label="Слой 1"
-     inkscape:groupmode="layer"
-     id="layer1"
-     transform="translate(-51.12025,-104.74797)">
-    <g
-       id="g1028"
-       transform="matrix(6.9754464,0,0,6.9754464,32.42507,404.31391)" />
-    <g
-       id="g1030"
-       transform="matrix(6.9754464,0,0,6.9754464,32.42507,404.31391)" />
-    <g
-       id="g1032"
-       transform="matrix(6.9754464,0,0,6.9754464,32.42507,404.31391)" />
-    <g
-       id="g1034"
-       transform="matrix(6.9754464,0,0,6.9754464,32.42507,404.31391)" />
-    <g
-       id="g1036"
-       transform="matrix(6.9754464,0,0,6.9754464,32.42507,404.31391)" />
-    <g
-       id="g1038"
-       transform="matrix(6.9754464,0,0,6.9754464,32.42507,404.31391)" />
-    <g
-       id="g1040"
-       transform="matrix(6.9754464,0,0,6.9754464,32.42507,404.31391)" />
-    <g
-       id="g1042"
-       transform="matrix(6.9754464,0,0,6.9754464,32.42507,404.31391)" />
-    <g
-       id="g1044"
-       transform="matrix(6.9754464,0,0,6.9754464,32.42507,404.31391)" />
-    <g
-       id="g1046"
-       transform="matrix(6.9754464,0,0,6.9754464,32.42507,404.31391)" />
-    <g
-       id="g1048"
-       transform="matrix(6.9754464,0,0,6.9754464,32.42507,404.31391)" />
-    <g
-       id="g1050"
-       transform="matrix(6.9754464,0,0,6.9754464,32.42507,404.31391)" />
-    <g
-       id="g1052"
-       transform="matrix(6.9754464,0,0,6.9754464,32.42507,404.31391)" />
-    <g
-       id="g1054"
-       transform="matrix(6.9754464,0,0,6.9754464,32.42507,404.31391)" />
-    <g
-       id="g1056"
-       transform="matrix(6.9754464,0,0,6.9754464,32.42507,404.31391)" />
-    <path
-       id="path1128"
-       d="m 307.12025,310.74755 c -50.53732,0 -91.66608,44.85688 -91.66608,99.99965 0,55.14277 41.12954,99.99964 91.66608,99.99964 50.53653,0 91.66607,-44.85687 91.66607,-99.99964 0,-55.14277 -41.12875,-99.99965 -91.66607,-99.99965 z m -34.21238,78.72707 c -1.46484,2.91327 -4.41092,4.60623 -7.45466,4.60623 -1.25312,0 -2.52265,-0.27656 -3.72733,-0.8789 l -12.9398,-6.4781 -12.9398,6.4781 c -4.13436,2.06718 -9.11481,0.37421 -11.18199,-3.72733 -2.05077,-4.11796 -0.39062,-9.11481 3.72733,-11.18199 l 16.66635,-8.33357 c 2.34374,-1.17187 5.11092,-1.17187 7.45466,0 l 16.66635,8.33357 c 4.11951,2.06718 5.77966,7.06403 3.72889,11.18199 z m 58.33338,-24.99991 c -1.46484,2.91327 -4.41092,4.60623 -7.45466,4.60623 -1.25312,0 -2.52264,-0.27656 -3.72733,-0.8789 l -12.93901,-6.47811 -12.9398,6.47811 c -4.13436,2.06718 -9.11481,0.37421 -11.18199,-3.72733 -2.05078,-4.11796 -0.39063,-9.11482 3.72733,-11.182 l 16.66634,-8.33356 c 2.34375,-1.17187 5.11092,-1.17187 7.45466,0 l 16.66635,8.33356 c 4.11874,2.06718 5.77889,7.06404 3.72811,11.182 z m 54.60606,13.81792 c 4.11795,2.06718 5.7781,7.06403 3.72733,11.18199 -1.46484,2.91327 -4.41092,4.60623 -7.45466,4.60623 -1.25312,0 -2.52265,-0.27656 -3.72733,-0.8789 l -12.9398,-6.4781 -12.9398,6.4781 c -4.11795,2.06718 -9.11481,0.37421 -11.18199,-3.72733 -2.05077,-4.11796 -0.39062,-9.11481 3.72733,-11.18199 l 16.66635,-8.33357 c 2.34374,-1.17187 5.11092,-1.17187 7.45466,0 z"
-       style="fill:#ffffff;stroke-width:0.781247" />
-    <path
-       id="path1130"
-       d="m 415.36283,274.00237 c -3.48202,-6.90544 -6.92029,-13.41714 -10.20934,-19.37102 l -8.26716,-14.47964 c -6.79607,-11.51871 -12.25699,-19.90305 -14.78354,-23.66554 -0.7164,-43.32797 -19.12415,-53.79356 -21.25617,-54.86777 -3.20624,-1.5789 -7.09607,-0.97656 -9.6195,1.56249 -12.25621,12.25621 -20.23118,24.4632 -24.00695,30.89286 h -40.20141 c -3.77577,-6.42888 -11.75153,-18.63665 -24.00695,-30.89286 -2.52265,-2.53905 -6.39685,-3.14139 -9.6195,-1.56249 -2.13202,1.07421 -20.54055,11.5398 -21.25617,54.86777 -2.52655,3.76327 -7.98669,12.14605 -14.78276,23.66476 l -8.27341,14.49214 c -3.28983,5.95701 -6.73044,12.47105 -10.21403,19.3804 l -7.4445,15.32572 c -17.72572,38.05377 -34.30066,85.4286 -34.30066,129.72766 0,69.32085 58.26776,128.42064 60.75838,130.89485 0.91171,0.91172 2.03437,1.61171 3.25546,2.01796 1.07421,0.35859 26.78974,8.757 69.31928,8.757 2.21327,0 4.32967,-0.8789 5.89217,-2.4414 l 5.89216,-5.89216 h 9.76559 l 5.89217,5.89216 c 1.56249,1.5625 3.67811,2.4414 5.89216,2.4414 42.52954,0 68.24507,-8.39841 69.31929,-8.757 1.22109,-0.40703 2.34374,-1.10703 3.25546,-2.01796 2.48905,-2.47421 60.75681,-61.57322 60.75681,-130.89485 0,-44.29906 -16.57494,-91.67389 -34.30066,-129.72766 z M 348.7865,227.41426 c 4.60624,0 4.41171,7.35466 4.41171,11.96089 4.60623,0 12.25464,0.1 12.25464,4.70624 0,9.19606 -7.47107,16.66634 -16.66635,16.66634 -9.19528,0 -16.66634,-7.47028 -16.66634,-16.66634 0,-9.19606 7.47106,-16.66713 16.66634,-16.66713 z m -57.69823,30.14364 c 1.28593,-3.10858 4.32967,-5.14295 7.69841,-5.14295 h 16.66635 c 3.36952,0 6.41248,2.03437 7.69841,5.14295 1.28593,3.10858 0.56953,6.70545 -1.80703,9.082 l -8.33356,8.33356 c -1.62734,1.62734 -3.76014,2.4414 -5.89217,2.4414 -2.13202,0 -4.26404,-0.81406 -5.89216,-2.4414 l -8.33357,-8.33356 c -2.37421,-2.37655 -3.09061,-5.97342 -1.80468,-9.082 z m -25.63428,-30.14364 c 4.60623,0 4.4117,7.35466 4.4117,11.96089 4.60623,0 12.25465,0.1 12.25465,4.70624 0,9.19606 -7.47107,16.66634 -16.66635,16.66634 -9.19606,0 -16.66635,-7.47106 -16.66635,-16.66634 -7.8e-4,-9.19606 7.47029,-16.66713 16.66635,-16.66713 z m 41.66626,299.99893 c -59.7326,0 -108.33321,-52.34357 -108.33321,-116.66599 0,-64.32243 48.60061,-116.66599 108.33321,-116.66599 59.73259,0 108.3332,52.34356 108.3332,116.66599 0,64.32242 -48.60061,116.66599 -108.3332,116.66599 z"
-       style="fill:#ffffff;stroke-width:0.781247;filter:url(#filter1059)"
-       sodipodi:nodetypes="cccccccccccccccsccssccssccsccscsssssssssssccsscsscssssss" />
-    <g
-       style="fill:#ffffff"
-       id="g1138"
-       transform="matrix(0.78124721,0,0,0.78124721,107.12096,160.74809)"
-       inkscape:groupmode="layer" />
-    <g
-       style="fill:#ffffff"
-       id="g1140"
-       transform="matrix(0.78124721,0,0,0.78124721,107.12096,160.74809)" />
-    <g
-       style="fill:#ffffff"
-       id="g1142"
-       transform="matrix(0.78124721,0,0,0.78124721,107.12096,160.74809)" />
-    <g
-       style="fill:#ffffff"
-       id="g1144"
-       transform="matrix(0.78124721,0,0,0.78124721,107.12096,160.74809)" />
-    <g
-       style="fill:#ffffff"
-       id="g1146"
-       transform="matrix(0.78124721,0,0,0.78124721,107.12096,160.74809)" />
-    <g
-       style="fill:#ffffff"
-       id="g1148"
-       transform="matrix(0.78124721,0,0,0.78124721,107.12096,160.74809)" />
-    <g
-       style="fill:#ffffff"
-       id="g1150"
-       transform="matrix(0.78124721,0,0,0.78124721,107.12096,160.74809)" />
-    <g
-       style="fill:#ffffff"
-       id="g1152"
-       transform="matrix(0.78124721,0,0,0.78124721,107.12096,160.74809)" />
-    <g
-       style="fill:#ffffff"
-       id="g1154"
-       transform="matrix(0.78124721,0,0,0.78124721,107.12096,160.74809)" />
-    <g
-       style="fill:#ffffff"
-       id="g1156"
-       transform="matrix(0.78124721,0,0,0.78124721,107.12096,160.74809)" />
-    <g
-       style="fill:#ffffff"
-       id="g1158"
-       transform="matrix(0.78124721,0,0,0.78124721,107.12096,160.74809)" />
-    <g
-       style="fill:#ffffff"
-       id="g1160"
-       transform="matrix(0.78124721,0,0,0.78124721,107.12096,160.74809)" />
-    <g
-       style="fill:#ffffff"
-       id="g1162"
-       transform="matrix(0.78124721,0,0,0.78124721,107.12096,160.74809)" />
-    <g
-       style="fill:#ffffff"
-       id="g1164"
-       transform="matrix(0.78124721,0,0,0.78124721,107.12096,160.74809)" />
-    <g
-       style="fill:#ffffff"
-       id="g1166"
-       transform="matrix(0.78124721,0,0,0.78124721,107.12096,160.74809)" />
-    <path
-       style="fill:#ef5350;fill-opacity:1;stroke:none;stroke-width:5.18208;stroke-linecap:round;stroke-linejoin:round"
-       d="m 344.3189,392.83707 c -4.60362,-2.75958 -5.36974,-9.69605 -1.45595,-13.18226 0.54459,-0.48508 5.34567,-3.07035 10.66909,-5.74503 7.5498,-3.79328 10.16725,-4.86303 11.89884,-4.86303 1.73503,0 4.42542,1.10391 12.3172,5.05396 11.72559,5.86898 12.60994,6.68326 12.60994,11.61118 0,3.40408 -0.99553,5.20819 -4.00363,7.25549 -3.08358,2.09867 -5.44113,1.68547 -13.60905,-2.38528 l -7.19926,-3.58796 -7.37198,3.59617 c -8.3911,4.09331 -10.26721,4.39753 -13.8552,2.24676 z"
-       id="path944" />
-    <path
-       style="fill:#ef5350;fill-opacity:1;stroke:none;stroke-width:5.18208;stroke-linecap:round;stroke-linejoin:round"
-       d="m 285.98437,367.98056 c -3.86343,-2.35557 -5.1524,-8.06518 -2.66781,-11.81734 1.64304,-2.48125 20.719,-12.23981 23.92632,-12.23981 1.56364,0 4.61398,1.26582 12.2153,5.06905 8.53551,4.27064 10.3157,5.36752 11.30239,6.96403 1.75651,2.84207 1.95178,5.62136 0.58856,8.37633 -1.52635,3.08463 -3.36973,4.32306 -6.86644,4.61304 -2.68142,0.22236 -3.36743,-0.003 -10.22731,-3.35873 l -7.35311,-3.59707 -7.04119,3.52834 c -7.90523,3.96133 -10.62609,4.44409 -13.87671,2.46216 z"
-       id="path946" />
-    <path
-       style="fill:#ef5350;fill-opacity:1;stroke:none;stroke-width:5.18208;stroke-linecap:round;stroke-linejoin:round"
-       d="m 228.11707,393.18031 c -1.0244,-0.54435 -2.42484,-1.80721 -3.11209,-2.80633 -1.05812,-1.53828 -1.2181,-2.32693 -1.04433,-5.14815 0.29039,-4.71472 1.41139,-5.70783 12.90113,-11.42937 7.71258,-3.84061 9.99443,-4.74971 11.92193,-4.74971 1.94819,0 4.22735,0.92952 12.47354,5.08716 8.66324,4.3679 10.26522,5.3693 11.33052,7.08263 3.53608,5.68714 -0.55313,12.95355 -7.28968,12.95355 -1.25225,0 -4.29453,-1.20187 -9.08226,-3.58799 l -7.19927,-3.58796 -7.37197,3.59617 c -8.07507,3.93914 -10.21699,4.34922 -13.52752,2.59 z"
-       id="path948" />
-  </g>
-</svg>
--- a/.idea/inspectionProfiles/Project_Default.xml
+++ b/.idea/inspectionProfiles/Project_Default.xml
@@ -0,0 +1,6 @@
+<component name="InspectionProjectProfileManager">
+  <profile version="1.0">
+    <option name="myName" value="Project Default" />
+    <inspection_tool class="TrailingComma" enabled="true" level="INFORMATION" enabled_by_default="true" />
+  </profile>
+</component>
--- a/.idea/jarRepositories.xml
+++ b/.idea/jarRepositories.xml
@@ -31,15 +31,5 @@
      <option name="name" value="maven2" />
      <option name="url" value="https://dl.bintray.com/kotlin/kotlin-eap" />
    </remote-repository>
-    <remote-repository>
-      <option name="id" value="MavenRepo" />
-      <option name="name" value="MavenRepo" />
-      <option name="url" value="https://repo.maven.apache.org/maven2/" />
-    </remote-repository>
-    <remote-repository>
-      <option name="id" value="maven2" />
-      <option name="name" value="maven2" />
-      <option name="url" value="https://maven.pkg.github.com/nv95/kotatsu-parsers" />
-    </remote-repository>
  </component>
 </project>
--- a/.idea/ktlint.xml
+++ b/.idea/ktlint.xml
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="KtlintProjectConfiguration">
-    <enableKtlint>false</enableKtlint>
-    <androidMode>true</androidMode>
-    <treatAsErrors>false</treatAsErrors>
-    <disabledRules>
-      <list>
-        <option value="no-empty-first-line-in-method-block" />
-      </list>
-    </disabledRules>
-  </component>
-</project>
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" project-jdk-name="1.8" project-jdk-type="JavaSDK">
+    <output url="file://$PROJECT_DIR$/build/classes" />
+  </component>
+  <component name="ProjectType">
+    <option name="id" value="Android" />
+  </component>
+</project>
--- a/.idea/render.experimental.xml
+++ b/.idea/render.experimental.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="RenderSettings">
+    <option name="quality" value="0.25" />
+  </component>
+</project>
--- a/.idea/runConfigurations.xml
+++ b/.idea/runConfigurations.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="RunConfigurationProducerService">
+    <option name="ignoredProducers">
+      <set>
+        <option value="org.jetbrains.plugins.gradle.execution.test.runner.AllInPackageGradleConfigurationProducer" />
+        <option value="org.jetbrains.plugins.gradle.execution.test.runner.TestClassGradleConfigurationProducer" />
+        <option value="org.jetbrains.plugins.gradle.execution.test.runner.TestMethodGradleConfigurationProducer" />
+      </set>
+    </option>
+  </component>
+</project>
--- a/.idea/vcs.xml
+++ b/.idea/vcs.xml
@@ -1,15 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
-  <component name="GitSharedSettings">
-    <option name="FORCE_PUSH_PROHIBITED_PATTERNS">
-      <list>
-        <option value="master" />
-        <option value="devel" />
-        <option value="legacy" />
-      </list>
-    </option>
-  </component>
  <component name="VcsDirectoryMappings">
-    <mapping directory="" vcs="Git" />
+    <mapping directory="$PROJECT_DIR$" vcs="Git" />
  </component>
 </project>
--- a/.travis.yml
+++ b/.travis.yml
@@ -0,0 +1,15 @@
+language: android
+dist: trusty
+jdk:
+  - oraclejdk8
+android:
+  components:
+    - tools
+    - platform-tools-29.0.6
+    - build-tools-29.0.3
+    - android-29
+  licenses:
+    - android-sdk-preview-license-.+
+    - android-sdk-license-.+
+    - google-gdk-license-.+
+script: ./gradlew -Dorg.gradle.jvmargs=-Xmx1536m assembleDebug lintDebug
--- a/.weblate
+++ b/.weblate
@@ -1,3 +0,0 @@
-[weblate]
-url = https://hosted.weblate.org/api/
-translation = kotatsu/strings
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -1,12 +0,0 @@
-## Kotatsu contribution guidelines
-
-+ If you want to **fix bugs** or **implement new features** that **already have an [issue card](https://github.com/KotatsuApp/Kotatsu/issues):** please assign this issue to you and/or comment about it.
-+ If you want to **implement a new feature:** open an issue or discussion regarding it to ensure it will be accepted.
-+ **Translations** have to be managed using the [Weblate](https://hosted.weblate.org/engage/kotatsu/) platform.
-+ In case you want to **add a new manga source,** refer to the [parsers repository](https://github.com/KotatsuApp/kotatsu-parsers).
-
-**Refactoring** or some **dev-faces improvements** might also be accepted. However, please stick to the following principles:
-
-+ **Performance matters.** In the case of choosing between source code beauty and performance, performance should be a priority. 
-+ Please, **do not modify readme and other information files** (except for typos).
-+ **Avoid adding new dependencies** unless required. APK size is important.
--- a/53
+++ b/53
@@ -619,3 +619,56 @@ Program, unless a warranty or assumption of liability accompanies a
 copy of the Program in return for a fee.

                     END OF TERMS AND CONDITIONS
+
+            How to Apply These Terms to Your New Programs
+
+  If you develop a new program, and you want it to be of the greatest
+possible use to the public, the best way to achieve this is to make it
+free software which everyone can redistribute and change under these terms.
+
+  To do so, attach the following notices to the program.  It is safest
+to attach them to the start of each source file to most effectively
+state the exclusion of warranty; and each file should have at least
+the "copyright" line and a pointer to where the full notice is found.
+
+    <one line to give the program's name and a brief idea of what it does.>
+    Copyright (C) <year>  <name of author>
+
+    This program is free software: you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program.  If not, see <https://www.gnu.org/licenses/>.
+
+Also add information on how to contact you by electronic and paper mail.
+
+  If the program does terminal interaction, make it output a short
+notice like this when it starts in an interactive mode:
+
+    <program>  Copyright (C) <year>  <name of author>
+    This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
+    This is free software, and you are welcome to redistribute it
+    under certain conditions; type `show c' for details.
+
+The hypothetical commands `show w' and `show c' should show the appropriate
+parts of the General Public License.  Of course, your program's commands
+might be different; for a GUI interface, you would use an "about box".
+
+  You should also get your employer (if you work as a programmer) or school,
+if any, to sign a "copyright disclaimer" for the program, if necessary.
+For more information on this, and how to apply and follow the GNU GPL, see
+<https://www.gnu.org/licenses/>.
+
+  The GNU General Public License does not permit incorporating your program
+into proprietary programs.  If your program is a subroutine library, you
+may consider it more useful to permit linking proprietary applications with
+the library.  If this is what you want to do, use the GNU Lesser General
+Public License instead of this License.  But first, please read
+<https://www.gnu.org/licenses/why-not-lgpl.html>.
--- a/README.md
+++ b/README.md
@@ -1,117 +1,40 @@
-<div align="center">
+# Kotatsu 

-<a href="https://kotatsu.app">
-    <img src="./.github/assets/vtuber.png" alt="Kotatsu Logo" title="Kotatsu" width="600"/>
-</a>
+Kotatsu is a free and open source manga reader for Android.

-# [Kotatsu](https://kotatsu.app)
-
-**[Kotatsu](https://github.com/KotatsuApp/Kotatsu) is a free and open-source manga reader for Android with built-in online content sources.**
-
-![Downloads count](https://img.shields.io/github/downloads/KotatsuApp/Kotatsu/total?color=1976d2) ![Latest Stable version](https://img.shields.io/github/v/release/KotatsuApp/Kotatsu?color=2596be&label=latest) ![Android 6.0](https://img.shields.io/badge/android-6.0+-brightgreen) [![Sources count](https://img.shields.io/badge/dynamic/yaml?url=https%3A%2F%2Fraw.githubusercontent.com%2FKotatsuApp%2Fkotatsu-parsers%2Frefs%2Fheads%2Fmaster%2F.github%2Fsummary.yaml&query=total&label=manga%20sources&color=%23E9321C)](https://github.com/KotatsuApp/kotatsu-parsers) [![weblate](https://hosted.weblate.org/widgets/kotatsu/-/strings/svg-badge.svg)](https://hosted.weblate.org/engage/kotatsu/) [![Discord](https://img.shields.io/discord/898363402467045416?color=5865f2&label=discord)](https://discord.gg/NNJ5RgVBC5) [![Telegram](https://img.shields.io/badge/chat-telegram-60ACFF?)](https://t.me/kotatsuapp) [![License](https://img.shields.io/github/license/KotatsuApp/Kotatsu)](https://github.com/KotatsuApp/Kotatsu/blob/devel/LICENSE)
+![Android 5.0](https://img.shields.io/badge/android-5.0+-brightgreen) ![Kotlin](https://img.shields.io/github/languages/top/nv95/Kotatsu) [![Build Status](https://travis-ci.org/nv95/Kotatsu.svg?branch=master)](https://travis-ci.org/nv95/Kotatsu) ![License](https://img.shields.io/github/license/nv95/Kotatsu) [![4pda](https://img.shields.io/badge/discuss-4pda-2982CC)](http://4pda.ru/forum/index.php?showtopic=697669)

 ### Download

-<div align="left">
-
-* **Recommended:** Download and install APK from [GitHub Releases](https://github.com/KotatsuApp/Kotatsu/releases/latest). Application has a built-in self-updating feature.
-* Get it on [F-Droid](https://f-droid.org/packages/org.koitharu.kotatsu). The F-Droid build may be a bit outdated and some fixes might be missing.
-* Also [nightly builds](https://github.com/KotatsuApp/Kotatsu-nightly/releases) are available (Unstable, use at your own risk). Application has a built-in self-updating feature.
-
-</div>
+Latest release: [get here](https://github.com/nv95/Kotatsu/releases/latest)

 ### Main Features

-<div align="left">
+* 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
+* Standard and Webtoon-optimized reader
+* Notifications about new chapters

-* Online [manga catalogues](https://github.com/KotatsuApp/kotatsu-parsers) (with 1200+ manga sources)
-* Search manga by name, genres and more filters
-* Favorites organized by user-defined categories
-* Reading history, bookmarks and incognito mode support
-* Download manga and read it offline. Third-party CBZ archives are also supported
-* Clean and convenient Material You UI, optimized for phones, tablets and desktop
-* Standard and Webtoon-optimized customizable reader, gesture support on reading interface
-* Notifications about new chapters with updates feed, manga recommendations (with filters)
-* Integration with manga tracking services: Shikimori, AniList, MyAnimeList, Kitsu
-* Password / fingerprint-protected access to the app
-* Automatically sync app data with other devices on the same account
-* Support for older devices running Android 6.0+
+### Screenshots

-</div>
-
-### In-App Screenshots
-
-<div align="center">
-    <img src="./metadata/en-US/images/phoneScreenshots/1.png" alt="Mobile view" width="250"/>
-    <img src="./metadata/en-US/images/phoneScreenshots/2.png" alt="Mobile view" width="250"/>
-    <img src="./metadata/en-US/images/phoneScreenshots/3.png" alt="Mobile view" width="250"/>
-    <img src="./metadata/en-US/images/phoneScreenshots/4.png" alt="Mobile view" width="250"/>
-    <img src="./metadata/en-US/images/phoneScreenshots/5.png" alt="Mobile view" width="250"/>
-    <img src="./metadata/en-US/images/phoneScreenshots/6.png" alt="Mobile view" width="250"/>
-</div>
-
-<br>
-
-<div align="center">
-    <img src="./metadata/en-US/images/tenInchScreenshots/1.png" alt="Tablet view" width="400"/>
-    <img src="./metadata/en-US/images/tenInchScreenshots/2.png" alt="Tablet view" width="400"/>
-</div>
-
-### Localization
-
-<a href="https://hosted.weblate.org/engage/kotatsu/">
-<img src="https://hosted.weblate.org/widget/kotatsu/horizontal-auto.png" alt="Translation status" />
-</a>
-
-**[Kotatsu](https://github.com/KotatsuApp/Kotatsu) is localized in a number of different languages.**<br>
-**📌 If you would like to help improve these or add new languages,
-please head over to the [Weblate project page](https://hosted.weblate.org/engage/kotatsu/)**
-
-### Contributing
-
-<br>
-
-<a href="https://github.com/KotatsuApp/Kotatsu">
-  <picture>
-    <source srcset="https://github-readme-stats.vercel.app/api/pin/?username=KotatsuApp&repo=Kotatsu&bg_color=0d1117&text_color=1976d2&title_color=1976d2&icon_color=0877d2&border_radius=10&description_lines_count=2&show_owner=true" media="(prefers-color-scheme: dark)">
-    <img src="https://github-readme-stats.vercel.app/api/pin/?username=KotatsuApp&repo=Kotatsu&text_color=1976d2&title_color=1976d2&icon_color=0877d2&border_radius=10&description_lines_count=2&show_owner=true" alt="Kotatsu GitHub Repository">
-  </picture>
-</a>
-<a href="https://github.com/KotatsuApp/Kotatsu-parsers">
-  <picture>
-    <source srcset="https://github-readme-stats.vercel.app/api/pin/?username=KotatsuApp&repo=Kotatsu-parsers&bg_color=0d1117&text_color=1976d2&title_color=1976d2&icon_color=0877d2&border_radius=10&description_lines_count=2&show_owner=true" media="(prefers-color-scheme: dark)">
-    <img src="https://github-readme-stats.vercel.app/api/pin/?username=KotatsuApp&repo=Kotatsu-parsers&text_color=1976d2&title_color=1976d2&icon_color=0877d2&border_radius=10&description_lines_count=2&show_owner=true" alt="Kotatsu-parsers GitHub Repository">
-  </picture>
-</a><br></br>
-
-</br>
-
-**📌 Pull requests are welcome, if you want: See [CONTRIBUTING.md](https://github.com/KotatsuApp/Kotatsu/blob/devel/CONTRIBUTING.md) for the guidelines**
-
-### Certificate fingerprints
-
-```plaintext
-2C:19:C7:E8:07:61:2B:8E:94:51:1B:FD:72:67:07:64:5D:C2:58:AE
-```
-
-```plaintext
-67:E1:51:00:BB:80:93:01:78:3E:DC:B6:34:8F:A3:BB:F8:30:34:D9:1E:62:86:8A:91:05:3D:BD:70:DB:3F:18
-```
+| ![Screenshot_20200226-210337](https://user-images.githubusercontent.com/8948226/75573590-d467f180-5a65-11ea-8338-a34af4679ed6.png) | ![Screenshot_20200226-210310](https://user-images.githubusercontent.com/8948226/75573612-dcc02c80-5a65-11ea-9afb-293dadfb3cfd.png) | ![Screenshot_20200226-210232](https://user-images.githubusercontent.com/8948226/75573621-e0ec4a00-5a65-11ea-92b9-72ab90281a2b.png) |
+|---|---|---|
+| ![Screenshot_20200226-210405](https://user-images.githubusercontent.com/8948226/75573629-e34ea400-5a65-11ea-86a1-4496032ac0f0.png)  | ![Screenshot_20200226-210151](https://user-images.githubusercontent.com/8948226/75573632-e5186780-5a65-11ea-81b0-7c296157709c.png) | ![Screenshot_20200226-210223](https://user-images.githubusercontent.com/8948226/75573639-e6e22b00-5a65-11ea-84a6-6257f532fd2c.png) |

 ### License
+[![GNU GPLv3 Image](https://www.gnu.org/graphics/gplv3-127x51.png)](http://www.gnu.org/licenses/gpl-3.0.en.html)  

-[![GNU GPLv3 Image](https://www.gnu.org/graphics/gplv3-127x51.png)](http://www.gnu.org/licenses/gpl-3.0.en.html)
+Kotatsu is Free Software: You can use, study share and improve it at your
+will. Specifically you can redistribute and/or modify it under the terms of the
+[GNU General Public License](https://www.gnu.org/licenses/gpl.html) as
+published by the Free Software Foundation, either version 3 of the License, or
+(at your option) any later version.  

-<div align="left">
+### Disclaimer

-You may copy, distribute and modify the software as long as you track changes/dates in source files. Any modifications to or software including (via compiler) GPL-licensed code must also be made available under the GPL along with build & install instructions.
-
-</div>
-
-### DMCA disclaimer
-
-<div align="left">
-
-The developers of this application do not have any affiliation with the content available in the app and does not store or distribute any content. This application should be considered a web browser, all content that can be found using this application is freely available on the Internet. All DMCA takedown requests should be sent to the owners of the website where the content is hosted.
-
-</div>
+The developers of this application does not have any affiliation with the content providers available.
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -1,43 +1,38 @@
-import java.time.LocalDateTime
+apply plugin: 'com.android.application'
+apply plugin: 'kotlin-android'
+apply plugin: 'kotlin-android-extensions'
+apply plugin: 'kotlin-kapt'

-plugins {
-	id 'com.android.application'
-	id 'kotlin-android'
-	id 'com.google.devtools.ksp'
-	id 'kotlin-parcelize'
-	id 'dagger.hilt.android.plugin'
-	id 'androidx.room'
-	id 'org.jetbrains.kotlin.plugin.serialization'
-	// enable if needed
-	// id 'dev.reformator.stacktracedecoroutinator'
-}
+def gitCommits = 'git rev-list --count HEAD'.execute([], rootDir).text.trim().toInteger()
+def gitBranch = 'git branch --show-current'.execute([], rootDir).text.trim()

 android {
-	compileSdk = 36
-	buildToolsVersion = '35.0.0'
-	namespace = 'org.koitharu.kotatsu'
+	compileSdkVersion 29
+	buildToolsVersion '29.0.3'

 	defaultConfig {
 		applicationId 'org.koitharu.kotatsu'
-		minSdk = 23
-		targetSdk = 36
-		versionCode = 1033
-		versionName = '9.4.1'
-		generatedDensities = []
-		testInstrumentationRunner 'org.koitharu.kotatsu.HiltTestRunner'
-		ksp {
-			arg('room.generateKotlin', 'true')
+		minSdkVersion 16
+		maxSdkVersion 20
+		targetSdkVersion 29
+		versionCode gitCommits
+		versionName '0.3'
+
+		buildConfigField 'String', 'GIT_BRANCH', "\"${gitBranch}\""
+		vectorDrawables.useSupportLibrary = true
+		kapt {
+			arguments {
+				arg('room.schemaLocation', "$projectDir/schemas".toString())
+			}
 		}
-		androidResources {
-			// https://issuetracker.google.com/issues/408030127
-			generateLocaleConfig false
-		}
-		def localProperties = new Properties()
-		def localPropertiesFile = rootProject.file('local.properties')
-		if (localPropertiesFile.exists()) {
-			localProperties.load(new FileInputStream(localPropertiesFile))
-		}
-		resValue 'string', 'tg_backup_bot_token', localProperties.getProperty('tg_backup_bot_token', '')
+	}
+	archivesBaseName = "kotatsu_${gitCommits}"
+	compileOptions {
+		sourceCompatibility JavaVersion.VERSION_1_8
+		targetCompatibility JavaVersion.VERSION_1_8
+	}
+	kotlinOptions {
+		jvmTarget = JavaVersion.VERSION_1_8.toString()
 	}
 	buildTypes {
 		debug {
@@ -48,164 +43,59 @@ android {
 			shrinkResources true
 			proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
 		}
-		nightly {
-			initWith release
-			applicationIdSuffix = '.nightly'
-		}
 	}
-	buildFeatures {
-		viewBinding true
-		buildConfig true
-	}
-	packagingOptions {
-		resources {
-			excludes += [
-				'META-INF/README.md',
-				'META-INF/NOTICE.md'
-			]
-		}
-	}
-	sourceSets {
-		androidTest.assets.srcDirs += files("$projectDir/schemas".toString())
-		main.java.srcDirs += 'src/main/kotlin/'
-	}
-	compileOptions {
-		coreLibraryDesugaringEnabled true
-		sourceCompatibility JavaVersion.VERSION_11
-		targetCompatibility JavaVersion.VERSION_11
-	}
-	kotlinOptions {
-		jvmTarget = JavaVersion.VERSION_11.toString()
-		freeCompilerArgs += [
-			'-opt-in=kotlin.ExperimentalStdlibApi',
-			'-opt-in=kotlinx.coroutines.ExperimentalCoroutinesApi',
-			'-opt-in=kotlinx.coroutines.ExperimentalForInheritanceCoroutinesApi',
-			'-opt-in=kotlinx.coroutines.InternalForInheritanceCoroutinesApi',
-			'-opt-in=kotlinx.coroutines.FlowPreview',
-			'-opt-in=kotlin.contracts.ExperimentalContracts',
-			'-opt-in=coil3.annotation.ExperimentalCoilApi',
-			'-opt-in=coil3.annotation.InternalCoilApi',
-			'-opt-in=kotlinx.serialization.ExperimentalSerializationApi',
-			'-Xjspecify-annotations=strict',
-			'-Xannotation-default-target=first-only',
-			'-Xtype-enhancement-improvements-strict-mode'
-		]
-	}
-	room {
-		schemaDirectory "$projectDir/schemas"
-	}
-	lint {
-		abortOnError true
-		disable 'MissingTranslation', 'PrivateResource', 'SetJavaScriptEnabled', 'SimpleDateFormat'
+	lintOptions {
+		disable 'MissingTranslation'
+		abortOnError false
 	}
 	testOptions {
-		unitTests.includeAndroidResources true
-		unitTests.returnDefaultValues false
-		kotlinOptions {
-			freeCompilerArgs += ['-opt-in=org.koitharu.kotatsu.parsers.InternalParsersApi']
-		}
-	}
-	applicationVariants.configureEach { variant ->
-		if (variant.name == 'nightly') {
-			variant.outputs.each { output ->
-				def now = LocalDateTime.now()
-				output.versionCodeOverride = now.format("yyMMdd").toInteger()
-				output.versionNameOverride = 'N' + now.format("yyyyMMdd")
-			}
-		}
+		unitTests.includeAndroidResources = true
+		unitTests.returnDefaultValues = true
 	}
 }
+androidExtensions {
+	experimental = true
+}
 dependencies {
-	def parsersVersion = libs.versions.parsers.get()
-	if (System.properties.containsKey('parsersVersionOverride')) {
-		// usage:
-		// -DparsersVersionOverride=$(curl -s https://api.github.com/repos/kotatsuapp/kotatsu-parsers/commits/master -H "Accept: application/vnd.github.sha" | cut -c -10)
-		parsersVersion = System.getProperty('parsersVersionOverride')
-	}
-	//noinspection UseTomlInstead
-	implementation("com.github.KotatsuApp:kotatsu-parsers:$parsersVersion") {
-		exclude group: 'org.json', module: 'json'
-	}
+	implementation fileTree(dir: 'libs', include: ['*.jar', '*.aar'])
+	implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
+	implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-core:1.3.3'
+	implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-android:1.3.3'

-	coreLibraryDesugaring libs.desugar.jdk.libs
-	implementation libs.kotlin.stdlib
-	implementation libs.kotlinx.coroutines.android
-	implementation libs.kotlinx.coroutines.guava
+	implementation 'androidx.core:core-ktx:1.3.0-rc01'
+	implementation 'androidx.fragment:fragment-ktx:1.2.4'
+	implementation 'androidx.appcompat:appcompat:1.2.0-beta01'
+	implementation 'androidx.constraintlayout:constraintlayout:2.0.0-beta4'
+	implementation 'androidx.swiperefreshlayout:swiperefreshlayout:1.1.0-rc01'
+	implementation 'androidx.recyclerview:recyclerview:1.2.0-alpha02'
+	implementation 'androidx.viewpager2:viewpager2:1.1.0-alpha01'
+	implementation 'androidx.preference:preference-ktx:1.1.1'
+	implementation 'androidx.work:work-runtime-ktx:2.3.4'
+	implementation 'com.google.android.material:material:1.2.0-alpha06'

-	implementation libs.androidx.appcompat
-	implementation libs.androidx.core
-	implementation libs.androidx.activity
-	implementation libs.androidx.fragment
-	implementation libs.androidx.transition
-	implementation libs.androidx.collection
-	implementation libs.lifecycle.viewmodel
-	implementation libs.lifecycle.service
-	implementation libs.lifecycle.process
-	implementation libs.androidx.constraintlayout
-	implementation libs.androidx.documentfile
-	implementation libs.androidx.swiperefreshlayout
-	implementation libs.androidx.recyclerview
-	implementation libs.androidx.viewpager2
-	implementation libs.androidx.preference
-	implementation libs.androidx.biometric
-	implementation libs.material
-	implementation libs.androidx.lifecycle.common.java8
-	implementation libs.androidx.webkit
+	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 libs.androidx.work.runtime
-	implementation libs.guava
+	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 libs.androidx.room.runtime
-	implementation libs.androidx.room.ktx
-	ksp libs.androidx.room.compiler
+	implementation 'com.squareup.okhttp3:okhttp:3.12.10'
+	implementation 'com.squareup.okio:okio:2.5.0'
+	implementation 'org.jsoup:jsoup:1.13.1'

-	implementation libs.okhttp
-	implementation libs.okhttp.tls
-	implementation libs.okhttp.dnsoverhttps
-	implementation libs.okio
-	implementation libs.kotlinx.serialization.json
+	implementation 'org.koin:koin-android:2.1.5'
+	implementation 'io.coil-kt:coil:0.9.5'
+	implementation 'com.davemorrissey.labs:subsampling-scale-image-view:3.10.0'
+	implementation 'com.tomclaw.cache:cache:1.0'

-	implementation libs.adapterdelegates
-	implementation libs.adapterdelegates.viewbinding
+	debugImplementation 'com.squareup.leakcanary:leakcanary-android:2.2'
+	debugImplementation 'com.github.ChuckerTeam.Chucker:library:3.1.2'
+	releaseImplementation 'com.github.ChuckerTeam.Chucker:library-no-op:3.1.2'

-	implementation libs.hilt.android
-	ksp libs.hilt.compiler
-	implementation libs.androidx.hilt.work
-	ksp libs.androidx.hilt.compiler
-
-	implementation libs.coil.core
-	implementation libs.coil.network
-	implementation libs.coil.gif
-	implementation libs.coil.svg
-	implementation libs.avif.decoder
-	implementation libs.ssiv
-	implementation libs.disk.lru.cache
-	implementation libs.markwon
-	implementation libs.kizzyrpc
-
-	implementation libs.acra.http
-	implementation libs.acra.dialog
-
-	implementation libs.conscrypt.android
-
-	debugImplementation libs.leakcanary.android
-	nightlyImplementation libs.leakcanary.android
-	debugImplementation libs.workinspector
-
-	testImplementation libs.junit
-	testImplementation libs.json
-	testImplementation libs.kotlinx.coroutines.test
-
-	androidTestImplementation libs.androidx.runner
-	androidTestImplementation libs.androidx.rules
-	androidTestImplementation libs.androidx.test.core
-	androidTestImplementation libs.androidx.junit
-
-	androidTestImplementation libs.kotlinx.coroutines.test
-
-	androidTestImplementation libs.androidx.room.testing
-	androidTestImplementation libs.moshi.kotlin
-
-	androidTestImplementation libs.hilt.android.testing
-	kspAndroidTest libs.hilt.android.compiler
-}
+	testImplementation 'junit:junit:4.13'
+	testImplementation 'org.json:json:20190722'
+}
--- a/app/proguard-rules.pro
+++ b/app/proguard-rules.pro
@@ -1,4 +1,3 @@
-optimizationpasses 8
 -dontobfuscate
 -assumenosideeffects class kotlin.jvm.internal.Intrinsics {
 	public static void checkExpressionValueIsNotNull(...);
@@ -6,26 +5,8 @@
 	public static void checkReturnedValueIsNotNull(...);
 	public static void checkFieldIsNotNull(...);
 	public static void checkParameterIsNotNull(...);
-	public static void checkNotNullParameter(...);
 }
-
-dontwarn okhttp3.internal.platform.**
-dontwarn org.conscrypt.**
-dontwarn org.bouncycastle.**
-dontwarn org.openjsse.**
-dontwarn com.google.j2objc.annotations.**
-dontwarn coil3.PlatformContext
-
-keep class org.koitharu.kotatsu.settings.NotificationSettingsLegacyFragment
-keep class org.koitharu.kotatsu.settings.about.changelog.ChangelogFragment
-
-keep class org.koitharu.kotatsu.core.exceptions.* { *; }
-keep class org.koitharu.kotatsu.core.prefs.ScreenshotsPolicy { *; }
-keep class org.koitharu.kotatsu.backups.ui.periodical.PeriodicalBackupSettingsFragment { *; }
-keep class org.jsoup.parser.Tag
-keep class org.jsoup.internal.StringUtil
-
-keep class org.acra.security.NoKeyStoreFactory { *; }
-keep class org.acra.config.DefaultRetryPolicy { *; }
-keep class org.acra.attachment.DefaultAttachmentProvider { *; }
-keep class org.acra.sender.JobSenderService
+-keep class org.koitharu.kotatsu.core.db.entity.* { *; }
+-keepclassmembers public class * extends org.koitharu.kotatsu.core.parser.MangaRepository {
+	public <init>(...);
+}
--- a/app/src/androidTest/assets/categories/simple.json
+++ b/app/src/androidTest/assets/categories/simple.json
@@ -1,9 +0,0 @@
-{
-	"id": 4,
-	"title": "Read later",
-	"sortKey": 1,
-	"order": "NEWEST",
-	"createdAt": 1335906000000,
-	"isTrackingEnabled": true,
-	"isVisibleInLibrary": true
-}
--- a/app/src/androidTest/assets/kotatsu_test.bak
+++ b/app/src/androidTest/assets/kotatsu_test.bak
--- a/app/src/androidTest/assets/manga/bad_ids.json
+++ b/app/src/androidTest/assets/manga/bad_ids.json
@@ -1,179 +0,0 @@
-{
-	"id": -2096681732556647985,
-	"title": "Странствия Эманон",
-	"altTitles": [],
-	"url": "/stranstviia_emanon",
-	"publicUrl": "https://readmanga.io/stranstviia_emanon",
-	"rating": 0.9400894,
-	"isNsfw": true,
-	"coverUrl": "https://staticrm.rmr.rocks/uploads/pics/01/12/559_p.jpg",
-	"tags": [
-		{
-			"title": "Сверхъестественное",
-			"key": "supernatural",
-			"source": "READMANGA_RU"
-		},
-		{
-			"title": "Сэйнэн",
-			"key": "seinen",
-			"source": "READMANGA_RU"
-		},
-		{
-			"title": "Повседневность",
-			"key": "slice_of_life",
-			"source": "READMANGA_RU"
-		},
-		{
-			"title": "Приключения",
-			"key": "adventure",
-			"source": "READMANGA_RU"
-		}
-	],
-	"state": "FINISHED",
-	"authors": [],
-	"largeCoverUrl": "https://staticrm.rmr.rocks/uploads/pics/01/12/559_o.jpg",
-	"description": "Продолжение истории о загадочной девушке по имени Эманон, которая помнит всё, что происходило на Земле за последние три миллиарда лет. \n<br>Начало истории читайте в \"Воспоминаниях Эманон\". \n<div class=\"clearfix\"></div>",
-	"chapters": [
-		{
-			"id": 1552943969433540704,
-			"title": "1 - 1",
-			"number": 1,
-			"volume": 0,
-			"url": "/stranstviia_emanon/vol1/1",
-			"scanlator": "Sad-Robot",
-			"uploadDate": 1342731600000,
-			"source": "READMANGA_RU"
-		},
-		{
-			"id": 1552943969433540705,
-			"title": "1 - 2",
-			"number": 2,
-			"volume": 0,
-			"url": "/stranstviia_emanon/vol1/2",
-			"scanlator": "Sad-Robot",
-			"uploadDate": 1342731600000,
-			"source": "READMANGA_RU"
-		},
-		{
-			"id": 1552943969433540706,
-			"title": "1 - 3",
-			"number": 3,
-			"volume": 0,
-			"url": "/stranstviia_emanon/vol1/3",
-			"scanlator": "Sad-Robot",
-			"uploadDate": 1342731600000,
-			"source": "READMANGA_RU"
-		},
-		{
-			"id": 1552943969433540707,
-			"title": "1 - 4",
-			"number": 4,
-			"volume": 0,
-			"url": "/stranstviia_emanon/vol1/4",
-			"scanlator": "Sad-Robot",
-			"uploadDate": 1342731600000,
-			"source": "READMANGA_RU"
-		},
-		{
-			"id": 1552943969433540708,
-			"title": "1 - 5",
-			"number": 5,
-			"volume": 0,
-			"url": "/stranstviia_emanon/vol1/5",
-			"scanlator": "Sad-Robot",
-			"uploadDate": 1342731600000,
-			"source": "READMANGA_RU"
-		},
-		{
-			"id": 1552943969433541665,
-			"title": "2 - 1",
-			"number": 6,
-			"volume": 0,
-			"url": "/stranstviia_emanon/vol2/1",
-			"scanlator": "Sup!",
-			"uploadDate": 1415570400000,
-			"source": "READMANGA_RU"
-		},
-		{
-			"id": 1552943969433541666,
-			"title": "2 - 2",
-			"number": 7,
-			"volume": 0,
-			"url": "/stranstviia_emanon/vol2/2",
-			"scanlator": "Sup!",
-			"uploadDate": 1419976800000,
-			"source": "READMANGA_RU"
-		},
-		{
-			"id": 1552943969433541667,
-			"title": "2 - 3",
-			"number": 8,
-			"volume": 0,
-			"url": "/stranstviia_emanon/vol2/3",
-			"scanlator": "Sup!",
-			"uploadDate": 1427922000000,
-			"source": "READMANGA_RU"
-		},
-		{
-			"id": 1552943969433541668,
-			"title": "2 - 4",
-			"number": 9,
-			"volume": 0,
-			"url": "/stranstviia_emanon/vol2/4",
-			"scanlator": "Sup!",
-			"uploadDate": 1436907600000,
-			"source": "READMANGA_RU"
-		},
-		{
-			"id": 1552943969433541669,
-			"title": "2 - 5",
-			"number": 10,
-			"volume": 0,
-			"url": "/stranstviia_emanon/vol2/5",
-			"scanlator": "Sup!",
-			"uploadDate": 1446674400000,
-			"source": "READMANGA_RU"
-		},
-		{
-			"id": 1552943969433541670,
-			"title": "2 - 6",
-			"number": 11,
-			"volume": 0,
-			"url": "/stranstviia_emanon/vol2/6",
-			"scanlator": "Sup!",
-			"uploadDate": 1451512800000,
-			"source": "READMANGA_RU"
-		},
-		{
-			"id": 1552943969433542626,
-			"title": "3 - 1",
-			"number": 12,
-			"volume": 0,
-			"url": "/stranstviia_emanon/vol3/1",
-			"scanlator": "Sup!",
-			"uploadDate": 1461618000000,
-			"source": "READMANGA_RU"
-		},
-		{
-			"id": 1552943969433542627,
-			"title": "3 - 2",
-			"number": 13,
-			"volume": 0,
-			"url": "/stranstviia_emanon/vol3/2",
-			"scanlator": "Sup!",
-			"uploadDate": 1461618000000,
-			"source": "READMANGA_RU"
-		},
-		{
-			"id": 1552943969433542628,
-			"title": "3 - 3",
-			"number": 14,
-			"volume": 0,
-			"url": "/stranstviia_emanon/vol3/3",
-			"scanlator": "",
-			"uploadDate": 1465851600000,
-			"source": "READMANGA_RU"
-		}
-	],
-	"source": "READMANGA_RU"
-}
--- a/app/src/androidTest/assets/manga/empty.json
+++ b/app/src/androidTest/assets/manga/empty.json
@@ -1,38 +0,0 @@
-{
-	"id": -2096681732556647985,
-	"title": "Странствия Эманон",
-	"altTitles": [],
-	"url": "/stranstviia_emanon",
-	"publicUrl": "https://readmanga.io/stranstviia_emanon",
-	"rating": 0.9400894,
-	"isNsfw": true,
-	"coverUrl": "https://staticrm.rmr.rocks/uploads/pics/01/12/559_p.jpg",
-	"tags": [
-		{
-			"title": "Сверхъестественное",
-			"key": "supernatural",
-			"source": "READMANGA_RU"
-		},
-		{
-			"title": "Сэйнэн",
-			"key": "seinen",
-			"source": "READMANGA_RU"
-		},
-		{
-			"title": "Повседневность",
-			"key": "slice_of_life",
-			"source": "READMANGA_RU"
-		},
-		{
-			"title": "Приключения",
-			"key": "adventure",
-			"source": "READMANGA_RU"
-		}
-	],
-	"state": "FINISHED",
-	"authors": [],
-	"largeCoverUrl": "https://staticrm.rmr.rocks/uploads/pics/01/12/559_o.jpg",
-	"description": "Продолжение истории о загадочной девушке по имени Эманон, которая помнит всё, что происходило на Земле за последние три миллиарда лет. \n<br>Начало истории читайте в \"Воспоминаниях Эманон\". \n<div class=\"clearfix\"></div>",
-	"chapters": [],
-	"source": "READMANGA_RU"
-}
--- a/app/src/androidTest/assets/manga/first_chapters.json
+++ b/app/src/androidTest/assets/manga/first_chapters.json
@@ -1,149 +0,0 @@
-{
-	"id": -2096681732556647985,
-	"title": "Странствия Эманон",
-	"altTitles": [],
-	"url": "/stranstviia_emanon",
-	"publicUrl": "https://readmanga.io/stranstviia_emanon",
-	"rating": 0.9400894,
-	"isNsfw": true,
-	"coverUrl": "https://staticrm.rmr.rocks/uploads/pics/01/12/559_p.jpg",
-	"tags": [
-		{
-			"title": "Сверхъестественное",
-			"key": "supernatural",
-			"source": "READMANGA_RU"
-		},
-		{
-			"title": "Сэйнэн",
-			"key": "seinen",
-			"source": "READMANGA_RU"
-		},
-		{
-			"title": "Повседневность",
-			"key": "slice_of_life",
-			"source": "READMANGA_RU"
-		},
-		{
-			"title": "Приключения",
-			"key": "adventure",
-			"source": "READMANGA_RU"
-		}
-	],
-	"state": "FINISHED",
-	"authors": [],
-	"largeCoverUrl": "https://staticrm.rmr.rocks/uploads/pics/01/12/559_o.jpg",
-	"description": "Продолжение истории о загадочной девушке по имени Эманон, которая помнит всё, что происходило на Земле за последние три миллиарда лет. \n<br>Начало истории читайте в \"Воспоминаниях Эманон\". \n<div class=\"clearfix\"></div>",
-	"chapters": [
-		{
-			"id": 3552943969433540704,
-			"title": "1 - 1",
-			"number": 1,
-			"volume": 0,
-			"url": "/stranstviia_emanon/vol1/1",
-			"scanlator": "Sad-Robot",
-			"uploadDate": 1342731600000,
-			"source": "READMANGA_RU"
-		},
-		{
-			"id": 3552943969433540705,
-			"title": "1 - 2",
-			"number": 2,
-			"volume": 0,
-			"url": "/stranstviia_emanon/vol1/2",
-			"scanlator": "Sad-Robot",
-			"uploadDate": 1342731600000,
-			"source": "READMANGA_RU"
-		},
-		{
-			"id": 3552943969433540706,
-			"title": "1 - 3",
-			"number": 3,
-			"volume": 0,
-			"url": "/stranstviia_emanon/vol1/3",
-			"scanlator": "Sad-Robot",
-			"uploadDate": 1342731600000,
-			"source": "READMANGA_RU"
-		},
-		{
-			"id": 3552943969433540707,
-			"title": "1 - 4",
-			"number": 4,
-			"volume": 0,
-			"url": "/stranstviia_emanon/vol1/4",
-			"scanlator": "Sad-Robot",
-			"uploadDate": 1342731600000,
-			"source": "READMANGA_RU"
-		},
-		{
-			"id": 3552943969433540708,
-			"title": "1 - 5",
-			"number": 5,
-			"volume": 0,
-			"url": "/stranstviia_emanon/vol1/5",
-			"scanlator": "Sad-Robot",
-			"uploadDate": 1342731600000,
-			"source": "READMANGA_RU"
-		},
-		{
-			"id": 3552943969433541665,
-			"title": "2 - 1",
-			"number": 6,
-			"volume": 0,
-			"url": "/stranstviia_emanon/vol2/1",
-			"scanlator": "Sup!",
-			"uploadDate": 1415570400000,
-			"source": "READMANGA_RU"
-		},
-		{
-			"id": 3552943969433541666,
-			"title": "2 - 2",
-			"number": 7,
-			"volume": 0,
-			"url": "/stranstviia_emanon/vol2/2",
-			"scanlator": "Sup!",
-			"uploadDate": 1419976800000,
-			"source": "READMANGA_RU"
-		},
-		{
-			"id": 3552943969433541667,
-			"title": "2 - 3",
-			"number": 8,
-			"volume": 0,
-			"url": "/stranstviia_emanon/vol2/3",
-			"scanlator": "Sup!",
-			"uploadDate": 1427922000000,
-			"source": "READMANGA_RU"
-		},
-		{
-			"id": 3552943969433541668,
-			"title": "2 - 4",
-			"number": 9,
-			"volume": 0,
-			"url": "/stranstviia_emanon/vol2/4",
-			"scanlator": "Sup!",
-			"uploadDate": 1436907600000,
-			"source": "READMANGA_RU"
-		},
-		{
-			"id": 3552943969433541669,
-			"title": "2 - 5",
-			"number": 10,
-			"volume": 0,
-			"url": "/stranstviia_emanon/vol2/5",
-			"scanlator": "Sup!",
-			"uploadDate": 1446674400000,
-			"source": "READMANGA_RU"
-		},
-		{
-			"id": 3552943969433541670,
-			"title": "2 - 6",
-			"number": 11,
-			"volume": 0,
-			"url": "/stranstviia_emanon/vol2/6",
-			"scanlator": "Sup!",
-			"uploadDate": 1451512800000,
-			"source": "READMANGA_RU"
-		}
-	],
-	"source": "READMANGA_RU"
-}
--- a/app/src/androidTest/assets/manga/full.json
+++ b/app/src/androidTest/assets/manga/full.json
@@ -1,179 +0,0 @@
-{
-	"id": -2096681732556647985,
-	"title": "Странствия Эманон",
-	"altTitles": [],
-	"url": "/stranstviia_emanon",
-	"publicUrl": "https://readmanga.io/stranstviia_emanon",
-	"rating": 0.9400894,
-	"isNsfw": true,
-	"coverUrl": "https://staticrm.rmr.rocks/uploads/pics/01/12/559_p.jpg",
-	"tags": [
-		{
-			"title": "Сверхъестественное",
-			"key": "supernatural",
-			"source": "READMANGA_RU"
-		},
-		{
-			"title": "Сэйнэн",
-			"key": "seinen",
-			"source": "READMANGA_RU"
-		},
-		{
-			"title": "Повседневность",
-			"key": "slice_of_life",
-			"source": "READMANGA_RU"
-		},
-		{
-			"title": "Приключения",
-			"key": "adventure",
-			"source": "READMANGA_RU"
-		}
-	],
-	"state": "FINISHED",
-	"authors": [],
-	"largeCoverUrl": "https://staticrm.rmr.rocks/uploads/pics/01/12/559_o.jpg",
-	"description": "Продолжение истории о загадочной девушке по имени Эманон, которая помнит всё, что происходило на Земле за последние три миллиарда лет. \n<br>Начало истории читайте в \"Воспоминаниях Эманон\". \n<div class=\"clearfix\"></div>",
-	"chapters": [
-		{
-			"id": 3552943969433540704,
-			"title": "1 - 1",
-			"number": 1,
-			"volume": 0,
-			"url": "/stranstviia_emanon/vol1/1",
-			"scanlator": "Sad-Robot",
-			"uploadDate": 1342731600000,
-			"source": "READMANGA_RU"
-		},
-		{
-			"id": 3552943969433540705,
-			"title": "1 - 2",
-			"number": 2,
-			"volume": 0,
-			"url": "/stranstviia_emanon/vol1/2",
-			"scanlator": "Sad-Robot",
-			"uploadDate": 1342731600000,
-			"source": "READMANGA_RU"
-		},
-		{
-			"id": 3552943969433540706,
-			"title": "1 - 3",
-			"number": 3,
-			"volume": 0,
-			"url": "/stranstviia_emanon/vol1/3",
-			"scanlator": "Sad-Robot",
-			"uploadDate": 1342731600000,
-			"source": "READMANGA_RU"
-		},
-		{
-			"id": 3552943969433540707,
-			"title": "1 - 4",
-			"number": 4,
-			"volume": 0,
-			"url": "/stranstviia_emanon/vol1/4",
-			"scanlator": "Sad-Robot",
-			"uploadDate": 1342731600000,
-			"source": "READMANGA_RU"
-		},
-		{
-			"id": 3552943969433540708,
-			"title": "1 - 5",
-			"number": 5,
-			"volume": 0,
-			"url": "/stranstviia_emanon/vol1/5",
-			"scanlator": "Sad-Robot",
-			"uploadDate": 1342731600000,
-			"source": "READMANGA_RU"
-		},
-		{
-			"id": 3552943969433541665,
-			"title": "2 - 1",
-			"number": 6,
-			"volume": 0,
-			"url": "/stranstviia_emanon/vol2/1",
-			"scanlator": "Sup!",
-			"uploadDate": 1415570400000,
-			"source": "READMANGA_RU"
-		},
-		{
-			"id": 3552943969433541666,
-			"title": "2 - 2",
-			"number": 7,
-			"volume": 0,
-			"url": "/stranstviia_emanon/vol2/2",
-			"scanlator": "Sup!",
-			"uploadDate": 1419976800000,
-			"source": "READMANGA_RU"
-		},
-		{
-			"id": 3552943969433541667,
-			"title": "2 - 3",
-			"number": 8,
-			"volume": 0,
-			"url": "/stranstviia_emanon/vol2/3",
-			"scanlator": "Sup!",
-			"uploadDate": 1427922000000,
-			"source": "READMANGA_RU"
-		},
-		{
-			"id": 3552943969433541668,
-			"title": "2 - 4",
-			"number": 9,
-			"volume": 0,
-			"url": "/stranstviia_emanon/vol2/4",
-			"scanlator": "Sup!",
-			"uploadDate": 1436907600000,
-			"source": "READMANGA_RU"
-		},
-		{
-			"id": 3552943969433541669,
-			"title": "2 - 5",
-			"number": 10,
-			"volume": 0,
-			"url": "/stranstviia_emanon/vol2/5",
-			"scanlator": "Sup!",
-			"uploadDate": 1446674400000,
-			"source": "READMANGA_RU"
-		},
-		{
-			"id": 3552943969433541670,
-			"title": "2 - 6",
-			"number": 11,
-			"volume": 0,
-			"url": "/stranstviia_emanon/vol2/6",
-			"scanlator": "Sup!",
-			"uploadDate": 1451512800000,
-			"source": "READMANGA_RU"
-		},
-		{
-			"id": 3552943969433542626,
-			"title": "3 - 1",
-			"number": 12,
-			"volume": 0,
-			"url": "/stranstviia_emanon/vol3/1",
-			"scanlator": "Sup!",
-			"uploadDate": 1461618000000,
-			"source": "READMANGA_RU"
-		},
-		{
-			"id": 3552943969433542627,
-			"title": "3 - 2",
-			"number": 13,
-			"volume": 0,
-			"url": "/stranstviia_emanon/vol3/2",
-			"scanlator": "Sup!",
-			"uploadDate": 1461618000000,
-			"source": "READMANGA_RU"
-		},
-		{
-			"id": 3552943969433542628,
-			"title": "3 - 3",
-			"number": 14,
-			"volume": 0,
-			"url": "/stranstviia_emanon/vol3/3",
-			"scanlator": "",
-			"uploadDate": 1465851600000,
-			"source": "READMANGA_RU"
-		}
-	],
-	"source": "READMANGA_RU"
-}
--- a/app/src/androidTest/assets/manga/header.json
+++ b/app/src/androidTest/assets/manga/header.json
@@ -1,37 +0,0 @@
-{
-	"id": -2096681732556647985,
-	"title": "Странствия Эманон",
-	"altTitles": [],
-	"url": "/stranstviia_emanon",
-	"publicUrl": "https://readmanga.io/stranstviia_emanon",
-	"rating": 0.9400894,
-	"isNsfw": true,
-	"coverUrl": "https://staticrm.rmr.rocks/uploads/pics/01/12/559_p.jpg",
-	"tags": [
-		{
-			"title": "Сверхъестественное",
-			"key": "supernatural",
-			"source": "READMANGA_RU"
-		},
-		{
-			"title": "Сэйнэн",
-			"key": "seinen",
-			"source": "READMANGA_RU"
-		},
-		{
-			"title": "Повседневность",
-			"key": "slice_of_life",
-			"source": "READMANGA_RU"
-		},
-		{
-			"title": "Приключения",
-			"key": "adventure",
-			"source": "READMANGA_RU"
-		}
-	],
-	"state": "FINISHED",
-	"authors": [],
-	"largeCoverUrl": "https://staticrm.rmr.rocks/uploads/pics/01/12/559_o.jpg",
-	"description": null,
-	"source": "READMANGA_RU"
-}
--- a/app/src/androidTest/assets/manga/without_middle_chapter.json
+++ b/app/src/androidTest/assets/manga/without_middle_chapter.json
@@ -1,169 +0,0 @@
-{
-	"id": -2096681732556647985,
-	"title": "Странствия Эманон",
-	"altTitles": [],
-	"url": "/stranstviia_emanon",
-	"publicUrl": "https://readmanga.io/stranstviia_emanon",
-	"rating": 0.9400894,
-	"isNsfw": true,
-	"coverUrl": "https://staticrm.rmr.rocks/uploads/pics/01/12/559_p.jpg",
-	"tags": [
-		{
-			"title": "Сверхъестественное",
-			"key": "supernatural",
-			"source": "READMANGA_RU"
-		},
-		{
-			"title": "Сэйнэн",
-			"key": "seinen",
-			"source": "READMANGA_RU"
-		},
-		{
-			"title": "Повседневность",
-			"key": "slice_of_life",
-			"source": "READMANGA_RU"
-		},
-		{
-			"title": "Приключения",
-			"key": "adventure",
-			"source": "READMANGA_RU"
-		}
-	],
-	"state": "FINISHED",
-	"authors": [],
-	"largeCoverUrl": "https://staticrm.rmr.rocks/uploads/pics/01/12/559_o.jpg",
-	"description": "Продолжение истории о загадочной девушке по имени Эманон, которая помнит всё, что происходило на Земле за последние три миллиарда лет. \n<br>Начало истории читайте в \"Воспоминаниях Эманон\". \n<div class=\"clearfix\"></div>",
-	"chapters": [
-		{
-			"id": 3552943969433540704,
-			"title": "1 - 1",
-			"number": 1,
-			"volume": 0,
-			"url": "/stranstviia_emanon/vol1/1",
-			"scanlator": "Sad-Robot",
-			"uploadDate": 1342731600000,
-			"source": "READMANGA_RU"
-		},
-		{
-			"id": 3552943969433540705,
-			"title": "1 - 2",
-			"number": 2,
-			"volume": 0,
-			"url": "/stranstviia_emanon/vol1/2",
-			"scanlator": "Sad-Robot",
-			"uploadDate": 1342731600000,
-			"source": "READMANGA_RU"
-		},
-		{
-			"id": 3552943969433540706,
-			"title": "1 - 3",
-			"number": 3,
-			"volume": 0,
-			"url": "/stranstviia_emanon/vol1/3",
-			"scanlator": "Sad-Robot",
-			"uploadDate": 1342731600000,
-			"source": "READMANGA_RU"
-		},
-		{
-			"id": 3552943969433540707,
-			"title": "1 - 4",
-			"number": 4,
-			"volume": 0,
-			"url": "/stranstviia_emanon/vol1/4",
-			"scanlator": "Sad-Robot",
-			"uploadDate": 1342731600000,
-			"source": "READMANGA_RU"
-		},
-		{
-			"id": 3552943969433540708,
-			"title": "1 - 5",
-			"number": 5,
-			"volume": 0,
-			"url": "/stranstviia_emanon/vol1/5",
-			"scanlator": "Sad-Robot",
-			"uploadDate": 1342731600000,
-			"source": "READMANGA_RU"
-		},
-		{
-			"id": 3552943969433541666,
-			"title": "2 - 2",
-			"number": 7,
-			"volume": 0,
-			"url": "/stranstviia_emanon/vol2/2",
-			"scanlator": "Sup!",
-			"uploadDate": 1419976800000,
-			"source": "READMANGA_RU"
-		},
-		{
-			"id": 3552943969433541667,
-			"title": "2 - 3",
-			"number": 8,
-			"volume": 0,
-			"url": "/stranstviia_emanon/vol2/3",
-			"scanlator": "Sup!",
-			"uploadDate": 1427922000000,
-			"source": "READMANGA_RU"
-		},
-		{
-			"id": 3552943969433541668,
-			"title": "2 - 4",
-			"number": 9,
-			"volume": 0,
-			"url": "/stranstviia_emanon/vol2/4",
-			"scanlator": "Sup!",
-			"uploadDate": 1436907600000,
-			"source": "READMANGA_RU"
-		},
-		{
-			"id": 3552943969433541669,
-			"title": "2 - 5",
-			"number": 10,
-			"volume": 0,
-			"url": "/stranstviia_emanon/vol2/5",
-			"scanlator": "Sup!",
-			"uploadDate": 1446674400000,
-			"source": "READMANGA_RU"
-		},
-		{
-			"id": 3552943969433541670,
-			"title": "2 - 6",
-			"number": 11,
-			"volume": 0,
-			"url": "/stranstviia_emanon/vol2/6",
-			"scanlator": "Sup!",
-			"uploadDate": 1451512800000,
-			"source": "READMANGA_RU"
-		},
-		{
-			"id": 3552943969433542626,
-			"title": "3 - 1",
-			"number": 12,
-			"volume": 0,
-			"url": "/stranstviia_emanon/vol3/1",
-			"scanlator": "Sup!",
-			"uploadDate": 1461618000000,
-			"source": "READMANGA_RU"
-		},
-		{
-			"id": 3552943969433542627,
-			"title": "3 - 2",
-			"number": 13,
-			"volume": 0,
-			"url": "/stranstviia_emanon/vol3/2",
-			"scanlator": "Sup!",
-			"uploadDate": 1461618000000,
-			"source": "READMANGA_RU"
-		},
-		{
-			"id": 3552943969433542628,
-			"title": "3 - 3",
-			"number": 14,
-			"volume": 0,
-			"url": "/stranstviia_emanon/vol3/3",
-			"scanlator": "",
-			"uploadDate": 1465851600000,
-			"source": "READMANGA_RU"
-		}
-	],
-	"source": "READMANGA_RU"
-}
--- a/app/src/androidTest/kotlin/org/koitharu/kotatsu/HiltTestRunner.kt
+++ b/app/src/androidTest/kotlin/org/koitharu/kotatsu/HiltTestRunner.kt
@@ -1,13 +0,0 @@
-package org.koitharu.kotatsu
-
-import android.app.Application
-import android.content.Context
-import androidx.test.runner.AndroidJUnitRunner
-import dagger.hilt.android.testing.HiltTestApplication
-
-class HiltTestRunner : AndroidJUnitRunner() {
-
-    override fun newApplication(cl: ClassLoader?, name: String?, context: Context?): Application {
-        return super.newApplication(cl, HiltTestApplication::class.java.name, context)
-    }
-}
--- a/app/src/androidTest/kotlin/org/koitharu/kotatsu/Instrumentation.kt
+++ b/app/src/androidTest/kotlin/org/koitharu/kotatsu/Instrumentation.kt
@@ -1,9 +0,0 @@
-package org.koitharu.kotatsu
-
-import android.app.Instrumentation
-import kotlin.coroutines.resume
-import kotlin.coroutines.suspendCoroutine
-
-suspend fun Instrumentation.awaitForIdle() = suspendCoroutine<Unit> { cont ->
-	waitForIdle { cont.resume(Unit) }
-}
--- a/app/src/androidTest/kotlin/org/koitharu/kotatsu/SampleData.kt
+++ b/app/src/androidTest/kotlin/org/koitharu/kotatsu/SampleData.kt
@@ -1,96 +0,0 @@
-package org.koitharu.kotatsu
-
-import androidx.test.platform.app.InstrumentationRegistry
-import com.squareup.moshi.FromJson
-import com.squareup.moshi.JsonAdapter
-import com.squareup.moshi.JsonReader
-import com.squareup.moshi.JsonWriter
-import com.squareup.moshi.Moshi
-import com.squareup.moshi.ToJson
-import com.squareup.moshi.kotlin.reflect.KotlinJsonAdapterFactory
-import okio.buffer
-import okio.source
-import org.koitharu.kotatsu.core.model.FavouriteCategory
-import org.koitharu.kotatsu.core.model.MangaSource
-import org.koitharu.kotatsu.parsers.model.Manga
-import org.koitharu.kotatsu.parsers.model.MangaSource
-import java.time.Instant
-import java.util.Date
-import kotlin.reflect.KClass
-
-object SampleData {
-
-	private val moshi = Moshi.Builder()
-		.add(DateAdapter())
-		.add(InstantAdapter())
-		.add(MangaSourceAdapter())
-		.add(KotlinJsonAdapterFactory())
-		.build()
-
-	val manga: Manga = loadAsset("manga/header.json", Manga::class)
-
-	val mangaDetails: Manga = loadAsset("manga/full.json", Manga::class)
-
-	val tag = mangaDetails.tags.elementAt(2)
-
-	val chapter = checkNotNull(mangaDetails.chapters)[2]
-
-	val favouriteCategory: FavouriteCategory = loadAsset("categories/simple.json", FavouriteCategory::class)
-
-	fun <T : Any> loadAsset(name: String, cls: KClass<T>): T {
-		val assets = InstrumentationRegistry.getInstrumentation().context.assets
-		return assets.open(name).use {
-			moshi.adapter(cls.java).fromJson(it.source().buffer())
-		} ?: throw RuntimeException("Cannot read asset from json \"$name\"")
-	}
-
-	private class DateAdapter : JsonAdapter<Date>() {
-
-		@FromJson
-		override fun fromJson(reader: JsonReader): Date? {
-			val ms = reader.nextLong()
-			return if (ms == 0L) {
-				null
-			} else {
-				Date(ms)
-			}
-		}
-
-		@ToJson
-		override fun toJson(writer: JsonWriter, value: Date?) {
-			writer.value(value?.time ?: 0L)
-		}
-	}
-
-	private class MangaSourceAdapter : JsonAdapter<MangaSource>() {
-
-		@FromJson
-		override fun fromJson(reader: JsonReader): MangaSource? {
-			val name = reader.nextString() ?: return null
-			return MangaSource(name)
-		}
-
-		@ToJson
-		override fun toJson(writer: JsonWriter, value: MangaSource?) {
-			writer.value(value?.name)
-		}
-	}
-
-	private class InstantAdapter : JsonAdapter<Instant>() {
-
-		@FromJson
-		override fun fromJson(reader: JsonReader): Instant? {
-			val ms = reader.nextLong()
-			return if (ms == 0L) {
-				null
-			} else {
-				Instant.ofEpochMilli(ms)
-			}
-		}
-
-		@ToJson
-		override fun toJson(writer: JsonWriter, value: Instant?) {
-			writer.value(value?.toEpochMilli() ?: 0L)
-		}
-	}
-}
--- a/app/src/androidTest/kotlin/org/koitharu/kotatsu/core/db/MangaDatabaseTest.kt
+++ b/app/src/androidTest/kotlin/org/koitharu/kotatsu/core/db/MangaDatabaseTest.kt
@@ -1,57 +0,0 @@
-package org.koitharu.kotatsu.core.db
-
-import androidx.room.testing.MigrationTestHelper
-import androidx.test.ext.junit.runners.AndroidJUnit4
-import androidx.test.platform.app.InstrumentationRegistry
-import org.junit.Assert.assertEquals
-import org.junit.Rule
-import org.junit.Test
-import org.junit.runner.RunWith
-
-@RunWith(AndroidJUnit4::class)
-class MangaDatabaseTest {
-
-	@get:Rule
-	val helper: MigrationTestHelper = MigrationTestHelper(
-		InstrumentationRegistry.getInstrumentation(),
-		MangaDatabase::class.java,
-	)
-
-	private val migrations = getDatabaseMigrations(InstrumentationRegistry.getInstrumentation().targetContext)
-
-	@Test
-	fun versions() {
-		assertEquals(1, migrations.first().startVersion)
-		repeat(migrations.size) { i ->
-			assertEquals(i + 1, migrations[i].startVersion)
-			assertEquals(i + 2, migrations[i].endVersion)
-		}
-		assertEquals(DATABASE_VERSION, migrations.last().endVersion)
-	}
-
-	@Test
-	fun migrateAll() {
-		helper.createDatabase(TEST_DB, 1).close()
-		for (migration in migrations) {
-			helper.runMigrationsAndValidate(
-				TEST_DB,
-				migration.endVersion,
-				true,
-				migration,
-			).close()
-		}
-	}
-
-	@Test
-	fun prePopulate() {
-		val resources = InstrumentationRegistry.getInstrumentation().targetContext.resources
-		helper.createDatabase(TEST_DB, DATABASE_VERSION).use {
-			DatabasePrePopulateCallback(resources).onCreate(it)
-		}
-	}
-
-	private companion object {
-
-		const val TEST_DB = "test-db"
-	}
-}
--- a/app/src/androidTest/kotlin/org/koitharu/kotatsu/core/os/AppShortcutManagerTest.kt
+++ b/app/src/androidTest/kotlin/org/koitharu/kotatsu/core/os/AppShortcutManagerTest.kt
@@ -1,79 +0,0 @@
-package org.koitharu.kotatsu.core.os
-
-import android.content.pm.ShortcutInfo
-import android.content.pm.ShortcutManager
-import android.os.Build
-import androidx.core.content.getSystemService
-import androidx.test.ext.junit.runners.AndroidJUnit4
-import androidx.test.platform.app.InstrumentationRegistry
-import dagger.hilt.android.testing.HiltAndroidRule
-import dagger.hilt.android.testing.HiltAndroidTest
-import kotlinx.coroutines.test.runTest
-import org.junit.Assert.assertEquals
-import org.junit.Assert.assertTrue
-import org.junit.Before
-import org.junit.Rule
-import org.junit.Test
-import org.junit.runner.RunWith
-import org.koitharu.kotatsu.SampleData
-import org.koitharu.kotatsu.awaitForIdle
-import org.koitharu.kotatsu.core.db.MangaDatabase
-import org.koitharu.kotatsu.history.data.HistoryRepository
-import javax.inject.Inject
-
-@HiltAndroidTest
-@RunWith(AndroidJUnit4::class)
-class AppShortcutManagerTest {
-
-	@get:Rule
-	var hiltRule = HiltAndroidRule(this)
-
-	@Inject
-	lateinit var historyRepository: HistoryRepository
-
-	@Inject
-	lateinit var appShortcutManager: AppShortcutManager
-
-	@Inject
-	lateinit var database: MangaDatabase
-
-	@Before
-	fun setUp() {
-		hiltRule.inject()
-		database.clearAllTables()
-	}
-
-	@Test
-	fun testUpdateShortcuts() = runTest {
-		if (Build.VERSION.SDK_INT < Build.VERSION_CODES.N_MR1) {
-			return@runTest
-		}
-		database.invalidationTracker.addObserver(appShortcutManager)
-		awaitUpdate()
-		assertTrue(getShortcuts().isEmpty())
-		historyRepository.addOrUpdate(
-			manga = SampleData.manga,
-			chapterId = SampleData.chapter.id,
-			page = 4,
-			scroll = 2,
-			percent = 0.3f,
-			force = false,
-		)
-		awaitUpdate()
-
-		val shortcuts = getShortcuts()
-		assertEquals(1, shortcuts.size)
-	}
-
-	private fun getShortcuts(): List<ShortcutInfo> {
-		val context = InstrumentationRegistry.getInstrumentation().targetContext
-		val manager = checkNotNull(context.getSystemService<ShortcutManager>())
-		return manager.dynamicShortcuts.filterNot { it.id == "com.squareup.leakcanary.dynamic_shortcut" }
-	}
-
-	private suspend fun awaitUpdate() {
-		val instrumentation = InstrumentationRegistry.getInstrumentation()
-		instrumentation.awaitForIdle()
-		appShortcutManager.await()
-	}
-}
--- a/app/src/androidTest/kotlin/org/koitharu/kotatsu/settings/backup/AppBackupAgentTest.kt
+++ b/app/src/androidTest/kotlin/org/koitharu/kotatsu/settings/backup/AppBackupAgentTest.kt
@@ -1,113 +0,0 @@
-package org.koitharu.kotatsu.settings.backup
-
-import android.content.res.AssetManager
-import androidx.test.ext.junit.runners.AndroidJUnit4
-import androidx.test.platform.app.InstrumentationRegistry
-import dagger.hilt.android.testing.HiltAndroidRule
-import dagger.hilt.android.testing.HiltAndroidTest
-import kotlinx.coroutines.flow.first
-import kotlinx.coroutines.test.runTest
-import org.junit.Assert.assertEquals
-import org.junit.Assert.assertNull
-import org.junit.Assert.assertTrue
-import org.junit.Before
-import org.junit.Rule
-import org.junit.Test
-import org.junit.runner.RunWith
-import org.koitharu.kotatsu.SampleData
-import org.koitharu.kotatsu.backups.data.BackupRepository
-import org.koitharu.kotatsu.backups.domain.AppBackupAgent
-import org.koitharu.kotatsu.core.db.MangaDatabase
-import org.koitharu.kotatsu.core.db.entity.toMangaTags
-import org.koitharu.kotatsu.favourites.domain.FavouritesRepository
-import org.koitharu.kotatsu.history.data.HistoryRepository
-import java.io.File
-import javax.inject.Inject
-
-@HiltAndroidTest
-@RunWith(AndroidJUnit4::class)
-class AppBackupAgentTest {
-
-	@get:Rule
-	var hiltRule = HiltAndroidRule(this)
-
-	@Inject
-	lateinit var historyRepository: HistoryRepository
-
-	@Inject
-	lateinit var favouritesRepository: FavouritesRepository
-
-	@Inject
-	lateinit var backupRepository: BackupRepository
-
-	@Inject
-	lateinit var database: MangaDatabase
-
-	@Before
-	fun setUp() {
-		hiltRule.inject()
-		database.clearAllTables()
-	}
-
-	@Test
-	fun backupAndRestore() = runTest {
-		val category = favouritesRepository.createCategory(
-			title = SampleData.favouriteCategory.title,
-			sortOrder = SampleData.favouriteCategory.order,
-			isTrackerEnabled = SampleData.favouriteCategory.isTrackingEnabled,
-			isVisibleOnShelf = SampleData.favouriteCategory.isVisibleInLibrary,
-		)
-		favouritesRepository.addToCategory(categoryId = category.id, mangas = listOf(SampleData.manga))
-		historyRepository.addOrUpdate(
-			manga = SampleData.mangaDetails,
-			chapterId = SampleData.mangaDetails.chapters!![2].id,
-			page = 3,
-			scroll = 40,
-			percent = 0.2f,
-			force = false,
-		)
-		val history = checkNotNull(historyRepository.getOne(SampleData.manga))
-
-		val agent = AppBackupAgent()
-		val backup = agent.createBackupFile(
-			context = InstrumentationRegistry.getInstrumentation().targetContext,
-			repository = backupRepository,
-		)
-
-		database.clearAllTables()
-		assertTrue(favouritesRepository.getAllManga().isEmpty())
-		assertNull(historyRepository.getLastOrNull())
-
-		backup.inputStream().use {
-			agent.restoreBackupFile(it.fd, backup.length(), backupRepository)
-		}
-
-		assertEquals(category, favouritesRepository.getCategory(category.id))
-		assertEquals(history, historyRepository.getOne(SampleData.manga))
-		assertEquals(listOf(SampleData.manga), favouritesRepository.getManga(category.id))
-
-		val allTags = database.getTagsDao().findTags(SampleData.tag.source.name).toMangaTags()
-		assertTrue(SampleData.tag in allTags)
-	}
-
-	@Test
-	fun restoreOldBackup() {
-		val agent = AppBackupAgent()
-		val backup = File.createTempFile("backup_", ".tmp")
-		InstrumentationRegistry.getInstrumentation().context.assets
-			.open("kotatsu_test.bak", AssetManager.ACCESS_STREAMING)
-			.use { input ->
-				backup.outputStream().use { output ->
-					input.copyTo(output)
-				}
-			}
-		backup.inputStream().use {
-			agent.restoreBackupFile(it.fd, backup.length(), backupRepository)
-		}
-		runTest {
-			assertEquals(6, historyRepository.observeAll().first().size)
-			assertEquals(2, favouritesRepository.observeCategories().first().size)
-			assertEquals(15, favouritesRepository.getAllManga().size)
-		}
-	}
-}
--- a/app/src/debug/kotlin/org/koitharu/kotatsu/KotatsuApp.kt
+++ b/app/src/debug/kotlin/org/koitharu/kotatsu/KotatsuApp.kt
@@ -1,91 +0,0 @@
-package org.koitharu.kotatsu
-
-import android.content.Context
-import android.content.SharedPreferences
-import android.os.Build
-import android.os.StrictMode
-import androidx.core.content.edit
-import androidx.fragment.app.strictmode.FragmentStrictMode
-import leakcanary.LeakCanary
-import org.koitharu.kotatsu.core.BaseApp
-
-class KotatsuApp : BaseApp() {
-
-	var isLeakCanaryEnabled: Boolean
-		get() = getDebugPreferences(this).getBoolean(KEY_LEAK_CANARY, true)
-		set(value) {
-			getDebugPreferences(this).edit { putBoolean(KEY_LEAK_CANARY, value) }
-			configureLeakCanary()
-		}
-
-	override fun attachBaseContext(base: Context) {
-		super.attachBaseContext(base)
-		enableStrictMode()
-		configureLeakCanary()
-	}
-
-	private fun configureLeakCanary() {
-		LeakCanary.config = LeakCanary.config.copy(
-			dumpHeap = isLeakCanaryEnabled,
-		)
-	}
-
-	private fun enableStrictMode() {
-		val notifier = if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.P) {
-			StrictModeNotifier(this)
-		} else {
-			null
-		}
-		StrictMode.setThreadPolicy(
-			StrictMode.ThreadPolicy.Builder().apply {
-				detectNetwork()
-				detectDiskWrites()
-				detectCustomSlowCalls()
-				detectResourceMismatches()
-				if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) detectUnbufferedIo()
-				if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.UPSIDE_DOWN_CAKE) detectExplicitGc()
-				penaltyLog()
-				if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.P && notifier != null) {
-					penaltyListener(notifier.executor, notifier)
-				}
-			}.build(),
-		)
-		StrictMode.setVmPolicy(
-			StrictMode.VmPolicy.Builder().apply {
-				detectActivityLeaks()
-				detectLeakedSqlLiteObjects()
-				detectLeakedClosableObjects()
-				detectLeakedRegistrationObjects()
-				if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
-					detectContentUriWithoutPermission()
-				}
-				detectFileUriExposure()
-				penaltyLog()
-				if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.P && notifier != null) {
-					penaltyListener(notifier.executor, notifier)
-				}
-			}.build(),
-		)
-		FragmentStrictMode.defaultPolicy = FragmentStrictMode.Policy.Builder().apply {
-			detectWrongFragmentContainer()
-			detectFragmentTagUsage()
-			detectRetainInstanceUsage()
-			detectSetUserVisibleHint()
-			detectWrongNestedHierarchy()
-			detectFragmentReuse()
-			penaltyLog()
-			if (notifier != null) {
-				penaltyListener(notifier)
-			}
-		}.build()
-	}
-
-	private companion object {
-
-		const val PREFS_DEBUG = "_debug"
-		const val KEY_LEAK_CANARY = "leak_canary"
-
-		fun getDebugPreferences(context: Context): SharedPreferences =
-			context.getSharedPreferences(PREFS_DEBUG, MODE_PRIVATE)
-	}
-}
--- a/app/src/debug/kotlin/org/koitharu/kotatsu/StrictModeNotifier.kt
+++ b/app/src/debug/kotlin/org/koitharu/kotatsu/StrictModeNotifier.kt
@@ -1,73 +0,0 @@
-package org.koitharu.kotatsu
-
-import android.app.Notification
-import android.app.Notification.BigTextStyle
-import android.app.NotificationChannel
-import android.app.NotificationManager
-import android.content.Context
-import android.os.Build
-import android.os.StrictMode
-import android.os.strictmode.Violation
-import androidx.annotation.RequiresApi
-import androidx.core.app.PendingIntentCompat
-import androidx.core.content.getSystemService
-import androidx.fragment.app.strictmode.FragmentStrictMode
-import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.asExecutor
-import org.koitharu.kotatsu.core.util.ShareHelper
-import kotlin.math.absoluteValue
-import androidx.fragment.app.strictmode.Violation as FragmentViolation
-
-@RequiresApi(Build.VERSION_CODES.P)
-class StrictModeNotifier(
-	private val context: Context,
-) : StrictMode.OnVmViolationListener, StrictMode.OnThreadViolationListener, FragmentStrictMode.OnViolationListener {
-
-	val executor = Dispatchers.Default.asExecutor()
-
-	private val notificationManager by lazy {
-		val nm = checkNotNull(context.getSystemService<NotificationManager>())
-		val channel = NotificationChannel(
-			CHANNEL_ID,
-			context.getString(R.string.strict_mode),
-			NotificationManager.IMPORTANCE_LOW,
-		)
-		nm.createNotificationChannel(channel)
-		nm
-	}
-
-	override fun onVmViolation(v: Violation) = showNotification(v)
-
-	override fun onThreadViolation(v: Violation) = showNotification(v)
-
-	override fun onViolation(violation: FragmentViolation) = showNotification(violation)
-
-	private fun showNotification(violation: Throwable) = Notification.Builder(context, CHANNEL_ID)
-		.setSmallIcon(R.drawable.ic_bug)
-		.setContentTitle(context.getString(R.string.strict_mode))
-		.setContentText(violation.message)
-		.setStyle(
-			BigTextStyle()
-				.setBigContentTitle(context.getString(R.string.strict_mode))
-				.setSummaryText(violation.message)
-				.bigText(violation.stackTraceToString()),
-		).setShowWhen(true)
-		.setContentIntent(
-			PendingIntentCompat.getActivity(
-				context,
-				violation.hashCode(),
-				ShareHelper(context).getShareTextIntent(violation.stackTraceToString()),
-				0,
-				false,
-			),
-		)
-		.setAutoCancel(true)
-		.setGroup(CHANNEL_ID)
-		.build()
-		.let { notificationManager.notify(CHANNEL_ID, violation.hashCode().absoluteValue, it) }
-
-	private companion object {
-
-		const val CHANNEL_ID = "strict_mode"
-	}
-}
--- a/app/src/debug/kotlin/org/koitharu/kotatsu/core/network/CurlLoggingInterceptor.kt
+++ b/app/src/debug/kotlin/org/koitharu/kotatsu/core/network/CurlLoggingInterceptor.kt
@@ -1,62 +0,0 @@
-package org.koitharu.kotatsu.core.network
-
-import android.util.Log
-import okhttp3.Interceptor
-import okhttp3.Request
-import okhttp3.Response
-import okio.Buffer
-import org.koitharu.kotatsu.core.network.CommonHeaders.ACCEPT_ENCODING
-
-class CurlLoggingInterceptor(
-	private val curlOptions: String? = null
-) : Interceptor {
-
-	private val escapeRegex = Regex("([\\[\\]\"])")
-
-	override fun intercept(chain: Interceptor.Chain): Response = chain.proceed(chain.request()).also {
-		logRequest(it.networkResponse?.request ?: it.request)
-	}
-
-	private fun logRequest(request: Request) {
-		var isCompressed = false
-
-		val curlCmd = StringBuilder()
-		curlCmd.append("curl")
-		if (curlOptions != null) {
-			curlCmd.append(' ').append(curlOptions)
-		}
-		curlCmd.append(" -X ").append(request.method)
-
-		for ((name, value) in request.headers) {
-			if (name.equals(ACCEPT_ENCODING, ignoreCase = true) && value.equals("gzip", ignoreCase = true)) {
-				isCompressed = true
-			}
-			curlCmd.append(" -H \"").append(name).append(": ").append(value.escape()).append('\"')
-		}
-
-		val body = request.body
-		if (body != null) {
-			val buffer = Buffer()
-			body.writeTo(buffer)
-			val charset = body.contentType()?.charset() ?: Charsets.UTF_8
-			curlCmd.append(" --data-raw '")
-				.append(buffer.readString(charset).replace("\n", "\\n"))
-				.append("'")
-		}
-		if (isCompressed) {
-			curlCmd.append(" --compressed")
-		}
-		curlCmd.append(" \"").append(request.url.toString().escape()).append('"')
-
-		log("---cURL (" + request.url + ")")
-		log(curlCmd.toString())
-	}
-
-	private fun String.escape() = replace(escapeRegex) { match ->
-		"\\" + match.value
-	}
-
-	private fun log(msg: String) {
-		Log.d("CURL", msg)
-	}
-}
--- a/app/src/debug/kotlin/org/koitharu/kotatsu/core/parser/TestMangaRepository.kt
+++ b/app/src/debug/kotlin/org/koitharu/kotatsu/core/parser/TestMangaRepository.kt
@@ -1,57 +0,0 @@
-package org.koitharu.kotatsu.core.parser
-
-import org.koitharu.kotatsu.core.cache.MemoryContentCache
-import org.koitharu.kotatsu.core.model.TestMangaSource
-import org.koitharu.kotatsu.parsers.MangaLoaderContext
-import org.koitharu.kotatsu.parsers.model.Manga
-import org.koitharu.kotatsu.parsers.model.MangaChapter
-import org.koitharu.kotatsu.parsers.model.MangaListFilter
-import org.koitharu.kotatsu.parsers.model.MangaListFilterCapabilities
-import org.koitharu.kotatsu.parsers.model.MangaListFilterOptions
-import org.koitharu.kotatsu.parsers.model.MangaPage
-import org.koitharu.kotatsu.parsers.model.SortOrder
-import java.util.EnumSet
-
-/*
- This class is for parser development and testing purposes
- You can open it in the app via Settings -> Debug
- */
-class TestMangaRepository(
-	@Suppress("unused") private val loaderContext: MangaLoaderContext,
-	cache: MemoryContentCache
-) : CachingMangaRepository(cache) {
-
-	override val source = TestMangaSource
-
-	override val sortOrders: Set<SortOrder> = EnumSet.allOf(SortOrder::class.java)
-
-	override var defaultSortOrder: SortOrder
-		get() = sortOrders.first()
-		set(value) = Unit
-
-	override val filterCapabilities = MangaListFilterCapabilities()
-
-	override suspend fun getFilterOptions() = MangaListFilterOptions()
-
-	override suspend fun getList(
-		offset: Int,
-		order: SortOrder?,
-		filter: MangaListFilter?
-	): List<Manga> = TODO("Get manga list by filter")
-
-	override suspend fun getDetailsImpl(
-		manga: Manga
-	): Manga = TODO("Fetch manga details")
-
-	override suspend fun getPagesImpl(
-		chapter: MangaChapter
-	): List<MangaPage> = TODO("Get pages for specific chapter")
-
-	override suspend fun getPageUrl(
-		page: MangaPage
-	): String = TODO("Return direct url of page image or page.url if it is already a direct url")
-
-	override suspend fun getRelatedMangaImpl(
-		seed: Manga
-	): List<Manga> = TODO("Get list of related manga. This method is optional and parser library has a default implementation")
-}
--- a/app/src/debug/kotlin/org/koitharu/kotatsu/core/ui/BaseService.kt
+++ b/app/src/debug/kotlin/org/koitharu/kotatsu/core/ui/BaseService.kt
@@ -1,21 +0,0 @@
-package org.koitharu.kotatsu.core.ui
-
-import android.content.Context
-import androidx.core.content.ContextCompat
-import androidx.lifecycle.LifecycleService
-import leakcanary.AppWatcher
-
-abstract class BaseService : LifecycleService() {
-
-	override fun attachBaseContext(newBase: Context) {
-		super.attachBaseContext(ContextCompat.getContextForLanguage(newBase))
-	}
-
-	override fun onDestroy() {
-		super.onDestroy()
-		AppWatcher.objectWatcher.watch(
-			watchedObject = this,
-			description = "${javaClass.simpleName} service received Service#onDestroy() callback",
-		)
-	}
-}
--- a/app/src/debug/kotlin/org/koitharu/kotatsu/core/util/ext/Debug.kt
+++ b/app/src/debug/kotlin/org/koitharu/kotatsu/core/util/ext/Debug.kt
@@ -1,9 +0,0 @@
-package org.koitharu.kotatsu.core.util.ext
-
-import android.os.Looper
-
-fun Throwable.printStackTraceDebug() = printStackTrace()
-
-fun assertNotInMainThread() = check(Looper.myLooper() != Looper.getMainLooper()) {
-	"Calling this from the main thread is prohibited"
-}
--- a/app/src/debug/kotlin/org/koitharu/kotatsu/settings/DebugSettingsFragment.kt
+++ b/app/src/debug/kotlin/org/koitharu/kotatsu/settings/DebugSettingsFragment.kt
@@ -1,72 +0,0 @@
-package org.koitharu.kotatsu.settings
-
-import android.os.Bundle
-import androidx.preference.Preference
-import leakcanary.LeakCanary
-import org.koitharu.kotatsu.KotatsuApp
-import org.koitharu.kotatsu.R
-import org.koitharu.kotatsu.core.model.TestMangaSource
-import org.koitharu.kotatsu.core.nav.router
-import org.koitharu.kotatsu.core.ui.BasePreferenceFragment
-import org.koitharu.kotatsu.settings.utils.SplitSwitchPreference
-import org.koitharu.workinspector.WorkInspector
-
-class DebugSettingsFragment : BasePreferenceFragment(R.string.debug), Preference.OnPreferenceChangeListener,
-	Preference.OnPreferenceClickListener {
-
-	private val application
-		get() = requireContext().applicationContext as KotatsuApp
-
-	override fun onCreatePreferences(savedInstanceState: Bundle?, rootKey: String?) {
-		addPreferencesFromResource(R.xml.pref_debug)
-		findPreference<SplitSwitchPreference>(KEY_LEAK_CANARY)?.let { pref ->
-			pref.isChecked = application.isLeakCanaryEnabled
-			pref.onPreferenceChangeListener = this
-			pref.onContainerClickListener = this
-		}
-	}
-
-	override fun onResume() {
-		super.onResume()
-		findPreference<SplitSwitchPreference>(KEY_LEAK_CANARY)?.isChecked = application.isLeakCanaryEnabled
-	}
-
-	override fun onPreferenceTreeClick(preference: Preference): Boolean = when (preference.key) {
-		KEY_WORK_INSPECTOR -> {
-			startActivity(WorkInspector.getIntent(preference.context))
-			true
-		}
-
-		KEY_TEST_PARSER -> {
-			router.openList(TestMangaSource, null, null)
-			true
-		}
-
-		else -> super.onPreferenceTreeClick(preference)
-	}
-
-	override fun onPreferenceClick(preference: Preference): Boolean = when (preference.key) {
-		KEY_LEAK_CANARY -> {
-			startActivity(LeakCanary.newLeakDisplayActivityIntent())
-			true
-		}
-
-		else -> super.onPreferenceTreeClick(preference)
-	}
-
-	override fun onPreferenceChange(preference: Preference, newValue: Any?): Boolean = when (preference.key) {
-		KEY_LEAK_CANARY -> {
-			application.isLeakCanaryEnabled = newValue as Boolean
-			true
-		}
-
-		else -> false
-	}
-
-	private companion object {
-
-		const val KEY_LEAK_CANARY = "leak_canary"
-		const val KEY_WORK_INSPECTOR = "work_inspector"
-		const val KEY_TEST_PARSER = "test_parser"
-	}
-}
--- a/app/src/debug/res/drawable-anydpi-v24/ic_bug.xml
+++ b/app/src/debug/res/drawable-anydpi-v24/ic_bug.xml
@@ -1,15 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24"
-    android:tint="#FFFFFF">
-  <group android:scaleX="0.98150784"
-      android:scaleY="0.98150784"
-      android:translateX="0.22190611"
-      android:translateY="-0.2688478">
-    <path
-        android:fillColor="@android:color/white"
-        android:pathData="M20,8h-2.81c-0.45,-0.78 -1.07,-1.45 -1.82,-1.96L17,4.41 15.59,3l-2.17,2.17C12.96,5.06 12.49,5 12,5c-0.49,0 -0.96,0.06 -1.41,0.17L8.41,3 7,4.41l1.62,1.63C7.88,6.55 7.26,7.22 6.81,8L4,8v2h2.09c-0.05,0.33 -0.09,0.66 -0.09,1v1L4,12v2h2v1c0,0.34 0.04,0.67 0.09,1L4,16v2h2.81c1.04,1.79 2.97,3 5.19,3s4.15,-1.21 5.19,-3L20,18v-2h-2.09c0.05,-0.33 0.09,-0.66 0.09,-1v-1h2v-2h-2v-1c0,-0.34 -0.04,-0.67 -0.09,-1L20,10L20,8zM14,16h-4v-2h4v2zM14,12h-4v-2h4v2z"/>
-  </group>
-</vector>
--- a/app/src/debug/res/drawable-hdpi/ic_bug.png
+++ b/app/src/debug/res/drawable-hdpi/ic_bug.png
--- a/app/src/debug/res/drawable-mdpi/ic_bug.png
+++ b/app/src/debug/res/drawable-mdpi/ic_bug.png
--- a/app/src/debug/res/drawable-xhdpi/ic_bug.png
+++ b/app/src/debug/res/drawable-xhdpi/ic_bug.png
--- a/app/src/debug/res/drawable-xxhdpi/ic_bug.png
+++ b/app/src/debug/res/drawable-xxhdpi/ic_bug.png
--- a/app/src/debug/res/drawable/ic_debug.xml
+++ b/app/src/debug/res/drawable/ic_debug.xml
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<vector
-	xmlns:android="http://schemas.android.com/apk/res/android"
-	android:width="24dp"
-	android:height="24dp"
-	android:tint="?attr/colorControlNormal"
-	android:viewportWidth="24"
-	android:viewportHeight="24">
-	<path
-		android:fillColor="#000"
-		android:pathData="M20,8H17.19C16.74,7.2 16.12,6.5 15.37,6L17,4.41L15.59,3L13.42,5.17C12.96,5.06 12.5,5 12,5C11.5,5 11.05,5.06 10.59,5.17L8.41,3L7,4.41L8.62,6C7.87,6.5 7.26,7.21 6.81,8H4V10H6.09C6.03,10.33 6,10.66 6,11V12H4V14H6V15C6,15.34 6.03,15.67 6.09,16H4V18H6.81C8.47,20.87 12.14,21.84 15,20.18C15.91,19.66 16.67,18.9 17.19,18H20V16H17.91C17.97,15.67 18,15.34 18,15V14H20V12H18V11C18,10.66 17.97,10.33 17.91,10H20V8M16,15A4,4 0 0,1 12,19A4,4 0 0,1 8,15V11A4,4 0 0,1 12,7A4,4 0 0,1 16,11V15M14,10V12H10V10H14M10,14H14V16H10V14Z" />
-</vector>
--- a/app/src/debug/res/drawable/ic_launcher_foreground.xml
+++ b/app/src/debug/res/drawable/ic_launcher_foreground.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="108dp"
+    android:height="108dp"
+    android:viewportWidth="108"
+    android:viewportHeight="108"
+    android:tint="#E6000A">
+  <group android:scaleX="0.40188664"
+      android:scaleY="0.40188664"
+      android:translateX="32.90095"
+      android:translateY="18.7272">
+    <group android:translateY="139.39206">
+      <path android:pathData="M83.796875,-0L105.6875,-0L60.765625,-55.828125L103.09375,-101L82.078125,-101L32.25,-49.1875L32.25,-101L13.53125,-101L13.53125,-0L32.25,-0L32.25,-25.8125L48.234375,-42.265625L83.796875,-0Z"
+          android:fillColor="#E6000A"/>
+    </group>
+  </group>
+</vector>
--- a/app/src/debug/res/mipmap-anydpi-v26/ic_launcher.xml
+++ b/app/src/debug/res/mipmap-anydpi-v26/ic_launcher.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
+    <background android:drawable="@color/ic_launcher_background"/>
+    <foreground android:drawable="@drawable/ic_launcher_foreground"/>
+</adaptive-icon>
--- a/app/src/debug/res/mipmap-anydpi-v26/ic_launcher_round.xml
+++ b/app/src/debug/res/mipmap-anydpi-v26/ic_launcher_round.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
+    <background android:drawable="@color/ic_launcher_background"/>
+    <foreground android:drawable="@drawable/ic_launcher_foreground"/>
+</adaptive-icon>
--- a/app/src/debug/res/mipmap-hdpi/ic_launcher.png
+++ b/app/src/debug/res/mipmap-hdpi/ic_launcher.png
--- a/app/src/debug/res/mipmap-hdpi/ic_launcher_round.png
+++ b/app/src/debug/res/mipmap-hdpi/ic_launcher_round.png
--- a/app/src/debug/res/mipmap-mdpi/ic_launcher.png
+++ b/app/src/debug/res/mipmap-mdpi/ic_launcher.png
--- a/app/src/debug/res/mipmap-mdpi/ic_launcher_round.png
+++ b/app/src/debug/res/mipmap-mdpi/ic_launcher_round.png
--- a/app/src/debug/res/mipmap-xhdpi/ic_launcher.png
+++ b/app/src/debug/res/mipmap-xhdpi/ic_launcher.png
--- a/app/src/debug/res/mipmap-xhdpi/ic_launcher_round.png
+++ b/app/src/debug/res/mipmap-xhdpi/ic_launcher_round.png
--- a/app/src/debug/res/mipmap-xxhdpi/ic_launcher.png
+++ b/app/src/debug/res/mipmap-xxhdpi/ic_launcher.png
--- a/app/src/debug/res/mipmap-xxhdpi/ic_launcher_round.png
+++ b/app/src/debug/res/mipmap-xxhdpi/ic_launcher_round.png
--- a/app/src/debug/res/mipmap-xxxhdpi/ic_launcher.png
+++ b/app/src/debug/res/mipmap-xxxhdpi/ic_launcher.png
--- a/app/src/debug/res/mipmap-xxxhdpi/ic_launcher_round.png
+++ b/app/src/debug/res/mipmap-xxxhdpi/ic_launcher_round.png
--- a/app/src/debug/res/values/bools.xml
+++ b/app/src/debug/res/values/bools.xml
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources xmlns:tools="http://schemas.android.com/tools">
-	<bool name="leak_canary_add_launcher_icon" tools:node="replace">false</bool>
-	<bool name="wi_launcher_icon_enabled" tools:node="replace">false</bool>
-</resources>
--- a/app/src/debug/res/values/constants.xml
+++ b/app/src/debug/res/values/constants.xml
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-	<string name="account_type_sync" translatable="false">org.kotatsu.debug.sync</string>
-	<string name="sync_authority_history" translatable="false">org.koitharu.kotatsu.debug.history</string>
-	<string name="sync_authority_favourites" translatable="false">org.koitharu.kotatsu.debug.favourites</string>
-</resources>
--- a/app/src/debug/res/values/ic_launcher_background.xml
+++ b/app/src/debug/res/values/ic_launcher_background.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <color name="ic_launcher_background">#FFFFFF</color>
+</resources>
--- a/app/src/debug/res/values/strings.xml
+++ b/app/src/debug/res/values/strings.xml
@@ -1,4 +0,0 @@
-<resources>
-	<string name="app_name" translatable="false">Kotatsu Dev</string>
-	<string name="strict_mode">Strict mode</string>
-</resources>
--- a/app/src/debug/res/xml/pref_debug.xml
+++ b/app/src/debug/res/xml/pref_debug.xml
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<androidx.preference.PreferenceScreen
-	xmlns:android="http://schemas.android.com/apk/res/android"
-	xmlns:app="http://schemas.android.com/apk/res-auto">
-
-	<org.koitharu.kotatsu.settings.utils.SplitSwitchPreference
-		android:key="leak_canary"
-		android:persistent="false"
-		android:title="LeakCanary" />
-
-	<Preference
-		android:key="work_inspector"
-		android:persistent="false"
-		android:title="@string/wi_lib_name" />
-
-	<Preference
-		android:key="test_parser"
-		android:persistent="false"
-		android:title="@string/test_parser"
-		app:allowDividerAbove="true" />
-
-
-</androidx.preference.PreferenceScreen>
--- a/app/src/debug/res/xml/pref_root_debug.xml
+++ b/app/src/debug/res/xml/pref_root_debug.xml
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<androidx.preference.PreferenceScreen
-	xmlns:android="http://schemas.android.com/apk/res/android">
-
-	<PreferenceScreen
-		android:fragment="org.koitharu.kotatsu.settings.DebugSettingsFragment"
-		android:icon="@drawable/ic_debug"
-		android:key="debug"
-		android:title="@string/debug" />
-
-</androidx.preference.PreferenceScreen>
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
--- a/app/src/main/assets/isrgrootx1.pem
+++ b/app/src/main/assets/isrgrootx1.pem
@@ -1,31 +0,0 @@
-----BEGIN CERTIFICATE-----
-MIIFazCCA1OgAwIBAgIRAIIQz7DSQONZRGPgu2OCiwAwDQYJKoZIhvcNAQELBQAw
-TzELMAkGA1UEBhMCVVMxKTAnBgNVBAoTIEludGVybmV0IFNlY3VyaXR5IFJlc2Vh
-cmNoIEdyb3VwMRUwEwYDVQQDEwxJU1JHIFJvb3QgWDEwHhcNMTUwNjA0MTEwNDM4
-WhcNMzUwNjA0MTEwNDM4WjBPMQswCQYDVQQGEwJVUzEpMCcGA1UEChMgSW50ZXJu
-ZXQgU2VjdXJpdHkgUmVzZWFyY2ggR3JvdXAxFTATBgNVBAMTDElTUkcgUm9vdCBY
-MTCCAiIwDQYJKoZIhvcNAQEBBQADggIPADCCAgoCggIBAK3oJHP0FDfzm54rVygc
-h77ct984kIxuPOZXoHj3dcKi/vVqbvYATyjb3miGbESTtrFj/RQSa78f0uoxmyF+
-0TM8ukj13Xnfs7j/EvEhmkvBioZxaUpmZmyPfjxwv60pIgbz5MDmgK7iS4+3mX6U
-A5/TR5d8mUgjU+g4rk8Kb4Mu0UlXjIB0ttov0DiNewNwIRt18jA8+o+u3dpjq+sW
-T8KOEUt+zwvo/7V3LvSye0rgTBIlDHCNAymg4VMk7BPZ7hm/ELNKjD+Jo2FR3qyH
-B5T0Y3HsLuJvW5iB4YlcNHlsdu87kGJ55tukmi8mxdAQ4Q7e2RCOFvu396j3x+UC
-B5iPNgiV5+I3lg02dZ77DnKxHZu8A/lJBdiB3QW0KtZB6awBdpUKD9jf1b0SHzUv
-KBds0pjBqAlkd25HN7rOrFleaJ1/ctaJxQZBKT5ZPt0m9STJEadao0xAH0ahmbWn
-OlFuhjuefXKnEgV4We0+UXgVCwOPjdAvBbI+e0ocS3MFEvzG6uBQE3xDk3SzynTn
-jh8BCNAw1FtxNrQHusEwMFxIt4I7mKZ9YIqioymCzLq9gwQbooMDQaHWBfEbwrbw
-qHyGO0aoSCqI3Haadr8faqU9GY/rOPNk3sgrDQoo//fb4hVC1CLQJ13hef4Y53CI
-rU7m2Ys6xt0nUW7/vGT1M0NPAgMBAAGjQjBAMA4GA1UdDwEB/wQEAwIBBjAPBgNV
-HRMBAf8EBTADAQH/MB0GA1UdDgQWBBR5tFnme7bl5AFzgAiIyBpY9umbbjANBgkq
-hkiG9w0BAQsFAAOCAgEAVR9YqbyyqFDQDLHYGmkgJykIrGF1XIpu+ILlaS/V9lZL
-ubhzEFnTIZd+50xx+7LSYK05qAvqFyFWhfFQDlnrzuBZ6brJFe+GnY+EgPbk6ZGQ
-3BebYhtF8GaV0nxvwuo77x/Py9auJ/GpsMiu/X1+mvoiBOv/2X/qkSsisRcOj/KK
-NFtY2PwByVS5uCbMiogziUwthDyC3+6WVwW6LLv3xLfHTjuCvjHIInNzktHCgKQ5
-ORAzI4JMPJ+GslWYHb4phowim57iaztXOoJwTdwJx4nLCgdNbOhdjsnvzqvHu7Ur
-TkXWStAmzOVyyghqpZXjFaH3pO3JLF+l+/+sKAIuvtd7u+Nxe5AW0wdeRlN8NwdC
-jNPElpzVmbUq4JUagEiuTDkHzsxHpFKVK7q4+63SM1N95R1NbdWhscdCb+ZAJzVc
-oyi3B43njTOQ5yOf+1CceWxG1bQVs5ZufpsMljq4Ui0/1lvh+wjChP4kqKOJ2qxq
-4RgqsahDYVvTH9w7jXbyLeiNdd8XM2w9U/t7y0Ff/9yi0GE44Za4rF2LN9d11TPA
-mRGunUHBcnWEvgJBQl9nJEiU0Zsnvgc/ubhPgXRR4Xq37Z0j4r7g1SgEEzwxA57d
-emyPxgcYxn/eR44/KJ4EBs+lVDR3veyJm+kXQ99b21/+jh5Xos1AnX5iItreGCc=
-----END CERTIFICATE-----
--- a/app/src/main/java/org/koitharu/kotatsu/KotatsuApp.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/KotatsuApp.kt
@@ -0,0 +1,125 @@
+package org.koitharu.kotatsu
+
+import android.app.Application
+import androidx.appcompat.app.AppCompatDelegate
+import androidx.room.Room
+import coil.Coil
+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.koin.androidContext
+import org.koin.android.ext.koin.androidLogger
+import org.koin.core.context.startKoin
+import org.koin.dsl.module
+import org.koitharu.kotatsu.core.db.MangaDatabase
+import org.koitharu.kotatsu.core.db.migrations.Migration1To2
+import org.koitharu.kotatsu.core.db.migrations.Migration2To3
+import org.koitharu.kotatsu.core.db.migrations.Migration3To4
+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.UserAgentInterceptor
+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
+
+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()
+		AppCompatDelegate.setCompatVectorFromResourcesEnabled(true)
+		initKoin()
+		initCoil()
+		Thread.setDefaultUncaughtExceptionHandler(AppCrashHandler(applicationContext))
+		if (BuildConfig.DEBUG) {
+			initErrorHandler()
+		}
+		AppCompatDelegate.setDefaultNightMode(AppSettings(this).theme)
+		val widgetUpdater = WidgetUpdater(applicationContext)
+		FavouritesRepository.subscribe(widgetUpdater)
+		HistoryRepository.subscribe(widgetUpdater)
+	}
+
+	private fun initKoin() {
+		startKoin {
+			androidLogger()
+			androidContext(applicationContext)
+			modules(
+				module {
+					factory {
+						okHttp()
+							.cache(CacheUtils.createHttpCache(applicationContext))
+							.build()
+					}
+					single {
+						mangaDb().build()
+					}
+					single {
+						MangaLoaderContext()
+					}
+					factory {
+						AppSettings(applicationContext)
+					}
+					single {
+						PagesCache(applicationContext)
+					}
+				}
+			)
+		}
+	}
+
+	private fun initCoil() {
+		Coil.setDefaultImageLoader(ImageLoader(applicationContext) {
+			okHttpClient {
+				okHttp()
+					.cache(CoilUtils.createDefaultCache(applicationContext))
+					.build()
+			}
+			componentRegistry {
+				add(CbzFetcher())
+			}
+		})
+	}
+
+	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)
+}
--- a/app/src/main/java/org/koitharu/kotatsu/core/db/FavouriteCategoriesDao.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/core/db/FavouriteCategoriesDao.kt
@@ -0,0 +1,23 @@
+package org.koitharu.kotatsu.core.db
+
+import androidx.room.Dao
+import androidx.room.Insert
+import androidx.room.OnConflictStrategy
+import androidx.room.Query
+import org.koitharu.kotatsu.core.db.entity.FavouriteCategoryEntity
+
+@Dao
+abstract class FavouriteCategoriesDao {
+
+	@Query("SELECT category_id,title,created_at FROM favourite_categories ORDER BY :orderBy")
+	abstract suspend fun findAll(orderBy: String): List<FavouriteCategoryEntity>
+
+	@Insert(onConflict = OnConflictStrategy.ABORT)
+	abstract suspend fun insert(category: FavouriteCategoryEntity): Long
+
+	@Query("DELETE FROM favourite_categories WHERE category_id = :id")
+	abstract suspend fun delete(id: Long)
+
+	@Query("UPDATE favourite_categories SET title = :title WHERE category_id = :id")
+	abstract suspend fun update(id: Long, title: String)
+}
--- a/app/src/main/java/org/koitharu/kotatsu/core/db/FavouritesDao.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/core/db/FavouritesDao.kt
@@ -0,0 +1,27 @@
+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 :orderBy LIMIT :limit OFFSET :offset")
+	abstract suspend fun findAll(offset: Int, limit: Int, orderBy: String): 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)
+}
--- a/app/src/main/java/org/koitharu/kotatsu/core/db/HistoryDao.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/core/db/HistoryDao.kt
@@ -0,0 +1,47 @@
+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
+    }
+
+}
--- a/app/src/main/java/org/koitharu/kotatsu/core/db/MangaDao.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/core/db/MangaDao.kt
@@ -0,0 +1,42 @@
+package org.koitharu.kotatsu.core.db
+
+import androidx.room.*
+import org.koitharu.kotatsu.core.db.entity.MangaEntity
+import org.koitharu.kotatsu.core.db.entity.MangaTagsEntity
+import org.koitharu.kotatsu.core.db.entity.MangaWithTags
+import org.koitharu.kotatsu.core.db.entity.TagEntity
+
+@Dao
+abstract class MangaDao {
+
+	@Transaction
+	@Query("SELECT * FROM manga WHERE manga_id = :id")
+	abstract suspend fun find(id: Long): MangaWithTags?
+
+	@Insert(onConflict = OnConflictStrategy.IGNORE)
+	abstract suspend fun insert(manga: MangaEntity): Long
+
+	@Update(onConflict = OnConflictStrategy.IGNORE)
+	abstract suspend fun update(manga: MangaEntity): Int
+
+	@Insert(onConflict = OnConflictStrategy.IGNORE)
+	abstract suspend fun insertTagRelation(tag: MangaTagsEntity): Long
+
+	@Query("DELETE FROM manga_tags WHERE manga_id = :mangaId")
+	abstract suspend fun clearTagRelation(mangaId: Long)
+
+	@Transaction
+	open suspend fun upsert(manga: MangaEntity, tags: Iterable<TagEntity>? = null) {
+		if (update(manga) <= 0) {
+			insert(manga)
+			if (tags != null) {
+				clearTagRelation(manga.id)
+				tags.map {
+					MangaTagsEntity(manga.id, it.id)
+				}.forEach {
+					insertTagRelation(it)
+				}
+			}
+		}
+	}
+}
--- a/app/src/main/java/org/koitharu/kotatsu/core/db/MangaDatabase.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/core/db/MangaDatabase.kt
@@ -0,0 +1,28 @@
+package org.koitharu.kotatsu.core.db
+
+import androidx.room.Database
+import androidx.room.RoomDatabase
+import org.koitharu.kotatsu.core.db.entity.*
+
+@Database(
+	entities = [
+		MangaEntity::class, TagEntity::class, HistoryEntity::class, MangaTagsEntity::class,
+		FavouriteCategoryEntity::class, FavouriteEntity::class, MangaPrefsEntity::class, TrackEntity::class
+	], version = 4
+)
+abstract class MangaDatabase : RoomDatabase() {
+
+	abstract val historyDao: HistoryDao
+
+	abstract val tagsDao: TagsDao
+
+	abstract val mangaDao: MangaDao
+
+	abstract val favouritesDao: FavouritesDao
+
+	abstract val preferencesDao: PreferencesDao
+
+	abstract val favouriteCategoriesDao: FavouriteCategoriesDao
+
+	abstract val tracksDao: TracksDao
+}
--- a/app/src/main/java/org/koitharu/kotatsu/core/db/PreferencesDao.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/core/db/PreferencesDao.kt
@@ -0,0 +1,24 @@
+package org.koitharu.kotatsu.core.db
+
+import androidx.room.*
+import org.koitharu.kotatsu.core.db.entity.MangaPrefsEntity
+
+@Dao
+abstract class PreferencesDao {
+
+	@Query("SELECT * FROM preferences WHERE manga_id = :mangaId")
+	abstract suspend fun find(mangaId: Long): MangaPrefsEntity?
+
+	@Insert(onConflict = OnConflictStrategy.IGNORE)
+	abstract suspend fun insert(pref: MangaPrefsEntity): Long
+
+	@Update
+	abstract suspend fun update(pref: MangaPrefsEntity): Int
+
+	@Transaction
+	open suspend fun upsert(pref: MangaPrefsEntity) {
+		if (update(pref) == 0) {
+			insert(pref)
+		}
+	}
+}
--- a/app/src/main/java/org/koitharu/kotatsu/core/db/TagsDao.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/core/db/TagsDao.kt
@@ -0,0 +1,26 @@
+package org.koitharu.kotatsu.core.db
+
+import androidx.room.*
+import org.koitharu.kotatsu.core.db.entity.TagEntity
+
+@Dao
+interface TagsDao {
+
+	@Query("SELECT * FROM tags")
+	suspend fun getAllTags(): List<TagEntity>
+
+	@Insert(onConflict = OnConflictStrategy.IGNORE)
+	suspend fun insert(tag: TagEntity): Long
+
+	@Update(onConflict = OnConflictStrategy.IGNORE)
+	suspend fun update(tag: TagEntity): Int
+
+	@Transaction
+	suspend fun upsert(tags: Iterable<TagEntity>) {
+		tags.forEach { tag ->
+			if (update(tag) <= 0) {
+				insert(tag)
+			}
+		}
+	}
+}
--- a/app/src/main/java/org/koitharu/kotatsu/core/db/TracksDao.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/core/db/TracksDao.kt
@@ -0,0 +1,35 @@
+package org.koitharu.kotatsu.core.db
+
+import androidx.room.*
+import org.koitharu.kotatsu.core.db.entity.TrackEntity
+
+
+@Dao
+abstract class TracksDao {
+
+	@Query("SELECT * FROM tracks")
+	abstract suspend fun findAll(): List<TrackEntity>
+
+	@Query("SELECT * FROM tracks WHERE manga_id = :mangaId")
+	abstract suspend fun find(mangaId: Long): TrackEntity?
+
+	@Query("DELETE FROM tracks")
+	abstract suspend fun clear()
+
+	@Insert(onConflict = OnConflictStrategy.IGNORE)
+	abstract suspend fun insert(entity: TrackEntity): Long
+
+	@Update
+	abstract suspend fun update(entity: TrackEntity): Int
+
+	@Query("DELETE FROM tracks WHERE manga_id = :mangaId")
+	abstract suspend fun delete(mangaId: Long)
+
+	@Transaction
+	open suspend fun upsert(entity: TrackEntity) {
+		if (update(entity) == 0) {
+			insert(entity)
+		}
+	}
+
+}
--- a/app/src/main/java/org/koitharu/kotatsu/core/db/entity/FavouriteCategoryEntity.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/core/db/entity/FavouriteCategoryEntity.kt
@@ -0,0 +1,22 @@
+package org.koitharu.kotatsu.core.db.entity
+
+import androidx.room.ColumnInfo
+import androidx.room.Entity
+import androidx.room.PrimaryKey
+import org.koitharu.kotatsu.core.model.FavouriteCategory
+import java.util.*
+
+@Entity(tableName = "favourite_categories")
+data class FavouriteCategoryEntity(
+	@PrimaryKey(autoGenerate = true)
+	@ColumnInfo(name = "category_id") val categoryId: Int,
+	@ColumnInfo(name = "created_at") val createdAt: Long,
+	@ColumnInfo(name = "title") val title: String
+) {
+
+	fun toFavouriteCategory(id: Long? = null) = FavouriteCategory(
+		id = id ?: categoryId.toLong(),
+		title = title,
+		createdAt = Date(createdAt)
+	)
+}
--- a/app/src/main/kotlin/org/koitharu/kotatsu/favourites/data/FavouriteEntity.kt
+++ b/app/src/main/kotlin/org/koitharu/kotatsu/favourites/data/FavouriteEntity.kt
@@ -1,15 +1,11 @@
-package org.koitharu.kotatsu.favourites.data
+package org.koitharu.kotatsu.core.db.entity

 import androidx.room.ColumnInfo
 import androidx.room.Entity
 import androidx.room.ForeignKey
-import org.koitharu.kotatsu.core.db.TABLE_FAVOURITES
-import org.koitharu.kotatsu.core.db.entity.MangaEntity

@Entity(
-	tableName = TABLE_FAVOURITES,
-	primaryKeys = ["manga_id", "category_id"],
-	foreignKeys = [
+	tableName = "favourites", primaryKeys = ["manga_id", "category_id"], foreignKeys = [
 		ForeignKey(
 			entity = MangaEntity::class,
 			parentColumns = ["manga_id"],
@@ -27,8 +23,5 @@ import org.koitharu.kotatsu.core.db.entity.MangaEntity
 data class FavouriteEntity(
 	@ColumnInfo(name = "manga_id", index = true) val mangaId: Long,
 	@ColumnInfo(name = "category_id", index = true) val categoryId: Long,
-	@ColumnInfo(name = "sort_key") val sortKey: Int,
-	@ColumnInfo(name = "pinned") val isPinned: Boolean,
-	@ColumnInfo(name = "created_at") val createdAt: Long,
-	@ColumnInfo(name = "deleted_at") val deletedAt: Long,
-)
+	@ColumnInfo(name = "created_at") val createdAt: Long
+)
--- a/app/src/main/kotlin/org/koitharu/kotatsu/favourites/data/FavouriteManga.kt
+++ b/app/src/main/kotlin/org/koitharu/kotatsu/favourites/data/FavouriteManga.kt
@@ -1,13 +1,10 @@
-package org.koitharu.kotatsu.favourites.data
+package org.koitharu.kotatsu.core.db.entity

 import androidx.room.Embedded
 import androidx.room.Junction
 import androidx.room.Relation
-import org.koitharu.kotatsu.core.db.entity.MangaEntity
-import org.koitharu.kotatsu.core.db.entity.MangaTagsEntity
-import org.koitharu.kotatsu.core.db.entity.TagEntity

-class FavouriteManga(
+data class FavouriteManga(
 	@Embedded val favourite: FavouriteEntity,
 	@Relation(
 		parentColumn = "manga_id",
--- a/app/src/main/java/org/koitharu/kotatsu/core/db/entity/HistoryEntity.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/core/db/entity/HistoryEntity.kt
@@ -1,32 +1,37 @@
-package org.koitharu.kotatsu.history.data
+package org.koitharu.kotatsu.core.db.entity

 import androidx.room.ColumnInfo
 import androidx.room.Entity
 import androidx.room.ForeignKey
 import androidx.room.PrimaryKey
-import org.koitharu.kotatsu.core.db.TABLE_HISTORY
-import org.koitharu.kotatsu.core.db.entity.MangaEntity
+import org.koitharu.kotatsu.core.model.MangaHistory
+import java.util.*

@Entity(
-	tableName = TABLE_HISTORY,
-	foreignKeys = [
+	tableName = "history", foreignKeys = [
 		ForeignKey(
 			entity = MangaEntity::class,
 			parentColumns = ["manga_id"],
 			childColumns = ["manga_id"],
-			onDelete = ForeignKey.CASCADE,
-		),
-	],
+			onDelete = ForeignKey.CASCADE
+		)
+	]
 )
 data class HistoryEntity(
 	@PrimaryKey(autoGenerate = false)
 	@ColumnInfo(name = "manga_id") val mangaId: Long,
-	@ColumnInfo(name = "created_at") val createdAt: Long,
+	@ColumnInfo(name = "created_at") val createdAt: Long = System.currentTimeMillis(),
 	@ColumnInfo(name = "updated_at") val updatedAt: Long,
 	@ColumnInfo(name = "chapter_id") val chapterId: Long,
 	@ColumnInfo(name = "page") val page: Int,
-	@ColumnInfo(name = "scroll") val scroll: Float,
-	@ColumnInfo(name = "percent") val percent: Float,
-	@ColumnInfo(name = "deleted_at") val deletedAt: Long,
-	@ColumnInfo(name = "chapters") val chaptersCount: Int,
-)
+	@ColumnInfo(name = "scroll") val scroll: Float
+) {
+
+	fun toMangaHistory() = MangaHistory(
+		createdAt = Date(createdAt),
+		updatedAt = Date(updatedAt),
+		chapterId = chapterId,
+		page = page,
+		scroll = scroll
+	)
+}
--- a/app/src/main/java/org/koitharu/kotatsu/core/db/entity/HistoryWithManga.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/core/db/entity/HistoryWithManga.kt
@@ -1,13 +1,10 @@
-package org.koitharu.kotatsu.history.data
+package org.koitharu.kotatsu.core.db.entity

 import androidx.room.Embedded
 import androidx.room.Junction
 import androidx.room.Relation
-import org.koitharu.kotatsu.core.db.entity.MangaEntity
-import org.koitharu.kotatsu.core.db.entity.MangaTagsEntity
-import org.koitharu.kotatsu.core.db.entity.TagEntity

-class HistoryWithManga(
+data class HistoryWithManga(
 	@Embedded val history: HistoryEntity,
 	@Relation(
 		parentColumn = "manga_id",
@@ -19,5 +16,5 @@ class HistoryWithManga(
 		entityColumn = "tag_id",
 		associateBy = Junction(MangaTagsEntity::class)
 	)
-	val tags: List<TagEntity>,
+	val tags: List<TagEntity>
 )
--- a/app/src/main/java/org/koitharu/kotatsu/core/db/entity/MangaEntity.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/core/db/entity/MangaEntity.kt
@@ -0,0 +1,55 @@
+package org.koitharu.kotatsu.core.db.entity
+
+import androidx.room.ColumnInfo
+import androidx.room.Entity
+import androidx.room.PrimaryKey
+import org.koitharu.kotatsu.core.model.Manga
+import org.koitharu.kotatsu.core.model.MangaSource
+import org.koitharu.kotatsu.core.model.MangaState
+import org.koitharu.kotatsu.core.model.MangaTag
+
+@Entity(tableName = "manga")
+data class MangaEntity(
+	@PrimaryKey(autoGenerate = false)
+	@ColumnInfo(name = "manga_id") val id: Long,
+	@ColumnInfo(name = "title") val title: String,
+	@ColumnInfo(name = "alt_title") val altTitle: String? = null,
+	@ColumnInfo(name = "url") val url: 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,
+	@ColumnInfo(name = "state") val state: String? = null,
+	@ColumnInfo(name = "author") val author: String? = null,
+	@ColumnInfo(name = "source") val source: String
+) {
+
+	fun toManga(tags: Set<MangaTag> = emptySet()) = Manga(
+		id = this.id,
+		title = this.title,
+		altTitle = this.altTitle,
+		state = this.state?.let { MangaState.valueOf(it) },
+		rating = this.rating,
+		url = this.url,
+		coverUrl = this.coverUrl,
+		largeCoverUrl = this.largeCoverUrl,
+		author = this.author,
+		source = MangaSource.valueOf(this.source),
+		tags = tags
+	)
+
+	companion object {
+
+		fun from(manga: Manga) = MangaEntity(
+			id = manga.id,
+			url = manga.url,
+			source = manga.source.name,
+			largeCoverUrl = manga.largeCoverUrl,
+			coverUrl = manga.coverUrl,
+			altTitle = manga.altTitle,
+			rating = manga.rating,
+			state = manga.state?.name,
+			title = manga.title,
+			author = manga.author
+		)
+	}
+}
--- a/app/src/main/kotlin/org/koitharu/kotatsu/local/data/index/LocalMangaIndexEntity.kt
+++ b/app/src/main/kotlin/org/koitharu/kotatsu/local/data/index/LocalMangaIndexEntity.kt
@@ -1,24 +1,21 @@
-package org.koitharu.kotatsu.local.data.index
+package org.koitharu.kotatsu.core.db.entity

 import androidx.room.ColumnInfo
 import androidx.room.Entity
 import androidx.room.ForeignKey
 import androidx.room.PrimaryKey
-import org.koitharu.kotatsu.core.db.entity.MangaEntity

@Entity(
-	tableName = "local_index",
-	foreignKeys = [
+	tableName = "preferences", foreignKeys = [
 		ForeignKey(
 			entity = MangaEntity::class,
 			parentColumns = ["manga_id"],
 			childColumns = ["manga_id"],
-			onDelete = ForeignKey.CASCADE,
-		),
-	],
+			onDelete = ForeignKey.CASCADE
+		)]
 )
-class LocalMangaIndexEntity(
+data class MangaPrefsEntity(
 	@PrimaryKey(autoGenerate = false)
 	@ColumnInfo(name = "manga_id") val mangaId: Long,
-	@ColumnInfo(name = "path") val path: String,
-)
+	@ColumnInfo(name = "mode") val mode: Int
+)
--- a/app/src/main/kotlin/org/koitharu/kotatsu/core/db/entity/MangaTagsEntity.kt
+++ b/app/src/main/kotlin/org/koitharu/kotatsu/core/db/entity/MangaTagsEntity.kt
@@ -3,27 +3,24 @@ package org.koitharu.kotatsu.core.db.entity
 import androidx.room.ColumnInfo
 import androidx.room.Entity
 import androidx.room.ForeignKey
-import org.koitharu.kotatsu.core.db.TABLE_MANGA_TAGS

@Entity(
-	tableName = TABLE_MANGA_TAGS,
-	primaryKeys = ["manga_id", "tag_id"],
-	foreignKeys = [
+	tableName = "manga_tags", primaryKeys = ["manga_id", "tag_id"], foreignKeys = [
 		ForeignKey(
 			entity = MangaEntity::class,
 			parentColumns = ["manga_id"],
 			childColumns = ["manga_id"],
-			onDelete = ForeignKey.CASCADE,
+			onDelete = ForeignKey.CASCADE
 		),
 		ForeignKey(
 			entity = TagEntity::class,
 			parentColumns = ["tag_id"],
 			childColumns = ["tag_id"],
-			onDelete = ForeignKey.CASCADE,
+			onDelete = ForeignKey.CASCADE
 		)
 	]
 )
-class MangaTagsEntity(
+data class MangaTagsEntity(
 	@ColumnInfo(name = "manga_id", index = true) val mangaId: Long,
-	@ColumnInfo(name = "tag_id", index = true) val tagId: Long,
+	@ColumnInfo(name = "tag_id", index = true) val tagId: Long
 )
--- a/app/src/main/kotlin/org/koitharu/kotatsu/core/db/entity/MangaWithTags.kt
+++ b/app/src/main/kotlin/org/koitharu/kotatsu/core/db/entity/MangaWithTags.kt
@@ -11,5 +11,10 @@ data class MangaWithTags(
 		entityColumn = "tag_id",
 		associateBy = Junction(MangaTagsEntity::class)
 	)
-	val tags: List<TagEntity>,
-)
+	val tags: List<TagEntity>
+) {
+
+	fun toManga() = manga.toManga(tags.map {
+		it.toMangaTag()
+	}.toSet())
+}
--- a/app/src/main/java/org/koitharu/kotatsu/core/db/entity/TagEntity.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/core/db/entity/TagEntity.kt
@@ -0,0 +1,34 @@
+package org.koitharu.kotatsu.core.db.entity
+
+import androidx.room.ColumnInfo
+import androidx.room.Entity
+import androidx.room.PrimaryKey
+import org.koitharu.kotatsu.core.model.MangaSource
+import org.koitharu.kotatsu.core.model.MangaTag
+import org.koitharu.kotatsu.utils.ext.longHashCode
+
+@Entity(tableName = "tags")
+data class TagEntity(
+	@PrimaryKey(autoGenerate = false)
+	@ColumnInfo(name = "tag_id") val id: Long,
+	@ColumnInfo(name = "title") val title: String,
+	@ColumnInfo(name = "key") val key: String,
+	@ColumnInfo(name = "source") val source: String
+) {
+
+	fun toMangaTag() = MangaTag(
+		key = this.key,
+		title = this.title,
+		source = MangaSource.valueOf(this.source)
+	)
+
+	companion object {
+
+		fun fromMangaTag(tag: MangaTag) = TagEntity(
+			title = tag.title,
+			key = tag.key,
+			source = tag.source.name,
+			id = "${tag.key}_${tag.source.name}".longHashCode()
+		)
+	}
+}
--- a/app/src/main/java/org/koitharu/kotatsu/core/db/entity/TrackEntity.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/core/db/entity/TrackEntity.kt
@@ -0,0 +1,26 @@
+package org.koitharu.kotatsu.core.db.entity
+
+import androidx.room.ColumnInfo
+import androidx.room.Entity
+import androidx.room.ForeignKey
+import androidx.room.PrimaryKey
+
+@Entity(
+	tableName = "tracks", foreignKeys = [
+		ForeignKey(
+			entity = MangaEntity::class,
+			parentColumns = ["manga_id"],
+			childColumns = ["manga_id"],
+			onDelete = ForeignKey.CASCADE
+		)
+	]
+)
+data class TrackEntity (
+	@PrimaryKey(autoGenerate = false)
+	@ColumnInfo(name = "manga_id") val mangaId: Long,
+	@ColumnInfo(name = "chapters_total") val totalChapters: Int,
+	@ColumnInfo(name = "last_chapter_id") val lastChapterId: Long,
+	@ColumnInfo(name = "chapters_new") val newChapters: Int,
+	@ColumnInfo(name = "last_check") val lastCheck: Long,
+	@ColumnInfo(name = "last_notified_id") val lastNotifiedChapterId: Long
+)
--- a/Show More
+++ b/Show More
				`@@ -0,0 +1 @@`
				`custom: ["https://money.yandex.ru/to/410012543938752"]`