Update version and parsers

Currently translated at 100.0% (320 of 320 strings)

Co-authored-by: Koitharu <nvasya95@gmail.com>
Translate-URL: https://hosted.weblate.org/projects/kotatsu/strings/ru/
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
+      url: https://github.com/KotatsuApp/kotatsu-parsers/issues/new
       about: Issues and requests for sources should be opened in the kotatsu-parsers repository instead

.github/ISSUE_TEMPLATE/report_issue.yml

@@ -44,7 +44,7 @@ body:
           label: Kotatsu version
           description: You can find your Kotatsu version in **Settings → About**.
           placeholder: |
-              Example: "3.2.3"
+              Example: "3.3"
       validations:
           required: true
 
@@ -85,9 +85,7 @@ body:
                 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)**.
+              - label: If this is an issue with a source, I should be opening an issue in the [parsers repository](https://github.com/KotatsuApp/kotatsu-parsers/issues/new).
                 required: true
               - label: I will fill out all of the requested information in this form.
                 required: true

.github/ISSUE_TEMPLATE/request_feature.yml

@@ -21,6 +21,16 @@ body:
           placeholder: |
               Additional details and attachments.
 
+    - 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: checkboxes
       id: acknowledgements
       attributes:
@@ -31,9 +41,7 @@ body:
                 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)**.
+              - label: If this is an issue with a source, I should be opening an issue in the [parsers repository](https://github.com/KotatsuApp/kotatsu-parsers/issues/new).
                 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

@@ -6,11 +6,14 @@
 /.idea/dictionaries
 /.idea/modules.xml
 /.idea/misc.xml
+/.idea/discord.xml
 /.idea/workspace.xml
 /.idea/navEditor.xml
 /.idea/assetWizardSettings.xml
 /.idea/kotlinScripting.xml
 /.idea/deploymentTargetDropDown.xml
+/.idea/androidTestResultsUserPreferences.xml
+/.idea/render.experimental.xml
 .DS_Store
 /build
 /captures

.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/inspectionProfiles/Project_Default.xml

@@ -4,6 +4,9 @@
     <inspection_tool class="BooleanLiteralArgument" enabled="false" level="WEAK WARNING" enabled_by_default="false" />
     <inspection_tool class="Destructure" enabled="true" level="INFO" enabled_by_default="true" />
     <inspection_tool class="KeySetIterationMayUseEntrySet" enabled="true" level="WARNING" enabled_by_default="true" />
+    <inspection_tool class="KotlinFunctionArgumentsHelper" enabled="true" level="INFORMATION" enabled_by_default="true">
+      <option name="withoutDefaultValues" value="true" />
+    </inspection_tool>
     <inspection_tool class="ReplaceCollectionCountWithSize" enabled="true" level="WEAK WARNING" enabled_by_default="true" />
     <inspection_tool class="TrailingComma" enabled="true" level="INFORMATION" enabled_by_default="true" />
     <inspection_tool class="ZeroLengthArrayInitialization" enabled="true" level="WARNING" enabled_by_default="true" />

.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>

.travis.yml

@@ -1,11 +0,0 @@
-language: android
-dist: trusty
-android:
-  components:
-    - android-30
-    - build-tools-30.0.3
-    - platform-tools-30.0.5
-    - tools
-before_install:
-  - yes | sdkmanager "platforms;android-30"
-script: ./gradlew -Dorg.gradle.jvmargs=-Xmx1536m assembleDebug lintDebug

README.md

@@ -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) [![Build Status](https://travis-ci.org/nv95/Kotatsu.svg?branch=master)](https://travis-ci.org/nv95/Kotatsu) ![License](https://img.shields.io/github/license/nv95/Kotatsu) [![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 407
-		versionName '3.2.3'
+		versionCode 414
+		versionName '3.4.2'
 		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 {
@@ -49,71 +53,87 @@ android {
 	kotlinOptions {
 		jvmTarget = JavaVersion.VERSION_1_8.toString()
 		freeCompilerArgs += [
-				'-opt-in=kotlinx.coroutines.ExperimentalCoroutinesApi',
-				'-opt-in=kotlinx.coroutines.FlowPreview',
-				'-opt-in=kotlin.contracts.ExperimentalContracts',
+			'-opt-in=kotlinx.coroutines.ExperimentalCoroutinesApi',
+			'-opt-in=kotlinx.coroutines.FlowPreview',
+			'-opt-in=kotlin.contracts.ExperimentalContracts',
+			'-opt-in=coil.annotation.ExperimentalCoilApi',
 		]
 	}
 	lint {
 		abortOnError false
-		disable 'MissingTranslation', 'PrivateResource'
+		disable 'MissingTranslation', 'PrivateResource', 'NotifyDataSetChanged'
 	}
 	testOptions {
 		unitTests.includeAndroidResources = true
 		unitTests.returnDefaultValues = false
 	}
 }
+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:05a93e2380') {
+	implementation('com.github.nv95:kotatsu-parsers:26d951bc20') {
 		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.3'
 
-	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.6.0'
+	implementation 'androidx.biometric:biometric-ktx:1.2.0-alpha04'
+	implementation 'com.google.android.material:material:1.7.0-alpha02'
 	//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.okio:okio:3.0.0'
+	implementation 'com.squareup.okhttp3:okhttp:4.10.0'
+	implementation 'com.squareup.okhttp3:okhttp-dnsoverhttps:4.9.3'
+	implementation 'com.squareup.okio:okio:3.2.0'
 
 	implementation 'com.hannesdorfmann:adapterdelegates4-kotlin-dsl:4.3.2'
 	implementation 'com.hannesdorfmann:adapterdelegates4-kotlin-dsl-viewbinding:4.3.2'
 
-	implementation 'io.insert-koin:koin-android:3.1.6'
-	implementation 'io.coil-kt:coil-base:1.4.0'
+	implementation 'io.insert-koin:koin-android:3.2.0'
+	implementation 'io.coil-kt:coil-base:2.1.0'
 	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.3'
+	implementation 'ch.acra:acra-dialog:5.9.3'
+
+	debugImplementation 'org.jsoup:jsoup:1.15.1'
 	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.1.5'
+	testImplementation 'org.jetbrains.kotlinx:kotlinx-coroutines-test:1.6.3'
 
 	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.3'
+	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/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/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/core/db/MangaDatabaseTest.kt

@@ -1,14 +1,13 @@
 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 java.io.IOException
 import org.junit.Rule
 import org.junit.Test
 import org.junit.runner.RunWith
 import org.koitharu.kotatsu.core.db.migrations.*
-import java.io.IOException
 
 @RunWith(AndroidJUnit4::class)
 class MangaDatabaseTest {
@@ -16,8 +15,7 @@ class MangaDatabaseTest {
 	@get:Rule
 	val helper: MigrationTestHelper = MigrationTestHelper(
 		InstrumentationRegistry.getInstrumentation(),
-		MangaDatabase::class.java.canonicalName,
-		FrameworkSQLiteOpenHelperFactory()
+		MangaDatabase::class.java,
 	)
 
 	@Test
@@ -37,7 +35,6 @@ class MangaDatabaseTest {
 		}
 	}
 
-
 	private companion object {
 
 		const val TEST_DB = "test-db"
@@ -50,6 +47,9 @@ class MangaDatabaseTest {
 			Migration5To6(),
 			Migration6To7(),
 			Migration7To8(),
+			Migration8To9(),
+			Migration9To10(),
+			Migration10To11(),
 		)
 	}
 }

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

@@ -0,0 +1,188 @@
+package org.koitharu.kotatsu.tracker.domain
+
+import androidx.test.ext.junit.runners.AndroidJUnit4
+import androidx.test.platform.app.InstrumentationRegistry
+import com.squareup.moshi.Moshi
+import com.squareup.moshi.kotlin.reflect.KotlinJsonAdapterFactory
+import kotlin.test.assertEquals
+import kotlin.test.assertFalse
+import kotlin.test.assertTrue
+import kotlinx.coroutines.test.runTest
+import okio.buffer
+import okio.source
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.koin.test.KoinTest
+import org.koin.test.inject
+import org.koitharu.kotatsu.base.domain.MangaDataRepository
+import org.koitharu.kotatsu.history.domain.HistoryRepository
+import org.koitharu.kotatsu.parsers.model.Manga
+
+@RunWith(AndroidJUnit4::class)
+class TrackerTest : KoinTest {
+
+	private val moshi = Moshi.Builder().add(KotlinJsonAdapterFactory()).build()
+	private val mangaAdapter = moshi.adapter(Manga::class.java)
+	private val historyRegistry by inject<HistoryRepository>()
+	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))
+
+		val chapter = requireNotNull(mangaFull.chapters).run { get(lastIndex - 1) }
+		repository.syncWithHistory(mangaFull, chapter.id)
+
+		assertEquals(1, repository.getNewChaptersCount(mangaFirst.id))
+		tracker.checkUpdates(mangaFull, commit = true).apply {
+			assertTrue(isValid)
+			assert(newChapters.isEmpty())
+		}
+		assertEquals(1, repository.getNewChaptersCount(mangaFirst.id))
+	}
+
+	private suspend fun loadManga(name: String): Manga {
+		val assets = InstrumentationRegistry.getInstrumentation().context.assets
+		val manga = assets.open("manga/$name").use {
+			mangaAdapter.fromJson(it.source().buffer())
+		} ?: throw RuntimeException("Cannot read manga from json \"$name\"")
+		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/debug/java/org/koitharu/kotatsu/utils/ext/DebugExt.kt

@@ -0,0 +1,3 @@
+package org.koitharu.kotatsu.utils.ext
+
+fun Throwable.printStackTraceDebug() = printStackTrace()

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"
@@ -53,11 +54,20 @@
 		<activity
 			android:name="org.koitharu.kotatsu.search.ui.SearchActivity"
 			android:label="@string/search" />
-		<activity android:name="org.koitharu.kotatsu.search.ui.MangaListActivity"
+		<activity
+			android:name="org.koitharu.kotatsu.search.ui.MangaListActivity"
 			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"
@@ -66,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"
@@ -78,13 +83,14 @@
 		<activity
 			android:name="org.koitharu.kotatsu.widget.shelf.ShelfConfigActivity"
 			android:exported="true"
-			android:label="@string/manga_shelf">
+			android:label="@string/manga_shelf"
+			android:theme="@style/Theme.Kotatsu.DialogWhenLarge">
 			<intent-filter>
 				<action android:name="android.appwidget.action.APPWIDGET_CONFIGURE" />
 			</intent-filter>
 		</activity>
 		<activity
-			android:name="org.koitharu.kotatsu.search.ui.global.GlobalSearchActivity"
+			android:name="org.koitharu.kotatsu.search.ui.multi.MultiSearchActivity"
 			android:label="@string/search" />
 		<activity
 			android:name="org.koitharu.kotatsu.main.ui.protect.ProtectActivity"
@@ -95,9 +101,13 @@
 			android:windowSoftInputMode="adjustResize" />
 		<activity
 			android:name="org.koitharu.kotatsu.download.ui.DownloadsActivity"
+			android:label="@string/downloads"
 			android:launchMode="singleTop"
-			android:label="@string/downloads" />
-		<activity android:name="org.koitharu.kotatsu.image.ui.ImageActivity"/>
+			android:theme="@style/Theme.Kotatsu.DialogWhenLarge" />
+		<activity android:name="org.koitharu.kotatsu.image.ui.ImageActivity" />
+		<activity
+			android:name="org.koitharu.kotatsu.favourites.ui.categories.edit.FavouritesCategoryEditActivity"
+			android:theme="@style/Theme.Kotatsu.DialogWhenLarge" />
 
 		<service
 			android:name="org.koitharu.kotatsu.download.ui.service.DownloadService"

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

@@ -1,17 +1,24 @@
 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 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.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.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
@@ -24,6 +31,7 @@ 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
@@ -39,9 +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())
@@ -67,10 +75,43 @@ 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 enableStrictMode() {
 		StrictMode.setThreadPolicy(
 			StrictMode.ThreadPolicy.Builder()

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

@@ -9,55 +9,50 @@ import okhttp3.OkHttpClient
 import okhttp3.Request
 import org.koin.core.component.KoinComponent
 import org.koin.core.component.get
-import org.koitharu.kotatsu.BuildConfig
 import org.koitharu.kotatsu.core.network.CommonHeaders
 import org.koitharu.kotatsu.core.parser.MangaRepository
 import org.koitharu.kotatsu.parsers.model.MangaPage
 import org.koitharu.kotatsu.parsers.util.await
-import org.koitharu.kotatsu.parsers.util.medianOrNull
 import java.io.File
 import java.io.InputStream
 import java.util.zip.ZipFile
+import kotlin.math.roundToInt
 
 object MangaUtils : KoinComponent {
 
+	private const val MIN_WEBTOON_RATIO = 2
+
 	/**
 	 * Automatic determine type of manga by page size
 	 * @return ReaderMode.WEBTOON if page is wide
 	 */
-	suspend fun determineMangaIsWebtoon(pages: List<MangaPage>): Boolean? {
-		try {
-			val page = pages.medianOrNull() ?: return null
-			val url = MangaRepository(page.source).getPageUrl(page)
-			val uri = Uri.parse(url)
-			val size = if (uri.scheme == "cbz") {
+	suspend fun determineMangaIsWebtoon(pages: List<MangaPage>): Boolean {
+		val pageIndex = (pages.size * 0.3).roundToInt()
+		val page = requireNotNull(pages.getOrNull(pageIndex)) { "No pages" }
+		val url = MangaRepository(page.source).getPageUrl(page)
+		val uri = Uri.parse(url)
+		val size = if (uri.scheme == "cbz") {
+			runInterruptible(Dispatchers.IO) {
+				val zip = ZipFile(uri.schemeSpecificPart)
+				val entry = zip.getEntry(uri.fragment)
+				zip.getInputStream(entry).use {
+					getBitmapSize(it)
+				}
+			}
+		} else {
+			val request = Request.Builder()
+				.url(url)
+				.get()
+				.header(CommonHeaders.REFERER, page.referer)
+				.cacheControl(CommonHeaders.CACHE_CONTROL_DISABLED)
+				.build()
+			get<OkHttpClient>().newCall(request).await().use {
 				runInterruptible(Dispatchers.IO) {
-					val zip = ZipFile(uri.schemeSpecificPart)
-					val entry = zip.getEntry(uri.fragment)
-					zip.getInputStream(entry).use {
-						getBitmapSize(it)
-					}
-				}
-			} else {
-				val request = Request.Builder()
-					.url(url)
-					.get()
-					.header(CommonHeaders.REFERER, page.referer)
-					.cacheControl(CommonHeaders.CACHE_CONTROL_DISABLED)
-					.build()
-				get<OkHttpClient>().newCall(request).await().use {
-					runInterruptible(Dispatchers.IO) {
-						getBitmapSize(it.body?.byteStream())
-					}
+					getBitmapSize(it.body?.byteStream())
 				}
 			}
-			return size.width * 2 < size.height
-		} catch (e: Exception) {
-			if (BuildConfig.DEBUG) {
-				e.printStackTrace()
-			}
-			return null
 		}
+		return size.width * MIN_WEBTOON_RATIO < size.height
 	}
 
 	suspend fun getImageMimeType(file: File): String? = runInterruptible(Dispatchers.IO) {
@@ -78,4 +73,4 @@ object MangaUtils : KoinComponent {
 		check(imageHeight > 0 && imageWidth > 0)
 		return Size(imageWidth, imageHeight)
 	}
-}
+}

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

@@ -0,0 +1,19 @@
+package org.koitharu.kotatsu.base.domain
+
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.launch
+import org.koitharu.kotatsu.utils.ext.processLifecycleScope
+
+fun interface ReversibleHandle {
+
+	suspend fun reverse()
+}
+
+fun ReversibleHandle.reverseAsync() = processLifecycleScope.launch(Dispatchers.Default) {
+	reverse()
+}
+
+operator fun ReversibleHandle.plus(other: ReversibleHandle) = ReversibleHandle {
+	this.reverse()
+	other.reverse()
+}

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

@@ -43,9 +43,13 @@ abstract class BaseActivity<B : ViewBinding> :
 
 	override fun onCreate(savedInstanceState: Bundle?) {
 		val settings = get<AppSettings>()
+		val isAmoled = settings.isAmoledTheme
+		val isDynamic = settings.isDynamicTheme
+		// TODO support DialogWhenLarge theme
 		when {
-			settings.isAmoledTheme -> setTheme(R.style.ThemeOverlay_Kotatsu_AMOLED)
-			settings.isDynamicTheme -> setTheme(R.style.Theme_Kotatsu_Monet)
+			isAmoled && isDynamic -> setTheme(R.style.Theme_Kotatsu_Monet_Amoled)
+			isAmoled -> setTheme(R.style.Theme_Kotatsu_Amoled)
+			isDynamic -> setTheme(R.style.Theme_Kotatsu_Monet)
 		}
 		super.onCreate(savedInstanceState)
 		WindowCompat.setDecorFitsSystemWindows(window, false)

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

@@ -2,11 +2,11 @@ package org.koitharu.kotatsu.base.ui
 
 import android.app.Dialog
 import android.os.Bundle
+import android.util.DisplayMetrics
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
 import android.view.ViewGroup.LayoutParams
-import androidx.appcompat.app.AppCompatDialog
 import androidx.core.view.updateLayoutParams
 import androidx.viewbinding.ViewBinding
 import com.google.android.material.bottomsheet.BottomSheetBehavior
@@ -14,6 +14,7 @@ import com.google.android.material.bottomsheet.BottomSheetDialog
 import com.google.android.material.bottomsheet.BottomSheetDialogFragment
 import org.koitharu.kotatsu.R
 import org.koitharu.kotatsu.base.ui.dialog.AppBottomSheetDialog
+import org.koitharu.kotatsu.utils.ext.displayCompat
 import com.google.android.material.R as materialR
 
 abstract class BaseBottomSheet<B : ViewBinding> : BottomSheetDialogFragment() {
@@ -33,6 +34,20 @@ abstract class BaseBottomSheet<B : ViewBinding> : BottomSheetDialogFragment() {
 	): View {
 		val binding = onInflateView(inflater, container)
 		viewBinding = binding
+
+		// Enforce max width for tablets
+		val width = resources.getDimensionPixelSize(R.dimen.bottom_sheet_width)
+		if (width > 0) {
+			behavior?.maxWidth = width
+		}
+
+		// Set peek height to 50% display height
+		requireContext().displayCompat?.let {
+			val metrics = DisplayMetrics()
+			it.getRealMetrics(metrics)
+			behavior?.peekHeight = (metrics.heightPixels * 0.4).toInt()
+		}
+
 		return binding.root
 	}
 
@@ -42,10 +57,15 @@ abstract class BaseBottomSheet<B : ViewBinding> : BottomSheetDialogFragment() {
 	}
 
 	override fun onCreateDialog(savedInstanceState: Bundle?): Dialog {
-		return if (resources.getBoolean(R.bool.is_tablet)) {
-			AppCompatDialog(context, R.style.Theme_Kotatsu_Dialog)
-		} else {
-			AppBottomSheetDialog(requireContext(), theme)
+		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)
 		}
 	}
 

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

@@ -7,10 +7,12 @@ import android.view.View
 import android.view.WindowManager
 import androidx.viewbinding.ViewBinding
 
+@Suppress("DEPRECATION")
 private const val SYSTEM_UI_FLAGS_SHOWN = View.SYSTEM_UI_FLAG_LAYOUT_STABLE or
 	View.SYSTEM_UI_FLAG_LAYOUT_HIDE_NAVIGATION or
 	View.SYSTEM_UI_FLAG_LAYOUT_FULLSCREEN
 
+@Suppress("DEPRECATION")
 private const val SYSTEM_UI_FLAGS_HIDDEN = View.SYSTEM_UI_FLAG_LAYOUT_STABLE or
 	View.SYSTEM_UI_FLAG_LAYOUT_HIDE_NAVIGATION or
 	View.SYSTEM_UI_FLAG_LAYOUT_FULLSCREEN or
@@ -18,7 +20,8 @@ private const val SYSTEM_UI_FLAGS_HIDDEN = View.SYSTEM_UI_FLAG_LAYOUT_STABLE or
 	View.SYSTEM_UI_FLAG_FULLSCREEN or
 	View.SYSTEM_UI_FLAG_IMMERSIVE_STICKY
 
-abstract class BaseFullscreenActivity<B : ViewBinding> : BaseActivity<B>(),
+abstract class BaseFullscreenActivity<B : ViewBinding> :
+	BaseActivity<B>(),
 	View.OnSystemUiVisibilityChangeListener {
 
 	override fun onCreate(savedInstanceState: Bundle?) {
@@ -35,16 +38,19 @@ abstract class BaseFullscreenActivity<B : ViewBinding> : BaseActivity<B>(),
 		showSystemUI()
 	}
 
+	@Suppress("DEPRECATION", "DeprecatedCallableAddReplaceWith")
 	@Deprecated("Deprecated in Java")
 	final override fun onSystemUiVisibilityChange(visibility: Int) {
 		onSystemUiVisibilityChanged(visibility and View.SYSTEM_UI_FLAG_FULLSCREEN == 0)
 	}
 
 	// TODO WindowInsetsControllerCompat works incorrect
+	@Suppress("DEPRECATION")
 	protected fun hideSystemUI() {
 		window.decorView.systemUiVisibility = SYSTEM_UI_FLAGS_HIDDEN
 	}
 
+	@Suppress("DEPRECATION")
 	protected fun showSystemUI() {
 		window.decorView.systemUiVisibility = SYSTEM_UI_FLAGS_SHOWN
 	}

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/BaseViewModel.kt

@@ -1,18 +1,25 @@
 package org.koitharu.kotatsu.base.ui
 
+import androidx.lifecycle.LiveData
 import androidx.lifecycle.ViewModel
 import androidx.lifecycle.viewModelScope
 import kotlin.coroutines.CoroutineContext
 import kotlin.coroutines.EmptyCoroutineContext
 import kotlinx.coroutines.*
-import org.koitharu.kotatsu.BuildConfig
 import org.koitharu.kotatsu.base.ui.util.CountedBooleanLiveData
 import org.koitharu.kotatsu.utils.SingleLiveEvent
+import org.koitharu.kotatsu.utils.ext.printStackTraceDebug
 
 abstract class BaseViewModel : ViewModel() {
 
-	val onError = SingleLiveEvent<Throwable>()
-	val isLoading = CountedBooleanLiveData()
+	protected val loadingCounter = CountedBooleanLiveData()
+	protected val errorEvent = SingleLiveEvent<Throwable>()
+
+	val onError: LiveData<Throwable>
+		get() = errorEvent
+
+	val isLoading: LiveData<Boolean>
+		get() = loadingCounter
 
 	protected fun launchJob(
 		context: CoroutineContext = EmptyCoroutineContext,
@@ -25,20 +32,18 @@ abstract class BaseViewModel : ViewModel() {
 		start: CoroutineStart = CoroutineStart.DEFAULT,
 		block: suspend CoroutineScope.() -> Unit
 	): Job = viewModelScope.launch(context + createErrorHandler(), start) {
-		isLoading.postValue(true)
+		loadingCounter.increment()
 		try {
 			block()
 		} finally {
-			isLoading.postValue(false)
+			loadingCounter.decrement()
 		}
 	}
 
 	private fun createErrorHandler() = CoroutineExceptionHandler { _, throwable ->
-		if (BuildConfig.DEBUG) {
-			throwable.printStackTrace()
-		}
+		throwable.printStackTraceDebug()
 		if (throwable !is CancellationException) {
-			onError.postCall(throwable)
+			errorEvent.postCall(throwable)
 		}
 	}
 }

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

@@ -21,7 +21,7 @@ class AppBottomSheetDialog(context: Context, theme: Int) : BottomSheetDialog(con
 			if (drawEdgeToEdge) {
 				// Copied from super.onAttachedToWindow:
 				val edgeToEdgeFlags = View.SYSTEM_UI_FLAG_LAYOUT_HIDE_NAVIGATION or View.SYSTEM_UI_FLAG_LAYOUT_STABLE
-				// Fix super-class's window flag bug by respecting the intial system UI visibility:
+				// Fix super-class's window flag bug by respecting the initial system UI visibility:
 				window.decorView.systemUiVisibility = edgeToEdgeFlags or initialSystemUiVisibility
 			}
 		}

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/AdapterDelegateClickListenerAdapter.kt

@@ -0,0 +1,20 @@
+package org.koitharu.kotatsu.base.ui.list
+
+import android.view.View
+import android.view.View.OnClickListener
+import android.view.View.OnLongClickListener
+import com.hannesdorfmann.adapterdelegates4.dsl.AdapterDelegateViewBindingViewHolder
+
+class AdapterDelegateClickListenerAdapter<I>(
+	private val adapterDelegate: AdapterDelegateViewBindingViewHolder<I, *>,
+	private val clickListener: OnListItemClickListener<I>,
+) : OnClickListener, OnLongClickListener {
+
+	override fun onClick(v: View) {
+		clickListener.onItemClick(adapterDelegate.item, v)
+	}
+
+	override fun onLongClick(v: View): Boolean {
+		return clickListener.onItemLongClick(adapterDelegate.item, v)
+	}
+}

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/ActivityRecreationHandle.kt

@@ -0,0 +1,34 @@
+package org.koitharu.kotatsu.base.ui.util
+
+import android.app.Activity
+import android.app.Application.ActivityLifecycleCallbacks
+import android.os.Bundle
+import java.util.*
+
+class ActivityRecreationHandle : ActivityLifecycleCallbacks {
+
+	private val activities = WeakHashMap<Activity, Unit>()
+
+	override fun onActivityCreated(activity: Activity, savedInstanceState: Bundle?) {
+		activities[activity] = Unit
+	}
+
+	override fun onActivityStarted(activity: Activity) = Unit
+
+	override fun onActivityResumed(activity: Activity) = Unit
+
+	override fun onActivityPaused(activity: Activity) = Unit
+
+	override fun onActivityStopped(activity: Activity) = Unit
+
+	override fun onActivitySaveInstanceState(activity: Activity, outState: Bundle) = Unit
+
+	override fun onActivityDestroyed(activity: Activity) {
+		activities.remove(activity)
+	}
+
+	fun recreateAll() {
+		val snapshot = activities.keys.toList()
+		snapshot.forEach { it.recreate() }
+	}
+}

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

@@ -1,20 +1,31 @@
 package org.koitharu.kotatsu.base.ui.util
 
-import androidx.lifecycle.MutableLiveData
+import androidx.annotation.AnyThread
+import androidx.lifecycle.LiveData
+import java.util.concurrent.atomic.AtomicInteger
 
-class CountedBooleanLiveData : MutableLiveData<Boolean>(false) {
+class CountedBooleanLiveData : LiveData<Boolean>(false) {
 
-	private var counter = 0
+	private val counter = AtomicInteger(0)
 
-	override fun setValue(value: Boolean) {
-		if (value) {
-			counter++
-		} else {
-			counter--
+	@AnyThread
+	fun increment() {
+		if (counter.getAndIncrement() == 0) {
+			postValue(true)
 		}
-		val newValue = counter > 0
-		if (newValue != this.value) {
-			super.setValue(newValue)
+	}
+
+	@AnyThread
+	fun decrement() {
+		if (counter.decrementAndGet() == 0) {
+			postValue(false)
+		}
+	}
+
+	@AnyThread
+	fun reset() {
+		if (counter.getAndSet(0) != 0) {
+			postValue(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/ListItemTextView.kt

@@ -36,8 +36,7 @@ class ListItemTextView @JvmOverloads constructor(
 
 	init {
 		context.withStyledAttributes(attrs, R.styleable.ListItemTextView, defStyleAttr) {
-			val itemRippleColor = getColorStateList(R.styleable.ListItemTextView_rippleColor)
-				?: getRippleColorFallback(context)
+			val itemRippleColor = getRippleColor(context)
 			val shape = createShapeDrawable(this)
 			background = RippleDrawable(
 				RippleUtils.sanitizeRippleDrawableColor(itemRippleColor),
@@ -108,7 +107,7 @@ class ListItemTextView @JvmOverloads constructor(
 			ta.getResourceId(R.styleable.ListItemTextView_shapeAppearanceOverlay, 0),
 		).build()
 		val shapeDrawable = MaterialShapeDrawable(shapeAppearance)
-		shapeDrawable.fillColor = ta.getColorStateList(R.styleable.ListItemTextView_backgroundTint)
+		shapeDrawable.fillColor = ta.getColorStateList(R.styleable.ListItemTextView_backgroundFillColor)
 		return InsetDrawable(
 			shapeDrawable,
 			ta.getDimensionPixelOffset(R.styleable.ListItemTextView_android_insetLeft, 0),
@@ -118,7 +117,7 @@ class ListItemTextView @JvmOverloads constructor(
 		)
 	}
 
-	private fun getRippleColorFallback(context: Context): ColorStateList {
+	private fun getRippleColor(context: Context): ColorStateList {
 		return context.getThemeColorStateList(android.R.attr.colorControlHighlight)
 			?: ColorStateList.valueOf(Color.TRANSPARENT)
 	}

app/src/main/java/org/koitharu/kotatsu/bookmarks/BookmarksModule.kt

@@ -0,0 +1,10 @@
+package org.koitharu.kotatsu.bookmarks
+
+import org.koin.dsl.module
+import org.koitharu.kotatsu.bookmarks.domain.BookmarksRepository
+
+val bookmarksModule
+	get() = module {
+
+		factory { BookmarksRepository(get()) }
+	}

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

@@ -0,0 +1,29 @@
+package org.koitharu.kotatsu.bookmarks.data
+
+import androidx.room.ColumnInfo
+import androidx.room.Entity
+import androidx.room.ForeignKey
+import org.koitharu.kotatsu.core.db.entity.MangaEntity
+
+@Entity(
+	tableName = "bookmarks",
+	primaryKeys = ["manga_id", "page_id"],
+	foreignKeys = [
+		ForeignKey(
+			entity = MangaEntity::class,
+			parentColumns = ["manga_id"],
+			childColumns = ["manga_id"],
+			onDelete = ForeignKey.CASCADE
+		),
+	]
+)
+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,
+	@ColumnInfo(name = "page") val page: Int,
+	@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/BookmarkWithManga.kt

@@ -0,0 +1,23 @@
+package org.koitharu.kotatsu.bookmarks.data
+
+import androidx.room.Embedded
+import androidx.room.Junction
+import androidx.room.Relation
+import org.koitharu.kotatsu.core.db.entity.MangaEntity
+import org.koitharu.kotatsu.core.db.entity.MangaTagsEntity
+import org.koitharu.kotatsu.core.db.entity.TagEntity
+
+class BookmarkWithManga(
+	@Embedded val bookmark: BookmarkEntity,
+	@Relation(
+		parentColumn = "manga_id",
+		entityColumn = "manga_id"
+	)
+	val manga: MangaEntity,
+	@Relation(
+		parentColumn = "manga_id",
+		entityColumn = "tag_id",
+		associateBy = Junction(MangaTagsEntity::class)
+	)
+	val tags: List<TagEntity>,
+)

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

@@ -0,0 +1,26 @@
+package org.koitharu.kotatsu.bookmarks.data
+
+import androidx.room.Dao
+import androidx.room.Delete
+import androidx.room.Insert
+import androidx.room.Query
+import kotlinx.coroutines.flow.Flow
+
+@Dao
+abstract class BookmarksDao {
+
+	@Query("SELECT * FROM bookmarks WHERE manga_id = :mangaId AND chapter_id = :chapterId AND page = :page")
+	abstract fun observe(mangaId: Long, chapterId: Long, page: Int): Flow<BookmarkEntity?>
+
+	@Query("SELECT * FROM bookmarks WHERE manga_id = :mangaId ORDER BY created_at DESC")
+	abstract fun observe(mangaId: Long): Flow<List<BookmarkEntity>>
+
+	@Insert
+	abstract suspend fun insert(entity: BookmarkEntity)
+
+	@Delete
+	abstract suspend fun delete(entity: BookmarkEntity)
+
+	@Query("DELETE FROM bookmarks WHERE manga_id = :mangaId AND page_id = :pageId")
+	abstract suspend fun delete(mangaId: Long, pageId: Long)
+}

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

@@ -0,0 +1,33 @@
+package org.koitharu.kotatsu.bookmarks.data
+
+import org.koitharu.kotatsu.bookmarks.domain.Bookmark
+import org.koitharu.kotatsu.core.db.entity.toManga
+import org.koitharu.kotatsu.core.db.entity.toMangaTags
+import org.koitharu.kotatsu.parsers.model.Manga
+import java.util.*
+
+fun BookmarkWithManga.toBookmark() = bookmark.toBookmark(
+	manga.toManga(tags.toMangaTags())
+)
+
+fun BookmarkEntity.toBookmark(manga: Manga) = Bookmark(
+	manga = manga,
+	pageId = pageId,
+	chapterId = chapterId,
+	page = page,
+	scroll = scroll,
+	imageUrl = imageUrl,
+	createdAt = Date(createdAt),
+	percent = percent,
+)
+
+fun Bookmark.toEntity() = BookmarkEntity(
+	mangaId = manga.id,
+	pageId = pageId,
+	chapterId = chapterId,
+	page = page,
+	scroll = scroll,
+	imageUrl = imageUrl,
+	createdAt = createdAt.time,
+	percent = percent,
+)

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

@@ -0,0 +1,46 @@
+package org.koitharu.kotatsu.bookmarks.domain
+
+import org.koitharu.kotatsu.parsers.model.Manga
+import java.util.*
+
+class Bookmark(
+	val manga: Manga,
+	val pageId: Long,
+	val chapterId: Long,
+	val page: Int,
+	val scroll: Int,
+	val imageUrl: String,
+	val createdAt: Date,
+	val percent: Float,
+) {
+
+	override fun equals(other: Any?): Boolean {
+		if (this === other) return true
+		if (javaClass != other?.javaClass) return false
+
+		other as Bookmark
+
+		if (manga != other.manga) return false
+		if (pageId != other.pageId) return false
+		if (chapterId != other.chapterId) return false
+		if (page != other.page) return false
+		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
+	}
+
+	override fun hashCode(): Int {
+		var result = manga.hashCode()
+		result = 31 * result + pageId.hashCode()
+		result = 31 * result + chapterId.hashCode()
+		result = 31 * result + page
+		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/domain/BookmarksRepository.kt

@@ -0,0 +1,38 @@
+package org.koitharu.kotatsu.bookmarks.domain
+
+import androidx.room.withTransaction
+import kotlinx.coroutines.flow.Flow
+import kotlinx.coroutines.flow.map
+import org.koitharu.kotatsu.bookmarks.data.toBookmark
+import org.koitharu.kotatsu.bookmarks.data.toEntity
+import org.koitharu.kotatsu.core.db.MangaDatabase
+import org.koitharu.kotatsu.core.db.entity.toEntities
+import org.koitharu.kotatsu.core.db.entity.toEntity
+import org.koitharu.kotatsu.parsers.model.Manga
+import org.koitharu.kotatsu.utils.ext.mapItems
+
+class BookmarksRepository(
+	private val db: MangaDatabase,
+) {
+
+	fun observeBookmark(manga: Manga, chapterId: Long, page: Int): Flow<Bookmark?> {
+		return db.bookmarksDao.observe(manga.id, chapterId, page).map { it?.toBookmark(manga) }
+	}
+
+	fun observeBookmarks(manga: Manga): Flow<List<Bookmark>> {
+		return db.bookmarksDao.observe(manga.id).mapItems { it.toBookmark(manga) }
+	}
+
+	suspend fun addBookmark(bookmark: Bookmark) {
+		db.withTransaction {
+			val tags = bookmark.manga.tags.toEntities()
+			db.tagsDao.upsert(tags)
+			db.mangaDao.upsert(bookmark.manga.toEntity(), tags)
+			db.bookmarksDao.insert(bookmark.toEntity())
+		}
+	}
+
+	suspend fun removeBookmark(mangaId: Long, pageId: Long) {
+		db.bookmarksDao.delete(mangaId, pageId)
+	}
+}

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

@@ -0,0 +1,51 @@
+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.enqueueWith
+import org.koitharu.kotatsu.utils.ext.newImageRequest
+import org.koitharu.kotatsu.utils.ext.referer
+
+fun bookmarkListAD(
+	coil: ImageLoader,
+	lifecycleOwner: LifecycleOwner,
+	clickListener: OnListItemClickListener<Bookmark>,
+) = adapterDelegateViewBinding<Bookmark, Bookmark, ItemBookmarkBinding>(
+	{ 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)
+	}
+
+	onViewRecycled {
+		imageRequest?.dispose()
+		imageRequest = null
+		CoilUtils.dispose(binding.imageViewThumb)
+		binding.imageViewThumb.setImageDrawable(null)
+	}
+}

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

@@ -0,0 +1,30 @@
+package org.koitharu.kotatsu.bookmarks.ui
+
+import androidx.lifecycle.LifecycleOwner
+import androidx.recyclerview.widget.DiffUtil
+import coil.ImageLoader
+import com.hannesdorfmann.adapterdelegates4.AsyncListDifferDelegationAdapter
+import org.koitharu.kotatsu.base.ui.list.OnListItemClickListener
+import org.koitharu.kotatsu.bookmarks.domain.Bookmark
+
+class BookmarksAdapter(
+	coil: ImageLoader,
+	lifecycleOwner: LifecycleOwner,
+	clickListener: OnListItemClickListener<Bookmark>,
+) : AsyncListDifferDelegationAdapter<Bookmark>(
+	DiffCallback(),
+	bookmarkListAD(coil, lifecycleOwner, clickListener)
+) {
+
+	private class DiffCallback : DiffUtil.ItemCallback<Bookmark>() {
+
+		override fun areItemsTheSame(oldItem: Bookmark, newItem: Bookmark): Boolean {
+			return oldItem.manga.id == newItem.manga.id && oldItem.chapterId == newItem.chapterId
+		}
+
+		override fun areContentsTheSame(oldItem: Bookmark, newItem: Bookmark): Boolean {
+			return oldItem.imageUrl == newItem.imageUrl
+		}
+
+	}
+}

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

@@ -111,6 +111,7 @@ class BackupRepository(private val db: MangaDatabase) {
 		jo.put("chapter_id", chapterId)
 		jo.put("page", page)
 		jo.put("scroll", scroll)
+		jo.put("percent", percent)
 		return jo
 	}
 
@@ -121,6 +122,7 @@ class BackupRepository(private val db: MangaDatabase) {
 		jo.put("sort_key", sortKey)
 		jo.put("title", title)
 		jo.put("order", order)
+		jo.put("track", track)
 		return jo
 	}
 

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/RestoreRepository.kt

@@ -9,10 +9,7 @@ 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
+import org.koitharu.kotatsu.parsers.util.json.*
 
 class RestoreRepository(private val db: MangaDatabase) {
 
@@ -95,7 +92,8 @@ class RestoreRepository(private val db: MangaDatabase) {
 		updatedAt = json.getLong("updated_at"),
 		chapterId = json.getLong("chapter_id"),
 		page = json.getInt("page"),
-		scroll = json.getDouble("scroll").toFloat()
+		scroll = json.getDouble("scroll").toFloat(),
+		percent = json.getFloatOrDefault("percent", -1f),
 	)
 
 	private fun parseCategory(json: JSONObject) = FavouriteCategoryEntity(
@@ -104,6 +102,7 @@ class RestoreRepository(private val db: MangaDatabase) {
 		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(

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

@@ -5,5 +5,5 @@ import org.koin.dsl.module
 
 val databaseModule
 	get() = module {
-		single { MangaDatabase.create(androidContext()) }
+		single { MangaDatabase(androidContext()) }
 	}

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

@@ -10,8 +10,8 @@ class DatabasePrePopulateCallback(private val resources: Resources) : RoomDataba
 
 	override fun onCreate(db: SupportSQLiteDatabase) {
 		db.execSQL(
-			"INSERT INTO favourite_categories (created_at, sort_key, title, `order`) VALUES (?,?,?,?)",
-			arrayOf(System.currentTimeMillis(), 1, resources.getString(R.string.read_later), SortOrder.NEWEST.name)
+			"INSERT INTO favourite_categories (created_at, sort_key, title, `order`, track) VALUES (?,?,?,?,?)",
+			arrayOf(System.currentTimeMillis(), 1, resources.getString(R.string.read_later), SortOrder.NEWEST.name, 1)
 		)
 	}
 }

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

@@ -4,8 +4,16 @@ import android.content.Context
 import androidx.room.Database
 import androidx.room.Room
 import androidx.room.RoomDatabase
-import org.koitharu.kotatsu.core.db.dao.*
-import org.koitharu.kotatsu.core.db.entity.*
+import org.koitharu.kotatsu.bookmarks.data.BookmarkEntity
+import org.koitharu.kotatsu.bookmarks.data.BookmarksDao
+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
@@ -13,16 +21,22 @@ 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
 
 @Database(
 	entities = [
 		MangaEntity::class, TagEntity::class, HistoryEntity::class, MangaTagsEntity::class,
 		FavouriteCategoryEntity::class, FavouriteEntity::class, MangaPrefsEntity::class,
-		TrackEntity::class, TrackLogEntity::class, SuggestionEntity::class
+		TrackEntity::class, TrackLogEntity::class, SuggestionEntity::class, BookmarkEntity::class,
+		ScrobblingEntity::class,
 	],
-	version = 9
+	version = 12,
 )
 abstract class MangaDatabase : RoomDatabase() {
 
@@ -44,23 +58,27 @@ abstract class MangaDatabase : RoomDatabase() {
 
 	abstract val suggestionDao: SuggestionDao
 
-	companion object {
+	abstract val bookmarksDao: BookmarksDao
 
-		fun create(context: Context): MangaDatabase = Room.databaseBuilder(
-			context,
-			MangaDatabase::class.java,
-			"kotatsu-db"
-		).addMigrations(
-			Migration1To2(),
-			Migration2To3(),
-			Migration3To4(),
-			Migration4To5(),
-			Migration5To6(),
-			Migration6To7(),
-			Migration7To8(),
-			Migration8To9(),
-		).addCallback(
-			DatabasePrePopulateCallback(context.resources)
-		).build()
-	}
-}
+	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(),
+	Migration11To12(),
+).addCallback(
+	DatabasePrePopulateCallback(context.resources)
+).build()

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,11 +1,9 @@
 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.longHashCode
 import org.koitharu.kotatsu.parsers.util.mapToSet
 import org.koitharu.kotatsu.parsers.util.toTitleCase
+import org.koitharu.kotatsu.utils.ext.longHashCode
 
 // Entity to model
 
@@ -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/migrations/Migration10To11.kt

@@ -0,0 +1,26 @@
+package org.koitharu.kotatsu.core.db.migrations
+
+import androidx.room.migration.Migration
+import androidx.sqlite.db.SupportSQLiteDatabase
+
+class Migration10To11 : Migration(10, 11) {
+
+	override fun migrate(database: SupportSQLiteDatabase) {
+		database.execSQL(
+			"""
+			CREATE TABLE IF NOT EXISTS `bookmarks` (
+				`manga_id` INTEGER NOT NULL,
+				`page_id` INTEGER NOT NULL,
+				`chapter_id` INTEGER NOT NULL, 
+				`page` INTEGER NOT NULL,
+				`scroll` INTEGER NOT NULL,
+				`image` TEXT NOT NULL,
+				`created_at` INTEGER NOT NULL,
+				PRIMARY KEY(`manga_id`, `page_id`),
+				FOREIGN KEY(`manga_id`) REFERENCES `manga`(`manga_id`) ON UPDATE NO ACTION ON DELETE CASCADE )
+			""".trimIndent()
+		)
+		database.execSQL("CREATE INDEX IF NOT EXISTS `index_bookmarks_manga_id` ON `bookmarks` (`manga_id`)")
+		database.execSQL("CREATE INDEX IF NOT EXISTS `index_bookmarks_page_id` ON `bookmarks` (`page_id`)")
+	}
+}

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/db/migrations/Migration9To10.kt

@@ -0,0 +1,11 @@
+package org.koitharu.kotatsu.core.db.migrations
+
+import androidx.room.migration.Migration
+import androidx.sqlite.db.SupportSQLiteDatabase
+
+class Migration9To10 : Migration(9, 10) {
+
+	override fun migrate(database: SupportSQLiteDatabase) {
+		database.execSQL("ALTER TABLE favourite_categories ADD COLUMN `track` INTEGER NOT NULL DEFAULT 1")
+	}
+}

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/github/GithubModule.kt

@@ -4,7 +4,5 @@ import org.koin.dsl.module
 
 val githubModule
 	get() = module {
-		single {
-			GithubRepository(get())
-		}
+		factory { GithubRepository(get()) }
 	}

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

@@ -54,27 +54,23 @@ class VersionId(
 		return result
 	}
 
-	companion object {
-
-		private fun variantWeight(variantType: String) =
-			when (variantType.lowercase(Locale.ROOT)) {
-				"a", "alpha" -> 1
-				"b", "beta" -> 2
-				"rc" -> 4
-				"" -> 8
-				else -> 0
-			}
-
-		fun parse(versionName: String): VersionId {
-			val parts = versionName.substringBeforeLast('-').split('.')
-			val variant = versionName.substringAfterLast('-', "")
-			return VersionId(
-				major = parts.getOrNull(0)?.toIntOrNull() ?: 0,
-				minor = parts.getOrNull(1)?.toIntOrNull() ?: 0,
-				build = parts.getOrNull(2)?.toIntOrNull() ?: 0,
-				variantType = variant.filter(Char::isLetter),
-				variantNumber = variant.filter(Char::isDigit).toIntOrNull() ?: 0
-			)
-		}
+	private fun variantWeight(variantType: String) = when (variantType.lowercase(Locale.ROOT)) {
+		"a", "alpha" -> 1
+		"b", "beta" -> 2
+		"rc" -> 4
+		"" -> 8
+		else -> 0
 	}
+}
+
+fun VersionId(versionName: String): VersionId {
+	val parts = versionName.substringBeforeLast('-').split('.')
+	val variant = versionName.substringAfterLast('-', "")
+	return VersionId(
+		major = parts.getOrNull(0)?.toIntOrNull() ?: 0,
+		minor = parts.getOrNull(1)?.toIntOrNull() ?: 0,
+		build = parts.getOrNull(2)?.toIntOrNull() ?: 0,
+		variantType = variant.filter(Char::isLetter),
+		variantNumber = variant.filter(Char::isDigit).toIntOrNull() ?: 0,
+	)
 }

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

@@ -1,9 +1,9 @@
 package org.koitharu.kotatsu.core.model
 
 import android.os.Parcelable
+import java.util.*
 import kotlinx.parcelize.Parcelize
 import org.koitharu.kotatsu.parsers.model.SortOrder
-import java.util.*
 
 @Parcelize
 data class FavouriteCategory(
@@ -12,4 +12,5 @@ data class FavouriteCategory(
 	val sortKey: Int,
 	val order: SortOrder,
 	val createdAt: Date,
+	val isTrackingEnabled: Boolean,
 ) : Parcelable

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/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

@@ -0,0 +1,84 @@
+package org.koitharu.kotatsu.core.network
+
+import okhttp3.Cache
+import okhttp3.Dns
+import okhttp3.HttpUrl.Companion.toHttpUrl
+import okhttp3.OkHttpClient
+import okhttp3.dnsoverhttps.DnsOverHttps
+import org.koitharu.kotatsu.core.prefs.AppSettings
+import org.koitharu.kotatsu.utils.ext.printStackTraceDebug
+import java.net.InetAddress
+import java.net.UnknownHostException
+
+class DoHManager(
+	cache: Cache,
+	private val settings: AppSettings,
+) : Dns {
+
+	private val bootstrapClient = OkHttpClient.Builder().cache(cache).build()
+
+	private var cachedDelegate: Dns? = null
+	private var cachedProvider: DoHProvider? = null
+
+	override fun lookup(hostname: String): List<InetAddress> {
+		return getDelegate().lookup(hostname)
+	}
+
+	@Synchronized
+	private fun getDelegate(): Dns {
+		var delegate = cachedDelegate
+		val provider = settings.dnsOverHttps
+		if (delegate == null || provider != cachedProvider) {
+			delegate = createDelegate(provider)
+			cachedDelegate = delegate
+			cachedProvider = provider
+		}
+		return delegate
+	}
+
+	private fun createDelegate(provider: DoHProvider): Dns = when (provider) {
+		DoHProvider.NONE -> Dns.SYSTEM
+		DoHProvider.GOOGLE -> DnsOverHttps.Builder().client(bootstrapClient)
+			.url("https://dns.google/dns-query".toHttpUrl())
+			.bootstrapDnsHosts(
+				listOfNotNull(
+					tryGetByIp("8.8.4.4"),
+					tryGetByIp("8.8.8.8"),
+					tryGetByIp("2001:4860:4860::8888"),
+					tryGetByIp("2001:4860:4860::8844"),
+				)
+			).build()
+		DoHProvider.CLOUDFLARE -> DnsOverHttps.Builder().client(bootstrapClient)
+			.url("https://cloudflare-dns.com/dns-query".toHttpUrl())
+			.bootstrapDnsHosts(
+				listOfNotNull(
+					tryGetByIp("162.159.36.1"),
+					tryGetByIp("162.159.46.1"),
+					tryGetByIp("1.1.1.1"),
+					tryGetByIp("1.0.0.1"),
+					tryGetByIp("162.159.132.53"),
+					tryGetByIp("2606:4700:4700::1111"),
+					tryGetByIp("2606:4700:4700::1001"),
+					tryGetByIp("2606:4700:4700::0064"),
+					tryGetByIp("2606:4700:4700::6400"),
+				)
+			).build()
+		DoHProvider.ADGUARD -> DnsOverHttps.Builder().client(bootstrapClient)
+			.url("https://dns-unfiltered.adguard.com/dns-query".toHttpUrl())
+			.bootstrapDnsHosts(
+				listOfNotNull(
+					tryGetByIp("94.140.14.140"),
+					tryGetByIp("94.140.14.141"),
+					tryGetByIp("2a10:50c0::1:ff"),
+					tryGetByIp("2a10:50c0::2:ff"),
+				)
+			).build()
+	}
+
+	private fun tryGetByIp(ip: String): InetAddress? = try {
+		InetAddress.getByName(ip)
+	} catch (e: UnknownHostException) {
+		e.printStackTraceDebug()
+		null
+	}
+}

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

@@ -0,0 +1,6 @@
+package org.koitharu.kotatsu.core.network
+
+enum class DoHProvider {
+
+	NONE, GOOGLE, CLOUDFLARE, ADGUARD
+}

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

@@ -1,6 +1,5 @@
 package org.koitharu.kotatsu.core.network
 
-import java.util.concurrent.TimeUnit
 import okhttp3.CookieJar
 import okhttp3.OkHttpClient
 import org.koin.dsl.bind
@@ -8,17 +7,20 @@ import org.koin.dsl.module
 import org.koitharu.kotatsu.core.parser.MangaLoaderContextImpl
 import org.koitharu.kotatsu.local.data.LocalStorageManager
 import org.koitharu.kotatsu.parsers.MangaLoaderContext
+import java.util.concurrent.TimeUnit
 
 val networkModule
 	get() = module {
 		single { AndroidCookieJar() } bind CookieJar::class
 		single {
+			val cache = get<LocalStorageManager>().createHttpCache()
 			OkHttpClient.Builder().apply {
 				connectTimeout(20, TimeUnit.SECONDS)
 				readTimeout(60, TimeUnit.SECONDS)
 				writeTimeout(20, TimeUnit.SECONDS)
 				cookieJar(get())
-				cache(get<LocalStorageManager>().createHttpCache())
+				dns(DoHManager(cache, get()))
+				cache(cache)
 				addInterceptor(UserAgentInterceptor())
 				addInterceptor(CloudFlareInterceptor())
 			}.build()

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

@@ -5,12 +5,12 @@ import android.content.Context
 import android.content.pm.ShortcutManager
 import android.media.ThumbnailUtils
 import android.os.Build
+import android.util.Size
 import androidx.core.content.pm.ShortcutInfoCompat
 import androidx.core.content.pm.ShortcutManagerCompat
 import androidx.core.graphics.drawable.IconCompat
 import coil.ImageLoader
 import coil.request.ImageRequest
-import coil.size.PixelSize
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.withContext
 import org.koitharu.kotatsu.R
@@ -54,7 +54,7 @@ class ShortcutsRepository(
 				val bmp = coil.execute(
 					ImageRequest.Builder(context)
 						.data(manga.coverUrl)
-						.size(iconSize)
+						.size(iconSize.width, iconSize.height)
 						.build()
 				).requireBitmap()
 				ThumbnailUtils.extractThumbnail(bmp, iconSize.width, iconSize.height, 0)
@@ -74,14 +74,14 @@ class ShortcutsRepository(
 			)
 	}
 
-	private fun getIconSize(context: Context): PixelSize {
+	private fun getIconSize(context: Context): Size {
 		return if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N_MR1) {
 			(context.getSystemService(Context.SHORTCUT_SERVICE) as ShortcutManager).let {
-				PixelSize(it.iconMaxWidth, it.iconMaxHeight)
+				Size(it.iconMaxWidth, it.iconMaxHeight)
 			}
 		} else {
 			(context.getSystemService(Context.ACTIVITY_SERVICE) as ActivityManager).launcherLargeIconSize.let {
-				PixelSize(it, it)
+				Size(it, it)
 			}
 		}
 	}

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

@@ -2,17 +2,19 @@ package org.koitharu.kotatsu.core.parser
 
 import android.net.Uri
 import coil.map.Mapper
+import coil.request.Options
 import okhttp3.HttpUrl
 import okhttp3.HttpUrl.Companion.toHttpUrl
 import org.koitharu.kotatsu.parsers.model.MangaSource
 
-class FaviconMapper() : Mapper<Uri, HttpUrl> {
+class FaviconMapper : Mapper<Uri, HttpUrl> {
 
-	override fun map(data: Uri): HttpUrl {
+	override fun map(data: Uri, options: Options): HttpUrl? {
+		if (data.scheme != "favicon") {
+			return null
+		}
 		val mangaSource = MangaSource.valueOf(data.schemeSpecificPart)
 		val repo = MangaRepository(mangaSource) as RemoteMangaRepository
 		return repo.getFaviconUrl().toHttpUrl()
 	}
-
-	override fun handles(data: Uri) = data.scheme == "favicon"
 }

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

@@ -4,26 +4,27 @@ import android.content.Context
 import android.content.SharedPreferences
 import android.net.ConnectivityManager
 import android.net.Uri
-import android.os.Build
 import android.provider.Settings
 import androidx.appcompat.app.AppCompatDelegate
 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
 import org.koitharu.kotatsu.BuildConfig
 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
@@ -51,7 +52,7 @@ class AppSettings(context: Context) {
 		get() = prefs.getString(KEY_THEME, null)?.toIntOrNull() ?: AppCompatDelegate.MODE_NIGHT_FOLLOW_SYSTEM
 
 	val isDynamicTheme: Boolean
-		get() = prefs.getBoolean(KEY_DYNAMIC_THEME, false)
+		get() = DynamicColors.isDynamicColorAvailable() && prefs.getBoolean(KEY_DYNAMIC_THEME, false)
 
 	val isAmoledTheme: Boolean
 		get() = prefs.getBoolean(KEY_THEME_AMOLED, false)
@@ -78,7 +79,10 @@ class AppSettings(context: Context) {
 		get() = prefs.getLong(KEY_APP_UPDATE, 0L)
 		set(value) = prefs.edit { putLong(KEY_APP_UPDATE, value) }
 
-	val trackerNotifications: Boolean
+	val isTrackerEnabled: Boolean
+		get() = prefs.getBoolean(KEY_TRACKER_ENABLED, true)
+
+	val isTrackerNotificationsEnabled: Boolean
 		get() = prefs.getBoolean(KEY_TRACKER_NOTIFICATIONS, true)
 
 	var notificationSound: Uri
@@ -95,13 +99,19 @@ class AppSettings(context: Context) {
 	val readerAnimation: Boolean
 		get() = prefs.getBoolean(KEY_READER_ANIMATION, false)
 
-	val isPreferRtlReader: Boolean
-		get() = prefs.getBoolean(KEY_READER_PREFER_RTL, false)
+	val defaultReaderMode: ReaderMode
+		get() = prefs.getEnumValue(KEY_READER_MODE, ReaderMode.STANDARD)
 
-	var historyGrouping: Boolean
+	val isReaderModeDetectionEnabled: Boolean
+		get() = prefs.getBoolean(KEY_READER_MODE_DETECT, true)
+
+	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)
 
@@ -119,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('|')
@@ -145,7 +159,7 @@ class AppSettings(context: Context) {
 		}
 
 	fun markKnownSources(sources: Collection<MangaSource>) {
-		sourcesOrder = sourcesOrder + sources.map { it.name }
+		sourcesOrder = (sourcesOrder + sources.map { it.name }).distinct()
 	}
 
 	val isPagesNumbersEnabled: Boolean
@@ -185,6 +199,9 @@ class AppSettings(context: Context) {
 		get() = prefs.getBoolean(KEY_SEARCH_SINGLE_SOURCE, false)
 		set(value) = prefs.edit { putBoolean(KEY_SEARCH_SINGLE_SOURCE, value) }
 
+	val dnsOverHttps: DoHProvider
+		get() = prefs.getEnumValue(KEY_DOH, DoHProvider.NONE)
+
 	fun isPagesPreloadAllowed(cm: ConnectivityManager): Boolean {
 		return when (prefs.getString(KEY_PAGES_PRELOAD, null)?.toIntOrNull()) {
 			NETWORK_ALWAYS -> true
@@ -233,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 {
 
@@ -269,22 +278,28 @@ class AppSettings(context: Context) {
 		const val KEY_REMOTE_SOURCES = "remote_sources"
 		const val KEY_LOCAL_STORAGE = "local_storage"
 		const val KEY_READER_SWITCHERS = "reader_switchers"
+		const val KEY_TRACKER_ENABLED = "tracker_enabled"
 		const val KEY_TRACK_SOURCES = "track_sources"
+		const val KEY_TRACK_CATEGORIES = "track_categories"
 		const val KEY_TRACK_WARNING = "track_warning"
 		const val KEY_TRACKER_NOTIFICATIONS = "tracker_notifications"
 		const val KEY_NOTIFICATIONS_SETTINGS = "notifications_settings"
 		const val KEY_NOTIFICATIONS_SOUND = "notifications_sound"
 		const val KEY_NOTIFICATIONS_VIBRATE = "notifications_vibrate"
 		const val KEY_NOTIFICATIONS_LIGHT = "notifications_light"
+		const val KEY_NOTIFICATIONS_INFO = "tracker_notifications_info"
 		const val KEY_READER_ANIMATION = "reader_animation"
-		const val KEY_READER_PREFER_RTL = "reader_prefer_rtl"
+		const val KEY_READER_MODE = "reader_mode"
+		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"
@@ -294,27 +309,19 @@ 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"
+		const val KEY_DOH = "doh"
 
 		// About
 		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
 		private const val NETWORK_NON_METERED = 2
-
-		val isDynamicColorAvailable: Boolean
-			get() = DynamicColors.isDynamicColorAvailable() ||
-				(isSamsung && Build.VERSION.SDK_INT >= Build.VERSION_CODES.S)
-
-		private val isSamsung
-			get() = Build.MANUFACTURER.equals("samsung", ignoreCase = true)
 	}
 }

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

@@ -0,0 +1,35 @@
+package org.koitharu.kotatsu.core.prefs
+
+import androidx.lifecycle.liveData
+import kotlin.coroutines.CoroutineContext
+import kotlinx.coroutines.flow.flow
+
+fun <T> AppSettings.observeAsFlow(key: String, valueProducer: AppSettings.() -> T) = flow {
+	var lastValue: T = valueProducer()
+	emit(lastValue)
+	observe().collect {
+		if (it == key) {
+			val value = valueProducer()
+			if (value != lastValue) {
+				emit(value)
+			}
+			lastValue = value
+		}
+	}
+}
+
+fun <T> AppSettings.observeAsLiveData(
+	context: CoroutineContext,
+	key: String,
+	valueProducer: AppSettings.() -> T
+) = liveData(context) {
+	emit(valueProducer())
+	observe().collect {
+		if (it == key) {
+			val value = valueProducer()
+			if (value != latestValue) {
+				emit(value)
+			}
+		}
+	}
+}

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

@@ -10,4 +10,4 @@ enum class ReaderMode(val id: Int) {
 
 		fun valueOf(id: Int) = values().firstOrNull { it.id == id }
 	}
-}
+}

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

@@ -1,21 +0,0 @@
-package org.koitharu.kotatsu.core.ui
-
-import android.content.Context
-import android.content.Intent
-import android.util.Log
-import kotlin.system.exitProcess
-
-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.printStackTrace()
-		}
-		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,30 +1,46 @@
 package org.koitharu.kotatsu.core.ui
 
+import android.text.Html
 import coil.ComponentRegistry
 import coil.ImageLoader
-import coil.util.CoilUtils
+import coil.disk.DiskCache
+import kotlinx.coroutines.Dispatchers
 import okhttp3.OkHttpClient
 import org.koin.android.ext.koin.androidContext
 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 {
 		single {
 			val httpClientFactory = {
 				get<OkHttpClient>().newBuilder()
-					.cache(CoilUtils.createDefaultCache(androidContext()))
+					.cache(null)
+					.build()
+			}
+			val diskCacheFactory = {
+				val context = androidContext()
+				val rootDir = context.externalCacheDir ?: context.cacheDir
+				DiskCache.Builder()
+					.directory(rootDir.resolve(CacheDir.THUMBS.dir))
 					.build()
 			}
 			ImageLoader.Builder(androidContext())
 				.okHttpClient(httpClientFactory)
-				.launchInterceptorChainOnMainThread(false)
-				.componentRegistry(
+				.interceptorDispatcher(Dispatchers.Default)
+				.fetcherDispatcher(Dispatchers.IO)
+				.decoderDispatcher(Dispatchers.Default)
+				.transformationDispatcher(Dispatchers.Default)
+				.diskCache(diskCacheFactory)
+				.components(
 					ComponentRegistry.Builder()
-						.add(CbzFetcher())
+						.add(CbzFetcher.Factory())
 						.add(FaviconMapper())
 						.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())
+			DetailsViewModel(intent.get(), get(), get(), get(), get(), get(), get(), get(), get(), get())
 		}
 	}

app/src/main/java/org/koitharu/kotatsu/details/domain/BranchComparator.kt

@@ -0,0 +1,6 @@
+package org.koitharu.kotatsu.details.domain
+
+class BranchComparator : Comparator<String?> {
+
+	override fun compare(o1: String?, o2: String?): Int = compareValues(o1, o2)
+}

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,62 +73,25 @@ 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)) {
 			(activity as? DetailsActivity)?.showChapterMissingDialog(item.chapter.id)
 			return
 		}
-		val options = ActivityOptions.makeScaleUpAnimation(
-			view,
-			0,
-			0,
-			view.measuredWidth,
-			view.measuredHeight
-		)
+		val options = ActivityOptions.makeScaleUpAnimation(view, 0, 0, view.width, view.height)
 		startActivity(
 			ReaderActivity.newIntent(
 				context = view.context,
@@ -139,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 {
@@ -155,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
@@ -180,9 +137,7 @@ class ChaptersFragment :
 			}
 			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
@@ -202,7 +157,7 @@ class ChaptersFragment :
 	}
 
 	override fun onPrepareActionMode(mode: ActionMode, menu: Menu): Boolean {
-		val selectedIds = selectionDecoration?.checkedItemsIds ?: return false
+		val selectedIds = selectionController?.peekCheckedIds() ?: return false
 		val items = chaptersAdapter?.items?.filter { x -> x.chapter.id in selectedIds }.orEmpty()
 		menu.findItem(R.id.action_save).isVisible = items.none { x ->
 			x.chapter.source == MangaSource.LOCAL
@@ -214,10 +169,8 @@ class ChaptersFragment :
 		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
@@ -274,4 +227,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
@@ -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.search.ui.global.GlobalSearchActivity
-import org.koitharu.kotatsu.utils.ShareHelper
+import org.koitharu.kotatsu.scrobbling.ui.selector.ScrobblingSelectorBottomSheet
+import org.koitharu.kotatsu.search.ui.multi.MultiSearchActivity
 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>(),
@@ -83,6 +84,9 @@ class DetailsActivity :
 		viewModel.newChaptersCount.observe(this, ::onNewChaptersChanged)
 		viewModel.onMangaRemoved.observe(this, ::onMangaRemoved)
 		viewModel.onError.observe(this, ::onError)
+		viewModel.onShowToast.observe(this) {
+			binding.snackbar.show(messageText = getString(it))
+		}
 
 		registerReceiver(downloadReceiver, IntentFilter(DownloadService.ACTION_DOWNLOAD_COMPLETE))
 	}
@@ -114,6 +118,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))
 			}
@@ -151,28 +170,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)
@@ -205,7 +211,13 @@ class DetailsActivity :
 		}
 		R.id.action_related -> {
 			viewModel.manga.value?.let {
-				startActivity(GlobalSearchActivity.newIntent(this, it.title))
+				startActivity(MultiSearchActivity.newIntent(this, it.title))
+			}
+			true
+		}
+		R.id.action_shiki_track -> {
+			viewModel.manga.value?.let {
+				ScrobblingSelectorBottomSheet.show(supportFragmentManager, it)
 			}
 			true
 		}

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

@@ -8,23 +8,34 @@ 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
 import org.koitharu.kotatsu.base.ui.BaseFragment
+import org.koitharu.kotatsu.base.ui.list.OnListItemClickListener
+import org.koitharu.kotatsu.base.ui.list.decor.SpacingItemDecoration
 import org.koitharu.kotatsu.base.ui.widgets.ChipsView
+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.favourites.ui.categories.select.FavouriteCategoriesDialog
+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
@@ -32,25 +43,23 @@ 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 :
 	BaseFragment<FragmentDetailsBinding>(),
 	View.OnClickListener,
 	View.OnLongClickListener,
-	ChipsView.OnChipClickListener {
+	ChipsView.OnChipClickListener,
+	OnListItemClickListener<Bookmark> {
 
 	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?,
@@ -63,17 +72,35 @@ 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)
 		viewModel.isLoading.observe(viewLifecycleOwner, ::onLoadingStateChanged)
 		viewModel.favouriteCategories.observe(viewLifecycleOwner, ::onFavouriteChanged)
 		viewModel.readingHistory.observe(viewLifecycleOwner, ::onHistoryChanged)
+		viewModel.bookmarks.observe(viewLifecycleOwner, ::onBookmarksChanged)
+		viewModel.scrobblingInfo.observe(viewLifecycleOwner, ::onScrobblingInfoChanged)
+		viewModel.description.observe(viewLifecycleOwner, ::onDescriptionChanged)
+		addMenuProvider(DetailsMenuProvider())
 	}
 
-	override fun onCreateOptionsMenu(menu: Menu, inflater: MenuInflater) {
-		super.onCreateOptionsMenu(menu, inflater)
-		inflater.inflate(R.menu.opt_details_info, menu)
+	override fun onItemClick(item: Bookmark, view: View) {
+		val options = ActivityOptions.makeScaleUpAnimation(view, 0, 0, view.width, view.height)
+		startActivity(ReaderActivity.newIntent(view.context, item), options.toBundle())
+	}
+
+	override fun onItemLongClick(item: Bookmark, view: View): Boolean {
+		val menu = PopupMenu(view.context, view)
+		menu.inflate(R.menu.popup_bookmark)
+		menu.setOnMenuItemClickListener { menuItem ->
+			when (menuItem.itemId) {
+				R.id.action_remove -> viewModel.removeBookmark(item)
+			}
+			true
+		}
+		menu.show()
+		return true
 	}
 
 	private fun onMangaUpdated(manga: Manga) {
@@ -83,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 {
@@ -147,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) {
@@ -157,6 +190,7 @@ class DetailsFragment :
 				setIconResource(R.drawable.ic_play)
 			}
 		}
+		binding.progressView.setPercent(history?.percent ?: PROGRESS_NONE, animate = true)
 	}
 
 	private fun onFavouriteChanged(isFavourite: Boolean) {
@@ -176,11 +210,52 @@ class DetailsFragment :
 		}
 	}
 
+	private fun onBookmarksChanged(bookmarks: List<Bookmark>) {
+		var adapter = binding.recyclerViewBookmarks.adapter as? BookmarksAdapter
+		binding.groupBookmarks.isGone = bookmarks.isEmpty()
+		if (adapter != null) {
+			adapter.items = bookmarks
+		} else {
+			adapter = BookmarksAdapter(coil, viewLifecycleOwner, this)
+			adapter.items = bookmarks
+			binding.recyclerViewBookmarks.adapter = adapter
+			val spacing = resources.getDimensionPixelOffset(R.dimen.bookmark_list_spacing)
+			binding.recyclerViewBookmarks.addItemDecoration(SpacingItemDecoration(spacing))
+		}
+	}
+
+	private fun onScrobblingInfoChanged(scrobbling: ScrobblingInfo?) {
+		with(binding.scrobblingLayout) {
+			root.isVisible = scrobbling != null
+			if (scrobbling == null) {
+				CoilUtils.dispose(imageViewCover)
+				return
+			}
+			imageViewCover.newImageRequest(scrobbling.coverUrl)
+				.crossfade(true)
+				.placeholder(R.drawable.ic_placeholder)
+				.fallback(R.drawable.ic_placeholder)
+				.error(R.drawable.ic_placeholder)
+				.scale(Scale.FILL)
+				.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 -> {
-				FavouriteCategoriesDialog.show(childFragmentManager, manga)
+				FavouriteCategoriesBottomSheet.show(childFragmentManager, manga)
+			}
+			R.id.scrobbling_layout -> {
+				ScrobblingInfoBottomSheet.show(childFragmentManager)
 			}
 			R.id.button_read -> {
 				val chapterId = viewModel.readingHistory.value?.chapterId
@@ -206,13 +281,9 @@ class DetailsFragment :
 				)
 			}
 			R.id.imageView_cover -> {
-				val options = ActivityOptions.makeSceneTransitionAnimation(
-					requireActivity(),
-					binding.imageViewCover,
-					binding.imageViewCover.transitionName,
-				)
+				val options = ActivityOptions.makeScaleUpAnimation(v, 0, 0, v.width, v.height)
 				startActivity(
-					ImageActivity.newIntent(v.context, manga.largeCoverUrl ?: manga.coverUrl),
+					ImageActivity.newIntent(v.context, manga.largeCoverUrl.ifNullOrEmpty { manga.coverUrl }),
 					options.toBundle()
 				)
 			}
@@ -278,20 +349,42 @@ class DetailsFragment :
 	}
 
 	private fun loadCover(manga: Manga) {
-		val currentCover = binding.imageViewCover.drawable
+		val imageUrl = manga.largeCoverUrl.ifNullOrEmpty { manga.coverUrl }
+		val lastResult = CoilUtils.result(binding.imageViewCover)
+		if (lastResult?.request?.data == imageUrl) {
+			return
+		}
 		val request = ImageRequest.Builder(context ?: return)
 			.target(binding.imageViewCover)
-		if (currentCover != null) {
-			request.data(manga.largeCoverUrl ?: return)
-				.placeholderMemoryCacheKey(CoilUtils.metadata(binding.imageViewCover)?.memoryCacheKey)
-				.fallback(currentCover)
-		} else {
-			request.crossfade(true)
-				.data(manga.coverUrl)
-				.fallback(R.drawable.ic_placeholder)
-		}
-		request.referer(manga.publicUrl)
+			.data(imageUrl)
+			.crossfade(true)
+			.referer(manga.publicUrl)
 			.lifecycle(viewLifecycleOwner)
-			.enqueueWith(coil)
+		lastResult?.drawable?.let {
+			request.fallback(it)
+		} ?: 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,6 +1,8 @@
 package org.koitharu.kotatsu.details.ui
 
-import androidx.core.os.LocaleListCompat
+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
@@ -9,113 +11,126 @@ import kotlinx.coroutines.Job
 import kotlinx.coroutines.flow.*
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.plus
-import org.koitharu.kotatsu.BuildConfig
+import org.koitharu.kotatsu.R
 import org.koitharu.kotatsu.base.domain.MangaDataRepository
 import org.koitharu.kotatsu.base.domain.MangaIntent
 import org.koitharu.kotatsu.base.ui.BaseViewModel
-import org.koitharu.kotatsu.core.exceptions.MangaNotFoundException
-import org.koitharu.kotatsu.core.parser.MangaRepository
+import org.koitharu.kotatsu.bookmarks.domain.Bookmark
+import org.koitharu.kotatsu.bookmarks.domain.BookmarksRepository
 import org.koitharu.kotatsu.core.prefs.AppSettings
+import org.koitharu.kotatsu.core.prefs.observeAsFlow
+import org.koitharu.kotatsu.details.domain.BranchComparator
 import org.koitharu.kotatsu.details.ui.model.ChapterListItem
-import org.koitharu.kotatsu.details.ui.model.toListItem
 import org.koitharu.kotatsu.favourites.domain.FavouritesRepository
 import org.koitharu.kotatsu.history.domain.HistoryRepository
 import org.koitharu.kotatsu.local.domain.LocalMangaRepository
 import org.koitharu.kotatsu.parsers.model.Manga
-import org.koitharu.kotatsu.parsers.model.MangaChapter
 import org.koitharu.kotatsu.parsers.model.MangaSource
 import org.koitharu.kotatsu.parsers.util.mapToSet
-import org.koitharu.kotatsu.parsers.util.toTitleCase
+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
-import org.koitharu.kotatsu.utils.ext.iterator
+import org.koitharu.kotatsu.utils.ext.printStackTraceDebug
 import java.io.IOException
 
 class DetailsViewModel(
-	private val intent: MangaIntent,
+	intent: MangaIntent,
 	private val historyRepository: HistoryRepository,
-	private val favouritesRepository: FavouritesRepository,
+	favouritesRepository: FavouritesRepository,
 	private val localMangaRepository: LocalMangaRepository,
-	private val trackingRepository: TrackingRepository,
-	private val mangaDataRepository: MangaDataRepository,
+	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(
+		intent = intent,
+		settings = settings,
+		mangaDataRepository = mangaDataRepository,
+		historyRepository = historyRepository,
+		localMangaRepository = localMangaRepository,
+	)
+
 	private var loadingJob: Job
-	private val mangaData = MutableStateFlow(intent.manga)
-	private val selectedBranch = MutableStateFlow<String?>(null)
 
-	private val history = mangaData.mapNotNull { it?.id }
-		.distinctUntilChanged()
-		.flatMapLatest { mangaId ->
-			historyRepository.observeOne(mangaId)
-		}.stateIn(viewModelScope + Dispatchers.Default, SharingStarted.Eagerly, null)
+	val onShowToast = SingleLiveEvent<Int>()
 
-	private val favourite = mangaData.mapNotNull { it?.id }
-		.distinctUntilChanged()
-		.flatMapLatest { mangaId ->
-			favouritesRepository.observeCategoriesIds(mangaId).map { it.isNotEmpty() }
-		}.stateIn(viewModelScope + Dispatchers.Default, SharingStarted.Eagerly, false)
+	private val history = historyRepository.observeOne(delegate.mangaId)
+		.stateIn(viewModelScope + Dispatchers.Default, SharingStarted.Eagerly, null)
 
-	private val newChapters = mangaData.mapNotNull { it?.id }
-		.distinctUntilChanged()
-		.mapLatest { mangaId ->
-			trackingRepository.getNewChaptersCount(mangaId)
-		}.stateIn(viewModelScope + Dispatchers.Default, SharingStarted.Eagerly, 0)
-
-	// Remote manga for saved and saved for remote
-	private val relatedManga = MutableStateFlow<Manga?>(null)
-	private val chaptersQuery = MutableStateFlow("")
-
-	private val chaptersReversed = settings.observe()
-		.filter { it == AppSettings.KEY_REVERSE_CHAPTERS }
-		.map { settings.chaptersReverse }
-		.onStart { emit(settings.chaptersReverse) }
+	private val favourite = favouritesRepository.observeCategoriesIds(delegate.mangaId).map { it.isNotEmpty() }
 		.stateIn(viewModelScope + Dispatchers.Default, SharingStarted.Eagerly, false)
 
-	val manga = mangaData.filterNotNull()
-		.asLiveData(viewModelScope.coroutineContext)
-	val favouriteCategories = favourite
-		.asLiveData(viewModelScope.coroutineContext)
-	val newChaptersCount = newChapters
-		.asLiveData(viewModelScope.coroutineContext)
-	val readingHistory = history
-		.asLiveData(viewModelScope.coroutineContext)
-	val isChaptersReversed = chaptersReversed
-		.asLiveData(viewModelScope.coroutineContext)
+	private val newChapters = trackingRepository.observeNewChaptersCount(delegate.mangaId)
+		.stateIn(viewModelScope + Dispatchers.Default, SharingStarted.Eagerly, 0)
+
+	private val chaptersQuery = MutableStateFlow("")
+
+	private val chaptersReversed = settings.observeAsFlow(AppSettings.KEY_REVERSE_CHAPTERS) { chaptersReverse }
+		.stateIn(viewModelScope + Dispatchers.Default, SharingStarted.Eagerly, false)
+
+	val manga = delegate.manga.filterNotNull().asLiveData(viewModelScope.coroutineContext)
+	val favouriteCategories = favourite.asLiveData(viewModelScope.coroutineContext)
+	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, 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 branches = mangaData.map {
-		it?.chapters?.mapToSet { x -> x.branch }?.sortedBy { x -> x }.orEmpty()
+	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()
+		chapters.mapToSet { x -> x.branch }.sortedWith(BranchComparator())
 	}.asLiveDataDistinct(viewModelScope.coroutineContext + Dispatchers.Default)
 
 	val selectedBranchIndex = combine(
 		branches.asFlow(),
-		selectedBranch
+		delegate.selectedBranch
 	) { branches, selected ->
 		branches.indexOf(selected)
 	}.asLiveDataDistinct(viewModelScope.coroutineContext + Dispatchers.Default)
 
-	val isChaptersEmpty = mangaData.mapNotNull { m ->
-		m?.run { 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(
-			mangaData.map { it?.chapters.orEmpty() },
-			relatedManga,
-			history.map { it?.chapterId },
+			delegate.manga,
+			delegate.relatedManga,
+			history,
+			delegate.selectedBranch,
 			newChapters,
-			selectedBranch
-		) { chapters, related, currentId, newCount, branch ->
-			val relatedChapters = related?.chapters
-			if (related?.source != MangaSource.LOCAL && !relatedChapters.isNullOrEmpty()) {
-				mapChaptersWithSource(chapters, relatedChapters, currentId, newCount, branch)
-			} else {
-				mapChapters(chapters, relatedChapters, currentId, newCount, branch)
-			}
+		) { manga, related, history, branch, news ->
+			delegate.mapChapters(manga, related, history, news, branch)
 		},
 		chaptersReversed,
 		chaptersQuery,
@@ -124,7 +139,7 @@ class DetailsViewModel(
 	}.asLiveData(viewModelScope.coroutineContext + Dispatchers.Default)
 
 	val selectedBranchValue: String?
-		get() = selectedBranch.value
+		get() = delegate.selectedBranch.value
 
 	init {
 		loadingJob = doLoad()
@@ -136,7 +151,11 @@ class DetailsViewModel(
 	}
 
 	fun deleteLocal() {
-		val m = mangaData.value ?: return
+		val m = delegate.manga.value
+		if (m == null) {
+			onShowToast.call(R.string.file_not_found)
+			return
+		}
 		launchLoadingJob(Dispatchers.Default) {
 			val manga = if (m.source == MangaSource.LOCAL) m else localMangaRepository.findSavedManga(m)
 			checkNotNull(manga) { "Cannot find saved manga for ${m.title}" }
@@ -149,16 +168,23 @@ class DetailsViewModel(
 		}
 	}
 
+	fun removeBookmark(bookmark: Bookmark) {
+		launchJob {
+			bookmarksRepository.removeBookmark(bookmark.manga.id, bookmark.pageId)
+			onShowToast.call(R.string.bookmark_removed)
+		}
+	}
+
 	fun setChaptersReversed(newValue: Boolean) {
 		settings.chaptersReverse = newValue
 	}
 
 	fun setSelectedBranch(branch: String?) {
-		selectedBranch.value = branch
+		delegate.selectedBranch.value = branch
 	}
 
 	fun getRemoteManga(): Manga? {
-		return relatedManga.value?.takeUnless { it.source == MangaSource.LOCAL }
+		return delegate.relatedManga.value?.takeUnless { it.source == MangaSource.LOCAL }
 	}
 
 	fun performChapterSearch(query: String?) {
@@ -166,7 +192,7 @@ class DetailsViewModel(
 	}
 
 	fun onDownloadComplete(downloadedManga: Manga) {
-		val currentManga = mangaData.value ?: return
+		val currentManga = delegate.manga.value ?: return
 		if (currentManga.id != downloadedManga.id) {
 			return
 		}
@@ -177,142 +203,35 @@ class DetailsViewModel(
 				runCatching {
 					localMangaRepository.getDetails(downloadedManga)
 				}.onSuccess {
-					relatedManga.value = it
+					delegate.relatedManga.value = it
 				}.onFailure {
-					if (BuildConfig.DEBUG) {
-						it.printStackTrace()
-					}
+					it.printStackTraceDebug()
 				}
 			}
 		}
 	}
 
+	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) {
-		var manga = mangaDataRepository.resolveIntent(intent)
-			?: throw MangaNotFoundException("Cannot find manga")
-		mangaData.value = manga
-		manga = MangaRepository(manga.source).getDetails(manga)
-		// find default branch
-		val hist = historyRepository.getOne(manga)
-		selectedBranch.value = if (hist != null) {
-			val currentChapter = manga.chapters?.find { it.id == hist.chapterId }
-			if (currentChapter != null) currentChapter.branch else predictBranch(manga.chapters)
-		} else {
-			predictBranch(manga.chapters)
-		}
-		mangaData.value = manga
-		relatedManga.value = runCatching {
-			if (manga.source == MangaSource.LOCAL) {
-				val m = localMangaRepository.getRemoteManga(manga) ?: return@runCatching null
-				MangaRepository(m.source).getDetails(m)
-			} else {
-				localMangaRepository.findSavedManga(manga)
-			}
-		}.onFailure { error ->
-			if (BuildConfig.DEBUG) error.printStackTrace()
-		}.getOrNull()
-	}
-
-	private fun mapChapters(
-		chapters: List<MangaChapter>,
-		downloadedChapters: List<MangaChapter>?,
-		currentId: Long?,
-		newCount: Int,
-		branch: String?,
-	): List<ChapterListItem> {
-		val result = ArrayList<ChapterListItem>(chapters.size)
-		val dateFormat = settings.getDateFormat()
-		val currentIndex = chapters.indexOfFirst { it.id == currentId }
-		val firstNewIndex = chapters.size - newCount
-		val downloadedIds = downloadedChapters?.mapToSet { it.id }
-		for (i in chapters.indices) {
-			val chapter = chapters[i]
-			if (chapter.branch != branch) {
-				continue
-			}
-			result += chapter.toListItem(
-				isCurrent = i == currentIndex,
-				isUnread = i > currentIndex,
-				isNew = i >= firstNewIndex,
-				isMissing = false,
-				isDownloaded = downloadedIds?.contains(chapter.id) == true,
-				dateFormat = dateFormat,
-			)
-		}
-		return result
-	}
-
-	private fun mapChaptersWithSource(
-		chapters: List<MangaChapter>,
-		sourceChapters: List<MangaChapter>,
-		currentId: Long?,
-		newCount: Int,
-		branch: String?,
-	): List<ChapterListItem> {
-		val chaptersMap = chapters.associateByTo(HashMap(chapters.size)) { it.id }
-		val result = ArrayList<ChapterListItem>(sourceChapters.size)
-		val currentIndex = sourceChapters.indexOfFirst { it.id == currentId }
-		val firstNewIndex = sourceChapters.size - newCount
-		val dateFormat = settings.getDateFormat()
-		for (i in sourceChapters.indices) {
-			val chapter = sourceChapters[i]
-			val localChapter = chaptersMap.remove(chapter.id)
-			if (chapter.branch != branch) {
-				continue
-			}
-			result += localChapter?.toListItem(
-				isCurrent = i == currentIndex,
-				isUnread = i > currentIndex,
-				isNew = i >= firstNewIndex,
-				isMissing = false,
-				isDownloaded = false,
-				dateFormat = dateFormat,
-			) ?: chapter.toListItem(
-				isCurrent = i == currentIndex,
-				isUnread = i > currentIndex,
-				isNew = i >= firstNewIndex,
-				isMissing = true,
-				isDownloaded = false,
-				dateFormat = dateFormat,
-			)
-		}
-		if (chaptersMap.isNotEmpty()) { // some chapters on device but not online source
-			result.ensureCapacity(result.size + chaptersMap.size)
-			chaptersMap.values.mapNotNullTo(result) {
-				if (it.branch == branch) {
-					it.toListItem(
-						isCurrent = false,
-						isUnread = true,
-						isNew = false,
-						isMissing = false,
-						isDownloaded = false,
-						dateFormat = dateFormat,
-					)
-				} else {
-					null
-				}
-			}
-			result.sortBy { it.chapter.number }
-		}
-		return result
-	}
-
-	private fun predictBranch(chapters: List<MangaChapter>?): String? {
-		if (chapters.isNullOrEmpty()) {
-			return null
-		}
-		val groups = chapters.groupBy { it.branch }
-		for (locale in LocaleListCompat.getAdjustedDefault()) {
-			var language = locale.getDisplayLanguage(locale).toTitleCase(locale)
-			if (groups.containsKey(language)) {
-				return language
-			}
-			language = locale.getDisplayName(locale).toTitleCase(locale)
-			if (groups.containsKey(language)) {
-				return language
-			}
-		}
-		return groups.maxByOrNull { it.value.size }?.key
+		delegate.doLoad()
 	}
 
 	private fun List<ChapterListItem>.filterSearch(query: String): List<ChapterListItem> {

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

@@ -0,0 +1,189 @@
+package org.koitharu.kotatsu.details.ui
+
+import androidx.core.os.LocaleListCompat
+import kotlinx.coroutines.flow.MutableStateFlow
+import kotlinx.coroutines.flow.StateFlow
+import org.acra.ACRA
+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
+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.ParseException
+import org.koitharu.kotatsu.parsers.model.Manga
+import org.koitharu.kotatsu.parsers.model.MangaChapter
+import org.koitharu.kotatsu.parsers.model.MangaSource
+import org.koitharu.kotatsu.parsers.util.mapToSet
+import org.koitharu.kotatsu.parsers.util.toTitleCase
+import org.koitharu.kotatsu.utils.ext.iterator
+import org.koitharu.kotatsu.utils.ext.printStackTraceDebug
+import org.koitharu.kotatsu.utils.ext.setCurrentManga
+
+class MangaDetailsDelegate(
+	private val intent: MangaIntent,
+	private val settings: AppSettings,
+	private val mangaDataRepository: MangaDataRepository,
+	private val historyRepository: HistoryRepository,
+	private val localMangaRepository: LocalMangaRepository,
+) {
+
+	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?>
+		get() = mangaData
+	val mangaId = intent.manga?.id ?: intent.mangaId
+
+	suspend fun doLoad() {
+		var manga = mangaDataRepository.resolveIntent(intent)
+			?: throw MangaNotFoundException("Cannot find manga")
+		ACRA.setCurrentManga(manga)
+		mangaData.value = manga
+		manga = MangaRepository(manga.source).getDetails(manga)
+		// find default branch
+		val hist = historyRepository.getOne(manga)
+		selectedBranch.value = if (hist != null) {
+			val currentChapter = manga.chapters?.find { it.id == hist.chapterId }
+			if (currentChapter != null) currentChapter.branch else predictBranch(manga.chapters)
+		} else {
+			predictBranch(manga.chapters)
+		}
+		mangaData.value = manga
+		relatedManga.value = runCatching {
+			if (manga.source == MangaSource.LOCAL) {
+				val m = localMangaRepository.getRemoteManga(manga) ?: return@runCatching null
+				MangaRepository(m.source).getDetails(m)
+			} else {
+				localMangaRepository.findSavedManga(manga)
+			}
+		}.onFailure { error ->
+			error.printStackTraceDebug()
+		}.getOrNull()
+	}
+
+	fun mapChapters(
+		manga: Manga?,
+		related: Manga?,
+		history: MangaHistory?,
+		newCount: Int,
+		branch: String?,
+	): List<ChapterListItem> {
+		val chapters = manga?.chapters ?: return emptyList()
+		val relatedChapters = related?.chapters
+		return if (related?.source != MangaSource.LOCAL && !relatedChapters.isNullOrEmpty()) {
+			mapChaptersWithSource(chapters, relatedChapters, history?.chapterId, newCount, branch)
+		} else {
+			mapChapters(chapters, relatedChapters, history?.chapterId, newCount, branch)
+		}
+	}
+
+	private fun mapChapters(
+		chapters: List<MangaChapter>,
+		downloadedChapters: List<MangaChapter>?,
+		currentId: Long?,
+		newCount: Int,
+		branch: String?,
+	): List<ChapterListItem> {
+		val result = ArrayList<ChapterListItem>(chapters.size)
+		val dateFormat = settings.getDateFormat()
+		val currentIndex = chapters.indexOfFirst { it.id == currentId }
+		val firstNewIndex = chapters.size - newCount
+		val downloadedIds = downloadedChapters?.mapToSet { it.id }
+		for (i in chapters.indices) {
+			val chapter = chapters[i]
+			if (chapter.branch != branch) {
+				continue
+			}
+			result += chapter.toListItem(
+				isCurrent = i == currentIndex,
+				isUnread = i > currentIndex,
+				isNew = i >= firstNewIndex,
+				isMissing = false,
+				isDownloaded = downloadedIds?.contains(chapter.id) == true,
+				dateFormat = dateFormat,
+			)
+		}
+		return result
+	}
+
+	private fun mapChaptersWithSource(
+		chapters: List<MangaChapter>,
+		sourceChapters: List<MangaChapter>,
+		currentId: Long?,
+		newCount: Int,
+		branch: String?,
+	): List<ChapterListItem> {
+		val chaptersMap = chapters.associateByTo(HashMap(chapters.size)) { it.id }
+		val result = ArrayList<ChapterListItem>(sourceChapters.size)
+		val currentIndex = sourceChapters.indexOfFirst { it.id == currentId }
+		val firstNewIndex = sourceChapters.size - newCount
+		val dateFormat = settings.getDateFormat()
+		for (i in sourceChapters.indices) {
+			val chapter = sourceChapters[i]
+			val localChapter = chaptersMap.remove(chapter.id)
+			if (chapter.branch != branch) {
+				continue
+			}
+			result += localChapter?.toListItem(
+				isCurrent = i == currentIndex,
+				isUnread = i > currentIndex,
+				isNew = i >= firstNewIndex,
+				isMissing = false,
+				isDownloaded = false,
+				dateFormat = dateFormat,
+			) ?: chapter.toListItem(
+				isCurrent = i == currentIndex,
+				isUnread = i > currentIndex,
+				isNew = i >= firstNewIndex,
+				isMissing = true,
+				isDownloaded = false,
+				dateFormat = dateFormat,
+			)
+		}
+		if (chaptersMap.isNotEmpty()) { // some chapters on device but not online source
+			result.ensureCapacity(result.size + chaptersMap.size)
+			chaptersMap.values.mapNotNullTo(result) {
+				if (it.branch == branch) {
+					it.toListItem(
+						isCurrent = false,
+						isUnread = true,
+						isNew = false,
+						isMissing = false,
+						isDownloaded = false,
+						dateFormat = dateFormat,
+					)
+				} else {
+					null
+				}
+			}
+			result.sortBy { it.chapter.number }
+		}
+		return result
+	}
+
+	private fun predictBranch(chapters: List<MangaChapter>?): String? {
+		if (chapters.isNullOrEmpty()) {
+			return null
+		}
+		val groups = chapters.groupBy { it.branch }
+		for (locale in LocaleListCompat.getAdjustedDefault()) {
+			var language = locale.getDisplayLanguage(locale).toTitleCase(locale)
+			if (groups.containsKey(language)) {
+				return language
+			}
+			language = locale.getDisplayName(locale).toTitleCase(locale)
+			if (groups.containsKey(language)) {
+				return language
+			}
+		}
+		return groups.maxByOrNull { it.value.size }?.key
+	}
+}

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

@@ -1,9 +1,9 @@
 package org.koitharu.kotatsu.details.ui.adapter
 
-import android.view.View
 import androidx.core.view.isVisible
 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.databinding.ItemChapterBinding
 import org.koitharu.kotatsu.details.ui.model.ChapterListItem
@@ -21,11 +21,7 @@ fun chapterListItemAD(
 	{ inflater, parent -> ItemChapterBinding.inflate(inflater, parent, false) }
 ) {
 
-	val eventListener = object : View.OnClickListener, View.OnLongClickListener {
-		override fun onClick(v: View) = clickListener.onItemClick(item, v)
-		override fun onLongClick(v: View) = clickListener.onItemLongClick(item, v)
-	}
-
+	val eventListener = AdapterDelegateClickListenerAdapter(this, clickListener)
 	itemView.setOnClickListener(eventListener)
 	itemView.setOnLongClickListener(eventListener)
 

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/domain/DownloadManager.kt

@@ -12,7 +12,6 @@ import kotlinx.coroutines.sync.Semaphore
 import okhttp3.OkHttpClient
 import okhttp3.Request
 import okio.IOException
-import org.koitharu.kotatsu.BuildConfig
 import org.koitharu.kotatsu.R
 import org.koitharu.kotatsu.core.network.CommonHeaders
 import org.koitharu.kotatsu.core.parser.MangaRepository
@@ -24,6 +23,7 @@ import org.koitharu.kotatsu.parsers.model.Manga
 import org.koitharu.kotatsu.parsers.model.MangaSource
 import org.koitharu.kotatsu.parsers.util.await
 import org.koitharu.kotatsu.utils.ext.deleteAwait
+import org.koitharu.kotatsu.utils.ext.printStackTraceDebug
 import org.koitharu.kotatsu.utils.ext.referer
 import org.koitharu.kotatsu.utils.ext.waitForNetwork
 import org.koitharu.kotatsu.utils.progress.ProgressJob
@@ -156,9 +156,7 @@ class DownloadManager(
 			outState.value = DownloadState.Cancelled(startId, manga, cover)
 			throw e
 		} catch (e: Throwable) {
-			if (BuildConfig.DEBUG) {
-				e.printStackTrace()
-			}
+			e.printStackTraceDebug()
 			outState.value = DownloadState.Error(startId, manga, cover, e)
 		} finally {
 			withContext(NonCancellable) {

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

@@ -3,10 +3,8 @@ package org.koitharu.kotatsu.download.ui
 import android.content.Context
 import android.content.Intent
 import android.os.Bundle
-import android.view.ViewGroup
 import androidx.core.graphics.Insets
 import androidx.core.view.isVisible
-import androidx.core.view.updateLayoutParams
 import androidx.core.view.updatePadding
 import androidx.lifecycle.lifecycleScope
 import kotlinx.coroutines.flow.flatMapLatest
@@ -17,7 +15,7 @@ import org.koin.android.ext.android.get
 import org.koitharu.kotatsu.base.ui.BaseActivity
 import org.koitharu.kotatsu.databinding.ActivityDownloadsBinding
 import org.koitharu.kotatsu.download.ui.service.DownloadService
-import org.koitharu.kotatsu.utils.LifecycleAwareServiceConnection
+import org.koitharu.kotatsu.utils.bindServiceWithLifecycle
 
 class DownloadsActivity : BaseActivity<ActivityDownloadsBinding>() {
 
@@ -28,11 +26,10 @@ class DownloadsActivity : BaseActivity<ActivityDownloadsBinding>() {
 		val adapter = DownloadsAdapter(lifecycleScope, get())
 		binding.recyclerView.setHasFixedSize(true)
 		binding.recyclerView.adapter = adapter
-		LifecycleAwareServiceConnection.bindService(
-			this,
-			this,
-			Intent(this, DownloadService::class.java),
-			0
+		bindServiceWithLifecycle(
+			owner = this,
+			service = Intent(this, DownloadService::class.java),
+			flags = 0,
 		).service.flatMapLatest { binder ->
 			(binder as? DownloadService.DownloadBinder)?.downloads ?: flowOf(null)
 		}.onEach {

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) {
 
@@ -59,6 +58,13 @@ class DownloadNotification(private val context: Context, startId: Int) {
 		builder.setStyle(null)
 		builder.setLargeIcon(state.cover?.toBitmap())
 		builder.clearActions()
+		builder.setVisibility(
+			if (state.manga.isNsfw) {
+				NotificationCompat.VISIBILITY_PRIVATE
+			} else {
+				NotificationCompat.VISIBILITY_PUBLIC
+			}
+		)
 		when (state) {
 			is DownloadState.Cancelled -> {
 				builder.setProgress(1, 0, true)
@@ -85,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/download/ui/service/DownloadService.kt

@@ -99,39 +99,42 @@ class DownloadService : BaseService() {
 	private fun listenJob(job: ProgressJob<DownloadState>) {
 		lifecycleScope.launch {
 			val startId = job.progressValue.startId
-			val timeLeftEstimator = TimeLeftEstimator()
 			val notification = DownloadNotification(this@DownloadService, startId)
-			notificationSwitcher.notify(startId, notification.create(job.progressValue, -1L))
-			job.progressAsFlow()
-				.onEach { state ->
-					if (state is DownloadState.Progress) {
-						timeLeftEstimator.tick(value = state.progress, total = state.max)
-					} else {
-						timeLeftEstimator.emptyTick()
+			try {
+				val timeLeftEstimator = TimeLeftEstimator()
+				notificationSwitcher.notify(startId, notification.create(job.progressValue, -1L))
+				job.progressAsFlow()
+					.onEach { state ->
+						if (state is DownloadState.Progress) {
+							timeLeftEstimator.tick(value = state.progress, total = state.max)
+						} else {
+							timeLeftEstimator.emptyTick()
+						}
 					}
+					.throttle { state -> if (state is DownloadState.Progress) 400L else 0L }
+					.whileActive()
+					.collect { state ->
+						val timeLeft = timeLeftEstimator.getEstimatedTimeLeft()
+						notificationSwitcher.notify(startId, notification.create(state, timeLeft))
+					}
+				job.join()
+			} finally {
+				(job.progressValue as? DownloadState.Done)?.let {
+					sendBroadcast(
+						Intent(ACTION_DOWNLOAD_COMPLETE)
+							.putExtra(EXTRA_MANGA, ParcelableManga(it.localManga, withChapters = false))
+					)
 				}
-				.throttle { state -> if (state is DownloadState.Progress) 400L else 0L }
-				.whileActive()
-				.collect { state ->
-					val timeLeft = timeLeftEstimator.getEstimatedTimeLeft()
-					notificationSwitcher.notify(startId, notification.create(state, timeLeft))
-				}
-			job.join()
-			(job.progressValue as? DownloadState.Done)?.let {
-				sendBroadcast(
-					Intent(ACTION_DOWNLOAD_COMPLETE)
-						.putExtra(EXTRA_MANGA, ParcelableManga(it.localManga, withChapters = false))
+				notificationSwitcher.detach(
+					startId,
+					if (job.isCancelled) {
+						null
+					} else {
+						notification.create(job.progressValue, -1L)
+					}
 				)
+				stopSelf(startId)
 			}
-			notificationSwitcher.detach(
-				startId,
-				if (job.isCancelled) {
-					null
-				} else {
-					notification.create(job.progressValue, -1L)
-				}
-			)
-			stopSelf(startId)
 		}
 	}
 

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

@@ -4,19 +4,21 @@ import org.koin.androidx.viewmodel.dsl.viewModel
 import org.koin.dsl.module
 import org.koitharu.kotatsu.favourites.domain.FavouritesRepository
 import org.koitharu.kotatsu.favourites.ui.categories.FavouritesCategoriesViewModel
+import org.koitharu.kotatsu.favourites.ui.categories.edit.FavouritesCategoryEditViewModel
 import org.koitharu.kotatsu.favourites.ui.categories.select.MangaCategoriesViewModel
 import org.koitharu.kotatsu.favourites.ui.list.FavouritesListViewModel
 
 val favouritesModule
 	get() = module {
 
-		single { FavouritesRepository(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 ->
 			MangaCategoriesViewModel(manga.get(), get())
 		}
+		viewModel { params -> FavouritesCategoryEditViewModel(params[0], get(), get()) }
 	}