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

3749 commits

Author SHA1 Message Date
Jobobby04
104e200b4a Favorites sync show currently processing title after 5 seconds in case of issues 2021-06-26 22:38:50 -04:00
Jobobby04
9af351e0dd Cleanup 2021-06-26 22:38:50 -04:00
Jobobby04
e2324df0cc Use the same thread for db operations in places where trans are possible 2021-06-13 19:56:17 -04:00
Jobobby04
96a932264b Use the clear selection function to destroy the action mode 2021-06-13 14:41:14 -04:00
arkon
d04161cc9e Surface exceptions when fetching pages properly (fixes #5377) 
(cherry picked from commit 8d25ce732307f2aee41f40a5a3c656458863f0da)

# Conflicts:
#	app/src/main/java/eu/kanade/tachiyomi/ui/reader/loader/ChapterLoader.kt
 2021-06-13 14:36:55 -04:00
Hunter Nickel
03c45f676a Added text to category changing dialog when shown with no categories (#5345) 
* Added text to ChangeMangaCategoriesDialog if invoked with empty category list

* Change dialog text, add negative button, and change positive button to open CategoryController

* Tiny bit of code cleanup and reorganizing

(cherry picked from commit 8deca3b63a5a9348933fa8c5fcfaa13bb85311e4)
 2021-06-13 14:36:04 -04:00
Zakhar Timoshenko
56fa39387f Added "Yotsuba" theme (#5290) 
(cherry picked from commit 9b967177c51a93c5db3fe2079cc6581e5b065970)
 2021-06-13 14:35:40 -04:00
Jobobby04
e3fd17f550 Fix Mangadex random 2021-06-12 20:00:28 -04:00
Jobobby04
1dcf49200a Saved searches tweaks 2021-06-11 19:51:34 -04:00
Jobobby04
d5638c6204 Cleanup recs 2021-06-10 17:20:54 -04:00
Jobobby04
9e80f47e9f Help with favorites sync db locking 2021-06-10 17:20:29 -04:00
Ivan Iskandar
963b85f756 Add background to draggable items (#5353) 
(cherry picked from commit 73e5e9ecd9f39af88183eaadc2832e8d8b87063e)
 2021-06-10 16:44:58 -04:00
Soitora
fc141cb92a Fix black icon for small notifications on EMUI (#5350) 
* Set notification icon fillColor to Android white

Closes #5340

* Remove '_black' suffix from the glasses icon drawable

(cherry picked from commit 653b7ffcd0fa5213668096059b43766f8ad8ed59)

# Conflicts:
#	app/src/main/res/drawable/ic_tachi.xml
 2021-06-10 16:44:49 -04:00
jmir1
0bdddb365f Fix library settings sheet causing app to crash... (#5354) 
...when the category list is empty

(cherry picked from commit 8791b72cb1ebdd4b803bbd7d7828630f82fe8a9f)
 2021-06-10 16:43:04 -04:00
arkon
0521c362c9 Revert "Set background job expedited policies" 
This reverts commit c69420373a7e61c1b4eea038447cff6f0409a201.

Caused crashes in TachiyomiSY for some reason. Will have to redo this once we target Android 12.

(cherry picked from commit 07de367476cb337f597880b6f73e8c53e9b2fd19)
 2021-06-10 16:42:53 -04:00
Ivan Iskandar
8cc51c7f71 Fix download status not updated properly after starting batch download (#5348) 
(cherry picked from commit 31d96c2bf0a2ae87978bd4c2774eed0cf050e6ec)

# Conflicts:
#	app/src/main/java/eu/kanade/tachiyomi/ui/manga/MangaPresenter.kt
 2021-06-10 16:42:43 -04:00
Ivan Iskandar
eafce1ee5d Enable secure screen when incognito mode is enabled (#5339) 
* Enable secure screen when incognito mode is enabled

* Fix incognito banner not showing up after configuration changes

(cherry picked from commit fb8aafb69f252efbf9e58bdb80180b3afb59b866)

# Conflicts:
#	app/src/main/java/eu/kanade/tachiyomi/ui/security/SecureActivityDelegate.kt
 2021-06-10 16:41:38 -04:00
arkon
65afc99ead Show global update error notifications by default 
(cherry picked from commit ec5e6958ef4f12f6cdf6694a37637770ca1e67da)
 2021-06-10 16:40:26 -04:00
arkon
c301def4bc Fix crash on source page load error 
(cherry picked from commit 71bd5fe36779ef91f62874020ddf276d4f5caf98)
 2021-06-10 16:40:15 -04:00
Ivan Iskandar
710196d514 Coil: Caching adjustments (#5311) 
* Coil: Enable disk cache for source items

* MangaCoverFetcher: Let Coil's OkHttp client handle caching for non-library cover

(cherry picked from commit 3527dedc993afc0d88143c4fd03fbaf953a4e715)
 2021-06-10 16:39:14 -04:00
arkon
216065fb38 Use coroutine job for fetching next source page 
(cherry picked from commit e6f3cd03bbc8b9e0ea2203f981cda94062d5186c)

# Conflicts:
#	app/src/main/java/eu/kanade/tachiyomi/ui/browse/source/browse/BrowseSourcePresenter.kt
 2021-06-10 16:36:14 -04:00
arkon
708c4b6905 Add shortcut to tracking guide on website 
(cherry picked from commit a1e31549a223f2a0d2006814db443702c9fc0138)

# Conflicts:
#	app/src/main/java/eu/kanade/tachiyomi/ui/browse/migration/sources/MigrationSourcesController.kt
 2021-06-10 16:17:48 -04:00
arkon
3536c359f3 Address some build warnings 
(cherry picked from commit 71d225c56286d4b868c1634316a4748a494037ea)

# Conflicts:
#	app/src/main/java/eu/kanade/tachiyomi/ui/browse/migration/search/SearchController.kt
 2021-06-10 16:16:12 -04:00
arkon
a3dbf6ff24 Don't expand source filter sheet on show (closes #5253) 
(cherry picked from commit 7c232128502ed75053ebc0651024ed6a77dfdba3)

# Conflicts:
#	app/src/main/java/eu/kanade/tachiyomi/ui/browse/source/browse/SourceFilterSheet.kt
 2021-06-10 16:15:38 -04:00
Hunter Nickel
13235f3a37 Add behavior for modifying reader buttons depending on prev/next chapters (#5305) 
(cherry picked from commit fdf178d4df5ca4819c972ca2730e86ef173beeca)

# Conflicts:
#	app/src/main/java/eu/kanade/tachiyomi/ui/reader/ReaderActivity.kt
 2021-06-05 16:09:45 -04:00
arkon
74636f4b1a Use smallest width instead of width for alt layouts 
(cherry picked from commit 04ebca8413403693870e58540eda02b1391f3b61)

# Conflicts:
#	app/src/main/res/layout-sw720dp/manga_info_header.xml
 2021-06-05 16:08:59 -04:00
arkon
9275d9ab55 Set orientation icon correctly when opening reader 
(cherry picked from commit edeee54fb2ebe09466bddd6be0abc64180955fc0)
 2021-06-05 16:08:20 -04:00
Andreas
89249c9895 Added category-wise display setting (#5232) 
* Added category-wise display setting

Co-authored-by: Rogavactive <30288842+Rogavactive@users.noreply.github.com>

* Use flag instead of preference

* Remove database call in LibraryItem

* Remove unnecessary code

Co-authored-by: Rogavactive <30288842+Rogavactive@users.noreply.github.com>
(cherry picked from commit a906e9b302f4aa4ce0d5c30b2a52d266b44eaaf5)

# Conflicts:
#	app/src/main/java/eu/kanade/tachiyomi/data/database/models/Category.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryItem.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/library/LibrarySettingsSheet.kt
 2021-06-05 16:07:57 -04:00
arkon
9b85b009a4 Fix image type build error 
(cherry picked from commit fff72b61dfef494260bbfa544b21be820fbaeafc)
 2021-06-05 15:40:33 -04:00
arkon
e017617612 Handle HEIF images (partly addresses #4756) 
(cherry picked from commit 74381ef59e9c05129d77e82dac17ab0f0b9e3406)
 2021-06-05 15:40:26 -04:00
Jobobby04
38f2a93c0f Use PageHandler for page requests 2021-06-05 15:24:02 -04:00
Carlos
143dfc6ad2 pass auth header to md@home request when logged in 
(cherry picked from commit c63bf955b308cbb67fcdda884eff76eaec901898)

# Conflicts:
#	app/src/main/java/eu/kanade/tachiyomi/source/online/MangaDex.kt
#	app/src/main/java/eu/kanade/tachiyomi/source/online/handlers/PageHandler.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/reader/loader/HttpPageLoader.kt
 2021-06-05 14:36:58 -04:00
Carlos
d82967ea3d switch to dex covers 
(cherry picked from commit 28d83509dadb0ddaca2e13e98f5e5f6e3df2d2a7)

# Conflicts:
#	app/src/main/java/eu/kanade/tachiyomi/source/online/MangaDexCache.kt
#	app/src/main/java/eu/kanade/tachiyomi/source/online/handlers/ApiMangaParser.kt
#	app/src/main/java/eu/kanade/tachiyomi/source/online/handlers/FollowsHandler.kt
#	app/src/main/java/eu/kanade/tachiyomi/source/online/handlers/PopularHandler.kt
#	app/src/main/java/eu/kanade/tachiyomi/source/online/handlers/SearchHandler.kt
#	app/src/main/java/eu/kanade/tachiyomi/source/online/handlers/SimilarHandler.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/manga/MangaDetailsPresenter.kt
#	app/src/main/java/exh/md/utils/MdUtil.kt
 2021-06-05 14:31:51 -04:00
Jobobby04
eab7571feb Cleanup 2021-06-05 13:58:30 -04:00
Hunter Nickel
09eab48b1b Add check for backstack size before pushing DownloadController (#5312) 
(cherry picked from commit 64f95af3e51bc721db1be137e34007e72ee4aeb9)
 2021-06-04 20:43:25 -04:00
jobobby04
9196a24eb1 Legacy backup conversion to Kotlin Serialization (#5282) 
* Legacy backup conversion to Kotlin Serialization

* Fix BackupTest compiling

(cherry picked from commit 597cec306455678f2cfe2ad2f632688292353b9e)

# Conflicts:
#	app/src/main/java/eu/kanade/tachiyomi/data/backup/legacy/LegacyBackupManager.kt
#	app/src/main/java/eu/kanade/tachiyomi/data/backup/legacy/LegacyBackupRestore.kt
#	app/src/main/java/eu/kanade/tachiyomi/data/backup/legacy/models/Backup.kt
#	app/src/main/java/eu/kanade/tachiyomi/data/backup/legacy/serializer/MangaTypeAdapter.kt
 2021-06-04 19:27:19 -04:00
arkon
4f9eb19ead Update tablet UI 
- Only used when width is >= 720dp instead of 600dp (typically 10" tablets)
- Fix fastscroll in manga view (fixes #5267)

(cherry picked from commit b03ebc1fa4d2fd4321ff736ddd9eda239fa2fdde)

# Conflicts:
#	app/src/main/res/layout-w720dp/manga_controller.xml
 2021-06-04 19:09:21 -04:00
Jobobby04
3d33d50c63 Cleanup some constructors 2021-06-04 19:07:30 -04:00
Jobobby04
b35aa30ea7 Address some lints 2021-06-03 16:28:38 -04:00
arkon
330b7990fe Allow center aligned side nav icons (closes #5177) 
(cherry picked from commit 6c53bb4d515d15c39bb4ba8e0eae46341fd58c45)
 2021-06-03 14:01:13 -04:00
arkon
84330af417 Address some build warnings 
(cherry picked from commit fb7a458747e8a9fe2abe73d8ef6982f3bc0298e2)

# Conflicts:
#	app/src/main/java/eu/kanade/tachiyomi/ui/more/AboutController.kt
 2021-06-03 14:01:05 -04:00
arkon
ac8e53b9a7 Set background job expedited policies 
(cherry picked from commit c69420373a7e61c1b4eea038447cff6f0409a201)
 2021-06-03 13:59:44 -04:00
arkon
88102b9705 Add share and save cover actions (closes #3011) 
(cherry picked from commit 281a3911f69b96050bae4b232af94ca3671b92ae)

# 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/reader/ReaderPresenter.kt
 2021-06-03 13:59:08 -04:00
Jobobby04
6d7e8cdcb9 Comment out more 2021-06-03 01:07:09 -04:00
Jobobby04
359ccdd052 Fix refactor for show history and updates button 2021-06-03 01:06:55 -04:00
Jobobby04
57ca396b46 Load chapters in the dialog instantly 2021-06-02 21:21:38 -04:00
Jobobby04
78d2881b4b Remove TachiEH Android 7 SSL Workaround, no idea why it was used 2021-06-02 21:04:51 -04:00
Jobobby04
cafce0ed5f Old saved searches can load now, but now toast on click 2021-06-02 21:04:06 -04:00
Jobobby04
3adde57db9 Use the same chapter sort that the chapters use in the reader dialog 2021-06-02 17:46:33 -04:00
Jobobby04
503ecb8076 Rename the reader chapter sheet to a dialog 2021-06-02 17:39:25 -04:00
Jobobby04
01d6dbba86 Add cancel button to reader chapters dialog 2021-06-02 17:34:08 -04:00
Jobobby04
b0bcad861f Open merged manga in webview properly 2021-06-02 17:17:11 -04:00
Jobobby04
d70a8848ec Fix merged manga delete after read 2021-06-02 16:53:00 -04:00
Jobobby04
c8426e71eb When browsing on Exh notify if the user has a bad igneous cookie 2021-06-02 16:10:26 -04:00
OncePunchedMan
b523e47102
Fix label visibility for tablet ui (#343) 
* fix label visibility for tablet ui

* change to less code
 2021-06-02 15:44:11 -04:00
Jobobby04
57dde4c922 Refactor show history and updates buttons 2021-06-02 14:12:57 -04:00
Jobobby04
8387492a9b Add biometric lock days, fix biometric time range 2021-06-02 13:39:04 -04:00
Jobobby04
114ba42af7 Fix duel page spread not marking chapters read 2021-06-02 00:11:55 -04:00
Jobobby04
aeaf52cb58 Handle more deprecated items 2021-06-02 00:10:36 -04:00
Jobobby04
d30c9f7120 Address some deprecation warnings 2021-06-01 21:09:03 -04:00
arkon
9697bffc5e Consolidate some of the app update classes 
We only use GitHub for all update checks, so the abstraction isn't useful.

(cherry picked from commit 5113c78ab6d599286e3e2bd445b5b21dd7abf994)
 2021-06-01 20:52:56 -04:00
arkon
65249a4ee7 Address some Kotlin language warnings 
(cherry picked from commit 3854995ef23df814da32ef7bc6522007e7882f35)

# Conflicts:
#	app/src/main/java/eu/kanade/tachiyomi/ui/browse/extension/ExtensionHolder.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/browse/source/SourceFilterController.kt
#	app/src/main/java/eu/kanade/tachiyomi/util/chapter/ChapterRecognition.kt
 2021-06-01 20:52:49 -04:00
arkon
d5b72c3d3a Only show automatically refresh trackers setting if logged in to some trackers 
(cherry picked from commit 36e14b951a2e36c42fa49fcadd503a4f01952c49)
 2021-06-01 20:51:36 -04:00
Jobobby04
86bd55268f Revert "Temporarily disable Double Page Spread" 
This reverts commit 02601aa32a.
 2021-06-01 20:49:43 -04:00
Jobobby04
8563342d0f Revert "Temporarily disable Mangadex delegation" 
This reverts commit 60e520e37e.
 2021-06-01 20:49:26 -04:00
Jobobby04
d057b61158 Revert "Temporarily hide Komga tracker" 
This reverts commit 3fb4b565fa.
 2021-06-01 20:49:21 -04:00
Jobobby04
02601aa32a Temporarily disable Double Page Spread 2021-06-01 18:40:42 -04:00
Jobobby04
60e520e37e Temporarily disable Mangadex delegation 2021-06-01 18:33:48 -04:00
arkon
3fb4b565fa Temporarily hide Komga tracker 
(cherry picked from commit 31997fe50af7fb8a5308682a246ceece710deb0d)
 2021-06-01 18:22:12 -04:00
arkon
b2e33ab950 Update some icons 
(cherry picked from commit 5e5ceef122856a1a6ff2f06e97fcfece917b33b5)

# Conflicts:
#	app/src/main/java/eu/kanade/tachiyomi/ui/browse/source/SourceController.kt
 2021-06-01 18:22:00 -04:00
Jobobby04
ebc1f2bb41 Update string reference 2021-06-01 18:17:06 -04:00
arkon
5fa3d55bc9 Show toast when toggling crop borders 
Consistent with reading mode and orientation shortcuts.

(cherry picked from commit 1feac9c5594e85a9e8ef82ac69cb048b7eda2598)

# Conflicts:
#	app/src/main/java/eu/kanade/tachiyomi/ui/reader/ReaderActivity.kt
 2021-05-31 23:47:48 -04:00
Jobobby04
ef02bd112c Fix some string references 2021-05-31 23:44:15 -04:00
arkon
0a96252ce8 Fix last library category not being saved 
(cherry picked from commit aa50554f06f3e6cfbd5ac41a296fe2ad790f5352)
 2021-05-31 23:44:15 -04:00
Jobobby04
7907723623 Move rec button higher on tablet view 2021-05-31 23:44:14 -04:00
arkon
d5fcded898 Fix toolbar menu being broken on transition (fixes #5135) 
(cherry picked from commit 034506f56b96b7f01c2d27021236e55f0542c559)
 2021-05-29 18:19:40 -04:00
arkon
d92e790c5e Try to avoid some Webview-related crashes 
Related to #5218

(cherry picked from commit 3d9383ce674dd4046b5f46eea70d5fddb61e193c)

# Conflicts:
#	app/src/main/java/eu/kanade/tachiyomi/App.kt
 2021-05-29 18:18:56 -04:00
Ivan Iskandar
7d659f559e Adjust chapter download button visual (#5213) 
* Removed the blinking icon and added back the indeterminate indicator for
queued items
* Make the downloading indicator a solid circle

(cherry picked from commit 9de07c11a624072a8ce7e13721103a06078dee67)
 2021-05-29 18:18:10 -04:00
Jobobby04
3a20e24ad0 Fix some drawable references 2021-05-29 18:17:54 -04:00
Ivan Iskandar
9a97a97aa7 More bottom sheet improvements (#5183) 
* Edge-to-edge bottom sheet when possible

* ReaderSettingsSheet: Animate background dim changes

* Adjust modal bottom sheet in-out animation

* Use public method to get bottom sheet behavior

* Set bottom sheet peek size to 50% screen height

The current auto peek height gives too low value on landscape orientation

* Set bottom sheet navigation bar scrim when needed

(cherry picked from commit 9f744bc44589a3e44fb8b655615c2184d1748c0a)

# Conflicts:
#	app/src/main/java/eu/kanade/tachiyomi/ui/main/MainActivity.kt
 2021-05-29 17:58:17 -04:00
Soitora
84076c2582 Add animations for Bottom Navigation items (#5181) 
* Animated icon for the Library tab

Co-Authored-By: CrepeTF <70870719+CrepeTF@users.noreply.github.com>

* Animated icon for the More tab

Co-Authored-By: CrepeTF <70870719+CrepeTF@users.noreply.github.com>

* Rename more_vert to overflow

Should maybe help any confusion together with the other more_horiz changes.

* Animated icon for the History tab

Co-Authored-By: CrepeTF <70870719+CrepeTF@users.noreply.github.com>

* Clarify names and clean files

* Animated icon for the Updates tab

* Animated icon for the Browse tab

* Recreate the animated icon for the History tab

History icons look better when the internal clock is not moving.

Co-authored-by: CrepeTF <70870719+CrepeTF@users.noreply.github.com>
(cherry picked from commit aed6e12119b1b71710a4dd4139e776ca63b4636c)
 2021-05-29 17:57:44 -04:00
Jobobby04
b67d2bba40 Last chapter can be null 2021-05-28 21:17:26 -04:00
Jobobby04
9fa278f708 Fix SY themes a bit more 2021-05-28 14:36:53 -04:00
Jobobby04
56ea025e20 Update coroutines, fix E-Hentai gallery update restrictions 2021-05-28 14:36:52 -04:00
Hunter Nickel
89531cd549 Implement feature to hide "Local" badge from library manga (#5202) 
(cherry picked from commit 8dcd919ff0c4df78343e501400294cfb079dc901)
 2021-05-28 14:36:51 -04:00
Gauthier
e50f04ec54 Display the currently active restrictions in the library update preference (#5187) 
* display the currently active restrictions in the library update preference

* removed first line

* use constant instead of literal string

* remove spanned string builder

(cherry picked from commit d9c27e7109fb01db4a103a2d55b5573c2cfe2185)

# Conflicts:
#	app/src/main/java/eu/kanade/tachiyomi/ui/setting/SettingsLibraryController.kt
 2021-05-28 14:36:50 -04:00
arkon
d8b40c2dc4 Add link to official subreddit 
(cherry picked from commit 8af8c57bb414beafb4eed2bfb448b072f2fe60e4)

# Conflicts:
#	app/src/main/java/eu/kanade/tachiyomi/ui/more/AboutController.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/more/AboutLinksPreference.kt
 2021-05-28 14:36:50 -04:00
inorichi
2eb5436b25 Display animated webp whenever possible, otherwise fallback to static image. Fixes #5139 
(cherry picked from commit 8c18a14dfd4ed51001b135a469434fe6f8103929)

# Conflicts:
#	app/src/main/java/eu/kanade/tachiyomi/util/system/ImageUtil.kt
 2021-05-28 14:36:48 -04:00
Gauthier
fba4bd163b Hide the score display on the tracksheet if not supported (#5169) 
* hide the score display on the tracksheet if not supported

* Convert track item to use LinearLayout

Co-authored-by: Andreas E <andreas.everos@gmail.com>
(cherry picked from commit 9a801cfdfba407634532a5ceac0170a9f4716447)
 2021-05-28 14:36:48 -04:00
Soitora
ae073f9207 Added "Green Apple" theme (#5184) 
* Added "Green Apple" theme

Totally not stolen from other forks.

Although to cover all my bases I co-author all people who adapted the theme in any form.

Neko, J2K and Tako

Co-Authored-By: Carlos <2092019+CarlosEsco@users.noreply.github.com>
Co-Authored-By: Jays2Kings <jays@outlook.com>
Co-Authored-By: CrepeTF <70870719+CrepeTF@users.noreply.github.com>

* Add black as the OnSecondary color

Co-authored-by: Carlos <2092019+CarlosEsco@users.noreply.github.com>
Co-authored-by: Jays2Kings <jays@outlook.com>
Co-authored-by: CrepeTF <70870719+CrepeTF@users.noreply.github.com>
(cherry picked from commit 4af13e3536493db7de3ff5e24ae5794c1efe3661)
 2021-05-28 14:36:47 -04:00
Gauthier
1c084d42df Background tracker update during Library update (#5166) 
* add preference to auto update trackers during library update

* also update trackers when updating chapters and preference is set

* remove unnecessary launch/join

* perform tracking update within the same chapter update loop to avoid double notifications

(cherry picked from commit e76e903060658530909455664c954cc4a639527d)

# Conflicts:
#	app/src/main/java/eu/kanade/tachiyomi/data/library/LibraryUpdateService.kt
 2021-05-28 14:36:47 -04:00
Gauthier
f492ad2529 Refactor TrackService.kt to remove unused add function (#5164) 
* removed the add function from TrackService.kt as it's not used except within the tracker implementations

* add private modifier

(cherry picked from commit acd927a937e1d7a7253dfd3954969ee9bb00d610)
 2021-05-28 14:36:46 -04:00
Jobobby04
33b6912c22 nullIfEmpty 2021-05-28 14:36:45 -04:00
Jobobby04
9e63f32a82 Localize Find in another source 2021-05-28 14:36:45 -04:00
arkon
834e3d78ab Put shortcut to backup menu in More 
(cherry picked from commit a498f940c6169a486f61be546759c59045be414e)

# Conflicts:
#	app/src/main/java/eu/kanade/tachiyomi/ui/more/MoreController.kt
 2021-05-28 14:36:45 -04:00
arkon
3cc61bc3b8 Make some strings in LocalSource translatable (closes #5178) 
(cherry picked from commit 179cb8eb50951955611036f4140d6128e6fce781)
 2021-05-28 14:36:44 -04:00
arkon
6b771b4a70 Handle toolbar title in manga details on tablets similar to on phones 
(cherry picked from commit 47f865aa720c47faa7853f4be3065e3ba718f1ba)

# Conflicts:
#	app/src/main/java/eu/kanade/tachiyomi/ui/manga/MangaController.kt
 2021-05-28 14:36:43 -04:00
arkon
9c2eadd8ca Remove unused Gson singleton factory 
We don't inject it anywhere anymore.

(cherry picked from commit b47face2f8cea2d5425b5fe9daaa566ffda55042)
 2021-05-28 14:36:43 -04:00
Ivan Iskandar
f09c977661 TabbedBottomSheetDialog: Fix scrollable pages (#5173) 
(cherry picked from commit 69869115f6531f62013e6c4c3bdfb750bc26c57f)
 2021-05-28 14:36:43 -04:00
Soitora
2acc364960 Added "Strawberry Daiquiri" theme (#5176) 
(cherry picked from commit 0fb9ca3e8b1e779206c9e4a9f7ac3259bed3911a)
 2021-05-28 14:36:42 -04:00