-
-
Notifications
You must be signed in to change notification settings - Fork 317
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #1693 from Secozzi/mihonmerge
- Loading branch information
Showing
214 changed files
with
2,316 additions
and
1,928 deletions.
There are no files selected for viewing
File renamed without changes
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,18 +1,14 @@ | ||
| { | ||
| "$schema": "https://docs.renovatebot.com/renovate-schema.json", | ||
| "extends": [ | ||
| "config:base" | ||
| ], | ||
| "schedule": ["every friday"], | ||
| "extends": ["config:base"], | ||
| "labels": ["Dependencies"], | ||
| "packageRules": [ | ||
| { | ||
| // Compiler plugins are tightly coupled to Kotlin version | ||
| "groupName": "Kotlin", | ||
| "matchPackagePrefixes": [ | ||
| "androidx.compose.compiler", | ||
| "org.jetbrains.kotlin", | ||
| "groupName": "Compose BOM (Alpha)", | ||
| "matchPackageNames": [ | ||
| "dev.chrisbanes.compose:compose-bom" | ||
| ], | ||
| "ignoreUnstable": false | ||
| } | ||
| ] | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,4 +1,5 @@ | ||
| .gradle | ||
| .kotlin | ||
| /local.properties | ||
| /acra.properties | ||
| /.idea/workspace.xml | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,83 +1,87 @@ | ||
| | Build | Preview Release | Codefactor | Stable | Translate Aniyomi | Discord Server | | ||
| |-------|-----------|-------|----------|---------------------------------------------------------------------------------------------------------------------------------------------------|---------| | ||
| | [](https://github.com/aniyomiorg/aniyomi/actions/workflows/build_push.yml) | [](https://github.com/aniyomiorg/aniyomi-preview/releases) | [](https://www.codefactor.io/repository/github/aniyomiorg/aniyomi) | [](https://github.com/aniyomiorg/aniyomi/releases) | [](https://hosted.weblate.org/engage/aniyomi/?utm_source=widget) | [](https://discord.gg/F32UjdJZrR) | | ||
| <div align="center"> | ||
|
|
||
| # Aniyomi | ||
| Aniyomi is a video player and image viewer for Android 8.0 and above. | ||
| <a href="https://aniyomi.org"> | ||
| <img src="./.github/assets/logo.png" alt="Aniyomi logo" title="Aniyomi logo" width="80"/> | ||
| </a> | ||
|
|
||
| ## Features | ||
| # Aniyomi [App](#) | ||
|
|
||
| Features include: | ||
| * Watching videos | ||
| * View images | ||
| * Local reading/watching of downloaded content | ||
| * A configurable reader with multiple viewers, reading directions and other settings. | ||
| * A configurable player built on mpv-android with multiple options and 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/) | ||
| * Categories to organize your library | ||
| * Light and dark themes | ||
| * Create backups locally to read/watch offline or to your desired cloud service | ||
| ### Full-featured player and reader, based on ~~Tachiyomi~~ Mihon. | ||
| Discover and watch anime, cartoons, series, and more – easier than ever on your Android device. | ||
|
|
||
| [](https://discord.gg/F32UjdJZrR) | ||
| [](https://github.com/aniyomiorg/aniyomi/releases) | ||
|
|
||
| [](https://github.com/aniyomiorg/aniyomi/actions/workflows/build_push.yml) | ||
| [](/LICENSE) | ||
| [](https://hosted.weblate.org/engage/aniyomi/) | ||
|
|
||
| ## Download | ||
| 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). | ||
| [](https://github.com/aniyomiorg/aniyomi/releases) | ||
| [](https://github.com/aniyomiorg/aniyomi-preview/releases) | ||
|
|
||
| ## Issues, Feature Requests and Contributing | ||
| *Requires Android 8.0 or higher.* | ||
|
|
||
| Please make sure to read the full guidelines. Your issue may be closed without warning if you do not. | ||
| ## Features | ||
|
|
||
| <details><summary>Issues</summary> | ||
| <div align="left"> | ||
|
|
||
| 1. **Before reporting a new issue, take a look at the already opened and closed [issues](https://github.com/aniyomiorg/aniyomi/issues), and [recent release version changes](https://aniyomi.org/changelogs/).** | ||
| 2. If you are unsure, ask on Discord: [](https://discord.gg/F32UjdJZrR) | ||
| * Local reading and watching of content. | ||
| * A configurable reader with multiple viewers, reading directions and other settings. | ||
| * A configurable player built on mpv-android with multiple options and settings. | ||
| * Tracker support: [MyAnimeList](https://myanimelist.net/), [AniList](https://anilist.co/), [Kitsu](https://kitsu.io/), [MangaUpdates](https://mangaupdates.com), [Shikimori](https://shikimori.one), [Simkl](https://simkl.com/), and [Bangumi](https://bgm.tv/) support. | ||
| * Categories to organize your library. | ||
| * Light and dark themes. | ||
| * Schedule updating your library for new chapters/episodes. | ||
| * Create backups locally to read/watch offline or to your desired cloud service. | ||
| * Plus much more... | ||
|
|
||
| </details> | ||
| </div> | ||
|
|
||
| <details><summary>Bugs</summary> | ||
| ## Contributing | ||
|
|
||
| * 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 on 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 | ||
| [Code of conduct](./CODE_OF_CONDUCT.md) · [Contributing guide](./CONTRIBUTING.md) | ||
|
|
||
| </details> | ||
| Pull requests are welcome. For major changes, please open an issue first to discuss what you would like to change. | ||
|
|
||
| <details><summary>Feature Requests</summary> | ||
| Before reporting a new issue, take a look at the [FAQ](https://aniyomi.org/docs/faq/general), the [changelog](https://aniyomi.org/changelogs/) and the already opened [issues](https://github.com/aniyomiorg/aniyomi/issues); if you got any questions, join our [Discord server](https://discord.gg/F32UjdJZrR). | ||
|
|
||
| * Write a detailed issue, explaining what it should do or how. Avoid writing just "like X app does" | ||
| * Include screenshot (if needed) | ||
| ### Repositories | ||
|
|
||
| <details><summary>Contributing</summary> | ||
| [](https://github.com/aniyomiorg/aniyomi-website/) | ||
| [](https://github.com/aniyomiorg/aniyomi-mpv-lib/) | ||
|
|
||
| See [CONTRIBUTING.md](./CONTRIBUTING.md). | ||
| </details> | ||
| ### Credits | ||
|
|
||
| <details><summary>Code of Conduct</summary> | ||
| Thank you to all the people who have contributed! | ||
|
|
||
| See [CODE_OF_CONDUCT.md](./CODE_OF_CONDUCT.md). | ||
| </details> | ||
| <a href="https://github.com/aniyomiorg/aniyomi/graphs/contributors"> | ||
| <img src="https://contrib.rocks/image?repo=aniyomiorg/aniyomi" alt="Aniyomi app contributors" title="Aniyomi app contributors" width="800"/> | ||
| </a> | ||
|
|
||
| ### Disclaimer | ||
|
|
||
| ## License | ||
| The developer(s) of this application does not have any affiliation with the content providers available, and this application hosts zero content. | ||
|
|
||
| Copyright 2015 Javier Tomás | ||
| ### License | ||
|
|
||
| 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 | ||
| <pre> | ||
| Copyright © 2015 Javier Tomás | ||
| Copyright © 2024 The Mihon Open Source Project | ||
| Copyright © 2024 The Aniyomi Open Source Project | ||
|
|
||
| http://www.apache.org/licenses/LICENSE-2.0 | ||
| 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 | ||
|
|
||
| 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. | ||
| http://www.apache.org/licenses/LICENSE-2.0 | ||
|
|
||
| ## Disclaimer | ||
| 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. | ||
| </pre> | ||
|
|
||
| The developer of this application does not have any affiliation with the content providers available. | ||
| </div> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.