From bddeb8622303d4832f58d488e1a4d61624c0725e Mon Sep 17 00:00:00 2001
From: Andreas E <andreas.everos@gmail.com>
Date: Tue, 29 Sep 2020 18:27:58 +0200
Subject: [PATCH] Fix color filter sheet content alignment (#3862)

Fix color filter sheet content alignment
---
 .../res/layout/reader_color_filter_sheet.xml    | 17 ++++++++++++-----
 1 file changed, 12 insertions(+), 5 deletions(-)

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 6237ab51e4..af8a16f357 100644
--- a/app/src/main/res/layout/reader_color_filter_sheet.xml
+++ b/app/src/main/res/layout/reader_color_filter_sheet.xml
@@ -33,7 +33,7 @@
         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_constraintStart_toEndOf="@id/color_filter_symbols_barrier"
         app:layout_constraintTop_toBottomOf="@id/switch_color_filter" />
 
     <TextView
@@ -67,7 +67,7 @@
         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_constraintStart_toEndOf="@id/color_filter_symbols_barrier"
         app:layout_constraintTop_toBottomOf="@id/seekbar_color_filter_red" />
 
     <TextView
@@ -101,7 +101,7 @@
         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_constraintStart_toEndOf="@id/color_filter_symbols_barrier"
         app:layout_constraintTop_toBottomOf="@id/seekbar_color_filter_green" />
 
     <TextView
@@ -135,7 +135,7 @@
         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_constraintStart_toEndOf="@id/color_filter_symbols_barrier"
         app:layout_constraintTop_toBottomOf="@id/seekbar_color_filter_blue" />
 
     <TextView
@@ -175,7 +175,7 @@
         android:layout_height="wrap_content"
         android:layout_marginTop="16dp"
         android:entries="@array/color_filter_modes"
-        app:layout_constraintEnd_toEndOf="@id/spinner_end"
+        app:layout_constraintEnd_toStartOf="@id/spinner_end"
         app:layout_constraintStart_toEndOf="@id/verticalcenter"
         app:layout_constraintTop_toBottomOf="@id/seekbar_color_filter_alpha" />
 
@@ -224,6 +224,13 @@
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintTop_toTopOf="@id/brightness_seekbar" />
 
+    <androidx.constraintlayout.widget.Barrier
+        android:id="@+id/color_filter_symbols_barrier"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        app:barrierDirection="end"
+        app:constraint_referenced_ids="txt_color_filter_alpha_symbol,txt_color_filter_blue_symbol,txt_color_filter_red_symbol,txt_color_filter_green_symbol" />
+
     <androidx.constraintlayout.widget.Guideline
         android:id="@+id/verticalcenter"
         android:layout_width="wrap_content"