From 679c1c3719bafec851c72594d83cdacd4cb6d5af Mon Sep 17 00:00:00 2001
From: Torsten Grote <t@grobox.de>
Date: Wed, 20 Jun 2018 11:59:53 -0300
Subject: [PATCH] Fix RSS feed delete button and disabled button text

---
 .../src/main/res/color/button_text.xml        |  2 +-
 .../layout-land/fragment_keyagreement_id.xml  | 31 ++++++++++---------
 .../main/res/layout/list_item_rss_feed.xml    | 13 ++++----
 .../src/main/res/values-night/color.xml       |  2 ++
 briar-android/src/main/res/values/color.xml   |  1 +
 5 files changed, 27 insertions(+), 22 deletions(-)

diff --git a/briar-android/src/main/res/color/button_text.xml b/briar-android/src/main/res/color/button_text.xml
index bbe56156e..1f1c03e9f 100644
--- a/briar-android/src/main/res/color/button_text.xml
+++ b/briar-android/src/main/res/color/button_text.xml
@@ -2,7 +2,7 @@
 <selector
 	xmlns:android="http://schemas.android.com/apk/res/android">
 	<item
-		android:color="?attr/colorControlNormal"
+		android:color="@color/briar_button_text_disabled"
 		android:state_enabled="false"/>
 	<item
 		android:color="#ffffffff"/>
diff --git a/briar-android/src/main/res/layout-land/fragment_keyagreement_id.xml b/briar-android/src/main/res/layout-land/fragment_keyagreement_id.xml
index c1f5cb114..9064b8527 100644
--- a/briar-android/src/main/res/layout-land/fragment_keyagreement_id.xml
+++ b/briar-android/src/main/res/layout-land/fragment_keyagreement_id.xml
@@ -22,10 +22,11 @@
 			android:padding="@dimen/margin_medium"
 			android:scaleType="fitCenter"
 			android:src="@drawable/qr_code_intro"
-			app:layout_constraintTop_toTopOf="parent"
-			app:layout_constraintStart_toStartOf="parent"
+			android:tint="@color/color_primary"
+			app:layout_constraintBottom_toBottomOf="@id/explanationText"
 			app:layout_constraintEnd_toStartOf="@id/explanationText"
-			app:layout_constraintBottom_toBottomOf="@id/explanationText"/>
+			app:layout_constraintStart_toStartOf="parent"
+			app:layout_constraintTop_toTopOf="parent"/>
 
 		<ImageView
 			android:id="@+id/explanationImage"
@@ -33,16 +34,16 @@
 			android:layout_height="wrap_content"
 			android:layout_weight="1"
 			android:adjustViewBounds="true"
-			android:paddingTop="@dimen/margin_large"
 			android:paddingLeft="@dimen/margin_large"
 			android:paddingRight="@dimen/margin_large"
+			android:paddingTop="@dimen/margin_large"
 			android:scaleType="fitCenter"
 			android:src="@drawable/qr_code_explanation"
-			tools:ignore="ContentDescription"
-			app:layout_constraintTop_toTopOf="parent"
-			app:layout_constraintStart_toEndOf="@id/diagram"
+			app:layout_constraintBottom_toTopOf="@id/explanationText"
 			app:layout_constraintEnd_toEndOf="parent"
-			app:layout_constraintBottom_toTopOf="@id/explanationText"/>
+			app:layout_constraintStart_toEndOf="@id/diagram"
+			app:layout_constraintTop_toTopOf="parent"
+			tools:ignore="ContentDescription"/>
 
 		<TextView
 			android:id="@+id/explanationText"
@@ -51,19 +52,19 @@
 			android:layout_weight="1"
 			android:padding="@dimen/margin_large"
 			android:text="@string/face_to_face"
-			app:layout_constraintTop_toBottomOf="@id/explanationImage"
+			app:layout_constraintEnd_toEndOf="parent"
 			app:layout_constraintStart_toEndOf="@id/diagram"
-			app:layout_constraintEnd_toEndOf="parent"/>
+			app:layout_constraintTop_toBottomOf="@id/explanationImage"/>
 
 		<View
 			android:id="@+id/explanationBorder"
 			android:layout_width="0dp"
 			android:layout_height="0dp"
 			android:background="@drawable/border_explanation"
-			app:layout_constraintTop_toTopOf="@id/explanationImage"
-			app:layout_constraintStart_toStartOf="@id/explanationImage"
+			app:layout_constraintBottom_toBottomOf="@id/explanationText"
 			app:layout_constraintEnd_toEndOf="@id/explanationImage"
-			app:layout_constraintBottom_toBottomOf="@id/explanationText"/>
+			app:layout_constraintStart_toStartOf="@id/explanationImage"
+			app:layout_constraintTop_toTopOf="@id/explanationImage"/>
 
 		<android.support.constraint.Barrier
 			android:id="@+id/barrier"
@@ -80,8 +81,8 @@
 			android:layout_gravity="center_horizontal"
 			android:layout_marginTop="@dimen/margin_medium"
 			android:text="@string/continue_button"
-			app:layout_constraintTop_toBottomOf="@id/barrier"
-			app:layout_constraintBottom_toBottomOf="parent"/>
+			app:layout_constraintBottom_toBottomOf="parent"
+			app:layout_constraintTop_toBottomOf="@id/barrier"/>
 
 	</android.support.constraint.ConstraintLayout>
 
diff --git a/briar-android/src/main/res/layout/list_item_rss_feed.xml b/briar-android/src/main/res/layout/list_item_rss_feed.xml
index 750f8a126..3bc3d3aea 100644
--- a/briar-android/src/main/res/layout/list_item_rss_feed.xml
+++ b/briar-android/src/main/res/layout/list_item_rss_feed.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <RelativeLayout
 	xmlns:android="http://schemas.android.com/apk/res/android"
+	xmlns:app="http://schemas.android.com/apk/res-auto"
 	xmlns:tools="http://schemas.android.com/tools"
 	android:layout_width="match_parent"
 	android:layout_height="wrap_content"
@@ -19,16 +20,16 @@
 		android:textSize="@dimen/text_size_medium"
 		tools:text="This is a name of a RSS Feed"/>
 
-	<ImageButton
+	<android.support.v7.widget.AppCompatImageButton
 		android:id="@+id/deleteButton"
-		android:layout_width="wrap_content"
-		android:layout_height="wrap_content"
+		android:layout_width="@dimen/button_size"
+		android:layout_height="@dimen/button_size"
 		android:layout_alignParentRight="true"
 		android:layout_alignParentTop="true"
-		android:layout_marginEnd="@dimen/listitem_horizontal_margin"
-		android:layout_marginRight="@dimen/listitem_horizontal_margin"
+		android:background="?attr/selectableItemBackground"
 		android:contentDescription="@string/delete"
-		android:src="@drawable/action_delete_black"/>
+		android:src="@drawable/action_delete_black"
+		app:tint="?attr/colorControlNormal"/>
 
 	<TextView
 		android:id="@+id/author"
diff --git a/briar-android/src/main/res/values-night/color.xml b/briar-android/src/main/res/values-night/color.xml
index e15fb0256..ef06c3838 100644
--- a/briar-android/src/main/res/values-night/color.xml
+++ b/briar-android/src/main/res/values-night/color.xml
@@ -10,6 +10,8 @@
 	<color name="card_background">@color/cardview_dark_background</color>
 	<color name="divider">#666666</color>
 
+	<color name="briar_button_text_disabled">#23cccccc</color>
+
 	<color name="thread_item_background">@color/window_background</color>
 	<color name="thread_item_highlight">#000000</color>
 
diff --git a/briar-android/src/main/res/values/color.xml b/briar-android/src/main/res/values/color.xml
index 7fedb0cbf..5087a5666 100644
--- a/briar-android/src/main/res/values/color.xml
+++ b/briar-android/src/main/res/values/color.xml
@@ -30,6 +30,7 @@
 
 	<color name="briar_button_positive">@color/briar_link</color>
 	<color name="briar_button_negative">#ff0000</color>
+	<color name="briar_button_text_disabled">#28000000</color>
 	<color name="briar_warning_background">#ff0000</color>
 
 	<color name="thread_indicator">#9e9e9e</color>