From 8c4d6ed5e40cfebb89fecb3943fd3dddb47f7c29 Mon Sep 17 00:00:00 2001
From: Torsten Grote <t@grobox.de>
Date: Thu, 1 Jul 2021 12:15:39 -0300
Subject: [PATCH] Remove guidelines for percent based laout width

---
 .../src/main/res/layout/fragment_final.xml    | 19 +++--------------
 .../layout/fragment_transfer_data_chooser.xml | 19 +++--------------
 .../layout/fragment_transfer_data_receive.xml | 21 ++++---------------
 .../layout/fragment_transfer_data_send.xml    | 19 +++--------------
 4 files changed, 13 insertions(+), 65 deletions(-)

diff --git a/briar-android/src/main/res/layout/fragment_final.xml b/briar-android/src/main/res/layout/fragment_final.xml
index c4866d8ae..7bf37a536 100644
--- a/briar-android/src/main/res/layout/fragment_final.xml
+++ b/briar-android/src/main/res/layout/fragment_final.xml
@@ -10,20 +10,6 @@
 		android:layout_width="match_parent"
 		android:layout_height="wrap_content">
 
-		<androidx.constraintlayout.widget.Guideline
-			android:id="@+id/imageLeftGuideline"
-			android:layout_width="wrap_content"
-			android:layout_height="wrap_content"
-			android:orientation="vertical"
-			app:layout_constraintGuide_percent=".3" />
-
-		<androidx.constraintlayout.widget.Guideline
-			android:id="@+id/imageRightGuideline"
-			android:layout_width="wrap_content"
-			android:layout_height="wrap_content"
-			android:orientation="vertical"
-			app:layout_constraintGuide_percent=".7" />
-
 		<ImageView
 			android:id="@+id/iconView"
 			android:layout_width="0dp"
@@ -31,12 +17,13 @@
 			android:layout_marginTop="32dp"
 			app:layout_constraintBottom_toTopOf="@+id/titleView"
 			app:layout_constraintDimensionRatio="1:1"
-			app:layout_constraintEnd_toEndOf="@+id/imageRightGuideline"
-			app:layout_constraintStart_toStartOf="@+id/imageLeftGuideline"
+			app:layout_constraintEnd_toEndOf="parent"
+			app:layout_constraintStart_toStartOf="parent"
 			app:layout_constraintTop_toTopOf="parent"
 			app:layout_constraintVertical_bias="0.25"
 			app:layout_constraintVertical_chainStyle="packed"
 			app:layout_constraintWidth_max="200dp"
+			app:layout_constraintWidth_percent="0.4"
 			tools:ignore="ContentDescription"
 			tools:srcCompat="@drawable/alerts_and_states_error"
 			tools:tint="@color/briar_red_500" />
diff --git a/briar-android/src/main/res/layout/fragment_transfer_data_chooser.xml b/briar-android/src/main/res/layout/fragment_transfer_data_chooser.xml
index ce75d30b5..532b3a0a4 100644
--- a/briar-android/src/main/res/layout/fragment_transfer_data_chooser.xml
+++ b/briar-android/src/main/res/layout/fragment_transfer_data_chooser.xml
@@ -10,20 +10,6 @@
 		android:layout_width="match_parent"
 		android:layout_height="wrap_content">
 
-		<androidx.constraintlayout.widget.Guideline
-			android:id="@+id/imageLeftGuideline"
-			android:layout_width="wrap_content"
-			android:layout_height="wrap_content"
-			android:orientation="vertical"
-			app:layout_constraintGuide_percent=".3" />
-
-		<androidx.constraintlayout.widget.Guideline
-			android:id="@+id/imageRightGuideline"
-			android:layout_width="wrap_content"
-			android:layout_height="wrap_content"
-			android:orientation="vertical"
-			app:layout_constraintGuide_percent=".7" />
-
 		<ImageView
 			android:id="@+id/imageView"
 			android:layout_width="0dp"
@@ -31,10 +17,11 @@
 			android:layout_marginTop="32dp"
 			app:layout_constraintBottom_toTopOf="@+id/introView"
 			app:layout_constraintDimensionRatio="1,1"
-			app:layout_constraintEnd_toEndOf="@+id/imageRightGuideline"
-			app:layout_constraintStart_toStartOf="@+id/imageLeftGuideline"
+			app:layout_constraintEnd_toEndOf="parent"
+			app:layout_constraintStart_toStartOf="parent"
 			app:layout_constraintTop_toTopOf="parent"
 			app:layout_constraintVertical_chainStyle="spread"
+			app:layout_constraintWidth_percent="0.4"
 			app:srcCompat="@drawable/ic_transfer_data"
 			tools:ignore="ContentDescription" />
 
diff --git a/briar-android/src/main/res/layout/fragment_transfer_data_receive.xml b/briar-android/src/main/res/layout/fragment_transfer_data_receive.xml
index d222572d4..52aa09a79 100644
--- a/briar-android/src/main/res/layout/fragment_transfer_data_receive.xml
+++ b/briar-android/src/main/res/layout/fragment_transfer_data_receive.xml
@@ -10,32 +10,19 @@
 		android:layout_width="match_parent"
 		android:layout_height="wrap_content">
 
-		<androidx.constraintlayout.widget.Guideline
-			android:id="@+id/imageLeftGuideline"
-			android:layout_width="wrap_content"
-			android:layout_height="wrap_content"
-			android:orientation="vertical"
-			app:layout_constraintGuide_percent=".2" />
-
-		<androidx.constraintlayout.widget.Guideline
-			android:id="@+id/imageRightGuideline"
-			android:layout_width="wrap_content"
-			android:layout_height="wrap_content"
-			android:orientation="vertical"
-			app:layout_constraintGuide_percent=".8" />
-
 		<ImageView
 			android:id="@+id/imageView"
 			android:layout_width="0dp"
 			android:layout_height="0dp"
 			android:layout_marginTop="32dp"
-			app:layout_constraintWidth_max="300dp"
 			app:layout_constraintBottom_toTopOf="@+id/progressBar"
 			app:layout_constraintDimensionRatio="1,2"
-			app:layout_constraintEnd_toEndOf="@+id/imageRightGuideline"
-			app:layout_constraintStart_toStartOf="@+id/imageLeftGuideline"
+			app:layout_constraintEnd_toEndOf="parent"
+			app:layout_constraintStart_toStartOf="parent"
 			app:layout_constraintTop_toTopOf="parent"
 			app:layout_constraintVertical_chainStyle="spread"
+			app:layout_constraintWidth_max="300dp"
+			app:layout_constraintWidth_percent="0.6"
 			app:srcCompat="@drawable/ic_transfer_data_send"
 			tools:ignore="ContentDescription" />
 
diff --git a/briar-android/src/main/res/layout/fragment_transfer_data_send.xml b/briar-android/src/main/res/layout/fragment_transfer_data_send.xml
index 7925869d4..56ef0f55f 100644
--- a/briar-android/src/main/res/layout/fragment_transfer_data_send.xml
+++ b/briar-android/src/main/res/layout/fragment_transfer_data_send.xml
@@ -10,20 +10,6 @@
 		android:layout_width="match_parent"
 		android:layout_height="wrap_content">
 
-		<androidx.constraintlayout.widget.Guideline
-			android:id="@+id/imageLeftGuideline"
-			android:layout_width="wrap_content"
-			android:layout_height="wrap_content"
-			android:orientation="vertical"
-			app:layout_constraintGuide_percent=".2" />
-
-		<androidx.constraintlayout.widget.Guideline
-			android:id="@+id/imageRightGuideline"
-			android:layout_width="wrap_content"
-			android:layout_height="wrap_content"
-			android:orientation="vertical"
-			app:layout_constraintGuide_percent=".8" />
-
 		<ImageView
 			android:id="@+id/imageView"
 			android:layout_width="0dp"
@@ -31,8 +17,9 @@
 			android:layout_marginTop="32dp"
 			app:layout_constraintBottom_toTopOf="@+id/progressBar"
 			app:layout_constraintDimensionRatio="1,2"
-			app:layout_constraintEnd_toEndOf="@+id/imageRightGuideline"
-			app:layout_constraintStart_toStartOf="@+id/imageLeftGuideline"
+			app:layout_constraintEnd_toEndOf="parent"
+			app:layout_constraintStart_toStartOf="parent"
+			app:layout_constraintWidth_percent="0.6"
 			app:layout_constraintTop_toTopOf="parent"
 			app:layout_constraintVertical_chainStyle="spread"
 			app:layout_constraintWidth_max="300dp"