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

584 Commits

Author SHA1 Message Date
arkon
2220b6a91d Follow chapter sort setting for start/resume FAB (closes #1716) 
(cherry picked from commit f7cc36f2f00ff8bcc690a0e5e94b1464f014e3b6)

# Conflicts:
#	app/src/main/java/eu/kanade/tachiyomi/ui/manga/MangaPresenter.kt
 2021-04-19 14:14:59 -04:00
arkon
08f0e515d5 Use DSL for creating chapter description spanned string 
(cherry picked from commit 6dbc0a6fd50f0b97a0798792d482aa6657a7ea11)

# Conflicts:
#	app/src/main/java/eu/kanade/tachiyomi/ui/manga/chapter/ChapterHolder.kt
 2021-04-19 14:06:51 -04:00
arkon
28b4281683 Follow chapter sort setting when downloading next n chapters (closes #4725) 
(cherry picked from commit fba3f9d501da586425b1fdce7db78ceaa6a644f7)

# Conflicts:
#	app/src/main/java/eu/kanade/tachiyomi/ui/manga/MangaController.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/manga/MangaPresenter.kt
 2021-04-19 14:05:12 -04:00
arkon
bc28e2d617 Adjust ActionToolbar positioning 
(cherry picked from commit 1f8c5b0120177ecd160110026ab2e018e20dd0c1)

# Conflicts:
#	app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryController.kt
 2021-04-19 14:00:10 -04:00
arkon
de0c55117d Minor cleanup 
(cherry picked from commit c7f839ea4ae164cedb632946767fb0909b841c01)

# Conflicts:
#	app/src/main/java/eu/kanade/tachiyomi/ui/more/MoreController.kt
 2021-04-19 13:59:33 -04:00
Jobobby04
b8e907cea2 Block merged manga from being able to be migrated 2021-04-15 15:28:28 -04:00
Jobobby04
0483097fc3 Cleanup 2021-04-13 18:53:10 -04:00
arkon
c5df8725de Fix ActionToolbar bottom offset 
(cherry picked from commit 155a4dd463b53e187d54f20d5cbdb4173c77a96a)

# Conflicts:
#	app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryController.kt
 2021-04-12 15:03:40 -04:00
Jobobby04
2602c49756 Hide dedupe by priority 2021-04-12 14:45:13 -04:00
Jobobby04
5a909f48b6 Fix some logs 2021-04-11 21:43:05 -04:00
Ivan Iskandar
9e40625c08 Draw edge-to-edge (#4802) 
(cherry picked from commit f3660d88ddf21d92a80cc5e73bfa012ddf506e75)

# Conflicts:
#	app/build.gradle.kts
#	app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryCategoryView.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/main/MainActivity.kt
 2021-04-11 18:43:19 -04:00
Jobobby04
2d4e589db8 Search browse if tag clicked in manga from Index controller 2021-04-11 18:36:41 -04:00
arkon
709f76d53d Merge reader settings and color filter sheets 
Heavily influenced by fe2543b9d5 (diff-8f47d7b7b53769ac18c28fe9978140c6bef44709879567acab2c6ef3270cd3a8)

(cherry picked from commit e0b7698d40678ccebfe6b546af9101c11c3a06c5)

# Conflicts:
#	app/src/main/java/eu/kanade/tachiyomi/ui/reader/setting/ReaderSettingsSheet.kt
#	app/src/main/res/layout/reader_activity.xml
#	app/src/main/res/layout/reader_settings_sheet.xml
 2021-03-28 17:19:57 -04:00
arkon
ac654340d8 Maybe make opening file picker for choosing backup file more reliable 
(cherry picked from commit a01792ac9a71689ef5d13a7ab4e71d7a97966062)
 2021-03-28 16:51:40 -04:00
arkon
c6369ed73f Handle null Anilist start dates (fixes #4685) 
(cherry picked from commit 99ba84c8100eebba8b20729c396dfe206674f375)
 2021-03-21 00:07:02 -04:00
arkon
879b41e97d Fix chapters list getting updated from wrong thread (fixes #4505) 
(cherry picked from commit d912a42249901e5c0e3d2e4c09d8d9b89ef6bb3d)

# Conflicts:
#	app/src/main/java/eu/kanade/tachiyomi/ui/manga/MangaController.kt
 2021-03-21 00:04:17 -04:00
Jobobby04
42d49b7cba Log tracking errors 2021-03-11 19:10:32 -05:00
Jobobby04
7e91ae02f1 Upgrade logging, now maps timber to XLog, new logging functions 2021-03-07 00:23:23 -05:00
Jobobby04
9457b832fc Surface errors when saving/sharing covers 2021-03-04 19:10:08 -05:00
Jobobby04
5a67d8169d Edit manga status + edit local manga fixes 2021-02-24 16:15:19 -05:00
Jobobby04
845dbbfa1e Revert "Hide dedupe by priority" 
This reverts commit 1a12caa48721434d9face80cd57f88d76fd50d55.
 2021-02-12 19:49:51 -05:00
Jobobby04
1a12caa487 Hide dedupe by priority 
(cherry picked from commit 2cf047506694d5f46c5838de9249268503c72622)
 2021-02-12 19:25:38 -05:00
arkon
cd8543d40b Avoid crash when device fails to handle opening a URL 
(cherry picked from commit 61e5440b7c9c01dcb4a373d407da4872a4f38de2)

# Conflicts:
#	app/src/main/java/eu/kanade/tachiyomi/ui/base/controller/ConductorExtensions.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/main/WhatsNewDialogController.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/more/AboutController.kt
 2021-02-12 18:54:09 -05:00
arkon
7d1fd9f0bb Avoid crash if activity is already dead 
(cherry picked from commit 2e2663bad9a627c1eb3093cb0f1f1e9fdf31cf3f)
 2021-02-12 18:41:31 -05:00
arkon
33d0507f98 Minor download icon optimizations 
(cherry picked from commit 7a373fb43a2d3f736c032d88b31a4a3bffd8dc5b)

# Conflicts:
#	app/src/main/java/eu/kanade/tachiyomi/ui/manga/MangaPresenter.kt
 2021-02-12 18:40:02 -05:00
arkon
ede6a54b30 Remove unnecessary LayoutContainer implementations 
(cherry picked from commit 291168f4debfc87a62c77c252c77ebeff4b3aafd)
 2021-02-11 18:13:41 -05:00
arkon
b6c7e96ddc Avoid some unnecessary re-renderings of download icons 
(cherry picked from commit 348c1ff29d77f9487dbf4a1304527c22d016c113)

# Conflicts:
#	app/src/main/java/eu/kanade/tachiyomi/ui/manga/MangaPresenter.kt
 2021-02-11 18:10:28 -05:00
arkon
c5b5c8c21d Fix downloads getting deleted when marked as unread 
(cherry picked from commit 717e55497f0656bf121defe8ad4ddb87ec5846b0)

# Conflicts:
#	app/src/main/java/eu/kanade/tachiyomi/ui/manga/MangaPresenter.kt
 2021-02-11 18:09:44 -05:00
Jobobby04
4896f3d16c Allow MDList tracking for all manga 2021-02-11 17:55:43 -05:00
Jobobby04
eb5469d362 Get MDList working with merged manga 2021-02-11 17:02:48 -05:00
Jobobby04
86c228243d Fix merged manga chapterlist not updating, fix merge chapter downloads 2021-02-10 16:39:11 -05:00
arkon
e80a4bea18 Avoid crash when changing spinner indeterminate state 
(cherry picked from commit 7191552126b514fee5a882072b4ad445136b4584)
 2021-02-06 19:08:20 -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
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
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
295af5306b Handle delegated source id lists better using a LisenterMutableMap 
Better source id comparisons
 2021-01-26 13:31:22 -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
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
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
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
arkon
c7bedb96a0 Avoid using global scope where appropriate 
Also fixes the crash in tracking when an exception is thrown during a refresh.

(cherry picked from commit 2ffbee3db21d188b163b27c7dfdb156c590ceb13)

# Conflicts:
#	app/src/main/java/eu/kanade/tachiyomi/data/updater/github/GithubUpdateChecker.kt
#	app/src/main/java/eu/kanade/tachiyomi/extension/api/ExtensionGithubApi.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/browse/migration/search/SearchPresenter.kt
 2021-01-10 18:25:57 -05:00
Jobobby04
fca7dad7b0 Address coroutine scope leaks for SY 2021-01-07 23:14:08 -05:00