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

566 Commits

Author SHA1 Message Date
Jobobby04
d6bbb69966 Fix saved searches not working in source feed 2022-09-11 23:52:04 -04:00
Jobobby04
97641e7692 Handle query search in source feed 2022-09-11 23:45:29 -04:00
Jobobby04
10d3df5b6c Handle back button when there is a search query in source feed 2022-09-11 23:42:28 -04:00
Jobobby04
01525c30f2 Add database subscriptions for feed and better thumbnail fetching 2022-09-11 22:19:26 -04:00
Jobobby04
8799f0c091 Syncronize networkToLocalManga because of data races 2022-09-11 21:13:30 -04:00
AntsyLich
81faf22562 Flatten available extensions with its source (#7956) 
* Flatten available extensions with it's source

We should also do something similar for installed extensions

Supersedes #7200

* Dedupe sources

(cherry picked from commit c51e83c048b9575b322690fdadddba0001690d4d)
 2022-09-11 19:49:32 -04:00
Jobobby04
3562816e89 SY linting 2022-09-11 19:43:45 -04:00
Jobobby04
b44afb6013 Minor cleanup 2022-09-10 14:17:54 -04:00
Jobobby04
fc44ffa5af PreMigrationController: Partial Compose Conversion 2022-09-10 13:25:25 -04:00
Jobobby04
d0518515e9 Control FAB with Compose in SourceFeed 2022-09-10 12:25:30 -04:00
nzoba
a0a76c99f7 Fix download ahead missing out 1 chapter (#7927) 
* Fix download ahead missing out 1 chapter

* Move toLong() function

* Add check whether the next chapter is queued

(cherry picked from commit 07d1b9f3bac5df3c469601b8d08ed024b5e607ec)

# Conflicts:
#	app/src/main/java/eu/kanade/data/manga/MangaRepositoryImpl.kt
#	app/src/main/java/eu/kanade/tachiyomi/data/backup/BackupManager.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/reader/ReaderPresenter.kt
 2022-09-10 11:22:36 -04:00
Andreas
138fc03d1b Fix Filter not being applied in Browse Source (#7945) 
(cherry picked from commit 6b2b21edfa63f01b956ec27386b0c729be2e6d18)

# Conflicts:
#	app/src/main/java/eu/kanade/tachiyomi/ui/browse/source/browse/BrowseSourcePresenter.kt
 2022-09-10 11:09:16 -04:00
Ivan Iskandar
25ad9c7fab Fix missing downloaded only/incognito banners in Browse Source (#7936) 
(cherry picked from commit 99270e370e1aba37c3ab5d8954363dd335ca0353)

# Conflicts:
#	app/src/main/java/eu/kanade/presentation/browse/BrowseSourceScreen.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
 2022-09-10 11:05:48 -04:00
Jobobby04
53df21d8db Make sure to cancel the migrations when closed 2022-09-07 21:20:09 -04:00
Jobobby04
96f24e0600 Rewrite migration, shove all logic into a presenter instead of the UI 2022-09-04 19:42:08 -04:00
arkon
0c1ac913cb Reimplement extensions search 
Not sure if I should abstract this out to per-tab though. Maybe when we need it...

(cherry picked from commit 21804bfc45b05c67fe6198cd0452cd67b05bc3e8)

# Conflicts:
#	app/src/main/java/eu/kanade/tachiyomi/ui/browse/BrowseController.kt
 2022-09-03 19:50:22 -04:00
arkon
da69f7876d Fix missing downloaded only/incognito banners in Browse 
(cherry picked from commit bbf5c86b4699703048fb95f4c7922a9c147e164d)

# Conflicts:
#	app/src/main/java/eu/kanade/tachiyomi/ui/browse/BrowseController.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/browse/BrowsePresenter.kt
 2022-09-03 19:45:38 -04:00
Andreas
99d5d8b91f Merge Latest and Browse into one screen (#7921) 
* Merge Latest and Browse into one

* Add back Latest button

* Change context to IO instead of launching a job

* Use loading screen when loading initial page

(cherry picked from commit cc6aef693e1a15f695ffa7eebd968004a6557010)

# Conflicts:
#	app/src/main/java/eu/kanade/data/source/SourceRepositoryImpl.kt
#	app/src/main/java/eu/kanade/presentation/browse/BrowseLatestScreen.kt
#	app/src/main/java/eu/kanade/presentation/browse/BrowseSourceScreen.kt
#	app/src/main/java/eu/kanade/presentation/browse/SourceSearchScreen.kt
#	app/src/main/java/eu/kanade/presentation/browse/SourcesScreen.kt
#	app/src/main/java/eu/kanade/presentation/browse/components/BrowseLatestToolbar.kt
#	app/src/main/java/eu/kanade/presentation/browse/components/BrowseSourceComfortableGrid.kt
#	app/src/main/java/eu/kanade/presentation/browse/components/BrowseSourceToolbar.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/browse/migration/search/SourceSearchController.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/browse/source/SourcesTab.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/browse/source/browse/BrowsePagingSource.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/latest/LatestUpdatesController.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/browse/source/latest/LatestUpdatesPresenter.kt
 2022-09-03 19:43:55 -04:00
AntsyLich
3fc05b03f5 Lessen the use of GlobalScope launchIO (#7916) 
* Lessen the use of GlobalScope `launchIO`

* Wrap some calls with `NonCancellable` context

(cherry picked from commit da95ecb6869314f35eb73c6d9245b4e0d127f22d)

# Conflicts:
#	app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryPresenter.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/manga/MangaPresenter.kt
 2022-09-03 18:41:58 -04:00
Andreas
e009398c0f Resolve review comments for BrowseSourceScreens (#7912) 
(cherry picked from commit 2f26982e346d65de82d0809d7262a17f737d9eb2)

# Conflicts:
#	app/src/main/java/eu/kanade/presentation/browse/BrowseLatestScreen.kt
#	app/src/main/java/eu/kanade/presentation/browse/BrowseSourceScreen.kt
#	app/src/main/java/eu/kanade/presentation/browse/SourceSearchScreen.kt
#	app/src/main/java/eu/kanade/presentation/browse/components/BrowseLatestToolbar.kt
#	app/src/main/java/eu/kanade/presentation/browse/components/BrowseSourceToolbar.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/browse/source/browse/BrowseSourceController.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/browse/source/latest/LatestUpdatesController.kt
 2022-09-03 18:27:33 -04:00
arkon
57b336b2b8 Maybe fix extensions list crash 
Also fix weird animation of last updated text in Updates

(cherry picked from commit 4c1da1bd1daa9ce51778546021de727c17ef65ba)
 2022-09-03 17:55:00 -04:00
arkon
9318b0d803 Minor cleanup 
(cherry picked from commit c39a1b7867976bddc85d3bfbffeeb717b8bf4501)

# Conflicts:
#	app/src/main/java/eu/kanade/tachiyomi/ui/browse/BrowseController.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/browse/migration/sources/MigrateSourcesTab.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/browse/source/SourcesTab.kt
 2022-09-03 17:53:12 -04:00
Andreas
16ea8aa3b7 Use Compose on BrowseSourceScreens (#7901) 
(cherry picked from commit d4b764fa317ddcb04b8fefb982cd6b9a6dfc1598)

# Conflicts:
#	app/src/main/java/eu/kanade/presentation/library/components/LibraryGridCover.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/Pager.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/browse/source/browse/SourceListHolder.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/browse/source/latest/LatestUpdatesController.kt
#	app/src/main/res/layout/source_comfortable_grid_item.xml
#	app/src/main/res/layout/source_compact_grid_item.xml
#	app/src/main/res/menu/source_browse.xml
 2022-09-03 17:41:24 -04:00
arkon
8c182df784 Initial conversion of browse tabs to full Compose 
TODO:
- Global search should launch a controller with the search textfield focused. This is pending a Compose rewrite of that screen.
- Better migrate sort UI
- Extensions search

(cherry picked from commit 92e83f702c775d5ab5a0b4248995308155150811)

# Conflicts:
#	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/presentation/library/components/LibraryTabs.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/browse/BrowseController.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/browse/migration/sources/MigrationSourcesController.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/browse/source/SourcesController.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/browse/source/SourcesPresenter.kt
 2022-08-31 18:55:00 -04:00
Jobobby04
9dad9a6551 Use FullComposeController for Source Feed 2022-08-31 17:01:10 -04:00
Jobobby04
a760198981 Convert Source Feed to Jetpack Compose 2022-08-31 16:21:26 -04:00
Jobobby04
493a1ab4a6 Convert Feed to Jetpack Compose 2022-08-31 15:20:29 -04:00
arkon
588d11c14f Convert settings main and search views to full Compose 
(cherry picked from commit f5c7aa1142eec366092722d6301af939f19ae970)

# Conflicts:
#	app/src/main/java/eu/kanade/presentation/library/components/LibraryToolbar.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/base/controller/ComposeController.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/setting/SettingsMainController.kt
 2022-08-29 19:01:59 -04:00
arkon
46b369036e Convert extension details to full Compose 
(cherry picked from commit 761635b572f4cffa0c4979df32635bba91c0b6cb)
 2022-08-29 18:50:22 -04:00
arkon
f5fd4526d3 Remove some usages of global scope 
(cherry picked from commit 8efb20439a3d06766f257227f68bf1b762f9c432)
 2022-08-29 18:48:52 -04:00
Andreas
65f6e14a46 Tweak flag classes for Library (#7829) 
* Tweak flag classes for Library

- Add interface for Flag and Mask
- Merge Sort Type and Direction into one class
- Use custom serializers for preferences
  - Mainly to not break the old

* Review changes

(cherry picked from commit 880407442c598d1b63db8be43f4848550dc17ff1)

# Conflicts:
#	app/build.gradle.kts
#	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/tachiyomi/data/preference/PreferencesHelper.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/SourceItem.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/library/setting/SortDirectionSetting.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/library/setting/SortModeSetting.kt
 2022-08-29 18:12:37 -04:00
stevenyomi
39e0d7f4e8 Remove 1.x source models (#7781) 
(cherry picked from commit e36e9d9d5c1b2a7b55f28f2bf0ef064880cbac8f)

# Conflicts:
#	app/src/main/java/eu/kanade/domain/manga/interactor/UpdateManga.kt
#	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/library/LibraryUpdateService.kt
#	app/src/main/java/eu/kanade/tachiyomi/source/LocalSource.kt
#	app/src/main/java/eu/kanade/tachiyomi/source/Source.kt
#	app/src/main/java/eu/kanade/tachiyomi/source/SourceManager.kt
#	app/src/main/java/eu/kanade/tachiyomi/source/model/SManga.kt
#	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-08-18 15:44:31 -04:00
arkon
2999190fad Address misc. build warnings 
(cherry picked from commit d6f1534ee8c95c7dc450f1cb86d378007e3bf53b)

# Conflicts:
#	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
 2022-08-13 14:50:03 -04:00
arkon
4e4e369188 Fix crash when setting cover errors (closes #7714) 
(cherry picked from commit e511f24979b0f40c545345ed151d3557644f79c6)

# Conflicts:
#	app/src/main/java/eu/kanade/tachiyomi/ui/browse/migration/search/SearchPresenter.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/reader/ReaderPresenter.kt
 2022-08-13 14:33:32 -04:00
arkon
b279c9115f Fix default category showing up in edit manga categories list 
Also remove some usages of runBlocking

(cherry picked from commit 3bc6b1e202f8344356720467c60da19239e22ebc)

# Conflicts:
#	app/src/main/java/eu/kanade/tachiyomi/ui/manga/MangaController.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/more/AboutController.kt
 2022-08-07 12:17:48 -04:00
arkon
c0db682476 Minor fixes 
- Fix categories modal showing when adding from source with no categories
- Use old categories icon in library bottom action menu

(cherry picked from commit 688cc64dffa8cdf1241d3b4e2467b5e8c8529800)

# Conflicts:
#	app/src/main/java/eu/kanade/presentation/components/MangaBottomActionMenu.kt
#	app/src/main/java/eu/kanade/tachiyomi/App.kt
 2022-08-06 18:25:28 -04:00
arkon
8b777e1e5a More backup/restore code cleanup 
(cherry picked from commit 9f0052eceb8bdbe9ca1ea18a2aac18a4718387bf)

# Conflicts:
#	app/src/main/java/eu/kanade/tachiyomi/data/backup/AbstractBackupManager.kt
#	app/src/main/java/eu/kanade/tachiyomi/data/backup/AbstractBackupRestore.kt
#	app/src/main/java/eu/kanade/tachiyomi/data/backup/BackupManager.kt
#	app/src/main/java/eu/kanade/tachiyomi/data/backup/BackupRestorer.kt
 2022-08-06 18:19:05 -04:00
Ivan Iskandar
4da028af6a ExtensionPresenter: Fix crash on first launch (#7685) 
* Revert "Use SharedFlow for available extensions to always emit the value (#7609)"

This reverts commit 73901f50c0aee1cb82695642af72ff6ac7bc232d.

* ExtensionPresenter: Explicitly set refreshing status

* Scope coroutines job to presenter

* cleanup

* fix toast

(cherry picked from commit b3426f37e7d36be653363338288f74e2ae252a78)

# Conflicts:
#	app/src/main/java/eu/kanade/tachiyomi/extension/ExtensionManager.kt
 2022-08-05 13:07:50 -04:00
Andreas
970e3e3880 Fix null pointer exception on Extension Detail screen (#7666) 
(cherry picked from commit 6c7b3d78118c9c01aa51fc3c663c5a12c8f986dd)
 2022-07-31 18:20:28 -04:00
MatchaSoba
b729b7f0aa Fix logic for searchWithGenre (#7559) 
(cherry picked from commit b563e85c3b744595272718f7e82e3272e2a7c57b)
 2022-07-30 12:40:15 -04:00
Andreas
9b19afb7b4 Merge GetExtensions and GetExtensionUpdates (#7646) 
(cherry picked from commit 7d74b174e024f2dee84debec1a9826b942e093e4)
 2022-07-29 19:40:58 -04:00
Ivan Iskandar
1e07cb0682 BrowseSourceController: Fix broken page after opening manga (#7608) 
Probably related to 788583e66f6ad355f65f5bd2db303faa85163c5c

(cherry picked from commit 1c8da5fa974b4cfd0fd762b0b1c2a07622ac7662)

# Conflicts:
#	app/src/main/java/eu/kanade/tachiyomi/ui/browse/source/browse/BrowseSourceController.kt
 2022-07-25 11:08:07 -04:00
Andreas
5888ca8e7a Fix crash in Extension Detail and set ready to true on Library screen (#7591) 
(cherry picked from commit 978489fadef98a05da6dbab49e6cb5b19cdb123d)
 2022-07-24 00:20:43 -04:00
arkon
bb11d056b5 Misc cleanup 
- Migrate sources filter screen to full compose
- Use standard "OK"/"Cancel" actions for delete category dialog
- Abstract some AppBar logic
- Remove some dead code
- Group related strings

(cherry picked from commit e2510c144ad3568caf81660d6ab1b4023202aad4)

# Conflicts:
#	app/src/main/java/eu/kanade/presentation/browse/SourcesFilterScreen.kt
#	app/src/main/java/eu/kanade/presentation/manga/MangaScreen.kt
 2022-07-19 13:01:04 -04:00
Jobobby04
cec181f444 Minor cleanup 2022-07-18 09:59:09 -04:00
arkon
37bb6b27ce Migrate more screens to full Compose 
(cherry picked from commit cbfe9c30bb2970ad911ce35cf1d14bc044225e30)

# Conflicts:
#	app/src/main/java/eu/kanade/tachiyomi/ui/browse/migration/manga/MigrationMangaController.kt
 2022-07-16 22:11:30 -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
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
arkon
bc208bac30 Replace some usages of RxJava 
(cherry picked from commit 788583e66f6ad355f65f5bd2db303faa85163c5c)

# Conflicts:
#	app/src/main/java/eu/kanade/tachiyomi/ui/browse/source/browse/BrowseSourcePresenter.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/browse/source/browse/Pager.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/manga/MangaPresenter.kt
 2022-07-11 11:45:19 -04:00
Jobobby04
2f78a3d681 Fix build on latest compile SDK 2022-07-11 11:31:29 -04:00