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

3170 Commits

Author SHA1 Message Date
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
925ecb282c Handle failures when updating metadata in library updater 
(cherry picked from commit 17109ab7606724dee83981b7b8605fc2d22ef57c)

# Conflicts:
#	app/src/main/java/eu/kanade/tachiyomi/data/library/LibraryUpdateService.kt
 2021-01-31 18:31:53 -05:00
Jobobby04
284a456184 Handle failures in the library updater 2021-01-28 15:04:17 -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
arkon
4f50fcadeb Ignore failures when updating metadata as part of library update 
(cherry picked from commit 58860b51a211522e39a66dab1c9a3c3473824e64)

# Conflicts:
#	app/src/main/java/eu/kanade/tachiyomi/data/library/LibraryUpdateService.kt
 2021-01-28 13:40:25 -05:00
Jobobby04
1eb8ee502e Optimize imports 2021-01-26 23:47:44 -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
628eedf15a Remove duplicate raised search metadata code 2021-01-26 23:33:51 -05:00
Jobobby04
4a86f39a40 Handle blank NHentai Scanlator 2021-01-26 20:31:44 -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
9a70f25552 Update total number of chapters when refreshing MAL entries (fixes #4348) 
(cherry picked from commit 34cb24fe34be97d30c4278b9e6ae183a56649fcb)
 2021-01-26 15:51:27 -05:00
arkon
78fbef637c Parse correct object when finding existing MAL list item (fixes #4347) 
(cherry picked from commit 1490112135db59950741c0cf99f7cee1fdd00b81)
 2021-01-26 15:51:17 -05:00
arkon
26385c9225 Fix cancelling library updates not working 
(cherry picked from commit c4716a3f4c9ff9b53863d1f1267056c8f153c0c7)

# Conflicts:
#	app/src/main/java/eu/kanade/tachiyomi/data/library/LibraryUpdateService.kt
 2021-01-26 15:51:09 -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
6fdff1b03b Perform metadata update in global scope 
(cherry picked from commit e4dc35674d680b10df2f059a5a51b01f892f9861)
 2021-01-26 14:10:24 -05:00
arkon
bf7af0c099 Revert async metadata updates to fix lag when updating (fixes #4341) 
(cherry picked from commit 8a668ba7b9f0ae11612ab3202de40624f330abf2)
 2021-01-26 14:10:12 -05:00
arkon
87db322ec6 Remove some unused rx/coroutine bridge code 
(cherry picked from commit 660e13b70124cf5781d338ff48ce4926cda0f79e)
 2021-01-26 14:07:20 -05:00
arkon
55f3ade9e7 Extract user agent string from WebView 
(cherry picked from commit 0685382083c1f590b71ad9f0cceff888612ad1f5)

# Conflicts:
#	app/src/main/java/eu/kanade/tachiyomi/source/online/HttpSource.kt
 2021-01-26 14:07:11 -05:00
arkon
788ed6dcc9 Update trackers in parallel, update manga metadata asynchronously 
(cherry picked from commit 04a993c99788076c692acd904c3dd65720217916)
 2021-01-26 14:06:26 -05:00
arkon
dd3b8c7967 Minor dependency updates 
(cherry picked from commit 7cae3095c4261f37ad22dc12d3698e2fe79d1237)
 2021-01-26 14:06:17 -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
arkon
e3ee3159fc Remove usage of RxJava from LibraryUpdateService 
(cherry picked from commit 86b9d7e843c90c37f7e7374a20cbbcbf89caf10d)

# Conflicts:
#	app/src/main/java/eu/kanade/tachiyomi/data/library/LibraryUpdateService.kt
 2021-01-26 14:05:48 -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
9fe039ba3f Ignore error when cover is missing in Kitsu search results (fixes #4334) 
(cherry picked from commit 00285a782c85c21f593fcfe0c8a568ae856e1cc3)
 2021-01-26 13:42:12 -05:00
arkon
cdd5f3b345 Surface tracking search errors properly 
(cherry picked from commit 16be469ecb9f2e87f9da38fc6f54930dc8daaf5c)
 2021-01-26 13:42:03 -05:00
arkon
fc481e4fd4 Don't stop downloader after deleting downloads if it wasn't running (fixes #4309) 
(cherry picked from commit 7c7ff8165eeab862363d0be41dbeb9f86c0bd386)

# Conflicts:
#	app/src/main/java/eu/kanade/tachiyomi/data/download/DownloadManager.kt
 2021-01-26 13:41:33 -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
9235f0e5ed Fix similar manga notification channel name 2021-01-26 13:31:10 -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