Fix old api compatibility

2020-04-25 21:29:46 +03:00
1131 changed files with 13900 additions and 43772 deletions
--- a/.editorconfig
+++ b/.editorconfig
@@ -1,20 +0,0 @@
-root = true
-
-[*]
-charset = utf-8
-end_of_line = lf
-indent_size = 4
-indent_style = tab
-insert_final_newline = false
-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
-
-[{*.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
@@ -1 +1 @@
-custom: ["https://yoomoney.ru/to/410012543938752"]
+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 troubles with a manga parser or want to propose new manga source, 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,64 +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: I have searched the existing issues and this is a new ticket, **NOT** a duplicate or related to another open issue.
-                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: I have searched the existing issues and this is a new ticket, **NOT** a duplicate or related to another open issue.
-                required: true
--- 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/.gitignore
+++ b/.gitignore
@@ -3,17 +3,10 @@
 /local.properties
 /.idea/caches
 /.idea/libraries
-/.idea/dictionaries
 /.idea/modules.xml
-/.idea/misc.xml
-/.idea/discord.xml
 /.idea/workspace.xml
 /.idea/navEditor.xml
 /.idea/assetWizardSettings.xml
-/.idea/kotlinScripting.xml
-/.idea/deploymentTargetDropDown.xml
-/.idea/androidTestResultsUserPreferences.xml
-/.idea/render.experimental.xml
 .DS_Store
 /build
 /captures
--- a/.idea/codeStyles/Project.xml
+++ b/.idea/codeStyles/Project.xml
@@ -23,7 +23,6 @@
      </option>
    </AndroidXmlCodeStyleSettings>
    <JetCodeStyleSettings>
-      <option name="ALLOW_TRAILING_COMMA" value="true" />
      <option name="CODE_STYLE_DEFAULTS" value="KOTLIN_OFFICIAL" />
    </JetCodeStyleSettings>
    <codeStyleSettings language="CMake">
--- a/.idea/compiler.xml
+++ b/.idea/compiler.xml
@@ -1,6 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
  <component name="CompilerConfiguration">
-    <bytecodeTargetLevel target="11" />
+    <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,18 @@
  <component name="GradleSettings">
    <option name="linkedExternalProjectsSettings">
      <GradleProjectSettings>
-        <option name="testRunner" value="GRADLE" />
+        <option name="testRunner" value="PLATFORM" />
        <option name="distributionType" value="DEFAULT_WRAPPED" />
        <option name="externalProjectPath" value="$PROJECT_DIR$" />
-        <option name="gradleJvm" value="Embedded JDK" />
+        <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>
--- 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
@@ -1,14 +1,6 @@
 <component name="InspectionProjectProfileManager">
  <profile version="1.0">
    <option name="myName" value="Project Default" />
-    <inspection_tool class="BooleanLiteralArgument" enabled="false" level="WEAK WARNING" enabled_by_default="false" />
-    <inspection_tool class="Destructure" enabled="true" level="INFO" enabled_by_default="true" />
-    <inspection_tool class="KeySetIterationMayUseEntrySet" enabled="true" level="WARNING" enabled_by_default="true" />
-    <inspection_tool class="KotlinFunctionArgumentsHelper" enabled="true" level="INFORMATION" enabled_by_default="true">
-      <option name="withoutDefaultValues" value="true" />
-    </inspection_tool>
-    <inspection_tool class="ReplaceCollectionCountWithSize" enabled="true" level="WEAK WARNING" enabled_by_default="true" />
    <inspection_tool class="TrailingComma" enabled="true" level="INFORMATION" enabled_by_default="true" />
-    <inspection_tool class="ZeroLengthArrayInitialization" enabled="true" level="WARNING" enabled_by_default="true" />
  </profile>
 </component>
--- 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/kotlinc.xml
+++ b/.idea/kotlinc.xml
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="Kotlin2JvmCompilerArguments">
-    <option name="jvmTarget" value="1.8" />
-  </component>
-</project>
--- a/.idea/ktlint.xml
+++ b/.idea/ktlint.xml
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="KtlintProjectConfiguration">
-    <androidMode>true</androidMode>
-    <treatAsErrors>false</treatAsErrors>
-  </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,14 +1,5 @@
 <?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="$PROJECT_DIR$" vcs="Git" />
  </component>
--- 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/README.md
+++ b/README.md
@@ -1,57 +1,40 @@
-# Kotatsu
+# Kotatsu 

 Kotatsu is a free and open source manga reader for Android.

-![Android 5.0](https://img.shields.io/badge/android-5.0+-brightgreen) ![Kotlin](https://img.shields.io/github/languages/top/KotatsuApp/Kotatsu) ![License](https://img.shields.io/github/license/KotatsuApp/Kotatsu) [![weblate](https://hosted.weblate.org/widgets/kotatsu/-/strings/svg-badge.svg)](https://hosted.weblate.org/engage/kotatsu/) [![4pda](https://img.shields.io/badge/discuss-4pda-2982CC)](http://4pda.ru/forum/index.php?showtopic=697669) [![Discord](https://img.shields.io/discord/898363402467045416?color=5865f2&label=discord)](https://discord.gg/NNJ5RgVBC5)
+![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

-[<img src="https://fdroid.gitlab.io/artwork/badge/get-it-on.png"
-alt="Get it on F-Droid"
-height="80">](https://f-droid.org/packages/org.koitharu.kotatsu)
-
-Download APK directly from GitHub:
-
- **[Latest release](https://github.com/KotatsuApp/Kotatsu/releases/latest)**
+Latest release: [get here](https://github.com/nv95/Kotatsu/releases/latest)

 ### Main Features

 * Online manga catalogues
-* Search manga by name and genres
-* Reading history and bookmarks
-* Favourites organized by user-defined categories
-* Downloading manga and reading it offline. Third-party CBZ archives also supported
-* Tablet-optimized material design UI
+* 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 with updates feed
-* Shikimori integration (manga tracking)
-* Password/fingerprint protect access to the app
+* Notifications about new chapters

 ### Screenshots

-| ![Screenshot_20200226-210337](https://github.com/KotatsuApp/Kotatsu/raw/devel/metadata/en-US/images/phoneScreenshots/1.png) | ![](https://github.com/KotatsuApp/Kotatsu/raw/devel/metadata/en-US/images/phoneScreenshots/2.png)                           | ![Screenshot_20200226-210232](https://github.com/KotatsuApp/Kotatsu/raw/devel/metadata/en-US/images/phoneScreenshots/3.png) |
-|-----------------------------------------------------------------------------------------------------------------------------|-----------------------------------------------------------------------------------------------------------------------------|-----------------------------------------------------------------------------------------------------------------------------|
-| ![Screenshot_20200226-210405](https://github.com/KotatsuApp/Kotatsu/raw/devel/metadata/en-US/images/phoneScreenshots/4.png) | ![Screenshot_20200226-210151](https://github.com/KotatsuApp/Kotatsu/raw/devel/metadata/en-US/images/phoneScreenshots/5.png) | ![Screenshot_20200226-210223](https://github.com/KotatsuApp/Kotatsu/raw/devel/metadata/en-US/images/phoneScreenshots/6.png) |
-
-| ![](https://github.com/KotatsuApp/Kotatsu/raw/devel/metadata/en-US/images/tenInchScreenshots/1.png) | ![](https://github.com/KotatsuApp/Kotatsu/raw/devel/metadata/en-US/images/tenInchScreenshots/2.png) |
-|-----------------------------------------------------------------------------------------------------|-----------------------------------------------------------------------------------------------------|
-
-### Localization
-
-[<img src="https://hosted.weblate.org/widgets/kotatsu/-/287x66-white.png" alt="Translation status">](https://hosted.weblate.org/engage/kotatsu/)
-
-Kotatsu is localized in a number of different languages, 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/)
+| ![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.  

-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.
+### Disclaimer

-### DMCA disclaimer
-
-The developers of this application does not have any affiliation with the content available in the app.
-It is collecting from the sources freely available through any web browser.
+The developers of this application does not have any affiliation with the content providers available.
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -1,142 +1,101 @@
-plugins {
-	id 'com.android.application'
-	id 'kotlin-android'
-	id 'kotlin-kapt'
-	id 'kotlin-parcelize'
-}
+apply plugin: 'com.android.application'
+apply plugin: 'kotlin-android'
+apply plugin: 'kotlin-android-extensions'
+apply plugin: 'kotlin-kapt'
+
+def gitCommits = 'git rev-list --count HEAD'.execute([], rootDir).text.trim().toInteger()
+def gitBranch = 'git branch --show-current'.execute([], rootDir).text.trim()

 android {
-	compileSdkVersion 32
-	buildToolsVersion '32.0.0'
-	namespace 'org.koitharu.kotatsu'
+	compileSdkVersion 29
+	buildToolsVersion '29.0.3'

 	defaultConfig {
 		applicationId 'org.koitharu.kotatsu'
-		minSdkVersion 21
-		targetSdkVersion 32
-		versionCode 423
-		versionName '3.4.11'
-		generatedDensities = []
-		testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
+		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()
+				arg('room.schemaLocation', "$projectDir/schemas".toString())
 			}
 		}
-
-		// define this values in your local.properties file
-		buildConfigField 'String', 'SHIKIMORI_CLIENT_ID', "\"${localProperty('shikimori.clientId')}\""
-		buildConfigField 'String', 'SHIKIMORI_CLIENT_SECRET', "\"${localProperty('shikimori.clientSecret')}\""
-	}
-	buildTypes {
-		debug {
-			applicationIdSuffix = '.debug'
-		}
-		release {
-			multiDexEnabled false
-			minifyEnabled true
-			shrinkResources true
-			proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
-		}
-	}
-	buildFeatures {
-		viewBinding true
-	}
-	sourceSets {
-		androidTest.assets.srcDirs += files("$projectDir/schemas".toString())
 	}
+	archivesBaseName = "kotatsu_${gitCommits}"
 	compileOptions {
 		sourceCompatibility JavaVersion.VERSION_1_8
 		targetCompatibility JavaVersion.VERSION_1_8
 	}
 	kotlinOptions {
 		jvmTarget = JavaVersion.VERSION_1_8.toString()
-		freeCompilerArgs += [
-			'-opt-in=kotlinx.coroutines.ExperimentalCoroutinesApi',
-			'-opt-in=kotlinx.coroutines.FlowPreview',
-			'-opt-in=kotlin.contracts.ExperimentalContracts',
-			'-opt-in=coil.annotation.ExperimentalCoilApi',
-		]
 	}
-	lint {
+	buildTypes {
+		debug {
+			applicationIdSuffix = '.debug'
+		}
+		release {
+			minifyEnabled true
+			shrinkResources true
+			proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
+		}
+	}
+	lintOptions {
+		disable 'MissingTranslation'
 		abortOnError false
-		disable 'MissingTranslation', 'PrivateResource', 'NotifyDataSetChanged'
 	}
 	testOptions {
-		unitTests.includeAndroidResources true
-		unitTests.returnDefaultValues false
-		kotlinOptions {
-			freeCompilerArgs += ['-opt-in=org.koitharu.kotatsu.parsers.InternalParsersApi']
-		}
+		unitTests.includeAndroidResources = true
+		unitTests.returnDefaultValues = true
 	}
 }
-afterEvaluate {
-	compileDebugKotlin {
-		kotlinOptions {
-			freeCompilerArgs += ['-opt-in=org.koitharu.kotatsu.parsers.InternalParsersApi']
-		}
-	}
+androidExtensions {
+	experimental = true
 }
 dependencies {
-	implementation('com.github.KotatsuApp:kotatsu-parsers:f112a06ab6') {
-		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'

-	implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-android:1.6.4'
+	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 'androidx.core:core-ktx:1.8.0'
-	implementation 'androidx.activity:activity-ktx:1.5.1'
-	implementation 'androidx.fragment:fragment-ktx:1.5.2'
-	implementation 'androidx.lifecycle:lifecycle-viewmodel-ktx:2.5.1'
-	implementation 'androidx.lifecycle:lifecycle-livedata-ktx:2.5.1'
-	implementation 'androidx.lifecycle:lifecycle-service:2.5.1'
-	implementation 'androidx.lifecycle:lifecycle-process:2.5.1'
-	implementation 'androidx.constraintlayout:constraintlayout:2.1.4'
-	implementation 'androidx.swiperefreshlayout:swiperefreshlayout:1.1.0'
-	implementation 'androidx.recyclerview:recyclerview:1.2.1'
-	implementation 'androidx.viewpager2:viewpager2:1.1.0-beta01'
-	implementation 'androidx.preference:preference-ktx:1.2.0'
-	implementation 'androidx.work:work-runtime-ktx:2.7.1'
-	implementation 'androidx.biometric:biometric-ktx:1.2.0-alpha04'
-	implementation 'com.google.android.material:material:1.7.0-beta01'
-	//noinspection LifecycleAnnotationProcessorWithJava8
-	kapt 'androidx.lifecycle:lifecycle-compiler:2.5.1'
+	implementation 'androidx.room:room-runtime:2.2.5'
+	implementation 'androidx.room:room-ktx:2.2.5'
+	kapt 'androidx.room:room-compiler:2.2.5'

-	implementation 'androidx.room:room-runtime:2.4.3'
-	implementation 'androidx.room:room-ktx:2.4.3'
-	kapt 'androidx.room:room-compiler:2.4.3'
+	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 'com.squareup.okhttp3:okhttp:4.10.0'
-	implementation 'com.squareup.okhttp3:okhttp-dnsoverhttps:4.9.3'
-	implementation 'com.squareup.okio:okio:3.2.0'
+	implementation 'com.squareup.okhttp3:okhttp:3.12.10'
+	implementation 'com.squareup.okio:okio:2.5.0'
+	implementation 'org.jsoup:jsoup:1.13.1'

-	implementation 'com.hannesdorfmann:adapterdelegates4-kotlin-dsl:4.3.2'
-	implementation 'com.hannesdorfmann:adapterdelegates4-kotlin-dsl-viewbinding:4.3.2'
+	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 'io.insert-koin:koin-android:3.2.0'
-	implementation 'io.coil-kt:coil-base:2.2.0'
-	implementation 'com.davemorrissey.labs:subsampling-scale-image-view-androidx:3.10.0'
-	implementation 'com.github.solkin:disk-lru-cache:1.4'
+	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 'ch.acra:acra-mail:5.9.5'
-	implementation 'ch.acra:acra-dialog:5.9.5'
-
-	debugImplementation 'com.squareup.leakcanary:leakcanary-android:2.9.1'
-
-	testImplementation 'junit:junit:4.13.2'
-	testImplementation 'org.json:json:20220320'
-	testImplementation 'org.jetbrains.kotlinx:kotlinx-coroutines-test:1.6.4'
-
-	androidTestImplementation 'androidx.test:runner:1.4.0'
-	androidTestImplementation 'androidx.test:rules:1.4.0'
-	androidTestImplementation 'androidx.test:core-ktx:1.4.0'
-	androidTestImplementation 'androidx.test.ext:junit-ktx:1.1.3'
-
-	androidTestImplementation 'org.jetbrains.kotlinx:kotlinx-coroutines-test:1.6.4'
-	androidTestImplementation 'io.insert-koin:koin-test:3.2.0'
-	androidTestImplementation 'io.insert-koin:koin-test-junit4:3.2.0'
-
-	androidTestImplementation 'androidx.room:room-testing:2.4.3'
-	androidTestImplementation 'com.squareup.moshi:moshi-kotlin:1.13.0'
+	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,8 +5,8 @@
 	public static void checkReturnedValueIsNotNull(...);
 	public static void checkFieldIsNotNull(...);
 	public static void checkParameterIsNotNull(...);
-	public static void checkNotNullParameter(...);
 }
-keep public class ** extends org.koitharu.kotatsu.base.ui.BaseFragment
 -keep class org.koitharu.kotatsu.core.db.entity.* { *; }
-dontwarn okhttp3.internal.platform.ConscryptPlatform
+-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,8 +0,0 @@
-{
-	"id": 4,
-	"title": "Read later",
-	"sortKey": 1,
-	"order": "NEWEST",
-	"createdAt": 1335906000000,
-	"isTrackingEnabled": true
-}
--- a/app/src/androidTest/assets/manga/bad_ids.json
+++ b/app/src/androidTest/assets/manga/bad_ids.json
@@ -1,163 +0,0 @@
-{
-	"id": -2096681732556647985,
-	"title": "Странствия Эманон",
-	"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",
-	"largeCoverUrl": "https://staticrm.rmr.rocks/uploads/pics/01/12/559_o.jpg",
-	"description": "Продолжение истории о загадочной девушке по имени Эманон, которая помнит всё, что происходило на Земле за последние три миллиарда лет. \n<br>Начало истории читайте в \"Воспоминаниях Эманон\". \n<div class=\"clearfix\"></div>",
-	"chapters": [
-		{
-			"id": 1552943969433540704,
-			"name": "1 - 1",
-			"number": 1,
-			"url": "/stranstviia_emanon/vol1/1",
-			"scanlator": "Sad-Robot",
-			"uploadDate": 1342731600000,
-			"source": "READMANGA_RU"
-		},
-		{
-			"id": 1552943969433540705,
-			"name": "1 - 2",
-			"number": 2,
-			"url": "/stranstviia_emanon/vol1/2",
-			"scanlator": "Sad-Robot",
-			"uploadDate": 1342731600000,
-			"source": "READMANGA_RU"
-		},
-		{
-			"id": 1552943969433540706,
-			"name": "1 - 3",
-			"number": 3,
-			"url": "/stranstviia_emanon/vol1/3",
-			"scanlator": "Sad-Robot",
-			"uploadDate": 1342731600000,
-			"source": "READMANGA_RU"
-		},
-		{
-			"id": 1552943969433540707,
-			"name": "1 - 4",
-			"number": 4,
-			"url": "/stranstviia_emanon/vol1/4",
-			"scanlator": "Sad-Robot",
-			"uploadDate": 1342731600000,
-			"source": "READMANGA_RU"
-		},
-		{
-			"id": 1552943969433540708,
-			"name": "1 - 5",
-			"number": 5,
-			"url": "/stranstviia_emanon/vol1/5",
-			"scanlator": "Sad-Robot",
-			"uploadDate": 1342731600000,
-			"source": "READMANGA_RU"
-		},
-		{
-			"id": 1552943969433541665,
-			"name": "2 - 1",
-			"number": 6,
-			"url": "/stranstviia_emanon/vol2/1",
-			"scanlator": "Sup!",
-			"uploadDate": 1415570400000,
-			"source": "READMANGA_RU"
-		},
-		{
-			"id": 1552943969433541666,
-			"name": "2 - 2",
-			"number": 7,
-			"url": "/stranstviia_emanon/vol2/2",
-			"scanlator": "Sup!",
-			"uploadDate": 1419976800000,
-			"source": "READMANGA_RU"
-		},
-		{
-			"id": 1552943969433541667,
-			"name": "2 - 3",
-			"number": 8,
-			"url": "/stranstviia_emanon/vol2/3",
-			"scanlator": "Sup!",
-			"uploadDate": 1427922000000,
-			"source": "READMANGA_RU"
-		},
-		{
-			"id": 1552943969433541668,
-			"name": "2 - 4",
-			"number": 9,
-			"url": "/stranstviia_emanon/vol2/4",
-			"scanlator": "Sup!",
-			"uploadDate": 1436907600000,
-			"source": "READMANGA_RU"
-		},
-		{
-			"id": 1552943969433541669,
-			"name": "2 - 5",
-			"number": 10,
-			"url": "/stranstviia_emanon/vol2/5",
-			"scanlator": "Sup!",
-			"uploadDate": 1446674400000,
-			"source": "READMANGA_RU"
-		},
-		{
-			"id": 1552943969433541670,
-			"name": "2 - 6",
-			"number": 11,
-			"url": "/stranstviia_emanon/vol2/6",
-			"scanlator": "Sup!",
-			"uploadDate": 1451512800000,
-			"source": "READMANGA_RU"
-		},
-		{
-			"id": 1552943969433542626,
-			"name": "3 - 1",
-			"number": 12,
-			"url": "/stranstviia_emanon/vol3/1",
-			"scanlator": "Sup!",
-			"uploadDate": 1461618000000,
-			"source": "READMANGA_RU"
-		},
-		{
-			"id": 1552943969433542627,
-			"name": "3 - 2",
-			"number": 13,
-			"url": "/stranstviia_emanon/vol3/2",
-			"scanlator": "Sup!",
-			"uploadDate": 1461618000000,
-			"source": "READMANGA_RU"
-		},
-		{
-			"id": 1552943969433542628,
-			"name": "3 - 3",
-			"number": 14,
-			"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,36 +0,0 @@
-{
-	"id": -2096681732556647985,
-	"title": "Странствия Эманон",
-	"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",
-	"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,136 +0,0 @@
-{
-	"id": -2096681732556647985,
-	"title": "Странствия Эманон",
-	"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",
-	"largeCoverUrl": "https://staticrm.rmr.rocks/uploads/pics/01/12/559_o.jpg",
-	"description": "Продолжение истории о загадочной девушке по имени Эманон, которая помнит всё, что происходило на Земле за последние три миллиарда лет. \n<br>Начало истории читайте в \"Воспоминаниях Эманон\". \n<div class=\"clearfix\"></div>",
-	"chapters": [
-		{
-			"id": 3552943969433540704,
-			"name": "1 - 1",
-			"number": 1,
-			"url": "/stranstviia_emanon/vol1/1",
-			"scanlator": "Sad-Robot",
-			"uploadDate": 1342731600000,
-			"source": "READMANGA_RU"
-		},
-		{
-			"id": 3552943969433540705,
-			"name": "1 - 2",
-			"number": 2,
-			"url": "/stranstviia_emanon/vol1/2",
-			"scanlator": "Sad-Robot",
-			"uploadDate": 1342731600000,
-			"source": "READMANGA_RU"
-		},
-		{
-			"id": 3552943969433540706,
-			"name": "1 - 3",
-			"number": 3,
-			"url": "/stranstviia_emanon/vol1/3",
-			"scanlator": "Sad-Robot",
-			"uploadDate": 1342731600000,
-			"source": "READMANGA_RU"
-		},
-		{
-			"id": 3552943969433540707,
-			"name": "1 - 4",
-			"number": 4,
-			"url": "/stranstviia_emanon/vol1/4",
-			"scanlator": "Sad-Robot",
-			"uploadDate": 1342731600000,
-			"source": "READMANGA_RU"
-		},
-		{
-			"id": 3552943969433540708,
-			"name": "1 - 5",
-			"number": 5,
-			"url": "/stranstviia_emanon/vol1/5",
-			"scanlator": "Sad-Robot",
-			"uploadDate": 1342731600000,
-			"source": "READMANGA_RU"
-		},
-		{
-			"id": 3552943969433541665,
-			"name": "2 - 1",
-			"number": 6,
-			"url": "/stranstviia_emanon/vol2/1",
-			"scanlator": "Sup!",
-			"uploadDate": 1415570400000,
-			"source": "READMANGA_RU"
-		},
-		{
-			"id": 3552943969433541666,
-			"name": "2 - 2",
-			"number": 7,
-			"url": "/stranstviia_emanon/vol2/2",
-			"scanlator": "Sup!",
-			"uploadDate": 1419976800000,
-			"source": "READMANGA_RU"
-		},
-		{
-			"id": 3552943969433541667,
-			"name": "2 - 3",
-			"number": 8,
-			"url": "/stranstviia_emanon/vol2/3",
-			"scanlator": "Sup!",
-			"uploadDate": 1427922000000,
-			"source": "READMANGA_RU"
-		},
-		{
-			"id": 3552943969433541668,
-			"name": "2 - 4",
-			"number": 9,
-			"url": "/stranstviia_emanon/vol2/4",
-			"scanlator": "Sup!",
-			"uploadDate": 1436907600000,
-			"source": "READMANGA_RU"
-		},
-		{
-			"id": 3552943969433541669,
-			"name": "2 - 5",
-			"number": 10,
-			"url": "/stranstviia_emanon/vol2/5",
-			"scanlator": "Sup!",
-			"uploadDate": 1446674400000,
-			"source": "READMANGA_RU"
-		},
-		{
-			"id": 3552943969433541670,
-			"name": "2 - 6",
-			"number": 11,
-			"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,163 +0,0 @@
-{
-	"id": -2096681732556647985,
-	"title": "Странствия Эманон",
-	"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",
-	"largeCoverUrl": "https://staticrm.rmr.rocks/uploads/pics/01/12/559_o.jpg",
-	"description": "Продолжение истории о загадочной девушке по имени Эманон, которая помнит всё, что происходило на Земле за последние три миллиарда лет. \n<br>Начало истории читайте в \"Воспоминаниях Эманон\". \n<div class=\"clearfix\"></div>",
-	"chapters": [
-		{
-			"id": 3552943969433540704,
-			"name": "1 - 1",
-			"number": 1,
-			"url": "/stranstviia_emanon/vol1/1",
-			"scanlator": "Sad-Robot",
-			"uploadDate": 1342731600000,
-			"source": "READMANGA_RU"
-		},
-		{
-			"id": 3552943969433540705,
-			"name": "1 - 2",
-			"number": 2,
-			"url": "/stranstviia_emanon/vol1/2",
-			"scanlator": "Sad-Robot",
-			"uploadDate": 1342731600000,
-			"source": "READMANGA_RU"
-		},
-		{
-			"id": 3552943969433540706,
-			"name": "1 - 3",
-			"number": 3,
-			"url": "/stranstviia_emanon/vol1/3",
-			"scanlator": "Sad-Robot",
-			"uploadDate": 1342731600000,
-			"source": "READMANGA_RU"
-		},
-		{
-			"id": 3552943969433540707,
-			"name": "1 - 4",
-			"number": 4,
-			"url": "/stranstviia_emanon/vol1/4",
-			"scanlator": "Sad-Robot",
-			"uploadDate": 1342731600000,
-			"source": "READMANGA_RU"
-		},
-		{
-			"id": 3552943969433540708,
-			"name": "1 - 5",
-			"number": 5,
-			"url": "/stranstviia_emanon/vol1/5",
-			"scanlator": "Sad-Robot",
-			"uploadDate": 1342731600000,
-			"source": "READMANGA_RU"
-		},
-		{
-			"id": 3552943969433541665,
-			"name": "2 - 1",
-			"number": 6,
-			"url": "/stranstviia_emanon/vol2/1",
-			"scanlator": "Sup!",
-			"uploadDate": 1415570400000,
-			"source": "READMANGA_RU"
-		},
-		{
-			"id": 3552943969433541666,
-			"name": "2 - 2",
-			"number": 7,
-			"url": "/stranstviia_emanon/vol2/2",
-			"scanlator": "Sup!",
-			"uploadDate": 1419976800000,
-			"source": "READMANGA_RU"
-		},
-		{
-			"id": 3552943969433541667,
-			"name": "2 - 3",
-			"number": 8,
-			"url": "/stranstviia_emanon/vol2/3",
-			"scanlator": "Sup!",
-			"uploadDate": 1427922000000,
-			"source": "READMANGA_RU"
-		},
-		{
-			"id": 3552943969433541668,
-			"name": "2 - 4",
-			"number": 9,
-			"url": "/stranstviia_emanon/vol2/4",
-			"scanlator": "Sup!",
-			"uploadDate": 1436907600000,
-			"source": "READMANGA_RU"
-		},
-		{
-			"id": 3552943969433541669,
-			"name": "2 - 5",
-			"number": 10,
-			"url": "/stranstviia_emanon/vol2/5",
-			"scanlator": "Sup!",
-			"uploadDate": 1446674400000,
-			"source": "READMANGA_RU"
-		},
-		{
-			"id": 3552943969433541670,
-			"name": "2 - 6",
-			"number": 11,
-			"url": "/stranstviia_emanon/vol2/6",
-			"scanlator": "Sup!",
-			"uploadDate": 1451512800000,
-			"source": "READMANGA_RU"
-		},
-		{
-			"id": 3552943969433542626,
-			"name": "3 - 1",
-			"number": 12,
-			"url": "/stranstviia_emanon/vol3/1",
-			"scanlator": "Sup!",
-			"uploadDate": 1461618000000,
-			"source": "READMANGA_RU"
-		},
-		{
-			"id": 3552943969433542627,
-			"name": "3 - 2",
-			"number": 13,
-			"url": "/stranstviia_emanon/vol3/2",
-			"scanlator": "Sup!",
-			"uploadDate": 1461618000000,
-			"source": "READMANGA_RU"
-		},
-		{
-			"id": 3552943969433542628,
-			"name": "3 - 3",
-			"number": 14,
-			"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,35 +0,0 @@
-{
-	"id": -2096681732556647985,
-	"title": "Странствия Эманон",
-	"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",
-	"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,154 +0,0 @@
-{
-	"id": -2096681732556647985,
-	"title": "Странствия Эманон",
-	"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",
-	"largeCoverUrl": "https://staticrm.rmr.rocks/uploads/pics/01/12/559_o.jpg",
-	"description": "Продолжение истории о загадочной девушке по имени Эманон, которая помнит всё, что происходило на Земле за последние три миллиарда лет. \n<br>Начало истории читайте в \"Воспоминаниях Эманон\". \n<div class=\"clearfix\"></div>",
-	"chapters": [
-		{
-			"id": 3552943969433540704,
-			"name": "1 - 1",
-			"number": 1,
-			"url": "/stranstviia_emanon/vol1/1",
-			"scanlator": "Sad-Robot",
-			"uploadDate": 1342731600000,
-			"source": "READMANGA_RU"
-		},
-		{
-			"id": 3552943969433540705,
-			"name": "1 - 2",
-			"number": 2,
-			"url": "/stranstviia_emanon/vol1/2",
-			"scanlator": "Sad-Robot",
-			"uploadDate": 1342731600000,
-			"source": "READMANGA_RU"
-		},
-		{
-			"id": 3552943969433540706,
-			"name": "1 - 3",
-			"number": 3,
-			"url": "/stranstviia_emanon/vol1/3",
-			"scanlator": "Sad-Robot",
-			"uploadDate": 1342731600000,
-			"source": "READMANGA_RU"
-		},
-		{
-			"id": 3552943969433540707,
-			"name": "1 - 4",
-			"number": 4,
-			"url": "/stranstviia_emanon/vol1/4",
-			"scanlator": "Sad-Robot",
-			"uploadDate": 1342731600000,
-			"source": "READMANGA_RU"
-		},
-		{
-			"id": 3552943969433540708,
-			"name": "1 - 5",
-			"number": 5,
-			"url": "/stranstviia_emanon/vol1/5",
-			"scanlator": "Sad-Robot",
-			"uploadDate": 1342731600000,
-			"source": "READMANGA_RU"
-		},
-		{
-			"id": 3552943969433541666,
-			"name": "2 - 2",
-			"number": 7,
-			"url": "/stranstviia_emanon/vol2/2",
-			"scanlator": "Sup!",
-			"uploadDate": 1419976800000,
-			"source": "READMANGA_RU"
-		},
-		{
-			"id": 3552943969433541667,
-			"name": "2 - 3",
-			"number": 8,
-			"url": "/stranstviia_emanon/vol2/3",
-			"scanlator": "Sup!",
-			"uploadDate": 1427922000000,
-			"source": "READMANGA_RU"
-		},
-		{
-			"id": 3552943969433541668,
-			"name": "2 - 4",
-			"number": 9,
-			"url": "/stranstviia_emanon/vol2/4",
-			"scanlator": "Sup!",
-			"uploadDate": 1436907600000,
-			"source": "READMANGA_RU"
-		},
-		{
-			"id": 3552943969433541669,
-			"name": "2 - 5",
-			"number": 10,
-			"url": "/stranstviia_emanon/vol2/5",
-			"scanlator": "Sup!",
-			"uploadDate": 1446674400000,
-			"source": "READMANGA_RU"
-		},
-		{
-			"id": 3552943969433541670,
-			"name": "2 - 6",
-			"number": 11,
-			"url": "/stranstviia_emanon/vol2/6",
-			"scanlator": "Sup!",
-			"uploadDate": 1451512800000,
-			"source": "READMANGA_RU"
-		},
-		{
-			"id": 3552943969433542626,
-			"name": "3 - 1",
-			"number": 12,
-			"url": "/stranstviia_emanon/vol3/1",
-			"scanlator": "Sup!",
-			"uploadDate": 1461618000000,
-			"source": "READMANGA_RU"
-		},
-		{
-			"id": 3552943969433542627,
-			"name": "3 - 2",
-			"number": 13,
-			"url": "/stranstviia_emanon/vol3/2",
-			"scanlator": "Sup!",
-			"uploadDate": 1461618000000,
-			"source": "READMANGA_RU"
-		},
-		{
-			"id": 3552943969433542628,
-			"name": "3 - 3",
-			"number": 14,
-			"url": "/stranstviia_emanon/vol3/3",
-			"scanlator": "",
-			"uploadDate": 1465851600000,
-			"source": "READMANGA_RU"
-		}
-	],
-	"source": "READMANGA_RU"
-}
--- a/app/src/androidTest/java/org/koitharu/kotatsu/Instrumentation.kt
+++ b/app/src/androidTest/java/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/java/org/koitharu/kotatsu/SampleData.kt
+++ b/app/src/androidTest/java/org/koitharu/kotatsu/SampleData.kt
@@ -1,54 +0,0 @@
-package org.koitharu.kotatsu
-
-import androidx.test.platform.app.InstrumentationRegistry
-import com.squareup.moshi.*
-import com.squareup.moshi.kotlin.reflect.KotlinJsonAdapterFactory
-import okio.buffer
-import okio.source
-import org.koitharu.kotatsu.core.model.FavouriteCategory
-import org.koitharu.kotatsu.parsers.model.Manga
-import java.util.*
-import kotlin.reflect.KClass
-
-object SampleData {
-
-	private val moshi = Moshi.Builder()
-		.add(DateAdapter())
-		.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)
-		}
-	}
-}
--- a/app/src/androidTest/java/org/koitharu/kotatsu/core/db/MangaDatabaseTest.kt
+++ b/app/src/androidTest/java/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.Rule
-import org.junit.Test
-import org.junit.runner.RunWith
-import kotlin.test.assertEquals
-
-@RunWith(AndroidJUnit4::class)
-class MangaDatabaseTest {
-
-	@get:Rule
-	val helper: MigrationTestHelper = MigrationTestHelper(
-		InstrumentationRegistry.getInstrumentation(),
-		MangaDatabase::class.java,
-	)
-
-	private val migrations = databaseMigrations
-
-	@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/java/org/koitharu/kotatsu/core/os/ShortcutsUpdaterTest.kt
+++ b/app/src/androidTest/java/org/koitharu/kotatsu/core/os/ShortcutsUpdaterTest.kt
@@ -1,65 +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 kotlinx.coroutines.test.runTest
-import org.junit.Before
-import org.junit.Test
-import org.junit.runner.RunWith
-import org.koin.test.KoinTest
-import org.koin.test.inject
-import org.koitharu.kotatsu.SampleData
-import org.koitharu.kotatsu.awaitForIdle
-import org.koitharu.kotatsu.core.db.MangaDatabase
-import org.koitharu.kotatsu.history.domain.HistoryRepository
-import kotlin.test.assertEquals
-import kotlin.test.assertTrue
-
-@RunWith(AndroidJUnit4::class)
-class ShortcutsUpdaterTest : KoinTest {
-
-	private val historyRepository by inject<HistoryRepository>()
-	private val shortcutsUpdater by inject<ShortcutsUpdater>()
-	private val database by inject<MangaDatabase>()
-
-	@Before
-	fun setUp() {
-		database.clearAllTables()
-	}
-
-	@Test
-	fun testUpdateShortcuts() = runTest {
-		if (Build.VERSION.SDK_INT < Build.VERSION_CODES.N_MR1) {
-			return@runTest
-		}
-		awaitUpdate()
-		assertTrue(getShortcuts().isEmpty())
-		historyRepository.addOrUpdate(
-			manga = SampleData.manga,
-			chapterId = SampleData.chapter.id,
-			page = 4,
-			scroll = 2,
-			percent = 0.3f
-		)
-		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()
-		shortcutsUpdater.await()
-	}
-}
--- a/app/src/androidTest/java/org/koitharu/kotatsu/settings/backup/AppBackupAgentTest.kt
+++ b/app/src/androidTest/java/org/koitharu/kotatsu/settings/backup/AppBackupAgentTest.kt
@@ -1,67 +0,0 @@
-package org.koitharu.kotatsu.settings.backup
-
-import androidx.test.ext.junit.runners.AndroidJUnit4
-import kotlinx.coroutines.test.runTest
-import org.junit.Before
-import org.junit.Test
-import org.junit.runner.RunWith
-import org.koin.test.KoinTest
-import org.koin.test.get
-import org.koin.test.inject
-import org.koitharu.kotatsu.SampleData
-import org.koitharu.kotatsu.core.backup.BackupRepository
-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.domain.HistoryRepository
-import kotlin.test.*
-
-@RunWith(AndroidJUnit4::class)
-class AppBackupAgentTest : KoinTest {
-
-	private val historyRepository by inject<HistoryRepository>()
-	private val favouritesRepository by inject<FavouritesRepository>()
-	private val backupRepository by inject<BackupRepository>()
-	private val database by inject<MangaDatabase>()
-
-	@Before
-	fun setUp() {
-		database.clearAllTables()
-	}
-
-	@Test
-	fun testBackupRestore() = runTest {
-		val category = favouritesRepository.createCategory(
-			title = SampleData.favouriteCategory.title,
-			sortOrder = SampleData.favouriteCategory.order,
-			isTrackerEnabled = SampleData.favouriteCategory.isTrackingEnabled,
-		)
-		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,
-		)
-		val history = checkNotNull(historyRepository.getOne(SampleData.manga))
-
-		val agent = AppBackupAgent()
-		val backup = agent.createBackupFile(get(), 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))
-		assertContentEquals(listOf(SampleData.manga), favouritesRepository.getManga(category.id))
-
-		val allTags = database.tagsDao.findTags(SampleData.tag.source.name).toMangaTags()
-		assertContains(allTags, SampleData.tag)
-	}
-}
--- a/app/src/androidTest/java/org/koitharu/kotatsu/tracker/domain/TrackerTest.kt
+++ b/app/src/androidTest/java/org/koitharu/kotatsu/tracker/domain/TrackerTest.kt
@@ -1,183 +0,0 @@
-package org.koitharu.kotatsu.tracker.domain
-
-import androidx.test.ext.junit.runners.AndroidJUnit4
-import kotlinx.coroutines.test.runTest
-import org.junit.Test
-import org.junit.runner.RunWith
-import org.koin.test.KoinTest
-import org.koin.test.inject
-import org.koitharu.kotatsu.SampleData
-import org.koitharu.kotatsu.base.domain.MangaDataRepository
-import org.koitharu.kotatsu.parsers.model.Manga
-import kotlin.test.assertEquals
-import kotlin.test.assertFalse
-import kotlin.test.assertTrue
-
-@RunWith(AndroidJUnit4::class)
-class TrackerTest : KoinTest {
-
-	private val repository by inject<TrackingRepository>()
-	private val dataRepository by inject<MangaDataRepository>()
-	private val tracker by inject<Tracker>()
-
-	@Test
-	fun noUpdates() = runTest {
-		val manga = loadManga("full.json")
-		tracker.deleteTrack(manga.id)
-
-		tracker.checkUpdates(manga, commit = true).apply {
-			assertFalse(isValid)
-			assert(newChapters.isEmpty())
-		}
-		assertEquals(0, repository.getNewChaptersCount(manga.id))
-		tracker.checkUpdates(manga, commit = true).apply {
-			assertTrue(isValid)
-			assert(newChapters.isEmpty())
-		}
-		assertEquals(0, repository.getNewChaptersCount(manga.id))
-	}
-
-	@Test
-	fun hasUpdates() = runTest {
-		val mangaFirst = loadManga("first_chapters.json")
-		val mangaFull = loadManga("full.json")
-		tracker.deleteTrack(mangaFirst.id)
-
-		tracker.checkUpdates(mangaFirst, commit = true).apply {
-			assertFalse(isValid)
-			assert(newChapters.isEmpty())
-		}
-		assertEquals(0, repository.getNewChaptersCount(mangaFirst.id))
-		tracker.checkUpdates(mangaFull, commit = true).apply {
-			assertTrue(isValid)
-			assertEquals(3, newChapters.size)
-		}
-		assertEquals(3, repository.getNewChaptersCount(mangaFirst.id))
-		tracker.checkUpdates(mangaFull, commit = true).apply {
-			assertTrue(isValid)
-			assert(newChapters.isEmpty())
-		}
-		assertEquals(3, repository.getNewChaptersCount(mangaFirst.id))
-	}
-
-	@Test
-	fun badIds() = runTest {
-		val mangaFirst = loadManga("first_chapters.json")
-		val mangaBad = loadManga("bad_ids.json")
-		tracker.deleteTrack(mangaFirst.id)
-
-		tracker.checkUpdates(mangaFirst, commit = true).apply {
-			assertFalse(isValid)
-			assert(newChapters.isEmpty())
-		}
-		assertEquals(0, repository.getNewChaptersCount(mangaFirst.id))
-		tracker.checkUpdates(mangaBad, commit = true).apply {
-			assertFalse(isValid)
-			assert(newChapters.isEmpty())
-		}
-		assertEquals(0, repository.getNewChaptersCount(mangaFirst.id))
-		tracker.checkUpdates(mangaFirst, commit = true).apply {
-			assertFalse(isValid)
-			assert(newChapters.isEmpty())
-		}
-		assertEquals(0, repository.getNewChaptersCount(mangaFirst.id))
-	}
-
-	@Test
-	fun badIds2() = runTest {
-		val mangaFirst = loadManga("first_chapters.json")
-		val mangaBad = loadManga("bad_ids.json")
-		val mangaFull = loadManga("full.json")
-		tracker.deleteTrack(mangaFirst.id)
-
-		tracker.checkUpdates(mangaFirst, commit = true).apply {
-			assertFalse(isValid)
-			assert(newChapters.isEmpty())
-		}
-		assertEquals(0, repository.getNewChaptersCount(mangaFirst.id))
-		tracker.checkUpdates(mangaFull, commit = true).apply {
-			assertTrue(isValid)
-			assertEquals(3, newChapters.size)
-		}
-		assertEquals(3, repository.getNewChaptersCount(mangaFull.id))
-		tracker.checkUpdates(mangaBad, commit = true).apply {
-			assertFalse(isValid)
-			assert(newChapters.isEmpty())
-		}
-		assertEquals(0, repository.getNewChaptersCount(mangaFirst.id))
-	}
-
-	@Test
-	fun fullReset() = runTest {
-		val mangaFull = loadManga("full.json")
-		val mangaFirst = loadManga("first_chapters.json")
-		val mangaEmpty = loadManga("empty.json")
-		tracker.deleteTrack(mangaFull.id)
-
-		assertEquals(0, repository.getNewChaptersCount(mangaFull.id))
-		tracker.checkUpdates(mangaFull, commit = true).apply {
-			assertFalse(isValid)
-			assert(newChapters.isEmpty())
-		}
-		assertEquals(0, repository.getNewChaptersCount(mangaFull.id))
-		tracker.checkUpdates(mangaEmpty, commit = true).apply {
-			assert(newChapters.isEmpty())
-		}
-		assertEquals(0, repository.getNewChaptersCount(mangaFull.id))
-		tracker.checkUpdates(mangaFirst, commit = true).apply {
-			assertFalse(isValid)
-			assert(newChapters.isEmpty())
-		}
-		assertEquals(0, repository.getNewChaptersCount(mangaFull.id))
-		tracker.checkUpdates(mangaFull, commit = true).apply {
-			assertTrue(isValid)
-			assertEquals(3, newChapters.size)
-		}
-		assertEquals(3, repository.getNewChaptersCount(mangaFull.id))
-		tracker.checkUpdates(mangaEmpty, commit = true).apply {
-			assertFalse(isValid)
-			assert(newChapters.isEmpty())
-		}
-		assertEquals(0, repository.getNewChaptersCount(mangaFull.id))
-	}
-
-	@Test
-	fun syncWithHistory() = runTest {
-		val mangaFull = loadManga("full.json")
-		val mangaFirst = loadManga("first_chapters.json")
-		tracker.deleteTrack(mangaFull.id)
-
-		tracker.checkUpdates(mangaFirst, commit = true).apply {
-			assertFalse(isValid)
-			assert(newChapters.isEmpty())
-		}
-		assertEquals(0, repository.getNewChaptersCount(mangaFirst.id))
-		tracker.checkUpdates(mangaFull, commit = true).apply {
-			assertTrue(isValid)
-			assertEquals(3, newChapters.size)
-		}
-		assertEquals(3, repository.getNewChaptersCount(mangaFirst.id))
-
-		var chapter = requireNotNull(mangaFull.chapters).run { get(lastIndex - 1) }
-		repository.syncWithHistory(mangaFull, chapter.id)
-
-		assertEquals(1, repository.getNewChaptersCount(mangaFirst.id))
-
-		chapter = requireNotNull(mangaFull.chapters).run { get(lastIndex) }
-		repository.syncWithHistory(mangaFull, chapter.id)
-
-		assertEquals(0, repository.getNewChaptersCount(mangaFirst.id))
-
-		tracker.checkUpdates(mangaFull, commit = true).apply {
-			assertTrue(isValid)
-			assert(newChapters.isEmpty())
-		}
-		assertEquals(0, repository.getNewChaptersCount(mangaFirst.id))
-	}
-
-	private suspend fun loadManga(name: String): Manga {
-		val manga = SampleData.loadAsset("manga/$name", Manga::class)
-		dataRepository.storeManga(manga)
-		return manga
-	}
-}
--- a/app/src/debug/java/org/koitharu/kotatsu/core/parser/DummyParser.kt
+++ b/app/src/debug/java/org/koitharu/kotatsu/core/parser/DummyParser.kt
@@ -1,40 +0,0 @@
-package org.koitharu.kotatsu.core.parser
-
-import java.util.*
-import org.koitharu.kotatsu.parsers.MangaLoaderContext
-import org.koitharu.kotatsu.parsers.MangaParser
-import org.koitharu.kotatsu.parsers.config.ConfigKey
-import org.koitharu.kotatsu.parsers.model.*
-
-/**
- * This parser is just for parser development, it should not be used in releases
- */
-class DummyParser(override val context: MangaLoaderContext) : MangaParser(MangaSource.DUMMY) {
-
-	override val configKeyDomain: ConfigKey.Domain
-		get() = ConfigKey.Domain("", null)
-
-	override val sortOrders: Set<SortOrder>
-		get() = EnumSet.allOf(SortOrder::class.java)
-
-	override suspend fun getDetails(manga: Manga): Manga {
-		TODO("Not yet implemented")
-	}
-
-	override suspend fun getList(
-		offset: Int,
-		query: String?,
-		tags: Set<MangaTag>?,
-		sortOrder: SortOrder,
-	): List<Manga> {
-		TODO("Not yet implemented")
-	}
-
-	override suspend fun getPages(chapter: MangaChapter): List<MangaPage> {
-		TODO("Not yet implemented")
-	}
-
-	override suspend fun getTags(): Set<MangaTag> {
-		TODO("Not yet implemented")
-	}
-}
--- a/app/src/debug/java/org/koitharu/kotatsu/core/parser/MangaParser.kt
+++ b/app/src/debug/java/org/koitharu/kotatsu/core/parser/MangaParser.kt
@@ -1,14 +0,0 @@
-package org.koitharu.kotatsu.core.parser
-
-import org.koitharu.kotatsu.parsers.MangaLoaderContext
-import org.koitharu.kotatsu.parsers.MangaParser
-import org.koitharu.kotatsu.parsers.model.MangaSource
-import org.koitharu.kotatsu.parsers.newParser
-
-fun MangaParser(source: MangaSource, loaderContext: MangaLoaderContext): MangaParser {
-	return if (source == MangaSource.DUMMY) {
-		DummyParser(loaderContext)
-	} else {
-		source.newParser(loaderContext)
-	}
-}
--- a/app/src/debug/java/org/koitharu/kotatsu/utils/ext/DebugExt.kt
+++ b/app/src/debug/java/org/koitharu/kotatsu/utils/ext/DebugExt.kt
@@ -1,3 +0,0 @@
-package org.koitharu.kotatsu.utils.ext
-
-fun Throwable.printStackTraceDebug() = printStackTrace()
--- 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,4 +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>
-</resources>
--- a/app/src/debug/res/values/ic_launcher_background.xml
+++ b/app/src/debug/res/values/ic_launcher_background.xml
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-
-	<integer name="manga_badge_max_character_count">3</integer>
+    <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,3 +0,0 @@
-<resources>
-	<string name="app_name" translatable="false">Kotatsu Dev</string>
-</resources>
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -1,128 +1,81 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest
 	xmlns:android="http://schemas.android.com/apk/res/android"
-	xmlns:tools="http://schemas.android.com/tools">
+	xmlns:tools="http://schemas.android.com/tools"
+	package="org.koitharu.kotatsu">

 	<uses-permission android:name="android.permission.INTERNET" />
 	<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
 	<uses-permission android:name="android.permission.FOREGROUND_SERVICE" />
 	<uses-permission android:name="android.permission.WAKE_LOCK" />
 	<uses-permission android:name="android.permission.VIBRATE" />
+	<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
 	<uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" />
-	<uses-permission android:name="android.permission.REQUEST_IGNORE_BATTERY_OPTIMIZATIONS" />

 	<application
 		android:name="org.koitharu.kotatsu.KotatsuApp"
 		android:allowBackup="true"
-		android:backupAgent="org.koitharu.kotatsu.settings.backup.AppBackupAgent"
-		android:dataExtractionRules="@xml/backup_rules"
-		android:fullBackupContent="@xml/backup_content"
-		android:fullBackupOnly="true"
+		android:fullBackupContent="@xml/backup_descriptor"
 		android:icon="@mipmap/ic_launcher"
 		android:label="@string/app_name"
-		android:networkSecurityConfig="@xml/network_security_config"
 		android:roundIcon="@mipmap/ic_launcher_round"
 		android:supportsRtl="true"
-		android:theme="@style/Theme.Kotatsu"
+		android:theme="@style/AppTheme"
+		android:usesCleartextTraffic="true"
 		tools:ignore="UnusedAttribute">
-
-		<activity
-			android:name="org.koitharu.kotatsu.main.ui.MainActivity"
-			android:exported="true">
+		<activity android:name=".ui.main.MainActivity">
 			<intent-filter>
 				<action android:name="android.intent.action.MAIN" />
 				<category android:name="android.intent.category.LAUNCHER" />
 			</intent-filter>
 			<meta-data
 				android:name="android.app.default_searchable"
-				android:value="org.koitharu.kotatsu.ui.search.SearchActivity" />
+				android:value=".ui.search.SearchActivity" />
 		</activity>
-		<activity
-			android:name="org.koitharu.kotatsu.details.ui.DetailsActivity"
-			android:exported="true">
+		<activity android:name=".ui.details.MangaDetailsActivity">
 			<intent-filter>
 				<action android:name="${applicationId}.action.VIEW_MANGA" />
 			</intent-filter>
 		</activity>
+		<activity android:name=".ui.reader.ReaderActivity" />
 		<activity
-			android:name="org.koitharu.kotatsu.reader.ui.ReaderActivity"
-			android:exported="true">
-			<intent-filter>
-				<action android:name="${applicationId}.action.READ_MANGA" />
-			</intent-filter>
-		</activity>
-		<activity
-			android:name="org.koitharu.kotatsu.search.ui.SearchActivity"
+			android:name=".ui.search.SearchActivity"
 			android:label="@string/search" />
 		<activity
-			android:name="org.koitharu.kotatsu.search.ui.MangaListActivity"
-			android:label="@string/search_manga" />
+			android:name=".ui.settings.SettingsActivity"
+			android:label="@string/settings" />
 		<activity
-			android:name="org.koitharu.kotatsu.settings.SettingsActivity"
-			android:exported="true"
+			android:name=".ui.reader.SimpleSettingsActivity"
 			android:label="@string/settings">
 			<intent-filter>
-				<action android:name="android.intent.action.VIEW" />
+				<action android:name="android.intent.action.MANAGE_NETWORK_USAGE" />
 				<category android:name="android.intent.category.DEFAULT" />
-				<category android:name="android.intent.category.BROWSABLE" />
-				<data android:scheme="kotatsu" />
 			</intent-filter>
 		</activity>
+		<activity android:name=".ui.browser.BrowserActivity" />
 		<activity
-			android:name="org.koitharu.kotatsu.browser.BrowserActivity"
-			android:configChanges="orientation|screenSize|screenLayout|keyboardHidden"
-			android:windowSoftInputMode="adjustResize" />
-		<activity
-			android:name="org.koitharu.kotatsu.settings.sources.auth.SourceAuthActivity"
-			android:configChanges="orientation|screenSize|screenLayout|keyboardHidden"
-			android:windowSoftInputMode="adjustResize" />
-		<activity
-			android:name="org.koitharu.kotatsu.favourites.ui.categories.CategoriesActivity"
-			android:label="@string/favourites_categories"
+			android:name=".ui.utils.CrashActivity"
+			android:label="@string/error_occurred"
+			android:theme="@android:style/Theme.DeviceDefault.Dialog"
 			android:windowSoftInputMode="stateAlwaysHidden" />
 		<activity
-			android:name="org.koitharu.kotatsu.widget.shelf.ShelfConfigActivity"
-			android:exported="true"
-			android:label="@string/manga_shelf"
-			android:theme="@style/Theme.Kotatsu.DialogWhenLarge">
-			<intent-filter>
-				<action android:name="android.appwidget.action.APPWIDGET_CONFIGURE" />
-			</intent-filter>
-		</activity>
-		<activity
-			android:name="org.koitharu.kotatsu.search.ui.multi.MultiSearchActivity"
-			android:label="@string/search" />
-		<activity
-			android:name="org.koitharu.kotatsu.main.ui.protect.ProtectActivity"
-			android:noHistory="true"
-			android:windowSoftInputMode="adjustResize" />
-		<activity
-			android:name="org.koitharu.kotatsu.settings.protect.ProtectSetupActivity"
-			android:windowSoftInputMode="adjustResize" />
-		<activity
-			android:name="org.koitharu.kotatsu.download.ui.DownloadsActivity"
-			android:label="@string/downloads"
-			android:launchMode="singleTop"
-			android:theme="@style/Theme.Kotatsu.DialogWhenLarge" />
-		<activity android:name="org.koitharu.kotatsu.image.ui.ImageActivity" />
-		<activity
-			android:name="org.koitharu.kotatsu.favourites.ui.categories.edit.FavouritesCategoryEditActivity"
-			android:theme="@style/Theme.Kotatsu.DialogWhenLarge" />
+			android:name=".ui.main.list.favourites.categories.CategoriesActivity"
+			android:windowSoftInputMode="stateAlwaysHidden"
+			android:label="@string/favourites_categories" />

 		<service
-			android:name="org.koitharu.kotatsu.download.ui.service.DownloadService"
-			android:stopWithTask="false"
+			android:name=".ui.download.DownloadService"
 			android:foregroundServiceType="dataSync" />
-		<service android:name="org.koitharu.kotatsu.local.ui.LocalChaptersRemoveService" />
+		<service android:name=".ui.settings.AppUpdateService" />
 		<service
-			android:name="org.koitharu.kotatsu.widget.shelf.ShelfWidgetService"
+			android:name=".ui.widget.shelf.ShelfWidgetService"
 			android:permission="android.permission.BIND_REMOTEVIEWS" />
 		<service
-			android:name="org.koitharu.kotatsu.widget.recent.RecentWidgetService"
+			android:name=".ui.widget.recent.RecentWidgetService"
 			android:permission="android.permission.BIND_REMOTEVIEWS" />

 		<provider
-			android:name="org.koitharu.kotatsu.search.ui.MangaSuggestionsProvider"
+			android:name=".ui.search.MangaSuggestionsProvider"
 			android:authorities="${applicationId}.MangaSuggestionsProvider"
 			android:exported="false" />
 		<provider
@@ -134,37 +87,24 @@
 				android:name="android.support.FILE_PROVIDER_PATHS"
 				android:resource="@xml/filepaths" />
 		</provider>
-
-		<receiver
-			android:name="org.koitharu.kotatsu.widget.shelf.ShelfWidgetProvider"
-			android:exported="true"
+		
+		<receiver android:name=".ui.widget.shelf.ShelfWidgetProvider"
 			android:label="@string/manga_shelf">
 			<intent-filter>
 				<action android:name="android.appwidget.action.APPWIDGET_UPDATE" />
 			</intent-filter>
-			<meta-data
-				android:name="android.appwidget.provider"
+			<meta-data android:name="android.appwidget.provider"
 				android:resource="@xml/widget_shelf" />
 		</receiver>
-		<receiver
-			android:name="org.koitharu.kotatsu.widget.recent.RecentWidgetProvider"
-			android:exported="true"
+		<receiver android:name=".ui.widget.recent.RecentWidgetProvider"
 			android:label="@string/recent_manga">
 			<intent-filter>
 				<action android:name="android.appwidget.action.APPWIDGET_UPDATE" />
 			</intent-filter>
-			<meta-data
-				android:name="android.appwidget.provider"
+			<meta-data android:name="android.appwidget.provider"
 				android:resource="@xml/widget_recent" />
 		</receiver>

-		<meta-data
-			android:name="android.webkit.WebView.EnableSafeBrowsing"
-			android:value="false" />
-		<meta-data
-			android:name="android.webkit.WebView.MetricsOptOut"
-			android:value="true" />
-
 	</application>

 </manifest>
--- a/app/src/main/java/org/koitharu/kotatsu/KotatsuApp.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/KotatsuApp.kt
@@ -1,152 +1,125 @@
 package org.koitharu.kotatsu

 import android.app.Application
-import android.content.Context
-import android.os.StrictMode
 import androidx.appcompat.app.AppCompatDelegate
-import androidx.fragment.app.strictmode.FragmentStrictMode
-import androidx.room.InvalidationTracker
-import org.acra.ReportField
-import org.acra.config.dialog
-import org.acra.config.mailSender
-import org.acra.data.StringFormat
-import org.acra.ktx.initAcra
-import org.koin.android.ext.android.get
-import org.koin.android.ext.android.getKoin
+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.koitharu.kotatsu.bookmarks.bookmarksModule
+import org.koin.dsl.module
 import org.koitharu.kotatsu.core.db.MangaDatabase
-import org.koitharu.kotatsu.core.db.databaseModule
-import org.koitharu.kotatsu.core.github.githubModule
-import org.koitharu.kotatsu.core.network.networkModule
+import org.koitharu.kotatsu.core.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.core.ui.uiModule
-import org.koitharu.kotatsu.details.detailsModule
-import org.koitharu.kotatsu.favourites.favouritesModule
-import org.koitharu.kotatsu.history.historyModule
-import org.koitharu.kotatsu.local.data.PagesCache
-import org.koitharu.kotatsu.local.domain.LocalMangaRepository
-import org.koitharu.kotatsu.local.localModule
-import org.koitharu.kotatsu.main.mainModule
-import org.koitharu.kotatsu.parsers.MangaLoaderContext
-import org.koitharu.kotatsu.reader.readerModule
-import org.koitharu.kotatsu.remotelist.remoteListModule
-import org.koitharu.kotatsu.scrobbling.shikimori.shikimoriModule
-import org.koitharu.kotatsu.search.searchModule
-import org.koitharu.kotatsu.settings.settingsModule
-import org.koitharu.kotatsu.suggestions.suggestionsModule
-import org.koitharu.kotatsu.tracker.trackerModule
-import org.koitharu.kotatsu.widget.appWidgetModule
+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()
-		if (BuildConfig.DEBUG) {
-			enableStrictMode()
-		}
+		AppCompatDelegate.setCompatVectorFromResourcesEnabled(true)
 		initKoin()
-		AppCompatDelegate.setDefaultNightMode(get<AppSettings>().theme)
-		setupActivityLifecycleCallbacks()
-		setupDatabaseObservers()
+		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 {
-			androidContext(this@KotatsuApp)
+			androidLogger()
+			androidContext(applicationContext)
 			modules(
-				networkModule,
-				databaseModule,
-				githubModule,
-				uiModule,
-				mainModule,
-				searchModule,
-				localModule,
-				favouritesModule,
-				historyModule,
-				remoteListModule,
-				detailsModule,
-				trackerModule,
-				settingsModule,
-				readerModule,
-				appWidgetModule,
-				suggestionsModule,
-				shikimoriModule,
-				bookmarksModule
+				module {
+					factory {
+						okHttp()
+							.cache(CacheUtils.createHttpCache(applicationContext))
+							.build()
+					}
+					single {
+						mangaDb().build()
+					}
+					single {
+						MangaLoaderContext()
+					}
+					factory {
+						AppSettings(applicationContext)
+					}
+					single {
+						PagesCache(applicationContext)
+					}
+				}
 			)
 		}
 	}

-	override fun attachBaseContext(base: Context?) {
-		super.attachBaseContext(base)
-		initAcra {
-			buildConfigClass = BuildConfig::class.java
-			reportFormat = StringFormat.KEY_VALUE_LIST
-			reportContent = listOf(
-				ReportField.PACKAGE_NAME,
-				ReportField.APP_VERSION_CODE,
-				ReportField.APP_VERSION_NAME,
-				ReportField.ANDROID_VERSION,
-				ReportField.PHONE_MODEL,
-				ReportField.CRASH_CONFIGURATION,
-				ReportField.STACK_TRACE,
-				ReportField.SHARED_PREFERENCES
-			)
-			dialog {
-				text = getString(R.string.crash_text)
-				title = getString(R.string.error_occurred)
-				positiveButtonText = getString(R.string.send)
-				resIcon = R.drawable.ic_alert_outline
-				resTheme = android.R.style.Theme_Material_Light_Dialog_Alert
+	private fun initCoil() {
+		Coil.setDefaultImageLoader(ImageLoader(applicationContext) {
+			okHttpClient {
+				okHttp()
+					.cache(CoilUtils.createDefaultCache(applicationContext))
+					.build()
 			}
-			mailSender {
-				mailTo = getString(R.string.email_error_report)
-				reportAsFile = true
-				reportFileName = "stacktrace.txt"
+			componentRegistry {
+				add(CbzFetcher())
 			}
+		})
+	}
+
+	private fun initErrorHandler() {
+		val exceptionHandler = Thread.getDefaultUncaughtExceptionHandler()
+		Thread.setDefaultUncaughtExceptionHandler { t, e ->
+			chuckerCollector.onError("CRASH", e)
+			exceptionHandler?.uncaughtException(t, e)
 		}
 	}

-	private fun setupDatabaseObservers() {
-		val observers = getKoin().getAll<InvalidationTracker.Observer>()
-		val database = get<MangaDatabase>()
-		val tracker = database.invalidationTracker
-		observers.forEach {
-			tracker.addObserver(it)
+	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 setupActivityLifecycleCallbacks() {
-		val callbacks = getKoin().getAll<ActivityLifecycleCallbacks>()
-		callbacks.forEach {
-			registerActivityLifecycleCallbacks(it)
-		}
-	}
-
-	private fun enableStrictMode() {
-		StrictMode.setThreadPolicy(
-			StrictMode.ThreadPolicy.Builder()
-				.detectAll()
-				.penaltyLog()
-				.build()
-		)
-		StrictMode.setVmPolicy(
-			StrictMode.VmPolicy.Builder()
-				.detectAll()
-				.setClassInstanceLimit(LocalMangaRepository::class.java, 1)
-				.setClassInstanceLimit(PagesCache::class.java, 1)
-				.setClassInstanceLimit(MangaLoaderContext::class.java, 1)
-				.penaltyLog()
-				.build()
-		)
-		FragmentStrictMode.defaultPolicy = FragmentStrictMode.Policy.Builder()
-			.penaltyDeath()
-			.detectFragmentReuse()
-			.detectWrongFragmentContainer()
-			.detectRetainInstanceUsage()
-			.detectSetUserVisibleHint()
-			.detectFragmentTagUsage()
-			.build()
-	}
+	private fun mangaDb() = Room.databaseBuilder(
+		applicationContext,
+		MangaDatabase::class.java,
+		"kotatsu-db"
+	).addMigrations(Migration1To2, Migration2To3, Migration3To4)
 }
--- a/app/src/main/java/org/koitharu/kotatsu/base/domain/MangaDataRepository.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/base/domain/MangaDataRepository.kt
@@ -1,52 +0,0 @@
-package org.koitharu.kotatsu.base.domain
-
-import androidx.room.withTransaction
-import org.koitharu.kotatsu.core.db.MangaDatabase
-import org.koitharu.kotatsu.core.db.entity.*
-import org.koitharu.kotatsu.core.prefs.ReaderMode
-import org.koitharu.kotatsu.parsers.model.Manga
-import org.koitharu.kotatsu.parsers.model.MangaSource
-import org.koitharu.kotatsu.parsers.model.MangaTag
-
-class MangaDataRepository(private val db: MangaDatabase) {
-
-	suspend fun savePreferences(manga: Manga, mode: ReaderMode) {
-		val tags = manga.tags.toEntities()
-		db.withTransaction {
-			db.tagsDao.upsert(tags)
-			db.mangaDao.upsert(manga.toEntity(), tags)
-			db.preferencesDao.upsert(
-				MangaPrefsEntity(
-					mangaId = manga.id,
-					mode = mode.id
-				)
-			)
-		}
-	}
-
-	suspend fun getReaderMode(mangaId: Long): ReaderMode? {
-		return db.preferencesDao.find(mangaId)?.let { ReaderMode.valueOf(it.mode) }
-	}
-
-	suspend fun findMangaById(mangaId: Long): Manga? {
-		return db.mangaDao.find(mangaId)?.toManga()
-	}
-
-	suspend fun resolveIntent(intent: MangaIntent): Manga? = when {
-		intent.manga != null -> intent.manga
-		intent.mangaId != 0L -> findMangaById(intent.mangaId)
-		else -> null // TODO resolve uri
-	}
-
-	suspend fun storeManga(manga: Manga) {
-		val tags = manga.tags.toEntities()
-		db.withTransaction {
-			db.tagsDao.upsert(tags)
-			db.mangaDao.upsert(manga.toEntity(), tags)
-		}
-	}
-
-	suspend fun findTags(source: MangaSource): Set<MangaTag> {
-		return db.tagsDao.findTags(source.name).toMangaTags()
-	}
-}
--- a/app/src/main/java/org/koitharu/kotatsu/base/domain/MangaIntent.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/base/domain/MangaIntent.kt
@@ -1,34 +0,0 @@
-package org.koitharu.kotatsu.base.domain
-
-import android.content.Intent
-import android.net.Uri
-import android.os.Bundle
-import org.koitharu.kotatsu.core.model.parcelable.ParcelableManga
-import org.koitharu.kotatsu.parsers.model.Manga
-
-class MangaIntent private constructor(
-	val manga: Manga?,
-	val mangaId: Long,
-	val uri: Uri?,
-) {
-
-	constructor(intent: Intent?) : this(
-		manga = intent?.getParcelableExtra<ParcelableManga>(KEY_MANGA)?.manga,
-		mangaId = intent?.getLongExtra(KEY_ID, ID_NONE) ?: ID_NONE,
-		uri = intent?.data
-	)
-
-	constructor(args: Bundle?) : this(
-		manga = args?.getParcelable<ParcelableManga>(KEY_MANGA)?.manga,
-		mangaId = args?.getLong(KEY_ID, ID_NONE) ?: ID_NONE,
-		uri = null
-	)
-
-	companion object {
-
-		const val ID_NONE = 0L
-
-		const val KEY_MANGA = "manga"
-		const val KEY_ID = "id"
-	}
-}
--- a/app/src/main/java/org/koitharu/kotatsu/base/domain/MangaUtils.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/base/domain/MangaUtils.kt
@@ -1,76 +0,0 @@
-package org.koitharu.kotatsu.base.domain
-
-import android.graphics.BitmapFactory
-import android.net.Uri
-import android.util.Size
-import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.runInterruptible
-import okhttp3.OkHttpClient
-import okhttp3.Request
-import org.koin.core.component.KoinComponent
-import org.koin.core.component.get
-import org.koitharu.kotatsu.core.network.CommonHeaders
-import org.koitharu.kotatsu.core.parser.MangaRepository
-import org.koitharu.kotatsu.parsers.model.MangaPage
-import org.koitharu.kotatsu.parsers.util.await
-import java.io.File
-import java.io.InputStream
-import java.util.zip.ZipFile
-import kotlin.math.roundToInt
-
-object MangaUtils : KoinComponent {
-
-	private const val MIN_WEBTOON_RATIO = 2
-
-	/**
-	 * Automatic determine type of manga by page size
-	 * @return ReaderMode.WEBTOON if page is wide
-	 */
-	suspend fun determineMangaIsWebtoon(pages: List<MangaPage>): Boolean {
-		val pageIndex = (pages.size * 0.3).roundToInt()
-		val page = requireNotNull(pages.getOrNull(pageIndex)) { "No pages" }
-		val url = MangaRepository(page.source).getPageUrl(page)
-		val uri = Uri.parse(url)
-		val size = if (uri.scheme == "cbz") {
-			runInterruptible(Dispatchers.IO) {
-				val zip = ZipFile(uri.schemeSpecificPart)
-				val entry = zip.getEntry(uri.fragment)
-				zip.getInputStream(entry).use {
-					getBitmapSize(it)
-				}
-			}
-		} else {
-			val request = Request.Builder()
-				.url(url)
-				.get()
-				.header(CommonHeaders.REFERER, page.referer)
-				.cacheControl(CommonHeaders.CACHE_CONTROL_DISABLED)
-				.build()
-			get<OkHttpClient>().newCall(request).await().use {
-				runInterruptible(Dispatchers.IO) {
-					getBitmapSize(it.body?.byteStream())
-				}
-			}
-		}
-		return size.width * MIN_WEBTOON_RATIO < size.height
-	}
-
-	suspend fun getImageMimeType(file: File): String? = runInterruptible(Dispatchers.IO) {
-		val options = BitmapFactory.Options().apply {
-			inJustDecodeBounds = true
-		}
-		BitmapFactory.decodeFile(file.path, options)?.recycle()
-		options.outMimeType
-	}
-
-	private fun getBitmapSize(input: InputStream?): Size {
-		val options = BitmapFactory.Options().apply {
-			inJustDecodeBounds = true
-		}
-		BitmapFactory.decodeStream(input, null, options)?.recycle()
-		val imageHeight: Int = options.outHeight
-		val imageWidth: Int = options.outWidth
-		check(imageHeight > 0 && imageWidth > 0)
-		return Size(imageWidth, imageHeight)
-	}
-}
--- a/app/src/main/java/org/koitharu/kotatsu/base/domain/ReversibleHandle.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/base/domain/ReversibleHandle.kt
@@ -1,19 +0,0 @@
-package org.koitharu.kotatsu.base.domain
-
-import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.launch
-import org.koitharu.kotatsu.utils.ext.processLifecycleScope
-
-fun interface ReversibleHandle {
-
-	suspend fun reverse()
-}
-
-fun ReversibleHandle.reverseAsync() = processLifecycleScope.launch(Dispatchers.Default) {
-	reverse()
-}
-
-operator fun ReversibleHandle.plus(other: ReversibleHandle) = ReversibleHandle {
-	this.reverse()
-	other.reverse()
-}
--- a/app/src/main/java/org/koitharu/kotatsu/base/ui/AlertDialogFragment.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/base/ui/AlertDialogFragment.kt
@@ -1,45 +0,0 @@
-package org.koitharu.kotatsu.base.ui
-
-import android.app.Dialog
-import android.os.Bundle
-import android.view.LayoutInflater
-import android.view.ViewGroup
-import androidx.annotation.CallSuper
-import androidx.fragment.app.DialogFragment
-import androidx.viewbinding.ViewBinding
-import com.google.android.material.dialog.MaterialAlertDialogBuilder
-
-abstract class AlertDialogFragment<B : ViewBinding> : DialogFragment() {
-
-	private var viewBinding: B? = null
-
-	protected val binding: B
-		get() = checkNotNull(viewBinding)
-
-	final override fun onCreateDialog(savedInstanceState: Bundle?): Dialog {
-		val binding = onInflateView(layoutInflater, null)
-		viewBinding = binding
-		return MaterialAlertDialogBuilder(requireContext(), theme)
-			.setView(binding.root)
-			.also(::onBuildDialog)
-			.create()
-	}
-
-	final override fun onCreateView(
-		inflater: LayoutInflater,
-		container: ViewGroup?,
-		savedInstanceState: Bundle?
-	) = viewBinding?.root
-
-	@CallSuper
-	override fun onDestroyView() {
-		viewBinding = null
-		super.onDestroyView()
-	}
-
-	open fun onBuildDialog(builder: MaterialAlertDialogBuilder) = Unit
-
-	protected fun bindingOrNull(): B? = viewBinding
-
-	protected abstract fun onInflateView(inflater: LayoutInflater, container: ViewGroup?): B
-}
--- a/app/src/main/java/org/koitharu/kotatsu/base/ui/BaseActivity.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/base/ui/BaseActivity.kt
@@ -1,131 +0,0 @@
-package org.koitharu.kotatsu.base.ui
-
-import android.content.res.Configuration
-import android.os.Build
-import android.os.Bundle
-import android.view.KeyEvent
-import android.view.MenuItem
-import android.view.View
-import android.view.ViewGroup
-import androidx.annotation.CallSuper
-import androidx.appcompat.app.AppCompatActivity
-import androidx.appcompat.view.ActionMode
-import androidx.appcompat.widget.ActionBarContextView
-import androidx.appcompat.widget.Toolbar
-import androidx.core.app.ActivityCompat
-import androidx.core.view.ViewCompat
-import androidx.core.view.WindowCompat
-import androidx.core.view.WindowInsetsCompat
-import androidx.core.view.updateLayoutParams
-import androidx.viewbinding.ViewBinding
-import org.koin.android.ext.android.get
-import org.koitharu.kotatsu.BuildConfig
-import org.koitharu.kotatsu.R
-import org.koitharu.kotatsu.base.ui.util.ActionModeDelegate
-import org.koitharu.kotatsu.base.ui.util.WindowInsetsDelegate
-import org.koitharu.kotatsu.core.exceptions.resolve.ExceptionResolver
-import org.koitharu.kotatsu.core.prefs.AppSettings
-
-abstract class BaseActivity<B : ViewBinding> :
-	AppCompatActivity(),
-	WindowInsetsDelegate.WindowInsetsListener {
-
-	protected lateinit var binding: B
-		private set
-
-	@Suppress("LeakingThis")
-	protected val exceptionResolver = ExceptionResolver(this)
-
-	@Suppress("LeakingThis")
-	protected val insetsDelegate = WindowInsetsDelegate(this)
-
-	val actionModeDelegate = ActionModeDelegate()
-
-	override fun onCreate(savedInstanceState: Bundle?) {
-		val settings = get<AppSettings>()
-		val isAmoled = settings.isAmoledTheme
-		val isDynamic = settings.isDynamicTheme
-		// TODO support DialogWhenLarge theme
-		when {
-			isAmoled && isDynamic -> setTheme(R.style.Theme_Kotatsu_Monet_Amoled)
-			isAmoled -> setTheme(R.style.Theme_Kotatsu_Amoled)
-			isDynamic -> setTheme(R.style.Theme_Kotatsu_Monet)
-		}
-		super.onCreate(savedInstanceState)
-		WindowCompat.setDecorFitsSystemWindows(window, false)
-		insetsDelegate.handleImeInsets = true
-	}
-
-	@Deprecated("Use ViewBinding", level = DeprecationLevel.ERROR)
-	override fun setContentView(layoutResID: Int) {
-		super.setContentView(layoutResID)
-		setupToolbar()
-	}
-
-	@Deprecated("Use ViewBinding", level = DeprecationLevel.ERROR)
-	override fun setContentView(view: View?) {
-		super.setContentView(view)
-		setupToolbar()
-	}
-
-	protected fun setContentView(binding: B) {
-		this.binding = binding
-		super.setContentView(binding.root)
-		val toolbar = (binding.root.findViewById<View>(R.id.toolbar) as? Toolbar)
-		toolbar?.let(this::setSupportActionBar)
-		insetsDelegate.onViewCreated(binding.root)
-	}
-
-	override fun onOptionsItemSelected(item: MenuItem) = if (item.itemId == android.R.id.home) {
-		onBackPressed()
-		true
-	} else super.onOptionsItemSelected(item)
-
-	override fun onKeyDown(keyCode: Int, event: KeyEvent?): Boolean {
-		if (BuildConfig.DEBUG && keyCode == KeyEvent.KEYCODE_VOLUME_UP) { // TODO remove
-			ActivityCompat.recreate(this)
-			return true
-		}
-		return super.onKeyDown(keyCode, event)
-	}
-
-	private fun setupToolbar() {
-		(findViewById<View>(R.id.toolbar) as? Toolbar)?.let(this::setSupportActionBar)
-	}
-
-	protected fun isDarkAmoledTheme(): Boolean {
-		val uiMode = resources.configuration.uiMode
-		val isNight = uiMode and Configuration.UI_MODE_NIGHT_MASK == Configuration.UI_MODE_NIGHT_YES
-		return isNight && get<AppSettings>().isAmoledTheme
-	}
-
-	@CallSuper
-	override fun onSupportActionModeStarted(mode: ActionMode) {
-		super.onSupportActionModeStarted(mode)
-		actionModeDelegate.onSupportActionModeStarted(mode)
-		val insets = ViewCompat.getRootWindowInsets(binding.root)
-			?.getInsets(WindowInsetsCompat.Type.systemBars()) ?: return
-		val view = findViewById<ActionBarContextView?>(androidx.appcompat.R.id.action_mode_bar)
-		view?.updateLayoutParams<ViewGroup.MarginLayoutParams> {
-			topMargin = insets.top
-		}
-	}
-
-	@CallSuper
-	override fun onSupportActionModeFinished(mode: ActionMode) {
-		super.onSupportActionModeFinished(mode)
-		actionModeDelegate.onSupportActionModeFinished(mode)
-	}
-
-	override fun onBackPressed() {
-		if ( // https://issuetracker.google.com/issues/139738913
-			Build.VERSION.SDK_INT == Build.VERSION_CODES.Q &&
-			isTaskRoot &&
-			supportFragmentManager.backStackEntryCount == 0
-		) {
-			finishAfterTransition()
-		} else {
-			super.onBackPressed()
-		}
-	}
-}
--- a/app/src/main/java/org/koitharu/kotatsu/base/ui/BaseBottomSheet.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/base/ui/BaseBottomSheet.kt
@@ -1,86 +0,0 @@
-package org.koitharu.kotatsu.base.ui
-
-import android.app.Dialog
-import android.os.Bundle
-import android.util.DisplayMetrics
-import android.view.LayoutInflater
-import android.view.View
-import android.view.ViewGroup
-import android.view.ViewGroup.LayoutParams
-import androidx.core.view.updateLayoutParams
-import androidx.viewbinding.ViewBinding
-import com.google.android.material.bottomsheet.BottomSheetBehavior
-import com.google.android.material.bottomsheet.BottomSheetDialog
-import com.google.android.material.bottomsheet.BottomSheetDialogFragment
-import org.koitharu.kotatsu.R
-import org.koitharu.kotatsu.base.ui.dialog.AppBottomSheetDialog
-import org.koitharu.kotatsu.utils.ext.displayCompat
-import com.google.android.material.R as materialR
-
-abstract class BaseBottomSheet<B : ViewBinding> : BottomSheetDialogFragment() {
-
-	private var viewBinding: B? = null
-
-	protected val binding: B
-		get() = checkNotNull(viewBinding)
-
-	protected val behavior: BottomSheetBehavior<*>?
-		get() = (dialog as? BottomSheetDialog)?.behavior
-
-	final override fun onCreateView(
-		inflater: LayoutInflater,
-		container: ViewGroup?,
-		savedInstanceState: Bundle?
-	): View {
-		val binding = onInflateView(inflater, container)
-		viewBinding = binding
-
-		// Enforce max width for tablets
-		val width = resources.getDimensionPixelSize(R.dimen.bottom_sheet_width)
-		if (width > 0) {
-			behavior?.maxWidth = width
-		}
-
-		// Set peek height to 50% display height
-		requireContext().displayCompat?.let {
-			val metrics = DisplayMetrics()
-			it.getRealMetrics(metrics)
-			behavior?.peekHeight = (metrics.heightPixels * 0.4).toInt()
-		}
-
-		return binding.root
-	}
-
-	override fun onDestroyView() {
-		viewBinding = null
-		super.onDestroyView()
-	}
-
-	override fun onCreateDialog(savedInstanceState: Bundle?): Dialog {
-		return AppBottomSheetDialog(requireContext(), theme)
-	}
-
-	fun addBottomSheetCallback(callback: BottomSheetBehavior.BottomSheetCallback) {
-		val b = behavior ?: return
-		b.addBottomSheetCallback(callback)
-		val rootView = dialog?.findViewById<View>(materialR.id.design_bottom_sheet)
-		if (rootView != null) {
-			callback.onStateChanged(rootView, b.state)
-		}
-	}
-
-	protected abstract fun onInflateView(inflater: LayoutInflater, container: ViewGroup?): B
-
-	protected fun setExpanded(isExpanded: Boolean, isLocked: Boolean) {
-		val b = behavior ?: return
-		if (isExpanded) {
-			b.state = BottomSheetBehavior.STATE_EXPANDED
-		}
-		b.isFitToContents = !isExpanded
-		val rootView = dialog?.findViewById<View>(materialR.id.design_bottom_sheet)
-		rootView?.updateLayoutParams {
-			height = if (isExpanded) LayoutParams.MATCH_PARENT else LayoutParams.WRAP_CONTENT
-		}
-		b.isDraggable = !isLocked
-	}
-}
--- a/app/src/main/java/org/koitharu/kotatsu/base/ui/BaseFragment.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/base/ui/BaseFragment.kt
@@ -1,55 +0,0 @@
-package org.koitharu.kotatsu.base.ui
-
-import android.os.Bundle
-import android.view.LayoutInflater
-import android.view.View
-import android.view.ViewGroup
-import androidx.fragment.app.Fragment
-import androidx.viewbinding.ViewBinding
-import org.koitharu.kotatsu.base.ui.util.ActionModeDelegate
-import org.koitharu.kotatsu.base.ui.util.WindowInsetsDelegate
-import org.koitharu.kotatsu.core.exceptions.resolve.ExceptionResolver
-
-abstract class BaseFragment<B : ViewBinding> :
-	Fragment(),
-	WindowInsetsDelegate.WindowInsetsListener {
-
-	private var viewBinding: B? = null
-
-	protected val binding: B
-		get() = checkNotNull(viewBinding)
-
-	@Suppress("LeakingThis")
-	protected val exceptionResolver = ExceptionResolver(this)
-
-	@Suppress("LeakingThis")
-	protected val insetsDelegate = WindowInsetsDelegate(this)
-
-	protected val actionModeDelegate: ActionModeDelegate
-		get() = (requireActivity() as BaseActivity<*>).actionModeDelegate
-
-	override fun onCreateView(
-		inflater: LayoutInflater,
-		container: ViewGroup?,
-		savedInstanceState: Bundle?
-	): View? {
-		val binding = onInflateView(inflater, container)
-		viewBinding = binding
-		return binding.root
-	}
-
-	override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
-		super.onViewCreated(view, savedInstanceState)
-		insetsDelegate.onViewCreated(view)
-	}
-
-	override fun onDestroyView() {
-		viewBinding = null
-		insetsDelegate.onDestroyView()
-		super.onDestroyView()
-	}
-
-	protected fun bindingOrNull() = viewBinding
-
-	protected abstract fun onInflateView(inflater: LayoutInflater, container: ViewGroup?): B
-}
--- a/app/src/main/java/org/koitharu/kotatsu/base/ui/BaseFullscreenActivity.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/base/ui/BaseFullscreenActivity.kt
@@ -1,59 +0,0 @@
-package org.koitharu.kotatsu.base.ui
-
-import android.graphics.Color
-import android.os.Build
-import android.os.Bundle
-import android.view.View
-import android.view.WindowManager
-import androidx.viewbinding.ViewBinding
-
-@Suppress("DEPRECATION")
-private const val SYSTEM_UI_FLAGS_SHOWN = View.SYSTEM_UI_FLAG_LAYOUT_STABLE or
-	View.SYSTEM_UI_FLAG_LAYOUT_HIDE_NAVIGATION or
-	View.SYSTEM_UI_FLAG_LAYOUT_FULLSCREEN
-
-@Suppress("DEPRECATION")
-private const val SYSTEM_UI_FLAGS_HIDDEN = View.SYSTEM_UI_FLAG_LAYOUT_STABLE or
-	View.SYSTEM_UI_FLAG_LAYOUT_HIDE_NAVIGATION or
-	View.SYSTEM_UI_FLAG_LAYOUT_FULLSCREEN or
-	View.SYSTEM_UI_FLAG_HIDE_NAVIGATION or
-	View.SYSTEM_UI_FLAG_FULLSCREEN or
-	View.SYSTEM_UI_FLAG_IMMERSIVE_STICKY
-
-abstract class BaseFullscreenActivity<B : ViewBinding> :
-	BaseActivity<B>(),
-	View.OnSystemUiVisibilityChangeListener {
-
-	override fun onCreate(savedInstanceState: Bundle?) {
-		super.onCreate(savedInstanceState)
-		with(window) {
-			statusBarColor = Color.TRANSPARENT
-			navigationBarColor = Color.TRANSPARENT
-			if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.P) {
-				attributes.layoutInDisplayCutoutMode =
-					WindowManager.LayoutParams.LAYOUT_IN_DISPLAY_CUTOUT_MODE_SHORT_EDGES
-			}
-			decorView.setOnSystemUiVisibilityChangeListener(this@BaseFullscreenActivity)
-		}
-		showSystemUI()
-	}
-
-	@Suppress("DEPRECATION", "DeprecatedCallableAddReplaceWith")
-	@Deprecated("Deprecated in Java")
-	final override fun onSystemUiVisibilityChange(visibility: Int) {
-		onSystemUiVisibilityChanged(visibility and View.SYSTEM_UI_FLAG_FULLSCREEN == 0)
-	}
-
-	// TODO WindowInsetsControllerCompat works incorrect
-	@Suppress("DEPRECATION")
-	protected fun hideSystemUI() {
-		window.decorView.systemUiVisibility = SYSTEM_UI_FLAGS_HIDDEN
-	}
-
-	@Suppress("DEPRECATION")
-	protected fun showSystemUI() {
-		window.decorView.systemUiVisibility = SYSTEM_UI_FLAGS_SHOWN
-	}
-
-	protected open fun onSystemUiVisibilityChanged(isVisible: Boolean) = Unit
-}
--- a/app/src/main/java/org/koitharu/kotatsu/base/ui/BasePreferenceFragment.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/base/ui/BasePreferenceFragment.kt
@@ -1,60 +0,0 @@
-package org.koitharu.kotatsu.base.ui
-
-import android.os.Bundle
-import android.view.View
-import androidx.annotation.CallSuper
-import androidx.annotation.StringRes
-import androidx.core.graphics.Insets
-import androidx.core.view.updatePadding
-import androidx.preference.PreferenceFragmentCompat
-import androidx.recyclerview.widget.RecyclerView
-import org.koin.android.ext.android.inject
-import org.koitharu.kotatsu.base.ui.util.RecyclerViewOwner
-import org.koitharu.kotatsu.base.ui.util.WindowInsetsDelegate
-import org.koitharu.kotatsu.core.prefs.AppSettings
-import org.koitharu.kotatsu.settings.SettingsHeadersFragment
-
-abstract class BasePreferenceFragment(@StringRes private val titleId: Int) :
-	PreferenceFragmentCompat(),
-	WindowInsetsDelegate.WindowInsetsListener,
-	RecyclerViewOwner {
-
-	protected val settings by inject<AppSettings>(mode = LazyThreadSafetyMode.NONE)
-
-	@Suppress("LeakingThis")
-	protected val insetsDelegate = WindowInsetsDelegate(this)
-
-	override val recyclerView: RecyclerView
-		get() = listView
-
-	override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
-		super.onViewCreated(view, savedInstanceState)
-		listView.clipToPadding = false
-		insetsDelegate.onViewCreated(view)
-	}
-
-	override fun onDestroyView() {
-		insetsDelegate.onDestroyView()
-		super.onDestroyView()
-	}
-
-	override fun onResume() {
-		super.onResume()
-		if (titleId != 0) {
-			setTitle(getString(titleId))
-		}
-	}
-
-	@CallSuper
-	override fun onWindowInsetsChanged(insets: Insets) {
-		listView.updatePadding(
-			bottom = insets.bottom
-		)
-	}
-
-	@Suppress("UsePropertyAccessSyntax")
-	protected fun setTitle(title: CharSequence) {
-		(parentFragment as? SettingsHeadersFragment)?.setTitle(title)
-			?: activity?.setTitle(title)
-	}
-}
--- a/app/src/main/java/org/koitharu/kotatsu/base/ui/BaseService.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/base/ui/BaseService.kt
@@ -1,5 +0,0 @@
-package org.koitharu.kotatsu.base.ui
-
-import androidx.lifecycle.LifecycleService
-
-abstract class BaseService : LifecycleService()
--- a/app/src/main/java/org/koitharu/kotatsu/base/ui/BaseViewModel.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/base/ui/BaseViewModel.kt
@@ -1,49 +0,0 @@
-package org.koitharu.kotatsu.base.ui
-
-import androidx.lifecycle.LiveData
-import androidx.lifecycle.ViewModel
-import androidx.lifecycle.viewModelScope
-import kotlin.coroutines.CoroutineContext
-import kotlin.coroutines.EmptyCoroutineContext
-import kotlinx.coroutines.*
-import org.koitharu.kotatsu.base.ui.util.CountedBooleanLiveData
-import org.koitharu.kotatsu.utils.SingleLiveEvent
-import org.koitharu.kotatsu.utils.ext.printStackTraceDebug
-
-abstract class BaseViewModel : ViewModel() {
-
-	protected val loadingCounter = CountedBooleanLiveData()
-	protected val errorEvent = SingleLiveEvent<Throwable>()
-
-	val onError: LiveData<Throwable>
-		get() = errorEvent
-
-	val isLoading: LiveData<Boolean>
-		get() = loadingCounter
-
-	protected fun launchJob(
-		context: CoroutineContext = EmptyCoroutineContext,
-		start: CoroutineStart = CoroutineStart.DEFAULT,
-		block: suspend CoroutineScope.() -> Unit
-	): Job = viewModelScope.launch(context + createErrorHandler(), start, block)
-
-	protected fun launchLoadingJob(
-		context: CoroutineContext = EmptyCoroutineContext,
-		start: CoroutineStart = CoroutineStart.DEFAULT,
-		block: suspend CoroutineScope.() -> Unit
-	): Job = viewModelScope.launch(context + createErrorHandler(), start) {
-		loadingCounter.increment()
-		try {
-			block()
-		} finally {
-			loadingCounter.decrement()
-		}
-	}
-
-	private fun createErrorHandler() = CoroutineExceptionHandler { _, throwable ->
-		throwable.printStackTraceDebug()
-		if (throwable !is CancellationException) {
-			errorEvent.postCall(throwable)
-		}
-	}
-}
--- a/app/src/main/java/org/koitharu/kotatsu/base/ui/CoroutineIntentService.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/base/ui/CoroutineIntentService.kt
@@ -1,37 +0,0 @@
-package org.koitharu.kotatsu.base.ui
-
-import android.app.Service
-import android.content.Intent
-import androidx.lifecycle.lifecycleScope
-import kotlinx.coroutines.CoroutineDispatcher
-import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.launch
-import kotlinx.coroutines.sync.Mutex
-import kotlinx.coroutines.sync.withLock
-import kotlinx.coroutines.withContext
-
-abstract class CoroutineIntentService : BaseService() {
-
-	private val mutex = Mutex()
-	protected open val dispatcher: CoroutineDispatcher = Dispatchers.Default
-
-	override fun onStartCommand(intent: Intent?, flags: Int, startId: Int): Int {
-		super.onStartCommand(intent, flags, startId)
-		launchCoroutine(intent, startId)
-		return Service.START_REDELIVER_INTENT
-	}
-
-	private fun launchCoroutine(intent: Intent?, startId: Int) = lifecycleScope.launch {
-		mutex.withLock {
-			try {
-				withContext(dispatcher) {
-					processIntent(intent)
-				}
-			} finally {
-				stopSelf(startId)
-			}
-		}
-	}
-
-	protected abstract suspend fun processIntent(intent: Intent?)
-}
--- a/app/src/main/java/org/koitharu/kotatsu/base/ui/dialog/AppBottomSheetDialog.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/base/ui/dialog/AppBottomSheetDialog.kt
@@ -1,29 +0,0 @@
-package org.koitharu.kotatsu.base.ui.dialog
-
-import android.content.Context
-import android.graphics.Color
-import android.view.View
-import com.google.android.material.bottomsheet.BottomSheetDialog
-
-class AppBottomSheetDialog(context: Context, theme: Int) : BottomSheetDialog(context, theme) {
-
-	/**
-	 * https://github.com/material-components/material-components-android/issues/2582
-	 */
-	@Suppress("DEPRECATION")
-	override fun onAttachedToWindow() {
-		val window = window
-		val initialSystemUiVisibility = window?.decorView?.systemUiVisibility ?: 0
-		super.onAttachedToWindow()
-		if (window != null) {
-			// If the navigation bar is translucent at all, the BottomSheet should be edge to edge
-			val drawEdgeToEdge = edgeToEdgeEnabled && Color.alpha(window.navigationBarColor) < 0xFF
-			if (drawEdgeToEdge) {
-				// Copied from super.onAttachedToWindow:
-				val edgeToEdgeFlags = View.SYSTEM_UI_FLAG_LAYOUT_HIDE_NAVIGATION or View.SYSTEM_UI_FLAG_LAYOUT_STABLE
-				// Fix super-class's window flag bug by respecting the initial system UI visibility:
-				window.decorView.systemUiVisibility = edgeToEdgeFlags or initialSystemUiVisibility
-			}
-		}
-	}
-}
--- a/app/src/main/java/org/koitharu/kotatsu/base/ui/dialog/StorageSelectDialog.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/base/ui/dialog/StorageSelectDialog.kt
@@ -1,101 +0,0 @@
-package org.koitharu.kotatsu.base.ui.dialog
-
-import android.content.Context
-import android.content.DialogInterface
-import android.view.LayoutInflater
-import android.view.View
-import android.view.ViewGroup
-import android.widget.BaseAdapter
-import androidx.annotation.StringRes
-import androidx.appcompat.app.AlertDialog
-import com.google.android.material.dialog.MaterialAlertDialogBuilder
-import kotlinx.coroutines.runBlocking
-import org.koitharu.kotatsu.R
-import org.koitharu.kotatsu.databinding.ItemStorageBinding
-import org.koitharu.kotatsu.local.data.LocalStorageManager
-import java.io.File
-
-class StorageSelectDialog private constructor(private val delegate: AlertDialog) :
-	DialogInterface by delegate {
-
-	fun show() = delegate.show()
-
-	class Builder(context: Context, storageManager: LocalStorageManager, listener: OnStorageSelectListener) {
-
-		private val adapter = VolumesAdapter(storageManager)
-		private val delegate = MaterialAlertDialogBuilder(context)
-
-		init {
-			if (adapter.isEmpty) {
-				delegate.setMessage(R.string.cannot_find_available_storage)
-			} else {
-				val defaultValue = runBlocking {
-					storageManager.getDefaultWriteableDir()
-				}
-				adapter.selectedItemPosition = adapter.volumes.indexOfFirst {
-					it.first.canonicalPath == defaultValue?.canonicalPath
-				}
-				delegate.setAdapter(adapter) { d, i ->
-					listener.onStorageSelected(adapter.getItem(i).first)
-					d.dismiss()
-				}
-			}
-		}
-
-		fun setTitle(@StringRes titleResId: Int): Builder {
-			delegate.setTitle(titleResId)
-			return this
-		}
-
-		fun setTitle(title: CharSequence): Builder {
-			delegate.setTitle(title)
-			return this
-		}
-
-		fun setNegativeButton(@StringRes textId: Int): Builder {
-			delegate.setNegativeButton(textId, null)
-			return this
-		}
-
-		fun create() = StorageSelectDialog(delegate.create())
-	}
-
-	private class VolumesAdapter(storageManager: LocalStorageManager) : BaseAdapter() {
-
-		var selectedItemPosition: Int = -1
-		val volumes = getAvailableVolumes(storageManager)
-
-		override fun getView(position: Int, convertView: View?, parent: ViewGroup): View {
-			val view = convertView ?: LayoutInflater.from(parent.context).inflate(R.layout.item_storage, parent, false)
-			val binding = (view.tag as? ItemStorageBinding) ?: ItemStorageBinding.bind(view).also {
-				view.tag = it
-			}
-			val item = volumes[position]
-			binding.imageViewIndicator.isChecked = selectedItemPosition == position
-			binding.textViewTitle.text = item.second
-			binding.textViewSubtitle.text = item.first.path
-			return view
-		}
-
-		override fun getItem(position: Int): Pair<File, String> = volumes[position]
-
-		override fun getItemId(position: Int) = position.toLong()
-
-		override fun getCount() = volumes.size
-
-		override fun hasStableIds() = true
-
-		private fun getAvailableVolumes(storageManager: LocalStorageManager): List<Pair<File, String>> {
-			return runBlocking {
-				storageManager.getWriteableDirs().map {
-					it to storageManager.getStorageDisplayName(it)
-				}
-			}
-		}
-	}
-
-	fun interface OnStorageSelectListener {
-
-		fun onStorageSelected(file: File)
-	}
-}
--- a/app/src/main/java/org/koitharu/kotatsu/base/ui/list/AdapterDelegateClickListenerAdapter.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/base/ui/list/AdapterDelegateClickListenerAdapter.kt
@@ -1,20 +0,0 @@
-package org.koitharu.kotatsu.base.ui.list
-
-import android.view.View
-import android.view.View.OnClickListener
-import android.view.View.OnLongClickListener
-import com.hannesdorfmann.adapterdelegates4.dsl.AdapterDelegateViewBindingViewHolder
-
-class AdapterDelegateClickListenerAdapter<I>(
-	private val adapterDelegate: AdapterDelegateViewBindingViewHolder<I, *>,
-	private val clickListener: OnListItemClickListener<I>,
-) : OnClickListener, OnLongClickListener {
-
-	override fun onClick(v: View) {
-		clickListener.onItemClick(adapterDelegate.item, v)
-	}
-
-	override fun onLongClick(v: View): Boolean {
-		return clickListener.onItemLongClick(adapterDelegate.item, v)
-	}
-}
--- a/app/src/main/java/org/koitharu/kotatsu/base/ui/list/FitHeightGridLayoutManager.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/base/ui/list/FitHeightGridLayoutManager.kt
@@ -1,37 +0,0 @@
-package org.koitharu.kotatsu.base.ui.list
-
-import android.content.Context
-import android.util.AttributeSet
-import android.view.View
-import androidx.recyclerview.widget.GridLayoutManager
-import androidx.recyclerview.widget.RecyclerView
-
-class FitHeightGridLayoutManager : GridLayoutManager {
-
-	constructor(context: Context?, spanCount: Int) : super(context, spanCount)
-
-	constructor(
-		context: Context?,
-		attrs: AttributeSet?,
-		defStyleAttr: Int,
-		defStyleRes: Int,
-	) : super(context, attrs, defStyleAttr, defStyleRes)
-
-	constructor(
-		context: Context?,
-		spanCount: Int,
-		orientation: Int,
-		reverseLayout: Boolean,
-	) : super(context, spanCount, orientation, reverseLayout)
-
-
-	override fun layoutDecoratedWithMargins(child: View, left: Int, top: Int, right: Int, bottom: Int) {
-		if (orientation == RecyclerView.VERTICAL && child.layoutParams.height == LayoutParams.MATCH_PARENT) {
-			val parentBottom = height - paddingBottom
-			val offset = parentBottom - bottom
-			super.layoutDecoratedWithMargins(child, left, top + offset, right, bottom + offset)
-		} else {
-			super.layoutDecoratedWithMargins(child, left, top, right, bottom)
-		}
-	}
-}
--- a/app/src/main/java/org/koitharu/kotatsu/base/ui/list/FitHeightLinearLayoutManager.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/base/ui/list/FitHeightLinearLayoutManager.kt
@@ -1,37 +0,0 @@
-package org.koitharu.kotatsu.base.ui.list
-
-import android.content.Context
-import android.util.AttributeSet
-import android.view.View
-import androidx.annotation.AttrRes
-import androidx.annotation.StyleRes
-import androidx.recyclerview.widget.LinearLayoutManager
-import androidx.recyclerview.widget.RecyclerView
-import androidx.recyclerview.widget.RecyclerView.LayoutParams
-
-class FitHeightLinearLayoutManager : LinearLayoutManager {
-
-	constructor(context: Context) : super(context)
-	constructor(
-		context: Context,
-		@RecyclerView.Orientation orientation: Int,
-		reverseLayout: Boolean,
-	) : super(context, orientation, reverseLayout)
-
-	constructor(
-		context: Context,
-		attrs: AttributeSet?,
-		@AttrRes defStyleAttr: Int,
-		@StyleRes defStyleRes: Int,
-	) : super(context, attrs, defStyleAttr, defStyleRes)
-
-	override fun layoutDecoratedWithMargins(child: View, left: Int, top: Int, right: Int, bottom: Int) {
-		if (orientation == RecyclerView.VERTICAL && child.layoutParams.height == LayoutParams.MATCH_PARENT) {
-			val parentBottom = height - paddingBottom
-			val offset = parentBottom - bottom
-			super.layoutDecoratedWithMargins(child, left, top + offset, right, bottom + offset)
-		} else {
-			super.layoutDecoratedWithMargins(child, left, top, right, bottom)
-		}
-	}
-}
--- a/app/src/main/java/org/koitharu/kotatsu/base/ui/list/ListSelectionController.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/base/ui/list/ListSelectionController.kt
@@ -1,162 +0,0 @@
-package org.koitharu.kotatsu.base.ui.list
-
-import android.app.Activity
-import android.os.Bundle
-import android.view.Menu
-import android.view.MenuItem
-import androidx.appcompat.app.AppCompatActivity
-import androidx.appcompat.view.ActionMode
-import androidx.lifecycle.Lifecycle
-import androidx.lifecycle.LifecycleEventObserver
-import androidx.lifecycle.LifecycleOwner
-import androidx.recyclerview.widget.RecyclerView
-import androidx.savedstate.SavedStateRegistry
-import androidx.savedstate.SavedStateRegistryOwner
-import kotlinx.coroutines.Dispatchers
-import org.koitharu.kotatsu.base.ui.list.decor.AbstractSelectionItemDecoration
-import kotlin.coroutines.EmptyCoroutineContext
-
-private const val KEY_SELECTION = "selection"
-private const val PROVIDER_NAME = "selection_decoration"
-
-class ListSelectionController(
-	private val activity: Activity,
-	private val decoration: AbstractSelectionItemDecoration,
-	private val registryOwner: SavedStateRegistryOwner,
-	private val callback: Callback,
-) : ActionMode.Callback, SavedStateRegistry.SavedStateProvider {
-
-	private var actionMode: ActionMode? = null
-	private val stateEventObserver = StateEventObserver()
-
-	val count: Int
-		get() = decoration.checkedItemsCount
-
-	fun snapshot(): Set<Long> {
-		return peekCheckedIds().toSet()
-	}
-
-	fun peekCheckedIds(): Set<Long> {
-		return decoration.checkedItemsIds
-	}
-
-	fun clear() {
-		decoration.clearSelection()
-		notifySelectionChanged()
-	}
-
-	fun addAll(ids: Collection<Long>) {
-		if (ids.isEmpty()) {
-			return
-		}
-		decoration.checkAll(ids)
-		notifySelectionChanged()
-	}
-
-	fun attachToRecyclerView(recyclerView: RecyclerView) {
-		recyclerView.addItemDecoration(decoration)
-		registryOwner.lifecycle.addObserver(stateEventObserver)
-	}
-
-	override fun saveState(): Bundle {
-		val bundle = Bundle(1)
-		bundle.putLongArray(KEY_SELECTION, peekCheckedIds().toLongArray())
-		return bundle
-	}
-
-	fun onItemClick(id: Long): Boolean {
-		if (decoration.checkedItemsCount != 0) {
-			decoration.toggleItemChecked(id)
-			if (decoration.checkedItemsCount == 0) {
-				actionMode?.finish()
-			} else {
-				actionMode?.invalidate()
-			}
-			notifySelectionChanged()
-			return true
-		}
-		return false
-	}
-
-	fun onItemLongClick(id: Long): Boolean {
-		startActionMode()
-		return actionMode?.also {
-			decoration.setItemIsChecked(id, true)
-			notifySelectionChanged()
-		} != null
-	}
-
-	override fun onCreateActionMode(mode: ActionMode, menu: Menu): Boolean {
-		return callback.onCreateActionMode(mode, menu)
-	}
-
-	override fun onPrepareActionMode(mode: ActionMode, menu: Menu): Boolean {
-		return callback.onPrepareActionMode(mode, menu)
-	}
-
-	override fun onActionItemClicked(mode: ActionMode, item: MenuItem): Boolean {
-		return callback.onActionItemClicked(mode, item)
-	}
-
-	override fun onDestroyActionMode(mode: ActionMode) {
-		callback.onDestroyActionMode(mode)
-		clear()
-		actionMode = null
-	}
-
-	private fun startActionMode() {
-		if (actionMode == null) {
-			actionMode = (activity as? AppCompatActivity)?.startSupportActionMode(this)
-		}
-	}
-
-	private fun notifySelectionChanged() {
-		val count = decoration.checkedItemsCount
-		callback.onSelectionChanged(count)
-		if (count == 0) {
-			actionMode?.finish()
-		} else {
-			actionMode?.invalidate()
-		}
-	}
-
-	private fun restoreState(ids: Collection<Long>) {
-		if (ids.isEmpty() || decoration.checkedItemsCount != 0) {
-			return
-		}
-		decoration.checkAll(ids)
-		startActionMode()
-		notifySelectionChanged()
-	}
-
-	interface Callback : ActionMode.Callback {
-
-		fun onSelectionChanged(count: Int)
-
-		override fun onCreateActionMode(mode: ActionMode, menu: Menu): Boolean
-
-		override fun onPrepareActionMode(mode: ActionMode, menu: Menu): Boolean
-
-		override fun onActionItemClicked(mode: ActionMode, item: MenuItem): Boolean
-
-		override fun onDestroyActionMode(mode: ActionMode) = Unit
-	}
-
-	private inner class StateEventObserver : LifecycleEventObserver {
-
-		override fun onStateChanged(source: LifecycleOwner, event: Lifecycle.Event) {
-			if (event == Lifecycle.Event.ON_CREATE) {
-				val registry = registryOwner.savedStateRegistry
-				registry.registerSavedStateProvider(PROVIDER_NAME, this@ListSelectionController)
-				val state = registry.consumeRestoredStateForKey(PROVIDER_NAME)
-				if (state != null) {
-					Dispatchers.Main.dispatch(EmptyCoroutineContext) { // == Handler.post
-						if (source.lifecycle.currentState.isAtLeast(Lifecycle.State.CREATED)) {
-							restoreState(state.getLongArray(KEY_SELECTION)?.toList().orEmpty())
-						}
-					}
-				}
-			}
-		}
-	}
-}
--- a/app/src/main/java/org/koitharu/kotatsu/base/ui/list/OnListItemClickListener.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/base/ui/list/OnListItemClickListener.kt
@@ -1,10 +0,0 @@
-package org.koitharu.kotatsu.base.ui.list
-
-import android.view.View
-
-interface OnListItemClickListener<I> {
-
-	fun onItemClick(item: I, view: View)
-
-	fun onItemLongClick(item: I, view: View) = false
-}
--- a/app/src/main/java/org/koitharu/kotatsu/base/ui/list/PaginationScrollListener.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/base/ui/list/PaginationScrollListener.kt
@@ -1,18 +0,0 @@
-package org.koitharu.kotatsu.base.ui.list
-
-import androidx.recyclerview.widget.RecyclerView
-
-class PaginationScrollListener(offset: Int, private val callback: Callback) :
-	BoundsScrollListener(0, offset) {
-
-	override fun onScrolledToStart(recyclerView: RecyclerView) = Unit
-
-	override fun onScrolledToEnd(recyclerView: RecyclerView) {
-		callback.onScrolledToEnd()
-	}
-
-	interface Callback {
-
-		fun onScrolledToEnd()
-	}
-}
--- a/app/src/main/java/org/koitharu/kotatsu/base/ui/list/decor/AbstractDividerItemDecoration.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/base/ui/list/decor/AbstractDividerItemDecoration.kt
@@ -1,87 +0,0 @@
-package org.koitharu.kotatsu.base.ui.list.decor
-
-import android.annotation.SuppressLint
-import android.content.Context
-import android.graphics.Canvas
-import android.graphics.Paint
-import android.graphics.Rect
-import android.view.View
-import androidx.core.content.res.getColorOrThrow
-import androidx.core.view.children
-import androidx.recyclerview.widget.RecyclerView
-import com.google.android.material.R as materialR
-
-@SuppressLint("PrivateResource")
-abstract class AbstractDividerItemDecoration(context: Context) : RecyclerView.ItemDecoration() {
-
-	private val bounds = Rect()
-	private val thickness: Int
-	private val paint = Paint(Paint.ANTI_ALIAS_FLAG)
-
-	init {
-		paint.style = Paint.Style.FILL
-		val ta = context.obtainStyledAttributes(
-			null,
-			materialR.styleable.MaterialDivider,
-			materialR.attr.materialDividerStyle,
-			materialR.style.Widget_Material3_MaterialDivider,
-		)
-		paint.color = ta.getColorOrThrow(materialR.styleable.MaterialDivider_dividerColor)
-		thickness = ta.getDimensionPixelSize(
-			materialR.styleable.MaterialDivider_dividerThickness,
-			context.resources.getDimensionPixelSize(materialR.dimen.material_divider_thickness),
-		)
-		ta.recycle()
-	}
-
-
-	override fun getItemOffsets(
-		outRect: Rect,
-		view: View,
-		parent: RecyclerView,
-		state: RecyclerView.State,
-	) {
-		outRect.set(0, thickness, 0, 0)
-	}
-
-	// TODO implement for horizontal lists on demand
-	override fun onDraw(canvas: Canvas, parent: RecyclerView, s: RecyclerView.State) {
-		if (parent.layoutManager == null || thickness == 0) {
-			return
-		}
-		canvas.save()
-		val left: Float
-		val right: Float
-		if (parent.clipToPadding) {
-			left = parent.paddingLeft.toFloat()
-			right = (parent.width - parent.paddingRight).toFloat()
-			canvas.clipRect(
-				left,
-				parent.paddingTop.toFloat(),
-				right,
-				(parent.height - parent.paddingBottom).toFloat()
-			)
-		} else {
-			left = 0f
-			right = parent.width.toFloat()
-		}
-
-		var previous: RecyclerView.ViewHolder? = null
-		for (child in parent.children) {
-			val holder = parent.getChildViewHolder(child)
-			if (previous != null && shouldDrawDivider(previous, holder)) {
-				parent.getDecoratedBoundsWithMargins(child, bounds)
-				val top: Float = bounds.top + child.translationY
-				val bottom: Float = top + thickness
-				canvas.drawRect(left, top, right, bottom, paint)
-			}
-			previous = holder
-		}
-		canvas.restore()
-	}
-
-	protected abstract fun shouldDrawDivider(
-		above: RecyclerView.ViewHolder,
-		below: RecyclerView.ViewHolder,
-	): Boolean
-}
--- a/app/src/main/java/org/koitharu/kotatsu/base/ui/list/decor/AbstractSelectionItemDecoration.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/base/ui/list/decor/AbstractSelectionItemDecoration.kt
@@ -1,111 +0,0 @@
-package org.koitharu.kotatsu.base.ui.list.decor
-
-import android.graphics.Canvas
-import android.graphics.Rect
-import android.graphics.RectF
-import android.view.View
-import androidx.core.view.children
-import androidx.recyclerview.widget.RecyclerView
-import androidx.recyclerview.widget.RecyclerView.NO_ID
-
-abstract class AbstractSelectionItemDecoration : RecyclerView.ItemDecoration() {
-
-	private val bounds = Rect()
-	private val boundsF = RectF()
-	protected val selection = HashSet<Long>()
-
-	protected var hasBackground: Boolean = true
-	protected var hasForeground: Boolean = false
-	protected var isIncludeDecorAndMargins: Boolean = true
-
-	val checkedItemsCount: Int
-		get() = selection.size
-
-	val checkedItemsIds: Set<Long>
-		get() = selection
-
-	fun toggleItemChecked(id: Long) {
-		if (!selection.remove(id)) {
-			selection.add(id)
-		}
-	}
-
-	fun setItemIsChecked(id: Long, isChecked: Boolean) {
-		if (isChecked) {
-			selection.add(id)
-		} else {
-			selection.remove(id)
-		}
-	}
-
-	fun checkAll(ids: Collection<Long>) {
-		selection.addAll(ids)
-	}
-
-	fun clearSelection() {
-		selection.clear()
-	}
-
-	override fun onDraw(canvas: Canvas, parent: RecyclerView, state: RecyclerView.State) {
-		if (hasBackground) {
-			doDraw(canvas, parent, state, false)
-		} else {
-			super.onDraw(canvas, parent, state)
-		}
-	}
-
-	override fun onDrawOver(canvas: Canvas, parent: RecyclerView, state: RecyclerView.State) {
-		if (hasForeground) {
-			doDraw(canvas, parent, state, true)
-		} else {
-			super.onDrawOver(canvas, parent, state)
-		}
-	}
-
-	private fun doDraw(canvas: Canvas, parent: RecyclerView, state: RecyclerView.State, isOver: Boolean) {
-		val checkpoint = canvas.save()
-		if (parent.clipToPadding) {
-			canvas.clipRect(
-				parent.paddingLeft, parent.paddingTop, parent.width - parent.paddingRight,
-				parent.height - parent.paddingBottom
-			)
-		}
-
-		for (child in parent.children) {
-			val itemId = getItemId(parent, child)
-			if (itemId != NO_ID && itemId in selection) {
-				if (isIncludeDecorAndMargins) {
-					parent.getDecoratedBoundsWithMargins(child, bounds)
-				} else {
-					bounds.set(child.left, child.top, child.right, child.bottom)
-				}
-				boundsF.set(bounds)
-				boundsF.offset(child.translationX, child.translationY)
-				if (isOver) {
-					onDrawForeground(canvas, parent, child, boundsF, state)
-				} else {
-					onDrawBackground(canvas, parent, child, boundsF, state)
-				}
-			}
-		}
-		canvas.restoreToCount(checkpoint)
-	}
-
-	protected open fun getItemId(parent: RecyclerView, child: View) = parent.getChildItemId(child)
-
-	protected open fun onDrawBackground(
-		canvas: Canvas,
-		parent: RecyclerView,
-		child: View,
-		bounds: RectF,
-		state: RecyclerView.State,
-	) = Unit
-
-	protected open fun onDrawForeground(
-		canvas: Canvas,
-		parent: RecyclerView,
-		child: View,
-		bounds: RectF,
-		state: RecyclerView.State,
-	) = Unit
-}
--- a/app/src/main/java/org/koitharu/kotatsu/base/ui/list/decor/SpacingItemDecoration.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/base/ui/list/decor/SpacingItemDecoration.kt
@@ -1,18 +0,0 @@
-package org.koitharu.kotatsu.base.ui.list.decor
-
-import android.graphics.Rect
-import android.view.View
-import androidx.annotation.Px
-import androidx.recyclerview.widget.RecyclerView
-
-class SpacingItemDecoration(@Px private val spacing: Int) : RecyclerView.ItemDecoration() {
-
-	override fun getItemOffsets(
-		outRect: Rect,
-		view: View,
-		parent: RecyclerView,
-		state: RecyclerView.State
-	) {
-		outRect.set(spacing, spacing, spacing, spacing)
-	}
-}
--- a/app/src/main/java/org/koitharu/kotatsu/base/ui/list/decor/TypedSpacingItemDecoration.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/base/ui/list/decor/TypedSpacingItemDecoration.kt
@@ -1,35 +0,0 @@
-package org.koitharu.kotatsu.base.ui.list.decor
-
-import android.graphics.Rect
-import android.util.SparseIntArray
-import android.view.View
-import androidx.core.util.getOrDefault
-import androidx.core.util.set
-import androidx.recyclerview.widget.RecyclerView
-
-class TypedSpacingItemDecoration(
-	vararg spacingMapping: Pair<Int, Int>,
-	private val fallbackSpacing: Int = 0,
-) : RecyclerView.ItemDecoration() {
-
-	private val mapping = SparseIntArray(spacingMapping.size)
-	
-	init {
-		spacingMapping.forEach { (k, v) -> mapping[k] = v }
-	}
-
-	override fun getItemOffsets(
-		outRect: Rect,
-		view: View,
-		parent: RecyclerView,
-		state: RecyclerView.State
-	) {
-		val itemType = parent.getChildViewHolder(view)?.itemViewType
-		val spacing = if (itemType == null) {
-			fallbackSpacing
-		} else {
-			mapping.getOrDefault(itemType, fallbackSpacing)
-		}
-		outRect.set(spacing, spacing, spacing, spacing)
-	}
-}
--- a/app/src/main/java/org/koitharu/kotatsu/base/ui/util/ActionModeDelegate.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/base/ui/util/ActionModeDelegate.kt
@@ -1,50 +0,0 @@
-package org.koitharu.kotatsu.base.ui.util
-
-import androidx.appcompat.view.ActionMode
-import androidx.lifecycle.DefaultLifecycleObserver
-import androidx.lifecycle.LifecycleOwner
-
-class ActionModeDelegate {
-
-	private var activeActionMode: ActionMode? = null
-	private var listeners: MutableList<ActionModeListener>? = null
-
-	val isActionModeStarted: Boolean
-		get() = activeActionMode != null
-
-	fun onSupportActionModeStarted(mode: ActionMode) {
-		activeActionMode = mode
-		listeners?.forEach { it.onActionModeStarted(mode) }
-	}
-
-	fun onSupportActionModeFinished(mode: ActionMode) {
-		activeActionMode = null
-		listeners?.forEach { it.onActionModeFinished(mode) }
-	}
-
-	fun addListener(listener: ActionModeListener) {
-		if (listeners == null) {
-			listeners = ArrayList()
-		}
-		checkNotNull(listeners).add(listener)
-	}
-
-	fun removeListener(listener: ActionModeListener) {
-		listeners?.remove(listener)
-	}
-
-	fun addListener(listener: ActionModeListener, owner: LifecycleOwner) {
-		addListener(listener)
-		owner.lifecycle.addObserver(ListenerLifecycleObserver(listener))
-	}
-
-	private inner class ListenerLifecycleObserver(
-		private val listener: ActionModeListener,
-	) : DefaultLifecycleObserver {
-
-		override fun onDestroy(owner: LifecycleOwner) {
-			super.onDestroy(owner)
-			removeListener(listener)
-		}
-	}
-}
--- a/app/src/main/java/org/koitharu/kotatsu/base/ui/util/ActionModeListener.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/base/ui/util/ActionModeListener.kt
@@ -1,10 +0,0 @@
-package org.koitharu.kotatsu.base.ui.util
-
-import androidx.appcompat.view.ActionMode
-
-interface ActionModeListener {
-
-	fun onActionModeStarted(mode: ActionMode)
-
-	fun onActionModeFinished(mode: ActionMode)
-}
--- a/app/src/main/java/org/koitharu/kotatsu/base/ui/util/ActivityRecreationHandle.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/base/ui/util/ActivityRecreationHandle.kt
@@ -1,34 +0,0 @@
-package org.koitharu.kotatsu.base.ui.util
-
-import android.app.Activity
-import android.app.Application.ActivityLifecycleCallbacks
-import android.os.Bundle
-import java.util.*
-
-class ActivityRecreationHandle : ActivityLifecycleCallbacks {
-
-	private val activities = WeakHashMap<Activity, Unit>()
-
-	override fun onActivityCreated(activity: Activity, savedInstanceState: Bundle?) {
-		activities[activity] = Unit
-	}
-
-	override fun onActivityStarted(activity: Activity) = Unit
-
-	override fun onActivityResumed(activity: Activity) = Unit
-
-	override fun onActivityPaused(activity: Activity) = Unit
-
-	override fun onActivityStopped(activity: Activity) = Unit
-
-	override fun onActivitySaveInstanceState(activity: Activity, outState: Bundle) = Unit
-
-	override fun onActivityDestroyed(activity: Activity) {
-		activities.remove(activity)
-	}
-
-	fun recreateAll() {
-		val snapshot = activities.keys.toList()
-		snapshot.forEach { it.recreate() }
-	}
-}
--- a/app/src/main/java/org/koitharu/kotatsu/base/ui/util/CountedBooleanLiveData.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/base/ui/util/CountedBooleanLiveData.kt
@@ -1,31 +0,0 @@
-package org.koitharu.kotatsu.base.ui.util
-
-import androidx.annotation.AnyThread
-import androidx.lifecycle.LiveData
-import java.util.concurrent.atomic.AtomicInteger
-
-class CountedBooleanLiveData : LiveData<Boolean>(false) {
-
-	private val counter = AtomicInteger(0)
-
-	@AnyThread
-	fun increment() {
-		if (counter.getAndIncrement() == 0) {
-			postValue(true)
-		}
-	}
-
-	@AnyThread
-	fun decrement() {
-		if (counter.decrementAndGet() == 0) {
-			postValue(false)
-		}
-	}
-
-	@AnyThread
-	fun reset() {
-		if (counter.getAndSet(0) != 0) {
-			postValue(false)
-		}
-	}
-}
--- a/app/src/main/java/org/koitharu/kotatsu/base/ui/util/RecyclerViewOwner.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/base/ui/util/RecyclerViewOwner.kt
@@ -1,8 +0,0 @@
-package org.koitharu.kotatsu.base.ui.util
-
-import androidx.recyclerview.widget.RecyclerView
-
-interface RecyclerViewOwner {
-
-	val recyclerView: RecyclerView
-}
--- a/app/src/main/java/org/koitharu/kotatsu/base/ui/util/ShrinkOnScrollBehavior.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/base/ui/util/ShrinkOnScrollBehavior.kt
@@ -1,48 +0,0 @@
-package org.koitharu.kotatsu.base.ui.util
-
-import android.content.Context
-import android.util.AttributeSet
-import android.view.View
-import androidx.coordinatorlayout.widget.CoordinatorLayout
-import androidx.coordinatorlayout.widget.CoordinatorLayout.Behavior
-import androidx.core.view.ViewCompat
-import com.google.android.material.floatingactionbutton.ExtendedFloatingActionButton
-
-class ShrinkOnScrollBehavior : Behavior<ExtendedFloatingActionButton> {
-
-	@Suppress("unused") constructor() : super()
-	@Suppress("unused") constructor(context: Context?, attrs: AttributeSet?) : super(context, attrs)
-
-	override fun onStartNestedScroll(
-		coordinatorLayout: CoordinatorLayout,
-		child: ExtendedFloatingActionButton,
-		directTargetChild: View,
-		target: View,
-		axes: Int,
-		type: Int
-	): Boolean {
-		return axes == ViewCompat.SCROLL_AXIS_VERTICAL
-	}
-
-	override fun onNestedScroll(
-		coordinatorLayout: CoordinatorLayout,
-		child: ExtendedFloatingActionButton,
-		target: View,
-		dxConsumed: Int,
-		dyConsumed: Int,
-		dxUnconsumed: Int,
-		dyUnconsumed: Int,
-		type: Int,
-		consumed: IntArray
-	) {
-		if (dyConsumed > 0) {
-			if (child.isExtended) {
-				child.shrink()
-			}
-		} else if (dyConsumed < 0) {
-			if (!child.isExtended) {
-				child.extend()
-			}
-		}
-	}
-}
--- a/app/src/main/java/org/koitharu/kotatsu/base/ui/util/WindowInsetsDelegate.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/base/ui/util/WindowInsetsDelegate.kt
@@ -1,66 +0,0 @@
-package org.koitharu.kotatsu.base.ui.util
-
-import android.view.View
-import androidx.core.graphics.Insets
-import androidx.core.view.OnApplyWindowInsetsListener
-import androidx.core.view.ViewCompat
-import androidx.core.view.WindowInsetsCompat
-
-class WindowInsetsDelegate(
-	private val listener: WindowInsetsListener,
-) : OnApplyWindowInsetsListener, View.OnLayoutChangeListener {
-
-	var handleImeInsets: Boolean = false
-
-	var interceptingWindowInsetsListener: OnApplyWindowInsetsListener? = null
-
-	private var lastInsets: Insets? = null
-
-	override fun onApplyWindowInsets(v: View, insets: WindowInsetsCompat): WindowInsetsCompat {
-		val handledInsets = interceptingWindowInsetsListener?.onApplyWindowInsets(v, insets) ?: insets
-		val newInsets = if (handleImeInsets) {
-			Insets.max(
-				handledInsets.getInsets(WindowInsetsCompat.Type.systemBars()),
-				handledInsets.getInsets(WindowInsetsCompat.Type.ime()),
-			)
-		} else {
-			handledInsets.getInsets(WindowInsetsCompat.Type.systemBars())
-		}
-		if (newInsets != lastInsets) {
-			listener.onWindowInsetsChanged(newInsets)
-			lastInsets = newInsets
-		}
-		return handledInsets
-	}
-
-	override fun onLayoutChange(
-		view: View,
-		left: Int,
-		top: Int,
-		right: Int,
-		bottom: Int,
-		oldLeft: Int,
-		oldTop: Int,
-		oldRight: Int,
-		oldBottom: Int,
-	) {
-		view.removeOnLayoutChangeListener(this)
-		if (lastInsets == null) { // Listener may not be called
-			onApplyWindowInsets(view, ViewCompat.getRootWindowInsets(view) ?: return)
-		}
-	}
-
-	fun onViewCreated(view: View) {
-		ViewCompat.setOnApplyWindowInsetsListener(view, this)
-		view.addOnLayoutChangeListener(this)
-	}
-
-	fun onDestroyView() {
-		lastInsets = null
-	}
-
-	interface WindowInsetsListener {
-
-		fun onWindowInsetsChanged(insets: Insets)
-	}
-}
--- a/app/src/main/java/org/koitharu/kotatsu/base/ui/widgets/CheckableButtonGroup.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/base/ui/widgets/CheckableButtonGroup.kt
@@ -1,42 +0,0 @@
-package org.koitharu.kotatsu.base.ui.widgets
-
-import android.content.Context
-import android.util.AttributeSet
-import android.view.View
-import android.view.ViewGroup
-import android.widget.LinearLayout
-import androidx.annotation.AttrRes
-import androidx.annotation.IdRes
-import androidx.core.view.children
-import com.google.android.material.button.MaterialButton
-
-class CheckableButtonGroup @JvmOverloads constructor(
-	context: Context,
-	attrs: AttributeSet? = null,
-	@AttrRes defStyleAttr: Int = 0,
-) : LinearLayout(context, attrs, defStyleAttr), View.OnClickListener {
-
-	var onCheckedChangeListener: OnCheckedChangeListener? = null
-
-	override fun addView(child: View?, index: Int, params: ViewGroup.LayoutParams?) {
-		if (child is MaterialButton) {
-			child.setOnClickListener(this)
-		}
-		super.addView(child, index, params)
-	}
-
-	override fun onClick(v: View) {
-		setCheckedId(v.id)
-	}
-
-	fun setCheckedId(@IdRes viewRes: Int) {
-		children.forEach {
-			(it as? MaterialButton)?.isChecked = it.id == viewRes
-		}
-		onCheckedChangeListener?.onCheckedChanged(this, viewRes)
-	}
-
-	fun interface OnCheckedChangeListener {
-		fun onCheckedChanged(group: CheckableButtonGroup, checkedId: Int)
-	}
-}
--- a/app/src/main/java/org/koitharu/kotatsu/base/ui/widgets/CheckableImageView.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/base/ui/widgets/CheckableImageView.kt
@@ -1,104 +0,0 @@
-package org.koitharu.kotatsu.base.ui.widgets
-
-import android.content.Context
-import android.os.Parcel
-import android.os.Parcelable
-import android.os.Parcelable.Creator
-import android.util.AttributeSet
-import android.view.View
-import android.widget.Checkable
-import androidx.annotation.AttrRes
-import androidx.appcompat.widget.AppCompatImageView
-import androidx.core.os.ParcelCompat
-import androidx.customview.view.AbsSavedState
-
-class CheckableImageView @JvmOverloads constructor(
-	context: Context,
-	attrs: AttributeSet? = null,
-	@AttrRes defStyleAttr: Int = 0,
-) : AppCompatImageView(context, attrs, defStyleAttr), Checkable {
-
-	private var isCheckedInternal = false
-	private var isBroadcasting = false
-
-	var onCheckedChangeListener: OnCheckedChangeListener? = null
-
-	override fun isChecked() = isCheckedInternal
-
-	override fun toggle() {
-		isChecked = !isCheckedInternal
-	}
-
-	override fun setChecked(checked: Boolean) {
-		if (checked != isCheckedInternal) {
-			isCheckedInternal = checked
-			refreshDrawableState()
-			if (!isBroadcasting) {
-				isBroadcasting = true
-				onCheckedChangeListener?.onCheckedChanged(this, checked)
-				isBroadcasting = false
-			}
-		}
-	}
-
-	override fun onCreateDrawableState(extraSpace: Int): IntArray {
-		val state = super.onCreateDrawableState(extraSpace + 1)
-		if (isCheckedInternal) {
-			mergeDrawableStates(state, intArrayOf(android.R.attr.state_checked))
-		}
-		return state
-	}
-
-	override fun onSaveInstanceState(): Parcelable? {
-		val superState = super.onSaveInstanceState() ?: return null
-		return SavedState(superState, isChecked)
-	}
-
-	override fun onRestoreInstanceState(state: Parcelable?) {
-		if (state is SavedState) {
-			super.onRestoreInstanceState(state.superState)
-			isChecked = state.isChecked
-		} else {
-			super.onRestoreInstanceState(state)
-		}
-	}
-
-	class ToggleOnClickListener : OnClickListener {
-		override fun onClick(view: View) {
-			(view as? Checkable)?.toggle()
-		}
-	}
-
-	fun interface OnCheckedChangeListener {
-
-		fun onCheckedChanged(view: CheckableImageView, isChecked: Boolean)
-	}
-
-	private class SavedState : AbsSavedState {
-
-		val isChecked: Boolean
-
-		constructor(superState: Parcelable, checked: Boolean) : super(superState) {
-			isChecked = checked
-		}
-
-		constructor(source: Parcel, classLoader: ClassLoader?) : super(source, classLoader) {
-			isChecked = ParcelCompat.readBoolean(source)
-		}
-
-		override fun writeToParcel(out: Parcel, flags: Int) {
-			super.writeToParcel(out, flags)
-			ParcelCompat.writeBoolean(out, isChecked)
-		}
-
-		companion object {
-			@Suppress("unused")
-			@JvmField
-			val CREATOR: Creator<SavedState> = object : Creator<SavedState> {
-				override fun createFromParcel(`in`: Parcel) = SavedState(`in`, SavedState::class.java.classLoader)
-
-				override fun newArray(size: Int): Array<SavedState?> = arrayOfNulls(size)
-			}
-		}
-	}
-}
--- a/app/src/main/java/org/koitharu/kotatsu/base/ui/widgets/ChipsView.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/base/ui/widgets/ChipsView.kt
@@ -1,134 +0,0 @@
-package org.koitharu.kotatsu.base.ui.widgets
-
-import android.content.Context
-import android.util.AttributeSet
-import android.view.View.OnClickListener
-import androidx.annotation.DrawableRes
-import androidx.core.view.children
-import com.google.android.material.chip.Chip
-import com.google.android.material.chip.ChipDrawable
-import com.google.android.material.chip.ChipGroup
-import org.koitharu.kotatsu.R
-
-class ChipsView @JvmOverloads constructor(
-	context: Context,
-	attrs: AttributeSet? = null,
-	defStyleAttr: Int = com.google.android.material.R.attr.chipGroupStyle
-) : ChipGroup(context, attrs, defStyleAttr) {
-
-	private var isLayoutSuppressedCompat = false
-	private var isLayoutCalledOnSuppressed = false
-	private var chipOnClickListener = OnClickListener {
-		onChipClickListener?.onChipClick(it as Chip, it.tag)
-	}
-	private var chipOnCloseListener = OnClickListener {
-		onChipCloseClickListener?.onChipCloseClick(it as Chip, it.tag)
-	}
-	var onChipClickListener: OnChipClickListener? = null
-		set(value) {
-			field = value
-			val isChipClickable = value != null
-			children.forEach { it.isClickable = isChipClickable }
-		}
-	var onChipCloseClickListener: OnChipCloseClickListener? = null
-		set(value) {
-			field = value
-			val isCloseIconVisible = value != null
-			children.forEach { (it as? Chip)?.isCloseIconVisible = isCloseIconVisible }
-		}
-
-	override fun requestLayout() {
-		if (isLayoutSuppressedCompat) {
-			isLayoutCalledOnSuppressed = true
-		} else {
-			super.requestLayout()
-		}
-	}
-
-	fun setChips(items: Collection<ChipModel>) {
-		suppressLayoutCompat(true)
-		try {
-			for ((i, model) in items.withIndex()) {
-				val chip = getChildAt(i) as Chip? ?: addChip()
-				bindChip(chip, model)
-			}
-			if (childCount > items.size) {
-				removeViews(items.size, childCount - items.size)
-			}
-		} finally {
-			suppressLayoutCompat(false)
-		}
-	}
-
-	private fun bindChip(chip: Chip, model: ChipModel) {
-		chip.text = model.title
-		if (model.icon == 0) {
-			chip.isChipIconVisible = false
-		} else {
-			chip.isCheckedIconVisible = true
-			chip.setChipIconResource(model.icon)
-		}
-		chip.isClickable = onChipClickListener != null
-		chip.tag = model.data
-	}
-
-	private fun addChip(): Chip {
-		val chip = Chip(context)
-		val drawable = ChipDrawable.createFromAttributes(context, null, 0, R.style.Widget_Kotatsu_Chip)
-		chip.setChipDrawable(drawable)
-		chip.isCloseIconVisible = onChipCloseClickListener != null
-		chip.setOnCloseIconClickListener(chipOnCloseListener)
-		chip.setEnsureMinTouchTargetSize(false)
-		chip.setOnClickListener(chipOnClickListener)
-		chip.isCheckable = false
-		addView(chip)
-		return chip
-	}
-
-	private fun suppressLayoutCompat(suppress: Boolean) {
-		isLayoutSuppressedCompat = suppress
-		if (!suppress) {
-			if (isLayoutCalledOnSuppressed) {
-				requestLayout()
-				isLayoutCalledOnSuppressed = false
-			}
-		}
-	}
-
-	class ChipModel(
-		@DrawableRes val icon: Int,
-		val title: CharSequence,
-		val data: Any? = null
-	) {
-
-		override fun equals(other: Any?): Boolean {
-			if (this === other) return true
-			if (javaClass != other?.javaClass) return false
-
-			other as ChipModel
-
-			if (icon != other.icon) return false
-			if (title != other.title) return false
-			if (data != other.data) return false
-
-			return true
-		}
-
-		override fun hashCode(): Int {
-			var result = icon
-			result = 31 * result + title.hashCode()
-			result = 31 * result + data.hashCode()
-			return result
-		}
-	}
-
-	fun interface OnChipClickListener {
-
-		fun onChipClick(chip: Chip, data: Any?)
-	}
-
-	fun interface OnChipCloseClickListener {
-
-		fun onChipCloseClick(chip: Chip, data: Any?)
-	}
-}
--- a/app/src/main/java/org/koitharu/kotatsu/base/ui/widgets/CoverImageView.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/base/ui/widgets/CoverImageView.kt
@@ -1,43 +0,0 @@
-package org.koitharu.kotatsu.base.ui.widgets
-
-import android.content.Context
-import android.util.AttributeSet
-import android.widget.LinearLayout.HORIZONTAL
-import android.widget.LinearLayout.VERTICAL
-import androidx.annotation.AttrRes
-import androidx.core.content.withStyledAttributes
-import com.google.android.material.imageview.ShapeableImageView
-import org.koitharu.kotatsu.R
-import kotlin.math.roundToInt
-
-private const val ASPECT_RATIO_HEIGHT = 18f
-private const val ASPECT_RATIO_WIDTH = 13f
-
-class CoverImageView @JvmOverloads constructor(
-	context: Context,
-	attrs: AttributeSet? = null,
-	@AttrRes defStyleAttr: Int = 0,
-) : ShapeableImageView(context, attrs, defStyleAttr) {
-
-	private var orientation: Int = HORIZONTAL
-
-	init {
-		context.withStyledAttributes(attrs, R.styleable.CoverImageView, defStyleAttr) {
-			orientation = getInt(R.styleable.CoverImageView_android_orientation, orientation)
-		}
-	}
-
-	override fun onMeasure(widthMeasureSpec: Int, heightMeasureSpec: Int) {
-		super.onMeasure(widthMeasureSpec, heightMeasureSpec)
-		val desiredWidth: Int
-		val desiredHeight: Int
-		if (orientation == VERTICAL) {
-			desiredHeight = measuredHeight
-			desiredWidth = (desiredHeight * ASPECT_RATIO_WIDTH / ASPECT_RATIO_HEIGHT).roundToInt()
-		} else {
-			desiredWidth = measuredWidth
-			desiredHeight = (desiredWidth * ASPECT_RATIO_HEIGHT / ASPECT_RATIO_WIDTH).roundToInt()
-		}
-		setMeasuredDimension(desiredWidth, desiredHeight)
-	}
-}
--- a/app/src/main/java/org/koitharu/kotatsu/base/ui/widgets/FadingSnackbar.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/base/ui/widgets/FadingSnackbar.kt
@@ -1,133 +0,0 @@
-/*
- * Copyright 2018 Google LLC
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.koitharu.kotatsu.base.ui.widgets
-
-import android.content.Context
-import android.content.res.ColorStateList
-import android.graphics.drawable.Drawable
-import android.util.AttributeSet
-import android.view.LayoutInflater
-import android.widget.FrameLayout
-import androidx.annotation.ColorInt
-import androidx.annotation.StringRes
-import androidx.core.graphics.drawable.DrawableCompat
-import androidx.core.view.postDelayed
-import com.google.android.material.color.MaterialColors
-import com.google.android.material.shape.MaterialShapeDrawable
-import com.google.android.material.shape.ShapeAppearanceModel
-import com.google.android.material.snackbar.Snackbar
-import org.koitharu.kotatsu.databinding.FadingSnackbarLayoutBinding
-import org.koitharu.kotatsu.utils.ext.getThemeColorStateList
-import com.google.android.material.R as materialR
-
-private const val ENTER_DURATION = 300L
-private const val EXIT_DURATION = 200L
-private const val SHORT_DURATION_MS = 1_500L
-private const val LONG_DURATION_MS = 2_750L
-
-/**
- * A custom snackbar implementation allowing more control over placement and entry/exit animations.
- *
- * Xtimms: Well, my sufferings over the Snackbar in [DetailsActivity] will go away forever... Thanks, Google.
- *
- * https://github.com/google/iosched/blob/main/mobile/src/main/java/com/google/samples/apps/iosched/widget/FadingSnackbar.kt
- */
-class FadingSnackbar @JvmOverloads constructor(
-	context: Context,
-	attrs: AttributeSet? = null,
-	defStyleAttr: Int = 0,
-) : FrameLayout(context, attrs, defStyleAttr) {
-
-	private val binding = FadingSnackbarLayoutBinding.inflate(LayoutInflater.from(context), this)
-
-	init {
-		binding.snackbarLayout.background = createThemedBackground()
-	}
-
-	fun dismiss() {
-		if (visibility == VISIBLE && alpha == 1f) {
-			animate()
-				.alpha(0f)
-				.withEndAction { visibility = GONE }
-				.duration = EXIT_DURATION
-		}
-	}
-
-	fun show(
-		messageText: CharSequence?,
-		@StringRes actionId: Int = 0,
-		duration: Int = Snackbar.LENGTH_SHORT,
-		onActionClick: (FadingSnackbar.() -> Unit)? = null,
-		onDismiss: (() -> Unit)? = null,
-	) {
-		binding.snackbarText.text = messageText
-		if (actionId != 0) {
-			with(binding.snackbarAction) {
-				visibility = VISIBLE
-				text = context.getString(actionId)
-				setOnClickListener {
-					onActionClick?.invoke(this@FadingSnackbar) ?: dismiss()
-				}
-			}
-		} else {
-			binding.snackbarAction.visibility = GONE
-		}
-		alpha = 0f
-		visibility = VISIBLE
-		animate()
-			.alpha(1f)
-			.duration = ENTER_DURATION
-		if (duration == Snackbar.LENGTH_INDEFINITE) {
-			return
-		}
-		val durationMs = ENTER_DURATION + if (duration == Snackbar.LENGTH_LONG) LONG_DURATION_MS else SHORT_DURATION_MS
-		postDelayed(durationMs) {
-			dismiss()
-			onDismiss?.invoke()
-		}
-	}
-
-	private fun createThemedBackground(): Drawable {
-		val backgroundColor = MaterialColors.layer(this, materialR.attr.colorSurface, materialR.attr.colorOnSurface, 1f)
-		val shapeAppearanceModel = ShapeAppearanceModel.builder(
-			context,
-			materialR.style.ShapeAppearance_Material3_Corner_ExtraSmall,
-			0
-		).build()
-		val background = createMaterialShapeDrawableBackground(
-			backgroundColor,
-			shapeAppearanceModel,
-		)
-		val backgroundTint = context.getThemeColorStateList(materialR.attr.colorSurfaceInverse)
-		return if (backgroundTint != null) {
-			val wrappedDrawable = DrawableCompat.wrap(background)
-			DrawableCompat.setTintList(wrappedDrawable, backgroundTint)
-			wrappedDrawable
-		} else {
-			DrawableCompat.wrap(background)
-		}
-	}
-
-	private fun createMaterialShapeDrawableBackground(
-		@ColorInt backgroundColor: Int,
-		shapeAppearanceModel: ShapeAppearanceModel,
-	): MaterialShapeDrawable {
-		val background = MaterialShapeDrawable(shapeAppearanceModel)
-		background.fillColor = ColorStateList.valueOf(backgroundColor)
-		return background
-	}
-}
--- a/app/src/main/java/org/koitharu/kotatsu/base/ui/widgets/ListItemTextView.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/base/ui/widgets/ListItemTextView.kt
@@ -1,124 +0,0 @@
-package org.koitharu.kotatsu.base.ui.widgets
-
-import android.annotation.SuppressLint
-import android.content.Context
-import android.content.res.ColorStateList
-import android.content.res.TypedArray
-import android.graphics.Color
-import android.graphics.drawable.Drawable
-import android.graphics.drawable.InsetDrawable
-import android.graphics.drawable.RippleDrawable
-import android.graphics.drawable.ShapeDrawable
-import android.graphics.drawable.shapes.RectShape
-import android.util.AttributeSet
-import androidx.annotation.AttrRes
-import androidx.appcompat.widget.AppCompatCheckedTextView
-import androidx.core.content.withStyledAttributes
-import com.google.android.material.ripple.RippleUtils
-import com.google.android.material.shape.MaterialShapeDrawable
-import com.google.android.material.shape.ShapeAppearanceModel
-import org.koitharu.kotatsu.R
-import org.koitharu.kotatsu.utils.ext.getThemeColorStateList
-
-@SuppressLint("RestrictedApi")
-class ListItemTextView @JvmOverloads constructor(
-	context: Context,
-	attrs: AttributeSet? = null,
-	@AttrRes defStyleAttr: Int = R.attr.listItemTextViewStyle,
-) : AppCompatCheckedTextView(context, attrs, defStyleAttr) {
-
-	private var checkedDrawableStart: Drawable? = null
-	private var checkedDrawableEnd: Drawable? = null
-	private var isInitialized = false
-	private var isCheckDrawablesVisible: Boolean = false
-	private var defaultPaddingStart: Int = 0
-	private var defaultPaddingEnd: Int = 0
-
-	init {
-		context.withStyledAttributes(attrs, R.styleable.ListItemTextView, defStyleAttr) {
-			val itemRippleColor = getRippleColor(context)
-			val shape = createShapeDrawable(this)
-			background = RippleDrawable(
-				RippleUtils.sanitizeRippleDrawableColor(itemRippleColor),
-				shape,
-				ShapeDrawable(RectShape()),
-			)
-			checkedDrawableStart = getDrawable(R.styleable.ListItemTextView_checkedDrawableStart)
-			checkedDrawableEnd = getDrawable(R.styleable.ListItemTextView_checkedDrawableEnd)
-		}
-		checkedDrawableStart?.setTintList(textColors)
-		checkedDrawableEnd?.setTintList(textColors)
-		defaultPaddingStart = paddingStart
-		defaultPaddingEnd = paddingEnd
-		isInitialized = true
-		adjustCheckDrawables()
-	}
-
-	override fun refreshDrawableState() {
-		super.refreshDrawableState()
-		adjustCheckDrawables()
-	}
-
-	override fun setTextColor(colors: ColorStateList?) {
-		checkedDrawableStart?.setTintList(colors)
-		checkedDrawableEnd?.setTintList(colors)
-		super.setTextColor(colors)
-	}
-
-	override fun setPaddingRelative(start: Int, top: Int, end: Int, bottom: Int) {
-		defaultPaddingStart = start
-		defaultPaddingEnd = end
-		super.setPaddingRelative(start, top, end, bottom)
-	}
-
-	override fun setPadding(left: Int, top: Int, right: Int, bottom: Int) {
-		val isRtl = layoutDirection == LAYOUT_DIRECTION_RTL
-		defaultPaddingStart = if (isRtl) right else left
-		defaultPaddingEnd = if (isRtl) left else right
-		super.setPadding(left, top, right, bottom)
-	}
-
-	private fun adjustCheckDrawables() {
-		if (isInitialized && isCheckDrawablesVisible != isChecked) {
-			setCompoundDrawablesRelativeWithIntrinsicBounds(
-				if (isChecked) checkedDrawableStart else null,
-				null,
-				if (isChecked) checkedDrawableEnd else null,
-				null,
-			)
-			super.setPaddingRelative(
-				if (isChecked && checkedDrawableStart != null) {
-					defaultPaddingStart + compoundDrawablePadding
-				} else defaultPaddingStart,
-				paddingTop,
-				if (isChecked && checkedDrawableEnd != null) {
-					defaultPaddingEnd + compoundDrawablePadding
-				} else defaultPaddingEnd,
-				paddingBottom,
-			)
-			isCheckDrawablesVisible = isChecked
-		}
-	}
-
-	private fun createShapeDrawable(ta: TypedArray): InsetDrawable {
-		val shapeAppearance = ShapeAppearanceModel.builder(
-			context,
-			ta.getResourceId(R.styleable.ListItemTextView_shapeAppearance, 0),
-			ta.getResourceId(R.styleable.ListItemTextView_shapeAppearanceOverlay, 0),
-		).build()
-		val shapeDrawable = MaterialShapeDrawable(shapeAppearance)
-		shapeDrawable.fillColor = ta.getColorStateList(R.styleable.ListItemTextView_backgroundFillColor)
-		return InsetDrawable(
-			shapeDrawable,
-			ta.getDimensionPixelOffset(R.styleable.ListItemTextView_android_insetLeft, 0),
-			ta.getDimensionPixelOffset(R.styleable.ListItemTextView_android_insetTop, 0),
-			ta.getDimensionPixelOffset(R.styleable.ListItemTextView_android_insetRight, 0),
-			ta.getDimensionPixelOffset(R.styleable.ListItemTextView_android_insetBottom, 0),
-		)
-	}
-
-	private fun getRippleColor(context: Context): ColorStateList {
-		return context.getThemeColorStateList(android.R.attr.colorControlHighlight)
-			?: ColorStateList.valueOf(Color.TRANSPARENT)
-	}
-}
--- a/app/src/main/java/org/koitharu/kotatsu/base/ui/widgets/SelectableTextView.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/base/ui/widgets/SelectableTextView.kt
@@ -1,29 +0,0 @@
-package org.koitharu.kotatsu.base.ui.widgets
-
-import android.content.Context
-import android.text.Selection
-import android.text.Spannable
-import android.util.AttributeSet
-import android.view.MotionEvent
-import androidx.annotation.AttrRes
-import com.google.android.material.textview.MaterialTextView
-
-class SelectableTextView @JvmOverloads constructor(
-	context: Context,
-	attrs: AttributeSet? = null,
-	@AttrRes defStyleAttr: Int = android.R.attr.textViewStyle,
-) : MaterialTextView(context, attrs, defStyleAttr) {
-
-	override fun dispatchTouchEvent(event: MotionEvent?): Boolean {
-		fixSelectionRange()
-		return super.dispatchTouchEvent(event)
-	}
-
-	// https://stackoverflow.com/questions/22810147/error-when-selecting-text-from-textview-java-lang-indexoutofboundsexception-se
-	private fun fixSelectionRange() {
-		if (selectionStart < 0 || selectionEnd < 0) {
-			val spannableText = text as? Spannable ?: return
-			Selection.setSelection(spannableText, text.length)
-		}
-	}
-}
--- a/app/src/main/java/org/koitharu/kotatsu/base/ui/widgets/WindowInsetHolder.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/base/ui/widgets/WindowInsetHolder.kt
@@ -1,72 +0,0 @@
-package org.koitharu.kotatsu.base.ui.widgets
-
-import android.annotation.SuppressLint
-import android.content.Context
-import android.util.AttributeSet
-import android.view.Gravity
-import android.view.View
-import android.view.WindowInsets
-import android.widget.FrameLayout
-import android.widget.LinearLayout
-import androidx.annotation.AttrRes
-import androidx.coordinatorlayout.widget.CoordinatorLayout
-import androidx.core.view.WindowInsetsCompat
-
-class WindowInsetHolder @JvmOverloads constructor(
-	context: Context,
-	attrs: AttributeSet? = null,
-	@AttrRes defStyleAttr: Int = 0,
-) : View(context, attrs, defStyleAttr) {
-
-	private var desiredHeight = 0
-	private var desiredWidth = 0
-
-	@SuppressLint("RtlHardcoded")
-	override fun dispatchApplyWindowInsets(insets: WindowInsets): WindowInsets {
-		val barsInsets = WindowInsetsCompat.toWindowInsetsCompat(insets, this)
-			.getInsets(WindowInsetsCompat.Type.systemBars())
-		val gravity = getLayoutGravity()
-		val newWidth = when (gravity and Gravity.HORIZONTAL_GRAVITY_MASK) {
-			Gravity.LEFT -> barsInsets.left
-			Gravity.RIGHT -> barsInsets.right
-			else -> 0
-		}
-		val newHeight = when (gravity and Gravity.VERTICAL_GRAVITY_MASK) {
-			Gravity.TOP -> barsInsets.top
-			Gravity.BOTTOM -> barsInsets.bottom
-			else -> 0
-		}
-		if (newWidth != desiredWidth || newHeight != desiredHeight) {
-			desiredWidth = newWidth
-			desiredHeight = newHeight
-			requestLayout()
-		}
-		return super.dispatchApplyWindowInsets(insets)
-	}
-
-	override fun onMeasure(widthMeasureSpec: Int, heightMeasureSpec: Int) {
-		val widthMode = MeasureSpec.getMode(widthMeasureSpec)
-		val heightMode = MeasureSpec.getMode(heightMeasureSpec)
-		super.onMeasure(
-			if (desiredWidth == 0 || widthMode == MeasureSpec.EXACTLY) {
-				widthMeasureSpec
-			} else {
-				MeasureSpec.makeMeasureSpec(desiredWidth, widthMode)
-			},
-			if (desiredHeight == 0 || heightMode == MeasureSpec.EXACTLY) {
-				heightMeasureSpec
-			} else {
-				MeasureSpec.makeMeasureSpec(desiredHeight, heightMode)
-			},
-		)
-	}
-
-	private fun getLayoutGravity(): Int {
-		return when (val lp = layoutParams) {
-			is FrameLayout.LayoutParams -> lp.gravity
-			is LinearLayout.LayoutParams -> lp.gravity
-			is CoordinatorLayout.LayoutParams -> lp.gravity
-			else -> Gravity.NO_GRAVITY
-		}
-	}
-}
--- a/app/src/main/java/org/koitharu/kotatsu/bookmarks/BookmarksModule.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/bookmarks/BookmarksModule.kt
@@ -1,10 +0,0 @@
-package org.koitharu.kotatsu.bookmarks
-
-import org.koin.dsl.module
-import org.koitharu.kotatsu.bookmarks.domain.BookmarksRepository
-
-val bookmarksModule
-	get() = module {
-
-		factory { BookmarksRepository(get()) }
-	}
--- a/Show More
+++ b/Show More