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

4234 Commits

Author SHA1 Message Date
AntsyLich
5f55a0afbb Reimplement chapter download indicator longpress (#7412) 
(cherry picked from commit deaded5af2da6645d7f320471d5f73c0ffed3edf)

# Conflicts:
#	app/src/main/java/eu/kanade/tachiyomi/data/download/DownloadManager.kt
 2022-07-02 13:44:14 -04:00
Andreas
42ecd912e8 Use SQLDelight on Updates screen (#7423) 
(cherry picked from commit 1f10b79ee800fba42aa588cb094d3d280c264245)

# Conflicts:
#	app/src/main/java/eu/kanade/tachiyomi/data/database/queries/RawQueries.kt
 2022-07-02 13:38:36 -04:00
arkon
0e390b5429 Revert some KTX extension changes 
These weren't exactly 1:1 replacements. Might be related to #7391.

(cherry picked from commit b9e108eb4d7e93deb6bc8bd6ed32220c780d2576)
 2022-07-02 13:23:22 -04:00
AntsyLich
8bf3426afd DownloadProvider: Only provide necessary info and not whole chapter/manga class (#7411) 
(cherry picked from commit e1525a5125f83fb419d5e5f05834cffcbcd7fa07)

# Conflicts:
#	app/src/main/java/eu/kanade/tachiyomi/data/download/DownloadProvider.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/manga/MangaPresenter.kt
 2022-07-02 13:22:43 -04:00
arkon
858c3b5a0a Bump dependencies 
(cherry picked from commit 7e4c45858f6fd2309f8ca07e1e4c4798ab87b764)

# Conflicts:
#	app/src/main/java/eu/kanade/tachiyomi/ui/reader/ReaderActivity.kt
 2022-07-02 13:02:29 -04:00
stevenyomi
ef20995e7d Extension API: change fallback source and logic (#7400) 
* Extension API: change fallback source and logic

* remove ghproxy

(cherry picked from commit 284445c364baa47c4f29a524c3e00f1e18360abb)

# Conflicts:
#	app/src/main/java/eu/kanade/tachiyomi/extension/api/ExtensionGithubApi.kt
 2022-07-02 12:57:25 -04:00
Jobobby04
4de4992e4e Fix trash group by tracking code 2022-06-27 18:06:36 -04:00
AntsyLich
58ed2b9752 Fix Mark previous as read (#7396) 
(cherry picked from commit 7440086ef1bd63d499945afe1722d6648ab514ac)
 2022-06-27 13:00:09 -04:00
AntsyLich
257001d4a6 Sort Manga by title in MigrationMangaScreeen (#7392) 
(cherry picked from commit ef3acb8c430f88664dbc3895e666e76836ad163d)
 2022-06-27 12:59:57 -04:00
stevenyomi
af82ef436b RateLimitInterceptor: ignore canceled calls (#7389) 
* RateLimitInterceptor: ignore canceled calls

* SpecificHostRateLimit: ignore canceled calls

(cherry picked from commit 5b8cd68cf355a15e5d5789280524d08b4c922f23)
 2022-06-27 12:59:42 -04:00
Jobobby04
45ba4e77bd Compile fixes 2022-06-27 12:59:29 -04:00
arkon
775ab6479a Migrate usages of SyncChaptersWithTrackServiceTwoWay 
(cherry picked from commit 53decfd47b2fba53cebcaa2350fb8cf6a2385e9f)

# Conflicts:
#	app/src/main/java/eu/kanade/tachiyomi/data/database/queries/ChapterQueries.kt
#	app/src/main/java/eu/kanade/tachiyomi/data/database/queries/TrackQueries.kt
#	app/src/main/java/eu/kanade/tachiyomi/data/library/LibraryUpdateService.kt
#	app/src/main/java/eu/kanade/tachiyomi/network/NetworkHelper.kt
 2022-06-27 12:59:11 -04:00
arkon
e6d39ce14c Migrate more track DB calls to SQLDelight 
(cherry picked from commit 65264e3ef56b3327d0f0d2f6f5250d79e6e7555f)

# Conflicts:
#	app/src/main/java/eu/kanade/tachiyomi/data/database/queries/MangaQueries.kt
#	app/src/main/java/eu/kanade/tachiyomi/data/database/resolvers/MangaFavoritePutResolver.kt
#	app/src/main/java/eu/kanade/tachiyomi/data/preference/PreferenceKeys.kt
#	app/src/main/java/eu/kanade/tachiyomi/data/track/TrackManager.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/browse/migration/MigrationFlags.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryPresenter.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/reader/ReaderPresenter.kt
 2022-06-27 12:52:18 -04:00
arkon
9d8aebc7a6 Fix app update install notification disappearing 
(cherry picked from commit 4ca0fc7a4d2232ef9a48890b42cd1bd27450b585)
 2022-06-27 12:27:05 -04:00
Jobobby04
1a17f87945 Simplify autoscroll 2022-06-26 22:17:37 -04:00
Jobobby04
ac586560f0 Only enable autoscroll when app is active 2022-06-26 19:11:20 -04:00
Jobobby04
4ddc696fb5 Use image decoder for double pages 2022-06-26 18:12:22 -04:00
Jobobby04
27733aba02 Add virtual visibility tag for E-Hentai 2022-06-26 16:51:51 -04:00
AntsyLich
6f407f6e0a Use sqldelight for direct db calls in MangaPresenter (#7366) 
(cherry picked from commit 04f0ca78469573707e14742226fd8f14445853d4)

# Conflicts:
#	app/src/main/java/eu/kanade/domain/manga/model/Manga.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/manga/MangaPresenter.kt
 2022-06-26 16:03:51 -04:00
jobobby04
1084e7fe9d Fix clicking cover opening random manga (#7387) 
(cherry picked from commit 61a44101a273598ec43168be9fbf00247facef58)
 2022-06-26 15:52:06 -04:00
Jobobby04
0862c935a1 Minor improvements to backup fix 2022-06-26 13:58:23 -04:00
Jobobby04
e1c183b04d Fix backups and filtered scanlators 2022-06-26 13:52:05 -04:00
Osyx
bd6f778de2 Add new "Lavender" theme (#7343) 
* Add new "Lavender" theme

* Add light theme values for Lavender theme

* Fix order of enums

* Fix accented UI elements in set categories sheet being different colors

Co-authored-by: CrepeTF <trungnguyen02@outlookcom>
(cherry picked from commit ad106bd8842dfc9c047c0412b92a0cb1dc1aba1a)
 2022-06-26 11:30:47 -04:00
Ivan Iskandar
3fa1c24f8d MangaPresenter: Fix state updates when opening a new manga entry (#7379) 
(cherry picked from commit 0e0c1dcdc5f42b0a63d5b865c9aba29db4ab18a6)

# Conflicts:
#	app/src/main/java/eu/kanade/tachiyomi/ui/manga/MangaPresenter.kt
 2022-06-26 11:24:57 -04:00
arkon
d2e40a0749 Use primary color for excluded tristate filter icon (fixes #7360) 
(cherry picked from commit 3ca1ce463696e2e8eabf63c1e729dbdd2ffe1f71)
 2022-06-26 11:09:00 -04:00
Jobobby04
f72b6cf87b Fix imports 2022-06-25 19:34:40 -04:00
Ivan Iskandar
2b7aca710e MangaController overhaul (#7244) 
(cherry picked from commit 33a778873af0eb52528a29f741fa59b530679c64)

# Conflicts:
#	app/build.gradle.kts
#	app/src/main/java/eu/kanade/tachiyomi/data/database/models/LibraryManga.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/browse/migration/search/SearchController.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/manga/MangaController.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/manga/MangaPresenter.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/manga/chapter/ChapterHolder.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/manga/chapter/ChaptersAdapter.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/manga/chapter/ChaptersSettingsSheet.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/manga/info/MangaInfoHeaderAdapter.kt
#	app/src/main/java/eu/kanade/tachiyomi/widget/MangaSummaryView.kt
#	app/src/main/res/layout-sw720dp/manga_info_header.xml
#	app/src/main/res/layout/manga_controller.xml
#	app/src/main/res/layout/manga_info_header.xml
#	app/src/main/res/layout/manga_summary.xml
#	app/src/main/res/menu/manga.xml
 2022-06-25 17:11:25 -04:00
jobobby04
1e53ad97db Fix downloader crash related to UnmeteredSource (#7365) 
Fix crash when starting a download with chaqpters from a UnmeteredSource

(cherry picked from commit 470a5764417ccd63a274ccea0e483a12ec1adbda)
 2022-06-25 11:35:05 -04:00
Ivan Iskandar
dfe32071e2 ChapterDownloadView: Convert to compose (#7354) 
(cherry picked from commit a77bce7b3735811002be3e80b95dae892029d0f5)
 2022-06-25 11:34:47 -04:00
arkon
c48318df73 Fix crashes from KTX extension changes 
(cherry picked from commit 915e38f636e2fba9ae53ee8d87026ea1e0edacf3)

# Conflicts:
#	app/src/main/java/eu/kanade/tachiyomi/ui/browse/source/browse/SourceFilterSheet.kt
 2022-06-25 11:33:40 -04:00
AntsyLich
14a57b7d4d Use sqldelight in migration (#7331) 
* Use sqldelight in migration

* Some more changes

Co-Authored-By: Ivan Iskandar <12537387+ivaniskandar@users.noreply.github.com>

* Review Changes

* Review changes 2

* Review Changes 3

* Review Changes 4

Co-authored-by: Ivan Iskandar <12537387+ivaniskandar@users.noreply.github.com>
(cherry picked from commit e3b1053c03da17c8c1b66f1914251707134e84a9)

# Conflicts:
#	app/src/main/java/eu/kanade/tachiyomi/ui/browse/migration/search/SearchPresenter.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/manga/MangaPresenter.kt
 2022-06-25 11:32:09 -04:00
Taco
9e63d7fb0b Utilize more KTX extensions (#7348) 
(cherry picked from commit c2520bff12fc2a9c382b21f2beb82173958c23ff)

# Conflicts:
#	app/src/main/java/eu/kanade/tachiyomi/ui/browse/source/browse/SourceFilterSheet.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/reader/viewer/ReaderPageImageView.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/setting/search/SettingsSearchHelper.kt
 2022-06-25 11:25:06 -04:00
arkon
eefdeb3c3f Fix accented UI elements in library sheet being different colors 
(cherry picked from commit cd5bcc36734e0959569be6dd5ecd3b3813863207)
 2022-06-25 11:23:50 -04:00
arkon
e0cfaa707e Minor cleanup 
(cherry picked from commit 254f021903030551d781223089d64a74fe130197)
 2022-06-25 11:23:39 -04:00
Jobobby04
60e1c9aded Remove unneeded backup functions 2022-06-25 11:23:31 -04:00
Ivan Iskandar
21e03616ba Convert cover dialog view to compose (#7346) 
(cherry picked from commit 8fedd2d5f13e56115bdf46a9a38e0ae750681488)

# Conflicts:
#	app/src/main/java/eu/kanade/tachiyomi/ui/manga/MangaController.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/manga/info/MangaFullCoverDialog.kt
 2022-06-25 11:22:39 -04:00
Jobobby04
f808cbfa69 Minor cleanup 2022-06-19 21:54:11 -04:00
arkon
ea712646fc More minor refactorings 
Extracted from #7244

Co-authored-by: ivaniskandar <ivaniskandar@users.noreply.github.com>
(cherry picked from commit cb1830d74773544c6063371df74b268dab0c85fa)

# Conflicts:
#	app/src/main/java/eu/kanade/tachiyomi/ui/browse/migration/search/SearchController.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/browse/source/browse/BrowseSourceController.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/manga/MangaController.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/manga/info/MangaInfoHeaderAdapter.kt
 2022-06-19 21:52:44 -04:00
arkon
0e90c7fa16 Migrate some categories SQL calls to SQLDelight 
(cherry picked from commit a7decdb62d6226184827378bb851420f7628f856)

# Conflicts:
#	app/src/main/java/eu/kanade/tachiyomi/ui/browse/source/browse/BrowseSourcePresenter.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/manga/MangaController.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/manga/MangaPresenter.kt
 2022-06-19 21:34:05 -04:00
Ivan Iskandar
29f992fe33 ChaptersSettingsSheet: Single source of truth and use new manga class (#7342) 
Currently breaks initial settings state until the source of truth is
properly updated.

(cherry picked from commit 005b9b595cfe41484eea94998d2f3c9918759a94)

# Conflicts:
#	app/src/main/java/eu/kanade/domain/manga/model/Manga.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/manga/MangaController.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/manga/chapter/ChaptersSettingsSheet.kt
 2022-06-19 21:29:38 -04:00
arkon
4ca4484362 Migrate duplicate manga check to SQLDelight 
Extracted from #7244

Co-authored-by: ivaniskandar <ivaniskandar@users.noreply.github.com>
(cherry picked from commit 9f66c85281e02eb6a73034d79a3441c98803ffd6)

# Conflicts:
#	app/src/main/java/eu/kanade/tachiyomi/ui/browse/source/browse/BrowseSourceController.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/browse/source/browse/BrowseSourcePresenter.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/manga/MangaPresenter.kt
 2022-06-19 21:24:07 -04:00
Ivan Iskandar
4a23c3b105 Convert edit cover function to suspend function (#7330) 
(cherry picked from commit 28e7009b4982fb846296a9e0973f4e84f6f46b25)

# Conflicts:
#	app/src/main/java/eu/kanade/tachiyomi/ui/manga/MangaController.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/reader/ReaderPresenter.kt
 2022-06-18 19:37:35 -04:00
arkon
115fc2afdc Delete unused database queries/resolvers 
(cherry picked from commit dd983c803b6fe1a29946447ca818eaefdd7928ff)

# Conflicts:
#	app/src/main/java/eu/kanade/tachiyomi/data/database/resolvers/HistoryUpsertResolver.kt
 2022-06-18 19:33:15 -04:00
Jobobby04
cd4b6a0c27 Build fixes and minor improvements 2022-06-18 19:27:26 -04:00
Ivan Iskandar
a5fe4e1a44 Fix cover fetching in compose views (#7315) 
Make sure it passed thru the custom fetcher

(cherry picked from commit 1b804e61cb2b38d7194b058b4152b14607b5e443)

# Conflicts:
#	app/src/main/java/eu/kanade/data/history/HistoryMapper.kt
#	app/src/main/java/eu/kanade/domain/history/model/HistoryWithRelations.kt
#	app/src/main/java/eu/kanade/tachiyomi/App.kt
 2022-06-18 19:26:33 -04:00
Andreas
cad93ce77e Fix History not being added when restoring backup (#7324) 
(cherry picked from commit c5d84b4f2408b043b7a74ac2a263e0564f2e4b5a)
 2022-06-18 19:10:30 -04:00
Ivan Iskandar
791736673f MangaController: Change the workaround for title alpha (#7277) 
Now checks for the backstack for any dialog controller when a push exit occurs
before restoring the title alpha.

(cherry picked from commit ae88252cb189283a87c3294c0b6c4bb28064b0f6)
 2022-06-18 19:10:21 -04:00
Ivan Iskandar
d7341f0a3f MainActivity: Fix incorrect UI states when activity recreated with dialog controller (#7325) 
(cherry picked from commit 3c3d787a2be41de3f1c0f3e1f38d1e4152f7b7ac)
 2022-06-18 19:10:09 -04:00
Ivan Iskandar
3c6b22a37e Don't set text colors when creating compose theme (#7316) 
This avoids compose snackbar text color issue

(cherry picked from commit 4ef337f1e92fcdbded2de57c8f248b60d7795649)
 2022-06-16 12:05:48 -04:00
Andreas
cbb201d63d Use SQLDelight on Category screen (#7310) 
* Use SQLDelight on Category screen

* Include category name in DuplicateNameException

(cherry picked from commit 017f6b22f02ef06cd5a3d521715c32c5e3b2b0e6)

# Conflicts:
#	app/src/main/sqldelight/data/categories.sq
 2022-06-16 12:05:40 -04:00