Fix browse comfortable grid

* Remove language detection

* Ignore casing for tag detection

Co-authored-by: she11sh0cked <she11sh0cked@users.noreply.github.com>

.editorconfig

@@ -1,7 +0,0 @@
-[*.{kt,kts}]
-indent_size=4
-insert_final_newline=true
-ij_kotlin_allow_trailing_comma=true
-ij_kotlin_allow_trailing_comma_on_call_site=true
-ij_kotlin_name_count_to_use_star_import = 2147483647
-ij_kotlin_name_count_to_use_star_import_for_members = 2147483647

.github/CONTRIBUTING.md

@@ -0,0 +1,33 @@
+1. **Before reporting a new issue, take a look at the [FAQ](https://tachiyomi.org/help/faq/), the [changelog](https://github.com/inorichi/tachiyomi/releases) and the already opened [issues](https://github.com/inorichi/tachiyomi/issues).**
+2. If you are unsure, ask here: [![Discord](https://img.shields.io/discord/349436576037732353.svg)](https://discord.gg/tachiyomi)
+3. What is your type of issue?
+    * [Catalogue request](#catalogue-requests)
+    * [Bugs](#bugs)
+    * [Feature requests](#feature-requests)
+    * [Translations](https://tachiyomi.org/help/contribution/#translation)
+4. After following 1. and 3. you can [open your issue](https://github.com/inorichi/tachiyomi/issues/new)
+
+***
+
+# Catalogue requests
+
+* Catalogue requests should be created at https://github.com/inorichi/tachiyomi-extensions#readme, not here
+
+# Bugs
+* Include version (Setting > About > Version)
+ * If not latest, try updating, it may have already been solved
+ * Dev version is equal to the number of commits as seen in the main page
+* Include steps to reproduce (if not obvious from description)
+* Include screenshot (if needed)
+* If it could be device-dependent, try reproducing on another device (if possible)
+* For large logs use http://pastebin.com/ (or similar)
+* Don't group unrelated requests into one issue
+
+DO: https://github.com/inorichi/tachiyomi/issues/24 https://github.com/inorichi/tachiyomi/issues/71
+
+DON'T: https://github.com/inorichi/tachiyomi/issues/75
+
+# Feature requests
+
+* Write a detailed issue, explaining what it should do or how. Avoid writing just "like X app does"
+* Include screenshot (if needed)

.github/FUNDING.yml

@@ -1 +1,2 @@
+github: inorichi
 ko_fi: inorichi

.github/ISSUE_TEMPLATE.md

@@ -2,21 +2,15 @@
 
 I acknowledge that:
 
-- I have updated:
-  - To the latest version of the app (stable is v0.14.6)
-  - All extensions
-- I have tried the troubleshooting guide: https://tachiyomi.org/help/guides/troubleshooting-problems/
-- If this is an issue with an extension, that I should be opening an issue in https://github.com/tachiyomiorg/tachiyomi-extensions
-- 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.
+- I have updated to the latest version of the app (stable is v0.9.2)
+- I have updated all extensions
+- If this is an issue with an extension, that I should be opening an issue in https://github.com/inorichi/tachiyomi-extensions
 
 **DELETE THIS SECTION IF YOU HAVE READ AND ACKNOWLEDGED IT**
 
 ---
 
-## Device information
+### Device information
 * Tachiyomi version: ?
 * Android version: ?
 * Device: ?
@@ -30,5 +24,3 @@ Note that the issue will be automatically closed if you do not fill out the titl
 
 ## Other details
 Additional details and attachments.
-
-If you're experiencing crashes, share the crash logs from More → Settings → Advanced → Dump crash logs.

.github/ISSUE_TEMPLATE/bug_report.md

@@ -0,0 +1,36 @@
+---
+name: "🐞 Bug report"
+about: Report a bug
+title: "[Bug] Write short description here"
+labels: "bug"
+---
+
+**PLEASE READ THIS**
+
+I acknowledge that:
+
+- I have updated to the latest version of the app (stable is v0.9.2)
+- I have updated all extensions
+- If this is an issue with an extension, that I should be opening an issue in https://github.com/inorichi/tachiyomi-extensions
+
+**DELETE THIS SECTION IF YOU HAVE READ AND ACKNOWLEDGED IT**
+
+---
+
+### Device information
+* Tachiyomi version: ?
+* Android version: ?
+* Device: ?
+
+## Steps to reproduce
+1. First step
+2. Second step
+
+### Expected behavior
+This should happen.
+
+### Actual behavior
+This happened instead.
+
+### Other details
+Additional details and attachments.

.github/ISSUE_TEMPLATE/config.yml

@@ -1,11 +0,0 @@
-blank_issues_enabled: false
-contact_links:
-  - name: ⚠️ Extension/source issue
-    url: https://github.com/tachiyomiorg/tachiyomi-extensions/issues/new/choose
-    about: Issues and requests for extensions and sources should be opened in the tachiyomi-extensions repository instead
-  - name: 📦 Tachiyomi extensions
-    url: https://tachiyomi.org/extensions
-    about: List of all available extensions with download links
-  - name: 🖥️ Tachiyomi website
-    url: https://tachiyomi.org/help/
-    about: Guides, troubleshooting, and answers to common questions

.github/ISSUE_TEMPLATE/feature_request.md

@@ -0,0 +1,24 @@
+---
+name: "🌟 Feature request"
+about: Suggest a feature to improve Tachiyomi
+title: "[Feature Request] Write short description here"
+labels: "feature"
+---
+
+**PLEASE READ THIS**
+
+I acknowledge that:
+
+- I have updated to the latest version of the app (stable is v0.9.2)
+- I have updated all extensions
+- If this is an issue with an extension, that I should be opening an issue in https://github.com/inorichi/tachiyomi-extensions
+
+**DELETE THIS SECTION IF YOU HAVE READ AND ACKNOWLEDGED IT**
+
+---
+
+### Why/User Benefit/User Problem
+(explain why this feature should be added)
+
+### What/Requirements
+(explain how this feature would behave)

.github/ISSUE_TEMPLATE/report_issue.yml

@@ -1,106 +0,0 @@
-name: 🐞 Issue report
-description: Report an issue in Tachiyomi
-labels: [Bug]
-body:
-
-  - type: textarea
-    id: reproduce-steps
-    attributes:
-      label: Steps to reproduce
-      description: Provide an example of the issue.
-      placeholder: |
-        Example:
-          1. First step
-          2. Second step
-          3. Issue here
-    validations:
-      required: true
-
-  - type: textarea
-    id: expected-behavior
-    attributes:
-      label: Expected behavior
-      description: Explain what you should expect to happen.
-      placeholder: |
-        Example:
-          "This should happen..."
-    validations:
-      required: true
-
-  - type: textarea
-    id: actual-behavior
-    attributes:
-      label: Actual behavior
-      description: Explain what actually happens.
-      placeholder: |
-        Example:
-          "This happened instead..."
-    validations:
-      required: true
-
-  - type: textarea
-    id: crash-logs
-    attributes:
-      label: Crash logs
-      description: |
-        If you're experiencing crashes, share the crash logs from **More → Settings → Advanced** then press **Dump crash logs**.
-      placeholder: |
-        You can paste the crash logs in plain text or upload it as an attachment.
-
-  - type: input
-    id: tachiyomi-version
-    attributes:
-      label: Tachiyomi version
-      description: You can find your Tachiyomi version in **More → About**.
-      placeholder: |
-        Example: "0.14.6"
-    validations:
-      required: true
-
-  - type: input
-    id: android-version
-    attributes:
-      label: Android version
-      description: You can find this somewhere in your Android settings.
-      placeholder: |
-        Example: "Android 11"
-    validations:
-      required: true
-
-  - type: input
-    id: device
-    attributes:
-      label: Device
-      description: List your device and model.
-      placeholder: |
-        Example: "Google Pixel 5"
-    validations:
-      required: true
-
-  - type: textarea
-    id: other-details
-    attributes:
-      label: Other details
-      placeholder: |
-        Additional details and attachments.
-
-  - type: checkboxes
-    id: acknowledgements
-    attributes:
-      label: Acknowledgements
-      description: Read this carefully, we will close and ignore your issue if you skimmed through this.
-      options:
-        - label: I have searched the existing issues and this is a new ticket, **NOT** a duplicate or related to another open or closed issue.
-          required: true
-        - label: I have written a short but informative title.
-          required: true
-        - label: If this is an issue with an extension, I should be opening an issue in the [extensions repository](https://github.com/tachiyomiorg/tachiyomi-extensions/issues/new/choose).
-          required: true
-        - label: I have tried the [troubleshooting guide](https://tachiyomi.org/help/guides/troubleshooting/).
-          required: true
-        - label: I have updated the app to version **[0.14.6](https://github.com/tachiyomiorg/tachiyomi/releases/latest)**.
-          required: true
-        - label: I have updated all installed extensions.
-          required: true
-        - label: I will fill out all of the requested information in this form.
-          required: true

.github/ISSUE_TEMPLATE/request_feature.yml

@@ -1,39 +0,0 @@
-name: ⭐ Feature request
-description: Suggest a feature to improve Tachiyomi
-labels: [Feature request]
-body:
-
-  - type: textarea
-    id: feature-description
-    attributes:
-      label: Describe your suggested feature
-      description: How can Tachiyomi be improved?
-      placeholder: |
-        Example:
-          "It should work like this..."
-    validations:
-      required: true
-
-  - type: textarea
-    id: other-details
-    attributes:
-      label: Other details
-      placeholder: |
-        Additional details and attachments.
-
-  - type: checkboxes
-    id: acknowledgements
-    attributes:
-      label: Acknowledgements
-      description: Read this carefully, we will close and ignore your issue if you skimmed through this.
-      options:
-        - label: I have searched the existing issues and this is a new ticket, **NOT** a duplicate or related to another open or closed issue.
-          required: true
-        - label: I have written a short but informative title.
-          required: true
-        - label: If this is an issue with an extension, I should be opening an issue in the [extensions repository](https://github.com/tachiyomiorg/tachiyomi-extensions/issues/new/choose).
-          required: true
-        - label: I have updated the app to version **[0.14.6](https://github.com/tachiyomiorg/tachiyomi/releases/latest)**.
-          required: true
-        - label: I will fill out all of the requested information in this form.
-          required: true

.github/ISSUE_TEMPLATE/source_issue.md

@@ -0,0 +1,8 @@
+---
+name: "Extension/source/catalogue issue"
+about: "Do not open an issue here. See https://github.com/inorichi/tachiyomi-extensions"
+title: "THIS ISSUE IS IN THE WRONG REPO; SEE https://github.com/inorichi/tachiyomi-extensions"
+labels: "catalog"
+---
+
+DO NOT OPEN AN ISSUE IN THIS REPO. SEE https://github.com/inorichi/tachiyomi-extensions

.github/mergify.yml

@@ -1,10 +0,0 @@
-#pull_request_rules:
-#  - name: Automatically merge translations
-#    conditions:
-#      - "author = weblate"
-#      - "-conflict"
-#      - "current-day-of-week = Sat"
-#      - "created-at < 1 day ago"
-#    actions:
-#      merge:
-#        method: squash

.github/pull_request_template.md

@@ -1,12 +0,0 @@
-<!--
-  Please include a summary of the change and which issue is fixed.
-  Also make sure you've tested your code and also done a self-review of it.
-  Don't forget to check all base themes and tablet mode for relevant changes.
-  
-  If your changes are visual, please provide images below:
-
-### Images
-| Image 1 | Image 2 |
-| ------- | ------- |
-| ![](https://github.githubassets.com/images/modules/logos_page/Octocat.png) | ![](https://github.githubassets.com/images/modules/logos_page/Octocat.png) |
--->

.github/renovate.json

@@ -1,12 +0,0 @@
-{
-  "extends": [
-    "config:base"
-  ],
-  "schedule": ["every sunday"],
-  "ignoreDeps": [
-    "androidx.core:core-splashscreen",
-    "com.android.tools:r8",
-    "com.google.guava:guava",
-    "com.github.commandiron:WheelPickerCompose"
-  ]
-}

.github/workflows/PullRequestTester.yml

@@ -0,0 +1,25 @@
+name: Pull Request Checker
+
+on:
+  pull_request:
+
+jobs:
+  apk:
+    name: Generate APK
+    runs-on: ubuntu-18.04
+
+    steps:
+      - uses: actions/checkout@v2
+      - name: set up JDK 1.8
+        uses: actions/setup-java@v1
+        with:
+          java-version: 1.8
+      - name: Get NDK 
+        run: sudo ${ANDROID_HOME}/tools/bin/sdkmanager --install "ndk;20.0.5594570"
+      - name: Build Release APK
+        run: bash ./gradlew assembleDebug --stacktrace
+      - name: Upload APK
+        uses: actions/upload-artifact@v2
+        with:
+          name: TachiyomiSY-${{ github.sha }}.apk
+          path: app/build/outputs/apk/dev/debug/app-dev-debug.apk

.github/workflows/TachiyomiSY-Preview-Builder.yml

@@ -0,0 +1,31 @@
+name: Remote Dispatch Action Initiator
+ 
+on:
+  push:
+  repository_dispatch:
+ 
+jobs:
+  ping-pong:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@master
+        with:
+          fetch-depth: '0'
+      - name: TAG - Bump version and push tag
+        uses: anothrNick/github-tag-action@1.17.2
+        if: github.event.action != 'pong'
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          WITH_V: true
+          RELEASE_BRANCHES: master
+      - name: PING - Dispatch initiating repository event
+        if: github.event.action != 'pong'
+        run: |
+          curl -X POST https://api.github.com/repos/jobobby04/TachiyomiSYPreview/dispatches \
+          -H 'Accept: application/vnd.github.everest-preview+json' \
+          -u ${{ secrets.ACCESS_TOKEN }} \
+          --data '{"event_type": "ping", "client_payload": { "repository": "'"$GITHUB_REPOSITORY"'" }}'
+      - name: ACK - Acknowledge pong from remote repository
+        if: github.event.action == 'pong'
+        run: |
+          echo "PONG received from '${{ github.event.client_payload.repository }}'"

.github/workflows/build_pull_request.yml

@@ -1,39 +0,0 @@
-name: PR build check
-on:
-  pull_request:
-    paths-ignore:
-      - '**.md'
-      - 'i18n/src/main/res/**/strings.xml'
-
-concurrency:
-  group: ${{ github.workflow }}-${{ github.event.pull_request.number }}
-  cancel-in-progress: true
-
-permissions:
-  contents: read
-
-jobs:
-  build:
-    name: Build app
-    runs-on: ubuntu-latest
-
-    steps:
-      - name: Clone repo
-        uses: actions/checkout@v3
-
-      - name: Validate Gradle Wrapper
-        uses: gradle/wrapper-validation-action@v1
-
-      - name: Dependency Review
-        uses: actions/dependency-review-action@v3
-
-      - name: Set up JDK 11
-        uses: actions/setup-java@v3
-        with:
-          java-version: 11
-          distribution: adopt
-
-      - name: Build app and run unit tests
-        uses: gradle/gradle-command-action@v2
-        with:
-          arguments: lintKotlin assembleStandardRelease testStandardReleaseUnitTest

.github/workflows/build_push.yml

@@ -1,106 +0,0 @@
-name: CI
-on:
-  push:
-    branches:
-      - master
-    tags:
-      - v*
-
-concurrency:
-  group: ${{ github.workflow }}-${{ github.ref }}
-  cancel-in-progress: true
-
-jobs:
-  build:
-    name: Build app
-    runs-on: ubuntu-latest
-
-    steps:
-      - name: Clone repo
-        uses: actions/checkout@v3
-
-      - name: Validate Gradle Wrapper
-        uses: gradle/wrapper-validation-action@v1
-
-      - name: Set up JDK 11
-        uses: actions/setup-java@v3
-        with:
-          java-version: 11
-          distribution: adopt
-
-      - name: Build app and run unit tests
-        uses: gradle/gradle-command-action@v2
-        with:
-          arguments: lintKotlin assembleStandardRelease testStandardReleaseUnitTest
-
-      # Sign APK and create release for tags
-
-      - name: Get tag name
-        if: startsWith(github.ref, 'refs/tags/') && github.repository == 'tachiyomiorg/tachiyomi'
-        run: |
-          set -x
-          echo "VERSION_TAG=${GITHUB_REF/refs\/tags\//}" >> $GITHUB_ENV
-
-      - name: Sign APK
-        if: startsWith(github.ref, 'refs/tags/') && github.repository == 'tachiyomiorg/tachiyomi'
-        uses: r0adkll/sign-android-release@v1
-        with:
-          releaseDirectory: app/build/outputs/apk/standard/release
-          signingKeyBase64: ${{ secrets.SIGNING_KEY }}
-          alias: ${{ secrets.ALIAS }}
-          keyStorePassword: ${{ secrets.KEY_STORE_PASSWORD }}
-          keyPassword: ${{ secrets.KEY_PASSWORD }}
-
-      - name: Clean up build artifacts
-        if: startsWith(github.ref, 'refs/tags/') && github.repository == 'tachiyomiorg/tachiyomi'
-        run: |
-          set -e
-
-          mv app/build/outputs/apk/standard/release/app-standard-universal-release-unsigned-signed.apk tachiyomi-${{ env.VERSION_TAG }}.apk
-          sha=`sha256sum tachiyomi-${{ env.VERSION_TAG }}.apk | awk '{ print $1 }'`
-          echo "APK_UNIVERSAL_SHA=$sha" >> $GITHUB_ENV
-
-          cp app/build/outputs/apk/standard/release/app-standard-arm64-v8a-release-unsigned-signed.apk tachiyomi-arm64-v8a-${{ env.VERSION_TAG }}.apk
-          sha=`sha256sum tachiyomi-arm64-v8a-${{ env.VERSION_TAG }}.apk | awk '{ print $1 }'`
-          echo "APK_ARM64_V8A_SHA=$sha" >> $GITHUB_ENV
-
-          cp app/build/outputs/apk/standard/release/app-standard-armeabi-v7a-release-unsigned-signed.apk tachiyomi-armeabi-v7a-${{ env.VERSION_TAG }}.apk
-          sha=`sha256sum tachiyomi-armeabi-v7a-${{ env.VERSION_TAG }}.apk | awk '{ print $1 }'`
-          echo "APK_ARMEABI_V7A_SHA=$sha" >> $GITHUB_ENV
-
-          cp app/build/outputs/apk/standard/release/app-standard-x86-release-unsigned-signed.apk tachiyomi-x86-${{ env.VERSION_TAG }}.apk
-          sha=`sha256sum tachiyomi-x86-${{ env.VERSION_TAG }}.apk | awk '{ print $1 }'`
-          echo "APK_X86_SHA=$sha" >> $GITHUB_ENV
-          
-          cp app/build/outputs/apk/standard/release/app-standard-x86_64-release-unsigned-signed.apk tachiyomi-x86_64-${{ env.VERSION_TAG }}.apk
-          sha=`sha256sum tachiyomi-x86_64-${{ env.VERSION_TAG }}.apk | awk '{ print $1 }'`
-          echo "APK_X86_64_SHA=$sha" >> $GITHUB_ENV
-
-      - name: Create Release
-        if: startsWith(github.ref, 'refs/tags/') && github.repository == 'tachiyomiorg/tachiyomi'
-        uses: softprops/action-gh-release@v1
-        with:
-          tag_name: ${{ env.VERSION_TAG }}
-          name: Tachiyomi ${{ env.VERSION_TAG }}
-          body: |
-            ---
-
-            ### Checksums
-
-            | Variant | SHA-256 |
-            | ------- | ------- |
-            | Universal | ${{ env.APK_UNIVERSAL_SHA }}
-            | arm64-v8a | ${{ env.APK_ARM64_V8A_SHA }}
-            | armeabi-v7a | ${{ env.APK_ARMEABI_V7A_SHA }}
-            | x86 | ${{ env.APK_X86_SHA }} |
-            | x86_64 | ${{ env.APK_X86_64_SHA }} |
-          files: |
-            tachiyomi-${{ env.VERSION_TAG }}.apk
-            tachiyomi-arm64-v8a-${{ env.VERSION_TAG }}.apk
-            tachiyomi-armeabi-v7a-${{ env.VERSION_TAG }}.apk
-            tachiyomi-x86-${{ env.VERSION_TAG }}.apk
-            tachiyomi-x86_64-${{ env.VERSION_TAG }}.apk
-          draft: true
-          prerelease: false
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/issue_closer.yml

@@ -0,0 +1,13 @@
+name: Issue closer
+on: [issues]
+jobs:
+  autoclose:
+    runs-on: ubuntu-latest
+    steps:
+    - name: Autoclose issue
+      uses: arkon/issue-closer-action@v1.0
+      with:
+        repo-token: ${{ secrets.GITHUB_TOKEN }}
+        issue-close-message: "@${issue.user.login} this issue was automatically closed because it was not filled in correctly or the acknowledgment section was not removed."
+        issue-title-pattern: ".*THIS ISSUE IS IN THE WRONG REPO.*"
+        issue-body-pattern: ".*DELETE THIS SECTION IF YOU HAVE READ AND ACKNOWLEDGED IT.*"

.github/workflows/issue_moderator.yml

@@ -1,35 +0,0 @@
-name: Issue moderator
-
-on:
-  issues:
-    types: [opened, edited, reopened]
-  issue_comment:
-    types: [created]
-
-jobs:
-  moderate:
-    runs-on: ubuntu-latest
-    steps:
-      - name: Moderate issues
-        uses: tachiyomiorg/issue-moderator-action@v1
-        with:
-          repo-token: ${{ secrets.GITHUB_TOKEN }}
-          auto-close-rules: |
-            [
-              {
-                "type": "body",
-                "regex": ".*DELETE THIS SECTION IF YOU HAVE READ AND ACKNOWLEDGED IT.*",
-                "message": "The acknowledgment section was not removed."
-              },
-              {
-                "type": "body",
-                "regex": ".*\\* (Tachiyomi version|Android version|Device): \\?.*",
-                "message": "Requested information in the template was not filled out."
-              },
-              {
-                "type": "both",
-                "regex": "^(?!.*myanimelist.*).*(aniyomi|anime).*$",
-                "ignoreCase": true,
-                "message": "Tachiyomi does not support anime, and has no plans to support anime. In addition Tachiyomi is not affiliated with Aniyomi https://github.com/jmir1/aniyomi"
-              }
-            ]

.github/workflows/lock.yml

@@ -1,19 +0,0 @@
-name: Lock threads
-
-on:
-  # Daily
-  schedule:
-    - cron: '0 0 * * *'
-  # Manual trigger
-  workflow_dispatch:
-    inputs:
-
-jobs:
-  lock:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: dessant/lock-threads@v4
-        with:
-          github-token: ${{ github.token }}
-          issue-inactive-days: '2'
-          pr-inactive-days: '2'

.gitignore

@@ -5,6 +5,8 @@
 .idea/
 *iml
 *.iml
+/mainframer
+/.mainframer
 
 # Built files
 */build
@@ -12,5 +14,10 @@
 *.apk
 app/**/output.json
 
-# Unnecessary file
-*.swp
+# Hebrew assets are copied on build
+app/src/main/res/values-iw/
+
+TODO.md
+CHANGELOG.md
+/captures
+build.sh

.travis.yml

@@ -0,0 +1,81 @@
+dist: trusty
+language: android
+
+android:
+  components:
+    - tools
+    - platform-tools
+    - build-tools-29.0.3
+    - android-29
+    - extra-android-m2repository
+    - extra-google-m2repository
+    - extra-android-support
+    - extra-google-google_play_services
+
+  licenses:
+    - 'android-sdk-license-.+'
+    - 'android-sdk-preview-license-.+'
+
+before_install:
+  - yes | sdkmanager "platforms;android-29" # workaround for accepting the license
+  - if [ "$TRAVIS_PULL_REQUEST" = "false" ]; then
+    openssl aes-256-cbc -K $encrypted_e56be693d4fd_key -iv $encrypted_e56be693d4fd_iv -in "$PWD/.travis/secrets.tar.enc" -out secrets.tar -d;
+    tar xf secrets.tar;
+    mv debug.keystore "$HOME/.android";
+    fi
+  - mkdir "$ANDROID_HOME/licenses" || true
+  - echo -e "\n24333f8a63b6825ea9c5514f83c2829b004d1fee" > "$ANDROID_HOME/licenses/android-sdk-license"
+  - echo -e "\n84831b9409646a918e30573bab4c9c91346d8abd" > "$ANDROID_HOME/licenses/android-sdk-preview-license"
+
+install:
+  - echo y | sdkmanager "ndk-bundle"
+
+before_script:
+  - export ANDROID_NDK_HOME=$ANDROID_HOME/ndk-bundle
+
+script: ".travis/build.sh"
+
+before_cache:
+  - rm -f  $HOME/.gradle/caches/modules-2/modules-2.lock
+  - rm -fr $HOME/.gradle/caches/*/plugin-resolution/
+
+cache:
+  directories:
+    - "$HOME/.gradle/caches/"
+    - "$HOME/.gradle/wrapper/"
+    - "$HOME/.android/build-cache"
+
+deploy:
+  - provider: releases
+    api_key:
+      secure: qmS9SyMq8xPDqaY83rvAFyZcvic24lGBj3MFt22RhVJzIXAAN/vqL1R70PnNiCF7CE+R7PaDlBpwjxDMBiuh0QQNc1oX6cgepUbro4/Nt7NFFfCvKXaFdR1cSgYouhuHmy0SS0/alrcfhQ2bPwcm1/vAOiSa8Wu7hsXhCcxbFyEbXZVD11QZmiffEM0py+OeuqOFo2JxZaGRu2z04E/u5TWep1ZEuhFRCC87PGgFqABgg6jYYebQOUZADG/0G8581HTGU0mdwueYsiA35ncRzpV2V8DajEEBd5wOe5d8SyMtE+6Qs5PD9KcXAqGGe4QRmrJMX5EcLQaLZf/Qd5s9SFZVHb1aJIw/y05w4L5dlVpsjx5WuUAYAVg7Ol5UawofFo/hYkYCNmfub67wJQdHSIxPif7V6YeON6RQQMpc5GBYY9eA6ZxhrdA2m7eyoOT3jcbdaVJwC0jMGhn26hkgJfTo1LfAUs85Cs3BrK8w6Poqc/Jb+4Y0NhdGIKgO5tS3vY54cTJVVrQTq4/XmME4ZnzOX3HaOqzfyt/6M4gEQMvaeFksxwoFhocV7wfaCq9ps/Kdq2dl4KwoqRV2WqVaauqzCP4XPSlVLaJqztsw0wboupcaZepWJ2a/6j9IrKo1pEnyeHF5y+k0SUAxL0X8iKZ0uPxsgoVrlNtqXJWNGvA=
+    file: tachiyomi-v*.apk
+    file_glob: true
+    skip_cleanup: true
+    on:
+      tags: true
+      repo: inorichi/tachiyomi
+  - provider: script
+    script: ".travis/deploy.sh"
+    skip_cleanup: true
+    on:
+      branch: master
+      condition: "-z $TRAVIS_TAG"
+      repo: inorichi/tachiyomi
+  - provider: script
+    script: ".travis/deploy.sh"
+    skip_cleanup: true
+    on:
+      branch: dev
+      condition: "-z $TRAVIS_TAG"
+      repo: inorichi/tachiyomi
+
+env:
+  global:
+    - secure: Ita1+tzo7P5IC2yqU3KgRcXt+5DTpP0103Hx/ECYi42/7rLt+TC7PMjl2yH3Z189+tGwLq0Ol1KJ2Z5Rn3q7EaQgD0+WRkH/ijtrjKoVh7dyItIBp7yowZpA0TJHQ4EZpGSxZakKbIP4di8XMxJ2+5VzEivYUt04LCUpzugemL6b6XOfUmOZykVxV2UDAlPPggklITYBXkHUa0mwJhjS1aPPeeR3PhVXomkqfuOJOKejPXXXJope9fhAnmopHA7ISfjIrTuwDVQJqNSuco+O9kQShmlu0C8pob1vFGPEDvafaDS8SZ9A6gKT1ZfgSUqVmvDbx0WLX8XugBLrQedtZv63esOa1WUyGhgFVpeJjexlszXlhyfP1gH5QbzRr+EiSaagCyjf9II2veLAtU5cFY+nj6KBdKQsazIMRHf8SAQlWASyJYMED/N9RnUFxSf1rnLGqiY2ezjycx4ieFj7vhlbTgyao1GHjjR9cwNuntdMYWhY8+Vc7Fctmzm46xOyyz9oJGdyim76Y4w4MZvQNKeZOBAjdEgX6cXBk15scoM2Vj9ENox+MKZLaKRawXg2U1ujK+bWAQkXiVvPriv05/JtYsNUft8qAsm+69vtohDsUW7Wu0bBIKDL+v0W30ty1PpyNehBB2OquUE7fp53gitOmYl7TyuxktkMY8PXKKU=
+    - secure: NABCfigMUVM/9TLALYBpQLp/p3rG6MbH5y34/oqCSej/oh2u0nyhFSi8veS0lFpDIcv0TZvxHJXoSA0zeZijb1fUU8jYVNT2azuPWE6Gu7sf0TfBeCvulqbgLMoaA6JuWbEbZwHcxpKHg4vLSMjNk+ZP4v2dffI6A620fxLltxxhTpsYkYYsfKG857CpQtdgN/HqcOaxyvzXFmWWyVWHala1uMcMeXZCwgnlVAqau9o0bsU092txSmHqoesHoAinidSCTCmTlEqp/1AFaYQTbxmnfNC1yLgzxWAlJcS3NWzNo3ellMvKjsiIGn3JJpAjTGcyf3yPsvhs1cY3MZbmJYVyKH5HbnkA5ms6mx0DDJ2UOs5H2dmED82m14+hu62Xb8XN8zAdq+bySNSwgsGzvr1PT74pT4BW1T+D7L1xvUe6k1enZ38GIMJbJPhBybRQazhjKPmXRB30Thxoqe5VqU8UeiXHAEps7JYAWUR1PLZvEYQb6MWurmTxs9be/OTwrUT1LDiqeJZg6XkDGgQwuR2YBaQJHJD17Piq6q1BUX8abhK6wzAAYVqyGvpmUCmQCtHZgenE6ulwcKChzBv4n97OjE21LGWnbNF5ViUhfAbGcKOVufd1chZsfbkJ7a3tHYCfLnxHUIhKvHk26f5Em8h68D0wQkPnkcVVkfh7XpI=
+    - secure: C93UADV5aR0zhLCLwR6tCyz+fwUYslZbhjBl3PHQp+0boIGS/Be2UQTFHp/NB9mQmhWqbwqHoAVFENZFytV04ePgOuNtMFcjAIfnzm19Am7iRAMFixD45pF/CuYYfLupElkAcSequtAzN0g4G0sQ5KR1hibaDIoz9kfA2YcUAMaZ4T5bhCr8os/xA2nOlmvPDWsRWCFBYkSpnmbsSsgYAhulA/V5bSNAWnp9LPw3CBLibW3WsVP4wuhZAkXznKwn/mHT31kfQlpMH3qNhXpsN9huUkZ/k8QWeakcHJKugung0Z2T1StK8rlI8OrJstVcwueHTa2ses4f5VbhWog/Z8HDkdll9W9RM/QqXjNDtOVBt/SPuhCp4k2rvJixFUxzvSqgSWQvQnbHwjWxIUVVyHtnb0/zc/S9ONZG14TOwB/+Lkgacb85PNszurZ2f3mH0O6slIh1mH+5d9J4+L976ot4nTPlK1OtothagVyKGOrn9HycrPk/MjftIJuElHzo7NEJd/wRPqIb5y12iZN1RSPriU+itg1uSAVP891/o3peJyuqY9WSB7dYwgDJos6dDvbr19emtdyxkQR+eAb5duyH6s4R58wh1kJ1d4zu0X6uSnF4AIc+6teKkN24rSXcqB/hrcojS49jgLy5P0/CVsUbYZPI/tx8E/IJfr8m36E=
+    - secure: mawwBvllvESc/mp+JHvncq1iUhiC7nyokPgXmOehffc0K3byMLs2L25HjNsU6EnXG9Lcae1cfP8S9bWLquU2C3kpAkLBUpjEbdx7K0654uvs7Rrvb5hcTRHwjzaEVmVaBFX4ROcjUhBYny/Wjj/YENCkSWpkfcMd1esFbVsO+fOLyaAPvrb6auKY7H+pUSqlEwaEnrkYeBBZIHa7KqwL4g5DHbq6K368tjmval/wBzwMB0V8V3dt/ik8RMVDtKPrik4Bu0V9UmXZUIo/a06ii/CM82ekFRh3eUb0DKkdkmYbdH6MBMoLTfQtMa6A4luXaA0oycAnTX3OGB5MWIjK39KhWRavh6ybSIt4aHKoolxzH8Zgmk7xMhFSot/laX5q5IzjZu5KU6F2SmdV0kcQugM8oAjANFySetPvY1q7nZ8pM+NO1xKS/mH0w4vChhdJFD1mw7aCoh8FdeUf0Eym2+pp5Q9uAisWMmNn5XN8/fL5q6PzAxkXmkedfrr1N61FmIL6EKx8qiWpOUNlRRTIMJ4GMhCyckCF6cNxDkBItp52c+Hmkbn+ZEInEyX6gpjYVm3xyEi0Z5kLCi/fMX2nBNczc5BuGLzzmJnITv4ovpeYn2/vPvHbaPgPC4LqDK3AjlpVadMZk/M5Egn+hWY7Mni57CmpZD+SpxUbbsItI0c=
+    - secure: PJPDkUg1zc57brxUvNpSh+Q3ZEaGpBqZzwDavqslkn0WmjBTLrE6/OG7TFHKNmO+P56qFl+pMEKqThxqR3+4bWEeEx8ykkixDVzxNJMmws+7A7ImJ75iQyB6giMW/4tykVMMHgIPNAdcnI8VOWn0LGHnpFWUd70yoyAGX8s6cspHCKgcuWMA3GS410KJfHpyd0B9/QS7ZyWzSETW7zSPyLPa81SBO95EhOF3TOGZYLt/mBhdtU3YGFs4k9fZ8jDDcm9XmBfqVlUhb8HiZcxJiZDdRvxODERfNnwc47uaJk6+kxGDzIW2uAxrMXXVKkG04GeMOokXoR9kW1Hl2JmoyySLKLZmB7I/XEtVWdzZw16mWi+4zmhjLhfB0phSW+/5I+0VtZZ6jO031J5FL/JqVrcq1ws/aw4QlaOdPUco/x2u4LNHyYYgOi5arD9xSyu6IRy0jCC4Xa1zuqM5adGJX+rZyVfKZ0TxOW661HTxlo8COtkB2i0WR2deZGVN75ooCAEO8DauQoUcFH1OelahmPtzVs1/6ZczuxGdp9ED7ZQq9NHEOsOdUGCj/D79Dm1hWFQsIsslnnGYWitAycNCgEwmlt2Q6fbrv2CJrmLqZ9a9r3AhzxoHn9Qx1GyuyfhZJzm/6Ff2kcOjma2kcz13KUwTxdW+2G5dDCotK3f7aiI=
+    - secure: FIIZfEEYfjNMKODs33Czh603CYVn6LRrzpFNIiPHYTb8iQWv9qAYhsg4FpHfOjDikokTwb5X/h8G7AX93Z0xKyyDi75ACT11oPeTNTArDdcmdDVlOYBvYHc2Ci7pMW5r8LGejB7Y3mWM8uKyA3oKvneEFutB65vO3JVZvFWrm03Lmqqe7+mA4qNqNqTbN7R7fmk5b7zt7A3DHvDu0JPTbSSUwpso/p2I5WJYjrf71I7YMQwIFLoMfplC1onVA3EFS3lZsF65zE+xVRy34AKa41iZAMbhVDyqUHEnx6L0dwEdn2Z5XLlK0ov1+qLTLlQsBE4Knre6TNkWMfktk7MKA+ch8RYxvEYLODhQkIrOkLSNWhZPhdaT+xD4fr0RCKSHo6uWRC4aofsJx8wSqb8ZL4j2zopUp9VisMOI202UEnvFDBtOkVGJSxxYbFjifIB7NCJBn788w+3k+k4IbOg537VdyoK2PMBR8/TDdjImWhWHY1i7+345ejwmzHL7ZPfb6GTNnQTWkajT77/n6Yk41twR5vvegOSTKuuO++WN/pUks4PGqtcQe9fnSfx2OcOq1ofLiG+JDorJ7z8kHSG13wHLq+QYMDayQbyJEYpDzmn/w3Ou1s2o0a7A41+cIkRzAgH9y3v4lgjp9GcMP2S74ZPA7OecWbFSexM7tL/dYxY=
+    - secure: DKCGc4E9PKeTX68r9pbbNg5qITsN0bApQ1m0x8xdEoi8GLRKVMYNn6ahoAxvy1YsBXC9Zlt5++gLmUV1I1JyDMyJXMr/lZrp4oarW0xWpTBmn3HzOph/K2W4i/fTGgMFieumPEbQIFOnU3JSjK6UJB8qVGEXD2OqS7A//EdrGDbAYVDL3ZTKE6JUlTNHgaKaNHhn+Dq4aBLTSYPwlLyqo+WNBVUUCKCHOq62ULF8MpX5YGaPFNxKYzircV7HpF1hCbV31dmpkeYT9xztra5V0SIBM27jAcQqGmtHH2mhx1sLu+gjhFJbbtY6cggA9EedzYYLDx/NPmgfyuOJfyVbSwTF3vhDUYfskqc1THWpwOSKO0Ry+8/xYb9crxg+FSwuI5hnfkIFk9woBvRGBhjto3/1buMNY9dSFiWtEbN6Let8e747l0wIGJCpJxSeh7vn7F1mWjixhf9GX1+V9BrUvGTd3XJDNb9cVnafYa1RTj8BLteA4HBza7Z9R3dvG4YWp16L/94UuaTzgAQfERLTZGopQth/hsaVTlYesJmJLF70lGM+W83y3YuNkSaX1zQ5FAIvp7oH0O16t7ISm6GprUFwN2Uox7AAbPZdWHxJbly+D+yCFNcqS3Bz9mV3YCLo690Sy1ePNHr+nCseVfBMo7OYyavSS/EjPWfEy65Wq04=

CODE_OF_CONDUCT.md

@@ -1,126 +0,0 @@
-# Contributor Covenant Code of Conduct
-
-## Our Pledge
-
-We as members, contributors, and leaders pledge to make participation in our
-community a harassment-free experience for everyone, regardless of age, body
-size, visible or invisible disability, ethnicity, sex characteristics, gender
-identity and expression, level of experience, education, socio-economic status,
-nationality, personal appearance, race, caste, color, religion, or sexual identity
-and orientation.
-
-We pledge to act and interact in ways that contribute to an open, welcoming,
-diverse, inclusive, and healthy community.
-
-## Our Standards
-
-Examples of behavior that contributes to a positive environment for our
-community include:
-
-* Demonstrating empathy and kindness toward other people
-* Being respectful of differing opinions, viewpoints, and experiences
-* Giving and gracefully accepting constructive feedback
-* Accepting responsibility and apologizing to those affected by our mistakes,
-  and learning from the experience
-* Focusing on what is best not just for us as individuals, but for the
-  overall community
-
-Examples of unacceptable behavior include:
-
-* The use of sexualized language or imagery, and sexual attention or
-  advances of any kind
-* Trolling, insulting or derogatory comments, and personal or political attacks
-* Public or private harassment
-* Publishing others' private information, such as a physical or email
-  address, without their explicit permission
-* Other conduct which could reasonably be considered inappropriate in a
-  professional setting
-
-## Enforcement Responsibilities
-
-Community moderators are responsible for clarifying and enforcing our standards of
-acceptable behavior and will take appropriate and fair corrective action in
-response to any behavior that they deem inappropriate, threatening, offensive,
-or harmful.
-
-Community moderators have the right and responsibility to remove, edit, or reject
-comments, commits, code, wiki edits, issues, and other contributions that are
-not aligned to this Code of Conduct, and will communicate reasons for moderation
-decisions when appropriate.
-
-## Scope
-
-This Code of Conduct applies within all community spaces, and also applies when
-an individual is officially representing the community in public spaces.
-Examples of representing our community include using an official e-mail address,
-posting via an official social media account, or acting as an appointed
-representative at an online or offline event.
-
-## Enforcement
-
-Instances of abusive, harassing, or otherwise unacceptable behavior may be
-reported to the community moderators responsible for enforcement at
-the [Tachiyomi Discord server](https://discord.gg/tachiyomi).
-All complaints will be reviewed and investigated promptly and fairly.
-
-All community moderators are obligated to respect the privacy and security of the
-reporter of any incident.
-
-## Enforcement Guidelines
-
-Community moderators will follow these Community Impact Guidelines in determining
-the consequences for any action they deem in violation of this Code of Conduct:
-
-### 1. Correction
-
-**Community Impact**: Use of inappropriate language or other behavior deemed
-unprofessional or unwelcome in the community.
-
-**Consequence**: A private, written warning from community moderators, providing
-clarity around the nature of the violation and an explanation of why the
-behavior was inappropriate. A public apology may be requested.
-
-### 2. Warning
-
-**Community Impact**: A violation through a single incident or series
-of actions.
-
-**Consequence**: A warning with consequences for continued behavior. No
-interaction with the people involved, including unsolicited interaction with
-those enforcing the Code of Conduct, for a specified period of time. This
-includes avoiding interactions in community spaces as well as external channels
-like social media. Violating these terms may lead to a temporary or
-permanent ban.
-
-### 3. Temporary Ban
-
-**Community Impact**: A serious violation of community standards, including
-sustained inappropriate behavior.
-
-**Consequence**: A temporary ban from any sort of interaction or public
-communication with the community for a specified period of time. No public or
-private interaction with the people involved, including unsolicited interaction
-with those enforcing the Code of Conduct, is allowed during this period.
-Violating these terms may lead to a permanent ban.
-
-### 4. Permanent Ban
-
-**Community Impact**: Demonstrating a pattern of violation of community
-standards, including sustained inappropriate behavior,  harassment of an
-individual, or aggression toward or disparagement of classes of individuals.
-
-**Consequence**: A permanent ban from any sort of public interaction within
-the community.
-
-## Attribution
-
-This Code of Conduct is adapted from the [Contributor Covenant](https://www.contributor-covenant.org/),
-version 2.1, available at
-[v2.1](https://www.contributor-covenant.org/version/2/1/code_of_conduct.html).
-
-Community Impact Guidelines were inspired by
-[Mozilla's code of conduct enforcement ladder](https://github.com/mozilla/diversity).
-
-For answers to common questions about this code of conduct, see the FAQ at
-[FAQ](https://www.contributor-covenant.org/faq). Translations are available
-at [translations](https://www.contributor-covenant.org/translations).

CONTRIBUTING.md

@@ -1,50 +0,0 @@
-Looking to report an issue/bug or make a feature request? Please refer to the [README file](https://github.com/tachiyomiorg/tachiyomi#issues-feature-requests-and-contributing).
-
----
-
-Thanks for your interest in contributing to Tachiyomi!
-
-
-# Code contributions
-
-Pull requests are welcome!
-
-If you're interested in taking on [an open issue](https://github.com/tachiyomiorg/tachiyomi/issues), please comment on it so others are aware.
-You do not need to ask for permission nor an assignment.
-
-## Prerequisites
-
-Before you start, please note that the ability to use following technologies is **required** and that existing contributors will not actively teach them to you.
-
-- Basic [Android development](https://developer.android.com/)
-- [Kotlin](https://kotlinlang.org/)
-
-### Tools
-
-- [Android Studio](https://developer.android.com/studio)
-- Emulator or phone with developer options enabled to test changes.
-
-## Getting help
-
-- Join [the Discord server](https://discord.gg/tachiyomi) for online help and to ask questions while developing.
-
-# Translations
-
-Translations are done externally via Weblate. See [our website](https://tachiyomi.org/help/contribution/#translation) for more details.
-
-
-# Forks
-
-Forks are allowed so long as they abide by [the project's LICENSE](https://github.com/tachiyomiorg/tachiyomi/blob/master/LICENSE).
-
-When creating a fork, remember to:
-
-- To avoid confusion with the main app:
-    - Change the app name
-    - Change the app icon
-    - Change or disable the [app update checker](https://github.com/tachiyomiorg/tachiyomi/blob/master/app/src/main/java/eu/kanade/tachiyomi/data/updater/AppUpdateChecker.kt)
-- To avoid installation conflicts:
-    - Change the `applicationId` in [`build.gradle.kts`](https://github.com/tachiyomiorg/tachiyomi/blob/master/app/build.gradle.kts)
-- To avoid having your data polluting the main app's analytics and crash report services:
-    - If you want to use Firebase analytics, replace [`google-services.json`](https://github.com/tachiyomiorg/tachiyomi/blob/master/app/src/standard/google-services.json) with your own
-    - If you want to use ACRA crash reporting, replace the `ACRA_URI` endpoint in [`build.gradle.kts`](https://github.com/tachiyomiorg/tachiyomi/blob/master/app/build.gradle.kts) with your own

LICENSE

@@ -174,3 +174,29 @@
       of your accepting any such warranty or additional liability.
 
    END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "{}"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright {yyyy} {name of copyright owner}
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+

README.md

@@ -1,94 +1,3 @@
-| Build | Stable | Weekly Preview | Contribute | Support Server |
-|-------|----------|---------|------------|---------|
-| ![CI](https://github.com/tachiyomiorg/tachiyomi/workflows/CI/badge.svg?branch=dev&event=push) | [![stable release](https://img.shields.io/github/release/tachiyomiorg/tachiyomi.svg?maxAge=3600&label=download)](https://github.com/tachiyomiorg/tachiyomi/releases) | [![latest preview build](https://img.shields.io/github/v/release/tachiyomiorg/tachiyomi-preview.svg?maxAge=3600&label=download)](https://github.com/tachiyomiorg/tachiyomi-preview/releases) | [![Translation status](https://hosted.weblate.org/widgets/tachiyomi/-/svg-badge.svg)](https://hosted.weblate.org/engage/tachiyomi/?utm_source=widget) | [![Discord](https://img.shields.io/discord/349436576037732353.svg?label=discord&labelColor=7289da&color=2c2f33&style=flat)](https://discord.gg/tachiyomi) |
+I haven't started a readme
 
-
-# ![app icon](./.github/readme-images/app-icon.png)Tachiyomi
-Tachiyomi is a free and open source manga reader for Android 6.0 and above.
-
-## Features
-
-Features include:
-* Online reading from a variety of sources
-* Local reading of downloaded content
-* A configurable reader with multiple viewers, reading directions and other settings.
-* Tracker support: [MyAnimeList](https://myanimelist.net/), [AniList](https://anilist.co/), [Kitsu](https://kitsu.io/), [MangaUpdates](https://mangaupdates.com), [Shikimori](https://shikimori.one), and [Bangumi](https://bgm.tv/) support
-* Categories to organize your library
-* Light and dark themes
-* Schedule updating your library for new chapters
-* Create backups locally to read offline or to your desired cloud service
-
-## Download
-Get the app from our [releases page](https://github.com/tachiyomiorg/tachiyomi/releases).
-
-If you want to try new features before they get to the stable release, you can download the preview version [here](https://github.com/tachiyomiorg/tachiyomi-preview/releases).
-
-## Issues, Feature Requests and Contributing
-
-Please make sure to read the full guidelines. Your issue may be closed without warning if you do not.
-
-<details><summary>Issues</summary>
-
-1. **Before reporting a new issue, take a look at the [FAQ](https://tachiyomi.org/help/faq/), the [changelog](https://github.com/tachiyomiorg/tachiyomi/releases) and the already opened [issues](https://github.com/tachiyomiorg/tachiyomi/issues).**
-2. If you are unsure, ask here: [![Discord](https://img.shields.io/discord/349436576037732353.svg)](https://discord.gg/tachiyomi)
-
-</details>
-
-<details><summary>Bugs</summary>
-
-* Include version (More → About → Version)
- * If not latest, try updating, it may have already been solved
- * Preview version is equal to the number of commits as seen in the main page
-* Include steps to reproduce (if not obvious from description)
-* Include screenshot (if needed)
-* If it could be device-dependent, try reproducing on another device (if possible)
-* Don't group unrelated requests into one issue
-
-DO: https://github.com/tachiyomiorg/tachiyomi/issues/24 https://github.com/tachiyomiorg/tachiyomi/issues/71
-
-DON'T: https://github.com/tachiyomiorg/tachiyomi/issues/75
-
-</details>
-
-<details><summary>Feature Requests</summary>
-
-* Write a detailed issue, explaining what it should do or how. Avoid writing just "like X app does"
-* Include screenshot (if needed)
-
-Source requests should be created at https://github.com/tachiyomiorg/tachiyomi-extensions, they do not belong in this repository.
-</details>
-
-<details><summary>Contributing</summary>
-
-See [CONTRIBUTING.md](./CONTRIBUTING.md).
-</details>
-
-<details><summary>Code of Conduct</summary>
-
-See [CODE_OF_CONDUCT.md](./CODE_OF_CONDUCT.md).
-</details>
-
-## FAQ
-
-[See our website.](https://tachiyomi.org/)
-You can also reach out to us on [Discord](https://discord.gg/tachiyomi).
-
-## License
-
-    Copyright 2015 Javier Tomás
-
-    Licensed under the Apache License, Version 2.0 (the "License");
-    you may not use this file except in compliance with the License.
-    You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-    Unless required by applicable law or agreed to in writing, software
-    distributed under the License is distributed on an "AS IS" BASIS,
-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-    See the License for the specific language governing permissions and
-    limitations under the License.
-
-## Disclaimer
-
-The developer of this application does not have any affiliation with the content providers available.
+Automated Preview Builds(with updater): https://github.com/jobobby04/TachiyomiSYPreview/releases

app/.gitignore

@@ -2,3 +2,5 @@
 *iml
 *.iml
 custom.gradle
+google-services.json
+output.json

app/build.gradle

@@ -0,0 +1,374 @@
+import org.jetbrains.kotlin.gradle.tasks.AbstractKotlinCompile
+//noinspection GradleDependency
+import java.text.SimpleDateFormat
+
+apply plugin: 'com.android.application'
+apply plugin: 'com.google.android.gms.oss-licenses-plugin'
+apply plugin: 'kotlin-android'
+apply plugin: 'kotlin-android-extensions'
+apply plugin: 'kotlin-kapt'
+apply plugin: 'com.github.zellius.shortcut-helper'
+// Realm (EH)
+apply plugin: 'realm-android'
+
+shortcutHelper.filePath = './shortcuts.xml'
+
+ext {
+    // Git is needed in your system PATH for these commands to work.
+    // If it's not installed, you can return a random value as a workaround
+    getCommitCount = {
+        return 'git rev-list --count HEAD'.execute().text.trim()
+        // return "1"
+    }
+
+    getGitSha = {
+        return 'git rev-parse --short HEAD'.execute().text.trim()
+        // return "1"
+    }
+
+    getBuildTime = {
+        def df = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm'Z'")
+        df.setTimeZone(TimeZone.getTimeZone("UTC"))
+        return df.format(new Date())
+    }
+}
+
+android {
+    compileSdkVersion 29
+    buildToolsVersion '29.0.3'
+    publishNonDefault true
+
+    defaultConfig {
+        applicationId "eu.kanade.tachiyomi.sy"
+        minSdkVersion 21
+        targetSdkVersion 29
+        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
+        versionCode 1
+        versionName "0.9.2.7"
+
+        buildConfigField "String", "COMMIT_COUNT", "\"${getCommitCount()}\""
+        buildConfigField "String", "COMMIT_SHA", "\"${getGitSha()}\""
+        buildConfigField "String", "BUILD_TIME", "\"${getBuildTime()}\""
+        buildConfigField "boolean", "INCLUDE_UPDATER", "true"
+
+        multiDexEnabled true
+
+        ndk {
+            abiFilters "armeabi-v7a", "arm64-v8a", "x86"
+        }
+    }
+
+    viewBinding {
+        enabled = true
+    }
+
+    buildTypes {
+        debug {
+            versionNameSuffix "-${getCommitCount()}"
+            applicationIdSuffix ".debug"
+            ext.enableCrashlytics = false
+        }
+        releaseTest {
+            applicationIdSuffix ".rt"
+//            minifyEnabled true
+//            shrinkResources true
+            zipAlignEnabled true
+            proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
+        }
+        release {
+            minifyEnabled true
+            shrinkResources true
+            zipAlignEnabled true
+            proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
+        }
+    }
+
+    flavorDimensions "default"
+
+    productFlavors {
+        standard {
+            buildConfigField "boolean", "INCLUDE_UPDATER", "true"
+            dimension "default"
+        }
+        dev {
+            resConfigs "en", "xxhdpi"
+            dimension "default"
+        }
+    }
+
+    compileOptions {
+        sourceCompatibility 1.8
+        targetCompatibility 1.8
+    }
+
+    packagingOptions {
+        exclude 'META-INF/DEPENDENCIES'
+        exclude 'LICENSE.txt'
+        exclude 'META-INF/LICENSE'
+        exclude 'META-INF/LICENSE.txt'
+        exclude 'META-INF/NOTICE'
+        exclude 'META-INF/*.kotlin_module'
+
+        // Compatibility for two RxJava versions (EXH)
+        exclude 'META-INF/rxjava.properties'
+    }
+
+    lintOptions {
+        abortOnError false
+        checkReleaseBuilds false
+    }
+
+    compileOptions {
+        sourceCompatibility = 1.8
+        targetCompatibility = 1.8
+    }
+
+    kotlinOptions {
+        jvmTarget = "1.8"
+    }
+}
+
+androidExtensions {
+    experimental = true
+}
+
+dependencies {
+
+    // Modified dependencies
+    implementation 'com.github.inorichi:subsampling-scale-image-view:ac0dae7'
+    implementation 'com.github.inorichi:junrar-android:634c1f5'
+
+    // Android support library
+    implementation 'androidx.appcompat:appcompat:1.1.0'
+    implementation 'androidx.cardview:cardview:1.0.0'
+    implementation 'androidx.constraintlayout:constraintlayout:1.1.3'
+    implementation 'androidx.recyclerview:recyclerview:1.1.0'
+    implementation 'androidx.preference:preference:1.1.1'
+    implementation 'androidx.annotation:annotation:1.1.0'
+    implementation 'androidx.browser:browser:1.2.0'
+    implementation 'androidx.multidex:multidex:2.0.1'
+    implementation 'androidx.biometric:biometric:1.0.1'
+
+    final lifecycle_version = '2.2.0'
+    implementation "androidx.lifecycle:lifecycle-common-java8:$lifecycle_version"
+    implementation "androidx.lifecycle:lifecycle-extensions:$lifecycle_version"
+    implementation "androidx.lifecycle:lifecycle-runtime-ktx:$lifecycle_version"
+
+    // UI library
+    implementation 'com.google.android.material:material:1.1.0'
+
+    standardImplementation 'com.google.firebase:firebase-core:17.4.1'
+
+    // ReactiveX
+    implementation 'io.reactivex:rxandroid:1.2.1'
+    implementation 'io.reactivex:rxjava:1.3.8'
+    implementation 'com.jakewharton.rxrelay:rxrelay:1.2.0'
+    implementation 'com.github.pwittchen:reactivenetwork:0.13.0'
+
+    // Network client
+    final okhttp_version = '4.7.2'
+    implementation "com.squareup.okhttp3:okhttp:$okhttp_version"
+    implementation "com.squareup.okhttp3:logging-interceptor:$okhttp_version"
+    implementation 'com.squareup.okio:okio:2.6.0'
+
+    // REST
+    final retrofit_version = '2.9.0'
+    implementation "com.squareup.retrofit2:retrofit:$retrofit_version"
+    implementation "com.squareup.retrofit2:converter-gson:$retrofit_version"
+    implementation "com.squareup.retrofit2:adapter-rxjava:$retrofit_version"
+
+    // JSON
+    implementation 'com.google.code.gson:gson:2.8.6'
+    implementation 'com.github.salomonbrys.kotson:kotson:2.5.0'
+
+    // JavaScript engine
+    implementation 'com.squareup.duktape:duktape-android:1.2.0' // Stuck on 1.2.0 to fix MangaPlus extension
+
+    // Disk
+    implementation 'com.jakewharton:disklrucache:2.0.2'
+    implementation 'com.github.inorichi:unifile:e9ee588'
+
+    // HTML parser
+    implementation 'org.jsoup:jsoup:1.13.1'
+
+    // Job scheduling
+    final work_version = '2.3.4'
+    implementation "androidx.work:work-runtime:$work_version"
+    implementation "androidx.work:work-runtime-ktx:$work_version"
+
+    // [EXH] Android 7 SSL Workaround
+    implementation 'com.google.android.gms:play-services-safetynet:17.0.0'
+
+    // Changelog
+    implementation 'com.github.gabrielemariotti.changeloglib:changelog:2.1.0'
+
+    // Database
+    implementation 'androidx.sqlite:sqlite:2.1.0'
+    implementation 'com.github.inorichi.storio:storio-common:8be19de@aar'
+    implementation 'com.github.inorichi.storio:storio-sqlite:8be19de@aar'
+    implementation 'io.requery:sqlite-android:3.31.0'
+
+    // Preferences
+    implementation 'com.f2prateek.rx.preferences:rx-preferences:1.0.2'
+    implementation 'com.github.tfcporciuncula:flow-preferences:1.1.1'
+
+    // Model View Presenter
+    final nucleus_version = '3.0.0'
+    implementation "info.android15.nucleus:nucleus:$nucleus_version"
+    implementation "info.android15.nucleus:nucleus-support-v7:$nucleus_version"
+
+    // Dependency injection
+    implementation "com.github.inorichi.injekt:injekt-core:65b0440"
+
+    // Image library
+    final glide_version = '4.10.0'
+    implementation "com.github.bumptech.glide:glide:$glide_version"
+    implementation "com.github.bumptech.glide:okhttp3-integration:$glide_version"
+    kapt "com.github.bumptech.glide:compiler:$glide_version"
+
+    // Logging
+    implementation 'com.jakewharton.timber:timber:4.7.1'
+
+    // Crash reports
+    final acra_version = '5.5.0'
+    implementation "ch.acra:acra-http:$acra_version"
+
+    // Sort
+    implementation 'com.github.gpanther:java-nat-sort:natural-comparator-1.1'
+
+    // UI
+    implementation 'com.dmitrymalkovich.android:material-design-dimens:1.4'
+    implementation 'com.github.dmytrodanylyk.android-process-button:library:1.0.4'
+    implementation 'eu.davidea:flexible-adapter:5.1.0'
+    implementation 'eu.davidea:flexible-adapter-ui:1.0.0'
+    implementation 'com.nononsenseapps:filepicker:2.5.2'
+    implementation 'com.nightlynexus.viewstatepageradapter:viewstatepageradapter:1.1.0'
+    implementation 'com.github.mthli:Slice:v1.3'
+    implementation 'com.github.chrisbanes:PhotoView:2.3.0'
+    implementation 'com.github.carlosesco:DirectionalViewPager:a844dbca0a'
+
+    // 3.2.0+ introduces weird UI blinking or cut off issues on some devices
+    final material_dialogs_version = '3.1.1'
+    implementation "com.afollestad.material-dialogs:core:$material_dialogs_version"
+    implementation "com.afollestad.material-dialogs:input:$material_dialogs_version"
+    implementation "com.afollestad.material-dialogs:datetime:$material_dialogs_version"
+
+    // Conductor
+    implementation 'com.bluelinelabs:conductor:2.1.5'
+    implementation("com.bluelinelabs:conductor-support:2.1.5") {
+        exclude group: "com.android.support"
+    }
+    implementation 'com.github.inorichi:conductor-support-preference:a32c357'
+
+    // FlowBinding
+    final flowbinding_version = '0.11.1'
+    implementation "io.github.reactivecircus.flowbinding:flowbinding-android:$flowbinding_version"
+    implementation "io.github.reactivecircus.flowbinding:flowbinding-appcompat:$flowbinding_version"
+    implementation "io.github.reactivecircus.flowbinding:flowbinding-recyclerview:$flowbinding_version"
+    implementation "io.github.reactivecircus.flowbinding:flowbinding-swiperefreshlayout:$flowbinding_version"
+    implementation "io.github.reactivecircus.flowbinding:flowbinding-viewpager:$flowbinding_version"
+
+    // Tests
+    testImplementation 'junit:junit:4.13'
+    testImplementation 'org.assertj:assertj-core:3.12.2'
+    testImplementation 'org.mockito:mockito-core:1.10.19'
+
+    final robolectric_version = '3.1.4'
+    testImplementation "org.robolectric:robolectric:$robolectric_version"
+    testImplementation "org.robolectric:shadows-multidex:$robolectric_version"
+    testImplementation "org.robolectric:shadows-play-services:$robolectric_version"
+
+    implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version"
+    implementation "org.jetbrains.kotlin:kotlin-reflect:$kotlin_version"
+
+    final coroutines_version = '1.3.7'
+    implementation "org.jetbrains.kotlinx:kotlinx-coroutines-core:$coroutines_version"
+    implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:$coroutines_version"
+    implementation "org.jetbrains.kotlinx:kotlinx-coroutines-reactive:$coroutines_version"
+    implementation "org.jetbrains.kotlinx:kotlinx-coroutines-rx2:$coroutines_version"
+
+    implementation 'com.google.android.gms:play-services-oss-licenses:17.0.0'
+
+    // Text distance (EH)
+    implementation 'info.debatty:java-string-similarity:1.2.1'
+
+    // Pin lock view (EH)
+    implementation 'com.github.jawnnypoo:pinlockview:2.2.0'
+
+    // Reprint (EH)
+    implementation 'com.github.ajalt.reprint:core:3.2.1@aar'
+    implementation 'com.github.ajalt.reprint:rxjava:3.2.1@aar' // optional: the RxJava 1 interface
+
+    // Swirl (EH)
+    implementation 'com.mattprecious.swirl:swirl:1.2.0'
+
+    // RxJava 2 interop for Realm (EH)
+    implementation 'com.github.akarnokd:rxjava2-interop:0.13.7'
+
+    // Firebase (EH)
+    implementation 'com.crashlytics.sdk.android:crashlytics:2.10.1'
+
+    // Better logging (EH)
+    implementation 'com.elvishew:xlog:1.6.1'
+
+    // Time utils (EH)
+    def typed_time_version = '1.0.2'
+    implementation "com.github.kizitonwose.time:time:$typed_time_version"
+    implementation "com.github.kizitonwose.time:time-android:$typed_time_version"
+
+    // Debug utils (EH)
+    debugImplementation 'com.ms-square:debugoverlay:1.1.3'
+    releaseTestImplementation 'com.ms-square:debugoverlay:1.1.3'
+    releaseImplementation 'com.ms-square:debugoverlay-no-op:1.1.3'
+    testImplementation 'com.ms-square:debugoverlay-no-op:1.1.3'
+
+    // Humanize (EH)
+    implementation 'com.github.mfornos:humanize-slim:1.2.2'
+
+    implementation 'androidx.gridlayout:gridlayout:1.0.0'
+
+    final def markwon_version = '4.1.0'
+
+    implementation "io.noties.markwon:core:$markwon_version"
+    implementation "io.noties.markwon:ext-strikethrough:$markwon_version"
+    implementation "io.noties.markwon:ext-tables:$markwon_version"
+    implementation "io.noties.markwon:html:$markwon_version"
+    implementation "io.noties.markwon:image:$markwon_version"
+    implementation "io.noties.markwon:linkify:$markwon_version"
+
+    implementation 'com.google.guava:guava:27.0.1-android'
+}
+
+buildscript {
+    ext.kotlin_version = '1.3.72'
+    repositories {
+        mavenCentral()
+    }
+    dependencies {
+        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
+    }
+}
+
+repositories {
+    mavenCentral()
+}
+
+// See https://kotlinlang.org/docs/reference/experimental.html#experimental-status-of-experimental-api-markers
+tasks.withType(AbstractKotlinCompile).all {
+    kotlinOptions.freeCompilerArgs += ["-Xuse-experimental=kotlin.Experimental"]
+}
+
+// Duplicating Hebrew string assets due to some locale code issues on different devices
+task copyResources(type: Copy) {
+    from './src/main/res/values-he'
+    into './src/main/res/values-iw'
+    include '**/*'
+}
+
+preBuild.dependsOn(ktlintFormat, copyResources)
+
+if (getGradle().getStartParameter().getTaskRequests().toString().contains("Standard")) {
+    apply plugin: 'com.google.gms.google-services'
+    // Firebase (EH)
+    apply plugin: 'io.fabric'
+}

app/build.gradle.kts

@@ -1,323 +0,0 @@
-import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
-import org.jmailen.gradle.kotlinter.tasks.LintTask
-
-plugins {
-    id("com.android.application")
-    id("com.mikepenz.aboutlibraries.plugin")
-    kotlin("android")
-    kotlin("plugin.serialization")
-    id("com.github.zellius.shortcut-helper")
-}
-
-if (gradle.startParameter.taskRequests.toString().contains("Standard")) {
-    apply<com.google.gms.googleservices.GoogleServicesPlugin>()
-}
-
-shortcutHelper.setFilePath("./shortcuts.xml")
-
-val SUPPORTED_ABIS = setOf("armeabi-v7a", "arm64-v8a", "x86", "x86_64")
-
-android {
-    namespace = "eu.kanade.tachiyomi"
-
-    defaultConfig {
-        applicationId = "eu.kanade.tachiyomi"
-        versionCode = 101
-        versionName = "0.14.6"
-
-        buildConfigField("String", "COMMIT_COUNT", "\"${getCommitCount()}\"")
-        buildConfigField("String", "COMMIT_SHA", "\"${getGitSha()}\"")
-        buildConfigField("String", "BUILD_TIME", "\"${getBuildTime()}\"")
-        buildConfigField("boolean", "INCLUDE_UPDATER", "false")
-        buildConfigField("boolean", "PREVIEW", "false")
-
-        // Please disable ACRA or use your own instance in forked versions of the project
-        buildConfigField("String", "ACRA_URI", "\"https://tachiyomi.kanade.eu/crash_report\"")
-
-        ndk {
-            abiFilters += SUPPORTED_ABIS
-        }
-
-        testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
-    }
-
-    splits {
-        abi {
-            isEnable = true
-            reset()
-            include(*SUPPORTED_ABIS.toTypedArray())
-            isUniversalApk = true
-        }
-    }
-
-    buildTypes {
-        named("debug") {
-            versionNameSuffix = "-${getCommitCount()}"
-            applicationIdSuffix = ".debug"
-            isPseudoLocalesEnabled = true
-        }
-        named("release") {
-            isShrinkResources = true
-            isMinifyEnabled = true
-            proguardFiles("proguard-android-optimize.txt", "proguard-rules.pro")
-        }
-        create("preview") {
-            initWith(getByName("release"))
-            buildConfigField("boolean", "PREVIEW", "true")
-
-            val debugType = getByName("debug")
-            signingConfig = debugType.signingConfig
-            versionNameSuffix = debugType.versionNameSuffix
-            applicationIdSuffix = debugType.applicationIdSuffix
-            matchingFallbacks.add("release")
-        }
-        create("benchmark") {
-            initWith(getByName("release"))
-
-            signingConfig = signingConfigs.getByName("debug")
-            matchingFallbacks.add("release")
-            isDebuggable = false
-            versionNameSuffix = "-benchmark"
-            applicationIdSuffix = ".benchmark"
-        }
-    }
-
-    sourceSets {
-        getByName("preview").res.srcDirs("src/debug/res")
-        getByName("benchmark").res.srcDirs("src/debug/res")
-    }
-
-    flavorDimensions.add("default")
-
-    productFlavors {
-        create("standard") {
-            buildConfigField("boolean", "INCLUDE_UPDATER", "true")
-            dimension = "default"
-        }
-        create("dev") {
-            // Include pseudolocales: https://developer.android.com/guide/topics/resources/pseudolocales
-            resourceConfigurations.addAll(listOf("en", "en_XA", "ar_XB", "xxhdpi"))
-            dimension = "default"
-        }
-    }
-
-    packagingOptions {
-        resources.excludes.addAll(listOf(
-            "META-INF/DEPENDENCIES",
-            "LICENSE.txt",
-            "META-INF/LICENSE",
-            "META-INF/LICENSE.txt",
-            "META-INF/README.md",
-            "META-INF/NOTICE",
-            "META-INF/*.kotlin_module",
-        ))
-    }
-
-    dependenciesInfo {
-        includeInApk = false
-    }
-
-    buildFeatures {
-        viewBinding = true
-        compose = true
-
-        // Disable some unused things
-        aidl = false
-        renderScript = false
-        shaders = false
-    }
-
-    lint {
-        abortOnError = false
-        checkReleaseBuilds = false
-    }
-
-    composeOptions {
-        kotlinCompilerExtensionVersion = compose.versions.compiler.get()
-    }
-}
-
-dependencies {
-    implementation(project(":i18n"))
-    implementation(project(":core"))
-    implementation(project(":source-api"))
-    implementation(project(":data"))
-    implementation(project(":domain"))
-    implementation(project(":presentation-core"))
-    implementation(project(":presentation-widget"))
-
-    // Compose
-    implementation(platform(compose.bom))
-    implementation(compose.activity)
-    implementation(compose.foundation)
-    implementation(compose.material3.core)
-    implementation(compose.material.core)
-    implementation(compose.material.icons)
-    implementation(compose.animation)
-    implementation(compose.animation.graphics)
-    implementation(compose.ui.tooling)
-    implementation(compose.ui.util)
-    implementation(compose.accompanist.webview)
-    implementation(compose.accompanist.flowlayout)
-    implementation(compose.accompanist.permissions)
-    implementation(compose.accompanist.themeadapter)
-    implementation(compose.accompanist.systemuicontroller)
-
-    implementation(androidx.paging.runtime)
-    implementation(androidx.paging.compose)
-
-    implementation(libs.bundles.sqlite)
-
-    implementation(kotlinx.reflect)
-
-    implementation(platform(kotlinx.coroutines.bom))
-    implementation(kotlinx.bundles.coroutines)
-
-    // AndroidX libraries
-    implementation(androidx.annotation)
-    implementation(androidx.appcompat)
-    implementation(androidx.biometricktx)
-    implementation(androidx.constraintlayout)
-    implementation(androidx.coordinatorlayout)
-    implementation(androidx.corektx)
-    implementation(androidx.splashscreen)
-    implementation(androidx.recyclerview)
-    implementation(androidx.viewpager)
-    implementation(androidx.profileinstaller)
-
-    implementation(androidx.bundles.lifecycle)
-
-    // Job scheduling
-    implementation(androidx.bundles.workmanager)
-
-    // RX
-    implementation(libs.bundles.reactivex)
-    implementation(libs.flowreactivenetwork)
-
-    // Network client
-    implementation(libs.bundles.okhttp)
-    implementation(libs.okio)
-
-    // TLS 1.3 support for Android < 10
-    implementation(libs.conscrypt.android)
-
-    // Data serialization (JSON, protobuf)
-    implementation(kotlinx.bundles.serialization)
-
-    // HTML parser
-    implementation(libs.jsoup)
-
-    // Disk
-    implementation(libs.disklrucache)
-    implementation(libs.unifile)
-    implementation(libs.junrar)
-
-    // Preferences
-    implementation(libs.preferencektx)
-
-    // Dependency injection
-    implementation(libs.injekt.core)
-
-    // Image loading
-    implementation(libs.bundles.coil)
-    implementation(libs.subsamplingscaleimageview) {
-        exclude(module = "image-decoder")
-    }
-    implementation(libs.image.decoder)
-
-    // Sort
-    implementation(libs.natural.comparator)
-
-    // UI libraries
-    implementation(libs.material)
-    implementation(libs.flexible.adapter.core)
-    implementation(libs.flexible.adapter.ui)
-    implementation(libs.photoview)
-    implementation(libs.directionalviewpager) {
-        exclude(group = "androidx.viewpager", module = "viewpager")
-    }
-    implementation(libs.insetter)
-    implementation(libs.bundles.richtext)
-    implementation(libs.aboutLibraries.compose)
-    implementation(libs.cascade)
-    implementation(libs.bundles.voyager)
-    implementation(libs.wheelpicker)
-    implementation(libs.materialmotion.core)
-
-    // Logging
-    implementation(libs.logcat)
-
-    // Crash reports/analytics
-    implementation(libs.acra.http)
-    "standardImplementation"(libs.firebase.analytics)
-
-    // Shizuku
-    implementation(libs.bundles.shizuku)
-
-    // Tests
-    testImplementation(libs.junit)
-
-    // For detecting memory leaks; see https://square.github.io/leakcanary/
-    // debugImplementation(libs.leakcanary.android)
-    implementation(libs.leakcanary.plumber)
-}
-
-androidComponents {
-    beforeVariants { variantBuilder ->
-        // Disables standardBenchmark
-        if (variantBuilder.buildType == "benchmark") {
-            variantBuilder.enable = variantBuilder.productFlavors.containsAll(listOf("default" to "dev"))
-        }
-    }
-    onVariants(selector().withFlavor("default" to "standard")) {
-        // Only excluding in standard flavor because this breaks
-        // Layout Inspector's Compose tree
-        it.packaging.resources.excludes.add("META-INF/*.version")
-    }
-}
-
-tasks {
-
-    withType<LintTask>().configureEach {
-        exclude { it.file.path.contains("generated[\\\\/]".toRegex()) }
-    }
-
-    // See https://kotlinlang.org/docs/reference/experimental.html#experimental-status-of-experimental-api(-markers)
-    withType<KotlinCompile> {
-        kotlinOptions.freeCompilerArgs += listOf(
-            "-opt-in=coil.annotation.ExperimentalCoilApi",
-            "-opt-in=com.google.accompanist.permissions.ExperimentalPermissionsApi",
-            "-opt-in=androidx.compose.foundation.layout.ExperimentalLayoutApi",
-            "-opt-in=androidx.compose.material.ExperimentalMaterialApi",
-            "-opt-in=androidx.compose.material3.ExperimentalMaterial3Api",
-            "-opt-in=androidx.compose.material.ExperimentalMaterialApi",
-            "-opt-in=androidx.compose.ui.ExperimentalComposeUiApi",
-            "-opt-in=androidx.compose.foundation.ExperimentalFoundationApi",
-            "-opt-in=androidx.compose.animation.ExperimentalAnimationApi",
-            "-opt-in=androidx.compose.animation.graphics.ExperimentalAnimationGraphicsApi",
-            "-opt-in=kotlinx.coroutines.ExperimentalCoroutinesApi",
-            "-opt-in=kotlinx.coroutines.FlowPreview",
-            "-opt-in=kotlinx.coroutines.InternalCoroutinesApi",
-            "-opt-in=kotlinx.serialization.ExperimentalSerializationApi",
-        )
-
-        if (project.findProperty("tachiyomi.enableComposeCompilerMetrics") == "true") {
-            kotlinOptions.freeCompilerArgs += listOf(
-                "-P",
-                "plugin:androidx.compose.compiler.plugins.kotlin:reportsDestination=" +
-                    project.buildDir.absolutePath + "/compose_metrics"
-            )
-            kotlinOptions.freeCompilerArgs += listOf(
-                "-P",
-                "plugin:androidx.compose.compiler.plugins.kotlin:metricsDestination=" +
-                    project.buildDir.absolutePath + "/compose_metrics"
-            )
-        }
-    }
-}
-
-buildscript {
-    dependencies {
-        classpath(kotlinx.gradle)
-    }
-}

app/proguard-android-optimize.txt

@@ -1,33 +0,0 @@
--dontusemixedcaseclassnames
--verbose
-
--keepattributes *Annotation*
-
--keepclasseswithmembernames,includedescriptorclasses class * {
-    native <methods>;
-}
-
--keepclassmembers enum * {
-    public static **[] values();
-    public static ** valueOf(java.lang.String);
-}
-
--keepclassmembers class * implements android.os.Parcelable {
-  public static final ** CREATOR;
-}
-
--keep class androidx.annotation.Keep
-
--keep @androidx.annotation.Keep class * {*;}
-
--keepclasseswithmembers class * {
-    @androidx.annotation.Keep <methods>;
-}
-
--keepclasseswithmembers class * {
-    @androidx.annotation.Keep <fields>;
-}
-
--keepclasseswithmembers class * {
-    @androidx.annotation.Keep <init>(...);
-}

app/proguard-rules.pro

@@ -1,26 +1,37 @@
 -dontobfuscate
 
-# Keep common dependencies used in extensions
--keep,allowoptimization class androidx.preference.** { public protected *; }
--keep,allowoptimization class kotlin.** { public protected *; }
--keep,allowoptimization class kotlinx.coroutines.** { public protected *; }
--keep,allowoptimization class kotlinx.serialization.** { public protected *; }
--keep,allowoptimization class okhttp3.** { public protected *; }
--keep,allowoptimization class okio.** { public protected *; }
--keep,allowoptimization class rx.** { public protected *; }
--keep,allowoptimization class org.jsoup.** { public protected *; }
--keep,allowoptimization class app.cash.quickjs.** { public protected *; }
--keep,allowoptimization class uy.kohesive.injekt.** { public protected *; }
+# Extensions may require methods unused in the core app
+-dontwarn eu.kanade.tachiyomi.**
+-keep class eu.kanade.tachiyomi.** { public protected private *; }
 
-# From extensions-lib
--keep,allowoptimization class eu.kanade.tachiyomi.network.interceptor.RateLimitInterceptorKt { public protected *; }
--keep,allowoptimization class eu.kanade.tachiyomi.network.interceptor.SpecificHostRateLimitInterceptorKt { public protected *; }
--keep,allowoptimization class eu.kanade.tachiyomi.network.NetworkHelper { public protected *; }
--keep,allowoptimization class eu.kanade.tachiyomi.network.OkHttpExtensionsKt { public protected *; }
--keep,allowoptimization class eu.kanade.tachiyomi.network.RequestsKt { public protected *; }
--keep,allowoptimization class eu.kanade.tachiyomi.AppInfo { public protected *; }
+-keep class org.jsoup.** { *; }
+-keep class kotlin.** { *; }
+-keep class okhttp3.** { *; }
+-keep class com.google.gson.** { *; }
+-keep class com.github.salomonbrys.kotson.** { *; }
+-keep class com.squareup.duktape.** { *; }
 
-##---------------Begin: proguard configuration for RxJava 1.x  ----------
+# === Keep EH classes
+-keep class exh.** { *; }
+-keep class xyz.nulldev.** { *; }
+
+# === Keep RxAndroid, https://github.com/ReactiveX/RxAndroid/issues/350
+-keep class rx.android.** { *; }
+
+# Design library
+-dontwarn com.google.android.material.**
+-keep class com.google.android.material.** { *; }
+-keep interface com.google.android.material.** { *; }
+-keep public class com.google.android.material.R$* { *; }
+
+-keep class com.hippo.image.** { *; }
+-keep interface com.hippo.image.** { *; }
+-keepclassmembers class * extends nucleus.presenter.Presenter {
+    <init>();
+}
+
+
+# RxJava 1.1.0
 -dontwarn sun.misc.**
 
 -keepclassmembers class rx.internal.util.unsafe.*ArrayQueue*Field* {
@@ -37,33 +48,185 @@
 }
 
 -dontnote rx.internal.util.PlatformDependent
-##---------------End: proguard configuration for RxJava 1.x  ----------
 
-##---------------Begin: proguard configuration for kotlinx.serialization  ----------
--keepattributes *Annotation*, InnerClasses
--dontnote kotlinx.serialization.AnnotationsKt # core serialization annotations
+# === Reactive network: https://github.com/pwittchen/ReactiveNetwork/tree/v0.12.4#proguard-configuration
+-dontwarn com.github.pwittchen.reactivenetwork.library.rx2.ReactiveNetwork
+-dontwarn io.reactivex.functions.Function
+-dontwarn rx.internal.util.**
+-dontwarn sun.misc.Unsafe
 
-# kotlinx-serialization-json specific. Add this if you have java.lang.NoClassDefFoundError kotlinx.serialization.json.JsonObjectSerializer
--keepclassmembers class kotlinx.serialization.json.** {
-    *** Companion;
-}
--keepclasseswithmembers class kotlinx.serialization.json.** {
-    kotlinx.serialization.KSerializer serializer(...);
+# === Okhttp: https://github.com/square/okhttp/blob/3637fc56f70f87da696847defd311dbfb28e87b5/okhttp/src/main/resources/META-INF/proguard/okhttp3.pro
+# JSR 305 annotations are for embedding nullability information.
+-dontwarn javax.annotation.**
+# A resource is loaded with a relative path so the package of this class must be preserved.
+-keepnames class okhttp3.internal.publicsuffix.PublicSuffixDatabase
+# Animal Sniffer compileOnly dependency to ensure APIs are compatible with older versions of Java.
+-dontwarn org.codehaus.mojo.animal_sniffer.*
+# OkHttp platform used only on JVM and when Conscrypt dependency is available.
+-dontwarn okhttp3.internal.platform.ConscryptPlatform
+
+# === Okio: https://github.com/square/okio/tree/9b8545e7fa267c9d89753283990f24a35cd69cd6#proguard
+-dontwarn okio.**
+
+# === GSON: https://raw.githubusercontent.com/google/gson/master/examples/android-proguard-example/proguard.cfg
+# Gson uses generic type information stored in a class file when working with fields. Proguard
+# removes such information by default, so configure it to keep all of it.
+-keepattributes Signature
+
+# For using GSON @Expose annotation
+-keepattributes *Annotation*
+
+# Gson specific classes
+-dontwarn sun.misc.**
+#-keep class com.google.gson.stream.** { *; }
+
+# Application classes that will be serialized/deserialized over Gson
+-keep class com.google.gson.examples.android.model.** { <fields>; }
+
+# Prevent proguard from stripping interface information from TypeAdapterFactory,
+# JsonSerializer, JsonDeserializer instances (so they can be used in @JsonAdapter)
+-keep class * implements com.google.gson.TypeAdapterFactory
+-keep class * implements com.google.gson.JsonSerializer
+-keep class * implements com.google.gson.JsonDeserializer
+
+# Prevent R8 from leaving Data object members always null
+-keepclassmembers,allowobfuscation class * {
+  @com.google.gson.annotations.SerializedName <fields>;
 }
 
--keep,includedescriptorclasses class eu.kanade.**$$serializer { *; }
--keepclassmembers class eu.kanade.** {
-    *** Companion;
-}
--keepclasseswithmembers class eu.kanade.** {
-    kotlinx.serialization.KSerializer serializer(...);
+# == Nucleus
+-keepclassmembers class * extends nucleus.presenter.Presenter {
+    <init>();
 }
 
--keep class kotlinx.serialization.**
--keepclassmembers class kotlinx.serialization.** {
-    <methods>;
-}
-##---------------End: proguard configuration for kotlinx.serialization  ----------
+# TODO Changeloglib? Does it need proguard?
 
-# XmlUtil
--keep public enum nl.adaptivity.xmlutil.EventType { *; }
+# === Injekt
+## From original config: "Attempt to fix: java.lang.NoClassDefFoundError: uy.kohesive.injekt.registry.default.DefaultRegistrar$NOKEY$1"
+-keep class uy.kohesive.injekt.** { *; }
+
+
+# === Glide
+-keep public class * implements com.bumptech.glide.module.GlideModule
+-keep public class * extends com.bumptech.glide.module.AppGlideModule
+-keep public enum com.bumptech.glide.load.ImageHeaderParser$** {
+  **[] $VALUES;
+  public *;
+}
+
+-dontwarn com.bumptech.glide.load.resource.bitmap.VideoDecoder
+
+# === Glide-transformations: https://github.com/wasabeef/glide-transformations/blob/3aa8e53c6a51b8351d312f802ba1354c5b115168/transformations/proguard-rules.txt
+-dontwarn jp.co.cyberagent.android.gpuimage.**
+
+# === Conductor
+# This isn't in the consumer proguard rules yet: https://github.com/bluelinelabs/Conductor/pull/550/files
+-keepclassmembers public class * extends com.bluelinelabs.conductor.ControllerChangeHandler {
+   public <init>();
+}
+
+# === RxBinding
+-dontwarn com.google.auto.value.AutoValue
+
+# === Crashlytics
+-keepattributes *Annotation*
+-keepattributes SourceFile,LineNumberTable
+-keep class com.crashlytics.** { *; }
+-dontwarn com.crashlytics.**
+
+# === Humanize + Guava: https://github.com/google/guava/wiki/UsingProGuardWithGuava
+-dontwarn javax.lang.model.element.Modifier
+-keep class org.ocpsoft.prettytime.i18n.**
+
+# Note: We intentionally don't add the flags we'd need to make Enums work.
+# That's because the Proguard configuration required to make it work on
+# optimized code would preclude lots of optimization, like converting enums
+# into ints.
+
+# Throwables uses internal APIs for lazy stack trace resolution
+-dontnote sun.misc.SharedSecrets
+-keep class sun.misc.SharedSecrets {
+  *** getJavaLangAccess(...);
+}
+-dontnote sun.misc.JavaLangAccess
+-keep class sun.misc.JavaLangAccess {
+  *** getStackTraceElement(...);
+  *** getStackTraceDepth(...);
+}
+
+# FinalizableReferenceQueue calls this reflectively
+# Proguard is intelligent enough to spot the use of reflection onto this, so we
+# only need to keep the names, and allow it to be stripped out if
+# FinalizableReferenceQueue is unused.
+-keepnames class com.google.common.base.internal.Finalizer {
+  *** startFinalizer(...);
+}
+# However, it cannot "spot" that this method needs to be kept IF the class is.
+-keepclassmembers class com.google.common.base.internal.Finalizer {
+  *** startFinalizer(...);
+}
+-keepnames class com.google.common.base.FinalizableReference {
+  void finalizeReferent();
+}
+-keepclassmembers class com.google.common.base.FinalizableReference {
+  void finalizeReferent();
+}
+
+# Striped64, LittleEndianByteArray, UnsignedBytes, AbstractFuture
+-dontwarn sun.misc.Unsafe
+
+# Striped64 appears to make some assumptions about object layout that
+# really might not be safe. This should be investigated.
+-keepclassmembers class com.google.common.cache.Striped64 {
+  *** base;
+  *** busy;
+}
+-keepclassmembers class com.google.common.cache.Striped64$Cell {
+  <fields>;
+}
+
+-dontwarn java.lang.SafeVarargs
+
+-keep class java.lang.Throwable {
+  *** addSuppressed(...);
+}
+
+# Futures.getChecked, in both of its variants, is incompatible with proguard.
+
+# Used by AtomicReferenceFieldUpdater and sun.misc.Unsafe
+-keepclassmembers class com.google.common.util.concurrent.AbstractFuture** {
+  *** waiters;
+  *** value;
+  *** listeners;
+  *** thread;
+  *** next;
+}
+-keepclassmembers class com.google.common.util.concurrent.AtomicDouble {
+  *** value;
+}
+-keepclassmembers class com.google.common.util.concurrent.AggregateFutureState {
+  *** remaining;
+  *** seenExceptions;
+}
+
+# Since Unsafe is using the field offsets of these inner classes, we don't want
+# to have class merging or similar tricks applied to these classes and their
+# fields. It's safe to allow obfuscation, since the by-name references are
+# already preserved in the -keep statement above.
+-keep,allowshrinking,allowobfuscation class com.google.common.util.concurrent.AbstractFuture** {
+  <fields>;
+}
+
+# Futures.getChecked (which often won't work with Proguard anyway) uses this. It
+# has a fallback, but again, don't use Futures.getChecked on Android regardless.
+-dontwarn java.lang.ClassValue
+
+# MoreExecutors references AppEngine
+-dontnote com.google.appengine.api.ThreadManager
+-keep class com.google.appengine.api.ThreadManager {
+  static *** currentRequestThreadFactory(...);
+}
+-dontnote com.google.apphosting.api.ApiProxy
+-keep class com.google.apphosting.api.ApiProxy {
+  static *** getCurrentEnvironment (...);
+}

app/shortcuts.xml

@@ -17,7 +17,7 @@
         android:shortcutDisabledMessage="@string/app_not_available"
         android:shortcutId="show_recently_updated"
         android:shortcutLongLabel="@string/label_recent_updates"
-        android:shortcutShortLabel="@string/label_recent_updates">
+        android:shortcutShortLabel="@string/short_recent_updates">
         <intent
             android:action="eu.kanade.tachiyomi.SHOW_RECENTLY_UPDATED"
             android:targetClass="eu.kanade.tachiyomi.ui.main.MainActivity" />

app/src/debug/res/drawable/ic_launcher_foreground.xml

@@ -1,27 +1,97 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="108dp"
-    android:height="108dp"
-    android:viewportWidth="108.0"
-    android:viewportHeight="108.0">
+        android:width="108dp"
+        android:height="108dp"
+        android:viewportWidth="108.0"
+        android:viewportHeight="108.0">
     <path
         android:pathData="M14.5,7L86.5,7A7,7 0,0 1,93.5 14L93.5,95A7,7 0,0 1,86.5 102L14.5,102A7,7 0,0 1,7.5 95L7.5,14A7,7 0,0 1,14.5 7z"
+        android:fillType="evenOdd"
         android:fillColor="#000"/>
     <path
         android:pathData="M14.5,7L86.5,7A7,7 0,0 1,93.5 14L93.5,95A7,7 0,0 1,86.5 102L14.5,102A7,7 0,0 1,7.5 95L7.5,14A7,7 0,0 1,14.5 7z"
+        android:fillType="evenOdd"
         android:fillColor="#455A64"/>
     <path
         android:pathData="M7.5,12.01C7.5,9.24 9.74,7 12.5,7L17.5,7L17.5,102L12.5,102C9.74,102 7.5,99.77 7.5,96.99L7.5,12.01Z"
+        android:fillType="evenOdd"
         android:fillColor="#607D8B"/>
     <path
-        android:pathData="M54,54.5m-25.5,0a25.5,25.5 0,1 1,51 0a25.5,25.5 0,1 1,-51 0"
-        android:fillColor="#000"/>
+        android:name="path_3"
+        android:pathData="M 54 54.5 M 28.5 54.5 C 28.5 47.74 31.188 41.249 35.969 36.469 C 40.749 31.688 47.24 29 54 29 C 60.76 29 67.251 31.688 72.031 36.469 C 76.812 41.249 79.5 47.74 79.5 54.5 C 79.5 61.26 76.812 67.751 72.031 72.531 C 67.251 77.312 60.76 80 54 80 C 47.24 80 40.749 77.312 35.969 72.531 C 31.188 67.751 28.5 61.26 28.5 54.5"
+        android:fillColor="#000"
+        android:fillType="evenOdd"/>
     <path
-        android:pathData="M54,54.5m-25.5,0a25.5,25.5 0,1 1,51 0a25.5,25.5 0,1 1,-51 0"
-        android:fillColor="#CE2828"/>
+        android:name="path_4"
+        android:pathData="M 54 54.5 M 28.5 54.5 C 28.5 47.74 31.188 41.249 35.969 36.469 C 40.749 31.688 47.24 29 54 29 C 60.76 29 67.251 31.688 72.031 36.469 C 76.812 41.249 79.5 47.74 79.5 54.5 C 79.5 61.26 76.812 67.751 72.031 72.531 C 67.251 77.312 60.76 80 54 80 C 47.24 80 40.749 77.312 35.969 72.531 C 31.188 67.751 28.5 61.26 28.5 54.5"
+        android:fillColor="#CE2828"
+        android:fillType="evenOdd"/>
     <path
-        android:pathData="M54,54.5m-19.94,0a19.94,19.94 0,1 1,39.87 0a19.94,19.94 0,1 1,-39.87 0"
-        android:fillColor="#FFF"/>
+        android:name="path_5"
+        android:pathData="M 54 54.5 M 34.06 54.5 C 33.964 50.23 35.243 46.04 37.707 42.551 C 40.171 39.062 43.692 36.455 47.748 35.117 C 51.805 33.779 56.185 33.779 60.242 35.117 C 64.298 36.455 67.819 39.062 70.283 42.551 C 72.747 46.04 74.026 50.23 73.93 54.5 C 74.026 58.77 72.747 62.96 70.283 66.449 C 67.819 69.938 64.298 72.545 60.242 73.883 C 56.185 75.221 51.805 75.221 47.748 73.883 C 43.692 72.545 40.171 69.938 37.707 66.449 C 35.243 62.96 33.964 58.77 34.06 54.5"
+        android:fillColor="#FFF"
+        android:fillType="evenOdd"/>
     <path
-        android:pathData="M52.04,46.3L47.42,46.3C46.14,46.3 44.93,46.23 44.2,46.14L44.2,49.76C45,49.65 46.16,49.6 47.42,49.6L60.58,49.6C61.86,49.6 63.02,49.65 63.82,49.76L63.82,46.14C63.09,46.23 61.86,46.3 60.58,46.3L55.69,46.3L55.69,45.07C55.69,44.43 55.73,43.95 55.82,43.45L51.9,43.45C51.99,44 52.04,44.43 52.04,45.07L52.04,46.3ZM46.78,60.68C45.46,60.68 44.29,60.63 43.45,60.52L43.45,64.14C44.34,64.03 45.46,63.98 46.78,63.98L61.29,63.98C62.57,63.98 63.71,64.03 64.57,64.14L64.57,60.52C63.73,60.63 62.57,60.68 61.29,60.68L58.24,60.68C59.33,58.06 59.99,56.23 60.7,53.91C61.34,51.81 61.34,51.81 61.56,51.13L57.58,50.06C57.51,50.93 57.37,51.52 56.89,53.41C56.19,56.14 55.32,58.74 54.5,60.68L46.78,60.68ZM46.48,51.36C47.55,54.02 48.28,56.53 49.03,60.15L52.66,58.9C51.65,54.98 50.92,52.66 49.94,50.11L46.48,51.36Z"
-        android:fillColor="#000"/>
+        android:name="path_6"
+        android:pathData="M 54.174 36.266 C 64.147 36.266 72.234 44.397 72.234 54.426 C 72.234 64.459 64.147 72.593 54.174 72.593 C 44.197 72.593 36.113 64.459 36.113 54.426 C 36.113 44.397 44.197 36.266 54.174 36.266 Z"
+        android:fillColor="#ffcc4d"
+        android:strokeColor="#ffcc4d"
+        android:strokeWidth="4.628571428571428"
+        android:strokeLineCap="round"
+        android:strokeLineJoin="round"/>
+    <path
+        android:name="path_7"
+        android:pathData="M 48.774 45.158 C 49.988 45.158 50.973 46.452 50.973 48.05 C 50.973 49.65 49.988 50.946 48.774 50.946 C 47.559 50.946 46.576 49.65 46.576 48.05 C 46.576 46.452 47.559 45.158 48.774 45.158 Z"
+        android:fillColor="#674600"
+        android:strokeColor="#674600"
+        android:strokeWidth="0.1"
+        android:strokeLineJoin="round"/>
+    <path
+        android:name="path_8"
+        android:pathData="M 62.02 45.158 C 63.235 45.158 64.219 46.452 64.219 48.05 C 64.219 49.65 63.235 50.946 62.02 50.946 C 60.805 50.946 59.821 49.65 59.821 48.05 C 59.821 46.452 60.805 45.158 62.02 45.158 Z"
+        android:fillColor="#674600"
+        android:strokeColor="#674600"
+        android:strokeWidth="0.1"
+        android:strokeLineJoin="round"/>
+    <path
+        android:name="path_9"
+        android:pathData="M 44.687 42.102 C 44.687 42.102 48.404 40.049 53.119 42.102"
+        android:strokeColor="#674600"
+        android:strokeWidth="2"
+        android:strokeLineCap="round"
+        android:strokeLineJoin="round"
+        android:fillType="evenOdd"/>
+    <path
+        android:name="path_10"
+        android:pathData="M 58.035 42.102 C 58.035 42.102 61.751 40.049 66.465 42.102"
+        android:strokeColor="#674600"
+        android:strokeWidth="2"
+        android:strokeLineCap="round"
+        android:strokeLineJoin="round"
+        android:fillType="evenOdd"/>
+    <path
+        android:name="path_11"
+        android:pathData="M 49.191 56.685 C 49.191 56.685 51.703 59.685 56.992 59.685"
+        android:strokeColor="#674600"
+        android:strokeWidth="2"
+        android:strokeLineCap="round"
+        android:strokeLineJoin="round"
+        android:fillType="evenOdd"/>
+    <path
+        android:name="path_12"
+        android:pathData="M 34.072 67.511 C 34.072 67.511 34.524 66.248 37.476 63.634 C 37.476 63.634 39.143 61.991 37.876 58.114 C 37.876 58.114 37.534 56.06 39.681 57.255 C 39.681 57.255 44.129 60.46 40.871 65 C 40.871 65 40.241 66.117 41.652 65.78 L 53.939 63.103 C 53.939 63.103 55.275 62.752 55.535 64.163 C 55.535 64.163 55.696 65.372 54.641 65.672 L 47.742 67.378 C 47.742 67.378 50.72 69.597 47.742 70.825 C 47.742 70.825 50.294 72.779 47.336 74.268 C 47.336 74.268 49.276 76.015 46.407 77.019 C 46.407 77.019 42.525 78.474 39.209 77.831 C 35.509 77.103 31.947 72.114 34.072 67.511 Z"
+        android:fillColor="#f4900c"
+        android:strokeColor="#f4900c"
+        android:strokeLineCap="round"
+        android:strokeLineJoin="round"
+        android:strokeWidth="0.1"
+        android:fillType="evenOdd"/>
+    <path
+        android:name="path_13"
+        android:pathData="M 56.182 67.511 C 56.182 67.511 56.633 66.248 59.585 63.634 C 59.585 63.634 61.253 61.991 59.985 58.114 C 59.985 58.114 59.642 56.06 61.789 57.255 C 61.789 57.255 66.239 60.46 62.98 65 C 62.98 65 62.351 66.117 63.761 65.78 L 76.066 63.103 C 76.066 63.103 77.386 62.752 77.641 64.163 C 77.641 64.163 77.812 65.372 76.746 65.672 L 69.85 67.378 C 69.85 67.378 72.829 69.597 69.85 70.825 C 69.85 70.825 72.404 72.779 69.446 74.268 C 69.446 74.268 71.387 76.015 68.516 77.019 C 68.516 77.019 64.633 78.474 61.317 77.831 C 57.618 77.103 54.057 72.114 56.182 67.511 Z"
+        android:fillColor="#f4900c"
+        android:strokeColor="#f4900c"
+        android:strokeLineCap="round"
+        android:strokeLineJoin="round"
+        android:strokeWidth="0.1"
+        android:fillType="evenOdd"/>
 </vector>

app/src/debug/res/drawable/ic_migrate_direction.xml

@@ -0,0 +1,6 @@
+<vector android:height="100dp"
+    android:viewportHeight="24.0" android:viewportWidth="24.0"
+    android:width="100dp" xmlns:android="http://schemas.android.com/apk/res/android"
+    android:tint="?attr/colorControlNormal">
+    <path android:fillColor="@android:color/white" android:pathData="M7,10l5,5 -5,5z"/>
+</vector>

app/src/debug/res/mipmap-anydpi-v26/ic_launcher.xml

@@ -2,5 +2,4 @@
 <adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
     <background android:drawable="@android:color/transparent"/>
     <foreground android:drawable="@drawable/ic_launcher_foreground"/>
-    <monochrome android:drawable="@drawable/ic_tachi_monochrome_launcher" />
 </adaptive-icon>

app/src/debug/res/mipmap-anydpi-v26/ic_launcher_round.xml

@@ -2,5 +2,4 @@
 <adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
     <background android:drawable="@android:color/transparent"/>
     <foreground android:drawable="@drawable/ic_launcher_foreground"/>
-    <monochrome android:drawable="@drawable/ic_tachi_monochrome_launcher" />
 </adaptive-icon>

app/src/main/AndroidManifest.xml

@@ -1,58 +1,45 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools">
+    xmlns:tools="http://schemas.android.com/tools"
+    package="eu.kanade.tachiyomi">
 
-    <!-- Internet -->
     <uses-permission android:name="android.permission.INTERNET" />
     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
     <uses-permission android:name="android.permission.ACCESS_WIFI_STATE" />
-
-    <!-- Storage -->
     <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
-
-    <!-- For background jobs -->
-    <uses-permission android:name="android.permission.FOREGROUND_SERVICE" />
     <uses-permission android:name="android.permission.WAKE_LOCK" />
+    <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" />
     <uses-permission android:name="android.permission.REQUEST_IGNORE_BATTERY_OPTIMIZATIONS" />
-
-    <!-- For managing extensions -->
     <uses-permission android:name="android.permission.REQUEST_INSTALL_PACKAGES" />
     <uses-permission android:name="android.permission.REQUEST_DELETE_PACKAGES" />
-    <uses-permission android:name="android.permission.UPDATE_PACKAGES_WITHOUT_USER_ACTION" />
-    <!-- To view extension packages in API 30+ -->
-    <uses-permission android:name="android.permission.QUERY_ALL_PACKAGES" />
-
-    <uses-permission android:name="android.permission.POST_NOTIFICATIONS" />
-    <uses-permission android:name="android.permission.READ_APP_SPECIFIC_LOCALES" />
-
-    <!-- Remove permission from Firebase dependency -->
-    <uses-permission android:name="com.google.android.gms.permission.AD_ID"
-        tools:node="remove" />
+    <uses-permission android:name="android.permission.FOREGROUND_SERVICE" />
+    <uses-permission android:name="com.android.launcher.permission.INSTALL_SHORTCUT" />
+    <uses-permission android:name="android.permission.USE_FINGERPRINT" />
+    <uses-permission android:name="android.permission.GET_TASKS" />
+    <uses-permission
+        android:name="android.permission.PACKAGE_USAGE_STATS"
+        tools:ignore="ProtectedPermissions" />
+    <!-- Lock vibrate -->
+    <uses-permission android:name="android.permission.VIBRATE" />
 
     <application
         android:name=".App"
-        android:allowBackup="false"
+        android:allowBackup="true"
+        android:fullBackupContent="@xml/backup_rules"
         android:hardwareAccelerated="true"
+        android:hasFragileUserData="true"
         android:icon="@mipmap/ic_launcher"
         android:label="@string/app_name"
         android:largeHeap="true"
-        android:localeConfig="@xml/locales_config"
         android:requestLegacyExternalStorage="true"
         android:roundIcon="@mipmap/ic_launcher_round"
-        android:theme="@style/Theme.Tachiyomi"
-        android:supportsRtl="true"
-        android:networkSecurityConfig="@xml/network_security_config">
-
-        <!-- enable profiling by macrobenchmark -->
-        <profileable
-            android:shell="true"
-            tools:targetApi="q" />
-
+        android:networkSecurityConfig="@xml/network_security_config"
+        android:theme="@style/Theme.Tachiyomi.Light"
+        android:usesCleartextTraffic="true">
         <activity
             android:name=".ui.main.MainActivity"
             android:launchMode="singleTop"
-            android:theme="@style/Theme.Tachiyomi.SplashScreen"
-            android:exported="true">
+            android:theme="@style/Theme.Splash">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
                 <category android:name="android.intent.category.LAUNCHER" />
@@ -62,18 +49,15 @@
                 android:name="android.app.shortcuts"
                 android:resource="@xml/shortcuts" />
         </activity>
-
         <activity
-            android:process=":error_handler"
-            android:name=".crash.CrashActivity"
-            android:exported="false" />
-
+            android:name=".ui.main.ForceCloseActivity"
+            android:clearTaskOnLaunch="true"
+            android:noHistory="true"
+            android:theme="@android:style/Theme.NoDisplay" />
         <activity
             android:name=".ui.main.DeepLinkActivity"
             android:launchMode="singleTask"
-            android:theme="@android:style/Theme.NoDisplay"
-            android:label="@string/action_global_search"
-            android:exported="true">
+            android:theme="@android:style/Theme.NoDisplay">
             <intent-filter>
                 <action android:name="android.intent.action.SEARCH" />
                 <action android:name="com.google.android.gms.actions.SEARCH_ACTION" />
@@ -84,48 +68,27 @@
                 <action android:name="eu.kanade.tachiyomi.SEARCH" />
                 <category android:name="android.intent.category.DEFAULT" />
             </intent-filter>
-            <intent-filter>
-                <action android:name="android.intent.action.SEND" />
-                <category android:name="android.intent.category.DEFAULT" />
-                <data android:mimeType="text/plain" />
-            </intent-filter>
 
             <meta-data
                 android:name="android.app.searchable"
                 android:resource="@xml/searchable" />
         </activity>
-
         <activity
             android:name=".ui.reader.ReaderActivity"
-            android:launchMode="singleTask"
-            android:exported="false">
-            <intent-filter>
-                <action android:name="com.samsung.android.support.REMOTE_ACTION" />
-            </intent-filter>
-
-            <meta-data android:name="com.samsung.android.support.REMOTE_ACTION"
-                android:resource="@xml/s_pen_actions"/>
-        </activity>
-
+            android:launchMode="singleTask" />
         <activity
-            android:name=".ui.security.UnlockActivity"
-            android:theme="@style/Theme.Tachiyomi"
-            android:exported="false" />
-
+            android:name=".ui.security.BiometricUnlockActivity"
+            android:theme="@style/Theme.Splash" />
         <activity
             android:name=".ui.webview.WebViewActivity"
-            android:configChanges="uiMode|orientation|screenSize"
-            android:exported="false" />
-
+            android:configChanges="uiMode|orientation|screenSize" />
         <activity
-            android:name=".extension.util.ExtensionInstallActivity"
-            android:theme="@android:style/Theme.Translucent.NoTitleBar"
-            android:exported="false" />
-
+            android:name=".widget.CustomLayoutPickerActivity"
+            android:label="@string/app_name"
+            android:theme="@style/FilePickerTheme" />
         <activity
             android:name=".ui.setting.track.AnilistLoginActivity"
-            android:label="Anilist"
-            android:exported="true">
+            android:label="Anilist">
             <intent-filter>
                 <action android:name="android.intent.action.VIEW" />
 
@@ -137,25 +100,9 @@
                     android:scheme="tachiyomi" />
             </intent-filter>
         </activity>
-        <activity
-            android:name=".ui.setting.track.MyAnimeListLoginActivity"
-            android:label="MyAnimeList"
-            android:exported="true">
-            <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:host="myanimelist-auth"
-                    android:scheme="tachiyomi" />
-            </intent-filter>
-        </activity>
         <activity
             android:name=".ui.setting.track.ShikimoriLoginActivity"
-            android:label="Shikimori"
-            android:exported="true">
+            android:label="Shikimori">
             <intent-filter>
                 <action android:name="android.intent.action.VIEW" />
 
@@ -169,8 +116,7 @@
         </activity>
         <activity
             android:name=".ui.setting.track.BangumiLoginActivity"
-            android:label="Bangumi"
-            android:exported="true">
+            android:label="Bangumi">
             <intent-filter>
                 <action android:name="android.intent.action.VIEW" />
 
@@ -183,51 +129,16 @@
             </intent-filter>
         </activity>
 
-        <receiver
-            android:name=".data.notification.NotificationReceiver"
-            android:exported="false" />
+        <activity
+            android:name=".extension.util.ExtensionInstallActivity"
+            android:theme="@android:style/Theme.Translucent.NoTitleBar" />
 
-        <receiver
-            android:name="tachiyomi.presentation.widget.UpdatesGridGlanceReceiver"
-            android:enabled="@bool/glance_appwidget_available"
-            android:exported="false"
-            android:label="@string/label_recent_updates">
-            <intent-filter>
-                <action android:name="android.appwidget.action.APPWIDGET_UPDATE" />
-            </intent-filter>
-
-            <meta-data
-                android:name="android.appwidget.provider"
-                android:resource="@xml/updates_grid_glance_widget_info" />
-        </receiver>
-
-        <service
-            android:name=".data.library.LibraryUpdateService"
-            android:exported="false" />
-
-        <service
-            android:name=".data.download.DownloadService"
-            android:exported="false" />
-
-        <service
-            android:name=".data.updater.AppUpdateService"
-            android:exported="false" />
-
-        <service
-            android:name=".data.backup.BackupRestoreService"
-            android:exported="false" />
-
-        <service android:name=".extension.util.ExtensionInstallService"
-            android:exported="false" />
-
-        <service
-            android:name="androidx.appcompat.app.AppLocalesMetadataHolderService"
-            android:enabled="false"
-            android:exported="false">
-            <meta-data
-                android:name="autoStoreLocales"
-                android:value="true" />
-        </service>
+        <activity
+            android:name="com.google.android.gms.oss.licenses.OssLicensesMenuActivity"
+            android:theme="@style/Theme.MaterialComponents" />
+        <activity
+            android:name="com.google.android.gms.oss.licenses.OssLicensesActivity"
+            android:theme="@style/Theme.MaterialComponents" />
 
         <provider
             android:name="androidx.core.content.FileProvider"
@@ -239,26 +150,163 @@
                 android:resource="@xml/provider_paths" />
         </provider>
 
-        <provider
-            android:name="rikka.shizuku.ShizukuProvider"
-            android:authorities="${applicationId}.shizuku"
-            android:multiprocess="false"
-            android:enabled="true"
-            android:exported="true"
-            android:permission="android.permission.INTERACT_ACROSS_USERS_FULL" />
+        <receiver
+            android:name=".data.notification.NotificationReceiver"
+            android:exported="false" />
 
-        <meta-data
-            android:name="android.webkit.WebView.EnableSafeBrowsing"
-            android:value="false" />
-        <meta-data
-            android:name="android.webkit.WebView.MetricsOptOut"
-            android:value="true" />
+        <service
+            android:name=".data.library.LibraryUpdateService"
+            android:exported="false" />
 
-        <!-- Disable advertising ID collection for Firebase -->
-        <meta-data
-            android:name="google_analytics_adid_collection_enabled"
-            android:value="false" />
+        <service
+            android:name=".data.download.DownloadService"
+            android:exported="false" />
 
+        <service
+            android:name=".data.updater.UpdaterService"
+            android:exported="false" />
+
+        <service
+            android:name=".data.backup.BackupCreateService"
+            android:exported="false" />
+
+        <service
+            android:name=".data.backup.BackupRestoreService"
+            android:exported="false" />
+
+        <!-- EH -->
+        <service
+            android:name="exh.eh.EHentaiUpdateWorker"
+            android:permission="android.permission.BIND_JOB_SERVICE"
+            android:exported="true" />
+        <activity
+            android:name="exh.ui.intercept.InterceptActivity"
+            android:label="TachiyomiEH"
+            android:theme="@style/Theme.EHActivity">
+            <intent-filter>
+                <action android:name="android.intent.action.VIEW" />
+
+                <category android:name="android.intent.category.DEFAULT" />
+                <category android:name="android.intent.category.BROWSABLE" />
+
+                <!-- EH -->
+                <data
+                    android:host="g.e-hentai.org"
+                    android:pathPrefix="/g/"
+                    android:scheme="http" />
+                <data
+                    android:host="g.e-hentai.org"
+                    android:pathPrefix="/g/"
+                    android:scheme="https" />
+                <data
+                    android:host="e-hentai.org"
+                    android:pathPrefix="/g/"
+                    android:scheme="http" />
+                <data
+                    android:host="e-hentai.org"
+                    android:pathPrefix="/g/"
+                    android:scheme="https" />
+
+                <!-- EXH -->
+                <data
+                    android:host="exhentai.org"
+                    android:pathPrefix="/g/"
+                    android:scheme="http" />
+                <data
+                    android:host="exhentai.org"
+                    android:pathPrefix="/g/"
+                    android:scheme="https" />
+
+                <!-- nhentai -->
+                <data
+                    android:host="nhentai.net"
+                    android:pathPrefix="/g/"
+                    android:scheme="http" />
+                <data
+                    android:host="nhentai.net"
+                    android:pathPrefix="/g/"
+                    android:scheme="https" />
+
+                <!-- Perv Eden -->
+                <data
+                    android:host="www.perveden.com"
+                    android:pathPattern="/.*/.*-manga/.*"
+                    android:scheme="http" />
+                <data
+                    android:host="www.perveden.com"
+                    android:pathPattern="/.*/.*-manga/.*"
+                    android:scheme="https" />
+
+                <!-- Hentai Cafe -->
+                <data
+                    android:host="hentai.cafe"
+                    android:pathPattern="/.*/.*"
+                    android:scheme="http" />
+                <data
+                    android:host="hentai.cafe"
+                    android:pathPattern="/.*/.*"
+                    android:scheme="https" />
+
+                <!-- Tsumino -->
+                <data
+                    android:host="www.tsumino.com"
+                    android:pathPrefix="/Book/Info/"
+                    android:scheme="http" />
+                <data
+                    android:host="www.tsumino.com"
+                    android:pathPrefix="/Book/Info/"
+                    android:scheme="https" />
+                <data
+                    android:host="www.tsumino.com"
+                    android:pathPrefix="/Read/View/"
+                    android:scheme="http" />
+                <data
+                    android:host="www.tsumino.com"
+                    android:pathPrefix="/Read/View/"
+                    android:scheme="https" />
+
+                 <!-- Hitomi.la -->
+                <data
+                    android:host="hitomi.la"
+                    android:pathPrefix="/galleries/"
+                    android:scheme="http" />
+                <data
+                    android:host="hitomi.la"
+                    android:pathPrefix="/reader/"
+                    android:scheme="http" />
+                <data
+                    android:host="hitomi.la"
+                    android:pathPrefix="/galleries/"
+                    android:scheme="https" />
+                <data
+                    android:host="hitomi.la"
+                    android:pathPrefix="/reader/"
+                    android:scheme="https" />
+
+                <!-- Pururin.io -->
+                <data
+                    android:host="pururin.io"
+                    android:pathPrefix="/gallery/"
+                    android:scheme="http" />
+                <data
+                    android:host="pururin.io"
+                    android:pathPrefix="/gallery/"
+                    android:scheme="https" />
+
+                <!-- HBrowse -->
+                <data
+                    android:host="www.hbrowse.com"
+                    android:pathPrefix="/"
+                    android:scheme="http" />
+                <data
+                    android:host="www.hbrowse.com"
+                    android:pathPrefix="/"
+                    android:scheme="https" />
+            </intent-filter>
+        </activity>
+        <activity
+            android:name="exh.ui.captcha.BrowserActionActivity"
+            android:theme="@style/Theme.EHActivity" />
     </application>
 
 </manifest>

app/src/main/java/eu/kanade/core/prefs/CheckboxState.kt

@@ -1,55 +0,0 @@
-package eu.kanade.core.prefs
-
-import androidx.compose.ui.state.ToggleableState
-
-sealed class CheckboxState<T>(open val value: T) {
-    abstract fun next(): CheckboxState<T>
-
-    sealed class State<T>(override val value: T) : CheckboxState<T>(value) {
-        data class Checked<T>(override val value: T) : State<T>(value)
-        data class None<T>(override val value: T) : State<T>(value)
-
-        val isChecked: Boolean
-            get() = this is Checked
-
-        override fun next(): CheckboxState<T> {
-            return when (this) {
-                is Checked -> None(value)
-                is None -> Checked(value)
-            }
-        }
-    }
-    sealed class TriState<T>(override val value: T) : CheckboxState<T>(value) {
-        data class Include<T>(override val value: T) : TriState<T>(value)
-        data class Exclude<T>(override val value: T) : TriState<T>(value)
-        data class None<T>(override val value: T) : TriState<T>(value)
-
-        override fun next(): CheckboxState<T> {
-            return when (this) {
-                is Exclude -> None(value)
-                is Include -> Exclude(value)
-                is None -> Include(value)
-            }
-        }
-
-        fun asState(): ToggleableState {
-            return when (this) {
-                is Exclude -> ToggleableState.Indeterminate
-                is Include -> ToggleableState.On
-                is None -> ToggleableState.Off
-            }
-        }
-    }
-}
-
-inline fun <T> T.asCheckboxState(condition: (T) -> Boolean): CheckboxState.State<T> {
-    return if (condition(this)) {
-        CheckboxState.State.Checked(this)
-    } else {
-        CheckboxState.State.None(this)
-    }
-}
-
-inline fun <T> List<T>.mapAsCheckboxState(condition: (T) -> Boolean): List<CheckboxState.State<T>> {
-    return this.map { it.asCheckboxState(condition) }
-}

app/src/main/java/eu/kanade/core/prefs/PreferenceMutableState.kt

@@ -1,38 +0,0 @@
-package eu.kanade.core.prefs
-
-import androidx.compose.runtime.MutableState
-import androidx.compose.runtime.mutableStateOf
-import kotlinx.coroutines.CoroutineScope
-import kotlinx.coroutines.flow.launchIn
-import kotlinx.coroutines.flow.onEach
-import tachiyomi.core.preference.Preference
-
-class PreferenceMutableState<T>(
-    private val preference: Preference<T>,
-    scope: CoroutineScope,
-) : MutableState<T> {
-
-    private val state = mutableStateOf(preference.get())
-
-    init {
-        preference.changes()
-            .onEach { state.value = it }
-            .launchIn(scope)
-    }
-
-    override var value: T
-        get() = state.value
-        set(value) {
-            preference.set(value)
-        }
-
-    override fun component1(): T {
-        return state.value
-    }
-
-    override fun component2(): (T) -> Unit {
-        return { preference.set(it) }
-    }
-}
-
-fun <T> Preference<T>.asState(scope: CoroutineScope) = PreferenceMutableState(this, scope)

app/src/main/java/eu/kanade/core/util/CollectionUtils.kt

@@ -1,148 +0,0 @@
-package eu.kanade.core.util
-
-import androidx.compose.ui.util.fastForEach
-import java.util.concurrent.ConcurrentHashMap
-import kotlin.contracts.ExperimentalContracts
-import kotlin.contracts.contract
-
-fun <T : R, R : Any> List<T>.insertSeparators(
-    generator: (T?, T?) -> R?,
-): List<R> {
-    if (isEmpty()) return emptyList()
-    val newList = mutableListOf<R>()
-    for (i in -1..lastIndex) {
-        val before = getOrNull(i)
-        before?.let { newList.add(it) }
-        val after = getOrNull(i + 1)
-        val separator = generator.invoke(before, after)
-        separator?.let { newList.add(it) }
-    }
-    return newList
-}
-
-/**
- * Returns a new map containing only the key entries of [transform] that are not null.
- */
-inline fun <K, V, R> Map<out K, V>.mapNotNullKeys(transform: (Map.Entry<K?, V>) -> R?): ConcurrentHashMap<R, V> {
-    val mutableMap = ConcurrentHashMap<R, V>()
-    forEach { element -> transform(element)?.let { mutableMap[it] = element.value } }
-    return mutableMap
-}
-
-fun <E> HashSet<E>.addOrRemove(value: E, shouldAdd: Boolean) {
-    if (shouldAdd) {
-        add(value)
-    } else {
-        remove(value)
-    }
-}
-
-/**
- * Returns a list containing only elements matching the given [predicate].
- *
- * **Do not use for collections that come from public APIs**, since they may not support random
- * access in an efficient way, and this method may actually be a lot slower. Only use for
- * collections that are created by code we control and are known to support random access.
- */
-@OptIn(ExperimentalContracts::class)
-inline fun <T> List<T>.fastFilter(predicate: (T) -> Boolean): List<T> {
-    contract { callsInPlace(predicate) }
-    val destination = ArrayList<T>()
-    fastForEach { if (predicate(it)) destination.add(it) }
-    return destination
-}
-
-/**
- * Returns a list containing all elements not matching the given [predicate].
- *
- * **Do not use for collections that come from public APIs**, since they may not support random
- * access in an efficient way, and this method may actually be a lot slower. Only use for
- * collections that are created by code we control and are known to support random access.
- */
-@OptIn(ExperimentalContracts::class)
-inline fun <T> List<T>.fastFilterNot(predicate: (T) -> Boolean): List<T> {
-    contract { callsInPlace(predicate) }
-    val destination = ArrayList<T>()
-    fastForEach { if (!predicate(it)) destination.add(it) }
-    return destination
-}
-
-/**
- * Returns a list containing only the non-null results of applying the
- * given [transform] function to each element in the original collection.
- *
- * **Do not use for collections that come from public APIs**, since they may not support random
- * access in an efficient way, and this method may actually be a lot slower. Only use for
- * collections that are created by code we control and are known to support random access.
- */
-@OptIn(ExperimentalContracts::class)
-inline fun <T, R> List<T>.fastMapNotNull(transform: (T) -> R?): List<R> {
-    contract { callsInPlace(transform) }
-    val destination = ArrayList<R>()
-    fastForEach { element ->
-        transform(element)?.let { destination.add(it) }
-    }
-    return destination
-}
-
-/**
- * Splits the original collection into pair of lists,
- * where *first* list contains elements for which [predicate] yielded `true`,
- * while *second* list contains elements for which [predicate] yielded `false`.
- *
- * **Do not use for collections that come from public APIs**, since they may not support random
- * access in an efficient way, and this method may actually be a lot slower. Only use for
- * collections that are created by code we control and are known to support random access.
- */
-@OptIn(ExperimentalContracts::class)
-inline fun <T> List<T>.fastPartition(predicate: (T) -> Boolean): Pair<List<T>, List<T>> {
-    contract { callsInPlace(predicate) }
-    val first = ArrayList<T>()
-    val second = ArrayList<T>()
-    fastForEach {
-        if (predicate(it)) {
-            first.add(it)
-        } else {
-            second.add(it)
-        }
-    }
-    return Pair(first, second)
-}
-
-/**
- * Returns the number of entries not matching the given [predicate].
- *
- * **Do not use for collections that come from public APIs**, since they may not support random
- * access in an efficient way, and this method may actually be a lot slower. Only use for
- * collections that are created by code we control and are known to support random access.
- */
-@OptIn(ExperimentalContracts::class)
-inline fun <T> List<T>.fastCountNot(predicate: (T) -> Boolean): Int {
-    contract { callsInPlace(predicate) }
-    var count = size
-    fastForEach { if (predicate(it)) --count }
-    return count
-}
-
-/**
- * Returns a list containing only elements from the given collection
- * having distinct keys returned by the given [selector] function.
- *
- * Among elements of the given collection with equal keys, only the first one will be present in the resulting list.
- * The elements in the resulting list are in the same order as they were in the source collection.
- *
- * **Do not use for collections that come from public APIs**, since they may not support random
- * access in an efficient way, and this method may actually be a lot slower. Only use for
- * collections that are created by code we control and are known to support random access.
- */
-@OptIn(ExperimentalContracts::class)
-inline fun <T, K> List<T>.fastDistinctBy(selector: (T) -> K): List<T> {
-    contract { callsInPlace(selector) }
-    val set = HashSet<K>()
-    val list = ArrayList<T>()
-    fastForEach {
-        val key = selector(it)
-        if (set.add(key)) list.add(it)
-    }
-    return list
-}

app/src/main/java/eu/kanade/core/util/DurationUtils.kt

@@ -1,16 +0,0 @@
-package eu.kanade.core.util
-
-import android.content.Context
-import eu.kanade.tachiyomi.R
-import kotlin.time.Duration
-
-fun Duration.toDurationString(context: Context, fallback: String): String {
-    return toComponents { days, hours, minutes, seconds, _ ->
-        buildList(4) {
-            if (days != 0L) add(context.getString(R.string.day_short, days))
-            if (hours != 0) add(context.getString(R.string.hour_short, hours))
-            if (minutes != 0 && (days == 0L || hours == 0)) add(context.getString(R.string.minute_short, minutes))
-            if (seconds != 0 && days == 0L && hours == 0) add(context.getString(R.string.seconds_short, seconds))
-        }.joinToString(" ").ifBlank { fallback }
-    }
-}

app/src/main/java/eu/kanade/core/util/RxJavaExtensions.kt

@@ -1,61 +0,0 @@
-package eu.kanade.core.util
-
-import kotlinx.coroutines.CancellationException
-import kotlinx.coroutines.CoroutineStart
-import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.GlobalScope
-import kotlinx.coroutines.channels.awaitClose
-import kotlinx.coroutines.flow.Flow
-import kotlinx.coroutines.flow.callbackFlow
-import kotlinx.coroutines.launch
-import rx.Emitter
-import rx.Observable
-import rx.Observer
-import kotlin.coroutines.CoroutineContext
-
-fun <T : Any> Observable<T>.asFlow(): Flow<T> = callbackFlow {
-    val observer = object : Observer<T> {
-        override fun onNext(t: T) {
-            trySend(t)
-        }
-
-        override fun onError(e: Throwable) {
-            close(e)
-        }
-
-        override fun onCompleted() {
-            close()
-        }
-    }
-    val subscription = subscribe(observer)
-    awaitClose { subscription.unsubscribe() }
-}
-
-fun <T : Any> Flow<T>.asObservable(
-    context: CoroutineContext = Dispatchers.Unconfined,
-    backpressureMode: Emitter.BackpressureMode = Emitter.BackpressureMode.NONE,
-): Observable<T> {
-    return Observable.create(
-        { emitter ->
-            /*
-             * ATOMIC is used here to provide stable behaviour of subscribe+dispose pair even if
-             * asObservable is already invoked from unconfined
-             */
-            val job = GlobalScope.launch(context = context, start = CoroutineStart.ATOMIC) {
-                try {
-                    collect { emitter.onNext(it) }
-                    emitter.onCompleted()
-                } catch (e: Throwable) {
-                    // Ignore `CancellationException` as error, since it indicates "normal cancellation"
-                    if (e !is CancellationException) {
-                        emitter.onError(e)
-                    } else {
-                        emitter.onCompleted()
-                    }
-                }
-            }
-            emitter.setCancellation { job.cancel() }
-        },
-        backpressureMode,
-    )
-}

app/src/main/java/eu/kanade/data/source/SourceMapper.kt

@@ -1,19 +0,0 @@
-package eu.kanade.data.source
-
-import eu.kanade.tachiyomi.source.CatalogueSource
-import eu.kanade.tachiyomi.source.SourceManager
-import tachiyomi.domain.source.model.Source
-
-val sourceMapper: (eu.kanade.tachiyomi.source.Source) -> Source = { source ->
-    Source(
-        source.id,
-        source.lang,
-        source.name,
-        supportsLatest = false,
-        isStub = source is SourceManager.StubSource,
-    )
-}
-
-val catalogueSourceMapper: (CatalogueSource) -> Source = { source ->
-    sourceMapper(source).copy(supportsLatest = source.supportsLatest)
-}

app/src/main/java/eu/kanade/data/source/SourcePagingSource.kt

@@ -1,64 +0,0 @@
-package eu.kanade.data.source
-
-import androidx.paging.PagingState
-import eu.kanade.domain.source.model.SourcePagingSourceType
-import eu.kanade.tachiyomi.source.CatalogueSource
-import eu.kanade.tachiyomi.source.model.FilterList
-import eu.kanade.tachiyomi.source.model.MangasPage
-import eu.kanade.tachiyomi.source.model.SManga
-import tachiyomi.core.util.lang.awaitSingle
-import tachiyomi.core.util.lang.withIOContext
-
-abstract class SourcePagingSource(
-    protected val source: CatalogueSource,
-) : SourcePagingSourceType() {
-
-    abstract suspend fun requestNextPage(currentPage: Int): MangasPage
-
-    override suspend fun load(params: LoadParams<Long>): LoadResult<Long, SManga> {
-        val page = params.key ?: 1
-
-        val mangasPage = try {
-            withIOContext {
-                requestNextPage(page.toInt())
-                    .takeIf { it.mangas.isNotEmpty() }
-                    ?: throw NoResultsException()
-            }
-        } catch (e: Exception) {
-            return LoadResult.Error(e)
-        }
-
-        return LoadResult.Page(
-            data = mangasPage.mangas,
-            prevKey = null,
-            nextKey = if (mangasPage.hasNextPage) page + 1 else null,
-        )
-    }
-
-    override fun getRefreshKey(state: PagingState<Long, SManga>): Long? {
-        return state.anchorPosition?.let { anchorPosition ->
-            val anchorPage = state.closestPageToPosition(anchorPosition)
-            anchorPage?.prevKey ?: anchorPage?.nextKey
-        }
-    }
-}
-
-class SourceSearchPagingSource(source: CatalogueSource, val query: String, val filters: FilterList) : SourcePagingSource(source) {
-    override suspend fun requestNextPage(currentPage: Int): MangasPage {
-        return source.fetchSearchManga(currentPage, query, filters).awaitSingle()
-    }
-}
-
-class SourcePopularPagingSource(source: CatalogueSource) : SourcePagingSource(source) {
-    override suspend fun requestNextPage(currentPage: Int): MangasPage {
-        return source.fetchPopularManga(currentPage).awaitSingle()
-    }
-}
-
-class SourceLatestPagingSource(source: CatalogueSource) : SourcePagingSource(source) {
-    override suspend fun requestNextPage(currentPage: Int): MangasPage {
-        return source.fetchLatestUpdates(currentPage).awaitSingle()
-    }
-}
-
-class NoResultsException : Exception()

app/src/main/java/eu/kanade/data/source/SourceRepositoryImpl.kt

@@ -1,74 +0,0 @@
-package eu.kanade.data.source
-
-import eu.kanade.domain.source.model.SourcePagingSourceType
-import eu.kanade.domain.source.repository.SourceRepository
-import eu.kanade.tachiyomi.source.CatalogueSource
-import eu.kanade.tachiyomi.source.LocalSource
-import eu.kanade.tachiyomi.source.SourceManager
-import eu.kanade.tachiyomi.source.model.FilterList
-import kotlinx.coroutines.flow.Flow
-import kotlinx.coroutines.flow.map
-import tachiyomi.data.DatabaseHandler
-import tachiyomi.domain.source.model.Source
-import tachiyomi.domain.source.model.SourceWithCount
-
-class SourceRepositoryImpl(
-    private val sourceManager: SourceManager,
-    private val handler: DatabaseHandler,
-) : SourceRepository {
-
-    override fun getSources(): Flow<List<Source>> {
-        return sourceManager.catalogueSources.map { sources ->
-            sources.map(catalogueSourceMapper)
-        }
-    }
-
-    override fun getOnlineSources(): Flow<List<Source>> {
-        return sourceManager.onlineSources.map { sources ->
-            sources.map(sourceMapper)
-        }
-    }
-
-    override fun getSourcesWithFavoriteCount(): Flow<List<Pair<Source, Long>>> {
-        val sourceIdWithFavoriteCount = handler.subscribeToList { mangasQueries.getSourceIdWithFavoriteCount() }
-        return sourceIdWithFavoriteCount.map { sourceIdsWithCount ->
-            sourceIdsWithCount
-                .filterNot { it.source == LocalSource.ID }
-                .map { (sourceId, count) ->
-                    val source = sourceManager.getOrStub(sourceId).run {
-                        sourceMapper(this)
-                    }
-                    source to count
-                }
-        }
-    }
-
-    override fun getSourcesWithNonLibraryManga(): Flow<List<SourceWithCount>> {
-        val sourceIdWithNonLibraryManga = handler.subscribeToList { mangasQueries.getSourceIdsWithNonLibraryManga() }
-        return sourceIdWithNonLibraryManga.map { sourceId ->
-            sourceId.map { (sourceId, count) ->
-                val source = sourceManager.getOrStub(sourceId)
-                SourceWithCount(sourceMapper(source), count)
-            }
-        }
-    }
-
-    override fun search(
-        sourceId: Long,
-        query: String,
-        filterList: FilterList,
-    ): SourcePagingSourceType {
-        val source = sourceManager.get(sourceId) as CatalogueSource
-        return SourceSearchPagingSource(source, query, filterList)
-    }
-
-    override fun getPopular(sourceId: Long): SourcePagingSourceType {
-        val source = sourceManager.get(sourceId) as CatalogueSource
-        return SourcePopularPagingSource(source)
-    }
-
-    override fun getLatest(sourceId: Long): SourcePagingSourceType {
-        val source = sourceManager.get(sourceId) as CatalogueSource
-        return SourceLatestPagingSource(source)
-    }
-}

app/src/main/java/eu/kanade/domain/DomainModule.kt

@@ -1,147 +0,0 @@
-package eu.kanade.domain
-
-import eu.kanade.data.source.SourceRepositoryImpl
-import eu.kanade.domain.category.interactor.CreateCategoryWithName
-import eu.kanade.domain.category.interactor.DeleteCategory
-import eu.kanade.domain.category.interactor.RenameCategory
-import eu.kanade.domain.category.interactor.ReorderCategory
-import eu.kanade.domain.category.interactor.ResetCategoryFlags
-import eu.kanade.domain.category.interactor.SetDisplayModeForCategory
-import eu.kanade.domain.category.interactor.SetMangaCategories
-import eu.kanade.domain.category.interactor.SetSortModeForCategory
-import eu.kanade.domain.category.interactor.UpdateCategory
-import eu.kanade.domain.chapter.interactor.GetChapter
-import eu.kanade.domain.chapter.interactor.GetChapterByMangaId
-import eu.kanade.domain.chapter.interactor.SetMangaDefaultChapterFlags
-import eu.kanade.domain.chapter.interactor.SetReadStatus
-import eu.kanade.domain.chapter.interactor.SyncChaptersWithSource
-import eu.kanade.domain.chapter.interactor.SyncChaptersWithTrackServiceTwoWay
-import eu.kanade.domain.chapter.interactor.UpdateChapter
-import eu.kanade.domain.download.interactor.DeleteDownload
-import eu.kanade.domain.extension.interactor.GetExtensionLanguages
-import eu.kanade.domain.extension.interactor.GetExtensionSources
-import eu.kanade.domain.extension.interactor.GetExtensionsByType
-import eu.kanade.domain.history.interactor.GetNextChapters
-import eu.kanade.domain.manga.interactor.GetDuplicateLibraryManga
-import eu.kanade.domain.manga.interactor.GetFavorites
-import eu.kanade.domain.manga.interactor.GetLibraryManga
-import eu.kanade.domain.manga.interactor.GetManga
-import eu.kanade.domain.manga.interactor.GetMangaWithChapters
-import eu.kanade.domain.manga.interactor.NetworkToLocalManga
-import eu.kanade.domain.manga.interactor.ResetViewerFlags
-import eu.kanade.domain.manga.interactor.SetMangaChapterFlags
-import eu.kanade.domain.manga.interactor.SetMangaViewerFlags
-import eu.kanade.domain.manga.interactor.UpdateManga
-import eu.kanade.domain.source.interactor.GetEnabledSources
-import eu.kanade.domain.source.interactor.GetLanguagesWithSources
-import eu.kanade.domain.source.interactor.GetRemoteManga
-import eu.kanade.domain.source.interactor.GetSourcesWithFavoriteCount
-import eu.kanade.domain.source.interactor.GetSourcesWithNonLibraryManga
-import eu.kanade.domain.source.interactor.SetMigrateSorting
-import eu.kanade.domain.source.interactor.ToggleLanguage
-import eu.kanade.domain.source.interactor.ToggleSource
-import eu.kanade.domain.source.interactor.ToggleSourcePin
-import eu.kanade.domain.source.repository.SourceRepository
-import eu.kanade.domain.track.interactor.DeleteTrack
-import eu.kanade.domain.track.interactor.GetTracks
-import eu.kanade.domain.track.interactor.GetTracksPerManga
-import eu.kanade.domain.track.interactor.InsertTrack
-import tachiyomi.data.category.CategoryRepositoryImpl
-import tachiyomi.data.chapter.ChapterRepositoryImpl
-import tachiyomi.data.history.HistoryRepositoryImpl
-import tachiyomi.data.manga.MangaRepositoryImpl
-import tachiyomi.data.source.SourceDataRepositoryImpl
-import tachiyomi.data.track.TrackRepositoryImpl
-import tachiyomi.data.updates.UpdatesRepositoryImpl
-import tachiyomi.domain.category.interactor.GetCategories
-import tachiyomi.domain.category.repository.CategoryRepository
-import tachiyomi.domain.chapter.interactor.ShouldUpdateDbChapter
-import tachiyomi.domain.chapter.repository.ChapterRepository
-import tachiyomi.domain.history.interactor.GetHistory
-import tachiyomi.domain.history.interactor.GetTotalReadDuration
-import tachiyomi.domain.history.interactor.RemoveHistory
-import tachiyomi.domain.history.interactor.UpsertHistory
-import tachiyomi.domain.history.repository.HistoryRepository
-import tachiyomi.domain.manga.repository.MangaRepository
-import tachiyomi.domain.source.repository.SourceDataRepository
-import tachiyomi.domain.track.repository.TrackRepository
-import tachiyomi.domain.updates.interactor.GetUpdates
-import tachiyomi.domain.updates.repository.UpdatesRepository
-import uy.kohesive.injekt.api.InjektModule
-import uy.kohesive.injekt.api.InjektRegistrar
-import uy.kohesive.injekt.api.addFactory
-import uy.kohesive.injekt.api.addSingletonFactory
-import uy.kohesive.injekt.api.get
-
-class DomainModule : InjektModule {
-
-    override fun InjektRegistrar.registerInjectables() {
-        addSingletonFactory<CategoryRepository> { CategoryRepositoryImpl(get()) }
-        addFactory { GetCategories(get()) }
-        addFactory { ResetCategoryFlags(get(), get()) }
-        addFactory { SetDisplayModeForCategory(get(), get()) }
-        addFactory { SetSortModeForCategory(get(), get()) }
-        addFactory { CreateCategoryWithName(get(), get()) }
-        addFactory { RenameCategory(get()) }
-        addFactory { ReorderCategory(get()) }
-        addFactory { UpdateCategory(get()) }
-        addFactory { DeleteCategory(get()) }
-
-        addSingletonFactory<MangaRepository> { MangaRepositoryImpl(get()) }
-        addFactory { GetDuplicateLibraryManga(get()) }
-        addFactory { GetFavorites(get()) }
-        addFactory { GetLibraryManga(get()) }
-        addFactory { GetMangaWithChapters(get(), get()) }
-        addFactory { GetManga(get()) }
-        addFactory { GetNextChapters(get(), get(), get()) }
-        addFactory { ResetViewerFlags(get()) }
-        addFactory { SetMangaChapterFlags(get()) }
-        addFactory { SetMangaDefaultChapterFlags(get(), get(), get()) }
-        addFactory { SetMangaViewerFlags(get()) }
-        addFactory { NetworkToLocalManga(get()) }
-        addFactory { UpdateManga(get()) }
-        addFactory { SetMangaCategories(get()) }
-
-        addSingletonFactory<TrackRepository> { TrackRepositoryImpl(get()) }
-        addFactory { DeleteTrack(get()) }
-        addFactory { GetTracksPerManga(get()) }
-        addFactory { GetTracks(get()) }
-        addFactory { InsertTrack(get()) }
-
-        addSingletonFactory<ChapterRepository> { ChapterRepositoryImpl(get()) }
-        addFactory { GetChapter(get()) }
-        addFactory { GetChapterByMangaId(get()) }
-        addFactory { UpdateChapter(get()) }
-        addFactory { SetReadStatus(get(), get(), get(), get()) }
-        addFactory { ShouldUpdateDbChapter() }
-        addFactory { SyncChaptersWithSource(get(), get(), get(), get()) }
-        addFactory { SyncChaptersWithTrackServiceTwoWay(get(), get()) }
-
-        addSingletonFactory<HistoryRepository> { HistoryRepositoryImpl(get()) }
-        addFactory { GetHistory(get()) }
-        addFactory { UpsertHistory(get()) }
-        addFactory { RemoveHistory(get()) }
-        addFactory { GetTotalReadDuration(get()) }
-
-        addFactory { DeleteDownload(get(), get()) }
-
-        addFactory { GetExtensionsByType(get(), get()) }
-        addFactory { GetExtensionSources(get()) }
-        addFactory { GetExtensionLanguages(get(), get()) }
-
-        addSingletonFactory<UpdatesRepository> { UpdatesRepositoryImpl(get()) }
-        addFactory { GetUpdates(get()) }
-
-        addSingletonFactory<SourceRepository> { SourceRepositoryImpl(get(), get()) }
-        addSingletonFactory<SourceDataRepository> { SourceDataRepositoryImpl(get()) }
-        addFactory { GetEnabledSources(get(), get()) }
-        addFactory { GetLanguagesWithSources(get(), get()) }
-        addFactory { GetRemoteManga(get()) }
-        addFactory { GetSourcesWithFavoriteCount(get(), get()) }
-        addFactory { GetSourcesWithNonLibraryManga(get()) }
-        addFactory { SetMigrateSorting(get()) }
-        addFactory { ToggleLanguage(get()) }
-        addFactory { ToggleSource(get()) }
-        addFactory { ToggleSourcePin(get()) }
-    }
-}

app/src/main/java/eu/kanade/domain/backup/service/BackupPreferences.kt

@@ -1,16 +0,0 @@
-package eu.kanade.domain.backup.service
-
-import tachiyomi.core.preference.PreferenceStore
-import tachiyomi.core.provider.FolderProvider
-
-class BackupPreferences(
-    private val folderProvider: FolderProvider,
-    private val preferenceStore: PreferenceStore,
-) {
-
-    fun backupsDirectory() = preferenceStore.getString("backup_directory", folderProvider.path())
-
-    fun numberOfBackups() = preferenceStore.getInt("backup_slots", 2)
-
-    fun backupInterval() = preferenceStore.getInt("backup_interval", 12)
-}

app/src/main/java/eu/kanade/domain/base/BasePreferences.kt

@@ -1,24 +0,0 @@
-package eu.kanade.domain.base
-
-import android.content.Context
-import eu.kanade.tachiyomi.util.system.isPreviewBuildType
-import eu.kanade.tachiyomi.util.system.isReleaseBuildType
-import tachiyomi.core.preference.PreferenceStore
-
-class BasePreferences(
-    val context: Context,
-    private val preferenceStore: PreferenceStore,
-) {
-
-    fun confirmExit() = preferenceStore.getBoolean("pref_confirm_exit", false)
-
-    fun downloadedOnly() = preferenceStore.getBoolean("pref_downloaded_only", false)
-
-    fun incognitoMode() = preferenceStore.getBoolean("incognito_mode", false)
-
-    fun automaticExtUpdates() = preferenceStore.getBoolean("automatic_ext_updates", true)
-
-    fun extensionInstaller() = ExtensionInstallerPreference(context, preferenceStore)
-
-    fun acraEnabled() = preferenceStore.getBoolean("acra.enable", isPreviewBuildType || isReleaseBuildType)
-}

app/src/main/java/eu/kanade/domain/base/ExtensionInstallerPreference.kt

@@ -1,68 +0,0 @@
-package eu.kanade.domain.base
-
-import android.content.Context
-import eu.kanade.tachiyomi.data.preference.PreferenceValues.ExtensionInstaller
-import eu.kanade.tachiyomi.util.system.hasMiuiPackageInstaller
-import eu.kanade.tachiyomi.util.system.isShizukuInstalled
-import kotlinx.coroutines.CoroutineScope
-import tachiyomi.core.preference.Preference
-import tachiyomi.core.preference.PreferenceStore
-import tachiyomi.core.preference.getEnum
-
-class ExtensionInstallerPreference(
-    private val context: Context,
-    preferenceStore: PreferenceStore,
-) : Preference<ExtensionInstaller> {
-
-    private val basePref = preferenceStore.getEnum(key(), defaultValue())
-
-    override fun key() = "extension_installer"
-
-    val entries get() = ExtensionInstaller.values().run {
-        if (context.hasMiuiPackageInstaller) {
-            filter { it != ExtensionInstaller.PACKAGEINSTALLER }
-        } else {
-            toList()
-        }
-    }
-
-    override fun defaultValue() = if (context.hasMiuiPackageInstaller) {
-        ExtensionInstaller.LEGACY
-    } else {
-        ExtensionInstaller.PACKAGEINSTALLER
-    }
-
-    private fun check(value: ExtensionInstaller): ExtensionInstaller {
-        when (value) {
-            ExtensionInstaller.PACKAGEINSTALLER -> {
-                if (context.hasMiuiPackageInstaller) return ExtensionInstaller.LEGACY
-            }
-            ExtensionInstaller.SHIZUKU -> {
-                if (!context.isShizukuInstalled) return defaultValue()
-            }
-            else -> {}
-        }
-        return value
-    }
-
-    override fun get(): ExtensionInstaller {
-        val value = basePref.get()
-        val checkedValue = check(value)
-        if (value != checkedValue) {
-            basePref.set(checkedValue)
-        }
-        return checkedValue
-    }
-
-    override fun set(value: ExtensionInstaller) {
-        basePref.set(check(value))
-    }
-
-    override fun isSet() = basePref.isSet()
-
-    override fun delete() = basePref.delete()
-
-    override fun changes() = basePref.changes()
-
-    override fun stateIn(scope: CoroutineScope) = basePref.stateIn(scope)
-}

app/src/main/java/eu/kanade/domain/category/interactor/CreateCategoryWithName.kt

@@ -1,46 +0,0 @@
-package eu.kanade.domain.category.interactor
-
-import eu.kanade.domain.library.service.LibraryPreferences
-import logcat.LogPriority
-import tachiyomi.core.util.lang.withNonCancellableContext
-import tachiyomi.core.util.system.logcat
-import tachiyomi.domain.category.model.Category
-import tachiyomi.domain.category.repository.CategoryRepository
-
-class CreateCategoryWithName(
-    private val categoryRepository: CategoryRepository,
-    private val preferences: LibraryPreferences,
-) {
-
-    private val initialFlags: Long
-        get() {
-            val sort = preferences.librarySortingMode().get()
-            return preferences.libraryDisplayMode().get().flag or
-                sort.type.flag or
-                sort.direction.flag
-        }
-
-    suspend fun await(name: String): Result = withNonCancellableContext {
-        val categories = categoryRepository.getAll()
-        val nextOrder = categories.maxOfOrNull { it.order }?.plus(1) ?: 0
-        val newCategory = Category(
-            id = 0,
-            name = name,
-            order = nextOrder,
-            flags = initialFlags,
-        )
-
-        try {
-            categoryRepository.insert(newCategory)
-            Result.Success
-        } catch (e: Exception) {
-            logcat(LogPriority.ERROR, e)
-            Result.InternalError(e)
-        }
-    }
-
-    sealed class Result {
-        object Success : Result()
-        data class InternalError(val error: Throwable) : Result()
-    }
-}

app/src/main/java/eu/kanade/domain/category/interactor/DeleteCategory.kt

@@ -1,42 +0,0 @@
-package eu.kanade.domain.category.interactor
-
-import logcat.LogPriority
-import tachiyomi.core.util.lang.withNonCancellableContext
-import tachiyomi.core.util.system.logcat
-import tachiyomi.domain.category.model.CategoryUpdate
-import tachiyomi.domain.category.repository.CategoryRepository
-
-class DeleteCategory(
-    private val categoryRepository: CategoryRepository,
-) {
-
-    suspend fun await(categoryId: Long) = withNonCancellableContext {
-        try {
-            categoryRepository.delete(categoryId)
-        } catch (e: Exception) {
-            logcat(LogPriority.ERROR, e)
-            return@withNonCancellableContext Result.InternalError(e)
-        }
-
-        val categories = categoryRepository.getAll()
-        val updates = categories.mapIndexed { index, category ->
-            CategoryUpdate(
-                id = category.id,
-                order = index.toLong(),
-            )
-        }
-
-        try {
-            categoryRepository.updatePartial(updates)
-            Result.Success
-        } catch (e: Exception) {
-            logcat(LogPriority.ERROR, e)
-            Result.InternalError(e)
-        }
-    }
-
-    sealed class Result {
-        object Success : Result()
-        data class InternalError(val error: Throwable) : Result()
-    }
-}

app/src/main/java/eu/kanade/domain/category/interactor/RenameCategory.kt

@@ -1,35 +0,0 @@
-package eu.kanade.domain.category.interactor
-
-import logcat.LogPriority
-import tachiyomi.core.util.lang.withNonCancellableContext
-import tachiyomi.core.util.system.logcat
-import tachiyomi.domain.category.model.Category
-import tachiyomi.domain.category.model.CategoryUpdate
-import tachiyomi.domain.category.repository.CategoryRepository
-
-class RenameCategory(
-    private val categoryRepository: CategoryRepository,
-) {
-
-    suspend fun await(categoryId: Long, name: String) = withNonCancellableContext {
-        val update = CategoryUpdate(
-            id = categoryId,
-            name = name,
-        )
-
-        try {
-            categoryRepository.updatePartial(update)
-            Result.Success
-        } catch (e: Exception) {
-            logcat(LogPriority.ERROR, e)
-            Result.InternalError(e)
-        }
-    }
-
-    suspend fun await(category: Category, name: String) = await(category.id, name)
-
-    sealed class Result {
-        object Success : Result()
-        data class InternalError(val error: Throwable) : Result()
-    }
-}

app/src/main/java/eu/kanade/domain/category/interactor/ReorderCategory.kt

@@ -1,70 +0,0 @@
-package eu.kanade.domain.category.interactor
-
-import kotlinx.coroutines.sync.Mutex
-import kotlinx.coroutines.sync.withLock
-import logcat.LogPriority
-import tachiyomi.core.util.lang.withNonCancellableContext
-import tachiyomi.core.util.system.logcat
-import tachiyomi.domain.category.model.Category
-import tachiyomi.domain.category.model.CategoryUpdate
-import tachiyomi.domain.category.repository.CategoryRepository
-import java.util.Collections
-
-class ReorderCategory(
-    private val categoryRepository: CategoryRepository,
-) {
-
-    private val mutex = Mutex()
-
-    suspend fun moveUp(category: Category): Result =
-        await(category, MoveTo.UP)
-
-    suspend fun moveDown(category: Category): Result =
-        await(category, MoveTo.DOWN)
-
-    private suspend fun await(category: Category, moveTo: MoveTo) = withNonCancellableContext {
-        mutex.withLock {
-            val categories = categoryRepository.getAll()
-                .filterNot(Category::isSystemCategory)
-                .toMutableList()
-
-            val currentIndex = categories.indexOfFirst { it.id == category.id }
-            if (currentIndex == -1) {
-                return@withNonCancellableContext Result.Unchanged
-            }
-
-            val newPosition = when (moveTo) {
-                MoveTo.UP -> currentIndex - 1
-                MoveTo.DOWN -> currentIndex + 1
-            }.toInt()
-
-            try {
-                Collections.swap(categories, currentIndex, newPosition)
-
-                val updates = categories.mapIndexed { index, category ->
-                    CategoryUpdate(
-                        id = category.id,
-                        order = index.toLong(),
-                    )
-                }
-
-                categoryRepository.updatePartial(updates)
-                Result.Success
-            } catch (e: Exception) {
-                logcat(LogPriority.ERROR, e)
-                Result.InternalError(e)
-            }
-        }
-    }
-
-    sealed class Result {
-        object Success : Result()
-        object Unchanged : Result()
-        data class InternalError(val error: Throwable) : Result()
-    }
-
-    private enum class MoveTo {
-        UP,
-        DOWN,
-    }
-}

app/src/main/java/eu/kanade/domain/category/interactor/ResetCategoryFlags.kt

@@ -1,17 +0,0 @@
-package eu.kanade.domain.category.interactor
-
-import eu.kanade.domain.library.service.LibraryPreferences
-import tachiyomi.domain.category.repository.CategoryRepository
-import tachiyomi.domain.library.model.plus
-
-class ResetCategoryFlags(
-    private val preferences: LibraryPreferences,
-    private val categoryRepository: CategoryRepository,
-) {
-
-    suspend fun await() {
-        val display = preferences.libraryDisplayMode().get()
-        val sort = preferences.librarySortingMode().get()
-        categoryRepository.updateAllFlags(display + sort.type + sort.direction)
-    }
-}

app/src/main/java/eu/kanade/domain/category/interactor/SetDisplayModeForCategory.kt

@@ -1,34 +0,0 @@
-package eu.kanade.domain.category.interactor
-
-import eu.kanade.domain.library.service.LibraryPreferences
-import tachiyomi.domain.category.model.Category
-import tachiyomi.domain.category.model.CategoryUpdate
-import tachiyomi.domain.category.repository.CategoryRepository
-import tachiyomi.domain.library.model.LibraryDisplayMode
-import tachiyomi.domain.library.model.plus
-
-class SetDisplayModeForCategory(
-    private val preferences: LibraryPreferences,
-    private val categoryRepository: CategoryRepository,
-) {
-
-    suspend fun await(categoryId: Long, display: LibraryDisplayMode) {
-        val category = categoryRepository.get(categoryId) ?: return
-        val flags = category.flags + display
-        if (preferences.categorizedDisplaySettings().get()) {
-            categoryRepository.updatePartial(
-                CategoryUpdate(
-                    id = category.id,
-                    flags = flags,
-                ),
-            )
-        } else {
-            preferences.libraryDisplayMode().set(display)
-            categoryRepository.updateAllFlags(flags)
-        }
-    }
-
-    suspend fun await(category: Category, display: LibraryDisplayMode) {
-        await(category.id, display)
-    }
-}

app/src/main/java/eu/kanade/domain/category/interactor/SetMangaCategories.kt

@@ -1,18 +0,0 @@
-package eu.kanade.domain.category.interactor
-
-import logcat.LogPriority
-import tachiyomi.core.util.system.logcat
-import tachiyomi.domain.manga.repository.MangaRepository
-
-class SetMangaCategories(
-    private val mangaRepository: MangaRepository,
-) {
-
-    suspend fun await(mangaId: Long, categoryIds: List<Long>) {
-        try {
-            mangaRepository.setMangaCategories(mangaId, categoryIds)
-        } catch (e: Exception) {
-            logcat(LogPriority.ERROR, e)
-        }
-    }
-}

app/src/main/java/eu/kanade/domain/category/interactor/SetSortModeForCategory.kt

@@ -1,34 +0,0 @@
-package eu.kanade.domain.category.interactor
-
-import eu.kanade.domain.library.service.LibraryPreferences
-import tachiyomi.domain.category.model.Category
-import tachiyomi.domain.category.model.CategoryUpdate
-import tachiyomi.domain.category.repository.CategoryRepository
-import tachiyomi.domain.library.model.LibrarySort
-import tachiyomi.domain.library.model.plus
-
-class SetSortModeForCategory(
-    private val preferences: LibraryPreferences,
-    private val categoryRepository: CategoryRepository,
-) {
-
-    suspend fun await(categoryId: Long, type: LibrarySort.Type, direction: LibrarySort.Direction) {
-        val category = categoryRepository.get(categoryId) ?: return
-        val flags = category.flags + type + direction
-        if (preferences.categorizedDisplaySettings().get()) {
-            categoryRepository.updatePartial(
-                CategoryUpdate(
-                    id = category.id,
-                    flags = flags,
-                ),
-            )
-        } else {
-            preferences.librarySortingMode().set(LibrarySort(type, direction))
-            categoryRepository.updateAllFlags(flags)
-        }
-    }
-
-    suspend fun await(category: Category, type: LibrarySort.Type, direction: LibrarySort.Direction) {
-        await(category.id, type, direction)
-    }
-}

app/src/main/java/eu/kanade/domain/category/interactor/UpdateCategory.kt

@@ -1,24 +0,0 @@
-package eu.kanade.domain.category.interactor
-
-import tachiyomi.core.util.lang.withNonCancellableContext
-import tachiyomi.domain.category.model.CategoryUpdate
-import tachiyomi.domain.category.repository.CategoryRepository
-
-class UpdateCategory(
-    private val categoryRepository: CategoryRepository,
-) {
-
-    suspend fun await(payload: CategoryUpdate): Result = withNonCancellableContext {
-        try {
-            categoryRepository.updatePartial(payload)
-            Result.Success
-        } catch (e: Exception) {
-            Result.Error(e)
-        }
-    }
-
-    sealed class Result {
-        object Success : Result()
-        data class Error(val error: Exception) : Result()
-    }
-}

app/src/main/java/eu/kanade/domain/chapter/interactor/GetChapter.kt

@@ -1,29 +0,0 @@
-package eu.kanade.domain.chapter.interactor
-
-import logcat.LogPriority
-import tachiyomi.core.util.system.logcat
-import tachiyomi.domain.chapter.model.Chapter
-import tachiyomi.domain.chapter.repository.ChapterRepository
-
-class GetChapter(
-    private val chapterRepository: ChapterRepository,
-) {
-
-    suspend fun await(id: Long): Chapter? {
-        return try {
-            chapterRepository.getChapterById(id)
-        } catch (e: Exception) {
-            logcat(LogPriority.ERROR, e)
-            null
-        }
-    }
-
-    suspend fun await(url: String, mangaId: Long): Chapter? {
-        return try {
-            chapterRepository.getChapterByUrlAndMangaId(url, mangaId)
-        } catch (e: Exception) {
-            logcat(LogPriority.ERROR, e)
-            null
-        }
-    }
-}

app/src/main/java/eu/kanade/domain/chapter/interactor/GetChapterByMangaId.kt

@@ -1,20 +0,0 @@
-package eu.kanade.domain.chapter.interactor
-
-import logcat.LogPriority
-import tachiyomi.core.util.system.logcat
-import tachiyomi.domain.chapter.model.Chapter
-import tachiyomi.domain.chapter.repository.ChapterRepository
-
-class GetChapterByMangaId(
-    private val chapterRepository: ChapterRepository,
-) {
-
-    suspend fun await(mangaId: Long): List<Chapter> {
-        return try {
-            chapterRepository.getChapterByMangaId(mangaId)
-        } catch (e: Exception) {
-            logcat(LogPriority.ERROR, e)
-            emptyList()
-        }
-    }
-}

app/src/main/java/eu/kanade/domain/chapter/interactor/SetDefaultChapterSettings.kt

@@ -1,36 +0,0 @@
-package eu.kanade.domain.chapter.interactor
-
-import eu.kanade.domain.library.service.LibraryPreferences
-import eu.kanade.domain.manga.interactor.GetFavorites
-import eu.kanade.domain.manga.interactor.SetMangaChapterFlags
-import tachiyomi.core.util.lang.withNonCancellableContext
-import tachiyomi.domain.manga.model.Manga
-
-class SetMangaDefaultChapterFlags(
-    private val libraryPreferences: LibraryPreferences,
-    private val setMangaChapterFlags: SetMangaChapterFlags,
-    private val getFavorites: GetFavorites,
-) {
-
-    suspend fun await(manga: Manga) {
-        withNonCancellableContext {
-            with(libraryPreferences) {
-                setMangaChapterFlags.awaitSetAllFlags(
-                    mangaId = manga.id,
-                    unreadFilter = filterChapterByRead().get(),
-                    downloadedFilter = filterChapterByDownloaded().get(),
-                    bookmarkedFilter = filterChapterByBookmarked().get(),
-                    sortingMode = sortChapterBySourceOrNumber().get(),
-                    sortingDirection = sortChapterByAscendingOrDescending().get(),
-                    displayMode = displayChapterByNameOrNumber().get(),
-                )
-            }
-        }
-    }
-
-    suspend fun awaitAll() {
-        withNonCancellableContext {
-            getFavorites.await().forEach { await(it) }
-        }
-    }
-}

app/src/main/java/eu/kanade/domain/chapter/interactor/SetReadStatus.kt

@@ -1,80 +0,0 @@
-package eu.kanade.domain.chapter.interactor
-
-import eu.kanade.domain.download.interactor.DeleteDownload
-import eu.kanade.domain.download.service.DownloadPreferences
-import logcat.LogPriority
-import tachiyomi.core.util.lang.withNonCancellableContext
-import tachiyomi.core.util.system.logcat
-import tachiyomi.domain.chapter.model.Chapter
-import tachiyomi.domain.chapter.model.ChapterUpdate
-import tachiyomi.domain.chapter.repository.ChapterRepository
-import tachiyomi.domain.manga.model.Manga
-import tachiyomi.domain.manga.repository.MangaRepository
-
-class SetReadStatus(
-    private val downloadPreferences: DownloadPreferences,
-    private val deleteDownload: DeleteDownload,
-    private val mangaRepository: MangaRepository,
-    private val chapterRepository: ChapterRepository,
-) {
-
-    private val mapper = { chapter: Chapter, read: Boolean ->
-        ChapterUpdate(
-            read = read,
-            lastPageRead = if (!read) 0 else null,
-            id = chapter.id,
-        )
-    }
-
-    suspend fun await(read: Boolean, vararg chapters: Chapter): Result = withNonCancellableContext {
-        val chaptersToUpdate = chapters.filter {
-            when (read) {
-                true -> !it.read
-                false -> it.read || it.lastPageRead > 0
-            }
-        }
-        if (chaptersToUpdate.isEmpty()) {
-            return@withNonCancellableContext Result.NoChapters
-        }
-
-        try {
-            chapterRepository.updateAll(
-                chaptersToUpdate.map { mapper(it, read) },
-            )
-        } catch (e: Exception) {
-            logcat(LogPriority.ERROR, e)
-            return@withNonCancellableContext Result.InternalError(e)
-        }
-
-        if (read && downloadPreferences.removeAfterMarkedAsRead().get()) {
-            chaptersToUpdate
-                .groupBy { it.mangaId }
-                .forEach { (mangaId, chapters) ->
-                    deleteDownload.awaitAll(
-                        manga = mangaRepository.getMangaById(mangaId),
-                        chapters = chapters.toTypedArray(),
-                    )
-                }
-        }
-
-        Result.Success
-    }
-
-    suspend fun await(mangaId: Long, read: Boolean): Result = withNonCancellableContext {
-        await(
-            read = read,
-            chapters = chapterRepository
-                .getChapterByMangaId(mangaId)
-                .toTypedArray(),
-        )
-    }
-
-    suspend fun await(manga: Manga, read: Boolean) =
-        await(manga.id, read)
-
-    sealed class Result {
-        object Success : Result()
-        object NoChapters : Result()
-        data class InternalError(val error: Throwable) : Result()
-    }
-}

app/src/main/java/eu/kanade/domain/chapter/interactor/SyncChaptersWithSource.kt

@@ -1,198 +0,0 @@
-package eu.kanade.domain.chapter.interactor
-
-import eu.kanade.domain.chapter.model.copyFromSChapter
-import eu.kanade.domain.chapter.model.toSChapter
-import eu.kanade.domain.manga.interactor.UpdateManga
-import eu.kanade.domain.manga.model.toSManga
-import eu.kanade.tachiyomi.data.download.DownloadManager
-import eu.kanade.tachiyomi.data.download.DownloadProvider
-import eu.kanade.tachiyomi.source.Source
-import eu.kanade.tachiyomi.source.isLocal
-import eu.kanade.tachiyomi.source.model.SChapter
-import eu.kanade.tachiyomi.source.online.HttpSource
-import eu.kanade.tachiyomi.util.chapter.ChapterRecognition
-import tachiyomi.data.chapter.ChapterSanitizer
-import tachiyomi.domain.chapter.interactor.ShouldUpdateDbChapter
-import tachiyomi.domain.chapter.model.Chapter
-import tachiyomi.domain.chapter.model.NoChaptersException
-import tachiyomi.domain.chapter.model.toChapterUpdate
-import tachiyomi.domain.chapter.repository.ChapterRepository
-import tachiyomi.domain.manga.model.Manga
-import uy.kohesive.injekt.Injekt
-import uy.kohesive.injekt.api.get
-import java.lang.Long.max
-import java.util.Date
-import java.util.TreeSet
-
-class SyncChaptersWithSource(
-    private val downloadManager: DownloadManager = Injekt.get(),
-    private val downloadProvider: DownloadProvider = Injekt.get(),
-    private val chapterRepository: ChapterRepository = Injekt.get(),
-    private val shouldUpdateDbChapter: ShouldUpdateDbChapter = Injekt.get(),
-    private val updateManga: UpdateManga = Injekt.get(),
-    private val updateChapter: UpdateChapter = Injekt.get(),
-    private val getChapterByMangaId: GetChapterByMangaId = Injekt.get(),
-) {
-
-    /**
-     * Method to synchronize db chapters with source ones
-     *
-     * @param rawSourceChapters the chapters from the source.
-     * @param manga the manga the chapters belong to.
-     * @param source the source the manga belongs to.
-     * @return Newly added chapters
-     */
-    suspend fun await(
-        rawSourceChapters: List<SChapter>,
-        manga: Manga,
-        source: Source,
-    ): List<Chapter> {
-        if (rawSourceChapters.isEmpty() && !source.isLocal()) {
-            throw NoChaptersException()
-        }
-
-        val sourceChapters = rawSourceChapters
-            .distinctBy { it.url }
-            .mapIndexed { i, sChapter ->
-                Chapter.create()
-                    .copyFromSChapter(sChapter)
-                    .copy(name = with(ChapterSanitizer) { sChapter.name.sanitize(manga.title) })
-                    .copy(mangaId = manga.id, sourceOrder = i.toLong())
-            }
-
-        // Chapters from db.
-        val dbChapters = getChapterByMangaId.await(manga.id)
-
-        // Chapters from the source not in db.
-        val toAdd = mutableListOf<Chapter>()
-
-        // Chapters whose metadata have changed.
-        val toChange = mutableListOf<Chapter>()
-
-        // Chapters from the db not in source.
-        val toDelete = dbChapters.filterNot { dbChapter ->
-            sourceChapters.any { sourceChapter ->
-                dbChapter.url == sourceChapter.url
-            }
-        }
-
-        val rightNow = Date().time
-
-        // Used to not set upload date of older chapters
-        // to a higher value than newer chapters
-        var maxSeenUploadDate = 0L
-
-        val sManga = manga.toSManga()
-        for (sourceChapter in sourceChapters) {
-            var chapter = sourceChapter
-
-            // Update metadata from source if necessary.
-            if (source is HttpSource) {
-                val sChapter = chapter.toSChapter()
-                source.prepareNewChapter(sChapter, sManga)
-                chapter = chapter.copyFromSChapter(sChapter)
-            }
-
-            // Recognize chapter number for the chapter.
-            val chapterNumber = ChapterRecognition.parseChapterNumber(manga.title, chapter.name, chapter.chapterNumber)
-            chapter = chapter.copy(chapterNumber = chapterNumber)
-
-            val dbChapter = dbChapters.find { it.url == chapter.url }
-
-            if (dbChapter == null) {
-                val toAddChapter = if (chapter.dateUpload == 0L) {
-                    val altDateUpload = if (maxSeenUploadDate == 0L) rightNow else maxSeenUploadDate
-                    chapter.copy(dateUpload = altDateUpload)
-                } else {
-                    maxSeenUploadDate = max(maxSeenUploadDate, sourceChapter.dateUpload)
-                    chapter
-                }
-                toAdd.add(toAddChapter)
-            } else {
-                if (shouldUpdateDbChapter.await(dbChapter, chapter)) {
-                    val shouldRenameChapter = downloadProvider.isChapterDirNameChanged(dbChapter, chapter) &&
-                        downloadManager.isChapterDownloaded(dbChapter.name, dbChapter.scanlator, manga.title, manga.source)
-
-                    if (shouldRenameChapter) {
-                        downloadManager.renameChapter(source, manga, dbChapter, chapter)
-                    }
-                    var toChangeChapter = dbChapter.copy(
-                        name = chapter.name,
-                        chapterNumber = chapter.chapterNumber,
-                        scanlator = chapter.scanlator,
-                        sourceOrder = chapter.sourceOrder,
-                    )
-                    if (chapter.dateUpload != 0L) {
-                        toChangeChapter = toChangeChapter.copy(dateUpload = chapter.dateUpload)
-                    }
-                    toChange.add(toChangeChapter)
-                }
-            }
-        }
-
-        // Return if there's nothing to add, delete or change, avoiding unnecessary db transactions.
-        if (toAdd.isEmpty() && toDelete.isEmpty() && toChange.isEmpty()) {
-            return emptyList()
-        }
-
-        val reAdded = mutableListOf<Chapter>()
-
-        val deletedChapterNumbers = TreeSet<Float>()
-        val deletedReadChapterNumbers = TreeSet<Float>()
-        val deletedBookmarkedChapterNumbers = TreeSet<Float>()
-
-        toDelete.forEach { chapter ->
-            if (chapter.read) deletedReadChapterNumbers.add(chapter.chapterNumber)
-            if (chapter.bookmark) deletedBookmarkedChapterNumbers.add(chapter.chapterNumber)
-            deletedChapterNumbers.add(chapter.chapterNumber)
-        }
-
-        val deletedChapterNumberDateFetchMap = toDelete.sortedByDescending { it.dateFetch }
-            .associate { it.chapterNumber to it.dateFetch }
-
-        // Date fetch is set in such a way that the upper ones will have bigger value than the lower ones
-        // Sources MUST return the chapters from most to less recent, which is common.
-        var itemCount = toAdd.size
-        var updatedToAdd = toAdd.map { toAddItem ->
-            var chapter = toAddItem.copy(dateFetch = rightNow + itemCount--)
-
-            if (chapter.isRecognizedNumber.not() || chapter.chapterNumber !in deletedChapterNumbers) return@map chapter
-
-            chapter = chapter.copy(
-                read = chapter.chapterNumber in deletedReadChapterNumbers,
-                bookmark = chapter.chapterNumber in deletedBookmarkedChapterNumbers,
-            )
-
-            // Try to to use the fetch date of the original entry to not pollute 'Updates' tab
-            deletedChapterNumberDateFetchMap[chapter.chapterNumber]?.let {
-                chapter = chapter.copy(dateFetch = it)
-            }
-
-            reAdded.add(chapter)
-
-            chapter
-        }
-
-        if (toDelete.isNotEmpty()) {
-            val toDeleteIds = toDelete.map { it.id }
-            chapterRepository.removeChaptersWithIds(toDeleteIds)
-        }
-
-        if (updatedToAdd.isNotEmpty()) {
-            updatedToAdd = chapterRepository.addAll(updatedToAdd)
-        }
-
-        if (toChange.isNotEmpty()) {
-            val chapterUpdates = toChange.map { it.toChapterUpdate() }
-            updateChapter.awaitAll(chapterUpdates)
-        }
-
-        // Set this manga as updated since chapters were changed
-        // Note that last_update actually represents last time the chapter list changed at all
-        updateManga.awaitUpdateLastUpdate(manga.id)
-
-        val reAddedUrls = reAdded.map { it.url }.toHashSet()
-
-        return updatedToAdd.filterNot { it.url in reAddedUrls }
-    }
-}

app/src/main/java/eu/kanade/domain/chapter/interactor/SyncChaptersWithTrackServiceTwoWay.kt

@@ -1,41 +0,0 @@
-package eu.kanade.domain.chapter.interactor
-
-import eu.kanade.domain.track.interactor.InsertTrack
-import eu.kanade.domain.track.model.toDbTrack
-import eu.kanade.tachiyomi.data.track.TrackService
-import logcat.LogPriority
-import tachiyomi.core.util.system.logcat
-import tachiyomi.domain.chapter.model.Chapter
-import tachiyomi.domain.chapter.model.toChapterUpdate
-import tachiyomi.domain.track.model.Track
-import uy.kohesive.injekt.Injekt
-import uy.kohesive.injekt.api.get
-
-class SyncChaptersWithTrackServiceTwoWay(
-    private val updateChapter: UpdateChapter = Injekt.get(),
-    private val insertTrack: InsertTrack = Injekt.get(),
-) {
-
-    suspend fun await(
-        chapters: List<Chapter>,
-        remoteTrack: Track,
-        service: TrackService,
-    ) {
-        val sortedChapters = chapters.sortedBy { it.chapterNumber }
-        val chapterUpdates = sortedChapters
-            .filter { chapter -> chapter.chapterNumber <= remoteTrack.lastChapterRead && !chapter.read }
-            .map { it.copy(read = true).toChapterUpdate() }
-
-        // only take into account continuous reading
-        val localLastRead = sortedChapters.takeWhile { it.read }.lastOrNull()?.chapterNumber ?: 0F
-        val updatedTrack = remoteTrack.copy(lastChapterRead = localLastRead.toDouble())
-
-        try {
-            service.update(updatedTrack.toDbTrack())
-            updateChapter.awaitAll(chapterUpdates)
-            insertTrack.await(updatedTrack)
-        } catch (e: Throwable) {
-            logcat(LogPriority.WARN, e)
-        }
-    }
-}

app/src/main/java/eu/kanade/domain/chapter/interactor/UpdateChapter.kt

@@ -1,27 +0,0 @@
-package eu.kanade.domain.chapter.interactor
-
-import logcat.LogPriority
-import tachiyomi.core.util.system.logcat
-import tachiyomi.domain.chapter.model.ChapterUpdate
-import tachiyomi.domain.chapter.repository.ChapterRepository
-
-class UpdateChapter(
-    private val chapterRepository: ChapterRepository,
-) {
-
-    suspend fun await(chapterUpdate: ChapterUpdate) {
-        try {
-            chapterRepository.update(chapterUpdate)
-        } catch (e: Exception) {
-            logcat(LogPriority.ERROR, e)
-        }
-    }
-
-    suspend fun awaitAll(chapterUpdates: List<ChapterUpdate>) {
-        try {
-            chapterRepository.updateAll(chapterUpdates)
-        } catch (e: Exception) {
-            logcat(LogPriority.ERROR, e)
-        }
-    }
-}

app/src/main/java/eu/kanade/domain/chapter/model/Chapter.kt

@@ -1,42 +0,0 @@
-package eu.kanade.domain.chapter.model
-
-import eu.kanade.tachiyomi.data.database.models.ChapterImpl
-import eu.kanade.tachiyomi.source.model.SChapter
-import tachiyomi.domain.chapter.model.Chapter
-import eu.kanade.tachiyomi.data.database.models.Chapter as DbChapter
-
-// TODO: Remove when all deps are migrated
-fun Chapter.toSChapter(): SChapter {
-    return SChapter.create().also {
-        it.url = url
-        it.name = name
-        it.date_upload = dateUpload
-        it.chapter_number = chapterNumber
-        it.scanlator = scanlator
-    }
-}
-
-fun Chapter.copyFromSChapter(sChapter: SChapter): Chapter {
-    return this.copy(
-        name = sChapter.name,
-        url = sChapter.url,
-        dateUpload = sChapter.date_upload,
-        chapterNumber = sChapter.chapter_number,
-        scanlator = sChapter.scanlator?.ifBlank { null },
-    )
-}
-
-fun Chapter.toDbChapter(): DbChapter = ChapterImpl().also {
-    it.id = id
-    it.manga_id = mangaId
-    it.url = url
-    it.name = name
-    it.scanlator = scanlator
-    it.read = read
-    it.bookmark = bookmark
-    it.last_page_read = lastPageRead.toInt()
-    it.date_fetch = dateFetch
-    it.date_upload = dateUpload
-    it.chapter_number = chapterNumber
-    it.source_order = sourceOrder.toInt()
-}

app/src/main/java/eu/kanade/domain/chapter/model/ChapterFilter.kt

@@ -1,84 +0,0 @@
-package eu.kanade.domain.chapter.model
-
-import eu.kanade.domain.manga.model.downloadedFilter
-import eu.kanade.domain.manga.model.isLocal
-import eu.kanade.tachiyomi.data.download.DownloadManager
-import eu.kanade.tachiyomi.data.download.model.Download
-import eu.kanade.tachiyomi.ui.manga.ChapterItem
-import eu.kanade.tachiyomi.util.chapter.getChapterSort
-import tachiyomi.domain.chapter.model.Chapter
-import tachiyomi.domain.manga.model.Manga
-import tachiyomi.domain.manga.model.TriStateFilter
-
-/**
- * Applies the view filters to the list of chapters obtained from the database.
- * @return an observable of the list of chapters filtered and sorted.
- */
-fun List<Chapter>.applyFilters(manga: Manga, downloadManager: DownloadManager): List<Chapter> {
-    val isLocalManga = manga.isLocal()
-    val unreadFilter = manga.unreadFilter
-    val downloadedFilter = manga.downloadedFilter
-    val bookmarkedFilter = manga.bookmarkedFilter
-
-    return filter { chapter ->
-        when (unreadFilter) {
-            TriStateFilter.DISABLED -> true
-            TriStateFilter.ENABLED_IS -> !chapter.read
-            TriStateFilter.ENABLED_NOT -> chapter.read
-        }
-    }
-        .filter { chapter ->
-            when (bookmarkedFilter) {
-                TriStateFilter.DISABLED -> true
-                TriStateFilter.ENABLED_IS -> chapter.bookmark
-                TriStateFilter.ENABLED_NOT -> !chapter.bookmark
-            }
-        }
-        .filter { chapter ->
-            val downloaded = downloadManager.isChapterDownloaded(chapter.name, chapter.scanlator, manga.title, manga.source)
-            val downloadState = when {
-                downloaded -> Download.State.DOWNLOADED
-                else -> Download.State.NOT_DOWNLOADED
-            }
-            when (downloadedFilter) {
-                TriStateFilter.DISABLED -> true
-                TriStateFilter.ENABLED_IS -> downloadState == Download.State.DOWNLOADED || isLocalManga
-                TriStateFilter.ENABLED_NOT -> downloadState != Download.State.DOWNLOADED && !isLocalManga
-            }
-        }
-        .sortedWith(getChapterSort(manga))
-}
-
-/**
- * Applies the view filters to the list of chapters obtained from the database.
- * @return an observable of the list of chapters filtered and sorted.
- */
-fun List<ChapterItem>.applyFilters(manga: Manga): Sequence<ChapterItem> {
-    val isLocalManga = manga.isLocal()
-    val unreadFilter = manga.unreadFilter
-    val downloadedFilter = manga.downloadedFilter
-    val bookmarkedFilter = manga.bookmarkedFilter
-    return asSequence()
-        .filter { (chapter) ->
-            when (unreadFilter) {
-                TriStateFilter.DISABLED -> true
-                TriStateFilter.ENABLED_IS -> !chapter.read
-                TriStateFilter.ENABLED_NOT -> chapter.read
-            }
-        }
-        .filter { (chapter) ->
-            when (bookmarkedFilter) {
-                TriStateFilter.DISABLED -> true
-                TriStateFilter.ENABLED_IS -> chapter.bookmark
-                TriStateFilter.ENABLED_NOT -> !chapter.bookmark
-            }
-        }
-        .filter {
-            when (downloadedFilter) {
-                TriStateFilter.DISABLED -> true
-                TriStateFilter.ENABLED_IS -> it.isDownloaded || isLocalManga
-                TriStateFilter.ENABLED_NOT -> !it.isDownloaded && !isLocalManga
-            }
-        }
-        .sortedWith { (chapter1), (chapter2) -> getChapterSort(manga).invoke(chapter1, chapter2) }
-}

app/src/main/java/eu/kanade/domain/download/interactor/DeleteDownload.kt

@@ -1,19 +0,0 @@
-package eu.kanade.domain.download.interactor
-
-import eu.kanade.tachiyomi.data.download.DownloadManager
-import eu.kanade.tachiyomi.source.SourceManager
-import tachiyomi.core.util.lang.withNonCancellableContext
-import tachiyomi.domain.chapter.model.Chapter
-import tachiyomi.domain.manga.model.Manga
-
-class DeleteDownload(
-    private val sourceManager: SourceManager,
-    private val downloadManager: DownloadManager,
-) {
-
-    suspend fun awaitAll(manga: Manga, vararg chapters: Chapter) = withNonCancellableContext {
-        sourceManager.get(manga.source)?.let { source ->
-            downloadManager.deleteChapters(chapters.toList(), manga, source)
-        }
-    }
-}

app/src/main/java/eu/kanade/domain/download/service/DownloadPreferences.kt

@@ -1,34 +0,0 @@
-package eu.kanade.domain.download.service
-
-import tachiyomi.core.preference.PreferenceStore
-import tachiyomi.core.provider.FolderProvider
-
-class DownloadPreferences(
-    private val folderProvider: FolderProvider,
-    private val preferenceStore: PreferenceStore,
-) {
-
-    fun downloadsDirectory() = preferenceStore.getString("download_directory", folderProvider.path())
-
-    fun downloadOnlyOverWifi() = preferenceStore.getBoolean("pref_download_only_over_wifi_key", true)
-
-    fun saveChaptersAsCBZ() = preferenceStore.getBoolean("save_chapter_as_cbz", true)
-
-    fun splitTallImages() = preferenceStore.getBoolean("split_tall_images", false)
-
-    fun autoDownloadWhileReading() = preferenceStore.getInt("auto_download_while_reading", 0)
-
-    fun removeAfterReadSlots() = preferenceStore.getInt("remove_after_read_slots", -1)
-
-    fun removeAfterMarkedAsRead() = preferenceStore.getBoolean("pref_remove_after_marked_as_read_key", false)
-
-    fun removeBookmarkedChapters() = preferenceStore.getBoolean("pref_remove_bookmarked", false)
-
-    fun removeExcludeCategories() = preferenceStore.getStringSet("remove_exclude_categories", emptySet())
-
-    fun downloadNewChapters() = preferenceStore.getBoolean("download_new", false)
-
-    fun downloadNewChapterCategories() = preferenceStore.getStringSet("download_new_categories", emptySet())
-
-    fun downloadNewChapterCategoriesExclude() = preferenceStore.getStringSet("download_new_categories_exclude", emptySet())
-}

app/src/main/java/eu/kanade/domain/extension/interactor/GetExtensionLanguages.kt

@@ -1,32 +0,0 @@
-package eu.kanade.domain.extension.interactor
-
-import eu.kanade.domain.source.service.SourcePreferences
-import eu.kanade.tachiyomi.extension.ExtensionManager
-import eu.kanade.tachiyomi.util.system.LocaleHelper
-import kotlinx.coroutines.flow.Flow
-import kotlinx.coroutines.flow.combine
-
-class GetExtensionLanguages(
-    private val preferences: SourcePreferences,
-    private val extensionManager: ExtensionManager,
-) {
-    fun subscribe(): Flow<List<String>> {
-        return combine(
-            preferences.enabledLanguages().changes(),
-            extensionManager.availableExtensionsFlow,
-        ) { enabledLanguage, availableExtensions ->
-            availableExtensions
-                .flatMap { ext ->
-                    if (ext.sources.isEmpty()) {
-                        listOf(ext.lang)
-                    } else {
-                        ext.sources.map { it.lang }
-                    }
-                }
-                .distinct()
-                .sortedWith(
-                    compareBy<String> { it !in enabledLanguage }.then(LocaleHelper.comparator),
-                )
-        }
-    }
-}

app/src/main/java/eu/kanade/domain/extension/interactor/GetExtensionSources.kt

@@ -1,37 +0,0 @@
-package eu.kanade.domain.extension.interactor
-
-import eu.kanade.domain.source.service.SourcePreferences
-import eu.kanade.tachiyomi.extension.model.Extension
-import eu.kanade.tachiyomi.source.Source
-import kotlinx.coroutines.flow.Flow
-import kotlinx.coroutines.flow.map
-
-class GetExtensionSources(
-    private val preferences: SourcePreferences,
-) {
-
-    fun subscribe(extension: Extension.Installed): Flow<List<ExtensionSourceItem>> {
-        val isMultiSource = extension.sources.size > 1
-        val isMultiLangSingleSource =
-            isMultiSource && extension.sources.map { it.name }.distinct().size == 1
-
-        return preferences.disabledSources().changes().map { disabledSources ->
-            fun Source.isEnabled() = id.toString() !in disabledSources
-
-            extension.sources
-                .map { source ->
-                    ExtensionSourceItem(
-                        source = source,
-                        enabled = source.isEnabled(),
-                        labelAsName = isMultiSource && isMultiLangSingleSource.not(),
-                    )
-                }
-        }
-    }
-}
-
-data class ExtensionSourceItem(
-    val source: Source,
-    val enabled: Boolean,
-    val labelAsName: Boolean,
-)

app/src/main/java/eu/kanade/domain/extension/interactor/GetExtensionsByType.kt

@@ -1,60 +0,0 @@
-package eu.kanade.domain.extension.interactor
-
-import eu.kanade.domain.extension.model.Extensions
-import eu.kanade.domain.source.service.SourcePreferences
-import eu.kanade.tachiyomi.extension.ExtensionManager
-import eu.kanade.tachiyomi.extension.model.Extension
-import kotlinx.coroutines.flow.Flow
-import kotlinx.coroutines.flow.combine
-
-class GetExtensionsByType(
-    private val preferences: SourcePreferences,
-    private val extensionManager: ExtensionManager,
-) {
-
-    fun subscribe(): Flow<Extensions> {
-        val showNsfwSources = preferences.showNsfwSource().get()
-
-        return combine(
-            preferences.enabledLanguages().changes(),
-            extensionManager.installedExtensionsFlow,
-            extensionManager.untrustedExtensionsFlow,
-            extensionManager.availableExtensionsFlow,
-        ) { _activeLanguages, _installed, _untrusted, _available ->
-            val (updates, installed) = _installed
-                .filter { (showNsfwSources || it.isNsfw.not()) }
-                .sortedWith(
-                    compareBy<Extension.Installed> { it.isObsolete.not() }
-                        .thenBy(String.CASE_INSENSITIVE_ORDER) { it.name },
-                )
-                .partition { it.hasUpdate }
-
-            val untrusted = _untrusted
-                .sortedWith(compareBy(String.CASE_INSENSITIVE_ORDER) { it.name })
-
-            val available = _available
-                .filter { extension ->
-                    _installed.none { it.pkgName == extension.pkgName } &&
-                        _untrusted.none { it.pkgName == extension.pkgName } &&
-                        (showNsfwSources || extension.isNsfw.not())
-                }
-                .flatMap { ext ->
-                    if (ext.sources.isEmpty()) {
-                        return@flatMap if (ext.lang in _activeLanguages) listOf(ext) else emptyList()
-                    }
-                    ext.sources.filter { it.lang in _activeLanguages }
-                        .map {
-                            ext.copy(
-                                name = it.name,
-                                lang = it.lang,
-                                pkgName = "${ext.pkgName}-${it.id}",
-                                sources = listOf(it),
-                            )
-                        }
-                }
-                .sortedWith(compareBy(String.CASE_INSENSITIVE_ORDER) { it.name })
-
-            Extensions(updates, installed, available, untrusted)
-        }
-    }
-}

app/src/main/java/eu/kanade/domain/extension/model/Extensions.kt

@@ -1,10 +0,0 @@
-package eu.kanade.domain.extension.model
-
-import eu.kanade.tachiyomi.extension.model.Extension
-
-data class Extensions(
-    val updates: List<Extension.Installed>,
-    val installed: List<Extension.Installed>,
-    val available: List<Extension.Available>,
-    val untrusted: List<Extension.Untrusted>,
-)

app/src/main/java/eu/kanade/domain/history/interactor/GetNextChapters.kt

@@ -1,52 +0,0 @@
-package eu.kanade.domain.history.interactor
-
-import eu.kanade.domain.chapter.interactor.GetChapterByMangaId
-import eu.kanade.domain.manga.interactor.GetManga
-import eu.kanade.tachiyomi.util.chapter.getChapterSort
-import tachiyomi.domain.chapter.model.Chapter
-import tachiyomi.domain.history.repository.HistoryRepository
-import kotlin.math.max
-
-class GetNextChapters(
-    private val getChapterByMangaId: GetChapterByMangaId,
-    private val getManga: GetManga,
-    private val historyRepository: HistoryRepository,
-) {
-
-    suspend fun await(onlyUnread: Boolean = true): List<Chapter> {
-        val history = historyRepository.getLastHistory() ?: return emptyList()
-        return await(history.mangaId, history.chapterId, onlyUnread)
-    }
-
-    suspend fun await(mangaId: Long, onlyUnread: Boolean = true): List<Chapter> {
-        val manga = getManga.await(mangaId) ?: return emptyList()
-        val chapters = getChapterByMangaId.await(mangaId)
-            .sortedWith(getChapterSort(manga, sortDescending = false))
-
-        return if (onlyUnread) {
-            chapters.filterNot { it.read }
-        } else {
-            chapters
-        }
-    }
-
-    suspend fun await(mangaId: Long, fromChapterId: Long, onlyUnread: Boolean = true): List<Chapter> {
-        val chapters = await(mangaId, onlyUnread)
-        val currChapterIndex = chapters.indexOfFirst { it.id == fromChapterId }
-        val nextChapters = chapters.subList(max(0, currChapterIndex), chapters.size)
-
-        if (onlyUnread) {
-            return nextChapters
-        }
-
-        // The "next chapter" is either:
-        // - The current chapter if it isn't completely read
-        // - The chapters after the current chapter if the current one is completely read
-        val fromChapter = chapters.getOrNull(currChapterIndex)
-        return if (fromChapter != null && !fromChapter.read) {
-            nextChapters
-        } else {
-            nextChapters.drop(1)
-        }
-    }
-}

app/src/main/java/eu/kanade/domain/library/service/LibraryPreferences.kt

@@ -1,111 +0,0 @@
-package eu.kanade.domain.library.service
-
-import eu.kanade.tachiyomi.data.preference.DEVICE_ONLY_ON_WIFI
-import eu.kanade.tachiyomi.data.preference.MANGA_HAS_UNREAD
-import eu.kanade.tachiyomi.data.preference.MANGA_NON_COMPLETED
-import eu.kanade.tachiyomi.data.preference.MANGA_NON_READ
-import eu.kanade.tachiyomi.widget.ExtendedNavigationView
-import tachiyomi.core.preference.PreferenceStore
-import tachiyomi.domain.library.model.LibraryDisplayMode
-import tachiyomi.domain.library.model.LibrarySort
-import tachiyomi.domain.manga.model.Manga
-
-class LibraryPreferences(
-    private val preferenceStore: PreferenceStore,
-) {
-
-    fun libraryDisplayMode() = preferenceStore.getObject("pref_display_mode_library", LibraryDisplayMode.default, LibraryDisplayMode.Serializer::serialize, LibraryDisplayMode.Serializer::deserialize)
-
-    fun librarySortingMode() = preferenceStore.getObject("library_sorting_mode", LibrarySort.default, LibrarySort.Serializer::serialize, LibrarySort.Serializer::deserialize)
-
-    fun portraitColumns() = preferenceStore.getInt("pref_library_columns_portrait_key", 0)
-
-    fun landscapeColumns() = preferenceStore.getInt("pref_library_columns_landscape_key", 0)
-
-    fun libraryUpdateInterval() = preferenceStore.getInt("pref_library_update_interval_key", 0)
-    fun libraryUpdateLastTimestamp() = preferenceStore.getLong("library_update_last_timestamp", 0L)
-
-    fun libraryUpdateDeviceRestriction() = preferenceStore.getStringSet("library_update_restriction", setOf(DEVICE_ONLY_ON_WIFI))
-    fun libraryUpdateMangaRestriction() = preferenceStore.getStringSet("library_update_manga_restriction", setOf(MANGA_HAS_UNREAD, MANGA_NON_COMPLETED, MANGA_NON_READ))
-
-    fun autoUpdateMetadata() = preferenceStore.getBoolean("auto_update_metadata", false)
-
-    fun autoUpdateTrackers() = preferenceStore.getBoolean("auto_update_trackers", false)
-
-    fun showContinueReadingButton() = preferenceStore.getBoolean("display_continue_reading_button", false)
-
-    // region Filter
-
-    fun filterDownloaded() = preferenceStore.getInt("pref_filter_library_downloaded", ExtendedNavigationView.Item.TriStateGroup.State.IGNORE.value)
-
-    fun filterUnread() = preferenceStore.getInt("pref_filter_library_unread", ExtendedNavigationView.Item.TriStateGroup.State.IGNORE.value)
-
-    fun filterStarted() = preferenceStore.getInt("pref_filter_library_started", ExtendedNavigationView.Item.TriStateGroup.State.IGNORE.value)
-
-    fun filterBookmarked() = preferenceStore.getInt("pref_filter_library_bookmarked", ExtendedNavigationView.Item.TriStateGroup.State.IGNORE.value)
-
-    fun filterCompleted() = preferenceStore.getInt("pref_filter_library_completed", ExtendedNavigationView.Item.TriStateGroup.State.IGNORE.value)
-
-    fun filterTracking(name: Int) = preferenceStore.getInt("pref_filter_library_tracked_$name", ExtendedNavigationView.Item.TriStateGroup.State.IGNORE.value)
-
-    // endregion
-
-    // region Badges
-
-    fun downloadBadge() = preferenceStore.getBoolean("display_download_badge", false)
-
-    fun localBadge() = preferenceStore.getBoolean("display_local_badge", true)
-
-    fun languageBadge() = preferenceStore.getBoolean("display_language_badge", false)
-
-    fun newShowUpdatesCount() = preferenceStore.getBoolean("library_show_updates_count", true)
-    fun newUpdatesCount() = preferenceStore.getInt("library_unseen_updates_count", 0)
-
-    // endregion
-
-    // region Category
-
-    fun defaultCategory() = preferenceStore.getInt("default_category", -1)
-
-    fun lastUsedCategory() = preferenceStore.getInt("last_used_category", 0)
-
-    fun categoryTabs() = preferenceStore.getBoolean("display_category_tabs", true)
-
-    fun categoryNumberOfItems() = preferenceStore.getBoolean("display_number_of_items", false)
-
-    fun categorizedDisplaySettings() = preferenceStore.getBoolean("categorized_display", false)
-
-    fun libraryUpdateCategories() = preferenceStore.getStringSet("library_update_categories", emptySet())
-
-    fun libraryUpdateCategoriesExclude() = preferenceStore.getStringSet("library_update_categories_exclude", emptySet())
-
-    // endregion
-
-    // region Chapter
-
-    fun filterChapterByRead() = preferenceStore.getLong("default_chapter_filter_by_read", Manga.SHOW_ALL)
-
-    fun filterChapterByDownloaded() = preferenceStore.getLong("default_chapter_filter_by_downloaded", Manga.SHOW_ALL)
-
-    fun filterChapterByBookmarked() = preferenceStore.getLong("default_chapter_filter_by_bookmarked", Manga.SHOW_ALL)
-
-    // and upload date
-    fun sortChapterBySourceOrNumber() = preferenceStore.getLong("default_chapter_sort_by_source_or_number", Manga.CHAPTER_SORTING_SOURCE)
-
-    fun displayChapterByNameOrNumber() = preferenceStore.getLong("default_chapter_display_by_name_or_number", Manga.CHAPTER_DISPLAY_NAME)
-
-    fun sortChapterByAscendingOrDescending() = preferenceStore.getLong("default_chapter_sort_by_ascending_or_descending", Manga.CHAPTER_SORT_DESC)
-
-    fun setChapterSettingsDefault(manga: Manga) {
-        filterChapterByRead().set(manga.unreadFilterRaw)
-        filterChapterByDownloaded().set(manga.downloadedFilterRaw)
-        filterChapterByBookmarked().set(manga.bookmarkedFilterRaw)
-        sortChapterBySourceOrNumber().set(manga.sorting)
-        displayChapterByNameOrNumber().set(manga.displayMode)
-        sortChapterByAscendingOrDescending().set(if (manga.sortDescending()) Manga.CHAPTER_SORT_DESC else Manga.CHAPTER_SORT_ASC)
-    }
-
-    fun autoClearChapterCache() = preferenceStore.getBoolean("auto_clear_chapter_cache", false)
-
-    // endregion
-}

app/src/main/java/eu/kanade/domain/manga/interactor/GetDuplicateLibraryManga.kt

@@ -1,13 +0,0 @@
-package eu.kanade.domain.manga.interactor
-
-import tachiyomi.domain.manga.model.Manga
-import tachiyomi.domain.manga.repository.MangaRepository
-
-class GetDuplicateLibraryManga(
-    private val mangaRepository: MangaRepository,
-) {
-
-    suspend fun await(title: String): Manga? {
-        return mangaRepository.getDuplicateLibraryManga(title.lowercase())
-    }
-}

app/src/main/java/eu/kanade/domain/manga/interactor/GetFavorites.kt

@@ -1,18 +0,0 @@
-package eu.kanade.domain.manga.interactor
-
-import kotlinx.coroutines.flow.Flow
-import tachiyomi.domain.manga.model.Manga
-import tachiyomi.domain.manga.repository.MangaRepository
-
-class GetFavorites(
-    private val mangaRepository: MangaRepository,
-) {
-
-    suspend fun await(): List<Manga> {
-        return mangaRepository.getFavorites()
-    }
-
-    fun subscribe(sourceId: Long): Flow<List<Manga>> {
-        return mangaRepository.getFavoritesBySourceId(sourceId)
-    }
-}

app/src/main/java/eu/kanade/domain/manga/interactor/GetLibraryManga.kt

@@ -1,18 +0,0 @@
-package eu.kanade.domain.manga.interactor
-
-import kotlinx.coroutines.flow.Flow
-import tachiyomi.domain.library.model.LibraryManga
-import tachiyomi.domain.manga.repository.MangaRepository
-
-class GetLibraryManga(
-    private val mangaRepository: MangaRepository,
-) {
-
-    suspend fun await(): List<LibraryManga> {
-        return mangaRepository.getLibraryManga()
-    }
-
-    fun subscribe(): Flow<List<LibraryManga>> {
-        return mangaRepository.getLibraryMangaAsFlow()
-    }
-}

app/src/main/java/eu/kanade/domain/manga/interactor/GetManga.kt

@@ -1,29 +0,0 @@
-package eu.kanade.domain.manga.interactor
-
-import kotlinx.coroutines.flow.Flow
-import logcat.LogPriority
-import tachiyomi.core.util.system.logcat
-import tachiyomi.domain.manga.model.Manga
-import tachiyomi.domain.manga.repository.MangaRepository
-
-class GetManga(
-    private val mangaRepository: MangaRepository,
-) {
-
-    suspend fun await(id: Long): Manga? {
-        return try {
-            mangaRepository.getMangaById(id)
-        } catch (e: Exception) {
-            logcat(LogPriority.ERROR, e)
-            null
-        }
-    }
-
-    suspend fun subscribe(id: Long): Flow<Manga> {
-        return mangaRepository.getMangaByIdAsFlow(id)
-    }
-
-    fun subscribe(url: String, sourceId: Long): Flow<Manga?> {
-        return mangaRepository.getMangaByUrlAndSourceIdAsFlow(url, sourceId)
-    }
-}

app/src/main/java/eu/kanade/domain/manga/interactor/GetMangaWithChapters.kt

@@ -1,31 +0,0 @@
-package eu.kanade.domain.manga.interactor
-
-import kotlinx.coroutines.flow.Flow
-import kotlinx.coroutines.flow.combine
-import tachiyomi.domain.chapter.model.Chapter
-import tachiyomi.domain.chapter.repository.ChapterRepository
-import tachiyomi.domain.manga.model.Manga
-import tachiyomi.domain.manga.repository.MangaRepository
-
-class GetMangaWithChapters(
-    private val mangaRepository: MangaRepository,
-    private val chapterRepository: ChapterRepository,
-) {
-
-    suspend fun subscribe(id: Long): Flow<Pair<Manga, List<Chapter>>> {
-        return combine(
-            mangaRepository.getMangaByIdAsFlow(id),
-            chapterRepository.getChapterByMangaIdAsFlow(id),
-        ) { manga, chapters ->
-            Pair(manga, chapters)
-        }
-    }
-
-    suspend fun awaitManga(id: Long): Manga {
-        return mangaRepository.getMangaById(id)
-    }
-
-    suspend fun awaitChapters(id: Long): List<Chapter> {
-        return chapterRepository.getChapterByMangaId(id)
-    }
-}

app/src/main/java/eu/kanade/domain/manga/interactor/NetworkToLocalManga.kt

@@ -1,35 +0,0 @@
-package eu.kanade.domain.manga.interactor
-
-import tachiyomi.domain.manga.model.Manga
-import tachiyomi.domain.manga.repository.MangaRepository
-
-class NetworkToLocalManga(
-    private val mangaRepository: MangaRepository,
-) {
-
-    suspend fun await(manga: Manga): Manga {
-        val localManga = getManga(manga.url, manga.source)
-        return when {
-            localManga == null -> {
-                val id = insertManga(manga)
-                manga.copy(id = id!!)
-            }
-            !localManga.favorite -> {
-                // if the manga isn't a favorite, set its display title from source
-                // if it later becomes a favorite, updated title will go to db
-                localManga.copy(title = manga.title)
-            }
-            else -> {
-                localManga
-            }
-        }
-    }
-
-    private suspend fun getManga(url: String, sourceId: Long): Manga? {
-        return mangaRepository.getMangaByUrlAndSourceId(url, sourceId)
-    }
-
-    private suspend fun insertManga(manga: Manga): Long? {
-        return mangaRepository.insert(manga)
-    }
-}

app/src/main/java/eu/kanade/domain/manga/interactor/ResetViewerFlags.kt

@@ -1,12 +0,0 @@
-package eu.kanade.domain.manga.interactor
-
-import tachiyomi.domain.manga.repository.MangaRepository
-
-class ResetViewerFlags(
-    private val mangaRepository: MangaRepository,
-) {
-
-    suspend fun await(): Boolean {
-        return mangaRepository.resetViewerFlags()
-    }
-}

app/src/main/java/eu/kanade/domain/manga/interactor/SetMangaChapterFlags.kt

@@ -1,97 +0,0 @@
-package eu.kanade.domain.manga.interactor
-
-import tachiyomi.domain.manga.model.Manga
-import tachiyomi.domain.manga.model.MangaUpdate
-import tachiyomi.domain.manga.repository.MangaRepository
-
-class SetMangaChapterFlags(
-    private val mangaRepository: MangaRepository,
-) {
-
-    suspend fun awaitSetDownloadedFilter(manga: Manga, flag: Long): Boolean {
-        return mangaRepository.update(
-            MangaUpdate(
-                id = manga.id,
-                chapterFlags = manga.chapterFlags.setFlag(flag, Manga.CHAPTER_DOWNLOADED_MASK),
-            ),
-        )
-    }
-
-    suspend fun awaitSetUnreadFilter(manga: Manga, flag: Long): Boolean {
-        return mangaRepository.update(
-            MangaUpdate(
-                id = manga.id,
-                chapterFlags = manga.chapterFlags.setFlag(flag, Manga.CHAPTER_UNREAD_MASK),
-            ),
-        )
-    }
-
-    suspend fun awaitSetBookmarkFilter(manga: Manga, flag: Long): Boolean {
-        return mangaRepository.update(
-            MangaUpdate(
-                id = manga.id,
-                chapterFlags = manga.chapterFlags.setFlag(flag, Manga.CHAPTER_BOOKMARKED_MASK),
-            ),
-        )
-    }
-
-    suspend fun awaitSetDisplayMode(manga: Manga, flag: Long): Boolean {
-        return mangaRepository.update(
-            MangaUpdate(
-                id = manga.id,
-                chapterFlags = manga.chapterFlags.setFlag(flag, Manga.CHAPTER_DISPLAY_MASK),
-            ),
-        )
-    }
-
-    suspend fun awaitSetSortingModeOrFlipOrder(manga: Manga, flag: Long): Boolean {
-        val newFlags = manga.chapterFlags.let {
-            if (manga.sorting == flag) {
-                // Just flip the order
-                val orderFlag = if (manga.sortDescending()) {
-                    Manga.CHAPTER_SORT_ASC
-                } else {
-                    Manga.CHAPTER_SORT_DESC
-                }
-                it.setFlag(orderFlag, Manga.CHAPTER_SORT_DIR_MASK)
-            } else {
-                // Set new flag with ascending order
-                it
-                    .setFlag(flag, Manga.CHAPTER_SORTING_MASK)
-                    .setFlag(Manga.CHAPTER_SORT_ASC, Manga.CHAPTER_SORT_DIR_MASK)
-            }
-        }
-        return mangaRepository.update(
-            MangaUpdate(
-                id = manga.id,
-                chapterFlags = newFlags,
-            ),
-        )
-    }
-
-    suspend fun awaitSetAllFlags(
-        mangaId: Long,
-        unreadFilter: Long,
-        downloadedFilter: Long,
-        bookmarkedFilter: Long,
-        sortingMode: Long,
-        sortingDirection: Long,
-        displayMode: Long,
-    ): Boolean {
-        return mangaRepository.update(
-            MangaUpdate(
-                id = mangaId,
-                chapterFlags = 0L.setFlag(unreadFilter, Manga.CHAPTER_UNREAD_MASK)
-                    .setFlag(downloadedFilter, Manga.CHAPTER_DOWNLOADED_MASK)
-                    .setFlag(bookmarkedFilter, Manga.CHAPTER_BOOKMARKED_MASK)
-                    .setFlag(sortingMode, Manga.CHAPTER_SORTING_MASK)
-                    .setFlag(sortingDirection, Manga.CHAPTER_SORT_DIR_MASK)
-                    .setFlag(displayMode, Manga.CHAPTER_DISPLAY_MASK),
-            ),
-        )
-    }
-
-    private fun Long.setFlag(flag: Long, mask: Long): Long {
-        return this and mask.inv() or (flag and mask)
-    }
-}

app/src/main/java/eu/kanade/domain/manga/interactor/SetMangaViewerFlags.kt

@@ -1,35 +0,0 @@
-package eu.kanade.domain.manga.interactor
-
-import eu.kanade.tachiyomi.ui.reader.setting.OrientationType
-import eu.kanade.tachiyomi.ui.reader.setting.ReadingModeType
-import tachiyomi.domain.manga.model.MangaUpdate
-import tachiyomi.domain.manga.repository.MangaRepository
-
-class SetMangaViewerFlags(
-    private val mangaRepository: MangaRepository,
-) {
-
-    suspend fun awaitSetMangaReadingMode(id: Long, flag: Long) {
-        val manga = mangaRepository.getMangaById(id)
-        mangaRepository.update(
-            MangaUpdate(
-                id = id,
-                viewerFlags = manga.viewerFlags.setFlag(flag, ReadingModeType.MASK.toLong()),
-            ),
-        )
-    }
-
-    suspend fun awaitSetOrientationType(id: Long, flag: Long) {
-        val manga = mangaRepository.getMangaById(id)
-        mangaRepository.update(
-            MangaUpdate(
-                id = id,
-                viewerFlags = manga.viewerFlags.setFlag(flag, OrientationType.MASK.toLong()),
-            ),
-        )
-    }
-
-    private fun Long.setFlag(flag: Long, mask: Long): Long {
-        return this and mask.inv() or (flag and mask)
-    }
-}

app/src/main/java/eu/kanade/domain/manga/interactor/UpdateManga.kt

@@ -1,93 +0,0 @@
-package eu.kanade.domain.manga.interactor
-
-import eu.kanade.domain.manga.model.hasCustomCover
-import eu.kanade.domain.manga.model.isLocal
-import eu.kanade.tachiyomi.data.cache.CoverCache
-import eu.kanade.tachiyomi.source.model.SManga
-import tachiyomi.domain.manga.model.Manga
-import tachiyomi.domain.manga.model.MangaUpdate
-import tachiyomi.domain.manga.repository.MangaRepository
-import uy.kohesive.injekt.Injekt
-import uy.kohesive.injekt.api.get
-import java.util.Date
-
-class UpdateManga(
-    private val mangaRepository: MangaRepository,
-) {
-
-    suspend fun await(mangaUpdate: MangaUpdate): Boolean {
-        return mangaRepository.update(mangaUpdate)
-    }
-
-    suspend fun awaitAll(mangaUpdates: List<MangaUpdate>): Boolean {
-        return mangaRepository.updateAll(mangaUpdates)
-    }
-
-    suspend fun awaitUpdateFromSource(
-        localManga: Manga,
-        remoteManga: SManga,
-        manualFetch: Boolean,
-        coverCache: CoverCache = Injekt.get(),
-    ): Boolean {
-        val remoteTitle = try {
-            remoteManga.title
-        } catch (_: UninitializedPropertyAccessException) {
-            ""
-        }
-
-        // if the manga isn't a favorite, set its title from source and update in db
-        val title = if (remoteTitle.isEmpty() || localManga.favorite) null else remoteTitle
-
-        val coverLastModified =
-            when {
-                // Never refresh covers if the url is empty to avoid "losing" existing covers
-                remoteManga.thumbnail_url.isNullOrEmpty() -> null
-                !manualFetch && localManga.thumbnailUrl == remoteManga.thumbnail_url -> null
-                localManga.isLocal() -> Date().time
-                localManga.hasCustomCover(coverCache) -> {
-                    coverCache.deleteFromCache(localManga, false)
-                    null
-                }
-                else -> {
-                    coverCache.deleteFromCache(localManga, false)
-                    Date().time
-                }
-            }
-
-        val thumbnailUrl = remoteManga.thumbnail_url?.takeIf { it.isNotEmpty() }
-
-        return mangaRepository.update(
-            MangaUpdate(
-                id = localManga.id,
-                title = title,
-                coverLastModified = coverLastModified,
-                author = remoteManga.author,
-                artist = remoteManga.artist,
-                description = remoteManga.description,
-                genre = remoteManga.getGenres(),
-                thumbnailUrl = thumbnailUrl,
-                status = remoteManga.status.toLong(),
-                updateStrategy = remoteManga.update_strategy,
-                initialized = true,
-            ),
-        )
-    }
-
-    suspend fun awaitUpdateLastUpdate(mangaId: Long): Boolean {
-        return mangaRepository.update(MangaUpdate(id = mangaId, lastUpdate = Date().time))
-    }
-
-    suspend fun awaitUpdateCoverLastModified(mangaId: Long): Boolean {
-        return mangaRepository.update(MangaUpdate(id = mangaId, coverLastModified = Date().time))
-    }
-
-    suspend fun awaitUpdateFavorite(mangaId: Long, favorite: Boolean): Boolean {
-        val dateAdded = when (favorite) {
-            true -> Date().time
-            false -> 0
-        }
-        return mangaRepository.update(
-            MangaUpdate(id = mangaId, favorite = favorite, dateAdded = dateAdded),
-        )
-    }
-}

app/src/main/java/eu/kanade/domain/manga/model/ComicInfo.kt

@@ -1,176 +0,0 @@
-package eu.kanade.domain.manga.model
-
-import eu.kanade.tachiyomi.source.model.SManga
-import kotlinx.serialization.Serializable
-import nl.adaptivity.xmlutil.serialization.XmlElement
-import nl.adaptivity.xmlutil.serialization.XmlSerialName
-import nl.adaptivity.xmlutil.serialization.XmlValue
-import tachiyomi.domain.chapter.model.Chapter
-import tachiyomi.domain.manga.model.Manga
-
-const val COMIC_INFO_FILE = "ComicInfo.xml"
-
-/**
- * Creates a ComicInfo instance based on the manga and chapter metadata.
- */
-fun getComicInfo(manga: Manga, chapter: Chapter, chapterUrl: String) = ComicInfo(
-    title = ComicInfo.Title(chapter.name),
-    series = ComicInfo.Series(manga.title),
-    web = ComicInfo.Web(chapterUrl),
-    summary = manga.description?.let { ComicInfo.Summary(it) },
-    writer = manga.author?.let { ComicInfo.Writer(it) },
-    penciller = manga.artist?.let { ComicInfo.Penciller(it) },
-    translator = chapter.scanlator?.let { ComicInfo.Translator(it) },
-    genre = manga.genre?.let { ComicInfo.Genre(it.joinToString()) },
-    publishingStatus = ComicInfo.PublishingStatusTachiyomi(
-        ComicInfoPublishingStatus.toComicInfoValue(manga.status),
-    ),
-    inker = null,
-    colorist = null,
-    letterer = null,
-    coverArtist = null,
-    tags = null,
-)
-
-fun SManga.copyFromComicInfo(comicInfo: ComicInfo) {
-    comicInfo.series?.let { title = it.value }
-    comicInfo.writer?.let { author = it.value }
-    comicInfo.summary?.let { description = it.value }
-
-    listOfNotNull(
-        comicInfo.genre?.value,
-        comicInfo.tags?.value,
-    )
-        .flatMap { it.split(", ") }
-        .distinct()
-        .joinToString(", ") { it.trim() }
-        .takeIf { it.isNotEmpty() }
-        ?.let { genre = it }
-
-    listOfNotNull(
-        comicInfo.penciller?.value,
-        comicInfo.inker?.value,
-        comicInfo.colorist?.value,
-        comicInfo.letterer?.value,
-        comicInfo.coverArtist?.value,
-    )
-        .flatMap { it.split(", ") }
-        .distinct()
-        .joinToString(", ") { it.trim() }
-        .takeIf { it.isNotEmpty() }
-        ?.let { artist = it }
-
-    status = ComicInfoPublishingStatus.toSMangaValue(comicInfo.publishingStatus?.value)
-}
-
-@Serializable
-@XmlSerialName("ComicInfo", "", "")
-data class ComicInfo(
-    val title: Title?,
-    val series: Series?,
-    val summary: Summary?,
-    val writer: Writer?,
-    val penciller: Penciller?,
-    val inker: Inker?,
-    val colorist: Colorist?,
-    val letterer: Letterer?,
-    val coverArtist: CoverArtist?,
-    val translator: Translator?,
-    val genre: Genre?,
-    val tags: Tags?,
-    val web: Web?,
-    val publishingStatus: PublishingStatusTachiyomi?,
-) {
-    @Suppress("UNUSED")
-    @XmlElement(false)
-    @XmlSerialName("xmlns:xsd", "", "")
-    val xmlSchema: String = "http://www.w3.org/2001/XMLSchema"
-
-    @Suppress("UNUSED")
-    @XmlElement(false)
-    @XmlSerialName("xmlns:xsi", "", "")
-    val xmlSchemaInstance: String = "http://www.w3.org/2001/XMLSchema-instance"
-
-    @Serializable
-    @XmlSerialName("Title", "", "")
-    data class Title(@XmlValue(true) val value: String = "")
-
-    @Serializable
-    @XmlSerialName("Series", "", "")
-    data class Series(@XmlValue(true) val value: String = "")
-
-    @Serializable
-    @XmlSerialName("Summary", "", "")
-    data class Summary(@XmlValue(true) val value: String = "")
-
-    @Serializable
-    @XmlSerialName("Writer", "", "")
-    data class Writer(@XmlValue(true) val value: String = "")
-
-    @Serializable
-    @XmlSerialName("Penciller", "", "")
-    data class Penciller(@XmlValue(true) val value: String = "")
-
-    @Serializable
-    @XmlSerialName("Inker", "", "")
-    data class Inker(@XmlValue(true) val value: String = "")
-
-    @Serializable
-    @XmlSerialName("Colorist", "", "")
-    data class Colorist(@XmlValue(true) val value: String = "")
-
-    @Serializable
-    @XmlSerialName("Letterer", "", "")
-    data class Letterer(@XmlValue(true) val value: String = "")
-
-    @Serializable
-    @XmlSerialName("CoverArtist", "", "")
-    data class CoverArtist(@XmlValue(true) val value: String = "")
-
-    @Serializable
-    @XmlSerialName("Translator", "", "")
-    data class Translator(@XmlValue(true) val value: String = "")
-
-    @Serializable
-    @XmlSerialName("Genre", "", "")
-    data class Genre(@XmlValue(true) val value: String = "")
-
-    @Serializable
-    @XmlSerialName("Tags", "", "")
-    data class Tags(@XmlValue(true) val value: String = "")
-
-    @Serializable
-    @XmlSerialName("Web", "", "")
-    data class Web(@XmlValue(true) val value: String = "")
-
-    // The spec doesn't have a good field for this
-    @Serializable
-    @XmlSerialName("PublishingStatusTachiyomi", "http://www.w3.org/2001/XMLSchema", "ty")
-    data class PublishingStatusTachiyomi(@XmlValue(true) val value: String = "")
-}
-
-private enum class ComicInfoPublishingStatus(
-    val comicInfoValue: String,
-    val sMangaModelValue: Int,
-) {
-    ONGOING("Ongoing", SManga.ONGOING),
-    COMPLETED("Completed", SManga.COMPLETED),
-    LICENSED("Licensed", SManga.LICENSED),
-    PUBLISHING_FINISHED("Publishing finished", SManga.PUBLISHING_FINISHED),
-    CANCELLED("Cancelled", SManga.CANCELLED),
-    ON_HIATUS("On hiatus", SManga.ON_HIATUS),
-    UNKNOWN("Unknown", SManga.UNKNOWN),
-    ;
-
-    companion object {
-        fun toComicInfoValue(value: Long): String {
-            return values().firstOrNull { it.sMangaModelValue == value.toInt() }?.comicInfoValue
-                ?: UNKNOWN.comicInfoValue
-        }
-
-        fun toSMangaValue(value: String?): Int {
-            return values().firstOrNull { it.comicInfoValue == value }?.sMangaModelValue
-                ?: UNKNOWN.sMangaModelValue
-        }
-    }
-}