From beaffc38706120e4d89d50354738b6901f3c636b Mon Sep 17 00:00:00 2001
From: arkon <eugcheung94@gmail.com>
Date: Sat, 11 Jul 2020 19:16:49 -0400
Subject: [PATCH] Remove redundant layout for reader color filter sheet

---
 .../ui/reader/ReaderColorFilterSheet.kt       |  26 +-
 .../main/res/layout/reader_color_filter.xml   | 234 ------------------
 .../res/layout/reader_color_filter_sheet.xml  | 233 ++++++++++++++++-
 3 files changed, 239 insertions(+), 254 deletions(-)
 delete mode 100644 app/src/main/res/layout/reader_color_filter.xml

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 @@
-<?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:padding="16dp">
-
-    <android.widget.Space
-        android:id="@+id/spinner_end"
-        android:layout_width="16dp"
-        android:layout_height="0dp"
-        app:layout_constraintStart_toEndOf="parent" />
-
-    <!-- Color filter -->
-
-    <com.google.android.material.switchmaterial.SwitchMaterial
-        android:id="@+id/switch_color_filter"
-        android:layout_width="0dp"
-        android:layout_height="wrap_content"
-        android:text="@string/pref_custom_color_filter"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent" />
-
-    <!-- Red filter -->
-
-    <SeekBar
-        android:id="@+id/seekbar_color_filter_red"
-        android:layout_width="0dp"
-        android:layout_height="wrap_content"
-        android:layout_marginStart="8dp"
-        android:layout_marginEnd="8dp"
-        android:max="255"
-        android:padding="@dimen/material_component_text_fields_floating_label_padding_between_label_and_input_text"
-        app:layout_constraintEnd_toStartOf="@id/txt_color_filter_red_value"
-        app:layout_constraintStart_toEndOf="@id/txt_color_filter_red_symbol"
-        app:layout_constraintTop_toBottomOf="@id/switch_color_filter" />
-
-    <TextView
-        android:id="@+id/txt_color_filter_red_symbol"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:text="@string/color_filter_r_value"
-        android:textAppearance="@style/TextAppearance.Regular.SubHeading.Secondary"
-        app:layout_constraintBottom_toBottomOf="@id/seekbar_color_filter_red"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="@id/seekbar_color_filter_red" />
-
-    <TextView
-        android:id="@+id/txt_color_filter_red_value"
-        android:layout_width="30dp"
-        android:layout_height="wrap_content"
-        android:layout_alignParentEnd="true"
-        android:textAppearance="@style/TextAppearance.Regular.SubHeading.Secondary"
-        app:layout_constraintBottom_toBottomOf="@id/seekbar_color_filter_red"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintTop_toTopOf="@id/seekbar_color_filter_red" />
-
-    <!-- Green filter -->
-
-    <SeekBar
-        android:id="@+id/seekbar_color_filter_green"
-        android:layout_width="0dp"
-        android:layout_height="wrap_content"
-        android:layout_marginStart="8dp"
-        android:layout_marginEnd="8dp"
-        android:max="255"
-        android:padding="@dimen/material_component_text_fields_floating_label_padding_between_label_and_input_text"
-        app:layout_constraintEnd_toStartOf="@id/txt_color_filter_green_value"
-        app:layout_constraintStart_toEndOf="@id/txt_color_filter_green_symbol"
-        app:layout_constraintTop_toBottomOf="@id/seekbar_color_filter_red" />
-
-    <TextView
-        android:id="@+id/txt_color_filter_green_symbol"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:text="@string/color_filter_g_value"
-        android:textAppearance="@style/TextAppearance.Regular.SubHeading.Secondary"
-        app:layout_constraintBottom_toBottomOf="@id/seekbar_color_filter_green"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="@id/seekbar_color_filter_green" />
-
-    <TextView
-        android:id="@+id/txt_color_filter_green_value"
-        android:layout_width="30dp"
-        android:layout_height="wrap_content"
-        android:layout_alignParentEnd="true"
-        android:textAppearance="@style/TextAppearance.Regular.SubHeading.Secondary"
-        app:layout_constraintBottom_toBottomOf="@id/seekbar_color_filter_green"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintTop_toTopOf="@id/seekbar_color_filter_green" />
-
-    <!-- Blue filter -->
-
-    <SeekBar
-        android:id="@+id/seekbar_color_filter_blue"
-        android:layout_width="0dp"
-        android:layout_height="wrap_content"
-        android:layout_marginStart="8dp"
-        android:layout_marginEnd="8dp"
-        android:max="255"
-        android:padding="@dimen/material_component_text_fields_floating_label_padding_between_label_and_input_text"
-        app:layout_constraintEnd_toStartOf="@id/txt_color_filter_blue_value"
-        app:layout_constraintStart_toEndOf="@id/txt_color_filter_blue_symbol"
-        app:layout_constraintTop_toBottomOf="@id/seekbar_color_filter_green" />
-
-    <TextView
-        android:id="@+id/txt_color_filter_blue_symbol"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:text="@string/color_filter_b_value"
-        android:textAppearance="@style/TextAppearance.Regular.SubHeading.Secondary"
-        app:layout_constraintBottom_toBottomOf="@id/seekbar_color_filter_blue"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="@id/seekbar_color_filter_blue" />
-
-    <TextView
-        android:id="@+id/txt_color_filter_blue_value"
-        android:layout_width="30dp"
-        android:layout_height="wrap_content"
-        android:layout_alignParentEnd="true"
-        android:textAppearance="@style/TextAppearance.Regular.SubHeading.Secondary"
-        app:layout_constraintBottom_toBottomOf="@id/seekbar_color_filter_blue"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintTop_toTopOf="@id/seekbar_color_filter_blue" />
-
-    <!-- Alpha filter -->
-
-    <SeekBar
-        android:id="@+id/seekbar_color_filter_alpha"
-        android:layout_width="0dp"
-        android:layout_height="wrap_content"
-        android:layout_marginStart="8dp"
-        android:layout_marginEnd="8dp"
-        android:max="255"
-        android:padding="@dimen/material_component_text_fields_floating_label_padding_between_label_and_input_text"
-        app:layout_constraintEnd_toStartOf="@id/txt_color_filter_alpha_value"
-        app:layout_constraintStart_toEndOf="@id/txt_color_filter_alpha_symbol"
-        app:layout_constraintTop_toBottomOf="@id/seekbar_color_filter_blue" />
-
-    <TextView
-        android:id="@+id/txt_color_filter_alpha_symbol"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:text="@string/color_filter_a_value"
-        android:textAppearance="@style/TextAppearance.Regular.SubHeading.Secondary"
-        app:layout_constraintBottom_toBottomOf="@id/seekbar_color_filter_alpha"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="@id/seekbar_color_filter_alpha" />
-
-    <TextView
-        android:id="@+id/txt_color_filter_alpha_value"
-        android:layout_width="30dp"
-        android:layout_height="wrap_content"
-        android:layout_alignParentEnd="true"
-        android:textAppearance="@style/TextAppearance.Regular.SubHeading.Secondary"
-        app:layout_constraintBottom_toBottomOf="@id/seekbar_color_filter_alpha"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintTop_toTopOf="@id/seekbar_color_filter_alpha" />
-
-    <!-- Filter mode -->
-
-    <TextView
-        android:id="@+id/color_filter_mode_text"
-        android:layout_width="0dp"
-        android:layout_height="wrap_content"
-        android:text="@string/pref_color_filter_mode"
-        app:layout_constraintBaseline_toBaselineOf="@id/color_filter_mode"
-        app:layout_constraintEnd_toStartOf="@id/color_filter_mode"
-        app:layout_constraintStart_toStartOf="parent" />
-
-    <androidx.appcompat.widget.AppCompatSpinner
-        android:id="@+id/color_filter_mode"
-        android:layout_width="0dp"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="16dp"
-        android:entries="@array/color_filter_modes"
-        app:layout_constraintEnd_toEndOf="@id/spinner_end"
-        app:layout_constraintStart_toEndOf="@id/verticalcenter"
-        app:layout_constraintTop_toBottomOf="@id/seekbar_color_filter_alpha" />
-
-    <!-- Brightness -->
-
-    <com.google.android.material.switchmaterial.SwitchMaterial
-        android:id="@+id/custom_brightness"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="16dp"
-        android:text="@string/pref_custom_brightness"
-        app:layout_constraintTop_toBottomOf="@id/color_filter_mode_text" />
-
-    <!-- Brightness value -->
-
-    <eu.kanade.tachiyomi.widget.NegativeSeekBar
-        android:id="@+id/brightness_seekbar"
-        android:layout_width="0dp"
-        android:layout_height="wrap_content"
-        android:layout_marginStart="8dp"
-        android:layout_marginEnd="8dp"
-        android:padding="@dimen/material_component_text_fields_floating_label_padding_between_label_and_input_text"
-        app:layout_constraintEnd_toStartOf="@id/txt_brightness_seekbar_value"
-        app:layout_constraintStart_toEndOf="@id/txt_brightness_seekbar_icon"
-        app:layout_constraintTop_toBottomOf="@id/custom_brightness"
-        app:max_seek="100"
-        app:min_seek="-75" />
-
-    <androidx.appcompat.widget.AppCompatImageView
-        android:id="@+id/txt_brightness_seekbar_icon"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:textAppearance="@style/TextAppearance.Regular.SubHeading.Secondary"
-        android:tint="?attr/colorOnBackground"
-        app:layout_constraintBottom_toBottomOf="@id/brightness_seekbar"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="@id/brightness_seekbar"
-        app:srcCompat="@drawable/ic_brightness_5_24dp" />
-
-    <TextView
-        android:id="@+id/txt_brightness_seekbar_value"
-        android:layout_width="30dp"
-        android:layout_height="wrap_content"
-        android:textAppearance="@style/TextAppearance.Regular.SubHeading.Secondary"
-        app:layout_constraintBottom_toBottomOf="@id/brightness_seekbar"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintTop_toTopOf="@id/brightness_seekbar" />
-
-    <androidx.constraintlayout.widget.Guideline
-        android:id="@+id/verticalcenter"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:orientation="vertical"
-        app:layout_constraintGuide_percent="0.5" />
-
-</androidx.constraintlayout.widget.ConstraintLayout>
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 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:orientation="vertical">
+    android:padding="16dp">
 
-    <androidx.core.widget.NestedScrollView
+    <android.widget.Space
+        android:id="@+id/spinner_end"
+        android:layout_width="16dp"
+        android:layout_height="0dp"
+        app:layout_constraintStart_toEndOf="parent" />
+
+    <!-- Color filter -->
+
+    <com.google.android.material.switchmaterial.SwitchMaterial
+        android:id="@+id/switch_color_filter"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:text="@string/pref_custom_color_filter"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent" />
+
+    <!-- Red filter -->
+
+    <SeekBar
+        android:id="@+id/seekbar_color_filter_red"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:layout_marginStart="8dp"
+        android:layout_marginEnd="8dp"
+        android:max="255"
+        android:padding="@dimen/material_component_text_fields_floating_label_padding_between_label_and_input_text"
+        app:layout_constraintEnd_toStartOf="@id/txt_color_filter_red_value"
+        app:layout_constraintStart_toEndOf="@id/txt_color_filter_red_symbol"
+        app:layout_constraintTop_toBottomOf="@id/switch_color_filter" />
+
+    <TextView
+        android:id="@+id/txt_color_filter_red_symbol"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="@string/color_filter_r_value"
+        android:textAppearance="@style/TextAppearance.Regular.SubHeading.Secondary"
+        app:layout_constraintBottom_toBottomOf="@id/seekbar_color_filter_red"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="@id/seekbar_color_filter_red" />
+
+    <TextView
+        android:id="@+id/txt_color_filter_red_value"
+        android:layout_width="30dp"
+        android:layout_height="wrap_content"
+        android:layout_alignParentEnd="true"
+        android:textAppearance="@style/TextAppearance.Regular.SubHeading.Secondary"
+        app:layout_constraintBottom_toBottomOf="@id/seekbar_color_filter_red"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintTop_toTopOf="@id/seekbar_color_filter_red" />
+
+    <!-- Green filter -->
+
+    <SeekBar
+        android:id="@+id/seekbar_color_filter_green"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:layout_marginStart="8dp"
+        android:layout_marginEnd="8dp"
+        android:max="255"
+        android:padding="@dimen/material_component_text_fields_floating_label_padding_between_label_and_input_text"
+        app:layout_constraintEnd_toStartOf="@id/txt_color_filter_green_value"
+        app:layout_constraintStart_toEndOf="@id/txt_color_filter_green_symbol"
+        app:layout_constraintTop_toBottomOf="@id/seekbar_color_filter_red" />
+
+    <TextView
+        android:id="@+id/txt_color_filter_green_symbol"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="@string/color_filter_g_value"
+        android:textAppearance="@style/TextAppearance.Regular.SubHeading.Secondary"
+        app:layout_constraintBottom_toBottomOf="@id/seekbar_color_filter_green"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="@id/seekbar_color_filter_green" />
+
+    <TextView
+        android:id="@+id/txt_color_filter_green_value"
+        android:layout_width="30dp"
+        android:layout_height="wrap_content"
+        android:layout_alignParentEnd="true"
+        android:textAppearance="@style/TextAppearance.Regular.SubHeading.Secondary"
+        app:layout_constraintBottom_toBottomOf="@id/seekbar_color_filter_green"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintTop_toTopOf="@id/seekbar_color_filter_green" />
+
+    <!-- Blue filter -->
+
+    <SeekBar
+        android:id="@+id/seekbar_color_filter_blue"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:layout_marginStart="8dp"
+        android:layout_marginEnd="8dp"
+        android:max="255"
+        android:padding="@dimen/material_component_text_fields_floating_label_padding_between_label_and_input_text"
+        app:layout_constraintEnd_toStartOf="@id/txt_color_filter_blue_value"
+        app:layout_constraintStart_toEndOf="@id/txt_color_filter_blue_symbol"
+        app:layout_constraintTop_toBottomOf="@id/seekbar_color_filter_green" />
+
+    <TextView
+        android:id="@+id/txt_color_filter_blue_symbol"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="@string/color_filter_b_value"
+        android:textAppearance="@style/TextAppearance.Regular.SubHeading.Secondary"
+        app:layout_constraintBottom_toBottomOf="@id/seekbar_color_filter_blue"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="@id/seekbar_color_filter_blue" />
+
+    <TextView
+        android:id="@+id/txt_color_filter_blue_value"
+        android:layout_width="30dp"
+        android:layout_height="wrap_content"
+        android:layout_alignParentEnd="true"
+        android:textAppearance="@style/TextAppearance.Regular.SubHeading.Secondary"
+        app:layout_constraintBottom_toBottomOf="@id/seekbar_color_filter_blue"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintTop_toTopOf="@id/seekbar_color_filter_blue" />
+
+    <!-- Alpha filter -->
+
+    <SeekBar
+        android:id="@+id/seekbar_color_filter_alpha"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:layout_marginStart="8dp"
+        android:layout_marginEnd="8dp"
+        android:max="255"
+        android:padding="@dimen/material_component_text_fields_floating_label_padding_between_label_and_input_text"
+        app:layout_constraintEnd_toStartOf="@id/txt_color_filter_alpha_value"
+        app:layout_constraintStart_toEndOf="@id/txt_color_filter_alpha_symbol"
+        app:layout_constraintTop_toBottomOf="@id/seekbar_color_filter_blue" />
+
+    <TextView
+        android:id="@+id/txt_color_filter_alpha_symbol"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="@string/color_filter_a_value"
+        android:textAppearance="@style/TextAppearance.Regular.SubHeading.Secondary"
+        app:layout_constraintBottom_toBottomOf="@id/seekbar_color_filter_alpha"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="@id/seekbar_color_filter_alpha" />
+
+    <TextView
+        android:id="@+id/txt_color_filter_alpha_value"
+        android:layout_width="30dp"
+        android:layout_height="wrap_content"
+        android:layout_alignParentEnd="true"
+        android:textAppearance="@style/TextAppearance.Regular.SubHeading.Secondary"
+        app:layout_constraintBottom_toBottomOf="@id/seekbar_color_filter_alpha"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintTop_toTopOf="@id/seekbar_color_filter_alpha" />
+
+    <!-- Filter mode -->
+
+    <TextView
+        android:id="@+id/color_filter_mode_text"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:text="@string/pref_color_filter_mode"
+        app:layout_constraintBaseline_toBaselineOf="@id/color_filter_mode"
+        app:layout_constraintEnd_toStartOf="@id/color_filter_mode"
+        app:layout_constraintStart_toStartOf="parent" />
+
+    <androidx.appcompat.widget.AppCompatSpinner
+        android:id="@+id/color_filter_mode"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="16dp"
+        android:entries="@array/color_filter_modes"
+        app:layout_constraintEnd_toEndOf="@id/spinner_end"
+        app:layout_constraintStart_toEndOf="@id/verticalcenter"
+        app:layout_constraintTop_toBottomOf="@id/seekbar_color_filter_alpha" />
+
+    <!-- Brightness -->
+
+    <com.google.android.material.switchmaterial.SwitchMaterial
+        android:id="@+id/custom_brightness"
         android:layout_width="match_parent"
-        android:layout_height="match_parent">
+        android:layout_height="wrap_content"
+        android:layout_marginTop="16dp"
+        android:text="@string/pref_custom_brightness"
+        app:layout_constraintTop_toBottomOf="@id/color_filter_mode_text" />
 
-        <include layout="@layout/reader_color_filter" />
+    <!-- Brightness value -->
 
-    </androidx.core.widget.NestedScrollView>
+    <eu.kanade.tachiyomi.widget.NegativeSeekBar
+        android:id="@+id/brightness_seekbar"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:layout_marginStart="8dp"
+        android:layout_marginEnd="8dp"
+        android:padding="@dimen/material_component_text_fields_floating_label_padding_between_label_and_input_text"
+        app:layout_constraintEnd_toStartOf="@id/txt_brightness_seekbar_value"
+        app:layout_constraintStart_toEndOf="@id/txt_brightness_seekbar_icon"
+        app:layout_constraintTop_toBottomOf="@id/custom_brightness"
+        app:max_seek="100"
+        app:min_seek="-75" />
 
-</LinearLayout>
+    <androidx.appcompat.widget.AppCompatImageView
+        android:id="@+id/txt_brightness_seekbar_icon"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:textAppearance="@style/TextAppearance.Regular.SubHeading.Secondary"
+        android:tint="?attr/colorOnBackground"
+        app:layout_constraintBottom_toBottomOf="@id/brightness_seekbar"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="@id/brightness_seekbar"
+        app:srcCompat="@drawable/ic_brightness_5_24dp" />
+
+    <TextView
+        android:id="@+id/txt_brightness_seekbar_value"
+        android:layout_width="30dp"
+        android:layout_height="wrap_content"
+        android:textAppearance="@style/TextAppearance.Regular.SubHeading.Secondary"
+        app:layout_constraintBottom_toBottomOf="@id/brightness_seekbar"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintTop_toTopOf="@id/brightness_seekbar" />
+
+    <androidx.constraintlayout.widget.Guideline
+        android:id="@+id/verticalcenter"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:orientation="vertical"
+        app:layout_constraintGuide_percent="0.5" />
+
+</androidx.constraintlayout.widget.ConstraintLayout>