From d7a89b0f8cd57b8da467d2876a2448ca5c82c0a7 Mon Sep 17 00:00:00 2001 From: arkon Date: Sat, 11 Jul 2020 18:58:04 -0400 Subject: [PATCH] Remove 32-bit color setting from reader sheet --- .../ui/reader/ReaderSettingsSheet.kt | 7 --- .../main/res/layout/reader_settings_sheet.xml | 63 ++++++++++--------- 2 files changed, 33 insertions(+), 37 deletions(-) diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/reader/ReaderSettingsSheet.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/reader/ReaderSettingsSheet.kt index 773ab36199..7f7f99dab4 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/reader/ReaderSettingsSheet.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/reader/ReaderSettingsSheet.kt @@ -1,6 +1,5 @@ package eu.kanade.tachiyomi.ui.reader -import android.os.Build import android.os.Bundle import android.widget.CompoundButton import android.widget.Spinner @@ -30,7 +29,6 @@ import kotlinx.android.synthetic.main.reader_settings_sheet.rotation_mode import kotlinx.android.synthetic.main.reader_settings_sheet.scale_type import kotlinx.android.synthetic.main.reader_settings_sheet.show_page_number import kotlinx.android.synthetic.main.reader_settings_sheet.tapping_inverted -import kotlinx.android.synthetic.main.reader_settings_sheet.true_color import kotlinx.android.synthetic.main.reader_settings_sheet.viewer import kotlinx.android.synthetic.main.reader_settings_sheet.webtoon_prefs_group import kotlinx.android.synthetic.main.reader_settings_sheet.webtoon_side_padding @@ -93,11 +91,6 @@ class ReaderSettingsSheet(private val activity: ReaderActivity) : BottomSheetDia always_show_chapter_transition.bindToPreference(preferences.alwaysShowChapterTransition()) crop_borders.bindToPreference(preferences.cropBorders()) page_transitions.bindToPreference(preferences.pageTransitions()) - - if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) { - true_color.visible() - true_color.bindToPreference(preferences.trueColor()) - } } /** diff --git a/app/src/main/res/layout/reader_settings_sheet.xml b/app/src/main/res/layout/reader_settings_sheet.xml index fd34dfc766..bf667d23a2 100644 --- a/app/src/main/res/layout/reader_settings_sheet.xml +++ b/app/src/main/res/layout/reader_settings_sheet.xml @@ -60,7 +60,7 @@ app:layout_constraintStart_toEndOf="@id/verticalcenter" app:layout_constraintTop_toBottomOf="@id/series_prefs" /> - + + + + + + + + + + app:layout_constraintTop_toBottomOf="@id/display_prefs" /> - - - - - - + app:layout_constraintTop_toBottomOf="@id/long_tap" /> + app:layout_constraintBottom_toBottomOf="@id/always_show_chapter_transition" />