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
renovate[bot]
611deab206
Update shizuku_version to v12.2.0 ( #8171 )
...
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
(cherry picked from commit bd9a08c73dd145bc560f3526a0f51663d307259a)
2022-10-15 12:09:19 -04:00
renovate[bot]
0ee8343325
Update dependency androidx.sqlite:sqlite-ktx to v2.3.0-beta01 ( #8165 )
...
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
(cherry picked from commit 41dc41f2852bc7f977cf77a9264ed41c68f13b96)
2022-10-15 12:09:19 -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
Jobobby04
2d2f5cdc66
Improve external repo extension handling
2022-10-15 12:09:16 -04:00
Basara-Hatake
7fd4f5ee97
remove dead delegatedsources ( #701 )
2022-10-15 12:08:26 -04:00
Román
555697b30b
Translations fixes ( #695 )
...
* Translations fixes
* one more thing
* one more thing x2
2022-10-08 20:47:05 -04:00
Jobobby04
7d8f89826f
Fix add feed when there are no feeds
2022-10-08 20:46:41 -04:00
Jobobby04
06d2e631be
Fix reccomendations
2022-10-08 19:45:04 -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
Ivan Iskandar
3596de1c44
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
(cherry picked from commit 4b4be58d0d2cac6636858d57119e0657b1b56f59)
# Conflicts:
# app/src/main/java/eu/kanade/presentation/browse/ExtensionsScreen.kt
# app/src/main/java/eu/kanade/presentation/library/components/LibraryContent.kt
2022-10-08 18:42:46 -04:00
arkon
1cd093ecc0
Allow marking partially read chapters as unread
...
Closes #3777
(cherry picked from commit 4bba7a8bab9db84edda517e9b377f510540ae243)
2022-10-08 18:35:28 -04:00
arkon
2f33b90eca
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
(cherry picked from commit 60bcebe4d17730e5abb0a409a06af2d6853c61ad)
2022-10-08 18:35:17 -04:00
Ivan Iskandar
b9f1bfb9ff
MoreScreen: Remove title ( #8158 )
...
* MoreScreen: Remove title
Also removes the state banners as it's redundant
* Add back banners
(cherry picked from commit cf6407c4d414a34949c3b97a451b14585db852df)
# Conflicts:
# app/src/main/java/eu/kanade/presentation/more/MoreScreen.kt
2022-10-08 18:35:08 -04:00
Weblate (bot)
bd278d81bb
Translations update from Hosted Weblate ( #8140 )
...
Weblate translations
Co-authored-by: Abay Emes <abayemes@gmail.com>
Co-authored-by: Ajeje Brazorf <lmelonimamo@yahoo.it>
Co-authored-by: Alessandro Jean <alessandrojean@gmail.com>
Co-authored-by: DarKCroX <darkcrox.2020@outlook.com>
Co-authored-by: Eric <hamburger1024@mailbox.org>
Co-authored-by: Giorgio Sanna <sannagiorgio1997@gmail.com>
Co-authored-by: Hosted Weblate <hosted@weblate.org>
Co-authored-by: ID-86 <id86dev@gmail.com>
Co-authored-by: J. Lavoie <j.lavoie@net-c.ca>
Co-authored-by: Marcel Brode <m.brode@shopware.com>
Co-authored-by: Oğuz Ersen <oguz@ersen.moe>
Co-authored-by: Swyter <swyterzone@gmail.com>
Co-authored-by: TheKingTermux <achmadmaulana0233@gmail.com>
Co-authored-by: altinat <altinat@duck.com>
Co-authored-by: borgar <vodrigorenegas@gmail.com>
Co-authored-by: fanylouise <gandra.fany@gmail.com>
Co-authored-by: stevenlele <stevenlele@outlook.com>
Co-authored-by: Роман <Rozhenkov69@gmail.com>
Translate-URL: https://hosted.weblate.org/projects/tachiyomi/strings/cs/
Translate-URL: https://hosted.weblate.org/projects/tachiyomi/strings/de/
Translate-URL: https://hosted.weblate.org/projects/tachiyomi/strings/es/
Translate-URL: https://hosted.weblate.org/projects/tachiyomi/strings/es_419/
Translate-URL: https://hosted.weblate.org/projects/tachiyomi/strings/fr/
Translate-URL: https://hosted.weblate.org/projects/tachiyomi/strings/id/
Translate-URL: https://hosted.weblate.org/projects/tachiyomi/strings/it/
Translate-URL: https://hosted.weblate.org/projects/tachiyomi/strings/ja/
Translate-URL: https://hosted.weblate.org/projects/tachiyomi/strings/kk/
Translate-URL: https://hosted.weblate.org/projects/tachiyomi/strings/ms/
Translate-URL: https://hosted.weblate.org/projects/tachiyomi/strings/pt/
Translate-URL: https://hosted.weblate.org/projects/tachiyomi/strings/pt_BR/
Translate-URL: https://hosted.weblate.org/projects/tachiyomi/strings/ru/
Translate-URL: https://hosted.weblate.org/projects/tachiyomi/strings/sc/
Translate-URL: https://hosted.weblate.org/projects/tachiyomi/strings/th/
Translate-URL: https://hosted.weblate.org/projects/tachiyomi/strings/tr/
Translate-URL: https://hosted.weblate.org/projects/tachiyomi/strings/zh_Hans/
Translation: Tachiyomi/Tachiyomi 0.x
Co-authored-by: Abay Emes <abayemes@gmail.com>
Co-authored-by: Ajeje Brazorf <lmelonimamo@yahoo.it>
Co-authored-by: Alessandro Jean <alessandrojean@gmail.com>
Co-authored-by: DarKCroX <darkcrox.2020@outlook.com>
Co-authored-by: Eric <hamburger1024@mailbox.org>
Co-authored-by: Giorgio Sanna <sannagiorgio1997@gmail.com>
Co-authored-by: ID-86 <id86dev@gmail.com>
Co-authored-by: J. Lavoie <j.lavoie@net-c.ca>
Co-authored-by: Marcel Brode <m.brode@shopware.com>
Co-authored-by: Oğuz Ersen <oguz@ersen.moe>
Co-authored-by: Swyter <swyterzone@gmail.com>
Co-authored-by: TheKingTermux <achmadmaulana0233@gmail.com>
Co-authored-by: altinat <altinat@duck.com>
Co-authored-by: borgar <vodrigorenegas@gmail.com>
Co-authored-by: fanylouise <gandra.fany@gmail.com>
Co-authored-by: stevenlele <stevenlele@outlook.com>
Co-authored-by: Роман <Rozhenkov69@gmail.com>
(cherry picked from commit 5f8252447f2fad47285c26c0705b7903c1a2f996)
2022-10-08 18:33:42 -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
896bc3253e
Add JavaScriptEngine abstraction to extensions-lib ( #8155 )
...
This allows us to swap out the implementation in the future and on different platforms
without major changes to the extensions themselves.
(cherry picked from commit 7be68639107caecea879dc05edb92d81a4689a5a)
# Conflicts:
# core/build.gradle.kts
2022-10-08 18:04:37 -04:00
arkon
48b9135056
Reword some reader settings
...
(cherry picked from commit caf9219d99c8f46a2c7371e7c4f0cfbba7f546d9)
2022-10-08 18:03:57 -04:00
Ivan Iskandar
cb1d47c685
Setup Baseline Profile ( #8135 )
...
* Setup Baseline Profile
Adds Baseline Profile generator and startup time test.
Readme included in macrobenchmark module to run the generator.
* changes
(cherry picked from commit 3b623964421b6bc196bcf751f920975c47884326)
# Conflicts:
# app/build.gradle.kts
# gradle/androidx.versions.toml
2022-10-08 18:03:47 -04:00
AntsyLich
9a2c1f23d1
Show correct language string in browse screens ( #8136 )
...
(cherry picked from commit bbe16080062c2bee725226c5196e2800b4ba16ef)
# Conflicts:
# app/src/main/java/eu/kanade/presentation/browse/SourcesScreen.kt
2022-10-08 17:36:16 -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
Ivan Iskandar
6ddc153af4
Fix regular scrollbar ( #8139 )
...
At some point the scrollbar stops responding to
scroll changes. Not too confident with this fix
but it works.
(cherry picked from commit 1cf1b34e7f32d71e3508f81e8348ff522d389109)
2022-10-08 17:35:10 -04:00
stevenyomi
17111a4d02
LocaleHelper: use argument for a when
expression ( #8131 )
...
(cherry picked from commit ff4fb83bff8f271220decb061405937230e0b18f)
2022-10-08 17:35:02 -04:00
renovate[bot]
f8bb98f642
Update coil_version to v2.2.2
...
(cherry picked from commit e24501da091d8d70e0db6445d0fac221fae9a84a)
2022-10-08 17:34:54 -04:00
arkon
827fe98211
Explicitly reword some locale names
...
Avoiding some country names in favour of more generic terminology where appropriate.
(cherry picked from commit 0ca14c61c256af770fe31c0d0cc8b7111f4b988b)
2022-10-08 17:34:46 -04:00
renovate[bot]
fe64a597b1
Update aboutlib_version to v10.5.0 ( #8127 )
...
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
(cherry picked from commit a5a70defc83eb08ef4f941f908a6e7c558253571)
2022-10-01 19:16:42 -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
30e3cc46c8
Downloader: Don't trust index provided by source ( #8122 )
...
(cherry picked from commit 98c459a6b69a26338d310afe7f2629fa939d6f89)
2022-10-01 18:33:18 -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
arkon
40a9df8969
Update Proguard rules to handle serializers in all modules
...
Fixes #8112
(cherry picked from commit 8d1f99a48084566a81807a1877c3b92e53c97036)
2022-10-01 18:32:45 -04:00
arkon
1fa371b8e4
Remove obscure/barely translated locales
...
(cherry picked from commit bef8342aa51db77752bab8ff5e75c47e4ba03746)
2022-10-01 18:32:36 -04:00
Weblate (bot)
b14c082c33
Translations update from Hosted Weblate ( #8070 )
...
Weblate translations
Co-authored-by: Ajeje Brazorf <lmelonimamo@yahoo.it>
Co-authored-by: Alessandro Jean <alessandrojean@gmail.com>
Co-authored-by: DarKCroX <darkcrox.2020@outlook.com>
Co-authored-by: DatTran MLL <tranthanhdat1142003@gmail.com>
Co-authored-by: Eric <hamburger1024@mailbox.org>
Co-authored-by: Giorgio Sanna <sannagiorgio1997@gmail.com>
Co-authored-by: Hosted Weblate <hosted@weblate.org>
Co-authored-by: ID-86 <id86dev@gmail.com>
Co-authored-by: Lyfja <yassinelaoud@gmail.com>
Co-authored-by: Lzmxya <lzmxya@gmail.com>
Co-authored-by: Marco Santos <enum.scima@gmail.com>
Co-authored-by: Milo Ivir <mail@milotype.de>
Co-authored-by: Momade98 <bemomoh@hotmail.com>
Co-authored-by: Oğuz Ersen <oguz@ersen.moe>
Co-authored-by: Pitpe11 <giorgos2550@gmail.com>
Co-authored-by: Swyter <swyterzone@gmail.com>
Co-authored-by: TheKingTermux <achmadmaulana0233@gmail.com>
Co-authored-by: Uzuki Shimamura <hzy980512@126.com>
Co-authored-by: Weblate <noreply@weblate.org>
Co-authored-by: altinat <altinat@duck.com>
Co-authored-by: luimen88 <kenjihimuravzla@gmail.com>
Co-authored-by: stevenlele <stevenlele@outlook.com>
Co-authored-by: Роман <Rozhenkov69@gmail.com>
Translate-URL: https://hosted.weblate.org/projects/tachiyomi/strings/cs/
Translate-URL: https://hosted.weblate.org/projects/tachiyomi/strings/de/
Translate-URL: https://hosted.weblate.org/projects/tachiyomi/strings/el/
Translate-URL: https://hosted.weblate.org/projects/tachiyomi/strings/es/
Translate-URL: https://hosted.weblate.org/projects/tachiyomi/strings/es_419/
Translate-URL: https://hosted.weblate.org/projects/tachiyomi/strings/fil/
Translate-URL: https://hosted.weblate.org/projects/tachiyomi/strings/hr/
Translate-URL: https://hosted.weblate.org/projects/tachiyomi/strings/id/
Translate-URL: https://hosted.weblate.org/projects/tachiyomi/strings/it/
Translate-URL: https://hosted.weblate.org/projects/tachiyomi/strings/ja/
Translate-URL: https://hosted.weblate.org/projects/tachiyomi/strings/ms/
Translate-URL: https://hosted.weblate.org/projects/tachiyomi/strings/nl/
Translate-URL: https://hosted.weblate.org/projects/tachiyomi/strings/pt_BR/
Translate-URL: https://hosted.weblate.org/projects/tachiyomi/strings/ru/
Translate-URL: https://hosted.weblate.org/projects/tachiyomi/strings/sc/
Translate-URL: https://hosted.weblate.org/projects/tachiyomi/strings/th/
Translate-URL: https://hosted.weblate.org/projects/tachiyomi/strings/tr/
Translate-URL: https://hosted.weblate.org/projects/tachiyomi/strings/vi/
Translate-URL: https://hosted.weblate.org/projects/tachiyomi/strings/zh_Hans/
Translate-URL: https://hosted.weblate.org/projects/tachiyomi/strings/zh_Hant/
Translation: Tachiyomi/Tachiyomi 0.x
Co-authored-by: Ajeje Brazorf <lmelonimamo@yahoo.it>
Co-authored-by: Alessandro Jean <alessandrojean@gmail.com>
Co-authored-by: DarKCroX <darkcrox.2020@outlook.com>
Co-authored-by: DatTran MLL <tranthanhdat1142003@gmail.com>
Co-authored-by: Eric <hamburger1024@mailbox.org>
Co-authored-by: Giorgio Sanna <sannagiorgio1997@gmail.com>
Co-authored-by: ID-86 <id86dev@gmail.com>
Co-authored-by: Lyfja <yassinelaoud@gmail.com>
Co-authored-by: Lzmxya <lzmxya@gmail.com>
Co-authored-by: Marco Santos <enum.scima@gmail.com>
Co-authored-by: Milo Ivir <mail@milotype.de>
Co-authored-by: Momade98 <bemomoh@hotmail.com>
Co-authored-by: Oğuz Ersen <oguz@ersen.moe>
Co-authored-by: Pitpe11 <giorgos2550@gmail.com>
Co-authored-by: Swyter <swyterzone@gmail.com>
Co-authored-by: TheKingTermux <achmadmaulana0233@gmail.com>
Co-authored-by: Uzuki Shimamura <hzy980512@126.com>
Co-authored-by: altinat <altinat@duck.com>
Co-authored-by: luimen88 <kenjihimuravzla@gmail.com>
Co-authored-by: stevenlele <stevenlele@outlook.com>
Co-authored-by: Роман <Rozhenkov69@gmail.com>
(cherry picked from commit 2131294b228108dc1c96a4b299fd5cdd1c01103f)
2022-10-01 18:32:30 -04:00
AntsyLich
e704b2bde4
Remove mangaChapterMapper ( #8124 )
...
Was used by updates screen previously
(cherry picked from commit 5c22cbf28e86079994874b08cd4bdfb1bff2b0d9)
# Conflicts:
# app/src/main/java/eu/kanade/data/manga/MangaMapper.kt
2022-10-01 18:32:18 -04:00
Jobobby04
5b31324b4b
Minor cleanup
2022-10-01 18:30:25 -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
Jobobby04
1ecd55736c
Minor cleanup
2022-10-01 18:18:56 -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
Shamicen
d540d83574
Fix ComicInfo.xml not being read if .noxml file exists too ( #8111 )
...
* gives ComicInfo.xml files priority over noxml files if both are at the chapter root.
* delete the noxml file if both a noXml file and a ComicInfo file exist
(cherry picked from commit 80b2ebc45b5f04bcd832ed2497d3f2f6ea4adf10)
2022-10-01 18:06:30 -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
stevenyomi
9f0ea91634
Requests: add GET(HttpUrl)
overload ( #8107 )
...
Requests: add GET(HttpUrl) overload
(cherry picked from commit 8b9a06e298d682ad3417d725068ec88537e0b12f)
2022-10-01 18:05:59 -04:00
Jobobby04
18a3546665
Improve SY search toolbar UX
2022-10-01 18:05:39 -04:00
Ivan Iskandar
4c3309177e
MangaScreen: Adjust insets ( #8097 )
...
I should have done this when Scaffold was rebased
(cherry picked from commit 6b1d597d34f903fabfc65ac9cd6bd561fc38f505)
2022-10-01 18:02:24 -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