Update prasers

Currently translated at 100.0% (323 of 323 strings)

Co-authored-by: Dpper <ruslan20020401@gmail.com>
Translate-URL: https://hosted.weblate.org/projects/kotatsu/strings/uk/
Translation: Kotatsu/Strings

.github/ISSUE_TEMPLATE.md

@@ -0,0 +1,29 @@
+**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.

.github/ISSUE_TEMPLATE/config.yml

@@ -1,5 +1,5 @@
 blank_issues_enabled: false
 contact_links:
     - name: ⚠️ Source issue
-      url: https://github.com/nv95/kotatsu-parsers/issues/new
-      about: Issues and requests for sources should be opened in the kotatsu-parsers repository instead
+      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

.github/ISSUE_TEMPLATE/report_bug.yml

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

.github/ISSUE_TEMPLATE/report_issue.yml

@@ -1,93 +0,0 @@
-name: 🐞 Issue report
-description: Report an issue in Kotatsu
-labels: [bug]
-body:
-
-    - type: textarea
-      id: reproduce-steps
-      attributes:
-          label: Steps to reproduce
-          description: Provide an example of the issue.
-          placeholder: |
-              Example:
-                1. First step
-                2. Second step
-                3. Issue here
-      validations:
-          required: true
-
-    - type: textarea
-      id: expected-behavior
-      attributes:
-          label: Expected behavior
-          description: Explain what you should expect to happen.
-          placeholder: |
-              Example:
-                "This should happen..."
-      validations:
-          required: true
-
-    - type: textarea
-      id: actual-behavior
-      attributes:
-          label: Actual behavior
-          description: Explain what actually happens.
-          placeholder: |
-              Example:
-                "This happened instead..."
-      validations:
-          required: true
-
-    - type: input
-      id: kotatsu-version
-      attributes:
-          label: Kotatsu version
-          description: You can find your Kotatsu version in **Settings → About**.
-          placeholder: |
-              Example: "3.2.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: "Android 12"
-      validations:
-          required: true
-
-    - type: input
-      id: device
-      attributes:
-          label: Device
-          description: List your device and model.
-          placeholder: |
-              Example: "LG Nexus 5X"
-      validations:
-          required: true
-
-    - type: textarea
-      id: other-details
-      attributes:
-          label: Other details
-          placeholder: |
-              Additional details and attachments.
-
-    - 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
-              - label: I have written a short but informative title.
-                required: true
-              - label: If this is an issue with a source, I should be opening an issue in the [parsers repository](https://github.com/nv95/kotatsu-parsers/issues/new).
-                required: true
-              - label: I have updated the app to version **[3.2.3](https://github.com/nv95/Kotatsu/releases/latest)**.
-                required: true
-              - label: I will fill out all of the requested information in this form.
-                required: true

.github/ISSUE_TEMPLATE/request_feature.yml

@@ -1,5 +1,5 @@
 name: ⭐ Feature request
-description: Suggest a feature to improve Kotatsu
+description: Suggest a new idea how to improve Kotatsu
 labels: [feature request]
 body:
 
@@ -14,13 +14,6 @@ body:
       validations:
           required: true
 
-    - type: textarea
-      id: other-details
-      attributes:
-          label: Other details
-          placeholder: |
-              Additional details and attachments.
-
     - type: checkboxes
       id: acknowledgements
       attributes:
@@ -28,12 +21,4 @@ body:
           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
-              - label: I have written a short but informative title.
-                required: true
-              - label: If this is an issue with a source, I should be opening an issue in the [parsers repository](https://github.com/nv95/kotatsu-parsers/issues/new).
-                required: true
-              - label: I have updated the app to version **[3.2.3](https://github.com/nv95/Kotatsu/releases/latest)**.
-                required: true
-              - label: I will fill out all of the requested information in this form.
                 required: true

.github/workflows/issue_moderator.yml

@@ -0,0 +1,29 @@
+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."
+               }
+             ]

.gitignore

@@ -12,6 +12,8 @@
 /.idea/assetWizardSettings.xml
 /.idea/kotlinScripting.xml
 /.idea/deploymentTargetDropDown.xml
+/.idea/androidTestResultsUserPreferences.xml
+/.idea/render.experimental.xml
 .DS_Store
 /build
 /captures

.idea/gradle.xml

@@ -7,7 +7,7 @@
         <option name="testRunner" value="GRADLE" />
         <option name="distributionType" value="DEFAULT_WRAPPED" />
         <option name="externalProjectPath" value="$PROJECT_DIR$" />
-        <option name="gradleJvm" value="Android Studio default JDK" />
+        <option name="gradleJvm" value="Embedded JDK" />
         <option name="modules">
           <set>
             <option value="$PROJECT_DIR$" />

.idea/icon.svg

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

.idea/render.experimental.xml

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

README.md

@@ -1,8 +1,8 @@
-# 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/nv95/Kotatsu) ![License](https://img.shields.io/github/license/nv95/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/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)
 
 ### Download
 
@@ -10,50 +10,48 @@ Kotatsu is a free and open source manga reader for Android.
 alt="Get it on F-Droid"
 height="80">](https://f-droid.org/packages/org.koitharu.kotatsu)
 
-Download APK from Github Releases:
+Download APK directly from GitHub:
 
-- [Latest release](https://github.com/nv95/Kotatsu/releases/latest)
-- [Legacy build](https://github.com/nv95/Kotatsu/releases/tag/v0.4-legacy) (with Android 4.1+ support)
+- **[Latest release](https://github.com/KotatsuApp/Kotatsu/releases/latest)**
 
 ### Main Features
 
 * Online manga catalogues
-* Search manga by name and genre
-* Reading history
+* 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
 * Standard and Webtoon-optimized reader
 * Notifications about new chapters with updates feed
-* Available in multiple languages
-* Password protect access to the app
+* Shikimori integration (manga tracking)
+* Password/fingerprint protect access to the app
 
 ### Screenshots
 
-| ![Screenshot_20200226-210337](https://github.com/nv95/Kotatsu/raw/devel/metadata/en-US/images/phoneScreenshots/1.png) | ![](https://github.com/nv95/Kotatsu/raw/devel/metadata/en-US/images/phoneScreenshots/2.png)                           | ![Screenshot_20200226-210232](https://github.com/nv95/Kotatsu/raw/devel/metadata/en-US/images/phoneScreenshots/3.png) |
-|-----------------------------------------------------------------------------------------------------------------------|-----------------------------------------------------------------------------------------------------------------------|-----------------------------------------------------------------------------------------------------------------------|
-| ![Screenshot_20200226-210405](https://github.com/nv95/Kotatsu/raw/devel/metadata/en-US/images/phoneScreenshots/4.png) | ![Screenshot_20200226-210151](https://github.com/nv95/Kotatsu/raw/devel/metadata/en-US/images/phoneScreenshots/5.png) | ![Screenshot_20200226-210223](https://github.com/nv95/Kotatsu/raw/devel/metadata/en-US/images/phoneScreenshots/6.png) |
+| ![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/nv95/Kotatsu/raw/devel/metadata/en-US/images/tenInchScreenshots/1.png) | ![](https://github.com/nv95/Kotatsu/raw/devel/metadata/en-US/images/tenInchScreenshots/2.png) |
-|-----------------------------------------------------------------------------------------------|-----------------------------------------------------------------------------------------------|
+| ![](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
 
-<a href="https://hosted.weblate.org/engage/kotatsu/">
-<img src="https://hosted.weblate.org/widgets/kotatsu/-/287x66-white.png" alt="Translation status" />
-</a>
+[<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 <a href="https://hosted.weblate.org/engage/kotatsu/">project page</a> 
+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/)
 
 ### License
-[![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.  
+[![GNU GPLv3 Image](https://www.gnu.org/graphics/gplv3-127x51.png)](http://www.gnu.org/licenses/gpl-3.0.en.html)
 
-### Disclaimer
+You may copy, distribute and modify the software as long as you track changes/dates in source files. Any modifications
+to or software including (via compiler) GPL-licensed code must also be made available under the GPL along with build &
+install instructions.
 
-The developers of this application does not have any affiliation with the content providers available.
+### 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.

app/build.gradle

@@ -14,8 +14,8 @@ android {
 		applicationId 'org.koitharu.kotatsu'
 		minSdkVersion 21
 		targetSdkVersion 32
-		versionCode 409
-		versionName '3.3'
+		versionCode 419
+		versionName '3.4.7'
 		generatedDensities = []
 		testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
 
@@ -24,6 +24,10 @@ android {
 				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 {
@@ -60,44 +64,52 @@ android {
 		disable 'MissingTranslation', 'PrivateResource', 'NotifyDataSetChanged'
 	}
 	testOptions {
-		unitTests.includeAndroidResources = true
-		unitTests.returnDefaultValues = false
+		unitTests.includeAndroidResources true
+		unitTests.returnDefaultValues false
+		kotlinOptions {
+			freeCompilerArgs += ['-opt-in=org.koitharu.kotatsu.parsers.InternalParsersApi']
+		}
+	}
+}
+afterEvaluate {
+	compileDebugKotlin {
+		kotlinOptions {
+			freeCompilerArgs += ['-opt-in=org.koitharu.kotatsu.parsers.InternalParsersApi']
+		}
 	}
 }
 dependencies {
-	implementation fileTree(dir: 'libs', include: ['*.jar', '*.aar'])
-	implementation('com.github.nv95:kotatsu-parsers:f46c5add46') {
+	implementation('com.github.nv95:kotatsu-parsers:7588617316') {
 		exclude group: 'org.json', module: 'json'
 	}
 
-	implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-core:1.6.1'
-	implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-android:1.6.1'
+	implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-android:1.6.4'
 
-	implementation 'androidx.core:core-ktx:1.7.0'
-	implementation 'androidx.activity:activity-ktx:1.4.0'
-	implementation 'androidx.fragment:fragment-ktx:1.4.1'
-	implementation 'androidx.lifecycle:lifecycle-runtime-ktx:2.4.1'
-	implementation 'androidx.lifecycle:lifecycle-viewmodel-ktx:2.4.1'
-	implementation 'androidx.lifecycle:lifecycle-livedata-ktx:2.4.1'
-	implementation 'androidx.lifecycle:lifecycle-service:2.4.1'
-	implementation 'androidx.lifecycle:lifecycle-process:2.4.1'
-	implementation 'androidx.constraintlayout:constraintlayout:2.1.3'
+	implementation 'androidx.core:core-ktx:1.8.0'
+	implementation 'androidx.activity:activity-ktx:1.5.0'
+	implementation 'androidx.fragment:fragment-ktx:1.5.0'
+	implementation 'androidx.lifecycle:lifecycle-viewmodel-ktx:2.5.0'
+	implementation 'androidx.lifecycle:lifecycle-livedata-ktx:2.5.0'
+	implementation 'androidx.lifecycle:lifecycle-service:2.5.0'
+	implementation 'androidx.lifecycle:lifecycle-process:2.5.0'
+	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 'com.google.android.material:material:1.7.0-alpha01'
+	implementation 'androidx.biometric:biometric-ktx:1.2.0-alpha04'
+	implementation 'com.google.android.material:material:1.7.0-alpha03'
 	//noinspection LifecycleAnnotationProcessorWithJava8
-	kapt 'androidx.lifecycle:lifecycle-compiler:2.4.1'
+	kapt 'androidx.lifecycle:lifecycle-compiler:2.5.0'
 
 	implementation 'androidx.room:room-runtime:2.4.2'
 	implementation 'androidx.room:room-ktx:2.4.2'
 	kapt 'androidx.room:room-compiler:2.4.2'
 
-	implementation 'com.squareup.okhttp3:okhttp:4.9.3'
+	implementation 'com.squareup.okhttp3:okhttp:4.10.0'
 	implementation 'com.squareup.okhttp3:okhttp-dnsoverhttps:4.9.3'
-	implementation 'com.squareup.okio:okio:3.1.0'
+	implementation 'com.squareup.okio:okio:3.2.0'
 
 	implementation 'com.hannesdorfmann:adapterdelegates4-kotlin-dsl:4.3.2'
 	implementation 'com.hannesdorfmann:adapterdelegates4-kotlin-dsl-viewbinding:4.3.2'
@@ -107,15 +119,24 @@ dependencies {
 	implementation 'com.davemorrissey.labs:subsampling-scale-image-view-androidx:3.10.0'
 	implementation 'com.github.solkin:disk-lru-cache:1.4'
 
+	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.jetbrains.kotlinx:kotlinx-coroutines-test:1.6.1'
-	testImplementation 'io.insert-koin:koin-test-junit4:3.2.0'
+	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.2'
+	androidTestImplementation 'com.squareup.moshi:moshi-kotlin:1.13.0'
 }

app/src/androidTest/assets/categories/simple.json

@@ -0,0 +1,8 @@
+{
+	"id": 4,
+	"title": "Read later",
+	"sortKey": 1,
+	"order": "NEWEST",
+	"createdAt": 1335906000000,
+	"isTrackingEnabled": true
+}

app/src/androidTest/assets/manga/bad_ids.json

@@ -0,0 +1,163 @@
+{
+	"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"
+}

app/src/androidTest/assets/manga/empty.json

@@ -0,0 +1,36 @@
+{
+	"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"
+}

app/src/androidTest/assets/manga/first_chapters.json

@@ -0,0 +1,136 @@
+{
+	"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"
+}

app/src/androidTest/assets/manga/full.json

@@ -0,0 +1,163 @@
+{
+	"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"
+}

app/src/androidTest/assets/manga/header.json

@@ -0,0 +1,35 @@
+{
+	"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"
+}

app/src/androidTest/assets/manga/without_middle_chapter.json

@@ -0,0 +1,154 @@
+{
+	"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"
+}

app/src/androidTest/java/org/koitharu/kotatsu/Instrumentation.kt

@@ -0,0 +1,9 @@
+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) }
+}

app/src/androidTest/java/org/koitharu/kotatsu/SampleData.kt

@@ -0,0 +1,54 @@
+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)
+		}
+	}
+}

app/src/androidTest/java/org/koitharu/kotatsu/core/db/MangaDatabaseTest.kt

@@ -1,14 +1,12 @@
 package org.koitharu.kotatsu.core.db
 
 import androidx.room.testing.MigrationTestHelper
-import androidx.sqlite.db.framework.FrameworkSQLiteOpenHelperFactory
 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 org.koitharu.kotatsu.core.db.migrations.*
-import java.io.IOException
+import kotlin.test.assertEquals
 
 @RunWith(AndroidJUnit4::class)
 class MangaDatabaseTest {
@@ -16,40 +14,44 @@ class MangaDatabaseTest {
 	@get:Rule
 	val helper: MigrationTestHelper = MigrationTestHelper(
 		InstrumentationRegistry.getInstrumentation(),
-		MangaDatabase::class.java.canonicalName,
-		FrameworkSQLiteOpenHelperFactory()
+		MangaDatabase::class.java,
 	)
 
+	private val migrations = databaseMigrations
+
 	@Test
-	@Throws(IOException::class)
-	fun migrateAll() {
-		helper.createDatabase(TEST_DB, 1).apply {
-			// TODO execSQL("")
-			close()
+	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"
-
-		val migrations = arrayOf(
-			Migration1To2(),
-			Migration2To3(),
-			Migration3To4(),
-			Migration4To5(),
-			Migration5To6(),
-			Migration6To7(),
-			Migration7To8(),
-		)
 	}
-}
+}

app/src/androidTest/java/org/koitharu/kotatsu/core/os/ShortcutsUpdaterTest.kt

@@ -0,0 +1,65 @@
+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()
+	}
+}

app/src/androidTest/java/org/koitharu/kotatsu/settings/backup/AppBackupAgentTest.kt

@@ -0,0 +1,67 @@
+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)
+	}
+}

app/src/androidTest/java/org/koitharu/kotatsu/tracker/domain/TrackerTest.kt

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

app/src/debug/java/org/koitharu/kotatsu/core/parser/DummyParser.kt

@@ -25,7 +25,7 @@ class DummyParser(override val context: MangaLoaderContext) : MangaParser(MangaS
 		offset: Int,
 		query: String?,
 		tags: Set<MangaTag>?,
-		sortOrder: SortOrder?
+		sortOrder: SortOrder,
 	): List<Manga> {
 		TODO("Not yet implemented")
 	}

app/src/main/AndroidManifest.xml

@@ -9,6 +9,7 @@
 	<uses-permission android:name="android.permission.WAKE_LOCK" />
 	<uses-permission android:name="android.permission.VIBRATE" />
 	<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"
@@ -58,7 +59,15 @@
 			android:label="@string/search_manga" />
 		<activity
 			android:name="org.koitharu.kotatsu.settings.SettingsActivity"
-			android:label="@string/settings" />
+			android:exported="true"
+			android:label="@string/settings">
+			<intent-filter>
+				<action android:name="android.intent.action.VIEW" />
+				<category android:name="android.intent.category.DEFAULT" />
+				<category android:name="android.intent.category.BROWSABLE" />
+				<data android:scheme="kotatsu" />
+			</intent-filter>
+		</activity>
 		<activity
 			android:name="org.koitharu.kotatsu.browser.BrowserActivity"
 			android:configChanges="orientation|screenSize|screenLayout|keyboardHidden"
@@ -67,11 +76,6 @@
 			android:name="org.koitharu.kotatsu.settings.sources.auth.SourceAuthActivity"
 			android:configChanges="orientation|screenSize|screenLayout|keyboardHidden"
 			android:windowSoftInputMode="adjustResize" />
-		<activity
-			android:name="org.koitharu.kotatsu.core.ui.CrashActivity"
-			android:label="@string/error_occurred"
-			android:theme="@android:style/Theme.DeviceDefault"
-			android:windowSoftInputMode="stateAlwaysHidden" />
 		<activity
 			android:name="org.koitharu.kotatsu.favourites.ui.categories.CategoriesActivity"
 			android:label="@string/favourites_categories"
@@ -85,9 +89,6 @@
 				<action android:name="android.appwidget.action.APPWIDGET_CONFIGURE" />
 			</intent-filter>
 		</activity>
-		<activity
-			android:name="org.koitharu.kotatsu.search.ui.global.GlobalSearchActivity"
-			android:label="@string/search" />
 		<activity
 			android:name="org.koitharu.kotatsu.search.ui.multi.MultiSearchActivity"
 			android:label="@string/search" />

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

@@ -1,19 +1,26 @@
 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 org.koin.android.ext.koin.androidContext
 import org.koin.core.context.startKoin
-import org.koitharu.kotatsu.base.ui.util.ActivityRecreationHandle
 import org.koitharu.kotatsu.bookmarks.bookmarksModule
+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.prefs.AppSettings
-import org.koitharu.kotatsu.core.ui.AppCrashHandler
 import org.koitharu.kotatsu.core.ui.uiModule
 import org.koitharu.kotatsu.details.detailsModule
 import org.koitharu.kotatsu.favourites.favouritesModule
@@ -22,15 +29,14 @@ 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.main.ui.protect.AppProtectHelper
 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.WidgetUpdater
 import org.koitharu.kotatsu.widget.appWidgetModule
 
 class KotatsuApp : Application() {
@@ -41,13 +47,9 @@ class KotatsuApp : Application() {
 			enableStrictMode()
 		}
 		initKoin()
-		Thread.setDefaultUncaughtExceptionHandler(AppCrashHandler(applicationContext))
 		AppCompatDelegate.setDefaultNightMode(get<AppSettings>().theme)
-		registerActivityLifecycleCallbacks(get<AppProtectHelper>())
-		registerActivityLifecycleCallbacks(get<ActivityRecreationHandle>())
-		val widgetUpdater = WidgetUpdater(applicationContext)
-		widgetUpdater.subscribeToFavourites(get())
-		widgetUpdater.subscribeToHistory(get())
+		setupActivityLifecycleCallbacks()
+		setupDatabaseObservers()
 	}
 
 	private fun initKoin() {
@@ -70,11 +72,59 @@ class KotatsuApp : Application() {
 				readerModule,
 				appWidgetModule,
 				suggestionsModule,
+				shikimoriModule,
 				bookmarksModule,
 			)
 		}
 	}
 
+	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.CUSTOM_DATA,
+				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
+			}
+			mailSender {
+				mailTo = getString(R.string.email_error_report)
+				reportAsFile = true
+				reportFileName = "stacktrace.txt"
+			}
+		}
+	}
+
+	private fun setupDatabaseObservers() {
+		val observers = getKoin().getAll<InvalidationTracker.Observer>()
+		val database = get<MangaDatabase>()
+		val tracker = database.invalidationTracker
+		observers.forEach {
+			tracker.addObserver(it)
+		}
+	}
+
+	private fun setupActivityLifecycleCallbacks() {
+		val callbacks = getKoin().getAll<ActivityLifecycleCallbacks>()
+		callbacks.forEach {
+			registerActivityLifecycleCallbacks(it)
+		}
+	}
+
 	private fun enableStrictMode() {
 		StrictMode.setThreadPolicy(
 			StrictMode.ThreadPolicy.Builder()

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

@@ -45,7 +45,7 @@ abstract class BaseBottomSheet<B : ViewBinding> : BottomSheetDialogFragment() {
 		requireContext().displayCompat?.let {
 			val metrics = DisplayMetrics()
 			it.getRealMetrics(metrics)
-			behavior?.peekHeight = metrics.heightPixels / 2
+			behavior?.peekHeight = (metrics.heightPixels * 0.4).toInt()
 		}
 
 		return binding.root
@@ -60,6 +60,15 @@ abstract class BaseBottomSheet<B : ViewBinding> : BottomSheetDialogFragment() {
 		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) {

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

@@ -6,14 +6,12 @@ import androidx.annotation.CallSuper
 import androidx.annotation.StringRes
 import androidx.core.graphics.Insets
 import androidx.core.view.updatePadding
-import androidx.fragment.app.Fragment
 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.SettingsActivity
 import org.koitharu.kotatsu.settings.SettingsHeadersFragment
 
 abstract class BasePreferenceFragment(@StringRes private val titleId: Int) :

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

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

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

@@ -0,0 +1,162 @@
+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())
+						}
+					}
+				}
+			}
+		}
+	}
+}

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

@@ -12,7 +12,7 @@ abstract class AbstractSelectionItemDecoration : RecyclerView.ItemDecoration() {
 
 	private val bounds = Rect()
 	private val boundsF = RectF()
-	private val selection = HashSet<Long>()
+	protected val selection = HashSet<Long>()
 
 	protected var hasBackground: Boolean = true
 	protected var hasForeground: Boolean = false

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

@@ -16,10 +16,7 @@ class WindowInsetsDelegate(
 
 	private var lastInsets: Insets? = null
 
-	override fun onApplyWindowInsets(v: View?, insets: WindowInsetsCompat?): WindowInsetsCompat? {
-		if (insets == null) {
-			return null
-		}
+	override fun onApplyWindowInsets(v: View, insets: WindowInsetsCompat): WindowInsetsCompat {
 		val handledInsets = interceptingWindowInsetsListener?.onApplyWindowInsets(v, insets) ?: insets
 		val newInsets = if (handleImeInsets) {
 			Insets.max(
@@ -49,7 +46,7 @@ class WindowInsetsDelegate(
 	) {
 		view.removeOnLayoutChangeListener(this)
 		if (lastInsets == null) { // Listener may not be called
-			onApplyWindowInsets(view, ViewCompat.getRootWindowInsets(view))
+			onApplyWindowInsets(view, ViewCompat.getRootWindowInsets(view) ?: return)
 		}
 	}
 

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

@@ -17,19 +17,28 @@
 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.Button
 import android.widget.FrameLayout
-import android.widget.TextView
+import androidx.annotation.ColorInt
 import androidx.annotation.StringRes
+import androidx.core.graphics.drawable.DrawableCompat
 import androidx.core.view.postDelayed
-import org.koitharu.kotatsu.R
+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 = 1_500L
-private const val LONG_DURATION = 2_750L
+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.
  *
@@ -40,16 +49,13 @@ private const val LONG_DURATION = 2_750L
 class FadingSnackbar @JvmOverloads constructor(
 	context: Context,
 	attrs: AttributeSet? = null,
-	defStyleAttr: Int = 0
+	defStyleAttr: Int = 0,
 ) : FrameLayout(context, attrs, defStyleAttr) {
 
-	private val message: TextView
-	private val action: Button
+	private val binding = FadingSnackbarLayoutBinding.inflate(LayoutInflater.from(context), this)
 
 	init {
-		val view = LayoutInflater.from(context).inflate(R.layout.fading_snackbar_layout, this, true)
-		message = view.findViewById(R.id.snackbar_text)
-		action = view.findViewById(R.id.snackbar_action)
+		binding.snackbarLayout.background = createThemedBackground()
 	}
 
 	fun dismiss() {
@@ -62,33 +68,66 @@ class FadingSnackbar @JvmOverloads constructor(
 	}
 
 	fun show(
-		messageText: CharSequence? = null,
-		@StringRes actionId: Int? = null,
-		longDuration: Boolean = true,
-		actionClick: () -> Unit = { dismiss() },
-		dismissListener: () -> Unit = { }
+		messageText: CharSequence?,
+		@StringRes actionId: Int = 0,
+		duration: Int = Snackbar.LENGTH_SHORT,
+		onActionClick: (FadingSnackbar.() -> Unit)? = null,
+		onDismiss: (() -> Unit)? = null,
 	) {
-		message.text = messageText
-		if (actionId != null) {
-			action.run {
+		binding.snackbarText.text = messageText
+		if (actionId != 0) {
+			with(binding.snackbarAction) {
 				visibility = VISIBLE
 				text = context.getString(actionId)
 				setOnClickListener {
-					actionClick()
+					onActionClick?.invoke(this@FadingSnackbar) ?: dismiss()
 				}
 			}
 		} else {
-			action.visibility = GONE
+			binding.snackbarAction.visibility = GONE
 		}
 		alpha = 0f
 		visibility = VISIBLE
 		animate()
 			.alpha(1f)
 			.duration = ENTER_DURATION
-		val showDuration = ENTER_DURATION + if (longDuration) LONG_DURATION else SHORT_DURATION
-		postDelayed(showDuration) {
+		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()
-			dismissListener()
+			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
+	}
 }

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

@@ -0,0 +1,29 @@
+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)
+		}
+	}
+}

app/src/main/java/org/koitharu/kotatsu/bookmarks/data/BookmarkEntity.kt

@@ -17,7 +17,7 @@ import org.koitharu.kotatsu.core.db.entity.MangaEntity
 		),
 	]
 )
-class BookmarkEntity(
+data class BookmarkEntity(
 	@ColumnInfo(name = "manga_id", index = true) val mangaId: Long,
 	@ColumnInfo(name = "page_id", index = true) val pageId: Long,
 	@ColumnInfo(name = "chapter_id") val chapterId: Long,
@@ -25,4 +25,5 @@ class BookmarkEntity(
 	@ColumnInfo(name = "scroll") val scroll: Int,
 	@ColumnInfo(name = "image") val imageUrl: String,
 	@ColumnInfo(name = "created_at") val createdAt: Long,
+	@ColumnInfo(name = "percent") val percent: Float,
 )

app/src/main/java/org/koitharu/kotatsu/bookmarks/data/EntityMapping.kt

@@ -18,6 +18,7 @@ fun BookmarkEntity.toBookmark(manga: Manga) = Bookmark(
 	scroll = scroll,
 	imageUrl = imageUrl,
 	createdAt = Date(createdAt),
+	percent = percent,
 )
 
 fun Bookmark.toEntity() = BookmarkEntity(
@@ -28,4 +29,5 @@ fun Bookmark.toEntity() = BookmarkEntity(
 	scroll = scroll,
 	imageUrl = imageUrl,
 	createdAt = createdAt.time,
+	percent = percent,
 )

app/src/main/java/org/koitharu/kotatsu/bookmarks/domain/Bookmark.kt

@@ -11,6 +11,7 @@ class Bookmark(
 	val scroll: Int,
 	val imageUrl: String,
 	val createdAt: Date,
+	val percent: Float,
 ) {
 
 	override fun equals(other: Any?): Boolean {
@@ -26,6 +27,7 @@ class Bookmark(
 		if (scroll != other.scroll) return false
 		if (imageUrl != other.imageUrl) return false
 		if (createdAt != other.createdAt) return false
+		if (percent != other.percent) return false
 
 		return true
 	}
@@ -38,6 +40,7 @@ class Bookmark(
 		result = 31 * result + scroll
 		result = 31 * result + imageUrl.hashCode()
 		result = 31 * result + createdAt.hashCode()
+		result = 31 * result + percent.hashCode()
 		return result
 	}
 }

app/src/main/java/org/koitharu/kotatsu/bookmarks/ui/BookmarkListAD.kt

@@ -2,15 +2,13 @@ package org.koitharu.kotatsu.bookmarks.ui
 
 import androidx.lifecycle.LifecycleOwner
 import coil.ImageLoader
-import coil.request.Disposable
-import coil.size.Scale
-import coil.util.CoilUtils
 import com.hannesdorfmann.adapterdelegates4.dsl.adapterDelegateViewBinding
 import org.koitharu.kotatsu.R
 import org.koitharu.kotatsu.base.ui.list.AdapterDelegateClickListenerAdapter
 import org.koitharu.kotatsu.base.ui.list.OnListItemClickListener
 import org.koitharu.kotatsu.bookmarks.domain.Bookmark
 import org.koitharu.kotatsu.databinding.ItemBookmarkBinding
+import org.koitharu.kotatsu.utils.ext.disposeImageRequest
 import org.koitharu.kotatsu.utils.ext.enqueueWith
 import org.koitharu.kotatsu.utils.ext.newImageRequest
 import org.koitharu.kotatsu.utils.ext.referer
@@ -23,29 +21,24 @@ fun bookmarkListAD(
 	{ inflater, parent -> ItemBookmarkBinding.inflate(inflater, parent, false) }
 ) {
 
-	var imageRequest: Disposable? = null
 	val listener = AdapterDelegateClickListenerAdapter(this, clickListener)
 
 	binding.root.setOnClickListener(listener)
 	binding.root.setOnLongClickListener(listener)
 
 	bind {
-		imageRequest?.dispose()
-		imageRequest = binding.imageViewThumb.newImageRequest(item.imageUrl)
-			.referer(item.manga.publicUrl)
-			.placeholder(R.drawable.ic_placeholder)
-			.fallback(R.drawable.ic_placeholder)
-			.error(R.drawable.ic_placeholder)
-			.allowRgb565(true)
-			.scale(Scale.FILL)
-			.lifecycle(lifecycleOwner)
-			.enqueueWith(coil)
+		binding.imageViewThumb.newImageRequest(item.imageUrl)?.run {
+			referer(item.manga.publicUrl)
+			placeholder(R.drawable.ic_placeholder)
+			fallback(R.drawable.ic_placeholder)
+			error(R.drawable.ic_placeholder)
+			allowRgb565(true)
+			lifecycle(lifecycleOwner)
+			enqueueWith(coil)
+		}
 	}
 
 	onViewRecycled {
-		imageRequest?.dispose()
-		imageRequest = null
-		CoilUtils.dispose(binding.imageViewThumb)
-		binding.imageViewThumb.setImageDrawable(null)
+		binding.imageViewThumb.disposeImageRequest()
 	}
 }

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

@@ -2,10 +2,9 @@ package org.koitharu.kotatsu.browser
 
 import android.graphics.Bitmap
 import android.webkit.WebView
-import org.koin.core.component.KoinComponent
-import org.koitharu.kotatsu.core.network.WebViewClientCompat
+import android.webkit.WebViewClient
 
-class BrowserClient(private val callback: BrowserCallback) : WebViewClientCompat(), KoinComponent {
+class BrowserClient(private val callback: BrowserCallback) : WebViewClient() {
 
 	override fun onPageFinished(webView: WebView, url: String) {
 		super.onPageFinished(webView, url)

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

@@ -2,13 +2,14 @@ package org.koitharu.kotatsu.browser
 
 import android.webkit.WebChromeClient
 import android.webkit.WebView
+import android.widget.ProgressBar
 import androidx.core.view.isVisible
-import com.google.android.material.progressindicator.BaseProgressIndicator
+import org.koitharu.kotatsu.utils.ext.setProgressCompat
 
 private const val PROGRESS_MAX = 100
 
 class ProgressChromeClient(
-	private val progressIndicator: BaseProgressIndicator<*>,
+	private val progressIndicator: ProgressBar,
 ) : WebChromeClient() {
 
 	init {
@@ -24,7 +25,7 @@ class ProgressChromeClient(
 			progressIndicator.isIndeterminate = false
 			progressIndicator.setProgressCompat(newProgress.coerceAtMost(PROGRESS_MAX), true)
 		} else {
-			progressIndicator.setIndeterminate(true)
+			progressIndicator.isIndeterminate = true
 		}
 	}
 }

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

@@ -2,19 +2,19 @@ package org.koitharu.kotatsu.browser.cloudflare
 
 import android.graphics.Bitmap
 import android.webkit.WebView
+import android.webkit.WebViewClient
 import okhttp3.HttpUrl.Companion.toHttpUrl
 import org.koitharu.kotatsu.core.network.AndroidCookieJar
-import org.koitharu.kotatsu.core.network.WebViewClientCompat
 
 private const val CF_CLEARANCE = "cf_clearance"
 
 class CloudFlareClient(
 	private val cookieJar: AndroidCookieJar,
 	private val callback: CloudFlareCallback,
-	private val targetUrl: String
-) : WebViewClientCompat() {
+	private val targetUrl: String,
+) : WebViewClient() {
 
-	private val oldClearance = getCookieValue(CF_CLEARANCE)
+	private val oldClearance = getClearance()
 
 	override fun onPageStarted(view: WebView, url: String?, favicon: Bitmap?) {
 		super.onPageStarted(view, url, favicon)
@@ -32,14 +32,14 @@ class CloudFlareClient(
 	}
 
 	private fun checkClearance() {
-		val clearance = getCookieValue(CF_CLEARANCE)
+		val clearance = getClearance()
 		if (clearance != null && clearance != oldClearance) {
 			callback.onCheckPassed()
 		}
 	}
 
-	private fun getCookieValue(name: String): String? {
+	private fun getClearance(): String? {
 		return cookieJar.loadForRequest(targetUrl.toHttpUrl())
-			.find { it.name == name }?.value
+			.find { it.name == CF_CLEARANCE }?.value
 	}
 }

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

@@ -1,14 +1,12 @@
 package org.koitharu.kotatsu.core.backup
 
+import androidx.room.withTransaction
 import org.json.JSONArray
 import org.json.JSONObject
 import org.koitharu.kotatsu.BuildConfig
 import org.koitharu.kotatsu.core.db.MangaDatabase
-import org.koitharu.kotatsu.core.db.entity.MangaEntity
-import org.koitharu.kotatsu.core.db.entity.TagEntity
-import org.koitharu.kotatsu.favourites.data.FavouriteCategoryEntity
-import org.koitharu.kotatsu.favourites.data.FavouriteEntity
-import org.koitharu.kotatsu.history.data.HistoryEntity
+import org.koitharu.kotatsu.parsers.util.json.JSONIterator
+import org.koitharu.kotatsu.parsers.util.json.mapJSON
 
 private const val PAGE_SIZE = 10
 
@@ -24,11 +22,11 @@ class BackupRepository(private val db: MangaDatabase) {
 			}
 			offset += history.size
 			for (item in history) {
-				val manga = item.manga.toJson()
+				val manga = JsonSerializer(item.manga).toJson()
 				val tags = JSONArray()
-				item.tags.forEach { tags.put(it.toJson()) }
+				item.tags.forEach { tags.put(JsonSerializer(it).toJson()) }
 				manga.put("tags", tags)
-				val json = item.history.toJson()
+				val json = JsonSerializer(item.history).toJson()
 				json.put("manga", manga)
 				entry.data.put(json)
 			}
@@ -40,7 +38,7 @@ class BackupRepository(private val db: MangaDatabase) {
 		val entry = BackupEntry(BackupEntry.CATEGORIES, JSONArray())
 		val categories = db.favouriteCategoriesDao.findAll()
 		for (item in categories) {
-			entry.data.put(item.toJson())
+			entry.data.put(JsonSerializer(item).toJson())
 		}
 		return entry
 	}
@@ -55,11 +53,11 @@ class BackupRepository(private val db: MangaDatabase) {
 			}
 			offset += favourites.size
 			for (item in favourites) {
-				val manga = item.manga.toJson()
+				val manga = JsonSerializer(item.manga).toJson()
 				val tags = JSONArray()
-				item.tags.forEach { tags.put(it.toJson()) }
+				item.tags.forEach { tags.put(JsonSerializer(it).toJson()) }
 				manga.put("tags", tags)
-				val json = item.favourite.toJson()
+				val json = JsonSerializer(item.favourite).toJson()
 				json.put("manga", manga)
 				entry.data.put(json)
 			}
@@ -77,59 +75,54 @@ class BackupRepository(private val db: MangaDatabase) {
 		return entry
 	}
 
-	private fun MangaEntity.toJson(): JSONObject {
-		val jo = JSONObject()
-		jo.put("id", id)
-		jo.put("title", title)
-		jo.put("alt_title", altTitle)
-		jo.put("url", url)
-		jo.put("public_url", publicUrl)
-		jo.put("rating", rating)
-		jo.put("nsfw", isNsfw)
-		jo.put("cover_url", coverUrl)
-		jo.put("large_cover_url", largeCoverUrl)
-		jo.put("state", state)
-		jo.put("author", author)
-		jo.put("source", source)
-		return jo
+	suspend fun restoreHistory(entry: BackupEntry): CompositeResult {
+		val result = CompositeResult()
+		for (item in entry.data.JSONIterator()) {
+			val mangaJson = item.getJSONObject("manga")
+			val manga = JsonDeserializer(mangaJson).toMangaEntity()
+			val tags = mangaJson.getJSONArray("tags").mapJSON {
+				JsonDeserializer(it).toTagEntity()
+			}
+			val history = JsonDeserializer(item).toHistoryEntity()
+			result += runCatching {
+				db.withTransaction {
+					db.tagsDao.upsert(tags)
+					db.mangaDao.upsert(manga, tags)
+					db.historyDao.upsert(history)
+				}
+			}
+		}
+		return result
 	}
 
-	private fun TagEntity.toJson(): JSONObject {
-		val jo = JSONObject()
-		jo.put("id", id)
-		jo.put("title", title)
-		jo.put("key", key)
-		jo.put("source", source)
-		return jo
+	suspend fun restoreCategories(entry: BackupEntry): CompositeResult {
+		val result = CompositeResult()
+		for (item in entry.data.JSONIterator()) {
+			val category = JsonDeserializer(item).toFavouriteCategoryEntity()
+			result += runCatching {
+				db.favouriteCategoriesDao.upsert(category)
+			}
+		}
+		return result
 	}
 
-	private fun HistoryEntity.toJson(): JSONObject {
-		val jo = JSONObject()
-		jo.put("manga_id", mangaId)
-		jo.put("created_at", createdAt)
-		jo.put("updated_at", updatedAt)
-		jo.put("chapter_id", chapterId)
-		jo.put("page", page)
-		jo.put("scroll", scroll)
-		return jo
-	}
-
-	private fun FavouriteCategoryEntity.toJson(): JSONObject {
-		val jo = JSONObject()
-		jo.put("category_id", categoryId)
-		jo.put("created_at", createdAt)
-		jo.put("sort_key", sortKey)
-		jo.put("title", title)
-		jo.put("order", order)
-		jo.put("track", track)
-		return jo
-	}
-
-	private fun FavouriteEntity.toJson(): JSONObject {
-		val jo = JSONObject()
-		jo.put("manga_id", mangaId)
-		jo.put("category_id", categoryId)
-		jo.put("created_at", createdAt)
-		return jo
+	suspend fun restoreFavourites(entry: BackupEntry): CompositeResult {
+		val result = CompositeResult()
+		for (item in entry.data.JSONIterator()) {
+			val mangaJson = item.getJSONObject("manga")
+			val manga = JsonDeserializer(mangaJson).toMangaEntity()
+			val tags = mangaJson.getJSONArray("tags").mapJSON {
+				JsonDeserializer(it).toTagEntity()
+			}
+			val favourite = JsonDeserializer(item).toFavouriteEntity()
+			result += runCatching {
+				db.withTransaction {
+					db.tagsDao.upsert(tags)
+					db.mangaDao.upsert(manga, tags)
+					db.favouritesDao.upsert(favourite)
+				}
+			}
+		}
+		return result
 	}
 }

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

@@ -15,11 +15,11 @@ class BackupZipOutput(val file: File) : Closeable {
 
 	private val output = ZipOutput(file, Deflater.BEST_COMPRESSION)
 
-	suspend fun put(entry: BackupEntry) {
+	suspend fun put(entry: BackupEntry) = runInterruptible(Dispatchers.IO) {
 		output.put(entry.name, entry.data.toString(2))
 	}
 
-	suspend fun finish() {
+	suspend fun finish() = runInterruptible(Dispatchers.IO) {
 		output.finish()
 	}
 

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

@@ -0,0 +1,62 @@
+package org.koitharu.kotatsu.core.backup
+
+import org.json.JSONObject
+import org.koitharu.kotatsu.core.db.entity.MangaEntity
+import org.koitharu.kotatsu.core.db.entity.TagEntity
+import org.koitharu.kotatsu.favourites.data.FavouriteCategoryEntity
+import org.koitharu.kotatsu.favourites.data.FavouriteEntity
+import org.koitharu.kotatsu.history.data.HistoryEntity
+import org.koitharu.kotatsu.parsers.model.SortOrder
+import org.koitharu.kotatsu.parsers.util.json.getBooleanOrDefault
+import org.koitharu.kotatsu.parsers.util.json.getFloatOrDefault
+import org.koitharu.kotatsu.parsers.util.json.getStringOrNull
+
+class JsonDeserializer(private val json: JSONObject) {
+
+	fun toFavouriteEntity() = FavouriteEntity(
+		mangaId = json.getLong("manga_id"),
+		categoryId = json.getLong("category_id"),
+		createdAt = json.getLong("created_at"),
+	)
+
+	fun toMangaEntity() = MangaEntity(
+		id = json.getLong("id"),
+		title = json.getString("title"),
+		altTitle = json.getStringOrNull("alt_title"),
+		url = json.getString("url"),
+		publicUrl = json.getStringOrNull("public_url").orEmpty(),
+		rating = json.getDouble("rating").toFloat(),
+		isNsfw = json.getBooleanOrDefault("nsfw", false),
+		coverUrl = json.getString("cover_url"),
+		largeCoverUrl = json.getStringOrNull("large_cover_url"),
+		state = json.getStringOrNull("state"),
+		author = json.getStringOrNull("author"),
+		source = json.getString("source")
+	)
+
+	fun toTagEntity() = TagEntity(
+		id = json.getLong("id"),
+		title = json.getString("title"),
+		key = json.getString("key"),
+		source = json.getString("source")
+	)
+
+	fun toHistoryEntity() = HistoryEntity(
+		mangaId = json.getLong("manga_id"),
+		createdAt = json.getLong("created_at"),
+		updatedAt = json.getLong("updated_at"),
+		chapterId = json.getLong("chapter_id"),
+		page = json.getInt("page"),
+		scroll = json.getDouble("scroll").toFloat(),
+		percent = json.getFloatOrDefault("percent", -1f),
+	)
+
+	fun toFavouriteCategoryEntity() = FavouriteCategoryEntity(
+		categoryId = json.getInt("category_id"),
+		createdAt = json.getLong("created_at"),
+		sortKey = json.getInt("sort_key"),
+		title = json.getString("title"),
+		order = json.getStringOrNull("order") ?: SortOrder.NEWEST.name,
+		track = json.getBooleanOrDefault("track", true),
+	)
+}

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

@@ -0,0 +1,70 @@
+package org.koitharu.kotatsu.core.backup
+
+import org.json.JSONObject
+import org.koitharu.kotatsu.core.db.entity.MangaEntity
+import org.koitharu.kotatsu.core.db.entity.TagEntity
+import org.koitharu.kotatsu.favourites.data.FavouriteCategoryEntity
+import org.koitharu.kotatsu.favourites.data.FavouriteEntity
+import org.koitharu.kotatsu.history.data.HistoryEntity
+
+class JsonSerializer private constructor(private val json: JSONObject) {
+
+	constructor(e: FavouriteEntity) : this(
+		JSONObject().apply {
+			put("manga_id", e.mangaId)
+			put("category_id", e.categoryId)
+			put("created_at", e.createdAt)
+		}
+	)
+
+	constructor(e: FavouriteCategoryEntity) : this(
+		JSONObject().apply {
+			put("category_id", e.categoryId)
+			put("created_at", e.createdAt)
+			put("sort_key", e.sortKey)
+			put("title", e.title)
+			put("order", e.order)
+			put("track", e.track)
+		}
+	)
+
+	constructor(e: HistoryEntity) : this(
+		JSONObject().apply {
+			put("manga_id", e.mangaId)
+			put("created_at", e.createdAt)
+			put("updated_at", e.updatedAt)
+			put("chapter_id", e.chapterId)
+			put("page", e.page)
+			put("scroll", e.scroll)
+			put("percent", e.percent)
+		}
+	)
+
+	constructor(e: TagEntity) : this(
+		JSONObject().apply {
+			put("id", e.id)
+			put("title", e.title)
+			put("key", e.key)
+			put("source", e.source)
+		}
+	)
+
+	constructor(e: MangaEntity) : this(
+		JSONObject().apply {
+			put("id", e.id)
+			put("title", e.title)
+			put("alt_title", e.altTitle)
+			put("url", e.url)
+			put("public_url", e.publicUrl)
+			put("rating", e.rating)
+			put("nsfw", e.isNsfw)
+			put("cover_url", e.coverUrl)
+			put("large_cover_url", e.largeCoverUrl)
+			put("state", e.state)
+			put("author", e.author)
+			put("source", e.source)
+		}
+	)
+
+	fun toJson(): JSONObject = json
+}

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

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

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

@@ -4,10 +4,17 @@ import android.content.Context
 import androidx.room.Database
 import androidx.room.Room
 import androidx.room.RoomDatabase
+import androidx.room.migration.Migration
 import org.koitharu.kotatsu.bookmarks.data.BookmarkEntity
 import org.koitharu.kotatsu.bookmarks.data.BookmarksDao
-import org.koitharu.kotatsu.core.db.dao.*
-import org.koitharu.kotatsu.core.db.entity.*
+import org.koitharu.kotatsu.core.db.dao.MangaDao
+import org.koitharu.kotatsu.core.db.dao.PreferencesDao
+import org.koitharu.kotatsu.core.db.dao.TagsDao
+import org.koitharu.kotatsu.core.db.dao.TrackLogsDao
+import org.koitharu.kotatsu.core.db.entity.MangaEntity
+import org.koitharu.kotatsu.core.db.entity.MangaPrefsEntity
+import org.koitharu.kotatsu.core.db.entity.MangaTagsEntity
+import org.koitharu.kotatsu.core.db.entity.TagEntity
 import org.koitharu.kotatsu.core.db.migrations.*
 import org.koitharu.kotatsu.favourites.data.FavouriteCategoriesDao
 import org.koitharu.kotatsu.favourites.data.FavouriteCategoryEntity
@@ -15,16 +22,24 @@ import org.koitharu.kotatsu.favourites.data.FavouriteEntity
 import org.koitharu.kotatsu.favourites.data.FavouritesDao
 import org.koitharu.kotatsu.history.data.HistoryDao
 import org.koitharu.kotatsu.history.data.HistoryEntity
+import org.koitharu.kotatsu.scrobbling.data.ScrobblingDao
+import org.koitharu.kotatsu.scrobbling.data.ScrobblingEntity
 import org.koitharu.kotatsu.suggestions.data.SuggestionDao
 import org.koitharu.kotatsu.suggestions.data.SuggestionEntity
+import org.koitharu.kotatsu.tracker.data.TrackEntity
+import org.koitharu.kotatsu.tracker.data.TrackLogEntity
+import org.koitharu.kotatsu.tracker.data.TracksDao
+
+const val DATABASE_VERSION = 12
 
 @Database(
 	entities = [
 		MangaEntity::class, TagEntity::class, HistoryEntity::class, MangaTagsEntity::class,
 		FavouriteCategoryEntity::class, FavouriteEntity::class, MangaPrefsEntity::class,
 		TrackEntity::class, TrackLogEntity::class, SuggestionEntity::class, BookmarkEntity::class,
+		ScrobblingEntity::class,
 	],
-	version = 11,
+	version = DATABASE_VERSION,
 )
 abstract class MangaDatabase : RoomDatabase() {
 
@@ -47,23 +62,27 @@ abstract class MangaDatabase : RoomDatabase() {
 	abstract val suggestionDao: SuggestionDao
 
 	abstract val bookmarksDao: BookmarksDao
+
+	abstract val scrobblingDao: ScrobblingDao
 }
 
-fun MangaDatabase(context: Context): MangaDatabase = Room.databaseBuilder(
-	context,
-	MangaDatabase::class.java,
-	"kotatsu-db"
-).addMigrations(
-	Migration1To2(),
-	Migration2To3(),
-	Migration3To4(),
-	Migration4To5(),
-	Migration5To6(),
-	Migration6To7(),
-	Migration7To8(),
-	Migration8To9(),
-	Migration9To10(),
-	Migration10To11(),
-).addCallback(
-	DatabasePrePopulateCallback(context.resources)
-).build()
+val databaseMigrations: Array<Migration>
+	get() = arrayOf(
+		Migration1To2(),
+		Migration2To3(),
+		Migration3To4(),
+		Migration4To5(),
+		Migration5To6(),
+		Migration6To7(),
+		Migration7To8(),
+		Migration8To9(),
+		Migration9To10(),
+		Migration10To11(),
+		Migration11To12(),
+	)
+
+fun MangaDatabase(context: Context): MangaDatabase = Room
+	.databaseBuilder(context, MangaDatabase::class.java, "kotatsu-db")
+	.addMigrations(*databaseMigrations)
+	.addCallback(DatabasePrePopulateCallback(context.resources))
+	.build()

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

@@ -0,0 +1,9 @@
+package org.koitharu.kotatsu.core.db
+
+
+const val TABLE_FAVOURITES = "favourites"
+const val TABLE_MANGA = "manga"
+const val TABLE_TAGS = "tags"
+const val TABLE_FAVOURITE_CATEGORIES = "favourite_categories"
+const val TABLE_HISTORY = "history"
+const val TABLE_MANGA_TAGS = "manga_tags"

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

@@ -1,8 +1,8 @@
 package org.koitharu.kotatsu.core.db.dao
 
 import androidx.room.*
-import org.koitharu.kotatsu.core.db.entity.TrackLogEntity
-import org.koitharu.kotatsu.core.db.entity.TrackLogWithManga
+import org.koitharu.kotatsu.tracker.data.TrackLogEntity
+import org.koitharu.kotatsu.tracker.data.TrackLogWithManga
 
 @Dao
 interface TrackLogsDao {
@@ -21,7 +21,7 @@ interface TrackLogsDao {
 	suspend fun removeAll(mangaId: Long)
 
 	@Query("DELETE FROM track_logs WHERE manga_id NOT IN (SELECT manga_id FROM tracks)")
-	suspend fun cleanup()
+	suspend fun gc()
 
 	@Query("SELECT COUNT(*) FROM track_logs")
 	suspend fun count(): Int

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

@@ -1,7 +1,5 @@
 package org.koitharu.kotatsu.core.db.entity
 
-import java.util.*
-import org.koitharu.kotatsu.core.model.TrackingLogItem
 import org.koitharu.kotatsu.parsers.model.*
 import org.koitharu.kotatsu.parsers.util.mapToSet
 import org.koitharu.kotatsu.parsers.util.toTitleCase
@@ -35,13 +33,6 @@ fun MangaEntity.toManga(tags: Set<MangaTag>) = Manga(
 
 fun MangaWithTags.toManga() = manga.toManga(tags.toMangaTags())
 
-fun TrackLogWithManga.toTrackingLogItem() = TrackingLogItem(
-	id = trackLog.id,
-	chapters = trackLog.chapters.split('\n').filterNot { x -> x.isEmpty() },
-	manga = manga.toManga(tags.toMangaTags()),
-	createdAt = Date(trackLog.createdAt)
-)
-
 // Model to entity
 
 fun Manga.toEntity() = MangaEntity(

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

@@ -3,9 +3,10 @@ package org.koitharu.kotatsu.core.db.entity
 import androidx.room.ColumnInfo
 import androidx.room.Entity
 import androidx.room.PrimaryKey
+import org.koitharu.kotatsu.core.db.TABLE_MANGA
 
-@Entity(tableName = "manga")
-class MangaEntity(
+@Entity(tableName = TABLE_MANGA)
+data class MangaEntity(
 	@PrimaryKey(autoGenerate = false)
 	@ColumnInfo(name = "manga_id") val id: Long,
 	@ColumnInfo(name = "title") val title: String,
@@ -18,5 +19,5 @@ class MangaEntity(
 	@ColumnInfo(name = "large_cover_url") val largeCoverUrl: String?,
 	@ColumnInfo(name = "state") val state: String?,
 	@ColumnInfo(name = "author") val author: String?,
-	@ColumnInfo(name = "source") val source: String
+	@ColumnInfo(name = "source") val source: String,
 )

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

@@ -3,9 +3,11 @@ package org.koitharu.kotatsu.core.db.entity
 import androidx.room.ColumnInfo
 import androidx.room.Entity
 import androidx.room.ForeignKey
+import org.koitharu.kotatsu.core.db.TABLE_MANGA_TAGS
 
 @Entity(
-	tableName = "manga_tags", primaryKeys = ["manga_id", "tag_id"],
+	tableName = TABLE_MANGA_TAGS,
+	primaryKeys = ["manga_id", "tag_id"],
 	foreignKeys = [
 		ForeignKey(
 			entity = MangaEntity::class,
@@ -23,5 +25,5 @@ import androidx.room.ForeignKey
 )
 class MangaTagsEntity(
 	@ColumnInfo(name = "manga_id", index = true) val mangaId: Long,
-	@ColumnInfo(name = "tag_id", index = true) val tagId: Long
+	@ColumnInfo(name = "tag_id", index = true) val tagId: Long,
 )

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

@@ -3,12 +3,13 @@ package org.koitharu.kotatsu.core.db.entity
 import androidx.room.ColumnInfo
 import androidx.room.Entity
 import androidx.room.PrimaryKey
+import org.koitharu.kotatsu.core.db.TABLE_TAGS
 
-@Entity(tableName = "tags")
-class TagEntity(
+@Entity(tableName = TABLE_TAGS)
+data class TagEntity(
 	@PrimaryKey(autoGenerate = false)
 	@ColumnInfo(name = "tag_id") val id: Long,
 	@ColumnInfo(name = "title") val title: String,
 	@ColumnInfo(name = "key") val key: String,
-	@ColumnInfo(name = "source") val source: String
+	@ColumnInfo(name = "source") val source: String,
 )

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

@@ -0,0 +1,27 @@
+package org.koitharu.kotatsu.core.db.migrations
+
+import androidx.room.migration.Migration
+import androidx.sqlite.db.SupportSQLiteDatabase
+
+class Migration11To12 : Migration(11, 12) {
+
+	override fun migrate(database: SupportSQLiteDatabase) {
+		database.execSQL(
+			"""
+			CREATE TABLE IF NOT EXISTS `scrobblings` (
+				`scrobbler` INTEGER NOT NULL,
+				`id` INTEGER NOT NULL,
+				`manga_id` INTEGER NOT NULL,
+				`target_id` INTEGER NOT NULL, 
+				`status` TEXT,
+				`chapter` INTEGER NOT NULL, 
+				`comment` TEXT,
+				`rating` REAL NOT NULL,
+				PRIMARY KEY(`scrobbler`, `id`, `manga_id`)
+			)
+			""".trimIndent()
+		)
+		database.execSQL("ALTER TABLE history ADD COLUMN `percent` REAL NOT NULL DEFAULT -1")
+		database.execSQL("ALTER TABLE bookmarks ADD COLUMN `percent` REAL NOT NULL DEFAULT -1")
+	}
+}

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

@@ -0,0 +1,3 @@
+package org.koitharu.kotatsu.core.exceptions
+
+class CaughtException(cause: Throwable, override val message: String?) : RuntimeException(cause)

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

@@ -1,8 +1,6 @@
 package org.koitharu.kotatsu.core.exceptions
 
-import androidx.annotation.StringRes
 import okio.IOException
-import org.koitharu.kotatsu.R
 
 class CloudFlareProtectedException(
 	val url: String

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

@@ -0,0 +1,8 @@
+package org.koitharu.kotatsu.core.exceptions
+
+import org.koitharu.kotatsu.parsers.util.mapNotNullToSet
+
+class CompositeException(val errors: Collection<Throwable>) : Exception() {
+
+	override val message: String = errors.mapNotNullToSet { it.message }.joinToString()
+}

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

@@ -1,3 +0,0 @@
-package org.koitharu.kotatsu.core.exceptions
-
-class MangaNotFoundException(s: String? = null) : RuntimeException(s)

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

@@ -8,9 +8,11 @@ import androidx.fragment.app.Fragment
 import androidx.fragment.app.FragmentActivity
 import kotlinx.coroutines.suspendCancellableCoroutine
 import org.koitharu.kotatsu.R
+import org.koitharu.kotatsu.browser.BrowserActivity
 import org.koitharu.kotatsu.browser.cloudflare.CloudFlareDialog
 import org.koitharu.kotatsu.core.exceptions.CloudFlareProtectedException
 import org.koitharu.kotatsu.parsers.exception.AuthRequiredException
+import org.koitharu.kotatsu.parsers.exception.NotFoundException
 import org.koitharu.kotatsu.parsers.model.MangaSource
 import org.koitharu.kotatsu.settings.sources.auth.SourceAuthActivity
 import org.koitharu.kotatsu.utils.TaggedActivityResult
@@ -43,6 +45,10 @@ class ExceptionResolver private constructor(
 	suspend fun resolve(e: Throwable): Boolean = when (e) {
 		is CloudFlareProtectedException -> resolveCF(e.url)
 		is AuthRequiredException -> resolveAuthException(e.source)
+		is NotFoundException -> {
+			openInBrowser(e.url)
+			false
+		}
 		else -> false
 	}
 
@@ -69,6 +75,11 @@ class ExceptionResolver private constructor(
 		sourceAuthContract.launch(source)
 	}
 
+	private fun openInBrowser(url: String) {
+		val context = activity ?: fragment?.activity ?: return
+		context.startActivity(BrowserActivity.newIntent(context, url, null))
+	}
+
 	private fun getFragmentManager() = checkNotNull(fragment?.childFragmentManager ?: activity?.supportFragmentManager)
 
 	companion object {
@@ -77,6 +88,7 @@ class ExceptionResolver private constructor(
 		fun getResolveStringId(e: Throwable) = when (e) {
 			is CloudFlareProtectedException -> R.string.captcha_solve
 			is AuthRequiredException -> R.string.sign_in
+			is NotFoundException -> if (e.url.isNotEmpty()) R.string.open_in_browser else 0
 			else -> 0
 		}
 

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

@@ -10,7 +10,7 @@ class GithubRepository(private val okHttp: OkHttpClient) {
 	suspend fun getLatestVersion(): AppVersion {
 		val request = Request.Builder()
 			.get()
-			.url("https://api.github.com/repos/nv95/Kotatsu/releases/latest")
+			.url("https://api.github.com/repos/KotatsuApp/Kotatsu/releases/latest")
 		val json = okHttp.newCall(request.build()).await().parseJson()
 		val asset = json.getJSONArray("assets").getJSONObject(0)
 		return AppVersion(

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

@@ -11,4 +11,5 @@ data class MangaHistory(
 	val chapterId: Long,
 	val page: Int,
 	val scroll: Int,
+	val percent: Float,
 ) : Parcelable

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

@@ -0,0 +1,10 @@
+package org.koitharu.kotatsu.core.model
+
+import org.koitharu.kotatsu.parsers.model.MangaSource
+import org.koitharu.kotatsu.parsers.util.toTitleCase
+import java.util.*
+
+fun MangaSource.getLocaleTitle(): String? {
+	val lc = Locale(locale ?: return null)
+	return lc.getDisplayLanguage(lc).toTitleCase(lc)
+}

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

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

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

@@ -3,14 +3,13 @@ package org.koitharu.kotatsu.core.model.parcelable
 import android.os.Parcel
 import android.os.Parcelable
 import org.koitharu.kotatsu.parsers.model.MangaChapter
-import org.koitharu.kotatsu.utils.ext.createList
 
 class ParcelableMangaChapters(
 	val chapters: List<MangaChapter>,
 ) : Parcelable {
 
 	constructor(parcel: Parcel) : this(
-		createList(parcel.readInt()) { parcel.readMangaChapter() }
+		List(parcel.readInt()) { parcel.readMangaChapter() }
 	)
 
 	override fun writeToParcel(parcel: Parcel, flags: Int) {

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

@@ -3,14 +3,13 @@ package org.koitharu.kotatsu.core.model.parcelable
 import android.os.Parcel
 import android.os.Parcelable
 import org.koitharu.kotatsu.parsers.model.MangaPage
-import org.koitharu.kotatsu.utils.ext.createList
 
 class ParcelableMangaPages(
 	val pages: List<MangaPage>,
 ) : Parcelable {
 
 	constructor(parcel: Parcel) : this(
-		createList(parcel.readInt()) { parcel.readMangaPage() }
+		List(parcel.readInt()) { parcel.readMangaPage() }
 	)
 
 	override fun writeToParcel(parcel: Parcel, flags: Int) {

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

@@ -3,14 +3,14 @@ package org.koitharu.kotatsu.core.model.parcelable
 import android.os.Parcel
 import android.os.Parcelable
 import org.koitharu.kotatsu.parsers.model.MangaTag
-import org.koitharu.kotatsu.utils.ext.createSet
+import org.koitharu.kotatsu.utils.ext.Set
 
 class ParcelableMangaTags(
 	val tags: Set<MangaTag>,
 ) : Parcelable {
 
 	constructor(parcel: Parcel) : this(
-		createSet(parcel.readInt()) { parcel.readMangaTag() }
+		Set(parcel.readInt()) { parcel.readMangaTag() }
 	)
 
 	override fun writeToParcel(parcel: Parcel, flags: Int) {

app/src/main/java/org/koitharu/kotatsu/core/network/CloudFlareInterceptor.kt

@@ -17,7 +17,7 @@ class CloudFlareInterceptor : Interceptor {
 		if (response.code == HTTP_FORBIDDEN || response.code == HTTP_UNAVAILABLE) {
 			if (response.header(HEADER_SERVER)?.startsWith(SERVER_CLOUDFLARE) == true) {
 				response.closeQuietly()
-				throw CloudFlareProtectedException(chain.request().url.toString())
+				throw CloudFlareProtectedException(response.request.url.toString())
 			}
 		}
 		return response

app/src/main/java/org/koitharu/kotatsu/core/network/CommonHeaders.kt

@@ -9,6 +9,7 @@ object CommonHeaders {
 	const val ACCEPT = "Accept"
 	const val CONTENT_DISPOSITION = "Content-Disposition"
 	const val COOKIE = "Cookie"
+	const val AUTHORIZATION = "Authorization"
 
 	val CACHE_CONTROL_DISABLED: CacheControl
 		get() = CacheControl.Builder().noStore().build()

app/src/main/java/org/koitharu/kotatsu/core/network/DoHManager.kt

@@ -21,7 +21,12 @@ class DoHManager(
 	private var cachedProvider: DoHProvider? = null
 
 	override fun lookup(hostname: String): List<InetAddress> {
-		return getDelegate().lookup(hostname)
+		return try {
+			getDelegate().lookup(hostname)
+		} catch (e: UnknownHostException) {
+			// fallback
+			Dns.SYSTEM.lookup(hostname)
+		}
 	}
 
 	@Synchronized
@@ -40,6 +45,7 @@ class DoHManager(
 		DoHProvider.NONE -> Dns.SYSTEM
 		DoHProvider.GOOGLE -> DnsOverHttps.Builder().client(bootstrapClient)
 			.url("https://dns.google/dns-query".toHttpUrl())
+			.resolvePrivateAddresses(true)
 			.bootstrapDnsHosts(
 				listOfNotNull(
 					tryGetByIp("8.8.4.4"),
@@ -50,6 +56,7 @@ class DoHManager(
 			).build()
 		DoHProvider.CLOUDFLARE -> DnsOverHttps.Builder().client(bootstrapClient)
 			.url("https://cloudflare-dns.com/dns-query".toHttpUrl())
+			.resolvePrivateAddresses(true)
 			.bootstrapDnsHosts(
 				listOfNotNull(
 					tryGetByIp("162.159.36.1"),
@@ -65,6 +72,7 @@ class DoHManager(
 			).build()
 		DoHProvider.ADGUARD -> DnsOverHttps.Builder().client(bootstrapClient)
 			.url("https://dns-unfiltered.adguard.com/dns-query".toHttpUrl())
+			.resolvePrivateAddresses(true)
 			.bootstrapDnsHosts(
 				listOfNotNull(
 					tryGetByIp("94.140.14.140"),
@@ -81,4 +89,4 @@ class DoHManager(
 		e.printStackTraceDebug()
 		null
 	}
-}
+}

app/src/main/java/org/koitharu/kotatsu/core/network/WebViewClientCompat.kt

@@ -1,86 +0,0 @@
-package org.koitharu.kotatsu.core.network
-
-import android.annotation.TargetApi
-import android.os.Build
-import android.webkit.*
-
-@Suppress("OverridingDeprecatedMember")
-abstract class WebViewClientCompat : WebViewClient() {
-
-	open fun shouldOverrideUrlCompat(view: WebView, url: String): Boolean {
-		return false
-	}
-
-	open fun shouldInterceptRequestCompat(view: WebView, url: String): WebResourceResponse? {
-		return null
-	}
-
-	open fun onReceivedErrorCompat(
-		view: WebView,
-		errorCode: Int,
-		description: String?,
-		failingUrl: String,
-		isMainFrame: Boolean
-	) {
-	}
-
-	@TargetApi(Build.VERSION_CODES.N)
-	final override fun shouldOverrideUrlLoading(
-		view: WebView,
-		request: WebResourceRequest
-	): Boolean = shouldOverrideUrlCompat(view, request.url.toString())
-
-	final override fun shouldOverrideUrlLoading(view: WebView, url: String): Boolean {
-		return shouldOverrideUrlCompat(view, url)
-	}
-
-	final override fun shouldInterceptRequest(
-		view: WebView,
-		request: WebResourceRequest
-	): WebResourceResponse? = shouldInterceptRequestCompat(view, request.url.toString())
-
-	final override fun shouldInterceptRequest(
-		view: WebView,
-		url: String
-	): WebResourceResponse? = shouldInterceptRequestCompat(view, url)
-
-	@TargetApi(Build.VERSION_CODES.M)
-	final override fun onReceivedError(
-		view: WebView,
-		request: WebResourceRequest,
-		error: WebResourceError
-	) {
-		onReceivedErrorCompat(
-			view,
-			error.errorCode,
-			error.description?.toString(),
-			request.url.toString(),
-			request.isForMainFrame
-		)
-	}
-
-	final override fun onReceivedError(
-		view: WebView,
-		errorCode: Int,
-		description: String?,
-		failingUrl: String
-	) {
-		onReceivedErrorCompat(view, errorCode, description, failingUrl, failingUrl == view.url)
-	}
-
-	@TargetApi(Build.VERSION_CODES.M)
-	final override fun onReceivedHttpError(
-		view: WebView,
-		request: WebResourceRequest,
-		error: WebResourceResponse
-	) {
-		onReceivedErrorCompat(
-			view,
-			error.statusCode,
-			error.reasonPhrase,
-			request.url
-				.toString(),
-			request.isForMainFrame
-		)
-	}
-}

app/src/main/java/org/koitharu/kotatsu/core/os/ShortcutsUpdater.kt

@@ -6,38 +6,42 @@ import android.content.pm.ShortcutManager
 import android.media.ThumbnailUtils
 import android.os.Build
 import android.util.Size
+import androidx.annotation.VisibleForTesting
 import androidx.core.content.pm.ShortcutInfoCompat
 import androidx.core.content.pm.ShortcutManagerCompat
 import androidx.core.graphics.drawable.IconCompat
+import androidx.room.InvalidationTracker
 import coil.ImageLoader
 import coil.request.ImageRequest
 import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.withContext
+import kotlinx.coroutines.Job
+import kotlinx.coroutines.launch
 import org.koitharu.kotatsu.R
 import org.koitharu.kotatsu.base.domain.MangaDataRepository
+import org.koitharu.kotatsu.core.db.TABLE_HISTORY
 import org.koitharu.kotatsu.history.domain.HistoryRepository
 import org.koitharu.kotatsu.parsers.model.Manga
 import org.koitharu.kotatsu.reader.ui.ReaderActivity
+import org.koitharu.kotatsu.utils.ext.printStackTraceDebug
+import org.koitharu.kotatsu.utils.ext.processLifecycleScope
 import org.koitharu.kotatsu.utils.ext.requireBitmap
 
-class ShortcutsRepository(
+class ShortcutsUpdater(
 	private val context: Context,
 	private val coil: ImageLoader,
 	private val historyRepository: HistoryRepository,
 	private val mangaRepository: MangaDataRepository,
-) {
+) : InvalidationTracker.Observer(TABLE_HISTORY) {
 
-	private val iconSize by lazy {
-		getIconSize(context)
-	}
+	private val iconSize by lazy { getIconSize(context) }
+	private var shortcutsUpdateJob: Job? = null
 
-	suspend fun updateShortcuts() {
-		if (Build.VERSION.SDK_INT < Build.VERSION_CODES.N_MR1) return
-		val manager = context.getSystemService(Context.SHORTCUT_SERVICE) as ShortcutManager
-		val shortcuts = historyRepository.getList(0, manager.maxShortcutCountPerActivity)
-			.filter { x -> x.title.isNotEmpty() }
-			.map { buildShortcutInfo(it).build().toShortcutInfo() }
-		manager.dynamicShortcuts = shortcuts
+	override fun onInvalidated(tables: MutableSet<String>) {
+		val prevJob = shortcutsUpdateJob
+		shortcutsUpdateJob = processLifecycleScope.launch(Dispatchers.Default) {
+			prevJob?.join()
+			updateShortcutsImpl()
+		}
 	}
 
 	suspend fun requestPinShortcut(manga: Manga): Boolean {
@@ -48,17 +52,30 @@ class ShortcutsRepository(
 		)
 	}
 
+	@VisibleForTesting
+	suspend fun await(): Boolean {
+		return shortcutsUpdateJob?.join() != null
+	}
+
+	private suspend fun updateShortcutsImpl() = runCatching {
+		val manager = context.getSystemService(Context.SHORTCUT_SERVICE) as ShortcutManager
+		val shortcuts = historyRepository.getList(0, manager.maxShortcutCountPerActivity)
+			.filter { x -> x.title.isNotEmpty() }
+			.map { buildShortcutInfo(it).build().toShortcutInfo() }
+		manager.dynamicShortcuts = shortcuts
+	}.onFailure {
+		it.printStackTraceDebug()
+	}
+
 	private suspend fun buildShortcutInfo(manga: Manga): ShortcutInfoCompat.Builder {
 		val icon = runCatching {
-			withContext(Dispatchers.IO) {
-				val bmp = coil.execute(
-					ImageRequest.Builder(context)
-						.data(manga.coverUrl)
-						.size(iconSize.width, iconSize.height)
-						.build()
-				).requireBitmap()
-				ThumbnailUtils.extractThumbnail(bmp, iconSize.width, iconSize.height, 0)
-			}
+			val bmp = coil.execute(
+				ImageRequest.Builder(context)
+					.data(manga.coverUrl)
+					.size(iconSize.width, iconSize.height)
+					.build()
+			).requireBitmap()
+			ThumbnailUtils.extractThumbnail(bmp, iconSize.width, iconSize.height, 0)
 		}.fold(
 			onSuccess = { IconCompat.createWithAdaptiveBitmap(it) },
 			onFailure = { IconCompat.createWithResource(context, R.drawable.ic_shortcut_default) }

app/src/main/java/org/koitharu/kotatsu/core/parser/MangaRepository.kt

@@ -13,12 +13,9 @@ interface MangaRepository {
 
 	val sortOrders: Set<SortOrder>
 
-	suspend fun getList(
-		offset: Int,
-		query: String? = null,
-		tags: Set<MangaTag>? = null,
-		sortOrder: SortOrder? = null,
-	): List<Manga>
+	suspend fun getList(offset: Int, query: String): List<Manga>
+
+	suspend fun getList(offset: Int, tags: Set<MangaTag>?, sortOrder: SortOrder?): List<Manga>
 
 	suspend fun getDetails(manga: Manga): Manga
 

app/src/main/java/org/koitharu/kotatsu/core/parser/RemoteMangaRepository.kt

@@ -20,12 +20,13 @@ class RemoteMangaRepository(private val parser: MangaParser) : MangaRepository {
 			getConfig().defaultSortOrder = value
 		}
 
-	override suspend fun getList(
-		offset: Int,
-		query: String?,
-		tags: Set<MangaTag>?,
-		sortOrder: SortOrder?,
-	): List<Manga> = parser.getList(offset, query, tags, sortOrder)
+	override suspend fun getList(offset: Int, query: String): List<Manga> {
+		return parser.getList(offset, query)
+	}
+
+	override suspend fun getList(offset: Int, tags: Set<MangaTag>?, sortOrder: SortOrder?): List<Manga> {
+		return parser.getList(offset, tags, sortOrder)
+	}
 
 	override suspend fun getDetails(manga: Manga): Manga = parser.getDetails(manga)
 

app/src/main/java/org/koitharu/kotatsu/core/prefs/AppSettings.kt

@@ -10,6 +10,10 @@ import androidx.collection.arraySetOf
 import androidx.core.content.edit
 import androidx.preference.PreferenceManager
 import com.google.android.material.color.DynamicColors
+import java.io.File
+import java.text.DateFormat
+import java.text.SimpleDateFormat
+import java.util.*
 import kotlinx.coroutines.channels.awaitClose
 import kotlinx.coroutines.channels.trySendBlocking
 import kotlinx.coroutines.flow.callbackFlow
@@ -18,12 +22,9 @@ import org.koitharu.kotatsu.core.model.ZoomMode
 import org.koitharu.kotatsu.core.network.DoHProvider
 import org.koitharu.kotatsu.parsers.model.MangaSource
 import org.koitharu.kotatsu.utils.ext.getEnumValue
+import org.koitharu.kotatsu.utils.ext.observe
 import org.koitharu.kotatsu.utils.ext.putEnumValue
 import org.koitharu.kotatsu.utils.ext.toUriOrNull
-import java.io.File
-import java.text.DateFormat
-import java.text.SimpleDateFormat
-import java.util.*
 
 class AppSettings(context: Context) {
 
@@ -40,7 +41,7 @@ class AppSettings(context: Context) {
 		get() = Collections.unmodifiableSet(remoteSources)
 
 	var listMode: ListMode
-		get() = prefs.getEnumValue(KEY_LIST_MODE, ListMode.DETAILED_LIST)
+		get() = prefs.getEnumValue(KEY_LIST_MODE, ListMode.GRID)
 		set(value) = prefs.edit { putEnumValue(KEY_LIST_MODE, value) }
 
 	var defaultSection: AppSection
@@ -104,10 +105,13 @@ class AppSettings(context: Context) {
 	val isReaderModeDetectionEnabled: Boolean
 		get() = prefs.getBoolean(KEY_READER_MODE_DETECT, true)
 
-	var historyGrouping: Boolean
+	var isHistoryGroupingEnabled: Boolean
 		get() = prefs.getBoolean(KEY_HISTORY_GROUPING, true)
 		set(value) = prefs.edit { putBoolean(KEY_HISTORY_GROUPING, value) }
 
+	val isReadingIndicatorsEnabled: Boolean
+		get() = prefs.getBoolean(KEY_READING_INDICATORS, true)
+
 	val isHistoryExcludeNsfw: Boolean
 		get() = prefs.getBoolean(KEY_HISTORY_EXCLUDE_NSFW, false)
 
@@ -125,6 +129,10 @@ class AppSettings(context: Context) {
 		get() = prefs.getString(KEY_APP_PASSWORD, null)
 		set(value) = prefs.edit { if (value != null) putString(KEY_APP_PASSWORD, value) else remove(KEY_APP_PASSWORD) }
 
+	var isBiometricProtectionEnabled: Boolean
+		get() = prefs.getBoolean(KEY_PROTECT_APP_BIOMETRIC, true)
+		set(value) = prefs.edit { putBoolean(KEY_PROTECT_APP_BIOMETRIC, value) }
+
 	var sourcesOrder: List<String>
 		get() = prefs.getString(KEY_SOURCES_ORDER, null)
 			?.split('|')
@@ -242,15 +250,7 @@ class AppSettings(context: Context) {
 		prefs.unregisterOnSharedPreferenceChangeListener(listener)
 	}
 
-	fun observe() = callbackFlow<String> {
-		val listener = SharedPreferences.OnSharedPreferenceChangeListener { _, key ->
-			trySendBlocking(key)
-		}
-		prefs.registerOnSharedPreferenceChangeListener(listener)
-		awaitClose {
-			prefs.unregisterOnSharedPreferenceChangeListener(listener)
-		}
-	}
+	fun observe() = prefs.observe()
 
 	companion object {
 
@@ -293,11 +293,13 @@ class AppSettings(context: Context) {
 		const val KEY_READER_MODE_DETECT = "reader_mode_detect"
 		const val KEY_APP_PASSWORD = "app_password"
 		const val KEY_PROTECT_APP = "protect_app"
+		const val KEY_PROTECT_APP_BIOMETRIC = "protect_app_bio"
 		const val KEY_APP_VERSION = "app_version"
 		const val KEY_ZOOM_MODE = "zoom_mode"
 		const val KEY_BACKUP = "backup"
 		const val KEY_RESTORE = "restore"
 		const val KEY_HISTORY_GROUPING = "history_grouping"
+		const val KEY_READING_INDICATORS = "reading_indicators"
 		const val KEY_REVERSE_CHAPTERS = "reverse_chapters"
 		const val KEY_HISTORY_EXCLUDE_NSFW = "history_exclude_nsfw"
 		const val KEY_PAGES_NUMBERS = "pages_numbers"
@@ -307,6 +309,7 @@ class AppSettings(context: Context) {
 		const val KEY_SUGGESTIONS_EXCLUDE_NSFW = "suggestions_exclude_nsfw"
 		const val KEY_SUGGESTIONS_EXCLUDE_TAGS = "suggestions_exclude_tags"
 		const val KEY_SEARCH_SINGLE_SOURCE = "search_single_source"
+		const val KEY_SHIKIMORI = "shikimori"
 		const val KEY_DOWNLOADS_PARALLELISM = "downloads_parallelism"
 		const val KEY_DOWNLOADS_SLOWDOWN = "downloads_slowdown"
 		const val KEY_ALL_FAVOURITES_VISIBLE = "all_favourites_visible"
@@ -316,9 +319,6 @@ class AppSettings(context: Context) {
 		const val KEY_APP_UPDATE = "app_update"
 		const val KEY_APP_UPDATE_AUTO = "app_update_auto"
 		const val KEY_APP_TRANSLATION = "about_app_translation"
-		const val KEY_FEEDBACK_4PDA = "about_feedback_4pda"
-		const val KEY_FEEDBACK_DISCORD = "about_feedback_discord"
-		const val KEY_FEEDBACK_GITHUB = "about_feedback_github"
 
 		private const val NETWORK_NEVER = 0
 		private const val NETWORK_ALWAYS = 1

app/src/main/java/org/koitharu/kotatsu/core/ui/AppCrashHandler.kt

@@ -1,22 +0,0 @@
-package org.koitharu.kotatsu.core.ui
-
-import android.content.Context
-import android.content.Intent
-import android.util.Log
-import kotlin.system.exitProcess
-import org.koitharu.kotatsu.utils.ext.printStackTraceDebug
-
-class AppCrashHandler(private val applicationContext: Context) : Thread.UncaughtExceptionHandler {
-
-	override fun uncaughtException(t: Thread, e: Throwable) {
-		val intent = CrashActivity.newIntent(applicationContext, e)
-		intent.flags = (Intent.FLAG_ACTIVITY_CLEAR_TASK or Intent.FLAG_ACTIVITY_NEW_TASK)
-		try {
-			applicationContext.startActivity(intent)
-		} catch (t: Throwable) {
-			t.printStackTraceDebug()
-		}
-		Log.e("CRASH", e.message, e)
-		exitProcess(1)
-	}
-}

app/src/main/java/org/koitharu/kotatsu/core/ui/CrashActivity.kt

@@ -1,83 +0,0 @@
-package org.koitharu.kotatsu.core.ui
-
-import android.app.Activity
-import android.content.ActivityNotFoundException
-import android.content.Context
-import android.content.Intent
-import android.net.Uri
-import android.os.Bundle
-import android.view.Menu
-import android.view.MenuItem
-import android.view.View
-import org.koitharu.kotatsu.R
-import org.koitharu.kotatsu.databinding.ActivityCrashBinding
-import org.koitharu.kotatsu.main.ui.MainActivity
-import org.koitharu.kotatsu.parsers.util.ellipsize
-import org.koitharu.kotatsu.utils.ShareHelper
-
-class CrashActivity : Activity(), View.OnClickListener {
-
-	private lateinit var binding: ActivityCrashBinding
-
-	override fun onCreate(savedInstanceState: Bundle?) {
-		super.onCreate(savedInstanceState)
-		binding = ActivityCrashBinding.inflate(layoutInflater)
-		setContentView(binding.root)
-		binding.textView.text = intent.getStringExtra(Intent.EXTRA_TEXT)
-		binding.buttonClose.setOnClickListener(this)
-		binding.buttonRestart.setOnClickListener(this)
-		binding.buttonReport.setOnClickListener(this)
-	}
-
-	override fun onCreateOptionsMenu(menu: Menu?): Boolean {
-		menuInflater.inflate(R.menu.opt_crash, menu)
-		return super.onCreateOptionsMenu(menu)
-	}
-
-	override fun onOptionsItemSelected(item: MenuItem): Boolean {
-		when (item.itemId) {
-			R.id.action_share -> {
-				ShareHelper(this).shareText(binding.textView.text.toString())
-			}
-			else -> return super.onOptionsItemSelected(item)
-		}
-		return true
-	}
-
-	override fun onClick(v: View) {
-		when (v.id) {
-			R.id.button_close -> {
-				finish()
-			}
-			R.id.button_restart -> {
-				val intent = Intent(applicationContext, MainActivity::class.java)
-				intent.flags = (Intent.FLAG_ACTIVITY_CLEAR_TASK or Intent.FLAG_ACTIVITY_NEW_TASK)
-				startActivity(intent)
-				finish()
-			}
-			R.id.button_report -> {
-				val intent = Intent(Intent.ACTION_VIEW)
-				intent.data = Uri.parse("https://github.com/nv95/Kotatsu/issues")
-				try {
-					startActivity(Intent.createChooser(intent, getString(R.string.report_github)))
-				} catch (_: ActivityNotFoundException) {
-				}
-			}
-		}
-	}
-
-	companion object {
-
-		private const val MAX_TRACE_SIZE = 131071
-
-		fun newIntent(context: Context, error: Throwable): Intent {
-			val crashInfo = error
-				.stackTraceToString()
-				.trimIndent()
-				.ellipsize(MAX_TRACE_SIZE)
-			val intent = Intent(context, CrashActivity::class.java)
-			intent.putExtra(Intent.EXTRA_TEXT, crashInfo)
-			return intent
-		}
-	}
-}

app/src/main/java/org/koitharu/kotatsu/core/ui/uiModule.kt

@@ -1,5 +1,6 @@
 package org.koitharu.kotatsu.core.ui
 
+import android.text.Html
 import coil.ComponentRegistry
 import coil.ImageLoader
 import coil.disk.DiskCache
@@ -10,6 +11,7 @@ import org.koin.dsl.module
 import org.koitharu.kotatsu.core.parser.FaviconMapper
 import org.koitharu.kotatsu.local.data.CacheDir
 import org.koitharu.kotatsu.local.data.CbzFetcher
+import org.koitharu.kotatsu.utils.image.CoilImageGetter
 
 val uiModule
 	get() = module {
@@ -29,6 +31,9 @@ val uiModule
 			ImageLoader.Builder(androidContext())
 				.okHttpClient(httpClientFactory)
 				.interceptorDispatcher(Dispatchers.Default)
+				.fetcherDispatcher(Dispatchers.IO)
+				.decoderDispatcher(Dispatchers.Default)
+				.transformationDispatcher(Dispatchers.Default)
 				.diskCache(diskCacheFactory)
 				.components(
 					ComponentRegistry.Builder()
@@ -37,4 +42,5 @@ val uiModule
 						.build()
 				).build()
 		}
+		factory<Html.ImageGetter> { CoilImageGetter(androidContext(), get()) }
 	}

app/src/main/java/org/koitharu/kotatsu/details/DetailsModule.kt

@@ -8,6 +8,6 @@ val detailsModule
 	get() = module {
 
 		viewModel { intent ->
-			DetailsViewModel(intent.get(), get(), get(), get(), get(), get(), get(), get())
+			DetailsViewModel(intent.get(), get(), get(), get(), get(), get(), get(), get(), get(), get())
 		}
 	}

app/src/main/java/org/koitharu/kotatsu/details/ui/ChaptersFragment.kt

@@ -5,16 +5,17 @@ import android.os.Bundle
 import android.view.*
 import android.widget.AdapterView
 import android.widget.Spinner
-import androidx.appcompat.app.AppCompatActivity
 import androidx.appcompat.view.ActionMode
 import androidx.appcompat.widget.SearchView
 import androidx.core.graphics.Insets
+import androidx.core.view.MenuProvider
 import androidx.core.view.isVisible
 import androidx.core.view.updatePadding
 import com.google.android.material.snackbar.Snackbar
 import org.koin.androidx.viewmodel.ext.android.sharedViewModel
 import org.koitharu.kotatsu.R
 import org.koitharu.kotatsu.base.ui.BaseFragment
+import org.koitharu.kotatsu.base.ui.list.ListSelectionController
 import org.koitharu.kotatsu.base.ui.list.OnListItemClickListener
 import org.koitharu.kotatsu.databinding.FragmentChaptersBinding
 import org.koitharu.kotatsu.details.ui.adapter.BranchesAdapter
@@ -27,26 +28,21 @@ import org.koitharu.kotatsu.parsers.model.MangaSource
 import org.koitharu.kotatsu.reader.ui.ReaderActivity
 import org.koitharu.kotatsu.reader.ui.ReaderState
 import org.koitharu.kotatsu.utils.RecyclerViewScrollCallback
+import org.koitharu.kotatsu.utils.ext.addMenuProvider
 import kotlin.math.roundToInt
 
 class ChaptersFragment :
 	BaseFragment<FragmentChaptersBinding>(),
 	OnListItemClickListener<ChapterListItem>,
-	ActionMode.Callback,
 	AdapterView.OnItemSelectedListener,
 	MenuItem.OnActionExpandListener,
-	SearchView.OnQueryTextListener {
+	SearchView.OnQueryTextListener,
+	ListSelectionController.Callback {
 
 	private val viewModel by sharedViewModel<DetailsViewModel>()
 
 	private var chaptersAdapter: ChaptersAdapter? = null
-	private var actionMode: ActionMode? = null
-	private var selectionDecoration: ChaptersSelectionDecoration? = null
-
-	override fun onCreate(savedInstanceState: Bundle?) {
-		super.onCreate(savedInstanceState)
-		setHasOptionsMenu(true)
-	}
+	private var selectionController: ListSelectionController? = null
 
 	override fun onInflateView(
 		inflater: LayoutInflater,
@@ -56,9 +52,14 @@ class ChaptersFragment :
 	override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
 		super.onViewCreated(view, savedInstanceState)
 		chaptersAdapter = ChaptersAdapter(this)
-		selectionDecoration = ChaptersSelectionDecoration(view.context)
+		selectionController = ListSelectionController(
+			activity = requireActivity(),
+			decoration = ChaptersSelectionDecoration(view.context),
+			registryOwner = this,
+			callback = this,
+		)
 		with(binding.recyclerViewChapters) {
-			addItemDecoration(selectionDecoration!!)
+			checkNotNull(selectionController).attachToRecyclerView(this)
 			setHasFixedSize(true)
 			adapter = chaptersAdapter
 		}
@@ -72,49 +73,18 @@ class ChaptersFragment :
 			binding.textViewHolder.isVisible = it
 			activity?.invalidateOptionsMenu()
 		}
+		addMenuProvider(ChaptersMenuProvider())
 	}
 
 	override fun onDestroyView() {
 		chaptersAdapter = null
-		selectionDecoration = null
+		selectionController = null
 		binding.spinnerBranches?.adapter = null
 		super.onDestroyView()
 	}
 
-	override fun onCreateOptionsMenu(menu: Menu, inflater: MenuInflater) {
-		super.onCreateOptionsMenu(menu, inflater)
-		inflater.inflate(R.menu.opt_chapters, menu)
-		val searchMenuItem = menu.findItem(R.id.action_search)
-		searchMenuItem.setOnActionExpandListener(this)
-		val searchView = searchMenuItem.actionView as SearchView
-		searchView.setOnQueryTextListener(this)
-		searchView.setIconifiedByDefault(false)
-		searchView.queryHint = searchMenuItem.title
-	}
-
-	override fun onPrepareOptionsMenu(menu: Menu) {
-		super.onPrepareOptionsMenu(menu)
-		menu.findItem(R.id.action_reversed).isChecked = viewModel.isChaptersReversed.value == true
-		menu.findItem(R.id.action_search).isVisible = viewModel.isChaptersEmpty.value == false
-	}
-
-	override fun onOptionsItemSelected(item: MenuItem) = when (item.itemId) {
-		R.id.action_reversed -> {
-			viewModel.setChaptersReversed(!item.isChecked)
-			true
-		}
-		else -> super.onOptionsItemSelected(item)
-	}
-
 	override fun onItemClick(item: ChapterListItem, view: View) {
-		if (selectionDecoration?.checkedItemsCount != 0) {
-			selectionDecoration?.toggleItemChecked(item.chapter.id)
-			if (selectionDecoration?.checkedItemsCount == 0) {
-				actionMode?.finish()
-			} else {
-				actionMode?.invalidate()
-				binding.recyclerViewChapters.invalidateItemDecorations()
-			}
+		if (selectionController?.onItemClick(item.chapter.id) == true) {
 			return
 		}
 		if (item.hasFlag(ChapterListItem.FLAG_MISSING)) {
@@ -133,14 +103,7 @@ class ChaptersFragment :
 	}
 
 	override fun onItemLongClick(item: ChapterListItem, view: View): Boolean {
-		if (actionMode == null) {
-			actionMode = (activity as? AppCompatActivity)?.startSupportActionMode(this)
-		}
-		return actionMode?.also {
-			selectionDecoration?.setItemIsChecked(item.chapter.id, true)
-			binding.recyclerViewChapters.invalidateItemDecorations()
-			it.invalidate()
-		} != null
+		return selectionController?.onItemLongClick(item.chapter.id) ?: false
 	}
 
 	override fun onActionItemClicked(mode: ActionMode, item: MenuItem): Boolean {
@@ -149,13 +112,13 @@ class ChaptersFragment :
 				DownloadService.start(
 					context ?: return false,
 					viewModel.getRemoteManga() ?: viewModel.manga.value ?: return false,
-					selectionDecoration?.checkedItemsIds?.toSet()
+					selectionController?.snapshot(),
 				)
 				mode.finish()
 				true
 			}
 			R.id.action_delete -> {
-				val ids = selectionDecoration?.checkedItemsIds
+				val ids = selectionController?.peekCheckedIds()
 				val manga = viewModel.manga.value
 				when {
 					ids.isNullOrEmpty() || manga == null -> Unit
@@ -172,11 +135,29 @@ class ChaptersFragment :
 				mode.finish()
 				true
 			}
+			R.id.action_select_range -> {
+				val controller = selectionController ?: return false
+				val items = chaptersAdapter?.items ?: return false
+				val ids = HashSet(controller.peekCheckedIds())
+				val buffer = HashSet<Long>()
+				var isAdding = false
+				for (x in items) {
+					if (x.chapter.id in ids) {
+						isAdding = true
+						if (buffer.isNotEmpty()) {
+							ids.addAll(buffer)
+							buffer.clear()
+						}
+					} else if (isAdding) {
+						buffer.add(x.chapter.id)
+					}
+				}
+				controller.addAll(ids)
+				true
+			}
 			R.id.action_select_all -> {
 				val ids = chaptersAdapter?.items?.map { it.chapter.id } ?: return false
-				selectionDecoration?.checkAll(ids)
-				binding.recyclerViewChapters.invalidateItemDecorations()
-				mode.invalidate()
+				selectionController?.addAll(ids)
 				true
 			}
 			else -> false
@@ -196,22 +177,30 @@ class ChaptersFragment :
 	}
 
 	override fun onPrepareActionMode(mode: ActionMode, menu: Menu): Boolean {
-		val selectedIds = selectionDecoration?.checkedItemsIds ?: return false
-		val items = chaptersAdapter?.items?.filter { x -> x.chapter.id in selectedIds }.orEmpty()
-		menu.findItem(R.id.action_save).isVisible = items.none { x ->
+		val selectedIds = selectionController?.peekCheckedIds() ?: return false
+		val allItems = chaptersAdapter?.items.orEmpty()
+		val items = allItems.withIndex().filter { (_, x) -> x.chapter.id in selectedIds }
+		menu.findItem(R.id.action_save).isVisible = items.none { (_, x) ->
 			x.chapter.source == MangaSource.LOCAL
 		}
-		menu.findItem(R.id.action_delete).isVisible = items.all { x ->
+		menu.findItem(R.id.action_delete).isVisible = items.all { (_, x) ->
 			x.chapter.source == MangaSource.LOCAL
 		}
+		menu.findItem(R.id.action_select_all).isVisible = items.size < allItems.size
 		mode.title = items.size.toString()
+		var hasGap = false
+		for (i in 0 until items.size - 1) {
+			if (items[i].index + 1 != items[i + 1].index) {
+				hasGap = true
+				break
+			}
+		}
+		menu.findItem(R.id.action_select_range).isVisible = hasGap
 		return true
 	}
 
-	override fun onDestroyActionMode(mode: ActionMode?) {
-		selectionDecoration?.clearSelection()
+	override fun onSelectionChanged(count: Int) {
 		binding.recyclerViewChapters.invalidateItemDecorations()
-		actionMode = null
 	}
 
 	override fun onMenuItemActionExpand(item: MenuItem?): Boolean = true
@@ -268,4 +257,30 @@ class ChaptersFragment :
 	private fun onLoadingStateChanged(isLoading: Boolean) {
 		binding.progressBar.isVisible = isLoading
 	}
+
+	private inner class ChaptersMenuProvider : MenuProvider {
+
+		override fun onCreateMenu(menu: Menu, menuInflater: MenuInflater) {
+			menuInflater.inflate(R.menu.opt_chapters, menu)
+			val searchMenuItem = menu.findItem(R.id.action_search)
+			searchMenuItem.setOnActionExpandListener(this@ChaptersFragment)
+			val searchView = searchMenuItem.actionView as SearchView
+			searchView.setOnQueryTextListener(this@ChaptersFragment)
+			searchView.setIconifiedByDefault(false)
+			searchView.queryHint = searchMenuItem.title
+		}
+
+		override fun onPrepareMenu(menu: Menu) {
+			menu.findItem(R.id.action_reversed).isChecked = viewModel.isChaptersReversed.value == true
+			menu.findItem(R.id.action_search).isVisible = viewModel.isChaptersEmpty.value == false
+		}
+
+		override fun onMenuItemSelected(menuItem: MenuItem): Boolean = when (menuItem.itemId) {
+			R.id.action_reversed -> {
+				viewModel.setChaptersReversed(!menuItem.isChecked)
+				true
+			}
+			else -> false
+		}
+	}
 }

app/src/main/java/org/koitharu/kotatsu/details/ui/DetailsActivity.kt

@@ -15,14 +15,13 @@ import android.widget.Toast
 import androidx.appcompat.view.ActionMode
 import androidx.core.content.pm.ShortcutManagerCompat
 import androidx.core.graphics.Insets
-import androidx.core.net.toFile
-import androidx.core.net.toUri
 import androidx.core.view.isVisible
 import androidx.core.view.updateLayoutParams
 import androidx.core.view.updatePadding
 import androidx.fragment.app.commit
 import androidx.lifecycle.lifecycleScope
 import com.google.android.material.dialog.MaterialAlertDialogBuilder
+import com.google.android.material.snackbar.Snackbar
 import com.google.android.material.tabs.TabLayout
 import com.google.android.material.tabs.TabLayoutMediator
 import kotlinx.coroutines.launch
@@ -35,7 +34,7 @@ import org.koitharu.kotatsu.base.ui.BaseActivity
 import org.koitharu.kotatsu.browser.BrowserActivity
 import org.koitharu.kotatsu.core.exceptions.resolve.ExceptionResolver
 import org.koitharu.kotatsu.core.model.parcelable.ParcelableManga
-import org.koitharu.kotatsu.core.os.ShortcutsRepository
+import org.koitharu.kotatsu.core.os.ShortcutsUpdater
 import org.koitharu.kotatsu.databinding.ActivityDetailsBinding
 import org.koitharu.kotatsu.details.ui.adapter.BranchesAdapter
 import org.koitharu.kotatsu.download.ui.service.DownloadService
@@ -44,9 +43,11 @@ import org.koitharu.kotatsu.parsers.model.MangaSource
 import org.koitharu.kotatsu.parsers.util.mapNotNullToSet
 import org.koitharu.kotatsu.reader.ui.ReaderActivity
 import org.koitharu.kotatsu.reader.ui.ReaderState
+import org.koitharu.kotatsu.scrobbling.ui.selector.ScrobblingSelectorBottomSheet
 import org.koitharu.kotatsu.search.ui.multi.MultiSearchActivity
-import org.koitharu.kotatsu.utils.ShareHelper
 import org.koitharu.kotatsu.utils.ext.getDisplayMessage
+import org.koitharu.kotatsu.utils.ext.isReportable
+import org.koitharu.kotatsu.utils.ext.report
 
 class DetailsActivity :
 	BaseActivity<ActivityDetailsBinding>(),
@@ -84,7 +85,7 @@ class DetailsActivity :
 		viewModel.onMangaRemoved.observe(this, ::onMangaRemoved)
 		viewModel.onError.observe(this, ::onError)
 		viewModel.onShowToast.observe(this) {
-			binding.snackbar.show(messageText = getString(it), longDuration = false)
+			binding.snackbar.show(messageText = getString(it))
 		}
 
 		registerReceiver(downloadReceiver, IntentFilter(DownloadService.ACTION_DOWNLOAD_COMPLETE))
@@ -102,7 +103,8 @@ class DetailsActivity :
 
 	private fun onMangaRemoved(manga: Manga) {
 		Toast.makeText(
-			this, getString(R.string._s_deleted_from_local_storage, manga.title),
+			this,
+			getString(R.string._s_deleted_from_local_storage, manga.title),
 			Toast.LENGTH_SHORT
 		).show()
 		finishAfterTransition()
@@ -117,6 +119,21 @@ class DetailsActivity :
 				Toast.makeText(this, e.getDisplayMessage(resources), Toast.LENGTH_LONG).show()
 				finishAfterTransition()
 			}
+			e.isReportable() -> {
+				binding.snackbar.show(
+					messageText = e.getDisplayMessage(resources),
+					actionId = R.string.report,
+					duration = if (viewModel.manga.value?.chapters == null) {
+						Snackbar.LENGTH_INDEFINITE
+					} else {
+						Snackbar.LENGTH_LONG
+					},
+					onActionClick = {
+						e.report("DetailsActivity::onError")
+						dismiss()
+					}
+				)
+			}
 			else -> {
 				binding.snackbar.show(e.getDisplayMessage(resources))
 			}
@@ -154,28 +171,15 @@ class DetailsActivity :
 
 	override fun onPrepareOptionsMenu(menu: Menu): Boolean {
 		val manga = viewModel.manga.value
-		menu.findItem(R.id.action_save).isVisible =
-			manga?.source != null && manga.source != MangaSource.LOCAL
-		menu.findItem(R.id.action_delete).isVisible =
-			manga?.source == MangaSource.LOCAL
-		menu.findItem(R.id.action_browser).isVisible =
-			manga?.source != MangaSource.LOCAL
-		menu.findItem(R.id.action_shortcut).isVisible =
-			ShortcutManagerCompat.isRequestPinShortcutSupported(this)
+		menu.findItem(R.id.action_save).isVisible = manga?.source != null && manga.source != MangaSource.LOCAL
+		menu.findItem(R.id.action_delete).isVisible = manga?.source == MangaSource.LOCAL
+		menu.findItem(R.id.action_browser).isVisible = manga?.source != MangaSource.LOCAL
+		menu.findItem(R.id.action_shortcut).isVisible = ShortcutManagerCompat.isRequestPinShortcutSupported(this)
+		menu.findItem(R.id.action_shiki_track).isVisible = viewModel.isScrobblingAvailable
 		return super.onPrepareOptionsMenu(menu)
 	}
 
 	override fun onOptionsItemSelected(item: MenuItem) = when (item.itemId) {
-		R.id.action_share -> {
-			viewModel.manga.value?.let {
-				if (it.source == MangaSource.LOCAL) {
-					ShareHelper(this).shareCbz(listOf(it.url.toUri().toFile()))
-				} else {
-					ShareHelper(this).shareMangaLink(it)
-				}
-			}
-			true
-		}
 		R.id.action_delete -> {
 			val title = viewModel.manga.value?.title.orEmpty()
 			MaterialAlertDialogBuilder(this)
@@ -212,10 +216,16 @@ class DetailsActivity :
 			}
 			true
 		}
+		R.id.action_shiki_track -> {
+			viewModel.manga.value?.let {
+				ScrobblingSelectorBottomSheet.show(supportFragmentManager, it)
+			}
+			true
+		}
 		R.id.action_shortcut -> {
 			viewModel.manga.value?.let {
 				lifecycleScope.launch {
-					if (!get<ShortcutsRepository>().requestPinShortcut(it)) {
+					if (!get<ShortcutsUpdater>().requestPinShortcut(it)) {
 						binding.snackbar.show(getString(R.string.operation_not_supported))
 					}
 				}

app/src/main/java/org/koitharu/kotatsu/details/ui/DetailsFragment.kt

@@ -8,16 +8,20 @@ import android.view.*
 import androidx.appcompat.widget.PopupMenu
 import androidx.core.content.ContextCompat
 import androidx.core.graphics.Insets
+import androidx.core.net.toFile
 import androidx.core.net.toUri
 import androidx.core.text.parseAsHtml
+import androidx.core.view.MenuProvider
 import androidx.core.view.isGone
 import androidx.core.view.isVisible
 import androidx.core.view.updatePadding
 import coil.ImageLoader
 import coil.request.ImageRequest
+import coil.size.Scale
 import coil.util.CoilUtils
 import com.google.android.material.chip.Chip
 import kotlinx.coroutines.launch
+import org.koin.android.ext.android.get
 import org.koin.android.ext.android.inject
 import org.koin.androidx.viewmodel.ext.android.sharedViewModel
 import org.koitharu.kotatsu.R
@@ -29,7 +33,9 @@ import org.koitharu.kotatsu.bookmarks.domain.Bookmark
 import org.koitharu.kotatsu.bookmarks.ui.BookmarksAdapter
 import org.koitharu.kotatsu.core.model.MangaHistory
 import org.koitharu.kotatsu.databinding.FragmentDetailsBinding
+import org.koitharu.kotatsu.details.ui.scrobbling.ScrobblingInfoBottomSheet
 import org.koitharu.kotatsu.favourites.ui.categories.select.FavouriteCategoriesBottomSheet
+import org.koitharu.kotatsu.history.domain.PROGRESS_NONE
 import org.koitharu.kotatsu.image.ui.ImageActivity
 import org.koitharu.kotatsu.parsers.model.Manga
 import org.koitharu.kotatsu.parsers.model.MangaSource
@@ -37,9 +43,11 @@ import org.koitharu.kotatsu.parsers.model.MangaState
 import org.koitharu.kotatsu.parsers.model.MangaTag
 import org.koitharu.kotatsu.reader.ui.ReaderActivity
 import org.koitharu.kotatsu.reader.ui.ReaderState
+import org.koitharu.kotatsu.scrobbling.domain.model.ScrobblingInfo
 import org.koitharu.kotatsu.search.ui.MangaListActivity
 import org.koitharu.kotatsu.search.ui.SearchActivity
 import org.koitharu.kotatsu.utils.FileSize
+import org.koitharu.kotatsu.utils.ShareHelper
 import org.koitharu.kotatsu.utils.ext.*
 
 class DetailsFragment :
@@ -52,11 +60,6 @@ class DetailsFragment :
 	private val viewModel by sharedViewModel<DetailsViewModel>()
 	private val coil by inject<ImageLoader>(mode = LazyThreadSafetyMode.NONE)
 
-	override fun onCreate(savedInstanceState: Bundle?) {
-		super.onCreate(savedInstanceState)
-		setHasOptionsMenu(true)
-	}
-
 	override fun onInflateView(
 		inflater: LayoutInflater,
 		container: ViewGroup?,
@@ -69,6 +72,7 @@ class DetailsFragment :
 		binding.buttonRead.setOnClickListener(this)
 		binding.buttonRead.setOnLongClickListener(this)
 		binding.imageViewCover.setOnClickListener(this)
+		binding.scrobblingLayout.root.setOnClickListener(this)
 		binding.textViewDescription.movementMethod = LinkMovementMethod.getInstance()
 		binding.chipsTags.onChipClickListener = this
 		viewModel.manga.observe(viewLifecycleOwner, ::onMangaUpdated)
@@ -76,11 +80,9 @@ class DetailsFragment :
 		viewModel.favouriteCategories.observe(viewLifecycleOwner, ::onFavouriteChanged)
 		viewModel.readingHistory.observe(viewLifecycleOwner, ::onHistoryChanged)
 		viewModel.bookmarks.observe(viewLifecycleOwner, ::onBookmarksChanged)
-	}
-
-	override fun onCreateOptionsMenu(menu: Menu, inflater: MenuInflater) {
-		super.onCreateOptionsMenu(menu, inflater)
-		inflater.inflate(R.menu.opt_details_info, menu)
+		viewModel.scrobblingInfo.observe(viewLifecycleOwner, ::onScrobblingInfoChanged)
+		viewModel.description.observe(viewLifecycleOwner, ::onDescriptionChanged)
+		addMenuProvider(DetailsMenuProvider())
 	}
 
 	override fun onItemClick(item: Bookmark, view: View) {
@@ -108,8 +110,6 @@ class DetailsFragment :
 			textViewTitle.text = manga.title
 			textViewSubtitle.textAndVisible = manga.altTitle
 			textViewAuthor.textAndVisible = manga.author
-			textViewDescription.text = manga.description?.parseAsHtml()?.takeUnless(Spanned::isBlank)
-				?: getString(R.string.no_description)
 			when (manga.state) {
 				MangaState.FINISHED -> {
 					textViewState.apply {
@@ -172,6 +172,14 @@ class DetailsFragment :
 		}
 	}
 
+	private fun onDescriptionChanged(description: CharSequence?) {
+		if (description.isNullOrBlank()) {
+			binding.textViewDescription.setText(R.string.no_description)
+		} else {
+			binding.textViewDescription.text = description
+		}
+	}
+
 	private fun onHistoryChanged(history: MangaHistory?) {
 		with(binding.buttonRead) {
 			if (history == null) {
@@ -182,6 +190,7 @@ class DetailsFragment :
 				setIconResource(R.drawable.ic_play)
 			}
 		}
+		binding.progressView.setPercent(history?.percent ?: PROGRESS_NONE, animate = true)
 	}
 
 	private fun onFavouriteChanged(isFavourite: Boolean) {
@@ -215,12 +224,38 @@ class DetailsFragment :
 		}
 	}
 
+	private fun onScrobblingInfoChanged(scrobbling: ScrobblingInfo?) {
+		with(binding.scrobblingLayout) {
+			root.isVisible = scrobbling != null
+			if (scrobbling == null) {
+				CoilUtils.dispose(imageViewCover)
+				return
+			}
+			imageViewCover.newImageRequest(scrobbling.coverUrl)?.run {
+				placeholder(R.drawable.ic_placeholder)
+				fallback(R.drawable.ic_placeholder)
+				error(R.drawable.ic_placeholder)
+				lifecycle(viewLifecycleOwner)
+				enqueueWith(coil)
+			}
+			textViewTitle.text = scrobbling.title
+			textViewTitle.setCompoundDrawablesRelativeWithIntrinsicBounds(0, 0, scrobbling.scrobbler.iconResId, 0)
+			ratingBar.rating = scrobbling.rating * ratingBar.numStars
+			textViewStatus.text = scrobbling.status?.let {
+				resources.getStringArray(R.array.scrobbling_statuses).getOrNull(it.ordinal)
+			}
+		}
+	}
+
 	override fun onClick(v: View) {
 		val manga = viewModel.manga.value ?: return
 		when (v.id) {
 			R.id.button_favorite -> {
 				FavouriteCategoriesBottomSheet.show(childFragmentManager, manga)
 			}
+			R.id.scrobbling_layout -> {
+				ScrobblingInfoBottomSheet.show(childFragmentManager)
+			}
 			R.id.button_read -> {
 				val chapterId = viewModel.readingHistory.value?.chapterId
 				if (chapterId != null && manga.chapters?.none { x -> x.id == chapterId } == true) {
@@ -329,4 +364,26 @@ class DetailsFragment :
 		} ?: request.fallback(R.drawable.ic_placeholder)
 		request.enqueueWith(coil)
 	}
+
+	private inner class DetailsMenuProvider : MenuProvider {
+
+		override fun onCreateMenu(menu: Menu, menuInflater: MenuInflater) {
+			menuInflater.inflate(R.menu.opt_details_info, menu)
+		}
+
+		override fun onMenuItemSelected(menuItem: MenuItem): Boolean = when (menuItem.itemId) {
+			R.id.action_share -> {
+				viewModel.manga.value?.let {
+					val context = requireContext()
+					if (it.source == MangaSource.LOCAL) {
+						ShareHelper(context).shareCbz(listOf(it.url.toUri().toFile()))
+					} else {
+						ShareHelper(context).shareMangaLink(it)
+					}
+				}
+				true
+			}
+			else -> false
+		}
+	}
 }

app/src/main/java/org/koitharu/kotatsu/details/ui/DetailsViewModel.kt

@@ -1,8 +1,16 @@
 package org.koitharu.kotatsu.details.ui
 
-import androidx.lifecycle.*
-import kotlinx.coroutines.*
+import android.text.Html
+import androidx.core.text.parseAsHtml
+import androidx.lifecycle.LiveData
+import androidx.lifecycle.asFlow
+import androidx.lifecycle.asLiveData
+import androidx.lifecycle.viewModelScope
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.Job
 import kotlinx.coroutines.flow.*
+import kotlinx.coroutines.launch
+import kotlinx.coroutines.plus
 import org.koitharu.kotatsu.R
 import org.koitharu.kotatsu.base.domain.MangaDataRepository
 import org.koitharu.kotatsu.base.domain.MangaIntent
@@ -19,6 +27,8 @@ import org.koitharu.kotatsu.local.domain.LocalMangaRepository
 import org.koitharu.kotatsu.parsers.model.Manga
 import org.koitharu.kotatsu.parsers.model.MangaSource
 import org.koitharu.kotatsu.parsers.util.mapToSet
+import org.koitharu.kotatsu.scrobbling.domain.Scrobbler
+import org.koitharu.kotatsu.scrobbling.domain.model.ScrobblingStatus
 import org.koitharu.kotatsu.tracker.domain.TrackingRepository
 import org.koitharu.kotatsu.utils.SingleLiveEvent
 import org.koitharu.kotatsu.utils.ext.asLiveDataDistinct
@@ -30,10 +40,12 @@ class DetailsViewModel(
 	private val historyRepository: HistoryRepository,
 	favouritesRepository: FavouritesRepository,
 	private val localMangaRepository: LocalMangaRepository,
-	private val trackingRepository: TrackingRepository,
+	trackingRepository: TrackingRepository,
 	mangaDataRepository: MangaDataRepository,
 	private val bookmarksRepository: BookmarksRepository,
 	private val settings: AppSettings,
+	private val scrobbler: Scrobbler,
+	private val imageGetter: Html.ImageGetter,
 ) : BaseViewModel() {
 
 	private val delegate = MangaDetailsDelegate(
@@ -54,9 +66,8 @@ class DetailsViewModel(
 	private val favourite = favouritesRepository.observeCategoriesIds(delegate.mangaId).map { it.isNotEmpty() }
 		.stateIn(viewModelScope + Dispatchers.Default, SharingStarted.Eagerly, false)
 
-	private val newChapters = viewModelScope.async(Dispatchers.Default) {
-		trackingRepository.getNewChaptersCount(delegate.mangaId)
-	}
+	private val newChapters = trackingRepository.observeNewChaptersCount(delegate.mangaId)
+		.stateIn(viewModelScope + Dispatchers.Default, SharingStarted.Eagerly, 0)
 
 	private val chaptersQuery = MutableStateFlow("")
 
@@ -65,15 +76,32 @@ class DetailsViewModel(
 
 	val manga = delegate.manga.filterNotNull().asLiveData(viewModelScope.coroutineContext)
 	val favouriteCategories = favourite.asLiveData(viewModelScope.coroutineContext)
-	val newChaptersCount = liveData(viewModelScope.coroutineContext) { emit(newChapters.await()) }
+	val newChaptersCount = newChapters.asLiveData(viewModelScope.coroutineContext)
 	val readingHistory = history.asLiveData(viewModelScope.coroutineContext)
 	val isChaptersReversed = chaptersReversed.asLiveData(viewModelScope.coroutineContext)
 
 	val bookmarks = delegate.manga.flatMapLatest {
 		if (it != null) bookmarksRepository.observeBookmarks(it) else flowOf(emptyList())
-	}.asLiveDataDistinct(viewModelScope.coroutineContext + Dispatchers.Default)
+	}.asLiveDataDistinct(viewModelScope.coroutineContext + Dispatchers.Default, emptyList())
+
+	val description = delegate.manga
+		.distinctUntilChangedBy { it?.description.orEmpty() }
+		.transformLatest {
+			val description = it?.description
+			if (description.isNullOrEmpty()) {
+				emit(null)
+			} else {
+				emit(description.parseAsHtml())
+				emit(description.parseAsHtml(imageGetter = imageGetter))
+			}
+		}.asLiveDataDistinct(viewModelScope.coroutineContext + Dispatchers.Default, null)
 
 	val onMangaRemoved = SingleLiveEvent<Manga>()
+	val isScrobblingAvailable: Boolean
+		get() = scrobbler.isAvailable
+
+	val scrobblingInfo = scrobbler.observeScrobblingInfo(delegate.mangaId)
+		.asLiveDataDistinct(viewModelScope.coroutineContext + Dispatchers.Default, null)
 
 	val branches: LiveData<List<String?>> = delegate.manga.map {
 		val chapters = it?.chapters ?: return@map emptyList()
@@ -87,9 +115,12 @@ class DetailsViewModel(
 		branches.indexOf(selected)
 	}.asLiveDataDistinct(viewModelScope.coroutineContext + Dispatchers.Default)
 
-	val isChaptersEmpty: LiveData<Boolean> = delegate.manga.map { m ->
-		m != null && m.chapters.isNullOrEmpty()
-	}.asLiveDataDistinct(viewModelScope.coroutineContext + Dispatchers.Default, false)
+	val isChaptersEmpty: LiveData<Boolean> = combine(
+		delegate.manga,
+		isLoading.asFlow(),
+	) { m, loading ->
+		m != null && m.chapters.isNullOrEmpty() && !loading
+	}.asLiveDataDistinct(viewModelScope.coroutineContext, false)
 
 	val chapters = combine(
 		combine(
@@ -97,8 +128,9 @@ class DetailsViewModel(
 			delegate.relatedManga,
 			history,
 			delegate.selectedBranch,
-		) { manga, related, history, branch ->
-			delegate.mapChapters(manga, related, history, newChapters.await(), branch)
+			newChapters,
+		) { manga, related, history, branch, news ->
+			delegate.mapChapters(manga, related, history, news, branch)
 		},
 		chaptersReversed,
 		chaptersQuery,
@@ -179,6 +211,25 @@ class DetailsViewModel(
 		}
 	}
 
+	fun updateScrobbling(rating: Float, status: ScrobblingStatus?) {
+		launchJob(Dispatchers.Default) {
+			scrobbler.updateScrobblingInfo(
+				mangaId = delegate.mangaId,
+				rating = rating,
+				status = status,
+				comment = null,
+			)
+		}
+	}
+
+	fun unregisterScrobbling() {
+		launchJob(Dispatchers.Default) {
+			scrobbler.unregisterScrobbling(
+				mangaId = delegate.mangaId
+			)
+		}
+	}
+
 	private fun doLoad() = launchLoadingJob(Dispatchers.Default) {
 		delegate.doLoad()
 	}

app/src/main/java/org/koitharu/kotatsu/details/ui/MangaDetailsDelegate.kt

@@ -5,7 +5,6 @@ import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.flow.StateFlow
 import org.koitharu.kotatsu.base.domain.MangaDataRepository
 import org.koitharu.kotatsu.base.domain.MangaIntent
-import org.koitharu.kotatsu.core.exceptions.MangaNotFoundException
 import org.koitharu.kotatsu.core.model.MangaHistory
 import org.koitharu.kotatsu.core.parser.MangaRepository
 import org.koitharu.kotatsu.core.prefs.AppSettings
@@ -13,6 +12,7 @@ import org.koitharu.kotatsu.details.ui.model.ChapterListItem
 import org.koitharu.kotatsu.details.ui.model.toListItem
 import org.koitharu.kotatsu.history.domain.HistoryRepository
 import org.koitharu.kotatsu.local.domain.LocalMangaRepository
+import org.koitharu.kotatsu.parsers.exception.NotFoundException
 import org.koitharu.kotatsu.parsers.model.Manga
 import org.koitharu.kotatsu.parsers.model.MangaChapter
 import org.koitharu.kotatsu.parsers.model.MangaSource
@@ -32,6 +32,7 @@ class MangaDetailsDelegate(
 	private val mangaData = MutableStateFlow(intent.manga)
 
 	val selectedBranch = MutableStateFlow<String?>(null)
+
 	// Remote manga for saved and saved for remote
 	val relatedManga = MutableStateFlow<Manga?>(null)
 	val manga: StateFlow<Manga?>
@@ -39,8 +40,7 @@ class MangaDetailsDelegate(
 	val mangaId = intent.manga?.id ?: intent.mangaId
 
 	suspend fun doLoad() {
-		var manga = mangaDataRepository.resolveIntent(intent)
-			?: throw MangaNotFoundException("Cannot find manga")
+		var manga = mangaDataRepository.resolveIntent(intent) ?: throw NotFoundException("Cannot find manga", "")
 		mangaData.value = manga
 		manga = MangaRepository(manga.source).getDetails(manga)
 		// find default branch

app/src/main/java/org/koitharu/kotatsu/details/ui/scrobbling/ScrobblingInfoBottomSheet.kt

@@ -0,0 +1,150 @@
+package org.koitharu.kotatsu.details.ui.scrobbling
+
+import android.app.ActivityOptions
+import android.content.Intent
+import android.os.Bundle
+import android.text.method.LinkMovementMethod
+import android.view.LayoutInflater
+import android.view.MenuItem
+import android.view.View
+import android.view.ViewGroup
+import android.widget.AdapterView
+import android.widget.RatingBar
+import android.widget.Toast
+import androidx.appcompat.widget.PopupMenu
+import androidx.core.net.toUri
+import androidx.fragment.app.FragmentManager
+import coil.ImageLoader
+import coil.request.ImageRequest
+import coil.size.Scale
+import org.koin.android.ext.android.inject
+import org.koin.androidx.viewmodel.ext.android.sharedViewModel
+import org.koitharu.kotatsu.R
+import org.koitharu.kotatsu.base.ui.BaseBottomSheet
+import org.koitharu.kotatsu.databinding.SheetScrobblingBinding
+import org.koitharu.kotatsu.details.ui.DetailsViewModel
+import org.koitharu.kotatsu.image.ui.ImageActivity
+import org.koitharu.kotatsu.scrobbling.domain.model.ScrobblingInfo
+import org.koitharu.kotatsu.scrobbling.domain.model.ScrobblingStatus
+import org.koitharu.kotatsu.scrobbling.ui.selector.ScrobblingSelectorBottomSheet
+import org.koitharu.kotatsu.utils.ext.enqueueWith
+import org.koitharu.kotatsu.utils.ext.getDisplayMessage
+
+class ScrobblingInfoBottomSheet :
+	BaseBottomSheet<SheetScrobblingBinding>(),
+	AdapterView.OnItemSelectedListener,
+	RatingBar.OnRatingBarChangeListener,
+	View.OnClickListener,
+	PopupMenu.OnMenuItemClickListener {
+
+	private val viewModel by sharedViewModel<DetailsViewModel>()
+	private val coil by inject<ImageLoader>(mode = LazyThreadSafetyMode.NONE)
+	private var menu: PopupMenu? = null
+
+	override fun onInflateView(inflater: LayoutInflater, container: ViewGroup?): SheetScrobblingBinding {
+		return SheetScrobblingBinding.inflate(inflater, container, false)
+	}
+
+	override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+		super.onViewCreated(view, savedInstanceState)
+		viewModel.scrobblingInfo.observe(viewLifecycleOwner, ::onScrobblingInfoChanged)
+		viewModel.onError.observe(viewLifecycleOwner) {
+			Toast.makeText(view.context, it.getDisplayMessage(view.resources), Toast.LENGTH_SHORT).show()
+		}
+
+		binding.spinnerStatus.onItemSelectedListener = this
+		binding.ratingBar.onRatingBarChangeListener = this
+		binding.buttonMenu.setOnClickListener(this)
+		binding.imageViewCover.setOnClickListener(this)
+		binding.textViewDescription.movementMethod = LinkMovementMethod.getInstance()
+
+		menu = PopupMenu(view.context, binding.buttonMenu).apply {
+			inflate(R.menu.opt_scrobbling)
+			setOnMenuItemClickListener(this@ScrobblingInfoBottomSheet)
+		}
+	}
+
+	override fun onDestroyView() {
+		super.onDestroyView()
+		menu = null
+	}
+
+	override fun onItemSelected(parent: AdapterView<*>?, view: View?, position: Int, id: Long) {
+		viewModel.updateScrobbling(
+			rating = binding.ratingBar.rating / binding.ratingBar.numStars,
+			status = enumValues<ScrobblingStatus>().getOrNull(position),
+		)
+	}
+
+	override fun onNothingSelected(parent: AdapterView<*>?) = Unit
+
+	override fun onRatingChanged(ratingBar: RatingBar, rating: Float, fromUser: Boolean) {
+		if (fromUser) {
+			viewModel.updateScrobbling(
+				rating = rating / ratingBar.numStars,
+				status = enumValues<ScrobblingStatus>().getOrNull(binding.spinnerStatus.selectedItemPosition),
+			)
+		}
+	}
+
+	override fun onClick(v: View) {
+		when (v.id) {
+			R.id.button_menu -> menu?.show()
+			R.id.imageView_cover -> {
+				val coverUrl = viewModel.scrobblingInfo.value?.coverUrl ?: return
+				val options = ActivityOptions.makeScaleUpAnimation(v, 0, 0, v.width, v.height)
+				startActivity(ImageActivity.newIntent(v.context, coverUrl), options.toBundle())
+			}
+		}
+	}
+
+	private fun onScrobblingInfoChanged(scrobbling: ScrobblingInfo?) {
+		if (scrobbling == null) {
+			dismissAllowingStateLoss()
+			return
+		}
+		binding.textViewTitle.text = scrobbling.title
+		binding.ratingBar.rating = scrobbling.rating * binding.ratingBar.numStars
+		binding.textViewDescription.text = scrobbling.description
+		binding.spinnerStatus.setSelection(scrobbling.status?.ordinal ?: -1)
+		ImageRequest.Builder(context ?: return)
+			.target(binding.imageViewCover)
+			.data(scrobbling.coverUrl)
+			.crossfade(true)
+			.lifecycle(viewLifecycleOwner)
+			.placeholder(R.drawable.ic_placeholder)
+			.fallback(R.drawable.ic_placeholder)
+			.error(R.drawable.ic_placeholder)
+			.scale(Scale.FILL)
+			.enqueueWith(coil)
+	}
+
+	companion object {
+
+		private const val TAG = "ScrobblingInfoBottomSheet"
+
+		fun show(fm: FragmentManager) = ScrobblingInfoBottomSheet().show(fm, TAG)
+	}
+
+	override fun onMenuItemClick(item: MenuItem): Boolean {
+		when (item.itemId) {
+			R.id.action_browser -> {
+				val url = viewModel.scrobblingInfo.value?.externalUrl ?: return false
+				val intent = Intent(Intent.ACTION_VIEW, url.toUri())
+				startActivity(
+					Intent.createChooser(intent, getString(R.string.open_in_browser))
+				)
+			}
+			R.id.action_unregister -> {
+				viewModel.unregisterScrobbling()
+				dismiss()
+			}
+			R.id.action_edit -> {
+				val manga = viewModel.manga.value ?: return false
+				ScrobblingSelectorBottomSheet.show(parentFragmentManager, manga)
+				dismiss()
+			}
+		}
+		return true
+	}
+}

app/src/main/java/org/koitharu/kotatsu/download/ui/DownloadItemAD.kt

@@ -27,13 +27,14 @@ fun downloadItemAD(
 	bind {
 		job?.cancel()
 		job = item.progressAsFlow().onFirst { state ->
-			binding.imageViewCover.newImageRequest(state.manga.coverUrl)
-				.referer(state.manga.publicUrl)
-				.placeholder(state.cover)
-				.fallback(R.drawable.ic_placeholder)
-				.error(R.drawable.ic_placeholder)
-				.allowRgb565(true)
-				.enqueueWith(coil)
+			binding.imageViewCover.newImageRequest(state.manga.coverUrl)?.run {
+				referer(state.manga.publicUrl)
+				placeholder(state.cover)
+				fallback(R.drawable.ic_placeholder)
+				error(R.drawable.ic_placeholder)
+				allowRgb565(true)
+				enqueueWith(coil)
+			}
 		}.onEach { state ->
 			binding.textViewTitle.text = state.manga.title
 			when (state) {

app/src/main/java/org/koitharu/kotatsu/download/ui/service/DownloadNotification.kt

@@ -11,8 +11,8 @@ import androidx.core.app.NotificationCompat
 import androidx.core.app.NotificationManagerCompat
 import androidx.core.content.ContextCompat
 import androidx.core.graphics.drawable.toBitmap
+import com.google.android.material.R as materialR
 import org.koitharu.kotatsu.R
-import org.koitharu.kotatsu.core.ui.CrashActivity
 import org.koitharu.kotatsu.details.ui.DetailsActivity
 import org.koitharu.kotatsu.download.domain.DownloadState
 import org.koitharu.kotatsu.download.ui.DownloadsActivity
@@ -20,7 +20,6 @@ import org.koitharu.kotatsu.parsers.model.Manga
 import org.koitharu.kotatsu.parsers.util.format
 import org.koitharu.kotatsu.utils.PendingIntentCompat
 import org.koitharu.kotatsu.utils.ext.getDisplayMessage
-import com.google.android.material.R as materialR
 
 class DownloadNotification(private val context: Context, startId: Int) {
 
@@ -92,14 +91,6 @@ class DownloadNotification(private val context: Context, startId: Int) {
 				builder.setContentText(message)
 				builder.setAutoCancel(true)
 				builder.setOngoing(false)
-				builder.setContentIntent(
-					PendingIntent.getActivity(
-						context,
-						state.manga.hashCode(),
-						CrashActivity.newIntent(context, state.error),
-						PendingIntent.FLAG_CANCEL_CURRENT or PendingIntentCompat.FLAG_IMMUTABLE
-					)
-				)
 				builder.setCategory(NotificationCompat.CATEGORY_ERROR)
 				builder.setStyle(NotificationCompat.BigTextStyle().bigText(message))
 			}

app/src/main/java/org/koitharu/kotatsu/favourites/FavouritesModule.kt

@@ -11,10 +11,10 @@ import org.koitharu.kotatsu.favourites.ui.list.FavouritesListViewModel
 val favouritesModule
 	get() = module {
 
-		factory { FavouritesRepository(get(), get()) }
+		single { FavouritesRepository(get(), get()) }
 
 		viewModel { categoryId ->
-			FavouritesListViewModel(categoryId.get(), get(), get(), get())
+			FavouritesListViewModel(categoryId.get(), get(), get(), get(), get())
 		}
 		viewModel { FavouritesCategoriesViewModel(get(), get()) }
 		viewModel { manga ->

app/src/main/java/org/koitharu/kotatsu/favourites/data/FavouriteCategoryEntity.kt

@@ -3,9 +3,10 @@ package org.koitharu.kotatsu.favourites.data
 import androidx.room.ColumnInfo
 import androidx.room.Entity
 import androidx.room.PrimaryKey
+import org.koitharu.kotatsu.core.db.TABLE_FAVOURITE_CATEGORIES
 
-@Entity(tableName = "favourite_categories")
-class FavouriteCategoryEntity(
+@Entity(tableName = TABLE_FAVOURITE_CATEGORIES)
+data class FavouriteCategoryEntity(
 	@PrimaryKey(autoGenerate = true)
 	@ColumnInfo(name = "category_id") val categoryId: Int,
 	@ColumnInfo(name = "created_at") val createdAt: Long,

app/src/main/java/org/koitharu/kotatsu/favourites/data/FavouriteEntity.kt

@@ -3,10 +3,13 @@ package org.koitharu.kotatsu.favourites.data
 import androidx.room.ColumnInfo
 import androidx.room.Entity
 import androidx.room.ForeignKey
+import org.koitharu.kotatsu.core.db.TABLE_FAVOURITES
 import org.koitharu.kotatsu.core.db.entity.MangaEntity
 
 @Entity(
-	tableName = "favourites", primaryKeys = ["manga_id", "category_id"], foreignKeys = [
+	tableName = TABLE_FAVOURITES,
+	primaryKeys = ["manga_id", "category_id"],
+	foreignKeys = [
 		ForeignKey(
 			entity = MangaEntity::class,
 			parentColumns = ["manga_id"],
@@ -21,8 +24,8 @@ import org.koitharu.kotatsu.core.db.entity.MangaEntity
 		)
 	]
 )
-class FavouriteEntity(
+data class FavouriteEntity(
 	@ColumnInfo(name = "manga_id", index = true) val mangaId: Long,
 	@ColumnInfo(name = "category_id", index = true) val categoryId: Long,
-	@ColumnInfo(name = "created_at") val createdAt: Long
+	@ColumnInfo(name = "created_at") val createdAt: Long,
 )

app/src/main/java/org/koitharu/kotatsu/favourites/ui/FavouritesContainerFragment.kt

@@ -1,7 +1,9 @@
 package org.koitharu.kotatsu.favourites.ui
 
 import android.os.Bundle
-import android.view.*
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
 import androidx.appcompat.view.ActionMode
 import androidx.appcompat.widget.PopupMenu
 import androidx.core.graphics.Insets
@@ -19,12 +21,12 @@ import org.koitharu.kotatsu.base.ui.util.ActionModeListener
 import org.koitharu.kotatsu.core.model.FavouriteCategory
 import org.koitharu.kotatsu.databinding.FragmentFavouritesBinding
 import org.koitharu.kotatsu.databinding.ItemEmptyStateBinding
-import org.koitharu.kotatsu.favourites.ui.categories.CategoriesActivity
 import org.koitharu.kotatsu.favourites.ui.categories.CategoriesEditDelegate
 import org.koitharu.kotatsu.favourites.ui.categories.FavouritesCategoriesViewModel
 import org.koitharu.kotatsu.favourites.ui.categories.adapter.CategoryListModel
 import org.koitharu.kotatsu.favourites.ui.categories.edit.FavouritesCategoryEditActivity
 import org.koitharu.kotatsu.main.ui.AppBarOwner
+import org.koitharu.kotatsu.utils.ext.addMenuProvider
 import org.koitharu.kotatsu.utils.ext.getDisplayMessage
 import org.koitharu.kotatsu.utils.ext.measureHeight
 import org.koitharu.kotatsu.utils.ext.resolveDp
@@ -43,11 +45,6 @@ class FavouritesContainerFragment :
 	private var pagerAdapter: FavouritesPagerAdapter? = null
 	private var stubBinding: ItemEmptyStateBinding? = null
 
-	override fun onCreate(savedInstanceState: Bundle?) {
-		super.onCreate(savedInstanceState)
-		setHasOptionsMenu(true)
-	}
-
 	override fun onInflateView(
 		inflater: LayoutInflater,
 		container: ViewGroup?
@@ -61,6 +58,7 @@ class FavouritesContainerFragment :
 		pagerAdapter = adapter
 		TabLayoutMediator(binding.tabs, binding.pager, adapter).attach()
 		actionModeDelegate.addListener(this, viewLifecycleOwner)
+		addMenuProvider(FavouritesContainerMenuProvider(view.context))
 
 		viewModel.visibleCategories.observe(viewLifecycleOwner, ::onCategoriesChanged)
 		viewModel.onError.observe(viewLifecycleOwner, ::onError)
@@ -115,21 +113,6 @@ class FavouritesContainerFragment :
 		}
 	}
 
-	override fun onCreateOptionsMenu(menu: Menu, inflater: MenuInflater) {
-		inflater.inflate(R.menu.opt_favourites, menu)
-		super.onCreateOptionsMenu(menu, inflater)
-	}
-
-	override fun onOptionsItemSelected(item: MenuItem) = when (item.itemId) {
-		R.id.action_categories -> {
-			context?.let {
-				startActivity(CategoriesActivity.newIntent(it))
-			}
-			true
-		}
-		else -> super.onOptionsItemSelected(item)
-	}
-
 	private fun onError(e: Throwable) {
 		Snackbar.make(binding.pager, e.getDisplayMessage(resources), Snackbar.LENGTH_LONG).show()
 	}
@@ -165,7 +148,12 @@ class FavouritesContainerFragment :
 		menu.setOnMenuItemClickListener {
 			when (it.itemId) {
 				R.id.action_remove -> editDelegate.deleteCategory(category)
-				R.id.action_edit -> startActivity(FavouritesCategoryEditActivity.newIntent(tabView.context, category.id))
+				R.id.action_edit -> startActivity(
+					FavouritesCategoryEditActivity.newIntent(
+						tabView.context,
+						category.id
+					)
+				)
 				else -> return@setOnMenuItemClickListener false
 			}
 			true
@@ -189,7 +177,7 @@ class FavouritesContainerFragment :
 	private fun showStub() {
 		val stub = stubBinding ?: ItemEmptyStateBinding.bind(binding.stubEmptyState.inflate())
 		stub.root.isVisible = true
-		stub.icon.setImageResource(R.drawable.ic_heart_outline)
+		stub.icon.setImageResource(R.drawable.ic_empty_favourites)
 		stub.textPrimary.setText(R.string.text_empty_holder_primary)
 		stub.textSecondary.setText(R.string.empty_favourite_categories)
 		stub.buttonRetry.setText(R.string.add)

app/src/main/java/org/koitharu/kotatsu/favourites/ui/FavouritesContainerMenuProvider.kt

@@ -0,0 +1,28 @@
+package org.koitharu.kotatsu.favourites.ui
+
+import android.content.Context
+import android.view.Menu
+import android.view.MenuInflater
+import android.view.MenuItem
+import androidx.core.view.MenuProvider
+import org.koitharu.kotatsu.R
+import org.koitharu.kotatsu.favourites.ui.categories.CategoriesActivity
+
+class FavouritesContainerMenuProvider(
+	private val context: Context,
+) : MenuProvider {
+
+	override fun onCreateMenu(menu: Menu, menuInflater: MenuInflater) {
+		menuInflater.inflate(R.menu.opt_favourites, menu)
+	}
+
+	override fun onMenuItemSelected(menuItem: MenuItem): Boolean {
+		return when (menuItem.itemId) {
+			R.id.action_categories -> {
+				context.startActivity(CategoriesActivity.newIntent(context))
+				true
+			}
+			else -> false
+		}
+	}
+}

app/src/main/java/org/koitharu/kotatsu/favourites/ui/categories/CategoriesEditDelegate.kt

@@ -4,6 +4,7 @@ import android.content.Context
 import com.google.android.material.dialog.MaterialAlertDialogBuilder
 import org.koitharu.kotatsu.R
 import org.koitharu.kotatsu.core.model.FavouriteCategory
+import com.google.android.material.R as materialR
 
 class CategoriesEditDelegate(
 	private val context: Context,
@@ -11,9 +12,10 @@ class CategoriesEditDelegate(
 ) {
 
 	fun deleteCategory(category: FavouriteCategory) {
-		MaterialAlertDialogBuilder(context)
+		MaterialAlertDialogBuilder(context, materialR.style.ThemeOverlay_Material3_MaterialAlertDialog_Centered)
 			.setMessage(context.getString(R.string.category_delete_confirm, category.title))
 			.setTitle(R.string.remove_category)
+			.setIcon(R.drawable.ic_delete)
 			.setNegativeButton(android.R.string.cancel, null)
 			.setPositiveButton(R.string.remove) { _, _ ->
 				callback.onDeleteCategory(category)

app/src/main/java/org/koitharu/kotatsu/favourites/ui/categories/edit/FavouritesCategoryEditActivity.kt

@@ -3,12 +3,13 @@ package org.koitharu.kotatsu.favourites.ui.categories.edit
 import android.content.Context
 import android.content.Intent
 import android.os.Bundle
-import android.view.Menu
-import android.view.MenuItem
+import android.text.Editable
+import android.text.TextWatcher
 import android.view.View
 import android.view.ViewGroup
 import android.widget.AdapterView
 import android.widget.ArrayAdapter
+import android.widget.Filter
 import androidx.core.graphics.Insets
 import androidx.core.view.isVisible
 import androidx.core.view.updateLayoutParams
@@ -24,7 +25,8 @@ import org.koitharu.kotatsu.favourites.ui.categories.CategoriesActivity
 import org.koitharu.kotatsu.parsers.model.SortOrder
 import org.koitharu.kotatsu.utils.ext.getDisplayMessage
 
-class FavouritesCategoryEditActivity : BaseActivity<ActivityCategoryEditBinding>(), AdapterView.OnItemClickListener {
+class FavouritesCategoryEditActivity : BaseActivity<ActivityCategoryEditBinding>(), AdapterView.OnItemClickListener,
+	View.OnClickListener, TextWatcher {
 
 	private val viewModel by viewModel<FavouritesCategoryEditViewModel> {
 		parametersOf(intent.getLongExtra(EXTRA_ID, NO_ID))
@@ -39,6 +41,9 @@ class FavouritesCategoryEditActivity : BaseActivity<ActivityCategoryEditBinding>
 			setHomeAsUpIndicator(com.google.android.material.R.drawable.abc_ic_clear_material)
 		}
 		initSortSpinner()
+		binding.buttonDone.setOnClickListener(this)
+		binding.editName.addTextChangedListener(this)
+		afterTextChanged(binding.editName.text)
 
 		viewModel.onSaved.observe(this) { finishAfterTransition() }
 		viewModel.category.observe(this, ::onCategoryChanged)
@@ -62,22 +67,22 @@ class FavouritesCategoryEditActivity : BaseActivity<ActivityCategoryEditBinding>
 		}
 	}
 
-	override fun onCreateOptionsMenu(menu: Menu): Boolean {
-		menuInflater.inflate(R.menu.opt_config, menu)
-		menu.findItem(R.id.action_done)?.setTitle(R.string.save)
-		return super.onCreateOptionsMenu(menu)
-	}
-
-	override fun onOptionsItemSelected(item: MenuItem) = when (item.itemId) {
-		R.id.action_done -> {
-			viewModel.save(
-				title = binding.editName.text?.toString().orEmpty(),
+	override fun onClick(v: View) {
+		when (v.id) {
+			R.id.button_done -> viewModel.save(
+				title = binding.editName.text?.toString()?.trim().orEmpty(),
 				sortOrder = getSelectedSortOrder(),
 				isTrackerEnabled = binding.switchTracker.isChecked,
 			)
-			true
 		}
-		else -> super.onOptionsItemSelected(item)
+	}
+
+	override fun beforeTextChanged(s: CharSequence?, start: Int, count: Int, after: Int) = Unit
+
+	override fun onTextChanged(s: CharSequence?, start: Int, before: Int, count: Int) = Unit
+
+	override fun afterTextChanged(s: Editable?) {
+		binding.buttonDone.isEnabled = !s.isNullOrBlank()
 	}
 
 	override fun onWindowInsetsChanged(insets: Insets) {
@@ -123,7 +128,7 @@ class FavouritesCategoryEditActivity : BaseActivity<ActivityCategoryEditBinding>
 
 	private fun initSortSpinner() {
 		val entries = CategoriesActivity.SORT_ORDERS.map { getString(it.titleRes) }
-		val adapter = ArrayAdapter(this, android.R.layout.simple_spinner_dropdown_item, entries)
+		val adapter = SortAdapter(this, entries)
 		binding.editSort.setAdapter(adapter)
 		binding.editSort.onItemClickListener = this
 	}
@@ -135,6 +140,19 @@ class FavouritesCategoryEditActivity : BaseActivity<ActivityCategoryEditBinding>
 		return CategoriesActivity.SORT_ORDERS.getOrNull(index) ?: SortOrder.NEWEST
 	}
 
+	private class SortAdapter(
+		context: Context,
+		entries: List<String>,
+	) : ArrayAdapter<String>(context, android.R.layout.simple_spinner_dropdown_item, entries) {
+
+		override fun getFilter(): Filter = EmptyFilter
+
+		private object EmptyFilter : Filter() {
+			override fun performFiltering(constraint: CharSequence?) = FilterResults()
+			override fun publishResults(constraint: CharSequence?, results: FilterResults?) = Unit
+		}
+	}
+
 	companion object {
 
 		private const val EXTRA_ID = "id"

app/src/main/java/org/koitharu/kotatsu/favourites/ui/categories/edit/FavouritesCategoryEditViewModel.kt

@@ -42,6 +42,7 @@ class FavouritesCategoryEditViewModel(
 		isTrackerEnabled: Boolean,
 	) {
 		launchLoadingJob {
+			check(title.isNotEmpty())
 			if (categoryId == NO_ID) {
 				repository.createCategory(title, sortOrder, isTrackerEnabled)
 			} else {

app/src/main/java/org/koitharu/kotatsu/favourites/ui/categories/select/FavouriteCategoriesBottomSheet.kt

@@ -28,7 +28,8 @@ class FavouriteCategoriesBottomSheet :
 	BaseBottomSheet<DialogFavoriteCategoriesBinding>(),
 	OnListItemClickListener<MangaCategoryItem>,
 	CategoriesEditDelegate.CategoriesEditCallback,
-	Toolbar.OnMenuItemClickListener, View.OnClickListener {
+	View.OnClickListener,
+	Toolbar.OnMenuItemClickListener {
 
 	private val viewModel by viewModel<MangaCategoriesViewModel> {
 		parametersOf(requireNotNull(arguments?.getParcelableArrayList<ParcelableManga>(KEY_MANGA_LIST)).map { it.manga })
@@ -45,8 +46,8 @@ class FavouriteCategoriesBottomSheet :
 		super.onViewCreated(view, savedInstanceState)
 		adapter = MangaCategoriesAdapter(this)
 		binding.recyclerViewCategories.adapter = adapter
+		binding.buttonDone.setOnClickListener(this)
 		binding.toolbar.setOnMenuItemClickListener(this)
-		binding.itemCreate.setOnClickListener(this)
 
 		viewModel.content.observe(viewLifecycleOwner, this::onContentChanged)
 		viewModel.onError.observe(viewLifecycleOwner, ::onError)
@@ -57,20 +58,18 @@ class FavouriteCategoriesBottomSheet :
 		super.onDestroyView()
 	}
 
-	override fun onMenuItemClick(item: MenuItem): Boolean {
-		return when (item.itemId) {
-			R.id.action_done -> {
-				dismiss()
-				true
-			}
-			else -> false
+	override fun onClick(v: View) {
+		when (v.id) {
+			R.id.button_done -> dismiss()
 		}
 	}
 
-	override fun onClick(v: View) {
-		when (v.id) {
-			R.id.item_create -> startActivity(FavouritesCategoryEditActivity.newIntent(requireContext()))
+	override fun onMenuItemClick(item: MenuItem): Boolean {
+		when (item.itemId) {
+			R.id.action_create -> startActivity(FavouritesCategoryEditActivity.newIntent(requireContext()))
+			else -> return false
 		}
+		return true
 	}
 
 	override fun onItemClick(item: MangaCategoryItem, view: View) {

app/src/main/java/org/koitharu/kotatsu/favourites/ui/list/FavouritesListFragment.kt

@@ -2,18 +2,15 @@ package org.koitharu.kotatsu.favourites.ui.list
 
 import android.os.Bundle
 import android.view.Menu
-import android.view.MenuInflater
 import android.view.MenuItem
 import android.view.View
 import androidx.appcompat.view.ActionMode
-import androidx.core.view.iterator
 import org.koin.androidx.viewmodel.ext.android.viewModel
 import org.koin.core.parameter.parametersOf
 import org.koitharu.kotatsu.R
-import org.koitharu.kotatsu.core.ui.titleRes
-import org.koitharu.kotatsu.favourites.ui.categories.CategoriesActivity
 import org.koitharu.kotatsu.list.ui.MangaListFragment
 import org.koitharu.kotatsu.parsers.model.MangaSource
+import org.koitharu.kotatsu.utils.ext.addMenuProvider
 import org.koitharu.kotatsu.utils.ext.withArgs
 
 class FavouritesListFragment : MangaListFragment() {
@@ -30,47 +27,14 @@ class FavouritesListFragment : MangaListFragment() {
 	override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
 		super.onViewCreated(view, savedInstanceState)
 		viewModel.sortOrder.observe(viewLifecycleOwner) { activity?.invalidateOptionsMenu() }
+
+		if (categoryId != NO_ID) {
+			addMenuProvider(FavouritesListMenuProvider(viewModel))
+		}
 	}
 
 	override fun onScrolledToEnd() = Unit
 
-	override fun onCreateOptionsMenu(menu: Menu, inflater: MenuInflater) {
-		super.onCreateOptionsMenu(menu, inflater)
-		if (categoryId != NO_ID) {
-			inflater.inflate(R.menu.opt_favourites_list, menu)
-			menu.findItem(R.id.action_order)?.subMenu?.let { submenu ->
-				for ((i, item) in CategoriesActivity.SORT_ORDERS.withIndex()) {
-					val menuItem = submenu.add(R.id.group_order, Menu.NONE, i, item.titleRes)
-					menuItem.isCheckable = true
-				}
-				submenu.setGroupCheckable(R.id.group_order, true, true)
-			}
-		}
-	}
-
-	override fun onPrepareOptionsMenu(menu: Menu) {
-		super.onPrepareOptionsMenu(menu)
-		menu.findItem(R.id.action_order)?.subMenu?.let { submenu ->
-			val selectedOrder = viewModel.sortOrder.value
-			for (item in submenu) {
-				val order = CategoriesActivity.SORT_ORDERS.getOrNull(item.order)
-				item.isChecked = order == selectedOrder
-			}
-		}
-	}
-
-	override fun onOptionsItemSelected(item: MenuItem): Boolean {
-		return when {
-			item.itemId == R.id.action_order -> false
-			item.groupId == R.id.group_order -> {
-				val order = CategoriesActivity.SORT_ORDERS.getOrNull(item.order) ?: return false
-				viewModel.setSortOrder(order)
-				true
-			}
-			else -> super.onOptionsItemSelected(item)
-		}
-	}
-
 	override fun onCreateActionMode(mode: ActionMode, menu: Menu): Boolean {
 		mode.menuInflater.inflate(R.menu.mode_favourites, menu)
 		return super.onCreateActionMode(mode, menu)

app/src/main/java/org/koitharu/kotatsu/favourites/ui/list/FavouritesListMenuProvider.kt

@@ -0,0 +1,48 @@
+package org.koitharu.kotatsu.favourites.ui.list
+
+import android.view.Menu
+import android.view.MenuInflater
+import android.view.MenuItem
+import androidx.core.view.MenuProvider
+import androidx.core.view.iterator
+import org.koitharu.kotatsu.R
+import org.koitharu.kotatsu.core.ui.titleRes
+import org.koitharu.kotatsu.favourites.ui.categories.CategoriesActivity
+
+class FavouritesListMenuProvider(
+	private val viewModel: FavouritesListViewModel,
+) : MenuProvider {
+
+	override fun onCreateMenu(menu: Menu, menuInflater: MenuInflater) {
+		menuInflater.inflate(R.menu.opt_favourites_list, menu)
+		menu.findItem(R.id.action_order)?.subMenu?.let { submenu ->
+			for ((i, item) in CategoriesActivity.SORT_ORDERS.withIndex()) {
+				val menuItem = submenu.add(R.id.group_order, Menu.NONE, i, item.titleRes)
+				menuItem.isCheckable = true
+			}
+			submenu.setGroupCheckable(R.id.group_order, true, true)
+		}
+	}
+
+	override fun onPrepareMenu(menu: Menu) {
+		menu.findItem(R.id.action_order)?.subMenu?.let { submenu ->
+			val selectedOrder = viewModel.sortOrder.value
+			for (item in submenu) {
+				val order = CategoriesActivity.SORT_ORDERS.getOrNull(item.order)
+				item.isChecked = order == selectedOrder
+			}
+		}
+	}
+
+	override fun onMenuItemSelected(menuItem: MenuItem): Boolean {
+		return when {
+			menuItem.itemId == R.id.action_order -> false
+			menuItem.groupId == R.id.group_order -> {
+				val order = CategoriesActivity.SORT_ORDERS.getOrNull(menuItem.order) ?: return false
+				viewModel.setSortOrder(order)
+				true
+			}
+			else -> false
+		}
+	}
+}

app/src/main/java/org/koitharu/kotatsu/favourites/ui/list/FavouritesListViewModel.kt

@@ -11,7 +11,9 @@ import org.koitharu.kotatsu.R
 import org.koitharu.kotatsu.core.prefs.AppSettings
 import org.koitharu.kotatsu.favourites.domain.FavouritesRepository
 import org.koitharu.kotatsu.favourites.ui.list.FavouritesListFragment.Companion.NO_ID
-import org.koitharu.kotatsu.list.domain.CountersProvider
+import org.koitharu.kotatsu.history.domain.HistoryRepository
+import org.koitharu.kotatsu.history.domain.PROGRESS_NONE
+import org.koitharu.kotatsu.list.domain.ListExtraProvider
 import org.koitharu.kotatsu.list.ui.MangaListViewModel
 import org.koitharu.kotatsu.list.ui.model.EmptyState
 import org.koitharu.kotatsu.list.ui.model.LoadingState
@@ -25,8 +27,9 @@ class FavouritesListViewModel(
 	private val categoryId: Long,
 	private val repository: FavouritesRepository,
 	private val trackingRepository: TrackingRepository,
-	settings: AppSettings,
-) : MangaListViewModel(settings), CountersProvider {
+	private val historyRepository: HistoryRepository,
+	private val settings: AppSettings,
+) : MangaListViewModel(settings), ListExtraProvider {
 
 	var sortOrder: LiveData<SortOrder?> = if (categoryId == NO_ID) {
 		MutableLiveData(null)
@@ -47,7 +50,7 @@ class FavouritesListViewModel(
 		when {
 			list.isEmpty() -> listOf(
 				EmptyState(
-					icon = R.drawable.ic_heart_outline,
+					icon = R.drawable.ic_empty_favourites,
 					textPrimary = R.string.text_empty_holder_primary,
 					textSecondary = if (categoryId == NO_ID) {
 						R.string.you_have_not_favourites_yet
@@ -92,4 +95,12 @@ class FavouritesListViewModel(
 	override suspend fun getCounter(mangaId: Long): Int {
 		return trackingRepository.getNewChaptersCount(mangaId)
 	}
+
+	override suspend fun getProgress(mangaId: Long): Float {
+		return if (settings.isReadingIndicatorsEnabled) {
+			historyRepository.getProgress(mangaId)
+		} else {
+			PROGRESS_NONE
+		}
+	}
 }