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

1991 Commits

Author SHA1 Message Date
arkon
9a3faad499 Fix unreadable sheet tab text in light blue theme 
(cherry picked from commit 9f2fe33ce0080f24f642a823119b0d842e63307a)
 2021-02-04 17:13:11 -05:00
arkon
08bf113dcb Minor cleanup 
(cherry picked from commit d5cfbef42bde2a785b9c3033dc2a769ac1a7c37f)

# Conflicts:
#	app/src/main/java/eu/kanade/tachiyomi/ui/manga/MangaPresenter.kt
 2021-01-31 19:38:27 -05:00
Andreas
369e075ed9 Move tracking to a bottom sheet (#4364) 
* Move tracking to a bottom sheet

* Give methods better names and remove unnecessary annotation

(cherry picked from commit 535abcbb8b2197faef77a6b0ba56aa4309067d4c)

# Conflicts:
#	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/track/TrackController.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/manga/track/TrackPresenter.kt
 2021-01-31 19:36:22 -05:00
Jobobby04
7bb4191d41 Maybe fix merge chapter downloads 2021-01-31 18:33:56 -05:00
Unlocked
8539d5b4db Add manga count to the library header (#3884) 
* Add manga count to the library header

* Make showing the number of manga configurable

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

# Conflicts:
#	app/src/main/java/eu/kanade/tachiyomi/data/preference/PreferenceKeys.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryController.kt
 2021-01-31 18:33:22 -05:00
Taco
f8763c71ff Regenerate drawables (#4352) 
(cherry picked from commit 9bf452856cb40c7d1475eb2c7471c17d7861bac3)
 2021-01-31 18:32:13 -05:00
arkon
4cbb2ae082 Apply bottom sheet dialog with restriction consistently 
(cherry picked from commit 7eef4f7fbf271ba05450551141929cb8142147ff)

# Conflicts:
#	app/src/main/java/eu/kanade/tachiyomi/ui/browse/source/browse/SourceFilterSheet.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/manga/chapter/ChaptersSettingsSheet.kt
 2021-01-28 14:19:04 -05:00
Andreas
9cb600e9d6 Unify history and update item (#4361) 
* Unify history and update item

* Use card_radius

(cherry picked from commit 0a10f6605324684afcf4d6bc13a765709dec2d94)
 2021-01-28 13:41:01 -05:00
Jobobby04
dbadec2c67 Revert "Fix reader bug with new suspend getFlatMetadata" 
This reverts commit 96031869271b3c5ed43d3c7d227dcdcd584d9618.
 2021-01-26 23:36:40 -05:00
Jobobby04
dc6aa11bc7 Revert "Run more db queries inside the IO pool, convert some RxJava references to Coroutines" 
This reverts commit 18f02a85ac3b21b5ce91b81a6a6b97c7585d7088.

# Conflicts:
#	app/src/main/java/eu/kanade/tachiyomi/ui/setting/SettingsEhController.kt
 2021-01-26 23:36:03 -05:00
Jobobby04
9603186927 Fix reader bug with new suspend getFlatMetadata 2021-01-26 20:31:04 -05:00
Taco
ec1fe205ad Update Okio, use more KTX stuff (#4353) 
* Update Okio to 2.10.0

* Use some more KTX extensions

(cherry picked from commit 5f7e34b6a1cbda755db6f943a87da16cfc51e6e4)

# Conflicts:
#	app/src/main/java/eu/kanade/tachiyomi/data/database/mappers/CategoryTypeMapping.kt
#	app/src/main/java/eu/kanade/tachiyomi/data/database/mappers/MangaTypeMapping.kt
#	app/src/main/java/eu/kanade/tachiyomi/data/database/resolvers/MangaFavoritePutResolver.kt
 2021-01-26 16:11:02 -05:00
arkon
deaefe8fa6 Refactor tracker name strings 
(cherry picked from commit 0a54901eb020609683cf8c7813e3afff82551630)

# Conflicts:
#	app/src/main/java/eu/kanade/tachiyomi/ui/library/LibrarySettingsSheet.kt
 2021-01-26 15:48:36 -05:00
Jobobby04
fbc041846b Fix track filter for Mangadex unfollowed 2021-01-26 15:26:35 -05:00
Andreas
a2aad23eae Extend track filter (#4344) 
* Allow to filter for each tracker logged in

* Simplify filter logic

* Use variable names instead of it

and rename variables

* Change how trackFilters and items are setup

* Use variable name instead of it and try cleanup filterFnTracking

* Changes from feedback

(cherry picked from commit fea2e0a26557051a375af236086203507230d78d)

# Conflicts:
#	app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryPresenter.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/library/LibrarySettingsSheet.kt
 2021-01-26 15:26:16 -05:00
arkon
9320221a4e Minor cleanup 
(cherry picked from commit a93c0577acdf9fdc591087838ecb5a004d3acf81)

# Conflicts:
#	app/src/main/java/eu/kanade/tachiyomi/data/backup/AbstractBackupRestore.kt
#	app/src/main/java/eu/kanade/tachiyomi/util/lang/RxCoroutineBridge.kt
#	app/src/main/java/eu/kanade/tachiyomi/util/system/ContextExtensions.kt
 2021-01-26 14:19:29 -05:00
arkon
c376699c37 Reword download chapter number sorting options 
(cherry picked from commit e288bf902bf1ee9694edbc8b2c8e0bbd4d2ba602)
 2021-01-26 14:06:07 -05:00
Riztard Lanthorn
8bd5b75fd9 add sort by chapter number in download queue (#4337) 
* add sort by chapter number in download queue

* Bigest, smallest chapter download

* grouped

(cherry picked from commit a083e1f71ace454a1081e2a673175a5e4b58ba66)
 2021-01-26 14:05:59 -05:00
Riztard Lanthorn
355170b8ff add source name in download queue (#4338) 
(cherry picked from commit 628bd5d6b42cedc463f17e4208b1cdaf4ba7869d)
 2021-01-26 13:42:21 -05:00
arkon
cdd5f3b345 Surface tracking search errors properly 
(cherry picked from commit 16be469ecb9f2e87f9da38fc6f54930dc8daaf5c)
 2021-01-26 13:42:03 -05:00
Clarence Castillo
41607ab259 Fix multi-select phantom anchor bug in manga chapters and library (#4201) 
* Fix phantom anchor bug in manga chapters list when multi-selecting

* Fix phantom bug when long pressing selected items not at top of stack

* Fix phantom anchor bug in library page

(cherry picked from commit 496a476c13396f3063388e0d7e8f5ab2c3663858)

# Conflicts:
#	app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryCategoryView.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/manga/MangaController.kt
 2021-01-26 13:40:43 -05:00
Jobobby04
b0981a00bd Fix Reder PR build errors 2021-01-26 13:37:31 -05:00
Jobobby04
295af5306b Handle delegated source id lists better using a LisenterMutableMap 
Better source id comparisons
 2021-01-26 13:31:22 -05:00
Jobobby04
cf1ce9e069 Search in the regular coroutine scope instead of a custom one 2021-01-26 13:31:21 -05:00
Jobobby04
18f02a85ac Run more db queries inside the IO pool, convert some RxJava references to Coroutines 2021-01-26 13:31:20 -05:00
Jobobby04
64eeab7c5e Use a Enum for genre color 2021-01-26 13:31:18 -05:00
Jobobby04
1e2f4fc35e Cleanup MigrationSource 2021-01-26 13:31:17 -05:00
Jobobby04
d63eae4444 Use bundleOf in merge settings dialog 2021-01-26 13:31:13 -05:00
Jobobby04
4552b9f849 Cleanup edit manga info dialog 2021-01-26 13:31:12 -05:00
Jobobby04
5c21f7ec30 Fix deprecated Parcelize annotation 2021-01-26 13:31:11 -05:00
jobobby04
2a211c68a9
Merge pull request #186 from CrepeTF/Reader_PR 
Reader PR + stuff
 2021-01-26 13:30:25 -05:00
CrepeTF
653ae10caf Reader PR 2021-01-26 13:11:42 -05:00
arkon
9ec67db8cb Use proper method to clear notification actions 
(cherry picked from commit cf7ec6aa7628b23ddbb22938f1b587e7bd613d74)
 2021-01-21 19:06:57 -05:00
arkon
4d6bd382e8 Add method for users to save error logs to a file 
(cherry picked from commit db2dd4b6c647dc01650b98472664a4e043f8f572)

# Conflicts:
#	app/src/main/java/eu/kanade/tachiyomi/data/notification/Notifications.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/setting/SettingsAdvancedController.kt
 2021-01-21 19:06:38 -05:00
Andreas
e0afe65096 Fix Kitsu toasting "Logged in" when there is an error (#4329) 
(cherry picked from commit 2a5102a4572f5250c60e2e97cc5ff41cb7d65e17)
 2021-01-21 18:48:51 -05:00
Andreas
2b8a0f2215 Hide tracking when no tracker is logged in and change filter logic (#4310) 
* Hide tracking when not logged in

* Change string name and value

(cherry picked from commit 1a5858e99ba98482a6470c7f70b2e4c43323940f)

# Conflicts:
#	app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryPresenter.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/library/LibrarySettingsSheet.kt
 2021-01-21 15:00:06 -05:00
Jobobby04
a17c4c151f Cleanup custom info, fix custom genre not saving if you dont edit it 2021-01-20 21:00:58 -05:00
Jobobby04
0a4fcb480d Small cleanup and optimizations, add a coroutine version of insertFlatMetadata 2021-01-20 21:00:23 -05:00
Jobobby04
e6d62dd1dc Support MDList unfollowed for tracking filter 2021-01-17 22:17:37 -05:00
Jobobby04
3b364c91f1 Do quite a bit of code cleanup 2021-01-17 22:17:15 -05:00
arkon
8db57aef6c Add shortcut to see commit history for official extensions 
(cherry picked from commit 4044427d931f1e973492583aa9ca673f5d36fcfa)
 2021-01-17 18:04:33 -05:00
arkon
25caba6905 More consistent injectLazy style 
(cherry picked from commit f667f85fa5857bee1f55217d28d1e751cbb8a66b)
 2021-01-17 18:04:25 -05:00
Andreas
c92c9fada5 Add filter for tracking (#4276) 
* Add filter for tracking or not

* Use .any

* Access database only when needed

(cherry picked from commit 5cddc0c3875fffa205bd7fbc7f881cc60871b5be)

# Conflicts:
#	app/src/main/java/eu/kanade/tachiyomi/data/preference/PreferenceKeys.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/library/LibrarySettingsSheet.kt
 2021-01-17 18:03:57 -05:00
arkon
7a893e3009 Revert removal of tracker start/end date 
(cherry picked from commit 0cd551d4fd94703aa49ede6db811fd07c712b2bc)
 2021-01-16 19:50:20 -05:00
arkon
70d5907cc8 Handle download cancelation from icon properly (fixes #4241) 
(cherry picked from commit f85194ec467ef661628861d33502db336b60da05)
 2021-01-16 19:50:12 -05:00
arkon
d5a912bda2 Fix display mode not updating in source view 
(cherry picked from commit 271489bdfd46f1053fb9f36e3d1377340489c1cf)
 2021-01-16 19:50:00 -05:00
Jobobby04
fe5058c94b Fix FAB when going to index controller to browse source controller 2021-01-15 22:06:30 -05:00
arkon
7b4311c7dc Show error when trying to download chapters from not installed source (closes #4283) 
(cherry picked from commit 9670863a418c39d2371e20b20557e7075961cb5e)

# Conflicts:
#	app/src/main/java/eu/kanade/tachiyomi/source/SourceManager.kt
 2021-01-10 19:38:10 -05:00
Jobobby04
a0ac2daad1 Deal with SY for the coroutine function changes 2021-01-10 19:36:24 -05:00
arkon
0edff11353 More coroutine tweaks 
(cherry picked from commit c9cf9cfff006bc8d87e1d7a7245e213d579bb6d9)

# Conflicts:
#	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/backup/AbstractBackupRestore.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/reader/ReaderPresenter.kt
#	app/src/main/java/eu/kanade/tachiyomi/util/lang/RxCoroutineBridge.kt
 2021-01-10 18:43:47 -05:00