copilot/komikku
1
0
Fork 0
Code Issues Pull requests Projects Releases 5 Packages Wiki Activity Actions
6356 commits 2 branches 67 tags 103 MiB
Commit graph

4444 commits

Author SHA1 Message Date
arkon
d48427152e More domain model usage 
(cherry picked from commit a3ab8746bf8b1cfca628431e76f9c63ecd973010)

# 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/LibraryController.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryPresenter.kt
 2022-07-03 16:51:08 -04:00
Andreas
22da633ee3 Cleanup data layer (#7450) 
(cherry picked from commit 069bd90c0f76d21bc6d99a51644926876415c113)

# Conflicts:
#	app/src/main/sqldelight/data/mangas.sq
 2022-07-03 16:41:43 -04:00
arkon
eb0964d0b6 More domain model usage 
(cherry picked from commit 68697e59d71d9875d8a8b8aaaf65e77a084e0b8a)

# Conflicts:
#	app/src/main/java/eu/kanade/tachiyomi/data/backup/AbstractBackupManager.kt
#	app/src/main/java/eu/kanade/tachiyomi/data/cache/ChapterCache.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/reader/ReaderPresenter.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/reader/loader/HttpPageLoader.kt
#	app/src/main/java/eu/kanade/tachiyomi/util/chapter/ChapterSourceSync.kt
 2022-07-03 16:32:00 -04:00
arkon
268911a7c9 More domain model usage 
(cherry picked from commit b3dd8b735581ee7ea1ef0ee6dde99507f329e346)

# Conflicts:
#	app/src/main/java/eu/kanade/domain/manga/model/Manga.kt
#	app/src/main/java/eu/kanade/tachiyomi/data/database/models/Manga.kt
#	app/src/main/java/eu/kanade/tachiyomi/data/database/models/MangaCategory.kt
#	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/library/LibraryPresenter.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/reader/ReaderPresenter.kt
 2022-07-03 16:22:08 -04:00
Andreas
0ad6e00bca Remove SQLiteOpenHelper as database is migrated to SQLDelight (#7448) 
(cherry picked from commit eb2a904b618bcbecd1311fa0db3809425d91d8d5)

# Conflicts:
#	app/src/main/java/eu/kanade/tachiyomi/data/database/DbOpenCallback.kt
 2022-07-03 16:00:25 -04:00
Andreas
ea38ffc53e Use SQLDelight for all Manga related queries (#7447) 
(cherry picked from commit 17951cfd68159d083df54c3e03094d8d66fe02ec)

# Conflicts:
#	app/src/main/java/eu/kanade/domain/DomainModule.kt
#	app/src/main/java/eu/kanade/domain/manga/repository/MangaRepository.kt
#	app/src/main/java/eu/kanade/tachiyomi/data/database/DatabaseHelper.kt
#	app/src/main/java/eu/kanade/tachiyomi/data/database/DbExtensions.kt
#	app/src/main/java/eu/kanade/tachiyomi/data/database/DbProvider.kt
#	app/src/main/java/eu/kanade/tachiyomi/data/database/mappers/ChapterTypeMapping.kt
#	app/src/main/java/eu/kanade/tachiyomi/data/database/mappers/MangaCategoryTypeMapping.kt
#	app/src/main/java/eu/kanade/tachiyomi/data/database/mappers/MangaTypeMapping.kt
#	app/src/main/java/eu/kanade/tachiyomi/data/database/queries/MangaQueries.kt
#	app/src/main/java/eu/kanade/tachiyomi/data/database/queries/RawQueries.kt
#	app/src/main/java/eu/kanade/tachiyomi/data/database/resolvers/ChapterProgressPutResolver.kt
#	app/src/main/java/eu/kanade/tachiyomi/data/database/resolvers/LibraryMangaGetResolver.kt
#	app/src/main/java/eu/kanade/tachiyomi/data/database/resolvers/MangaFlagsPutResolver.kt
#	app/src/main/java/eu/kanade/tachiyomi/data/database/tables/CategoryTable.kt
#	app/src/main/java/eu/kanade/tachiyomi/data/database/tables/ChapterTable.kt
#	app/src/main/java/eu/kanade/tachiyomi/data/database/tables/MangaCategoryTable.kt
#	app/src/main/java/eu/kanade/tachiyomi/data/database/tables/MangaTable.kt
#	app/src/main/java/eu/kanade/tachiyomi/data/library/LibraryUpdateService.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/browse/migration/search/SearchController.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/browse/source/browse/BrowseSourcePresenter.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryPresenter.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/reader/ReaderPresenter.kt
 2022-07-03 15:58:26 -04:00
Jobobby04
d88c769d3b Use SQLDelight for more SY specific things 2022-07-03 13:37:27 -04:00
Jobobby04
e71c9e2775 Use SQLDelight for mass migration 2022-07-03 00:33:09 -04:00
Jobobby04
664f9b1484 Use SQLDelight for most SY specific things 2022-07-02 23:52:03 -04:00
Andreas
3cf4c3128f Use SQLDelight for all MangaCategory related queries (#7441) 
(cherry picked from commit 9e3b454b1b79a7725b3d3be4c85c1655ad80e18d)

# Conflicts:
#	app/src/main/java/eu/kanade/tachiyomi/data/database/DatabaseHelper.kt
#	app/src/main/java/eu/kanade/tachiyomi/data/database/queries/MangaCategoryQueries.kt
 2022-07-02 20:46:46 -04:00
Andreas
9093663f2f Use SQLDelight for all Chapter related queries (#7440) 
(cherry picked from commit 29633b64aa1b3d87392362f31f4fc250d930722b)

# Conflicts:
#	app/src/main/java/eu/kanade/data/chapter/ChapterRepositoryImpl.kt
#	app/src/main/java/eu/kanade/domain/chapter/repository/ChapterRepository.kt
#	app/src/main/java/eu/kanade/tachiyomi/data/database/DatabaseHelper.kt
#	app/src/main/java/eu/kanade/tachiyomi/data/database/queries/ChapterQueries.kt
#	app/src/main/sqldelight/data/chapters.sq
 2022-07-02 20:46:01 -04:00
arkon
9205b568e8 Migrate to more use of domain models 
(cherry picked from commit 76c0ead1db3a93f859f00ce6bff69f38b8699bd6)

# Conflicts:
#	app/src/main/java/eu/kanade/domain/manga/model/Manga.kt
#	app/src/main/java/eu/kanade/tachiyomi/data/database/DatabaseHelper.kt
#	app/src/main/java/eu/kanade/tachiyomi/data/database/mappers/CategoryTypeMapping.kt
#	app/src/main/java/eu/kanade/tachiyomi/data/database/models/MangaCategory.kt
#	app/src/main/java/eu/kanade/tachiyomi/data/database/queries/RawQueries.kt
#	app/src/main/java/eu/kanade/tachiyomi/data/database/tables/CategoryTable.kt
#	app/src/main/java/eu/kanade/tachiyomi/data/library/LibraryUpdateService.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/SourceSearchController.kt
#	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/browse/source/browse/SourceComfortableGridHolder.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/browse/source/browse/SourceCompactGridHolder.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/browse/source/browse/SourceHolder.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/browse/source/browse/SourceItem.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryCategoryView.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryController.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryPresenter.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/library/LibrarySettingsSheet.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/manga/MangaController.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/manga/MangaPresenter.kt
 2022-07-02 20:42:52 -04:00
Andreas
cd2f26a7c9 Use SQLDelight for a Category related queries (#7438) 
(cherry picked from commit 2674570792a275abaee7a6ec1ae947d94f69a634)

# Conflicts:
#	app/src/main/java/eu/kanade/data/category/CategoryRepositoryImpl.kt
#	app/src/main/java/eu/kanade/domain/category/model/Category.kt
#	app/src/main/java/eu/kanade/domain/category/repository/CategoryRepository.kt
#	app/src/main/java/eu/kanade/tachiyomi/data/database/DatabaseHelper.kt
#	app/src/main/java/eu/kanade/tachiyomi/data/database/queries/CategoryQueries.kt
#	app/src/main/java/eu/kanade/tachiyomi/data/download/DownloadManager.kt
#	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
#	app/src/main/java/eu/kanade/tachiyomi/util/MangaExtensions.kt
 2022-07-02 20:10:20 -04:00
arkon
85898df703 More SQLDelight migrations 
(cherry picked from commit 21771e62aa0dc7e1393b27ea8eb146de277cebd9)

# Conflicts:
#	app/src/main/java/eu/kanade/domain/manga/model/Manga.kt
#	app/src/main/java/eu/kanade/tachiyomi/data/backup/AbstractBackupManager.kt
#	app/src/main/java/eu/kanade/tachiyomi/data/backup/full/models/BackupManga.kt
#	app/src/main/java/eu/kanade/tachiyomi/data/database/queries/ChapterQueries.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/reader/ReaderActivity.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/reader/ReaderPresenter.kt
 2022-07-02 19:40:55 -04:00
Andreas
2c87a8fd02 Use SQLDelight on Library screen (#7432) 
- Uses the new `asObservable` function to change the database calls to use SQLDelight, which should make the impact minimal when it comes to bugs.
- Use interactors where they already exist
- The todos are for the Compose rewrite
- Removed unused StorIO methods/queries
- Tested loading library, move manga to new category, unfavorite multiple manga, move multiple manga from one category to another, change filter, sort and display settings (with and without per category settings), (un)mark chapters, start/delete downloads

Thank Syer for asObservable

Co-authored-by: jobobby04 <17078382+jobobby04@users.noreply.github.com>

Co-authored-by: jobobby04 <17078382+jobobby04@users.noreply.github.com>
(cherry picked from commit 05085fe57fe4c3ada497f93b8cd282a5009cdbbb)

# Conflicts:
#	app/src/main/java/eu/kanade/data/manga/MangaRepositoryImpl.kt
#	app/src/main/java/eu/kanade/tachiyomi/data/database/DatabaseHelper.kt
#	app/src/main/java/eu/kanade/tachiyomi/data/database/queries/CategoryQueries.kt
#	app/src/main/java/eu/kanade/tachiyomi/data/database/queries/MangaQueries.kt
#	app/src/main/java/eu/kanade/tachiyomi/data/database/queries/TrackQueries.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/browse/migration/search/SearchPresenter.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryController.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryPresenter.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/library/LibrarySettingsSheet.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/manga/MangaPresenter.kt
 2022-07-02 19:10:26 -04:00
AntsyLich
1087f07614 Downloader: Optimize split tall image (#7435) 
(cherry picked from commit ff32ab09fbc32eff33cb378d6e1b1aa0d9ef8e1a)
 2022-07-02 13:44:21 -04:00
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
Ivan Iskandar
4854fcfccf MangaScreen: Hide scroller when appbar is expanded (#7426) 
(cherry picked from commit 3072296919089546016de10c274de1a10b0b7234)
 2022-07-02 13:42:48 -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
Ivan Iskandar
299ac1ca2d MangaScreen: Reuse components between two layouts (#7397) 
(cherry picked from commit 388dc2f10301c8dd128b493ad876467fca1b38c3)
 2022-07-02 13:03:00 -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
AntsyLich
b2a7780501 Fix chapter item incorrect colors (#7403) 
* Fix chapter item incorrect colors

* Make it like stable

(cherry picked from commit 08d1ecfba7e8b41b1ea159057314619d91428da2)
 2022-07-02 12:56:48 -04:00
Ivan Iskandar
e36cacee5a MangaInfoHeader: Add description placeholder (#7398) 
To always show summary view for expanding tags

(cherry picked from commit 0c856438fa86296ecc70f8422740d64f18a9b716)
 2022-06-28 10:03:53 -04:00
Ivan Iskandar
d81fc7f1c0 Improve history screen scrolling perf (#7399) 
(cherry picked from commit e44bb309965e63174b89b9e5e527ad9a60d5184f)
 2022-06-28 10:03:38 -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
447829b1b9 Improve handling of tags 2022-06-27 09:16:19 -04:00
Jobobby04
acc8ec6912 Put metadata header below the buttons 2022-06-27 09:07:25 -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
48a62f7c4a Fix metadata not properly updating 2022-06-26 14:44:56 -04:00
Jobobby04
0862c935a1 Minor improvements to backup fix 2022-06-26 13:58:23 -04:00
Ivan Iskandar
b1be2a8612 MangaScreen: Fix action mode download button not working (#7385) 
(cherry picked from commit 924dfa19cffed109db8d039cecfa430165abc45e)
 2022-06-26 13:55:38 -04:00
Ivan Iskandar
4eb45d0ade VerticalFastScroller: Fix incorrect touch target (#7384) 
(cherry picked from commit 9ff6ae81bdcb7ce8d1a180f86fad8870324bcf1e)
 2022-06-26 13:55:29 -04:00
Ivan Iskandar
42c8b47f04 Fix chapter number display style (#7383) 
(cherry picked from commit c33e5c8a1704c8c1a66aa90f6dd934cd5d064c88)
 2022-06-26 13:55:13 -04:00
Ivan Iskandar
8adfc4954c MangaInfoHeader tweaks (#7382) 
* Changed cover alignment when title is longer
* Hide artist text if it's equal to author
* Set single line to status and source name

(cherry picked from commit 6129bbc9ab9ac493a40e4b7f928f8271c191ae2d)
 2022-06-26 13:52:57 -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
arkon
24252c388a Fix manga info header using wrong text color (fixes #7368) 
(cherry picked from commit 37fe25ac06ff58d9d91f619bfb13cd516b369a90)

# Conflicts:
#	app/src/main/java/eu/kanade/presentation/manga/components/MangaInfoHeader.kt
 2022-06-26 11:26:31 -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
b889a3482e Avoid overflow in extension screen items (fixes #6972) 
(cherry picked from commit 80d2d9d2581df56286b990f167ad34cbe00a8627)

# Conflicts:
#	app/src/main/java/eu/kanade/presentation/browse/ExtensionsScreen.kt
 2022-06-26 11:09:55 -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
arkon
ec0f572a82 Minor cleanup 
- Use outlined icons where appropriate to match previous UI
- Allow tapping entire ChapterHeader to bring up sheet

(cherry picked from commit 8ec91cddab1b77baa631500d6878e60df8c8d13d)

# Conflicts:
#	app/src/main/java/eu/kanade/presentation/browse/ExtensionsScreen.kt
#	app/src/main/java/eu/kanade/presentation/manga/components/MangaSmallAppBar.kt
 2022-06-25 17:13:34 -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
a9227a13e1 Minor composable updates 
Extracted from #7244

Co-authored-by: ivaniskandar <ivaniskandar@users.noreply.github.com>
(cherry picked from commit 68c47a323879a794c9fc87903233fd418fe2edab)
 2022-06-19 21:36:21 -04:00
arkon
bcb0a24a4f Add Composable preview for preferences 
...except Android Studio refuses to actually render them.

(cherry picked from commit 11f1482818d70e6b00bcfd267ab70418e3350e83)

# Conflicts:
#	app/src/main/java/eu/kanade/presentation/components/Preferences.kt
 2022-06-19 21:36:06 -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
Ivan Iskandar
3f94fd8e6e Add fast scroller to extensions screen (#7340) 
(cherry picked from commit e6a9d0b090e6f89669587cfa7b71b275d7796bff)
 2022-06-19 21:25:09 -04:00
AntsyLich
60e0913cbb Make stub source icon part of SourceIcon (#7337) 
* Make stub source icon part of `SourceIcon`

* Review Changes

(cherry picked from commit 82879a129e12509223a05230ebeb884f103d0745)

# Conflicts:
#	app/src/main/java/eu/kanade/presentation/browse/MigrateSourceScreen.kt
 2022-06-19 21:25:00 -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
Andreas
9a28d42b63 Use custom QueryPagingSource (#7321) 
* Use custom QueryPagingSource

- Adds placeholder to make the list jump around less
- Fixes issue where SQLDelight QueryPagingSource would throw IndexOutOfBounds

* Review Changes

(cherry picked from commit 3fd9e021fa84557fc1681685ee1a3e8b6678e7ba)
 2022-06-18 19:37:56 -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
Jobobby04
40258139ab Use a custom domain module for SY 2022-06-16 12:04:27 -04:00
nicki
753ed70e1c Add Cancel button to App Update Notification (#7309) 
* Add cancel button in app update download notif

Since stuck downloads are a common issue and only solution until now was
to force close the app or download and update the app manually by
downloading from GitHub (which clears the notif away)

Based on commit
4dea924337

Co-authored-by: Jays2Kings <8617760+Jays2Kings@users.noreply.github.com>

* Linting by Android Studio

* commit PR Review Suggestion

Update app/src/main/java/eu/kanade/tachiyomi/data/notification/NotificationReceiver.kt

Co-authored-by: arkon <arkon@users.noreply.github.com>

* Use `launchIO`

copied this over from how j2k was doing it. Launching in IO Thread like
how it was before this PR is sufficient

* Clear previous actions before adding `Cancel`

Otherwise, it led to two identical Cancel buttons

Co-authored-by: Jays2Kings <8617760+Jays2Kings@users.noreply.github.com>
Co-authored-by: arkon <arkon@users.noreply.github.com>
(cherry picked from commit fdf384b8092d09f0a4e68c5688f9c1c1e94c80d0)
 2022-06-16 12:03:49 -04:00
arkon
2ae6d76af7 Fix WebView user-agent (fixes #7306) 
The `source.headers.toMultimap()` call in WebViewActivity makes all the names lowercase.

(cherry picked from commit 284880d096d1a4e4f746cc49de945f3186207285)
 2022-06-16 12:03:32 -04:00
arkon
d7919c531a Make Compose overflow menu feel slightly more like XML version 
(cherry picked from commit a446b37c1f09c5be4c8693895814921c802479c5)
 2022-06-16 12:03:24 -04:00
arkon
7e8228137c Minor cleanup 
(cherry picked from commit d2f4c43526769ff8928d273d2e95e29fc5688bbc)
 2022-06-16 12:03:03 -04:00
AntsyLich
8a06bc42d8 Maintain source info in the database. (#6389) 
* Maintain Source Info in database

* Review changes and cleanups

* Review changes 2

* Review Changes 3

(cherry picked from commit 9d5b7de1d89a353d0bf73ce6befd9f5667d94d17)

# Conflicts:
#	app/src/main/java/eu/kanade/domain/DomainModule.kt
#	app/src/main/java/eu/kanade/presentation/browse/MigrateSourceScreen.kt
#	app/src/main/java/eu/kanade/tachiyomi/extension/ExtensionManager.kt
#	app/src/main/java/eu/kanade/tachiyomi/source/SourceManager.kt
 2022-06-16 12:02:38 -04:00
AntsyLich
62873c4e67 Set db chapter metadata from correct chapter (#7303) 
(cherry picked from commit a01c370d6335c19f608f5216ad0772e49310b098)
 2022-06-16 11:43:01 -04:00
Andreas
70c2f97976 Use SQLDelight in Backup/Restore (#7295) 
* Use SQLDelight in Backup/Restore

* Use CoroutineWorker

(cherry picked from commit fd5da2de3ab294988e8408077977f776cca5299a)

# Conflicts:
#	app/src/main/java/eu/kanade/tachiyomi/data/backup/AbstractBackupManager.kt
#	app/src/main/java/eu/kanade/tachiyomi/data/backup/full/FullBackupManager.kt
#	app/src/main/java/eu/kanade/tachiyomi/data/backup/full/FullBackupRestore.kt
#	app/src/main/java/eu/kanade/tachiyomi/data/backup/full/models/BackupCategory.kt
#	app/src/main/java/eu/kanade/tachiyomi/data/backup/full/models/BackupManga.kt
#	app/src/main/java/eu/kanade/tachiyomi/data/database/DatabaseHelper.kt
#	app/src/main/java/eu/kanade/tachiyomi/data/database/queries/HistoryQueries.kt
#	app/src/main/java/eu/kanade/tachiyomi/source/model/SManga.kt
#	app/src/main/sqldelight/data/categories.sq
#	app/src/main/sqldelight/data/chapters.sq
 2022-06-14 11:13:53 -04:00
AntsyLich
240d5a7c52 Add date_upload to toDbChapter() (#7297) 
(cherry picked from commit 693cc103ea5e9fed3045d3d20778866a0041d944)
 2022-06-12 12:47:38 -04:00
arkon
ed27491ba9 Minor cleanup 
(cherry picked from commit 5ccde61ae1c6f557233dc48d57ad4a953aace6ec)

# Conflicts:
#	app/src/main/java/eu/kanade/domain/chapter/repository/ChapterRepository.kt
 2022-06-12 12:47:30 -04:00
nicki
25e0075041 Fix Links to Changelog/Readme/Commits for multisrc (#7252) 
* Fix Links to Changelog/Readme/Commits for `multisrc`

working basic fix. Needs to be refactored into `createUrl()`

* Refactor back into `createUrl`

hopefully the logic is understandable
there's three cases:
 - when multisrc, if `path` isn't mentioned, then we're trying to open
   commmit history
 - when multisrc, if `path` is mentioned, then its either a changelog or
   a readme to a multisrc extension, the files are stored in the
   `overrides` subfolder
 - when not multisrc, we're looking at a single source where the links
   are constructed in the same way regardless of it being
   changelog/readme/commit history

(cherry picked from commit e7695aef78c92c10e5bae953b24a19e67ac156af)
 2022-06-12 12:47:00 -04:00
AntsyLich
f7ccbd24f8 Fix chapter list live update (#7296) 
(cherry picked from commit b96686e6ad0b46a586958179e8cbb1d6a9182323)

# Conflicts:
#	app/src/main/java/eu/kanade/tachiyomi/ui/manga/MangaPresenter.kt
 2022-06-12 12:44:34 -04:00
AntsyLich
e3f577a6e2 Update manga metadata on library update with sqldelight (#7293) 
Co-Authored-By: Ivan Iskandar <12537387+ivaniskandar@users.noreply.github.com>

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

# Conflicts:
#	app/src/main/java/eu/kanade/domain/manga/model/Manga.kt
#	app/src/main/java/eu/kanade/tachiyomi/data/database/queries/MangaQueries.kt
#	app/src/main/java/eu/kanade/tachiyomi/data/database/resolvers/MangaLastUpdatedPutResolver.kt
#	app/src/main/java/eu/kanade/tachiyomi/data/library/LibraryUpdateService.kt
 2022-06-12 12:20:07 -04:00
arkon
0888a7cd72 Update compose-theme-adapter 
(cherry picked from commit 5fbf454652a52567d9c4e2d0bb19eb7b08b1721e)
 2022-06-12 11:50:56 -04:00