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

3228 Commits

Author SHA1 Message Date
Jobobby04
1acb7a1a35 Fixes for merged manga settings 2022-11-15 00:25:42 -05:00
Andreas
9870c23a5b Use Voyager on Extension Filter screen (#8503) 
- Use sealed class for state
- Minor changes

(cherry picked from commit 02708787483b6dee9d42e39c984ed8c4beaacb40)
 2022-11-11 19:27:51 -05:00
arkon
7578b4d6fc Migrate to more domain model usages 
(cherry picked from commit c6c4c1c393aa8f7fe702ce7da9d7d04e0ad9005b)

# Conflicts:
#	app/src/main/java/eu/kanade/tachiyomi/data/library/LibraryUpdateService.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/browse/migration/search/SearchPresenter.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/manga/MangaScreenModel.kt
 2022-11-11 14:36:15 -05:00
arkon
564cc5144f Minor cleanup 
(cherry picked from commit 811931ccc0f21b0fd88c56b8567358982c48c31e)

# Conflicts:
#	app/src/main/java/eu/kanade/tachiyomi/data/track/anilist/OAuth.kt
#	app/src/main/java/eu/kanade/tachiyomi/data/track/kitsu/OAuth.kt
 2022-11-11 14:27:32 -05:00
Ivan Iskandar
13db6c1a7a Voyager on More tab (#8498) 
(cherry picked from commit 340357d158762a0b01b09092688ef6bce784b1c0)

# Conflicts:
#	app/src/main/java/eu/kanade/tachiyomi/ui/more/MoreController.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/more/MorePresenter.kt
 2022-11-11 14:19:50 -05:00
arkon
2ba4135e38 Use toShareIntent in WebViewActivity 
(cherry picked from commit e45f6d0c92a5cbcd973b3f86b024fb090f701eb8)
 2022-11-11 13:55:13 -05:00
Ivan Iskandar
7b1bc790b3 Full Compose MangaController (#8452) 
* Full Compose MangaController

* unique key

* Use StateScreenModel

* dismiss

* rebase fix

* toShareIntent

(cherry picked from commit 18ccde082d5529766ad1297f9850752508805156)

# Conflicts:
#	app/src/main/java/eu/kanade/tachiyomi/ui/manga/MangaController.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/manga/MangaScreenModel.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/manga/chapter/ChaptersSettingsSheet.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/manga/track/TrackAdapter.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/manga/track/TrackHolder.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/manga/track/TrackSearchAdapter.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/manga/track/TrackSearchDialog.kt
#	app/src/main/res/layout/track_chapters_dialog.xml
#	app/src/main/res/layout/track_controller.xml
#	app/src/main/res/layout/track_item.xml
#	app/src/main/res/layout/track_score_dialog.xml
#	app/src/main/res/layout/track_search_dialog.xml
#	app/src/main/res/layout/track_search_item.xml
 2022-11-11 13:55:01 -05:00
Ivan Iskandar
5b88385ccc Voyager on History tab (#8481) 
(cherry picked from commit bc3bb82651e85a8b0584a645e0fa07ab97ab1767)
 2022-11-11 11:07:53 -05:00
d-najd
1903453ce7 Add "Play" button on manga in library (#8218) 
* resume manga button in libarary

* work on resume button

* Backup

* work on opening the last read chapter

* backup

* renaming

* fab instead of image

* done with logic

* cleanup

* cleanup

* import cleanup

* cleanup...

* refactoring

* fixing logic

* fixing scopes

* Reworking design

* adding ability to turn on/off the feature

* cleanup

* refactoring, fixing logic, adding filter logic (partial)

* backup

* backup

* logic done

* backup before merge fix

* merge conflict....

* merge conflict...

* reworking ui logic

* removing unnecessary file

* refactoring

* refactoring

* review changes + minor parameter position movement

* commiting suggestion

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

* fixing minor mistake

* moving ChapterFilter.kt

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

# Conflicts:
#	app/src/main/java/eu/kanade/presentation/components/CommonMangaItem.kt
#	app/src/main/java/eu/kanade/presentation/library/LibraryScreen.kt
#	app/src/main/java/eu/kanade/presentation/library/components/LibraryComfortableGrid.kt
#	app/src/main/java/eu/kanade/presentation/library/components/LibraryCompactGrid.kt
#	app/src/main/java/eu/kanade/presentation/library/components/LibraryContent.kt
#	app/src/main/java/eu/kanade/presentation/library/components/LibraryPager.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-11-11 11:07:42 -05:00
Jobobby04
206aab6755 Use Voyager on Biometric Times screen 2022-11-11 00:11:35 -05:00
Jobobby04
fd99a5f502 Use Voyager on Sort Tags screen 2022-11-10 23:48:03 -05:00
Jobobby04
4a1a1301ff Use Voyager on Repo screen 2022-11-10 23:33:17 -05:00
Jobobby04
02954670d4 Use Voyager on Source Category screen 2022-11-10 23:17:20 -05:00
Andreas
0d638b1c1e Use Voyager on Category screen (#8472) 
(cherry picked from commit bf9edda04c8cf8e5988e6eb49ffffdbf54826b3a)

# Conflicts:
#	app/src/main/java/eu/kanade/presentation/category/CategoryScreen.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/category/CategoryPresenter.kt
 2022-11-10 23:16:39 -05:00
arkon
771ec24d28 Get index of selected update list item based on chapterId 
Fixes #8442

(cherry picked from commit 54471a014fa152e41dad92b0a192bde90d8baded)
 2022-11-10 22:49:50 -05:00
arkon
d3f4f63f52 Adjust read next history logic 
Closes #8454

(cherry picked from commit 8749be518f8fb7f278f35f110df6c1d5b4b2508e)

# Conflicts:
#	app/src/main/java/eu/kanade/domain/DomainModule.kt
#	app/src/main/java/eu/kanade/domain/history/interactor/GetNextUnreadChapters.kt
#	app/src/main/java/eu/kanade/domain/history/interactor/RemoveHistory.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryPresenter.kt
 2022-11-10 22:37:36 -05:00
Luqman
9492ddd337 Add back haptic feedback long tap to fav (#8418) 
* Add back haptic feedback long tap to fav

- add back haptic when long tap on manga to add to library

* simplify

* Revert "simplify"

This reverts commit f4bd57315a3dbf35f5975233980304fa66807718.

* Revert "Add back haptic feedback long tap to fav"

This reverts commit 81486e30e9adf6a7e983b5e3f12bd5bc34083db1.

* cleanup

(cherry picked from commit 34aa4eb291747ccb268c28f5060481706d6c4915)

# Conflicts:
#	app/src/main/java/eu/kanade/tachiyomi/ui/browse/source/browse/BrowseSourceController.kt
 2022-11-10 22:16:39 -05:00
arkon
4e37fbca17 Toggle enabled source in bulk 
Maybe fixes #8439

(cherry picked from commit 280b0f42db2cc8c21ac046b11717cac6975746ca)
 2022-11-10 22:15:54 -05:00
Jobobby04
e2916941d6 Don't try to migrate the manga if its the same id 2022-11-10 20:22:03 -05:00
Jobobby04
c96efe1819 Page preview jump to page in Reader 2022-11-08 23:20:38 -05:00
Jobobby04
d5ee2905ee Fix E-Hentai getNextChapter 2022-11-08 23:20:37 -05:00
Jobobby04
8facc5346f Cleanup grouping code 2022-11-02 21:01:43 -04:00
Jobobby04
e943b4ed09 Fix sorting and filtering for grouping library 2022-11-02 20:43:31 -04:00
AntsyLich
0535c98b37 Fix resetting filter resets browse pager (#8394) 
Fix resetinf filter resets browse pager

(cherry picked from commit afcf4b298863ae0537c8b32420bf75670be94dd2)
 2022-11-01 13:37:29 -04:00
arkon
bd94751e73 Fix crash in ReaderReadingModeSettings when reverse portrait orientation is set 
(cherry picked from commit 642b392d44328f09783d34769d4d2f3596156da3)
 2022-11-01 13:36:38 -04:00
arkon
b2565c7f8b Clean up library download chapters logic 
We can probably clean up the same logic in the manga controller at some point too, but that stuff's messy.
Also fixes the spacing issue that the new icon introduced.

(cherry picked from commit 33e90d64497f920be825b803e1342a2e6c937111)

# Conflicts:
#	app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryPresenter.kt
 2022-11-01 13:36:11 -04:00
Jobobby04
35bd6233d9 Cherry pick fix 2022-11-01 12:46:46 -04:00
Swords
dd08da26e8 Add different download options within the Library (#8267) 
* feat: add download options to library

* feat: use max instead of min

* feat: remove download all option

* feat: applied requested changes + rename some functions

* feat: merge downloadAllUnreadChapters and downloadUnreadChapters into one function

* Apply suggestions from code review

Co-authored-by: AntsyLich <59261191+AntsyLich@users.noreply.github.com>

* feat: apply lint suggestions + fix code

feat: apply lint suggestions + fix code

* feat: revert onClickDownload back to onDownloadClicked

Co-authored-by: AntsyLich <59261191+AntsyLich@users.noreply.github.com>
(cherry picked from commit 50b17d5d3416e5c44a4a98f93e9710769e74aa51)

# Conflicts:
#	app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryPresenter.kt
 2022-11-01 12:46:33 -04:00
arkon
ebfc0f89ed Fix some crashes 
- Delay the initial emission of updates/sources/extensions lists instead of using a state flow. This hopefully avoids rapid initial recompositions that cause the LazyColumn key duplication crashes. (Closes #8371)
- Fix a NPE in BrowseSourcePresenter

(cherry picked from commit 5d1f79012e63403ac37309dd958244108e28a1a5)

# Conflicts:
#	app/src/main/java/eu/kanade/tachiyomi/ui/browse/source/SourcesPresenter.kt
 2022-11-01 12:33:30 -04:00
arkon
b4ede754b9 Clean up download ahead logic 
- Remove redundant chapter sorting logic when fetching next chapter(s)
- Remove redundant download queue checks (it'll handle already queued or downloaded items)
- Trigger download ahead when read >= 25% of chapter rather than 20%
- Rely on download cache when checking if next chapter is downloaded to avoid jank (fixes #8328)

(cherry picked from commit fc184f1cfa929328c41b0ec374503afe204d6c15)

# Conflicts:
#	app/src/main/java/eu/kanade/tachiyomi/data/library/LibraryUpdateService.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/reader/ReaderPresenter.kt
 2022-11-01 12:32:13 -04:00
arkon
f9b49aa7f6 Add warning about F-Droid build support in More screen 
(cherry picked from commit 725fcbba0e45488c8553f2a5a88fbdfb2a63982c)

# Conflicts:
#	app/src/main/java/eu/kanade/presentation/browse/ExtensionDetailsScreen.kt
#	app/src/main/java/eu/kanade/tachiyomi/data/updater/AppUpdateChecker.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/more/MoreController.kt
 2022-11-01 12:24:45 -04:00
stevenyomi
e8e7ff55c0 Refactor search toolbar and fix browse source (#8360) 
(cherry picked from commit a078f1ab1bd288d604edd8b8a21dcf2e88f47065)

# Conflicts:
#	app/src/main/java/eu/kanade/presentation/browse/components/BrowseSourceToolbar.kt
 2022-11-01 12:17:26 -04:00
arkon
3be06eacaa Remove redundant preference composables 
(cherry picked from commit dd1923fe88bbb1e7f838d560806598a4ba2174f8)

# Conflicts:
#	app/src/main/java/eu/kanade/presentation/components/Preferences.kt
 2022-11-01 12:00:14 -04:00
arkon
81d9ac81ce Refactor overflow menus into a composable 
(cherry picked from commit df773ee15c814e03267fdfcd81d4e12d38a3508b)

# Conflicts:
#	app/src/main/java/eu/kanade/presentation/library/components/LibraryToolbar.kt
#	app/src/main/java/eu/kanade/presentation/manga/components/MangaToolbar.kt
 2022-11-01 11:43:19 -04:00
zbue
621e9dbc41 Add ability to open random manga (#8232) 
* Add ability to open random manga

* Use `getMangaForCategory` instead

* Put it in overflow menu instead of using EFAB

* Partial review changes

* Merge remote-tracking branch 'refs/remotes/origin/patch-6' into patch-6

# Conflicts:
#	app/src/main/java/eu/kanade/presentation/library/LibraryScreen.kt

* Merge remote-tracking branch 'refs/remotes/origin/patch-6' into patch-6

# Conflicts:
#	app/src/main/java/eu/kanade/presentation/library/LibraryScreen.kt

* Wording changes

(cherry picked from commit f5451a68812f56d9427a9b771f6bed00f8fbd7e6)

# Conflicts:
#	app/src/main/java/eu/kanade/presentation/library/LibraryScreen.kt
#	app/src/main/java/eu/kanade/presentation/library/components/LibraryToolbar.kt
 2022-11-01 11:38:53 -04:00
arkon
b941c34c3f Use remember var delegates in more places 
(cherry picked from commit 0849111247d28fa5a74abe6759c992097bfa7109)

# Conflicts:
#	app/src/main/java/eu/kanade/presentation/category/components/CategoryDialogs.kt
#	app/src/main/java/eu/kanade/presentation/manga/components/MangaToolbar.kt
 2022-11-01 11:20:34 -04:00
stevenyomi
b2c4fc0ec5 Clean up strings and icons (#8326) 
* Clean up strings and icons

* fix incorrect usages of label_more

* restore strings and reduce usage of android.R

* removing icon desc of FABs anyway as app's not for visual impaired users

(cherry picked from commit 4b60138d41ea33e5e4c3defb0dc626b599216f3f)

# Conflicts:
#	app/src/main/java/eu/kanade/presentation/browse/BrowseSourceScreen.kt
#	app/src/main/java/eu/kanade/presentation/browse/ExtensionsScreen.kt
#	app/src/main/java/eu/kanade/presentation/components/MangaBottomActionMenu.kt
#	app/src/main/java/eu/kanade/presentation/manga/components/MangaInfoHeader.kt
 2022-10-29 18:57:56 -04:00
arkon
f3a2b1d7e4 Sort library items alphabetically in secondary pass 
Fixes #7461

(cherry picked from commit 224f29077d37ca72c5a9f01649998c80d7bafedd)
 2022-10-29 18:45:49 -04:00
arkon
ef1242d067 Consider downloaded only mode when getting download counts in library 
Fixes #8318

(cherry picked from commit ad107860b91d5b91f3e127904a0bd81c957f87c4)

# Conflicts:
#	app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryPresenter.kt
 2022-10-29 18:26:25 -04:00
arkon
38abaa162e Fix some crashes 
(cherry picked from commit 5efb31bd7105975ef531aaebbb70e3f409378663)

# Conflicts:
#	app/src/main/java/eu/kanade/presentation/browse/BrowseSourceScreen.kt
#	app/src/main/java/eu/kanade/presentation/browse/components/BrowseSourceToolbar.kt
 2022-10-29 18:25:50 -04:00
arkon
55a07ae51a Fix library download counts not being loaded if downloaded filter is in exclusion state 
(cherry picked from commit e4a2f35907a8f0eefcbd30b6a9bde258dfd89111)

# Conflicts:
#	app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryPresenter.kt
 2022-10-29 18:24:56 -04:00
Jobobby04
9d84481770 Cherry pick fixes 2022-10-29 18:03:25 -04:00
AntsyLich
37207ed58b Cleanup Library presenter (#8284) 
* yeet observable + minor cleanup

* move [getTracksFlow] to domain

* Lint

* Review changes

Co-Authored-By: Andreas <6576096+ghostbear@users.noreply.github.com>

* Review Changes 2

* Stuff

* Rename + Rebase

* Lint

Co-authored-by: Andreas <6576096+ghostbear@users.noreply.github.com>
(cherry picked from commit e36d31bf0fff9652652319fa8b4fc700edc1442a)

# Conflicts:
#	app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryController.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryPresenter.kt
 2022-10-29 18:03:08 -04:00
d-najd
0d7cff1f43 WebView for chapter link (#8281) 
* backup

* doing logic

* cleanup

* applying suggestion

Co-authored-by: AntsyLich <59261191+AntsyLich@users.noreply.github.com>

* requested changes

Co-authored-by: AntsyLich <59261191+AntsyLich@users.noreply.github.com>
(cherry picked from commit 37b7efbc87c45c421974394ee36f86f5cd6e0492)

# Conflicts:
#	app/src/main/java/eu/kanade/tachiyomi/ui/reader/ReaderActivity.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/reader/ReaderPresenter.kt
 2022-10-29 17:31:25 -04:00
arkon
2217eb9d35 Alternate method of avoiding LazyColumn key conflict crashes 
Co-authored-by: ivaniskandar <ivaniskandar@users.noreply.github.com>
(cherry picked from commit c50b1a5c66256ab003a224d50caa317c53479397)

# Conflicts:
#	app/src/main/java/eu/kanade/tachiyomi/ui/browse/source/SourcesPresenter.kt
 2022-10-29 17:26:42 -04:00
arkon
f549730c8f Remove side nav icon alignment preference 
Simplifying it to just always be centered, which is what most Google apps seem to be doing anyway.

(cherry picked from commit ccc4144f3cc2264c3ae75d492983e9577f352af1)

# Conflicts:
#	app/src/main/java/eu/kanade/tachiyomi/ui/main/MainActivity.kt
 2022-10-29 17:24:26 -04:00
arkon
b5ae4c0d43 Refactor network to local manga logic 
Maybe fixes #8289

(cherry picked from commit d5b4bb49b168adc5b7c3934e530571497c85a916)

# Conflicts:
#	app/src/main/java/eu/kanade/tachiyomi/ui/browse/migration/search/SearchPresenter.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/browse/source/browse/BrowseSourcePresenter.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/browse/source/globalsearch/GlobalSearchPresenter.kt
 2022-10-29 17:22:24 -04:00
AntsyLich
c48dd63019 Rework library selection (#8290) 
(cherry picked from commit 2cbe946e7e9eae14c035001c9e4eb970ede229a4)
 2022-10-26 23:37:39 -04:00
Ivan Iskandar
20ea3d5eac MangaPresenter: Filter unsupported track service from available service list (#8286) 
(cherry picked from commit 82b552ac9a4a8764f8ccf1d75c628310c020440d)
 2022-10-26 23:35:37 -04:00
arkon
8231aa45d7 Fetch download counts if library is filtered by downloaded 
Fixes #8277

(cherry picked from commit 9792a6cb780d0db3a962fdf2e60ef028b3ceb07f)

# Conflicts:
#	app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryPresenter.kt
 2022-10-23 12:52:58 -04:00