Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

upstream #1219

Closed
wants to merge 120 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
120 commits
Select commit Hold shift + click to select a range
c188307
Add files via upload
LuftVerbot Jul 24, 2023
c1b7b89
Update README.md
LuftVerbot Jul 24, 2023
a883c90
Delete ic_launcher.png
LuftVerbot Jul 24, 2023
928a62c
Update README.md
LuftVerbot Jul 24, 2023
c3062d2
merge1
LuftVerbot Oct 4, 2023
5a2a3fd
fuck lint
LuftVerbot Oct 4, 2023
5ceae31
merge2
LuftVerbot Oct 4, 2023
14a8aeb
merge3
LuftVerbot Oct 4, 2023
2ebf477
merge4
LuftVerbot Oct 4, 2023
f705e19
merge5
LuftVerbot Oct 5, 2023
b3c911e
merge6
LuftVerbot Oct 6, 2023
e99e4c2
merge7
LuftVerbot Oct 6, 2023
c62f86f
merge8
LuftVerbot Oct 21, 2023
67d3043
Merge branch 'aniyomiorg:master' into MR
LuftVerbot Oct 21, 2023
c85576e
merge9
LuftVerbot Oct 22, 2023
da3265f
merge10
LuftVerbot Oct 22, 2023
febf046
fuck lint
LuftVerbot Oct 22, 2023
c19b4b5
fuck lint (again)
LuftVerbot Oct 22, 2023
dfb5ca4
Merge remote-tracking branch 'upstream/master' into MR
LuftVerbot Oct 23, 2023
d78159b
Translations update from Hosted Weblate (#9531)
weblate Jun 3, 2023
974d3b5
Revert "Translations update from Hosted Weblate (#9531)"
LuftVerbot Oct 23, 2023
3a8e7d0
Translations update from Hosted Weblate (#9531)
weblate Jun 3, 2023
e282528
Revert "Translations update from Hosted Weblate (#9531)"
LuftVerbot Oct 23, 2023
5d575f1
Merge remote-tracking branch 'upstream/master' into MR
LuftVerbot Oct 26, 2023
b9333be
fix download button not shown
LuftVerbot Oct 26, 2023
564a959
Merge remote-tracking branch 'origin/master' into MR
LuftVerbot Oct 27, 2023
f51b36a
merge11
LuftVerbot Oct 27, 2023
7e14b6d
Merge remote-tracking branch 'upstream/master' into MR
LuftVerbot Oct 27, 2023
5b1099d
Update AdaptiveSheet.kt
LuftVerbot Oct 27, 2023
692b566
revert subs commit
LuftVerbot Oct 27, 2023
c6317e9
Update AdaptiveSheet.kt
LuftVerbot Oct 27, 2023
2431d8a
merge12
LuftVerbot Oct 27, 2023
f0783f5
feat(player): Subtitle settings + refactor + crash fixes (#1152)
quickdesh Oct 27, 2023
6dd16ca
Merge branch 'master' into MR
LuftVerbot Oct 28, 2023
03ee4bc
merge13
LuftVerbot Oct 28, 2023
9bb1a5d
Merge branch 'master' into MR
LuftVerbot Oct 29, 2023
fd1c643
merge14
LuftVerbot Oct 29, 2023
f3ec9da
Merge branch 'master' into MR
LuftVerbot Oct 31, 2023
f0180e0
rework anime downloader
LuftVerbot Nov 1, 2023
5415cbb
Update AnimeDownloader.kt
LuftVerbot Nov 1, 2023
9509d09
Update AnimeDownloader.kt
LuftVerbot Nov 1, 2023
8f08a24
Merge branch 'master' into MR
LuftVerbot Nov 2, 2023
d2ccb75
Merge branch 'master' into MR
LuftVerbot Nov 2, 2023
dd69ce5
Merge branch 'master' into MR
LuftVerbot Nov 3, 2023
264b0e6
merge15
LuftVerbot Nov 3, 2023
6bab100
Update ReaderActivity.kt
LuftVerbot Nov 3, 2023
184804f
merge15.5
LuftVerbot Nov 3, 2023
59b4404
merge16
LuftVerbot Nov 4, 2023
bb96174
Merge branch 'master' into MR
LuftVerbot Nov 7, 2023
872fc74
fix downloader pause
LuftVerbot Nov 9, 2023
748d610
small changes
LuftVerbot Nov 9, 2023
338b54a
Merge branch 'master' into MR
LuftVerbot Nov 9, 2023
83dcd5e
merge17
LuftVerbot Nov 11, 2023
4732c38
repositioning
LuftVerbot Nov 11, 2023
b9d42c9
Merge branch 'master' into MR
LuftVerbot Nov 11, 2023
61256a2
again repositioning
LuftVerbot Nov 11, 2023
e7b1066
merge18
LuftVerbot Nov 11, 2023
0271706
merge19
LuftVerbot Nov 11, 2023
82eb36b
fuck lint
LuftVerbot Nov 11, 2023
096276c
merge19.5
LuftVerbot Nov 11, 2023
4709cbe
merge20
LuftVerbot Nov 12, 2023
645746a
merge21
LuftVerbot Nov 12, 2023
563efef
Merge branch 'master' into MR
LuftVerbot Nov 15, 2023
7174799
Update StreamsCatalogSheet.kt
LuftVerbot Nov 15, 2023
370212c
merge22
LuftVerbot Nov 17, 2023
a439045
merge23
LuftVerbot Nov 17, 2023
72a54cb
Merge branch 'master' into MR
LuftVerbot Nov 17, 2023
4cbf9a8
merge23.5
LuftVerbot Nov 17, 2023
1b6301c
merge24
LuftVerbot Nov 17, 2023
a2a445f
merge25
LuftVerbot Nov 18, 2023
eeddf17
merge26
LuftVerbot Nov 18, 2023
85d0e49
little fix
LuftVerbot Nov 18, 2023
e29dc62
lint cleanup
LuftVerbot Nov 18, 2023
fa7b842
merge27
LuftVerbot Nov 18, 2023
2c42303
merge28
LuftVerbot Nov 19, 2023
f1cd8f6
merge29
LuftVerbot Nov 19, 2023
a34bc76
renaming & ktlintCheck
LuftVerbot Nov 19, 2023
b1f728e
fix ConcurrentHashMap crash
LuftVerbot Nov 19, 2023
6215528
ktlint format
LuftVerbot Nov 19, 2023
05f9124
klint format again
LuftVerbot Nov 19, 2023
ea2b7fe
ktlint format again
LuftVerbot Nov 19, 2023
3a31153
ktlint formt
LuftVerbot Nov 19, 2023
18e04b7
merge30
LuftVerbot Nov 19, 2023
99eea59
crash fix & add forgotten commit
LuftVerbot Nov 20, 2023
f6d430d
fuck lint
LuftVerbot Nov 20, 2023
b8cdb9d
small Episode Tracker change
LuftVerbot Nov 20, 2023
85d2c04
Shift first half of top controls to compose
quickdesh Nov 22, 2023
df4d33e
Clean up top half of compose top controls
quickdesh Nov 22, 2023
d4cdb86
Migrate top controls entirely to compose
quickdesh Nov 22, 2023
71a3bc4
update
Dark25 Nov 23, 2023
2f6b664
Merge pull request #2 from Dark25/master
Dark25 Nov 23, 2023
cbe13b1
Merge branch 'up' into test
Dark25 Nov 23, 2023
57edc41
Merge pull request #1 from Dark25/test
Dark25 Nov 23, 2023
411bba6
fix errors
Dark25 Nov 23, 2023
325e625
merge31
LuftVerbot Nov 23, 2023
a654a54
Update build_push.yml
LuftVerbot Nov 23, 2023
0ec8b1c
Merge branch 'up' of https://github.com/Dark25/aniyomi into merger_up…
Dark25 Nov 23, 2023
ec4e2ea
Merge pull request #4 from Dark25/merger_upstreams
Dark25 Nov 23, 2023
31e637a
bump version
Dark25 Nov 23, 2023
c07cc8d
merge32
LuftVerbot Nov 24, 2023
76df725
merge33
LuftVerbot Nov 24, 2023
962e053
Merge branch 'up' of https://github.com/Dark25/aniyomi into merge_ups…
Dark25 Nov 24, 2023
4b406c0
Merge pull request #6 from Dark25/merge_upstream
Dark25 Nov 24, 2023
c7403d4
Merge branch 'up' into upani
Dark25 Nov 24, 2023
6defaf6
Merge pull request #8 from Dark25/upani
Dark25 Nov 24, 2023
69a2cf7
fix padding
Dark25 Nov 24, 2023
150d43e
merge34
LuftVerbot Nov 24, 2023
e4d3105
cleanup
LuftVerbot Nov 24, 2023
e4283fe
Merge branch 'master' into merge_upstream
LuftVerbot Nov 24, 2023
cc19eb9
Merge branch 'up' into Upstream
Dark25 Nov 24, 2023
f1f969c
Merge pull request #9 from Dark25/Upstream
Dark25 Nov 24, 2023
5f78244
merge34.5
LuftVerbot Nov 24, 2023
c6f81b7
merge35
LuftVerbot Nov 25, 2023
a60268e
lint cleanup
LuftVerbot Nov 25, 2023
3fba4cb
merge36
LuftVerbot Nov 25, 2023
89777e9
merge37
LuftVerbot Nov 25, 2023
d7aee03
merge38
LuftVerbot Nov 25, 2023
0598e32
Merge branch 'Upstream' of https://github.com/Dark25/aniyomi into Ups…
Dark25 Nov 25, 2023
e7ab35d
Merge pull request #11 from Dark25/Upstream
Dark25 Nov 25, 2023
3d5ccf4
delete BackupManager.kt
Dark25 Nov 25, 2023
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
9 changes: 5 additions & 4 deletions .editorconfig
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
[*.{kt,kts}]
indent_size=4
insert_final_newline=true
ij_kotlin_allow_trailing_comma=true
ij_kotlin_allow_trailing_comma_on_call_site=true
max_line_length = 120
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
4 changes: 2 additions & 2 deletions .github/FUNDING.yml
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
github: jmir1
ko_fi: jmir1
github: Dark25
ko_fi: Dark25
6 changes: 3 additions & 3 deletions .github/ISSUE_TEMPLATE.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ I acknowledge that:
- I have updated:
- To the latest version of the app (stable is v0.12.3.10)
- All extensions
- I have gone through the FAQ (https://aniyomi.org/help/faq/) and troubleshooting guide (https://aniyomi.org/help/guides/troubleshooting/)
- If this is an issue with an anime extension, that I should be opening an issue in https://github.com/aniyomiorg/aniyomi-extensions
- I have gone through the FAQ (https://akiled.org/help/faq/) and troubleshooting guide (https://akiled.org/help/guides/troubleshooting/)
- If this is an issue with an anime extension, that I should be opening an issue in https://github.com/Dark25/animetailv2-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

Expand All @@ -17,7 +17,7 @@ Note that the issue will be automatically closed if you do not fill out the titl
---

## Device information
* Aniyomi version: ?
* aniyomi version: ?
* Android version: ?
* Device: ?

Expand Down
8 changes: 4 additions & 4 deletions .github/ISSUE_TEMPLATE/config.yml
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
blank_issues_enabled: false
contact_links:
- name: ⚠️ Anime extension/source issue
url: https://github.com/aniyomiorg/aniyomi-extensions/issues/new/choose
url: https://github.com/Dark25/animetailv2-extensions/issues/new/choose
about: Issues and requests for extensions and sources should be opened in the aniyomi-extensions repository instead
- name: 📦 Aniyomi extensions
url: https://aniyomi.org/extensions
- name: 📦 aniyomi extensions
url: https://akiled.org/extensions
about: Anime extensions and sources
- name: 🧑‍💻 Aniyomi help discord
- name: 🧑‍💻 aniyomi help discord
url: https://discord.gg/F32UjdJZrR
about: Common questions are answered here
12 changes: 6 additions & 6 deletions .github/ISSUE_TEMPLATE/report_issue.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
name: 🐞 Issue report
description: Report an issue in Aniyomi
description: Report an issue in aniyomi
labels: [Bug]
body:
- type: textarea
Expand Down Expand Up @@ -49,8 +49,8 @@ body:
- type: input
id: aniyomi-version
attributes:
label: Aniyomi version
description: You can find your Aniyomi version in **More → About**.
label: aniyomi version
description: You can find your aniyomi version in **More → About**.
placeholder: |
Example: "0.12.3.10"
validations:
Expand Down Expand Up @@ -93,11 +93,11 @@ body:
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/aniyomiorg/aniyomi-extensions/issues/new/choose).
- label: If this is an issue with an extension, I should be opening an issue in the [extensions repository](https://github.com/Dark25/animetailv2-extensions/issues/new/choose).
required: true
- label: I have gone through the [FAQ](https://aniyomi.org/help/faq/) and [troubleshooting guide](https://aniyomi.org/help/guides/troubleshooting/).
- label: I have gone through the [FAQ](https://akiled.org/help/faq/) and [troubleshooting guide](https://akiled.org/help/guides/troubleshooting/).
required: true
- label: I have updated the app to version **[0.12.3.10](https://github.com/aniyomiorg/aniyomi/releases/latest)**.
- label: I have updated the app to version **[0.12.3.10](https://github.com/Dark25/animetailv2/releases/latest)**.
required: true
- label: I have updated all installed extensions.
required: true
Expand Down
8 changes: 4 additions & 4 deletions .github/ISSUE_TEMPLATE/request_feature.yml
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
name: ⭐ Feature request
description: Suggest a feature to improve Aniyomi
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 Aniyomi be improved?
description: How can aniyomi be improved?
placeholder: |
Example:
"It should work like this..."
Expand All @@ -30,9 +30,9 @@ body:
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/aniyomiorg/aniyomi-extensions/issues/new/choose).
- label: If this is an issue with an extension, I should be opening an issue in the [extensions repository](https://github.com/Dark25/animetailv2-extensions/issues/new/choose).
required: true
- label: I have updated the app to version **[0.12.3.10](https://github.com/aniyomiorg/aniyomi/releases/latest)**.
- label: I have updated the app to version **[0.12.3.10](https://github.com/Dark25/animetailv2/releases/latest)**.
required: true
- label: I will fill out all of the requested information in this form.
required: true
11 changes: 0 additions & 11 deletions .github/renovate.json

This file was deleted.

17 changes: 17 additions & 0 deletions .github/renovate.json5
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
{
"$schema": "https://docs.renovatebot.com/renovate-schema.json",
"extends": [
"config:base"
],
"schedule": ["every sunday"],
"packageRules": [
{
// Compiler plugins are tightly coupled to Kotlin version
"groupName": "Kotlin",
"matchPackagePrefixes": [
"androidx.compose.compiler",
"org.jetbrains.kotlin",
],
}
]
}
4 changes: 2 additions & 2 deletions .github/workflows/build_pull_request.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ jobs:

steps:
- name: Clone repo
uses: actions/checkout@v3
uses: actions/checkout@v4

- name: Validate Gradle Wrapper
uses: gradle/wrapper-validation-action@v1
Expand All @@ -37,4 +37,4 @@ jobs:
- name: Build app and run unit tests
uses: gradle/gradle-command-action@v2
with:
arguments: lintKotlin assembleStandardRelease testStandardReleaseUnitTest
arguments: ktlintCheck assembleStandardRelease testReleaseUnitTest
57 changes: 34 additions & 23 deletions .github/workflows/build_push.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ permissions:
on:
push:
branches:
- master
- main
- dev
tags:
- v*
Expand All @@ -22,7 +22,7 @@ jobs:

steps:
- name: Clone repo
uses: actions/checkout@v3
uses: actions/checkout@v4

- name: Validate Gradle Wrapper
uses: gradle/wrapper-validation-action@v1
Expand All @@ -46,19 +46,19 @@ jobs:
- name: Build app and run unit tests
uses: gradle/gradle-command-action@v2
with:
arguments: lintKotlin assembleStandardRelease testStandardReleaseUnitTest
arguments: ktlintCheck assembleStandardRelease testReleaseUnitTest

# Sign APK and create release for tags

- name: Get tag name

if: startsWith(github.ref, 'refs/tags/') && github.repository == 'aniyomiorg/aniyomi'
if: startsWith(github.ref, 'refs/tags/') && github.repository == 'Dark25/AnimeTail-source'
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/AnimeTail-source'
uses: r0adkll/sign-android-release@v1
with:
releaseDirectory: app/build/outputs/apk/standard/release
Expand All @@ -68,36 +68,36 @@ jobs:
keyPassword: ${{ secrets.KEY_PASSWORD }}

- name: Clean up build artifacts
if: startsWith(github.ref, 'refs/tags/') && github.repository == 'aniyomiorg/aniyomi'
if: startsWith(github.ref, 'refs/tags/') && github.repository == 'Dark25/AnimeTail-source'
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 == 'animetailorg/animetail'
uses: softprops/action-gh-release@v1
with:
tag_name: ${{ env.VERSION_TAG }}
name: Aniyomi ${{ env.VERSION_TAG }}
name: animetail ${{ env.VERSION_TAG }}
body: |
---

Expand All @@ -111,12 +111,23 @@ 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:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

update-website:
needs: [ build ]
runs-on: ubuntu-latest
if: startsWith(github.ref, 'refs/tags/') && github.repository == 'aniyomiorg/aniyomi'
steps:
- name: Trigger Netlify build hook
run: curl -s -X POST -d {} "https://api.netlify.com/build_hooks/${TOKEN}"
env:
TOKEN: ${{ secrets.NETLIFY_HOOK_RELEASE }}

9 changes: 8 additions & 1 deletion .github/workflows/issue_moderator.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,15 @@ jobs:
},
{
"type": "body",
"regex": ".*\\* (Aniyomi version|Android version|Device): \\?.*",
"regex": ".*\\* (aniyomi version|Android version|Device): \\?.*",
"message": "Requested information in the template was not filled out."
},
{
"type": "both",
"regex": ".*(?:fail(?:ed|ure|s)?|can\\s*(?:no|')?t|(?:not|un).*able|(?<!n[o']?t )blocked by|error) (?:to )?(?:get past|by ?pass|penetrate)?.*cloud ?fl?are.*",
"ignoreCase": true,
"labels": ["Cloudflare protected"],
"message": "Refer to the **Solving Cloudflare issues** section at https://aniyomi.org/docs/guides/troubleshooting/#cloudflare. If it doesn't work, migrate to other sources or wait until they lower their protection."
}
]
auto-close-ignore-label: do-not-autoclose
3 changes: 2 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,8 @@
/acra.properties
/.idea/workspace.xml
.DS_Store
.idea/
.idea/*
!.idea/icon.png
*iml
*.iml

Expand Down
File renamed without changes
20 changes: 12 additions & 8 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
@@ -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/animetailv2#issues-feature-requests-and-contributing).

---

Thanks for your interest in contributing to Aniyomi!
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/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/animetailv2/issues), please comment on it so others are aware.
You do not need to ask for permission nor an assignment.

## Prerequisites
Expand All @@ -24,13 +24,17 @@ Before you start, please note that the ability to use following technologies is
- [Android Studio](https://developer.android.com/studio)
- Emulator or phone with developer options enabled to test changes.

## Linting

To auto-fix some linting errors, run the `ktlintFormat` Gradle task.

## Getting help

- Join [the Discord server](https://discord.gg/F32UjdJZrR) for online help and to ask questions while developing.

# Translations

Translations are done externally via Weblate. See [our website](https://aniyomi.org/help/contribution/#translation) for more details.
Translations are done externally via Weblate. See [our website](https://akiled.org/help/contribution/#translation) for more details.


# Forks
Expand All @@ -42,9 +46,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/animetailv2/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/animetailv2/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
- If you want to use Firebase analytics, replace [`google-services.json`](https://github.com/Dark25/animetailv2/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/Dark25/animetailv2/blob/master/app/build.gradle.kts) with your own
Loading