From 0d75636720fa3775ace9c707ca6b8200ae01fdbf Mon Sep 17 00:00:00 2001
From: Torsten Grote <t@grobox.de>
Date: Mon, 22 Oct 2018 12:38:51 -0300
Subject: [PATCH] Rearrange layout so sending link comes first

---
 .../layout/fragment_contact_link_exchange.xml | 59 +++++++++----------
 briar-android/src/main/res/values/strings.xml |  4 +-
 2 files changed, 31 insertions(+), 32 deletions(-)

diff --git a/briar-android/src/main/res/layout/fragment_contact_link_exchange.xml b/briar-android/src/main/res/layout/fragment_contact_link_exchange.xml
index ccc9d5e64..f4762acda 100644
--- a/briar-android/src/main/res/layout/fragment_contact_link_exchange.xml
+++ b/briar-android/src/main/res/layout/fragment_contact_link_exchange.xml
@@ -4,8 +4,7 @@
 	xmlns:app="http://schemas.android.com/apk/res-auto"
 	xmlns:tools="http://schemas.android.com/tools"
 	android:layout_width="match_parent"
-	android:layout_height="match_parent"
-	android:fillViewport="true">
+	android:layout_height="match_parent">
 
 	<android.support.constraint.ConstraintLayout
 		android:layout_width="match_parent"
@@ -23,17 +22,16 @@
 			android:hint="@string/contact_name_hint"
 			android:importantForAutofill="no"
 			android:inputType="text|textCapWords"
-			app:layout_constraintBottom_toTopOf="@id/linkInput"
+			app:layout_constraintBottom_toTopOf="@+id/addButton"
 			app:layout_constraintEnd_toEndOf="parent"
 			app:layout_constraintStart_toStartOf="parent"
-			app:layout_constraintTop_toTopOf="parent"
-			app:layout_constraintVertical_chainStyle="packed"/>
+			app:layout_constraintTop_toBottomOf="@+id/pasteButton"/>
 
 		<EditText
 			android:id="@+id/linkInput"
 			android:layout_width="0dp"
 			android:layout_height="wrap_content"
-			android:layout_marginTop="@dimen/margin_xlarge"
+			android:layout_marginTop="16dp"
 			android:drawableLeft="@drawable/ic_link"
 			android:drawablePadding="8dp"
 			android:drawableStart="@drawable/ic_link"
@@ -41,25 +39,25 @@
 			android:hint="@string/contact_link_hint"
 			android:importantForAutofill="no"
 			android:inputType="textUri"
-			app:layout_constraintBottom_toTopOf="@id/pasteButton"
 			app:layout_constraintEnd_toEndOf="parent"
 			app:layout_constraintStart_toStartOf="parent"
-			app:layout_constraintTop_toBottomOf="@id/contactNameInput"/>
+			app:layout_constraintTop_toBottomOf="@+id/copyButton"/>
 
 		<Button
 			android:id="@+id/pasteButton"
 			style="@style/BriarButtonFlat.Positive.Tiny"
 			android:layout_width="wrap_content"
 			android:layout_height="wrap_content"
+			android:layout_marginLeft="8dp"
+			android:layout_marginStart="8dp"
 			android:drawableLeft="@drawable/ic_content_paste"
 			android:drawablePadding="8dp"
 			android:drawableStart="@drawable/ic_content_paste"
 			android:text="@string/paste_button"
-			app:layout_constraintBottom_toTopOf="@id/linkIntro"
+			app:layout_constraintBottom_toTopOf="@+id/contactNameInput"
 			app:layout_constraintEnd_toStartOf="@id/scanCodeButton"
-			app:layout_constraintHorizontal_bias="0.5"
 			app:layout_constraintStart_toStartOf="parent"
-			app:layout_constraintTop_toBottomOf="@id/linkInput"/>
+			app:layout_constraintTop_toBottomOf="@+id/linkInput"/>
 
 		<Button
 			android:id="@+id/scanCodeButton"
@@ -74,53 +72,54 @@
 			app:layout_constraintEnd_toEndOf="parent"
 			app:layout_constraintHorizontal_bias="0.5"
 			app:layout_constraintStart_toEndOf="@id/pasteButton"
-			app:layout_constraintTop_toBottomOf="@id/linkInput"/>
+			app:layout_constraintTop_toTopOf="@+id/pasteButton"
+			tools:visibility="visible"/>
 
 		<TextView
 			android:id="@+id/linkIntro"
 			android:layout_width="0dp"
 			android:layout_height="wrap_content"
-			android:layout_marginTop="@dimen/margin_xlarge"
-			android:gravity="center"
+			android:gravity="left|start"
 			android:text="@string/send_link_instructions"
-			android:textIsSelectable="true"
 			android:textSize="18sp"
-			app:layout_constraintBottom_toTopOf="@id/linkView"
+			app:layout_constraintBottom_toTopOf="@+id/linkView"
 			app:layout_constraintEnd_toEndOf="parent"
 			app:layout_constraintStart_toStartOf="parent"
-			app:layout_constraintTop_toBottomOf="@id/pasteButton"/>
+			app:layout_constraintTop_toTopOf="parent"
+			app:layout_constraintVertical_chainStyle="packed"/>
 
 		<TextView
 			android:id="@+id/linkView"
 			android:layout_width="0dp"
 			android:layout_height="wrap_content"
-			android:layout_marginTop="@dimen/margin_medium"
+			android:layout_marginTop="16dp"
 			android:background="@color/briar_white"
 			android:padding="8dp"
 			android:textColor="@color/briar_primary"
 			android:textIsSelectable="true"
 			android:textSize="18sp"
 			android:typeface="monospace"
-			app:layout_constraintBottom_toTopOf="@id/copyButton"
+			app:layout_constraintBottom_toTopOf="@+id/copyButton"
 			app:layout_constraintEnd_toEndOf="parent"
 			app:layout_constraintStart_toStartOf="parent"
-			app:layout_constraintTop_toBottomOf="@id/linkIntro"
-			tools:text="briar://scnsdflamslkfjgluoblmksdfbwevlewajfdlkjewwhqliafskfjhskdjhvoieiv"/>
+			app:layout_constraintTop_toBottomOf="@+id/linkIntro"
+			tools:text="briar://scnsdflamslkfjgluoblmksdfbwevlewajfdlkjewwhqliafskfjhskdjhvoieiv"
+			/>
 
 		<Button
 			android:id="@+id/copyButton"
 			style="@style/BriarButtonFlat.Positive.Tiny"
 			android:layout_width="wrap_content"
 			android:layout_height="wrap_content"
+			android:layout_marginTop="8dp"
 			android:drawableLeft="@drawable/ic_content_copy"
 			android:drawablePadding="8dp"
 			android:drawableStart="@drawable/ic_content_copy"
 			android:text="@string/copy_button"
-			app:layout_constraintBottom_toTopOf="@id/addButton"
+			app:layout_constraintBottom_toTopOf="@+id/linkInput"
 			app:layout_constraintEnd_toStartOf="@id/shareButton"
-			app:layout_constraintHorizontal_bias="0.5"
 			app:layout_constraintStart_toStartOf="parent"
-			app:layout_constraintTop_toBottomOf="@id/linkView"/>
+			app:layout_constraintTop_toBottomOf="@+id/linkView"/>
 
 		<Button
 			android:id="@+id/shareButton"
@@ -133,7 +132,6 @@
 			android:text="@string/share_button"
 			app:layout_constraintBottom_toBottomOf="@id/copyButton"
 			app:layout_constraintEnd_toStartOf="@id/showCodeButton"
-			app:layout_constraintHorizontal_bias="0.5"
 			app:layout_constraintStart_toEndOf="@id/copyButton"
 			app:layout_constraintTop_toTopOf="@id/copyButton"/>
 
@@ -150,22 +148,23 @@
 			android:visibility="gone"
 			app:layout_constraintBottom_toBottomOf="@id/copyButton"
 			app:layout_constraintEnd_toEndOf="parent"
-			app:layout_constraintHorizontal_bias="0.5"
 			app:layout_constraintStart_toEndOf="@id/shareButton"
-			app:layout_constraintTop_toTopOf="@id/copyButton"/>
+			app:layout_constraintTop_toTopOf="@id/copyButton"
+			tools:visibility="visible"/>
 
 		<Button
 			android:id="@+id/addButton"
 			style="@style/BriarButton"
 			android:layout_width="match_parent"
 			android:layout_height="wrap_content"
-			android:layout_marginTop="@dimen/margin_xlarge"
+			android:layout_marginBottom="8dp"
+			android:layout_marginTop="16dp"
 			android:enabled="false"
 			android:text="@string/add_contact_button"
+			app:layout_constraintBottom_toBottomOf="parent"
 			app:layout_constraintEnd_toEndOf="parent"
-			app:layout_constraintHorizontal_bias="0.75"
 			app:layout_constraintStart_toStartOf="parent"
-			app:layout_constraintTop_toBottomOf="@id/copyButton"
+			app:layout_constraintTop_toBottomOf="@+id/contactNameInput"
 			tools:enabled="true"/>
 
 	</android.support.constraint.ConstraintLayout>
diff --git a/briar-android/src/main/res/values/strings.xml b/briar-android/src/main/res/values/strings.xml
index 1925e5ae0..fe0095536 100644
--- a/briar-android/src/main/res/values/strings.xml
+++ b/briar-android/src/main/res/values/strings.xml
@@ -166,8 +166,8 @@
 
 	<string name="add_contact_nearby_title">Add Contact Nearby</string>
 	<string name="add_contact_remotely_title">Add Contact with Link</string>
-	<string name="contact_name_hint">Contact name</string>
-	<string name="contact_link_hint">Contact link</string>
+	<string name="contact_name_hint">Give contact a nickname</string>
+	<string name="contact_link_hint">Your contact\'s link</string>
 	<string name="paste_button">Paste</string>
 	<string name="scan_qr_code_button">QR Code</string>
 	<string name="add_contact_button">Add Contact</string>