12 Commits

Author SHA1 Message Date
arkon
1518c2aa25 Run formatter on drawables and layouts
(cherry picked from commit dbe8931cf0a3839b10ec3deed9c0a262a493d891)

# Conflicts:
#	app/src/main/res/drawable/ic_launcher_foreground.xml
#	app/src/main/res/layout/main_activity.xml
#	app/src/main/res/layout/manga_info_header.xml
#	app/src/main/res/layout/reader_activity.xml
#	app/src/main/res/layout/reader_general_settings.xml
2021-05-22 17:47:08 -04:00
Jobobby04
fd65db51c1 Fix some text colors 2021-05-18 13:05:40 -04:00
arkon
b46500c837 Add checkmark beside selected popup menu item
Based on what's in J2K. Also renamed to MaterialSpinnerView to match what's there.

Co-authored-by: Jays2Kings <Jays2Kings@users.noreply.github.com>
(cherry picked from commit 3287ca9cf264fb0d28bdd7e43404cef595d953de)
2021-04-19 14:00:55 -04:00
arkon
1ba07466ef Minor cleanup
(cherry picked from commit ef49fc91d8c40a45efab6661f9dfe78e147bc732)
2021-04-11 18:40:23 -04:00
arkon
bcc120056c Make reader spinner colors a bit more consistent
(cherry picked from commit 7504621a24597340f47edb140fee939ac79fb5ec)

# Conflicts:
#	app/src/main/res/layout/reader_general_settings.xml
2021-04-11 18:38:58 -04:00
Jobobby04
d294db3e4e Continues -> Continuous 2021-03-30 20:00:55 -04:00
arkon
8b37c27a73 Cleanup reader spinner layouts
(cherry picked from commit c4b975b77734c8cea843796bae87ee6e236180f4)

# Conflicts:
#	app/src/main/res/layout/reader_general_settings.xml
#	app/src/main/res/layout/reader_webtoon_settings.xml
2021-03-28 19:01:08 -04:00
arkon
2988524fd8 Clean up reader sheet spinner preferences
Based on fe2543b9d5

Co-Authored-By: Jays2Kings
(cherry picked from commit 14c114756dbcc9d952790918c0a47b2bdc2dbade)

# Conflicts:
#	app/src/main/res/layout/reader_general_settings.xml
#	app/src/main/res/layout/reader_pager_settings.xml
#	app/src/main/res/layout/reader_webtoon_settings.xml
2021-03-28 18:01:39 -04:00
arkon
75f0ab2f40 Split general and reading mode sheet settings
(cherry picked from commit 64c47bbaedeeca6d2bff81cf37baee01e2067306)

# Conflicts:
#	app/src/main/java/eu/kanade/tachiyomi/ui/reader/setting/ReaderGeneralSettings.kt
#	app/src/main/res/layout/reader_general_settings.xml
#	app/src/main/res/layout/reader_pager_settings.xml
#	app/src/main/res/layout/reader_webtoon_settings.xml
2021-03-28 17:47:31 -04:00
scb261
a4c10394b6
Split transition animation setting for webtoon and pager (#230)
* Split transition animation setting for webtoon and pager

* Move variables

* Rename config variables back
2021-02-26 14:51:51 -05:00
arkon
a0981c4944 Minor cleanup
(cherry picked from commit 135cf9960fbbb479cdabae02602a3c55b2d211c3)
2021-01-04 01:14:45 -05:00
Andreas E
aab3ba5b48 Navigation settings and split invert tapping for webtoon and pager (#4233)
(cherry picked from commit 3bf7c74f9343542be74495d4cb48d1fe615839cb)

# Conflicts:
#	app/src/main/java/eu/kanade/tachiyomi/ui/reader/ReaderSettingsSheet.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/reader/viewer/webtoon/WebtoonConfig.kt
#	app/src/main/res/layout/reader_settings_sheet.xml
2021-01-04 01:08:35 -05:00