copilot/komikku
1
0
Fork 0
Code Issues Pull requests Projects Releases 5 Packages Wiki Activity Actions
4331 commits 2 branches 67 tags 103 MiB
Commit graph

2787 commits

Author SHA1 Message Date
arkon
bd8084c565 Minor optimizations for restoring full backups 
Based on fc6d9aaf51

(cherry picked from commit 2e9ef373f339257767f54fe3a6d3e51526cac683)

# Conflicts:
#	app/src/main/java/eu/kanade/tachiyomi/data/backup/full/FullBackupManager.kt
 2021-02-06 19:11:13 -05:00
arkon
e80a4bea18 Avoid crash when changing spinner indeterminate state 
(cherry picked from commit 7191552126b514fee5a882072b4ad445136b4584)
 2021-02-06 19:08:20 -05:00
Jobobby04
e633da5567 Backup read manga that are not in library 2021-02-06 18:59:40 -05:00
Jobobby04
e26ab22e41 Update manga from differernt sources in parallel 2021-02-04 19:05:35 -05:00
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
15b826074f Don't automatically set MAL start date (closes #4349) 
(cherry picked from commit 13d25e0849ea9c3b267da6d7fb2624a942fcc41b)
 2021-02-04 17:07:56 -05:00
Jobobby04
fc6d9aaf51 Restore offline optimization 
Should make restore offline faster when data is already there
 2021-02-04 17:06:28 -05:00
Jobobby04
e629703afd Build fix 2021-01-31 19:39: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
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 9603186927.
 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 18f02a85ac.

# 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
Jobobby04
677909cd6e Fix compile error 2021-01-21 18:49:37 -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
arkon
94f0dd8362 Delay restoring AppBar elevation on Android 5.0 (fixes #4311) 
(cherry picked from commit 837d8f5f3002fb628acd3ece6352fed190d14a15)
 2021-01-21 15:00:13 -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
34f8407983 Fix MangaPlus chapters for MangaDex 2021-01-21 14:47:03 -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
a47e88a953 Move ACRA endpoint config to build.gradle.kts 
(cherry picked from commit 3319ccfd41a75b5c80a4b05aa2a9f41e1739a50f)

# Conflicts:
#	app/src/main/java/eu/kanade/tachiyomi/App.kt
 2021-01-17 17:06:21 -05:00
arkon
54071507c1 Reimplement MAL start/end date support 
(cherry picked from commit 878008e93badbb1f61704f23a5e810fbff90d2f4)
 2021-01-16 19:50:28 -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
arkon
b6acb3d7f6 Simplify lookup for existing MAL list item 
(cherry picked from commit 189f18b1128d7b685117e124eba4b1fa3fbc7a2c)
 2021-01-16 19:49:41 -05:00
Carlos
5fefefcb23 Mark manga complete on mangadex when all chapters are marked in mdlist 
(cherry picked from commit b95cca91fc19fedb42fce895e0a5f062e342dc21)

# Conflicts:
#	app/src/main/java/eu/kanade/tachiyomi/data/track/mdlist/MdList.kt
 2021-01-15 22:52:44 -05:00
Jobobby04
37787f040c Mangadex code cleanup 2021-01-15 22:29:57 -05:00
Jobobby04
ae15a178e5 Cleanup 2021-01-15 22:21:10 -05:00
Jobobby04
9465803e5b Cleanup NHentai tags code 2021-01-15 22:20:25 -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
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
73e861ec9e Mangadex replace list of langs with just the source lang 2021-01-10 17:28:20 -05:00
Jobobby04
33fac3e96b Search manga descriptions 2021-01-10 15:22:47 -05:00
Carlos
35936e3c9a finish transition to api v2 
(cherry picked from commit 4039f6927e627279cf1b324279a2d817a007d29b)

# Conflicts:
#	app/src/main/java/eu/kanade/tachiyomi/source/online/handlers/ApiMangaParser.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/reader/ReaderActivity.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/reader/ReaderPresenter.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/reader/ReaderSettingsSheet.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/reader/chapter/ReaderChapterSheet.kt
#	app/src/main/java/exh/md/handlers/MangaHandler.kt
#	app/src/main/java/exh/md/utils/MdUtil.kt
#	app/src/main/res/layout/reader_activity.xml
#	app/src/main/res/layout/reader_chapters_sheet.xml
#	app/src/main/res/menu/reader.xml
 2021-01-09 16:11:15 -05:00
Jobobby04
7006341fab Cleanup 2021-01-09 15:16:23 -05:00
Jobobby04
4afe227e02 Revert "Request a new image from E-Hentai if it fails to download, should make E-Hentai downloads more relaible" 
This reverts commit a21d7f4f90.
 2021-01-08 16:24:42 -05:00
Jobobby04
fca7dad7b0 Address coroutine scope leaks for SY 2021-01-07 23:14:08 -05:00
arkon
3683665e8a Address coroutine scope leaks in custom views 
(cherry picked from commit 8e613d03e326adbfa36d72e38cdff021ac806b87)

# Conflicts:
#	app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryCategoryView.kt
 2021-01-07 22:29:35 -05:00
arkon
a68f18d180 Use lifecycleScope directly 
(cherry picked from commit b18a794eca05f4c4befb8606b9af8913d7520215)

# Conflicts:
#	app/src/main/java/eu/kanade/tachiyomi/ui/reader/ReaderActivity.kt
 2021-01-07 22:22:27 -05:00
arkon
d09406dc29 Revert "Use flows instead of relays for extensions loading" 
This reverts commit 07e76f35fa2a69a4cda0668f540aa1a4e2eb2b98.

(cherry picked from commit c620c924f9d5554bd8a7de7fc5c40ca5381bbdde)

# Conflicts:
#	app/src/main/java/eu/kanade/tachiyomi/extension/ExtensionManager.kt
 2021-01-07 22:12:29 -05:00
Andreas E
d41c619c8a Fix navigation from feedback (#4238) 
* Fix navigation from feedback (fixes #4237)

* Add additional enum values to NavigationRegion mainly for PagerViewer

Co-authored-by: arkon <arkon@users.noreply.github.com>
(cherry picked from commit 9db81a5a49ff6679cbc5d20c6a0c523a11691ee5)
 2021-01-07 22:11:24 -05:00
arkon
7330be555d Address more coroutine scope leaks 
(cherry picked from commit 6fb7a85e8a77aa379a8138e1f2fe1b5f65b45ed7)

# Conflicts:
#	app/build.gradle.kts
#	app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryCategoryView.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/manga/info/MangaInfoHeaderAdapter.kt
 2021-01-07 22:11:14 -05:00
Jobobby04
fd3e0bc449 Import cleanup 2021-01-07 21:56:33 -05:00
inorichi
c8dd2190ba Minor fixes regarding leaks 
(cherry picked from commit 36f81b4a623ede11f10049f5869de5b6efa7803a)

# Conflicts:
#	app/src/main/java/eu/kanade/tachiyomi/ui/main/MainActivity.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/manga/MangaController.kt
 2021-01-07 14:27:22 -05:00