Merge branch 'akidev' of https://github.com/Dark25/Animetail2 into Up…

…stream2
Dark25 · Nov 7, 2024 · 95a0f93 · 95a0f93
2 parents 8645d6f + 0ed5a62
commit 95a0f93
Show file tree

Hide file tree

Showing 389 changed files with 13,677 additions and 1,105 deletions.
diff --git a/.github/ISSUE_TEMPLATE.md b/.github/ISSUE_TEMPLATE.md
@@ -0,0 +1,35 @@
+**PLEASE READ THIS**
+
+I acknowledge that:
+
+- I have updated:
+  - To the latest version of the app (stable is v0.3.2)
+  - All extensions
+- I have gone through the FAQ (https://aniyomi.org/docs/faq/general) and troubleshooting guide (https://aniyomi.org/docs/guides/troubleshooting/)
+- If this is an issue with an official anime extension, that I should be opening an issue in https://github.com/aniyomiorg/aniyomi-extensions
+- If this is an issue with an official manga extension and this issue can be replicated in the Tachiyomi app, that I should be opening an issue in https://github.com/tachiyomiorg/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.
+
+**DELETE THIS SECTION IF YOU HAVE READ AND ACKNOWLEDGED IT**
+
+---
+
+## Device information
+* Kuukiyomi version: ?
+* Android version: ?
+* Device: ?
+
+## Steps to reproduce
+1. First step
+2. Second step
+
+## Issue/Request
+?
+
+## Other details
+Additional details and attachments.
+
+If you're experiencing crashes, share the crash logs from More → Settings → Advanced → Dump crash logs.
diff --git a/.github/ISSUE_TEMPLATE/config.yml b/.github/ISSUE_TEMPLATE/config.yml
@@ -1,7 +1,7 @@
 blank_issues_enabled: false
 contact_links:
-  - name: 🧑‍💻 Aniyomi help discord
-    url: https://discord.gg/F32UjdJZrR
+  - name: 🧑‍💻 Animetail help discord
+    url: https://discord.gg/Bp8ZJkNYXJ
     about: Common questions are answered here
   - name: 🖥️ Aniyomi website
     url: https://aniyomi.org/

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 Aniyomi
+description: Report an issue in Animetail
 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: aniyomi-version
+    id: animetail-version
     attributes:
-      label: Aniyomi version
-      description: You can find your Aniyomi version in **More → About**.
+      label: Animetail version
+      description: You can find your Animetail version in **More → About**.
       placeholder: |
         Example: "0.16.4.3"
     validations:
@@ -97,7 +97,7 @@ body:
           required: true
         - label: I have gone through the [FAQ](https://aniyomi.org/docs/faq/general) and [troubleshooting guide](https://aniyomi.org/docs/guides/troubleshooting/).
           required: true
-        - label: I have updated the app to version **[0.16.4.3](https://github.com/aniyomiorg/aniyomi/releases/latest)**.
+        - label: I have updated the app to version **[0.16.4.3](https://github.com/dark25/animetail2/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 Aniyomi
+description: Suggest a feature to improve Animetail
 labels: [Feature request]
 body:
   - type: textarea
     id: feature-description
     attributes:
       label: Describe your suggested feature
-      description: How can Aniyomi be improved?
+      description: How can Animetail be improved?
       placeholder: |
         Example:
           "It should work like this..."
@@ -32,7 +32,7 @@ body:
           required: true
         - label: If this is a request regarding an extension, I should be opening an issue in the extension's repository.
           required: true
-        - label: I have updated the app to version **[0.16.4.3](https://github.com/aniyomiorg/aniyomi/releases/latest)**.
+        - label: I have updated the app to version **[0.16.4.3](https://github.com/dark25/animetail2/releases/latest)**.
           required: true
         - label: I will fill out all of the requested information in this form.
           required: true
diff --git a/.github/assets/icon.png b/.github/assets/icon.png
diff --git a/.github/assets/logo.png b/.github/assets/logo.png
diff --git a/.github/workflows/build_pull_request.yml b/.github/workflows/build_pull_request.yml
@@ -8,6 +8,7 @@ on:
       - '!i18n/src/commonMain/moko-resources/**/strings.xml'
       - '!i18n/src/commonMain/moko-resources/**/plurals-aniyomi.xml'
       - '!i18n/src/commonMain/moko-resources/**/plurals.xml'
+      - 'i18n/src/main/res/**/strings-animetail.xml'
       - 'i18n/src/commonMain/moko-resources/base/strings-aniyomi.xml'
       - 'i18n/src/commonMain/moko-resources/base/strings.xml'
       - 'i18n/src/commonMain/moko-resources/base/plurals-aniyomi.xml'

diff --git a/.github/workflows/build_push.yml b/.github/workflows/build_push.yml
@@ -7,7 +7,7 @@ on:
   push:
     branches:
       - master
-      - dev
+      - Anitail-prev
     tags:
       - v*
 
@@ -24,6 +24,49 @@ jobs:
       - name: Clone repo
         uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
 
+      - uses: dorny/paths-filter@v2
+        id: filter
+        with:
+          filters: |
+            gofiles:
+              - 'go/**'
+  
+
+      - name: Set up Go
+        if: steps.filter.outputs.gofiles == 'true'
+        uses: actions/setup-go@v2
+        with:
+          go-version: '1.21' 
+
+      - name: Install Android SDK
+        if: steps.filter.outputs.gofiles == 'true'
+        uses: android-actions/setup-android@v2
+        with:
+          sdk-version: '30' 
+
+      - name: Install Android NDK
+        if: steps.filter.outputs.gofiles == 'true'
+        uses: nttld/setup-ndk@v1
+        with:
+          ndk-version: r25b
+
+      - name: Commit build library
+        if: steps.filter.outputs.gofiles == 'true'
+        run: |
+          git config --local user.email "41898282+github-actions[bot]@users.noreply.github.com"
+          git config --local user.name "github-actions[bot]"
+          git add app/libs/server.aar
+          git add app/libs/server-sources.jar
+          git commit -m "Add compiled torrserver library"
+        
+      - name: Push changes
+        if: steps.filter.outputs.gofiles == 'true'
+        uses: ad-m/github-push-action@master
+        with:
+          github_token: ${{ secrets.GITHUB_TOKEN }}
+          branch: akidev
+
+
       - name: Validate Gradle Wrapper
         uses: gradle/actions/wrapper-validation@d156388eb19639ec20ade50009f3d199ce1e2808 # v4.1.0
 
@@ -33,6 +76,13 @@ jobs:
           java-version: 17
           distribution: adopt
 
+      - name: Write client_secrets.json
+        uses: DamianReeves/[email protected]
+        with:
+          path: app/src/main/assets/client_secrets.json
+          contents: ${{ secrets.CLIENT_SECRETS_TEXT }}
+          write-mode: overwrite
+
       - name: Set up gradle
         uses: gradle/actions/setup-gradle@d156388eb19639ec20ade50009f3d199ce1e2808 # v4.1.0
 
@@ -55,13 +105,13 @@ jobs:
 
       - name: Get tag name
 
-        if: startsWith(github.ref, 'refs/tags/') && github.repository == 'aniyomiorg/aniyomi'
+        if: startsWith(github.ref, 'refs/tags/') && github.repository == 'dark25/Animetail2'
         run: |
           set -x
           echo "VERSION_TAG=${GITHUB_REF/refs\/tags\//}" >> $GITHUB_ENV
 
       - name: Sign APK
-        if: startsWith(github.ref, 'refs/tags/') && github.repository == 'aniyomiorg/aniyomi'
+        if: startsWith(github.ref, 'refs/tags/') && github.repository == 'dark25/Animetail2'
         uses: r0adkll/sign-android-release@349ebdef58775b1e0d8099458af0816dc79b6407 # v1
         with:
           releaseDirectory: app/build/outputs/apk/standard/release
@@ -73,36 +123,36 @@ jobs:
           BUILD_TOOLS_VERSION: "34.0.0"
 
       - name: Clean up build artifacts
-        if: startsWith(github.ref, 'refs/tags/') && github.repository == 'aniyomiorg/aniyomi'
+        if: startsWith(github.ref, 'refs/tags/') && github.repository == 'dark25/Animetail2'
         run: |
           set -e
 
-          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 }'`
+          mv app/build/outputs/apk/standard/release/app-standard-universal-release-unsigned-signed.apk animetail-${{ env.VERSION_TAG }}.apk
+          sha=`sha256sum animetail-${{ 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 aniyomi-arm64-v8a-${{ env.VERSION_TAG }}.apk
-          sha=`sha256sum aniyomi-arm64-v8a-${{ env.VERSION_TAG }}.apk | awk '{ print $1 }'`
+          cp app/build/outputs/apk/standard/release/app-standard-arm64-v8a-release-unsigned-signed.apk animetail-arm64-v8a-${{ env.VERSION_TAG }}.apk
+          sha=`sha256sum animetail-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 aniyomi-armeabi-v7a-${{ env.VERSION_TAG }}.apk
-          sha=`sha256sum aniyomi-armeabi-v7a-${{ env.VERSION_TAG }}.apk | awk '{ print $1 }'`
+          cp app/build/outputs/apk/standard/release/app-standard-armeabi-v7a-release-unsigned-signed.apk animetail-armeabi-v7a-${{ env.VERSION_TAG }}.apk
+          sha=`sha256sum animetail-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 aniyomi-x86-${{ env.VERSION_TAG }}.apk
-          sha=`sha256sum aniyomi-x86-${{ env.VERSION_TAG }}.apk | awk '{ print $1 }'`
+          cp app/build/outputs/apk/standard/release/app-standard-x86-release-unsigned-signed.apk animetail-x86-${{ env.VERSION_TAG }}.apk
+          sha=`sha256sum animetail-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 aniyomi-x86_64-${{ env.VERSION_TAG }}.apk
-          sha=`sha256sum aniyomi-x86_64-${{ env.VERSION_TAG }}.apk | awk '{ print $1 }'`
+          cp app/build/outputs/apk/standard/release/app-standard-x86_64-release-unsigned-signed.apk animetail-x86_64-${{ env.VERSION_TAG }}.apk
+          sha=`sha256sum animetail-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 == 'aniyomiorg/aniyomi'
+        if: startsWith(github.ref, 'refs/tags/') && github.repository == 'dark25/Animetail2'
         uses: softprops/action-gh-release@c062e08bd532815e2082a85e87e3ef29c3e6d191 # v2.0.8
         with:
           tag_name: ${{ env.VERSION_TAG }}
-          name: Aniyomi ${{ env.VERSION_TAG }}
+          name: Animetail ${{ env.VERSION_TAG }}
           body: |
             ---
 
@@ -116,11 +166,11 @@ jobs:
             | x86 | ${{ env.APK_X86_SHA }}
             | x86_64 | ${{ env.APK_X86_64_SHA }} |
           files: |
-            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
+            animetail-${{ env.VERSION_TAG }}.apk
+            animetail-arm64-v8a-${{ env.VERSION_TAG }}.apk
+            animetail-armeabi-v7a-${{ env.VERSION_TAG }}.apk
+            animetail-x86-${{ env.VERSION_TAG }}.apk
+            animetail-x86_64-${{ env.VERSION_TAG }}.apk
           draft: true
           prerelease: false
         env:

diff --git a/.gitignore b/.gitignore
@@ -8,6 +8,7 @@ build
 .idea/*
 !.idea/icon.png
 /captures
+app/**/assets/client_secrets.json
 
 # Configuration files
 local.properties

diff --git a/.idea/icon.png b/.idea/icon.png
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/aniyomiorg/aniyomi#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/dark25/animetail2#issues-feature-requests-and-contributing).
 
 ---
 
-Thanks for your interest in contributing to Aniyomi!
+Thanks for your interest in contributing to Animetail!
 
 
 # Code contributions
 
 Pull requests are welcome!
 
-If you're interested in taking on [an open issue](https://github.com/aniyomiorg/aniyomi/issues), please comment on it so others are aware.
+If you're interested in taking on [an open issue](https://github.com/dark25/animetail2/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/F32UjdJZrR) for online help and to ask questions while developing.
+- Join [the Discord server](https://discord.gg/s82Vu589Ya) 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/aniyomiorg/aniyomi/blob/master/app/src/main/java/eu/kanade/tachiyomi/data/updater/AppUpdateChecker.kt)
+    - Change or disable the [app update checker](https://github.com/dark25/animetail2/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/aniyomiorg/aniyomi/blob/master/app/build.gradle.kts)
+    - Change the `applicationId` in [`build.gradle.kts`](https://github.com/dark25/animetail2/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/LICENSE b/LICENSE
@@ -173,4 +173,4 @@
       incurred by, or claims asserted against, such Contributor by reason
       of your accepting any such warranty or additional liability.
 
-   END OF TERMS AND CONDITIONS
+   END OF TERMS AND CONDITIONS