diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/reader/ReaderColorFilterSheet.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/reader/ReaderColorFilterSheet.kt index b70f3f2c0..f4227ca8e 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/reader/ReaderColorFilterSheet.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/reader/ReaderColorFilterSheet.kt @@ -10,19 +10,19 @@ import eu.kanade.tachiyomi.R import eu.kanade.tachiyomi.data.preference.PreferencesHelper import eu.kanade.tachiyomi.widget.IgnoreFirstSpinnerListener import eu.kanade.tachiyomi.widget.SimpleSeekBarListener -import kotlinx.android.synthetic.main.reader_color_filter.brightness_seekbar -import kotlinx.android.synthetic.main.reader_color_filter.color_filter_mode -import kotlinx.android.synthetic.main.reader_color_filter.custom_brightness -import kotlinx.android.synthetic.main.reader_color_filter.seekbar_color_filter_alpha -import kotlinx.android.synthetic.main.reader_color_filter.seekbar_color_filter_blue -import kotlinx.android.synthetic.main.reader_color_filter.seekbar_color_filter_green -import kotlinx.android.synthetic.main.reader_color_filter.seekbar_color_filter_red -import kotlinx.android.synthetic.main.reader_color_filter.switch_color_filter -import kotlinx.android.synthetic.main.reader_color_filter.txt_brightness_seekbar_value -import kotlinx.android.synthetic.main.reader_color_filter.txt_color_filter_alpha_value -import kotlinx.android.synthetic.main.reader_color_filter.txt_color_filter_blue_value -import kotlinx.android.synthetic.main.reader_color_filter.txt_color_filter_green_value -import kotlinx.android.synthetic.main.reader_color_filter.txt_color_filter_red_value +import kotlinx.android.synthetic.main.reader_color_filter_sheet.brightness_seekbar +import kotlinx.android.synthetic.main.reader_color_filter_sheet.color_filter_mode +import kotlinx.android.synthetic.main.reader_color_filter_sheet.custom_brightness +import kotlinx.android.synthetic.main.reader_color_filter_sheet.seekbar_color_filter_alpha +import kotlinx.android.synthetic.main.reader_color_filter_sheet.seekbar_color_filter_blue +import kotlinx.android.synthetic.main.reader_color_filter_sheet.seekbar_color_filter_green +import kotlinx.android.synthetic.main.reader_color_filter_sheet.seekbar_color_filter_red +import kotlinx.android.synthetic.main.reader_color_filter_sheet.switch_color_filter +import kotlinx.android.synthetic.main.reader_color_filter_sheet.txt_brightness_seekbar_value +import kotlinx.android.synthetic.main.reader_color_filter_sheet.txt_color_filter_alpha_value +import kotlinx.android.synthetic.main.reader_color_filter_sheet.txt_color_filter_blue_value +import kotlinx.android.synthetic.main.reader_color_filter_sheet.txt_color_filter_green_value +import kotlinx.android.synthetic.main.reader_color_filter_sheet.txt_color_filter_red_value import kotlinx.coroutines.flow.launchIn import kotlinx.coroutines.flow.onEach import kotlinx.coroutines.flow.sample diff --git a/app/src/main/res/layout/reader_color_filter.xml b/app/src/main/res/layout/reader_color_filter.xml deleted file mode 100644 index 00f8efe06..000000000 --- a/app/src/main/res/layout/reader_color_filter.xml +++ /dev/null @@ -1,234 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/app/src/main/res/layout/reader_color_filter_sheet.xml b/app/src/main/res/layout/reader_color_filter_sheet.xml index 64e9b0fe6..00f8efe06 100644 --- a/app/src/main/res/layout/reader_color_filter_sheet.xml +++ b/app/src/main/res/layout/reader_color_filter_sheet.xml @@ -1,15 +1,234 @@ - + android:padding="16dp"> - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + android:layout_height="wrap_content" + android:layout_marginTop="16dp" + android:text="@string/pref_custom_brightness" + app:layout_constraintTop_toBottomOf="@id/color_filter_mode_text" /> - + - + - + + + + + + +