Revert "Merge branch 'kuukiyomi' into kuuki-merge"

This reverts commit 267cbe4, reversing changes made to 145777f.
LuftVerbot · Jul 30, 2023 · 0cf6fc2 · 0cf6fc2
1 parent 267cbe4
commit 0cf6fc2
Show file tree

Hide file tree

Showing 136 changed files with 242 additions and 3,239 deletions.
diff --git a/.github/ISSUE_TEMPLATE/report_issue.yml b/.github/ISSUE_TEMPLATE/report_issue.yml
@@ -1,5 +1,5 @@
 name: 🐞 Issue report
-description: Report an issue in Kuukiyomi
+description: Report an issue in Aniyomi
 labels: [Bug]
 body:
   - type: textarea
@@ -47,10 +47,10 @@ body:
         You can paste the crash logs in plain text or upload it as an attachment.
 
   - type: input
-    id: kuukiyomi-version
+    id: aniyomi-version
     attributes:
-      label: Kuukiyomi version
-      description: You can find your Kuukiyomi version in **More → About**.
+      label: Aniyomi version
+      description: You can find your Aniyomi version in **More → About**.
       placeholder: |
         Example: "0.12.3.10"
     validations:
@@ -97,7 +97,7 @@ body:
           required: true
         - label: I have gone through the [FAQ](https://aniyomi.org/help/faq/) and [troubleshooting guide](https://aniyomi.org/help/guides/troubleshooting/).
           required: true
-        - label: I have updated the app to version **[0.12.3.10](https://github.com/LuftVerbot/kuukiyomi/releases/latest)**.
+        - label: I have updated the app to version **[0.12.3.10](https://github.com/aniyomiorg/aniyomi/releases/latest)**.
           required: true
         - label: I have updated all installed extensions.
           required: true

diff --git a/.github/ISSUE_TEMPLATE/request_feature.yml b/.github/ISSUE_TEMPLATE/request_feature.yml
@@ -1,12 +1,12 @@
 name: ⭐ Feature request
-description: Suggest a feature to improve Kuukiyomi
+description: Suggest a feature to improve Aniyomi
 labels: [Feature request]
 body:
   - type: textarea
     id: feature-description
     attributes:
       label: Describe your suggested feature
-      description: How can Kuukiyomi be improved?
+      description: How can Aniyomi be improved?
       placeholder: |
         Example:
           "It should work like this..."
@@ -32,7 +32,7 @@ body:
           required: true
         - label: If this is an issue with an extension, I should be opening an issue in the [extensions repository](https://github.com/aniyomiorg/aniyomi-extensions/issues/new/choose).
           required: true
-        - label: I have updated the app to version **[0.12.3.10](https://github.com/LuftVerbot/kuukiyomi/releases/latest)**.
+        - label: I have updated the app to version **[0.12.3.10](https://github.com/aniyomiorg/aniyomi/releases/latest)**.
           required: true
         - label: I will fill out all of the requested information in this form.
           required: true
diff --git a/.github/readme-images/app-icon.png b/.github/readme-images/app-icon.png
diff --git a/.github/workflows/build_push.yml b/.github/workflows/build_push.yml
@@ -38,13 +38,13 @@ jobs:
 
       - name: Get tag name
 
-        if: startsWith(github.ref, 'refs/tags/') && github.repository == 'LuftVerbot/kuukiyomi'
+        if: startsWith(github.ref, 'refs/tags/') && github.repository == 'aniyomiorg/aniyomi'
         run: |
           set -x
           echo "VERSION_TAG=${GITHUB_REF/refs\/tags\//}" >> $GITHUB_ENV
 
       - name: Sign APK
-        if: startsWith(github.ref, 'refs/tags/') && github.repository == 'LuftVerbot/kuukiyomi'
+        if: startsWith(github.ref, 'refs/tags/') && github.repository == 'aniyomiorg/aniyomi'
         uses: r0adkll/sign-android-release@v1
         with:
           releaseDirectory: app/build/outputs/apk/standard/release
@@ -54,36 +54,36 @@ jobs:
           keyPassword: ${{ secrets.KEY_PASSWORD }}
 
       - name: Clean up build artifacts
-        if: startsWith(github.ref, 'refs/tags/') && github.repository == 'LuftVerbot/kuukiyomi'
+        if: startsWith(github.ref, 'refs/tags/') && github.repository == 'aniyomiorg/aniyomi'
         run: |
           set -e
 
-          mv app/build/outputs/apk/standard/release/app-standard-universal-release-unsigned-signed.apk kuukiyomi-${{ env.VERSION_TAG }}.apk
-          sha=`sha256sum kuukiyomi-${{ env.VERSION_TAG }}.apk | awk '{ print $1 }'`
+          mv app/build/outputs/apk/standard/release/app-standard-universal-release-unsigned-signed.apk aniyomi-${{ env.VERSION_TAG }}.apk
+          sha=`sha256sum aniyomi-${{ 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 kuukiyomi-arm64-v8a-${{ env.VERSION_TAG }}.apk
-          sha=`sha256sum kuukiyomi-arm64-v8a-${{ env.VERSION_TAG }}.apk | awk '{ print $1 }'`
+          cp app/build/outputs/apk/standard/release/app-standard-arm64-v8a-release-unsigned-signed.apk aniyomi-arm64-v8a-${{ env.VERSION_TAG }}.apk
+          sha=`sha256sum aniyomi-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 kuukiyomi-armeabi-v7a-${{ env.VERSION_TAG }}.apk
-          sha=`sha256sum kuukiyomi-armeabi-v7a-${{ env.VERSION_TAG }}.apk | awk '{ print $1 }'`
+          cp app/build/outputs/apk/standard/release/app-standard-armeabi-v7a-release-unsigned-signed.apk aniyomi-armeabi-v7a-${{ env.VERSION_TAG }}.apk
+          sha=`sha256sum aniyomi-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 kuukiyomi-x86-${{ env.VERSION_TAG }}.apk
-          sha=`sha256sum kuukiyomi-x86-${{ env.VERSION_TAG }}.apk | awk '{ print $1 }'`
+          cp app/build/outputs/apk/standard/release/app-standard-x86-release-unsigned-signed.apk aniyomi-x86-${{ env.VERSION_TAG }}.apk
+          sha=`sha256sum aniyomi-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 kuukiyomi-x86_64-${{ env.VERSION_TAG }}.apk
-          sha=`sha256sum kuukiyomi-x86_64-${{ env.VERSION_TAG }}.apk | awk '{ print $1 }'`
+          cp app/build/outputs/apk/standard/release/app-standard-x86_64-release-unsigned-signed.apk aniyomi-x86_64-${{ env.VERSION_TAG }}.apk
+          sha=`sha256sum aniyomi-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 == 'LuftVerbot/kuukiyomi'
+        if: startsWith(github.ref, 'refs/tags/') && github.repository == 'aniyomiorg/aniyomi'
         uses: softprops/action-gh-release@v1
         with:
           tag_name: ${{ env.VERSION_TAG }}
-          name: Kuukiyomi ${{ env.VERSION_TAG }}
+          name: Aniyomi ${{ env.VERSION_TAG }}
           body: |
             ---
 
@@ -97,11 +97,11 @@ jobs:
             | x86 | ${{ env.APK_X86_SHA }}
             | x86_64 | ${{ env.APK_X86_64_SHA }} |
           files: |
-            kuukiyomi-${{ env.VERSION_TAG }}.apk
-            kuukiyomi-arm64-v8a-${{ env.VERSION_TAG }}.apk
-            kuukiyomi-armeabi-v7a-${{ env.VERSION_TAG }}.apk
-            kuukiyomi-x86-${{ env.VERSION_TAG }}.apk
-            kuukiyomi-x86_64-${{ env.VERSION_TAG }}.apk
+            aniyomi-${{ env.VERSION_TAG }}.apk
+            aniyomi-arm64-v8a-${{ env.VERSION_TAG }}.apk
+            aniyomi-armeabi-v7a-${{ env.VERSION_TAG }}.apk
+            aniyomi-x86-${{ env.VERSION_TAG }}.apk
+            aniyomi-x86_64-${{ env.VERSION_TAG }}.apk
           draft: true
           prerelease: false
         env:

diff --git a/.github/workflows/issue_moderator.yml b/.github/workflows/issue_moderator.yml
@@ -25,7 +25,7 @@ jobs:
               },
               {
                 "type": "body",
-                "regex": ".*\\* (Kuukiyomi version|Android version|Device): \\?.*",
+                "regex": ".*\\* (Aniyomi version|Android version|Device): \\?.*",
                 "message": "Requested information in the template was not filled out."
               }
             ]

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
@@ -1,15 +1,15 @@
-Looking to report an issue/bug or make a feature request? Please refer to the [README file](https://github.com/LuftVerbot/kuukiyomi#issues-feature-requests-and-contributing).
+Looking to report an issue/bug or make a feature request? Please refer to the [README file](https://github.com/aniyomiorg/aniyomi#issues-feature-requests-and-contributing).
 
 ---
 
-Thanks for your interest in contributing to Kuukiyomi!
+Thanks for your interest in contributing to Aniyomi!
 
 
 # Code contributions
 
 Pull requests are welcome!
 
-If you're interested in taking on [an open issue](https://github.com/LuftVerbot/Kuukiyomi/issues), please comment on it so others are aware.
+If you're interested in taking on [an open issue](https://github.com/aniyomiorg/aniyomi/issues), please comment on it so others are aware.
 You do not need to ask for permission nor an assignment.
 
 ## Prerequisites
@@ -26,7 +26,7 @@ Before you start, please note that the ability to use following technologies is
 
 ## Getting help
 
-- Join [the Discord server](https://discord.gg/s82Vu589Ya) for online help and to ask questions while developing.
+- Join [the Discord server](https://discord.gg/F32UjdJZrR) for online help and to ask questions while developing.
 
 # Translations
 
@@ -42,9 +42,9 @@ 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/LuftVerbot/kuukiyomi/blob/master/app/src/main/java/eu/kanade/tachiyomi/data/updater/AppUpdateChecker.kt)
+    - Change or disable the [app update checker](https://github.com/aniyomiorg/aniyomi/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/LuftVerbot/kuukiyomi/blob/master/app/build.gradle.kts)
+    - Change the `applicationId` in [`build.gradle.kts`](https://github.com/aniyomiorg/aniyomi/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/aniyomiorg/aniyomi/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/aniyomiorg/aniyomi/blob/master/app/build.gradle.kts) with your own
diff --git a/README.md b/README.md
@@ -1,19 +1,15 @@
-| Build                                                                                                                                                                 | Preview Release | Codefactor | Stable                                                                                                                                                             | Translate Aniyomi                                                                                                                                 | Discord Server |
-|-----------------------------------------------------------------------------------------------------------------------------------------------------------------------|-----------|-------|--------------------------------------------------------------------------------------------------------------------------------------------------------------------|---------------------------------------------------------------------------------------------------------------------------------------------------|---------|
-| [![CI](https://github.com/LuftVerbot/kuukiyomi/actions/workflows/build_push.yml/badge.svg)](https://github.com/LuftVerbot/kuukiyomi/actions/workflows/build_push.yml) | [![latest preview build](https://img.shields.io/github/v/release/aniyomiorg/aniyomi-preview.svg?maxAge=3600&label=download)](https://github.com/aniyomiorg/aniyomi-preview/releases) | [![CodeFactor](https://www.codefactor.io/repository/github/LuftVerbot/kuukiyomi/badge)](https://www.codefactor.io/repository/github/LuftVerbot/kuukiyomi) | [![stable release](https://img.shields.io/github/v/release/LuftVerbot/kuukiyomi.svg?maxAge=3600&label=download)](https://github.com/LuftVerbot/kuukiyomi/releases) | [![Translation status](https://hosted.weblate.org/widgets/aniyomi/-/svg-badge.svg)](https://hosted.weblate.org/engage/aniyomi/?utm_source=widget) | [![Discord](https://img.shields.io/discord/1133390318323126402?label=discord&labelColor=7289da&color=2c2f33&style=flat)](https://discord.gg/s82Vu589Ya) |
+| Build | Preview Release | Codefactor | Stable | Translate Aniyomi                                                                                                                                 | Discord Server |
+|-------|-----------|-------|----------|---------------------------------------------------------------------------------------------------------------------------------------------------|---------|
+| [![CI](https://github.com/aniyomiorg/aniyomi/actions/workflows/build_push.yml/badge.svg)] (https://github.com/aniyomiorg/aniyomi/actions/workflows/build_push.yml) | [![latest preview build](https://img.shields.io/github/v/release/aniyomiorg/aniyomi-preview.svg?maxAge=3600&label=download)](https://github.com/aniyomiorg/aniyomi-preview/releases) | [![CodeFactor](https://www.codefactor.io/repository/github/aniyomiorg/aniyomi/badge)](https://www.codefactor.io/repository/github/aniyomiorg/aniyomi) | [![stable release](https://img.shields.io/github/release/aniyomiorg/aniyomi.svg?maxAge=3600&label=download)](https://github.com/aniyomiorg/aniyomi/releases) | [![Translation status](https://hosted.weblate.org/widgets/aniyomi/-/svg-badge.svg)](https://hosted.weblate.org/engage/aniyomi/?utm_source=widget) | [![Discord](https://img.shields.io/discord/841701076242530374?label=discord&labelColor=7289da&color=2c2f33&style=flat)](https://discord.gg/F32UjdJZrR) |
 
 
-# ![app icon](.github/readme-images/app-icon.png)Kuukiyomi
-Kuukiyomi is an fork of [Aniyomi](https://github.com/aniyomiorg/aniyomi) which is an unofficial fork of the free and open source manga reader [Tachiyomi](https://github.com/tachiyomiorg/tachiyomi) that adds anime capabilities! For Android 6.0 and above.
-This version of Aniyomi aims to implement as many features of other forks as possible. This Includes TachiyomiSY and TachiyomiJ2K
+# ![app icon](.github/readme-images/app-icon.png)Aniyomi
+Aniyomi is an unofficial fork of the free and open source manga reader [Tachiyomi](https://github.com/tachiyomiorg/tachiyomi) that adds anime capabilities! For Android 6.0 and above.
 
 ## Features
 
 Features include:
-* Kuukiyomi:
-  * resmush.it(Data Saver Provider)
-* Aniyomi:
-  * Watching anime from [a variety of sources](https://github.com/aniyomiorg/aniyomi-extensions)
+* Watching anime from [a variety of sources](https://github.com/aniyomiorg/aniyomi-extensions)
 * Everything you know and love about Tachiyomi: 
     * Online reading from a variety of sources
     * Local reading of downloaded content
@@ -23,22 +19,20 @@ Features include:
     * Light and dark themes
     * Schedule updating your library for new chapters
     * Create backups locally to read offline or to your desired cloud service
-* Other fork features:
-  * TachiyomiSY:
-    * Data Saver
 
 ## Download
-Get the app from the [releases page](https://github.com/LuftVerbot/kuukiyomi/releases).
+Get the app from the [releases page](https://github.com/aniyomiorg/aniyomi/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/aniyomiorg/aniyomi-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 already opened [issues](https://github.com/LuftVerbot/kuukiyomi/issues).**
-2. Also take a look at issues opened on Aniyomis GitHub [issues](https://github.com/aniyomiorg/aniyomi/issues).
-3. If you are unsure, ask here: [![Discord](https://img.shields.io/discord/1133390318323126402?label=discord&labelColor=7289da&color=2c2f33&style=flat)](https://discord.gg/s82Vu589Ya)
+1. **Before reporting a new issue, take a look at the already opened [issues](https://github.com/aniyomiorg/aniyomi/issues).**
+2. If you are unsure, ask here: [![Discord](https://img.shields.io/discord/841701076242530374?label=discord&labelColor=7289da&color=2c2f33&style=flat)](https://discord.gg/F32UjdJZrR)
 
 </details>
 

diff --git a/app/build.gradle.kts b/app/build.gradle.kts
@@ -10,8 +10,8 @@ plugins {
 }
 
 if (gradle.startParameter.taskRequests.toString().contains("Standard")) {
-    //apply<com.google.gms.googleservices.GoogleServicesPlugin>()
-    //apply<com.google.firebase.crashlytics.buildtools.gradle.CrashlyticsPlugin>()
+    apply<com.google.gms.googleservices.GoogleServicesPlugin>()
+    apply<com.google.firebase.crashlytics.buildtools.gradle.CrashlyticsPlugin>()
 }
 
 shortcutHelper.setFilePath("./shortcuts.xml")
@@ -22,10 +22,10 @@ android {
     namespace = "eu.kanade.tachiyomi"
 
     defaultConfig {
-
-        applicationId = "xyz.luft.tachiyomi.mi"
+        applicationId = "xyz.jmir.tachiyomi.mi"
+
         versionCode = 103
-        versionName = "0.1.5"
+        versionName = "0.14.6"
 
         buildConfigField("String", "COMMIT_COUNT", "\"${getCommitCount()}\"")
         buildConfigField("String", "COMMIT_SHA", "\"${getGitSha()}\"")
@@ -247,13 +247,13 @@ dependencies {
 
     // Crash reports/analytics
     implementation(libs.acra.http)
-    //implementation(libs.firebase.analytics)
-    //implementation(libs.firebase.crashlytics)
+    implementation(libs.firebase.analytics)
+    implementation(libs.firebase.crashlytics)
 
     // Add the dependencies for the Crashlytics and Analytics libraries
     // When using the BoM, you don't specify versions in Firebase library dependencies
-    //implementation("com.google.firebase:firebase-crashlytics-ktx")
-    //implementation("com.google.firebase:firebase-analytics-ktx")
+    implementation("com.google.firebase:firebase-crashlytics-ktx")
+    implementation("com.google.firebase:firebase-analytics-ktx")
 
     // Shizuku
     implementation(libs.bundles.shizuku)

diff --git a/app/src/debug/res/mipmap-anydpi-v26/ic_launcher.xml b/app/src/debug/res/mipmap-anydpi-v26/ic_launcher.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
-  <background android:drawable="@mipmap/ic_launcher_background"/>
-  <foreground android:drawable="@mipmap/ic_launcher_foreground"/>
-  <monochrome android:drawable="@mipmap/ic_launcher_monochrome"/>
+  <background android:drawable="@android:color/transparent"/>
+  <foreground android:drawable="@drawable/ic_launcher_foreground"/>
+  <monochrome android:drawable="@drawable/ic_ani_monochrome_launcher" />
 </adaptive-icon>
diff --git a/app/src/debug/res/mipmap-anydpi-v26/ic_launcher_round.xml b/app/src/debug/res/mipmap-anydpi-v26/ic_launcher_round.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
-  <background android:drawable="@mipmap/ic_launcher_background"/>
-  <foreground android:drawable="@mipmap/ic_launcher_foreground"/>
-  <monochrome android:drawable="@mipmap/ic_launcher_monochrome"/>
+  <background android:drawable="@android:color/transparent"/>
+  <foreground android:drawable="@drawable/ic_launcher_foreground"/>
+  <monochrome android:drawable="@drawable/ic_ani_monochrome_launcher" />
 </adaptive-icon>
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
@@ -247,7 +247,7 @@
 
                 <data
                     android:host="simkl-auth"
-                    android:scheme="kuukiyomi" />
+                    android:scheme="aniyomi" />
             </intent-filter>
         </activity>