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 |
|
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
|
5b9d2175e2
|
Reorganize reader sheet contents a bit
(cherry picked from commit c255f57d956a6f81d4a1ea6c22e1ca29d81d28ba)
# Conflicts:
# app/src/main/res/layout/reader_general_settings.xml
|
2021-03-28 17:49:40 -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 |
|
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 |
|