Draff/TachiyomiSY-Plus
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
8,561 Commits 1 Branch 60 Tags
Commit Graph

7685 Commits

Author SHA1 Message Date
arkon
82b16be60f Fix tablet manga screen column ratios 
Matches previous stable design. Related to #7401

(cherry picked from commit 3192d478371bd0c913020cd6262021f12b074827)
 2022-07-16 20:48:44 -04:00
arkon
879999e69e Fix library column setting jumping in 
(cherry picked from commit f6f5b6aeaba6825974f4b05d279fab54a2633d76)

# Conflicts:
#	app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryMangaEvent.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryPresenter.kt
 2022-07-16 20:48:18 -04:00
arkon
d145239d93 Migrate licenses screen to full Compose 
(cherry picked from commit 1b2c12385feaa8bc7e32b724289323e5d3e9499e)
 2022-07-16 20:39:54 -04:00
arkon
1e3f313ca2 Remove top app bar scroll behavior 
This lets us make it more consistent with the Compose screens for now. Maybe it'll return in the future.

This also includes making the AboutController a full Compose controller with a new abstracted TopAppBar composable.

(cherry picked from commit 80c7a453286f296ae4d5d3531c805e63db9ca424)

# Conflicts:
#	app/src/main/java/eu/kanade/presentation/category/components/CategoryTopAppBar.kt
#	app/src/main/java/eu/kanade/presentation/more/about/AboutScreen.kt
 2022-07-16 20:39:44 -04:00
arkon
97e9218f75 Consolidate badge components 
(cherry picked from commit 2096df301d55ed446db21d0d2881e9d273674fae)

# Conflicts:
#	app/src/main/java/eu/kanade/presentation/browse/MigrateSourceScreen.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/manga/MangaPresenter.kt
 2022-07-16 20:30:16 -04:00
arkon
af83f81034 Tweak categories view 
- Remove Compose top app bar behaviour since it's kind of jank -- we'll probably just remove the scrolling behaviour everywhere
- Tap title to rename
- Focus in textfield when opening dialogs

(cherry picked from commit 0b78028cf660e2f576ee30f8315b657eca1f39cd)

# Conflicts:
#	app/src/main/java/eu/kanade/presentation/category/components/CategoryDialogs.kt
#	app/src/main/java/eu/kanade/presentation/category/components/CategoryTopAppBar.kt
#	app/src/main/java/eu/kanade/presentation/library/components/LibraryGridCover.kt
 2022-07-16 20:28:56 -04:00
arkon
74b360f798 Consolidate Compose content/theme setting 
(cherry picked from commit 46ac9fe9701009077fa3edefb0ef0c5faa65f2bc)

# Conflicts:
#	app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryAdapter.kt
#	app/src/main/java/eu/kanade/tachiyomi/util/view/ViewExtensions.kt
 2022-07-16 20:23:01 -04:00
AntsyLich
a99aaade5d MangaPresenter: Incognito and downloaded only label related tweaks (#7535) 
When manga screen takes time to load incognito and downloaded only label doesn't show up. It's fixed in the pr.

(cherry picked from commit b034f503f8ce9327187c2024b7ee74779f397bb8)

# Conflicts:
#	app/src/main/java/eu/kanade/tachiyomi/ui/manga/MangaPresenter.kt
 2022-07-16 20:16:10 -04:00
Andreas
19fcc129c0 Fix Library List not using correct text color (#7548) 
(cherry picked from commit 9ebeff04e6b9beb518d40b94cd92405b06383370)
 2022-07-16 20:13:13 -04:00
arkon
9b47b7f204 Minor library view cleanup 
- Clean up unused code
- Add text shadow in compact mode
- Tweak some paddings to better match stable

(cherry picked from commit fa73e2403b79deca40590d8f4fa15f00a70e316e)

# Conflicts:
#	app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryPresenter.kt
 2022-07-16 20:13:04 -04:00
Andreas
d8042f7182 Use Flow in ExtensionManager and SourceManager (#7547) 
- Replace ExtensionManager relay and observable with Flow
- Inverse SourceManager dependency
    - SourceManager observers ExtensionManager flow
- Separate SourceData from SourceRepository as it created a circular dependency

(cherry picked from commit 35ec5936587799f33a264f57729cb4b75c5a0f72)

# Conflicts:
#	app/src/main/java/eu/kanade/tachiyomi/source/SourceManager.kt
 2022-07-16 20:09:33 -04:00
Jobobby04
dd68ef4ba8 Remove drag and drop 2022-07-16 19:49:46 -04:00
Andreas
b4adab5eb4 Use Compose for Library list and grid (#7520) 
(cherry picked from commit 905c96922bc7059e99c4c7bd89775747d02028a9)

# Conflicts:
#	app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryCategoryAdapter.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryCategoryView.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryComfortableGridHolder.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryCompactGridHolder.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryController.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryHolder.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryItem.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryListHolder.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryPresenter.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/library/LibrarySelectionEvent.kt
#	app/src/main/res/layout/library_category.xml
#	app/src/main/res/layout/library_grid_recycler.xml
#	app/src/main/res/layout/library_list_recycler.xml
 2022-07-16 19:11:22 -04:00
Andreas
6df1a0f79e Use Stable interface for Browse screens (#7544) 
(cherry picked from commit 018ca71336c893f64e0d0653b48b3d5f39b88d63)

# Conflicts:
#	app/src/main/java/eu/kanade/presentation/browse/ExtensionDetailsScreen.kt
#	app/src/main/java/eu/kanade/presentation/browse/ExtensionsScreen.kt
#	app/src/main/java/eu/kanade/presentation/browse/MigrateSourceScreen.kt
#	app/src/main/java/eu/kanade/presentation/browse/SourcesScreen.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/browse/migration/manga/MigrateMangaPresenter.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/browse/migration/sources/MigrationSourcesController.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/browse/source/SourcesFilterPresenter.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/browse/source/SourcesPresenter.kt
 2022-07-16 17:45:36 -04:00
Weblate (bot)
75fe1d4bee Weblate translations (#7490) 
Co-authored-by: ANNOSSE MAXENCE <m-annosse@protonmail.ch>
Co-authored-by: Ajeje Brazorf <lmelonimamo@yahoo.it>
Co-authored-by: Alessandro Jean <alessandrojean@gmail.com>
Co-authored-by: Anupam Malhotra <anpm.malhotra@gmail.com>
Co-authored-by: Eduard Ereza Martínez <eduard@ereza.cat>
Co-authored-by: Eric <alchemillatruth@purelymail.com>
Co-authored-by: Excalidoom <doctorasulatomic@gmail.com>
Co-authored-by: Giorgio Sanna <sannagiorgio1997@gmail.com>
Co-authored-by: Hosted Weblate <hosted@weblate.org>
Co-authored-by: KOEN FOO YONG PING <qoenntrell@gmail.com>
Co-authored-by: Lyfja <yassinelaoud@gmail.com>
Co-authored-by: Lzmxya <lzmxya@gmail.com>
Co-authored-by: Marco Santos <enum.scima@gmail.com>
Co-authored-by: Matyáš Caras <contact@hernikplays.cz>
Co-authored-by: Nepx <anandabaskara@outlook.com>
Co-authored-by: Oğuz Ersen <oguz@ersen.moe>
Co-authored-by: Pitpe11 <giorgos2550@gmail.com>
Co-authored-by: Rostyslav Haitkulov <info@ubilling.net.ua>
Co-authored-by: Shjosan <shjosan@kakmix.co>
Co-authored-by: Swyter <swyterzone@gmail.com>
Co-authored-by: Sztalker Ket <stalkercat888@gmail.com>
Co-authored-by: TheKingTermux <achmadmaulana0233@gmail.com>
Co-authored-by: Uzuki Shimamura <hzy980512@126.com>
Co-authored-by: Víctor J <vjhc980831@gmail.com>
Co-authored-by: altinat <poiiiii4yy@gmail.com>
Co-authored-by: awe <weblate@mixt.anonaddy.com>
Co-authored-by: moon <jamiejakie@gmail.com>
Co-authored-by: stevenlele <stevenlele@outlook.com>
Co-authored-by: Роман <Rozhenkov69@gmail.com>
Translate-URL: https://hosted.weblate.org/projects/tachiyomi/strings/ca/
Translate-URL: https://hosted.weblate.org/projects/tachiyomi/strings/cs/
Translate-URL: https://hosted.weblate.org/projects/tachiyomi/strings/de/
Translate-URL: https://hosted.weblate.org/projects/tachiyomi/strings/el/
Translate-URL: https://hosted.weblate.org/projects/tachiyomi/strings/es/
Translate-URL: https://hosted.weblate.org/projects/tachiyomi/strings/es_419/
Translate-URL: https://hosted.weblate.org/projects/tachiyomi/strings/fil/
Translate-URL: https://hosted.weblate.org/projects/tachiyomi/strings/fr/
Translate-URL: https://hosted.weblate.org/projects/tachiyomi/strings/hi/
Translate-URL: https://hosted.weblate.org/projects/tachiyomi/strings/hu/
Translate-URL: https://hosted.weblate.org/projects/tachiyomi/strings/id/
Translate-URL: https://hosted.weblate.org/projects/tachiyomi/strings/it/
Translate-URL: https://hosted.weblate.org/projects/tachiyomi/strings/ja/
Translate-URL: https://hosted.weblate.org/projects/tachiyomi/strings/jv/
Translate-URL: https://hosted.weblate.org/projects/tachiyomi/strings/ko/
Translate-URL: https://hosted.weblate.org/projects/tachiyomi/strings/ms/
Translate-URL: https://hosted.weblate.org/projects/tachiyomi/strings/pt_BR/
Translate-URL: https://hosted.weblate.org/projects/tachiyomi/strings/ro/
Translate-URL: https://hosted.weblate.org/projects/tachiyomi/strings/ru/
Translate-URL: https://hosted.weblate.org/projects/tachiyomi/strings/sc/
Translate-URL: https://hosted.weblate.org/projects/tachiyomi/strings/sv/
Translate-URL: https://hosted.weblate.org/projects/tachiyomi/strings/th/
Translate-URL: https://hosted.weblate.org/projects/tachiyomi/strings/tr/
Translate-URL: https://hosted.weblate.org/projects/tachiyomi/strings/uk/
Translate-URL: https://hosted.weblate.org/projects/tachiyomi/strings/zh_Hans/
Translate-URL: https://hosted.weblate.org/projects/tachiyomi/strings/zh_Hant/
Translation: Tachiyomi/Tachiyomi 0.x

Co-authored-by: ANNOSSE MAXENCE <m-annosse@protonmail.ch>
Co-authored-by: Ajeje Brazorf <lmelonimamo@yahoo.it>
Co-authored-by: Alessandro Jean <alessandrojean@gmail.com>
Co-authored-by: Anupam Malhotra <anpm.malhotra@gmail.com>
Co-authored-by: Eduard Ereza Martínez <eduard@ereza.cat>
Co-authored-by: Eric <alchemillatruth@purelymail.com>
Co-authored-by: Excalidoom <doctorasulatomic@gmail.com>
Co-authored-by: Giorgio Sanna <sannagiorgio1997@gmail.com>
Co-authored-by: KOEN FOO YONG PING <qoenntrell@gmail.com>
Co-authored-by: Lyfja <yassinelaoud@gmail.com>
Co-authored-by: Lzmxya <lzmxya@gmail.com>
Co-authored-by: Marco Santos <enum.scima@gmail.com>
Co-authored-by: Matyáš Caras <contact@hernikplays.cz>
Co-authored-by: Nepx <anandabaskara@outlook.com>
Co-authored-by: Oğuz Ersen <oguz@ersen.moe>
Co-authored-by: Pitpe11 <giorgos2550@gmail.com>
Co-authored-by: Rostyslav Haitkulov <info@ubilling.net.ua>
Co-authored-by: Shjosan <shjosan@kakmix.co>
Co-authored-by: Swyter <swyterzone@gmail.com>
Co-authored-by: Sztalker Ket <stalkercat888@gmail.com>
Co-authored-by: TheKingTermux <achmadmaulana0233@gmail.com>
Co-authored-by: Uzuki Shimamura <hzy980512@126.com>
Co-authored-by: Víctor J <vjhc980831@gmail.com>
Co-authored-by: altinat <poiiiii4yy@gmail.com>
Co-authored-by: awe <weblate@mixt.anonaddy.com>
Co-authored-by: moon <jamiejakie@gmail.com>
Co-authored-by: stevenlele <stevenlele@outlook.com>
Co-authored-by: Роман <Rozhenkov69@gmail.com>
(cherry picked from commit 383f7089c4c3cb4f9fd406209a8df411bf559e68)
 2022-07-16 17:21:39 -04:00
Jobobby04
f3ffd3b930 Handle new default user agent where SY uses it 2022-07-16 17:21:27 -04:00
Andreas
41855c34de Add Stable interface for Category state (#7539) 
(cherry picked from commit a21aa8125e63b9e0d4377aa9c97d6614ee4acf7f)
 2022-07-16 17:21:09 -04:00
AntsyLich
8a3c9255e5 Fix extension setting isn't accesiable when it has update (#7537) 
Closes #7516

(cherry picked from commit 83e193f1ab2798936aba59482ecab67600574583)
 2022-07-16 16:48:03 -04:00
arkon
bcf9398987 Make default user agent string configurable 
(cherry picked from commit 4ee1d72b6f8278d84da6f75d218a51261d175e18)

# Conflicts:
#	app/src/main/java/eu/kanade/tachiyomi/source/online/HttpSource.kt
 2022-07-16 16:47:32 -04:00
AntsyLich
70aeaccbee Little cleanup for stub source (#7519) 
* Little cleanup for stub source

Fixes instances where name shows up blank for stub sources

* Review Changes

Co-authored-by: Andreas <andreas.everos@gmail.com>

Co-authored-by: Andreas <andreas.everos@gmail.com>
(cherry picked from commit 902bb35ba7f56f06660985dda0f7f8abf41ee669)
 2022-07-16 16:46:36 -04:00
Jobobby04
67e190bffd Page previews for Exh/E-H and NH 
- Still needs click image to open chapter
 2022-07-16 16:45:27 -04:00
Jobobby04
36461b52c0 Fix inconsistencies with Manga.create() 2022-07-15 11:50:06 -04:00
Jobobby04
90ab8f1d94 Add sources to merge data 2022-07-15 11:39:38 -04:00
Jobobby04
3b6ce209be Fix chapter flags 2022-07-15 11:38:56 -04:00
Jobobby04
4dda69ac40 Bring back merge manga sources string 2022-07-15 11:27:30 -04:00
Jobobby04
33f9b15891 Forgot this 2022-07-13 13:30:36 -04:00
Jobobby04
2f41312842 Minor cleanup 2022-07-13 13:30:15 -04:00
Jobobby04
5b63121835 Bump preview version code for migrations 2022-07-13 12:56:07 -04:00
Jobobby04
991c2284ac Merge branch 'release' into master 
# Conflicts:
#	.github/workflows/TachiyomiSY-Release-Builder.yml
#	.github/workflows/build_check.yml
#	app/build.gradle.kts
#	app/src/main/java/eu/kanade/tachiyomi/data/backup/full/FullBackupManager.kt
#	app/src/main/java/eu/kanade/tachiyomi/data/database/queries/RawQueries.kt
#	app/src/main/java/eu/kanade/tachiyomi/data/download/Downloader.kt
#	app/src/main/java/eu/kanade/tachiyomi/data/library/LibraryUpdateJob.kt
#	app/src/main/java/eu/kanade/tachiyomi/data/library/LibraryUpdateService.kt
#	app/src/main/java/eu/kanade/tachiyomi/data/preference/PreferencesHelper.kt
#	app/src/main/java/eu/kanade/tachiyomi/data/track/TrackManager.kt
#	app/src/main/java/eu/kanade/tachiyomi/data/track/TrackStatus.kt
#	app/src/main/java/eu/kanade/tachiyomi/data/updater/AppUpdateChecker.kt
#	app/src/main/java/eu/kanade/tachiyomi/source/LocalSource.kt
#	app/src/main/java/eu/kanade/tachiyomi/source/online/all/MergedSource.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/browse/extension/ExtensionHolder.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/browse/migration/advanced/process/MigrationProcessAdapter.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryPresenter.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/reader/ReaderActivity.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/reader/ReaderPresenter.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/reader/viewer/pager/PagerPageHolder.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/setting/SettingsAdvancedController.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/setting/SettingsDownloadController.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/setting/database/ClearDatabaseController.kt
#	app/src/main/java/eu/kanade/tachiyomi/util/MangaExtensions.kt
#	app/src/main/java/eu/kanade/tachiyomi/util/chapter/ChapterSourceSync.kt
#	app/src/main/java/eu/kanade/tachiyomi/util/system/ImageUtil.kt
#	app/src/main/java/exh/merged/sql/queries/MergedQueries.kt
#	app/src/main/res/values/strings.xml
#	buildSrc/src/main/kotlin/AndroidConfig.kt
#	gradle/androidx.versions.toml
#	gradle/libs.versions.toml
 2022-07-13 12:29:13 -04:00
Jobobby04
1d24bae841 Release v1.8.4 2022-07-13 12:02:59 -04:00
Jobobby04
5901509fbf Cherry picking fixes 2022-07-13 11:48:48 -04:00
Jobobby04
a8b07e0e05 Fix trash group by tracking code 
(cherry picked from commit 4de4992e4eba8f8d508341907225d4ecc55073b8)

# Conflicts:
#	app/src/main/java/eu/kanade/tachiyomi/data/library/LibraryUpdateService.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryPresenter.kt
 2022-07-13 11:48:26 -04:00
Jobobby04
808efd3968 Simplify autoscroll 
(cherry picked from commit 1a17f87945a2cd8cf25c6368db8eccfba6328b9e)
 2022-07-13 11:41:01 -04:00
Jobobby04
cedbbb05e4 Only enable autoscroll when app is active 
(cherry picked from commit ac586560f0ce17a4e81c3c5dfe31888a180cb7e7)
 2022-07-13 11:40:52 -04:00
Jobobby04
84d22c11ee Use image decoder for double pages 
(cherry picked from commit 4ddc696fb5aa662a9831048a502d416085ce2566)

# Conflicts:
#	app/src/main/java/eu/kanade/tachiyomi/ui/reader/viewer/pager/PagerPageHolder.kt
 2022-07-13 11:40:44 -04:00
Jobobby04
4cf068283b Add virtual visibility tag for E-Hentai 
(cherry picked from commit 27733aba02896502835200a327f0481960de101d)
 2022-07-13 11:39:42 -04:00
Jobobby04
e5fd460bb0 Minor cleanup of metadata 
(cherry picked from commit 5b7539ac3eae805e262f86750268fb7a164a70b7)
 2022-07-13 11:37:35 -04:00
Jobobby04
6d3095b503 Improve migration sheet layout 
(cherry picked from commit fef7808bb47b19aac8cad832daac0883de78f41d)
 2022-07-13 11:36:53 -04:00
Saud-97
fcbe9590d3 New: Migrating titles maintains custom covers (#7196) 
* New: Migrating titles maintains custom covers #7189

* Added Custom Covers to MigrationFlags.kt, strings.xml

* Reworded covers --> cover

* Updated logic to show/hide Migration flags titles depending on manga.

(cherry picked from commit 5ea03fad8793a810514b41fe8308f89b25368c4d)

# Conflicts:
#	app/src/main/java/eu/kanade/tachiyomi/ui/browse/migration/MigrationFlags.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/browse/migration/search/SearchController.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/browse/migration/search/SearchPresenter.kt
(cherry picked from commit ed39b61ee9bb9ccec7edc8be82005e9ac95d5e22)
 2022-07-13 11:36:43 -04:00
Jobobby04
f7e5df2b6d Fix auto-downloading for merged manga 
(cherry picked from commit 8f868c0813a9a5e7af64760f22e849cb344a4f89)

# Conflicts:
#	app/src/main/sqldelight/data/merged.sq
 2022-07-13 11:35:50 -04:00
Jobobby04
c58554ec75 Minor cleanup 
(cherry picked from commit b71b9ab5518d9c8b3ec4c24b791ed35f1a44e8e0)
 2022-07-13 11:34:51 -04:00
Jobobby04
cdf2cf8a2d Fix mangadex blocked uploaders 
(cherry picked from commit f0f8a2a0a29d79f3695cb5823bf5183be381a325)
 2022-07-13 11:34:01 -04:00
Jobobby04
0922d3c288 Fix on hiatus status category 
(cherry picked from commit 0df61a9f28acffad5b48f64f5e648462ac718f92)
 2022-07-13 11:33:52 -04:00
Jobobby04
505a8288be Merged source stop ddos 
(cherry picked from commit 0c7ceb059e24ec6711b9d2ecec1296d56f120c7b)
 2022-07-13 11:33:42 -04:00
Jobobby04
b3baaa18d2 Use a file suppress deprecation 
(cherry picked from commit 1eafc6ebd8c00f727e96ceb59737ae003fce6e5f)
 2022-07-13 11:32:26 -04:00
Jobobby04
62e2b301c5 Cherry picking fix 2022-07-13 11:30:56 -04:00
Jobobby04
8b11357eff Separate EHTags into multiple files 
(cherry picked from commit c51e8c7ab4ee57ab78e86a4c3021ff637490f647)
 2022-07-13 11:30:23 -04:00
Jobobby04
e9d25e9d32 Fix cherry picking errors 2022-07-13 11:23:48 -04:00
arkon
a03ed54c64 Update default user agent string 
(cherry picked from commit 7d3fe0ed4374880765fe9dadbd5f6c842e41cc6b)
(cherry picked from commit d71bf4e6bc6789706351e14264377123cfef0402)
 2022-07-13 11:20:39 -04:00
arkon
cc499a7c07 Add MIME type mapping for image/jxl (fixes #7117) 
(cherry picked from commit 591df8abccba95031a670b1ef761fb522b0c0517)

# Conflicts:
#	app/src/main/java/eu/kanade/tachiyomi/util/system/ImageUtil.kt
(cherry picked from commit bbdab4a70374ad697ee7ff8570e6946c04b4f798)

# Conflicts:
#	app/src/main/java/eu/kanade/tachiyomi/util/system/ImageUtil.kt
 2022-07-13 11:20:31 -04:00