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

903 Commits

Author SHA1 Message Date
Andreas
887757691c Move more to data and domain modules (#8973) 
(cherry picked from commit cdf242e8c8e4b8142d9f4167b0187a32ea1a4d35)

# Conflicts:
#	app/src/main/java/eu/kanade/domain/chapter/interactor/SyncChaptersWithSource.kt
#	app/src/main/java/eu/kanade/domain/track/interactor/GetTracksPerManga.kt
#	app/src/main/java/eu/kanade/tachiyomi/data/library/LibraryUpdateService.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/manga/MangaScreenModel.kt
 2023-02-09 16:50:07 -05:00
Jobobby04
dd62337ad6 Move more repositories to domain module 2023-02-09 15:10:37 -05:00
Jobobby04
ab0995ab9f Make MergedMangaReference immutable 2023-02-09 14:54:52 -05:00
arkon
ce67eb9de3 Move more models to domain module 
(cherry picked from commit 345e9c2a9a61f1f3b814db52eddbb42681499854)

# Conflicts:
#	app/src/main/java/eu/kanade/data/manga/MangaMapper.kt
#	app/src/main/java/eu/kanade/domain/chapter/interactor/SyncChaptersWithSource.kt
#	app/src/main/java/eu/kanade/domain/chapter/model/ChapterFilter.kt
#	app/src/main/java/eu/kanade/domain/history/interactor/GetNextChapters.kt
#	app/src/main/java/eu/kanade/domain/library/service/LibraryPreferences.kt
#	app/src/main/java/eu/kanade/domain/manga/model/Manga.kt
#	app/src/main/java/eu/kanade/presentation/browse/MigrateSearchScreen.kt
#	app/src/main/java/eu/kanade/presentation/browse/components/BrowseSourceDialogs.kt
#	app/src/main/java/eu/kanade/presentation/manga/MangaScreen.kt
#	app/src/main/java/eu/kanade/tachiyomi/data/backup/models/BackupManga.kt
#	app/src/main/java/eu/kanade/tachiyomi/data/database/models/Manga.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/browse/migration/MigrationFlags.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/browse/migration/search/MigrateDialog.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/browse/migration/search/SourceSearchScreen.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/browse/source/browse/BrowseSourceScreenModel.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/history/HistoryTab.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryScreenModel.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryTab.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/manga/MangaScreen.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/manga/MangaScreenModel.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/reader/ReaderViewModel.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/reader/loader/ChapterLoader.kt
#	app/src/main/java/eu/kanade/tachiyomi/util/chapter/ChapterGetNextUnread.kt
 2023-02-09 13:44:38 -05:00
arkon
eb3e928e67 Move more models to domain module 
(cherry picked from commit b53e24e0dbd4affd6066a03ce543c3ecc88bdb99)

# Conflicts:
#	app/src/main/java/eu/kanade/data/history/HistoryRepositoryImpl.kt
#	app/src/main/java/eu/kanade/data/updates/UpdatesMapper.kt
#	app/src/main/java/eu/kanade/domain/category/interactor/SetDisplayModeForCategory.kt
#	app/src/main/java/eu/kanade/domain/category/interactor/SetSortModeForCategory.kt
#	app/src/main/java/eu/kanade/domain/history/repository/HistoryRepository.kt
#	app/src/main/java/eu/kanade/domain/library/service/LibraryPreferences.kt
#	app/src/main/java/eu/kanade/presentation/browse/components/BrowseSourceToolbar.kt
#	app/src/main/java/eu/kanade/tachiyomi/extension/ExtensionManager.kt
#	app/src/main/java/eu/kanade/tachiyomi/source/SourceManager.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/browse/migration/search/MigrateDialog.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/library/LibrarySettingsSheet.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryTab.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/reader/ReaderViewModel.kt
#	domain/src/main/java/tachiyomi/domain/history/model/HistoryWithRelations.kt
#	domain/src/main/java/tachiyomi/domain/updates/model/UpdatesWithRelations.kt
 2023-02-09 13:00:07 -05:00
Andreas
d68330c64e Move Category model and repository to domain and data layer (#8967) 
To keep the commit from being 100+ files the interactors wasn't moved.

The domain module like the data module uses `tachiyomi` instead of `eu.kanade.tachiyomi` for package names

(cherry picked from commit d3a73fc22849a915483bea03fcd7c20834b1f4d8)

# Conflicts:
#	app/src/main/java/eu/kanade/domain/category/interactor/SetSortModeForCategory.kt
#	app/src/main/java/eu/kanade/presentation/more/settings/screen/SettingsLibraryScreen.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryScreenModel.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/library/LibrarySettingsSheet.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryTab.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/manga/MangaScreenModel.kt
 2023-02-07 17:18:30 -05:00
zbue
a53190f7c4 MangaScreenModel: Make download function follow reader preference (#8920) 
* Make download function more clearer in manga screen

Maybe resolves #8879

* Minor cleanup

* Minor cleanup 2

(cherry picked from commit e28b0155801859f48a18bc1c5aacead54378c77f)

# Conflicts:
#	app/src/main/java/eu/kanade/tachiyomi/ui/manga/MangaScreenModel.kt
 2023-02-07 17:05:13 -05:00
zbue
740b3e4616 Allow partially read chapters to be marked as unread in updates screen (#8884) 
* Allow partially read chapters to be marked as unread in updates screen

* Review changes

* Review changes 2

(cherry picked from commit f301dc64f00c2d8a19cb89610cf6fba7eb78917d)

# Conflicts:
#	app/src/main/java/eu/kanade/presentation/manga/MangaScreen.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/manga/MangaScreenModel.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/updates/UpdatesScreenModel.kt
#	app/src/main/sqldelight/migrations/23.sqm
 2023-02-07 15:41:58 -05:00
arkon
864707d75b Minor cleanup 
(cherry picked from commit a2ee4e63ae3bb2949c57d11a23bc56315579f891)
 2023-02-07 13:57:15 -05:00
Alessandro Jean
3a9a1c631d Show proper Exception message in MangaScreen (#8900) 
Show proper Exception message in MangaScreen.

(cherry picked from commit 7329f03bc5e6fa63723d8b19ef8a351916af3631)
 2023-02-07 13:32:14 -05:00
arkon
a55e27c657 Don't prompt to add to library multiple times 
Fixes #8842

(cherry picked from commit 82ea643c7d2ee75acc7fc17e2b9d492b57fb7a42)

# Conflicts:
#	app/src/main/java/eu/kanade/tachiyomi/ui/manga/MangaScreenModel.kt
 2023-02-07 13:32:07 -05:00
arkon
c1f87feb7e Show the tracker name when showing error toast 
(cherry picked from commit 7df10b076c555e403b30f6db34f7b1d7c41aee77)
 2023-02-07 13:29:39 -05:00
arkon
8087c25559 Don't exclude same source when checking for duplicate entries 
Closes #8870

(cherry picked from commit a0f47d3f1b874c9b6d62dfc1679daa9398bf9b98)

# Conflicts:
#	app/src/main/java/eu/kanade/tachiyomi/ui/browse/source/browse/BrowseSourceScreenModel.kt
 2023-02-07 13:26:20 -05:00
arkon
c9bc4646da Use Voyager for WebView in non-reader places 
(cherry picked from commit 6efcb8ccfae0a19ae1c3c866620c8dd5222eb4b3)

# Conflicts:
#	app/src/main/java/eu/kanade/tachiyomi/ui/manga/MangaScreen.kt
 2023-02-07 13:16:24 -05:00
arkon
50c06de524 Use theme padding values in more places 
(cherry picked from commit 0067d474c86d08011ebf3b1676c4db8c85e68125)
 2023-02-07 13:08:48 -05:00
Jobobby04
292f5a93aa Fix page previews not opening read chapters 2023-01-10 16:10:15 -05:00
Ivan Iskandar
55e525b175 TrackDateRemoverScreen: Fix pop behavior after confirming removal (#8792) 
(cherry picked from commit 94a410f50fc8a50ac499d31b7b3423372a6fb2ac)
 2022-12-24 16:35:04 -05:00
stevenyomi
91f6abec98 Fix snackbar blocking refreshing state in MangaScreen (#8759) 
(cherry picked from commit c44db54d9f729f94c53ccf690cb86e8bac332189)

# Conflicts:
#	app/src/main/java/eu/kanade/tachiyomi/ui/manga/MangaScreenModel.kt
 2022-12-17 23:17:07 -05:00
arkon
e5ad53e1d3 Remove unused resources 
(cherry picked from commit 3ede42252ce98346a7fd14d6b2ec12d4579e850b)
 2022-12-16 00:43:37 -05:00
arkon
35817cc7c5 Add Assistant content URLs 
This is surfaced in recents on Pixel devices for example.
Docs: https://developer.android.com/guide/app-actions/assistant-sharing

Co-authored-by: Jays2Kings <Jays2Kings@users.noreply.github.com>
(cherry picked from commit 3749cee28f269aabe5ea18ffb62483a28d0c75e7)

# Conflicts:
#	app/src/main/java/eu/kanade/tachiyomi/ui/browse/source/browse/BrowseSourceScreen.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/main/MainActivity.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/manga/MangaScreen.kt
 2022-12-16 00:34:42 -05:00
Ivan Iskandar
8da293ad91 Move app state banner to the very top (#8706) 
This moves the banners to the root composable and so eliminates the need to
track the app states in every screen.

(cherry picked from commit d97eab03283ea8b686ffa007bfc69224348b24f1)

# Conflicts:
#	app/src/main/java/eu/kanade/presentation/more/MoreScreen.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/browse/BrowseTab.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/browse/source/browse/BrowseSourceScreen.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/browse/source/browse/BrowseSourceScreenModel.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryScreenModel.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/main/MainActivity.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/manga/MangaScreenModel.kt
 2022-12-15 22:36:08 -05:00
Jobobby04
a280a5ed77 Simplify EHentaiUpdateHelper 2022-12-15 21:06:24 -05:00
Ivan Iskandar
270690e513 Track sheet fixes (#8673) 
* Fix Track sheet not being disposed properly

* Change insets handling

(cherry picked from commit 47f079891fe666e2a2c7d91fe1f7fc49981a78f9)

# Conflicts:
#	app/src/main/java/eu/kanade/presentation/util/Navigator.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/manga/MangaScreen.kt
 2022-12-04 15:45:58 -05:00
arkon
4b2acc29f5 More domain model migrations 
(cherry picked from commit 696dc59ea5ebacb5c4fc36b04f3d4125d91385a7)

# Conflicts:
#	app/src/main/java/eu/kanade/tachiyomi/data/database/models/Manga.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/manga/MangaScreenModel.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/reader/ReaderPresenter.kt
 2022-12-04 15:41:20 -05:00
arkon
bcf6904363 Remove some dead code 
(cherry picked from commit b0dc20e00ce7c4cc33742fa3d4ae9d55503a25a4)

# Conflicts:
#	app/src/main/java/eu/kanade/tachiyomi/widget/TachiyomiAppBarLayout.kt
 2022-12-03 15:04:36 -05:00
Ivan Iskandar
726626f2c5 Merge Voyager screens (#8656) 
* Merge Voyager screens

* cleanups

(cherry picked from commit 3d66eaea8373b6ab5d8e8423be227e0452cb0743)

# Conflicts:
#	app/src/main/java/eu/kanade/presentation/components/MangaBottomActionMenu.kt
#	app/src/main/java/eu/kanade/presentation/more/settings/screen/AboutScreen.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/base/changehandler/OneWayFadeChangeHandler.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/base/controller/ConductorExtensions.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/browse/migration/search/MigrateSearchScreen.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/browse/migration/search/SourceSearchController.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/browse/migration/search/SourceSearchScreen.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/browse/source/SourcesFilterController.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/browse/source/SourcesTab.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/BrowseSourceScreen.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/category/CategoryScreen.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/download/DownloadController.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/library/LibrarySettingsSheet.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryTab.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/main/MainActivity.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/main/WhatsNewDialogController.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/manga/MangaController.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/manga/MangaScreen.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/more/MoreTab.kt
#	app/src/main/res/layout/main_activity.xml
 2022-12-03 13:25:41 -05:00
Jobobby04
07c7ec972d Move SmartSearchConfig around 2022-12-03 00:19:24 -05:00
arkon
8e2f5aa495 Remove unnecessary base Nucleus classes 
The reader still uses it, but we just move stuff to there.

(cherry picked from commit 5313a5d5d246bde7df78d43e6704c5a3d5140c23)

# Conflicts:
#	app/src/main/java/eu/kanade/tachiyomi/ui/base/activity/BaseRxActivity.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/base/presenter/BasePresenter.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/main/MainActivity.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/reader/ReaderActivity.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/reader/ReaderPresenter.kt
 2022-12-03 00:15:01 -05:00
Jobobby04
d361a12dfc Fix editing info not updating UI 2022-11-29 19:59:09 -05:00
Jobobby04
08adfdc21d Fix edit info saving not closing the dialog 2022-11-29 19:48:45 -05:00
Dexroneum
9747f1ba91
Translations (#748) 
* Translations

* Fix 1 string
 2022-11-29 17:30:04 -05:00
arkon
9b46395fd8 Minor cleanup 
(cherry picked from commit 3480b45098dba20377975d5f0368f47cc7df75ab)

# Conflicts:
#	app/src/main/java/eu/kanade/tachiyomi/data/download/DownloadManager.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryScreenModel.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/manga/MangaScreenModel.kt
 2022-11-28 22:27:31 -05:00
Jobobby04
658c84bef8 Use Voyager for source feed 2022-11-28 22:21:34 -05:00
Andreas
d2182ed380 Use Compose on Global/Migrate Search screen (#8631) 
* Use Compose on Global/Migrate Search screen

- Refactor to use Voyager and Compose
- Use sealed class for state
- Somethings are broken/missing due to screens using different navigation libraries

* Review changes

(cherry picked from commit f99b62a069e8e987318a0144090560795d59e3ff)

# Conflicts:
#	app/src/main/java/eu/kanade/presentation/browse/components/BrowseSourceComfortableGrid.kt
#	app/src/main/java/eu/kanade/presentation/browse/components/BrowseSourceCompactGrid.kt
#	app/src/main/java/eu/kanade/presentation/browse/components/BrowseSourceList.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/browse/migration/manga/MigrationMangaScreen.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
#	app/src/main/java/eu/kanade/tachiyomi/ui/browse/migration/search/SourceSearchController.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/browse/source/globalsearch/GlobalSearchController.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/browse/source/globalsearch/GlobalSearchPresenter.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/manga/MangaScreen.kt
 2022-11-28 20:41:43 -05:00
arkon
44c324f145 Use Voyager between more screens 
(cherry picked from commit 5c9e9bd2c4647da189d7313f2ee206541e65f409)

# Conflicts:
#	app/src/main/java/eu/kanade/presentation/more/settings/screen/SettingsLibraryScreen.kt
 2022-11-26 13:50:52 -05:00
Jobobby04
7df12c68fd Use Voyager for a few screens 2022-11-26 13:36:06 -05:00
Jobobby04
4d7b6f8167 Cherry pick fixes 2022-11-24 16:41:50 -05:00
Joseph Olugbohunmi
c07ccf7943 Implement copying of Manga URL to Clipboard (#8587) 
feat: Implement copying of Manga URL to Clipboard
(cherry picked from commit ef3a6c80a7638209a5a41a0923bd9195380429aa)

# Conflicts:
#	app/src/main/java/eu/kanade/tachiyomi/ui/manga/MangaScreen.kt
 2022-11-24 16:23:20 -05:00
arkon
889fec251e Don't attempt to check chapter download status for local chapters 
Fixes #8541

(cherry picked from commit 8c1171a72256f76972e787d53e182869df2a87d4)

# Conflicts:
#	app/src/main/java/eu/kanade/tachiyomi/ui/manga/MangaScreenModel.kt
 2022-11-24 16:08:04 -05:00
arkon
4f8d2f3fd7 Use current timezone when setting tracker dates 
Fixes #8553

(cherry picked from commit e22896a9569b3dc8d8bc087a4765f8de2391a69b)
 2022-11-24 15:47:46 -05:00
AntsyLich
e8ec4094f7 Fix related to cancelling queued chapters (#8528) 
Tachi removes the downloaded chapter (if it exists) when you just cancelled a download from queue.

PR fixes that

Also removes redundant return

(cherry picked from commit ba2a528886c6ae29d0f46070df736497921346e3)
 2022-11-24 15:21:55 -05:00
Jobobby04
fdb17e2f74 Minor cleanup 2022-11-24 15:18:34 -05:00
Jobobby04
e0ad9f78ac Improve SY specific change declarations 2022-11-24 15:16:58 -05:00
Jobobby04
9dc233cbbd Fix scanlator filter 2022-11-17 20:04:13 -05:00
arkon
2bbb374e40 Set source properly when creating manga entries 
Fixes #8333

(cherry picked from commit cac80daa714a8dc3906954b514cd6e3baa140aa1)

# Conflicts:
#	app/src/main/java/eu/kanade/tachiyomi/ui/browse/source/browse/BrowseSourcePresenter.kt
 2022-11-17 18:16:16 -05:00
Jobobby04
c8de918e46 Cherry pick fixes 2022-11-16 14:17:26 -05:00
arkon
1202c36a98 Retain previous selected state when updating list states 
Fixes #8417

(cherry picked from commit 10e349f76ee1f9bcde5e3502bcd45270d5cd496b)

# Conflicts:
#	app/src/main/java/eu/kanade/tachiyomi/ui/browse/source/SourcesPresenter.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/manga/MangaScreenModel.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/updates/UpdatesPresenter.kt
 2022-11-16 13:54:38 -05:00
arkon
22c828da76 Minor cleanup 
Mostly just addressing comments from #8452

(cherry picked from commit b1ccebf329e9a9d77894b9d4ff06aeb9d7317acf)
 2022-11-16 13:52:29 -05:00
Jobobby04
6a6d8c0657 Dedupe by priority 2022-11-16 13:08:07 -05:00
Jobobby04
eedfa44ec8 Only show the sources name if there are multiple sources 2022-11-15 11:22:29 -05:00