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

3157 Commits

Author SHA1 Message Date
AntsyLich
639eb50dbc Tweak library query (#8214) 
* Tweak library query

Co-Authored-By: Quang Kieu <kieuq@wit.edu>

* Update app/src/main/sqldelight/migrations/21.sqm

* Update app/src/main/java/eu/kanade/domain/library/model/LibraryManga.kt

* Update app/src/main/sqldelight/view/libraryView.sq

* Update app/src/main/java/eu/kanade/data/manga/MangaMapper.kt

* Update app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryPresenter.kt

* Update app/src/main/java/eu/kanade/data/manga/MangaMapper.kt

* Bump version

Co-authored-by: Quang Kieu <kieuq@wit.edu>
(cherry picked from commit d6cbff2837bdf0de679bdf1cc8b93dbf3eadb487)

# Conflicts:
#	app/build.gradle.kts
#	app/src/main/java/eu/kanade/data/manga/MangaMapper.kt
#	app/src/main/java/eu/kanade/data/manga/MangaRepositoryImpl.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryPresenter.kt
#	app/src/main/sqldelight/migrations/21.sqm
 2022-10-17 00:05:52 -04:00
arkon
2144221250 Remove dead code 
Mostly from settings rewrite, but some other things too.

(cherry picked from commit 69cdba71eb842865586309d8549de78480cdbe0e)

# Conflicts:
#	app/src/main/java/eu/kanade/presentation/more/settings/database/ClearDatabaseScreen.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/setting/SettingsAdvancedController.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/setting/SettingsAppearanceController.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/setting/SettingsBackupController.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/setting/SettingsBrowseController.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/setting/SettingsGeneralController.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/setting/SettingsLibraryController.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/setting/SettingsReaderController.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/setting/SettingsSecurityController.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/setting/database/ClearDatabasePresenter.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/setting/search/SettingsSearchHelper.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/setting/track/TrackLoginDialog.kt
#	app/src/main/java/eu/kanade/tachiyomi/widget/materialdialogs/MaterialAlertDialogBuilderExtensions.kt
#	app/src/main/java/eu/kanade/tachiyomi/widget/preference/IntListPreference.kt
#	app/src/main/java/eu/kanade/tachiyomi/widget/preference/LoginDialogPreference.kt
#	app/src/main/res/drawable/ic_done_green_24dp.xml
#	app/src/main/res/layout/pref_account_login.xml
#	app/src/main/res/layout/pref_library_columns.xml
 2022-10-16 22:58:07 -04:00
Ivan Iskandar
a2f6b90547 Settings: M3 and two pane ui (#8211) 
* Settings: M3 and two pane ui

* TrackingLoginDialog: Move close button

* Use small top bar

* Revert "Update voyager to v1.0.0-rc02"

This reverts commit 570fec6ea622a7deae44668f4d9c3317699de2aa.

https://github.com/adrielcafe/voyager/issues/62
(cherry picked from commit 5c5468f9af74be984d0d9cb79da804370ee0e775)

# Conflicts:
#	app/src/main/java/eu/kanade/presentation/manga/MangaScreen.kt
#	app/src/main/java/eu/kanade/presentation/more/settings/screen/SettingsMainScreen.kt
#	app/src/main/java/eu/kanade/presentation/more/settings/widget/TextPreferenceWidget.kt
 2022-10-16 22:39:58 -04:00
arkon
0b5b9cb5cc Control library badge visibility with props instead 
Fixes #8174

(cherry picked from commit 6635dd2990851d830e83a628b7e62091bd20cb43)

# Conflicts:
#	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/LibraryCoverOnlyGrid.kt
#	app/src/main/java/eu/kanade/presentation/library/components/LibraryGridCover.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryController.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryPresenter.kt
 2022-10-16 22:20:47 -04:00
Ivan Iskandar
57dcd16cb9 Full Compose settings (#8201) 
* Uses Voyager for navigation.
* Replaces every screen inside settings except category editor screen since it's
called from several places.

(cherry picked from commit 890f1a3c7b0f2ceefa86a77cb40c11567e2b5a46)

# Conflicts:
#	app/src/main/java/eu/kanade/tachiyomi/ui/more/MoreController.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/setting/SettingsMainController.kt
 2022-10-16 21:53:23 -04:00
Swords
1ac63787bd Add bookmark filter (#8198) 
* feat: add bookmark filter

* feat: add getBookmarkChaptersByMangaId query + interactor to be used for filtering

(cherry picked from commit 3fdcd636d75e3862e75779077faef3d70365bcf6)

# Conflicts:
#	app/src/main/java/eu/kanade/tachiyomi/ui/library/LibrarySettingsSheet.kt
 2022-10-15 12:11:24 -04:00
Jobobby04
80c53adf29 Fix open in webview issue 2022-10-15 12:09:38 -04:00
arkon
a82b86bec8 Minor cleanup 
(cherry picked from commit bc1fbfac9d3bd6a13b755acb5ac0a2ed702ba1a2)

# Conflicts:
#	app/src/main/java/eu/kanade/domain/chapter/interactor/SetReadStatus.kt
#	app/src/main/java/eu/kanade/domain/manga/repository/MangaRepository.kt
#	app/src/main/java/eu/kanade/presentation/library/LibraryScreen.kt
#	app/src/main/java/eu/kanade/tachiyomi/source/SourceExtensions.kt
 2022-10-15 12:09:35 -04:00
arkon
7da8484d81 Attempt to avoid duplicate update rows 
Related to #7713

(cherry picked from commit 7e92921f84905fefa46a9514c096593520c52076)

# Conflicts:
#	app/src/main/java/eu/kanade/tachiyomi/ui/recent/updates/UpdatesPresenter.kt
 2022-10-15 12:09:34 -04:00
d-najd
aef2dab957 Range selection in library (#8186) 
* logic and a bit of cleanup

* cleanup done

* grammar fix

* fixing format

* Auto stash before checking out "HEAD"

* Revert "Auto stash before checking out "HEAD""

This reverts commit 202374a36ff444b7da3fcdb2a9859ca71a7c046e.

* Update app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryPresenter.kt

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

* cleanup

Co-authored-by: arkon <arkon@users.noreply.github.com>
(cherry picked from commit e1adb89ff8ed1759fcab08ed70b596b41bf3c88c)
 2022-10-15 12:09:33 -04:00
Jobobby04
861481bf26 Fix some Feed add bugs 2022-10-15 12:09:27 -04:00
Ivan Iskandar
24593da484 EmptyScreen: Compose-ify and apply content padding (#8177) 
* Apply content padding to empty screen

except the empty screens in browse

* compose-ify EmptyScreen

* center face when action show

* fix padding

* apply content padding to browse tabs

* fix duplicate bottom insets

(cherry picked from commit 8500add09f475093e4e861f42508496e0f1fd68c)

# 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/library/LibraryScreen.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/browse/source/SourcesTab.kt
#	app/src/main/res/layout/common_view_empty.xml
 2022-10-15 12:09:26 -04:00
zbue
86b333384f RemoveMangaDialog: Show manga title in dialog message (#8163) 
(cherry picked from commit 737d0fb8f3d87ab7a9d5ff4319d629dbe5213b96)
 2022-10-15 12:09:22 -04:00
arkon
35758adb8e Clean up download state logic in MorePresenter 
(cherry picked from commit 3bfbd58402bcb24e1f24bb5c2d88389767cab2d9)

# Conflicts:
#	app/src/main/java/eu/kanade/tachiyomi/ui/more/MorePresenter.kt
 2022-10-15 12:09:20 -04:00
Jobobby04
2dadf37711 Fix browse reset button 2022-10-15 12:09:18 -04:00
Jobobby04
22abd02641 Fix multiple issues with saved searches 2022-10-15 12:09:17 -04:00
Basara-Hatake
7fd4f5ee97
remove dead delegatedsources (#701) 2022-10-15 12:08:26 -04:00
Jobobby04
39c82feb01 Fix mangadex group deeplink not only searching mangadex sources 2022-10-08 19:44:12 -04:00
d-najd
17bb5d1c4b Hiding the keyboard (#8160) 
* Hiding the keyboard (#8157)

* Cleanup

* Adding log

* cleanup

* moving code to ViewExtensions.kt

* TrackDialog keyboard fix?

* moving  code to ContextExtensions.kt

* MoreScreen: Remove title (#8158)

* MoreScreen: Remove title

Also removes the state banners as it's redundant

* Add back banners

* Allow manual selection of manga description instead of copying to clipboard

Closes #6548

Notably missing some "standard" options like "Select all" or "Share": https://issuetracker.google.com/issues/226648919

* Allow marking partially read chapters as unread

Closes #3777

* Tablet UI edge-to-edge tweaks (#8159)

* LibraryScreen: Tweak content padding application to draw under nav bar

* BrowseScreen: Tweak content padding application to draw under nav bar

Side note the tab content doesn't actually use its
scaffold (bottom) contentPadding so it's definitely will
be a headache in the future.

* Don't hardcode bottom nav padding

* removed unnecessary import

* refactoring code

* rewriting code

* cleanup?

* cleanup

Co-authored-by: Ivan Iskandar <12537387+ivaniskandar@users.noreply.github.com>
Co-authored-by: arkon <eugcheung94@gmail.com>
(cherry picked from commit 50f959e5f41fa5d4117e821fb82db761cfdcf33f)
 2022-10-08 19:44:12 -04:00
Andreas
84c463d648 Fix filter search not triggering when clicking genre from Manga details (#8156) 
(cherry picked from commit dcd5541e964b94f0dab9bb86fe207ec41b249296)

# Conflicts:
#	app/src/main/java/eu/kanade/presentation/browse/BrowseSourceScreen.kt
#	app/src/main/java/eu/kanade/presentation/browse/components/BrowseSourceToolbar.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/browse/source/browse/BrowseSourcePresenter.kt
 2022-10-08 18:33:28 -04:00
arkon
48b9135056 Reword some reader settings 
(cherry picked from commit caf9219d99c8f46a2c7371e7c4f0cfbba7f546d9)
 2022-10-08 18:03:57 -04:00
Alessandro Tedesco
b645bcb1b3 Fix sort by date in LibraryPresenter (#8137) (#8145) 
Co-authored-by: Alessandro Tedesco <alessandro.tedesco@zehus.it>
(cherry picked from commit b8fa326c21a3f05ae09e173038e5dc366395ab40)
 2022-10-08 17:35:34 -04:00
AntsyLich
41542517f7 Add methods to get manga and chapter url (#8114) 
* Add methods to get manga and chapter url

Some fork supports directly opening chapters with webview hence `getChapterUrl`

* Review Changes

* Add since to javadoc

(cherry picked from commit de23226591376e998e4ff1ff7b2d4c2a0a805b09)

# Conflicts:
#	app/src/main/java/eu/kanade/tachiyomi/ui/manga/MangaController.kt
 2022-10-01 19:16:27 -04:00
AntsyLich
71076bd56a Move LibraryManga to domain layer (#8126) 
(cherry picked from commit ea8383978b1783fd60d6057deb6c91cb5a85c505)

# Conflicts:
#	app/src/main/java/eu/kanade/data/manga/MangaMapper.kt
#	app/src/main/java/eu/kanade/presentation/library/LibraryState.kt
#	app/src/main/java/eu/kanade/tachiyomi/data/database/models/LibraryManga.kt
#	app/src/main/java/eu/kanade/tachiyomi/data/library/LibraryUpdateService.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryItem.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryPresenter.kt
 2022-10-01 19:14:58 -04:00
AntsyLich
37fd74f141 Reduce some usages of toDbManga (#8116) 
Co-Authored-By: stevenyomi <95685115+stevenyomi@users.noreply.github.com>

Co-authored-by: stevenyomi <95685115+stevenyomi@users.noreply.github.com>
(cherry picked from commit b04d1e5f50b1a3622e8bfde3ddced7e5a7cd8e2e)

# Conflicts:
#	app/src/main/java/eu/kanade/tachiyomi/ui/browse/source/browse/BrowseSourcePresenter.kt
 2022-10-01 18:39:11 -04:00
AntsyLich
c1df5adf2c Don't download completely read chapter if it was in queue (#8113) 
(cherry picked from commit 00f442b77ee6b04a486f842bdad83487efb349d5)
 2022-10-01 18:33:12 -04:00
Ivan Iskandar
1eb1763342 HistoryScreen: Remove paging (#8125) 
* HistoryScreen: Remove paging

Per my testing performance-wise there's virtually no
difference in loading time.

* cleanups

* add key and contentType

(cherry picked from commit 42b0e3e4389b78556ccf34b93edc7d454de5881e)
 2022-10-01 18:33:02 -04:00
Andreas
dbeb6c721a Tweak behavior on Browse screen (#8121) 
* Tweak behavior on Browse screen

- Fix system back popping controller
- Add behavior to system back to cancel search toolbar before clearing current search or popping controller

* Review changes

(cherry picked from commit 6ac17363ed68487b2262308ee9d671ad301f2754)

# Conflicts:
#	app/src/main/java/eu/kanade/tachiyomi/ui/browse/source/browse/BrowseSourceController.kt
 2022-10-01 18:30:01 -04:00
Ivan Iskandar
8e4f038e9a ExtensionScreen: Adjust item visual (#8120) 
* ExtensionScreen: Adjust item visual

* Move install status view and add progress indicator
* Add secondary item modifier to info texts
* Wrap info texts with FlowRow in case of unavailable space
* Remove language text in non-installed items

Extra content:
* Change the list key to be more consistent
* General cleanups

* typo

(cherry picked from commit 58c47c4c50936f061e65434f60af56a92a51dfb2)

# Conflicts:
#	app/src/main/java/eu/kanade/presentation/browse/ExtensionsScreen.kt
 2022-10-01 18:15:27 -04:00
AntsyLich
5002bafa22 Fix total item count in library app bar (#8117) 
(cherry picked from commit ef2c9460b5dc15bb9af6a430fa0a93765debcef4)
 2022-10-01 18:06:14 -04:00
AntsyLich
54dcb640bb Improve DelayedTrackerStore (#8109) 
* Improve DelayedTrackerStore

* Review changes

(cherry picked from commit ad84a8c3e9bd56025ab59beb5c024a7b7d6e2b35)
 2022-10-01 18:06:05 -04:00
Alessandro Jean
d8e0344624 Improve search toolbar UX a little bit (#8102) 
* Improve search toolbar UX a little.

* Fix wrong stringResource import.

* Revert `FocusRequester` change in favour of #8093.

(cherry picked from commit 5a37f2398a45949bb327a61210ab46d5207d09cb)
 2022-10-01 18:02:18 -04:00
Ivan Iskandar
ca36adca29 manga-refresh-state (#8090) 
(cherry picked from commit 98a4f6cccb85d39fb37c95aa99da71bb7abfd134)

# Conflicts:
#	app/src/main/java/eu/kanade/tachiyomi/ui/manga/MangaPresenter.kt
 2022-10-01 18:02:01 -04:00
Ivan Iskandar
1f444185da UpdatesScreen: Fix selection state after deleting download (#8100) 
(cherry picked from commit 633bd6eb462ee187fb3c1d6c3f8f025cb0f9eedc)
 2022-10-01 17:40:08 -04:00
Jobobby04
89b30bd8d8 Probably fix random source crashes 2022-09-26 14:00:15 -04:00
arkon
1e9dca95cb Fix date added when adding from browse source 
Fixes #8059

(cherry picked from commit ec272f6c4ee9731dac5f6639c02c07fedd523698)
 2022-09-25 21:13:01 -04:00
Ivan Iskandar
d5fcd3a67e BrowseSourceScreen: Adjust browse mode chips placement (#8076) 
The chips row is now scrollable too and filter fab is removed

(cherry picked from commit 0190c36d20a0ef070fad8a6ab55906c25390144c)

# Conflicts:
#	app/src/main/java/eu/kanade/presentation/browse/BrowseSourceScreen.kt
#	app/src/main/java/eu/kanade/presentation/browse/components/BrowseSourceComfortableGrid.kt
#	app/src/main/java/eu/kanade/presentation/browse/components/BrowseSourceToolbar.kt
 2022-09-25 21:11:29 -04:00
Jobobby04
3da5a2a20d Minor cleanup 2022-09-25 20:41:31 -04:00
Andreas
1f4bfc4764 Split the rest of the preferences in PreferencesHelper (#8074) 
* Split the reset of the preferences in PreferencesHelper

* Capitalize ThemeMode

(cherry picked from commit 29fa93e829ca7f9c3a28c58f3de146bc2bd15aad)

# Conflicts:
#	app/build.gradle.kts
#	app/src/main/java/eu/kanade/domain/manga/model/Manga.kt
#	app/src/main/java/eu/kanade/tachiyomi/App.kt
#	app/src/main/java/eu/kanade/tachiyomi/AppModule.kt
#	app/src/main/java/eu/kanade/tachiyomi/data/preference/PreferenceKeys.kt
#	app/src/main/java/eu/kanade/tachiyomi/data/preference/PreferenceValues.kt
#	app/src/main/java/eu/kanade/tachiyomi/data/preference/PreferencesHelper.kt
#	app/src/main/java/eu/kanade/tachiyomi/extension/api/ExtensionGithubApi.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/base/delegate/SecureActivityDelegate.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/source/SourcesPresenter.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
#	app/src/main/java/eu/kanade/tachiyomi/ui/setting/SettingsAdvancedController.kt
 2022-09-25 20:41:19 -04:00
Ivan Iskandar
0d0513cff7 GlobalSearchController: Auto focus search view when initial query is empty (#8073) 
(cherry picked from commit 0fabe4bd013a1980b0fa3e70306e851acd1b5bc3)
 2022-09-25 19:19:31 -04:00
Ivan Iskandar
fc8b15916a DownloadController: Fix first active download status not updating (#8069) 
(cherry picked from commit f98b4f4e39514a48aab34ef4afee675bbd5bd6ac)
 2022-09-24 23:26:20 -04:00
Ivan Iskandar
1fe34a35d7 SecureActivityDelegate: Fix cold-start only lock behavior (#8066) 
(cherry picked from commit 467ceacb17770399fd1f276aebe887bafb516f49)
 2022-09-24 23:25:14 -04:00
Andreas
02a154bb85 Move chapter preferences from PreferencesHelper to LibraryPrefrences (#8061) 
(cherry picked from commit b5dca2eb09c008563e6e977fb3379fb7548d1144)

# Conflicts:
#	app/build.gradle.kts
#	app/src/main/java/eu/kanade/domain/library/service/LibraryPreferences.kt
#	app/src/main/java/eu/kanade/tachiyomi/data/preference/PreferencesHelper.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryPresenter.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/manga/MangaPresenter.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/setting/SettingsAdvancedController.kt
 2022-09-24 23:24:28 -04:00
Andreas
1d9237d3ee Clear search query before popping controller when navigating up (#8055) 
(cherry picked from commit d3520419d49f4c283b96de23fa12ac68b3f2db60)
 2022-09-24 23:14:06 -04:00
Andreas
e5b99c0147 Recreate reader settings when opening sheet (#8054) 
(cherry picked from commit acb8ab15b2e73ba2f161eb201e93ba3a36df2867)
 2022-09-24 23:13:59 -04:00
Andreas
34735166ec Split backup preferences from PreferencesHelper (#8051) 
(cherry picked from commit 5cdcc1679f2eb8a79586bf407d4d2f6fc60c2c49)

# Conflicts:
#	app/src/main/java/eu/kanade/tachiyomi/AppModule.kt
#	app/src/main/java/eu/kanade/tachiyomi/data/backup/BackupManager.kt
 2022-09-22 12:58:54 -04:00
arkon
7f29d6fc74 Minor cleanup 
Also add POST_NOTIFICATIONS permissions to make Android Studio stop complaining about it.

(cherry picked from commit b37b3767f3c55a74bede78d11300249ab419a4c7)
 2022-09-22 12:48:23 -04:00
Andreas
416db76218 Split download preferences from PreferencesHelper (#8048) 
(cherry picked from commit e82963c9ef15416f6bf818c4043cf802c3033105)

# Conflicts:
#	app/src/main/java/eu/kanade/domain/chapter/interactor/SetReadStatus.kt
#	app/src/main/java/eu/kanade/tachiyomi/AppModule.kt
#	app/src/main/java/eu/kanade/tachiyomi/data/download/Downloader.kt
#	app/src/main/java/eu/kanade/tachiyomi/data/library/LibraryUpdateService.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/manga/MangaPresenter.kt
 2022-09-22 12:47:25 -04:00
happywillow0
02fe0df8f6 Update BrowseSourcePresenter.kt (#8040) 
Set filters to default when reset is pressed.

(cherry picked from commit ec34977a64ae21c5dfe5533064882554ba964d44)
 2022-09-22 12:36:22 -04:00
Jobobby04
8fb2faca12 Don't uselessly override the search in SearchController 2022-09-22 12:36:02 -04:00