From 04be7c9b920d297926d04eee488636589ca1d9ed Mon Sep 17 00:00:00 2001
From: Torsten Grote <t@grobox.de>
Date: Tue, 8 Dec 2015 16:31:43 -0200
Subject: [PATCH] Providing more detailed instructions for adding contacts

Users were confused by the process of adding a contact for the first time.
This change adds additional explanation and a picture of what is going on.

It also moves part of the UI into XML files.

Closes #87
---
 briar-android/res/drawable/bluetooth.png      | Bin 0 -> 19988 bytes
 .../res/layout/invitation_bluetooth_start.xml |  53 ++++++++++++++++++
 briar-android/res/values/strings.xml          |   3 +-
 .../invitation/ChooseIdentityView.java        |  29 ++--------
 4 files changed, 61 insertions(+), 24 deletions(-)
 create mode 100644 briar-android/res/drawable/bluetooth.png
 create mode 100644 briar-android/res/layout/invitation_bluetooth_start.xml

diff --git a/briar-android/res/drawable/bluetooth.png b/briar-android/res/drawable/bluetooth.png
new file mode 100644
index 0000000000000000000000000000000000000000..b5e6ef06fc3ae965337813ee01dcfc195e59dfb5
GIT binary patch
literal 19988
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
Rc2EES002ovPDHLkV1hUWq#XbN

literal 0
HcmV?d00001

diff --git a/briar-android/res/layout/invitation_bluetooth_start.xml b/briar-android/res/layout/invitation_bluetooth_start.xml
new file mode 100644
index 0000000000..855e9d0791
--- /dev/null
+++ b/briar-android/res/layout/invitation_bluetooth_start.xml
@@ -0,0 +1,53 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+              android:orientation="vertical"
+              android:layout_width="match_parent"
+              android:layout_height="match_parent"
+              android:padding="7dp">
+
+    <TextView
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:text="@string/your_nickname"
+        android:id="@+id/yourNicknameView"
+        android:padding="7dp"/>
+
+    <Spinner
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:id="@+id/spinner"
+        android:spinnerMode="dropdown"
+        android:padding="7dp"/>
+
+    <TextView
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:text="@string/face_to_face"
+        android:id="@+id/faceToFaceView"
+        android:padding="7dp"/>
+
+    <ImageView
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:id="@+id/imageView"
+        android:src="@drawable/bluetooth"
+        android:scaleType="fitCenter"
+        android:baselineAlignBottom="false"
+        android:cropToPadding="false"
+        android:layout_weight="1"/>
+
+    <TextView
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:text="@string/bluetooth_explanation"
+        android:id="@+id/explanationView"
+        android:padding="7dp"/>
+
+    <Button
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="@string/continue_button"
+        android:id="@+id/continueButton"
+        android:layout_gravity="center_horizontal"
+        android:layout_weight="0"/>
+</LinearLayout>
\ No newline at end of file
diff --git a/briar-android/res/values/strings.xml b/briar-android/res/values/strings.xml
index 6532d77d8a..0076ca171c 100644
--- a/briar-android/res/values/strings.xml
+++ b/briar-android/res/values/strings.xml
@@ -36,8 +36,9 @@
     <string name="contact_list_title">Contacts</string>
     <string name="no_contacts">No contacts</string>
     <string name="add_contact_title">Add a Contact</string>
-    <string name="your_nickname">Your nickname: </string>
+    <string name="your_nickname">Please select the identity you want to use:</string>
     <string name="face_to_face">For security reasons you must be face-to-face with the person you want to add as a contact.\n\nThis will prevent anyone from impersonating you or reading your messages in future.</string>
+    <string name="bluetooth_explanation">Contacts need to add each other at the same time. Please continue together and allow Bluetooth to be enabled for the process to work.</string>
     <string name="continue_button">Continue</string>
     <string name="your_invitation_code">Your invitation code is</string>
     <string name="enter_invitation_code">Please enter your contact\'s invitation code:</string>
diff --git a/briar-android/src/org/briarproject/android/invitation/ChooseIdentityView.java b/briar-android/src/org/briarproject/android/invitation/ChooseIdentityView.java
index 5ecd1898fa..fc2e4524a3 100644
--- a/briar-android/src/org/briarproject/android/invitation/ChooseIdentityView.java
+++ b/briar-android/src/org/briarproject/android/invitation/ChooseIdentityView.java
@@ -21,6 +21,7 @@ import org.briarproject.api.LocalAuthor;
 
 import android.content.Context;
 import android.content.Intent;
+import android.view.LayoutInflater;
 import android.view.View;
 import android.view.View.OnClickListener;
 import android.widget.AdapterView;
@@ -35,7 +36,6 @@ implements OnItemSelectedListener, OnClickListener {
 
 	private LocalAuthorSpinnerAdapter adapter = null;
 	private Spinner spinner = null;
-	private Button continueButton = null;
 
 	ChooseIdentityView(Context ctx) {
 		super(ctx);
@@ -45,34 +45,17 @@ implements OnItemSelectedListener, OnClickListener {
 		removeAllViews();
 		Context ctx = getContext();
 
-		LinearLayout innerLayout = new LinearLayout(ctx);
-		innerLayout.setLayoutParams(MATCH_WRAP);
-		innerLayout.setOrientation(HORIZONTAL);
-		innerLayout.setGravity(CENTER);
-
-		TextView yourNickname = new TextView(ctx);
-		yourNickname.setTextSize(18);
-		yourNickname.setPadding(pad, pad, pad, pad);
-		yourNickname.setText(R.string.your_nickname);
-		innerLayout.addView(yourNickname);
+		LayoutInflater inflater = (LayoutInflater) ctx.getSystemService
+				(Context.LAYOUT_INFLATER_SERVICE);
+		View view = inflater.inflate(R.layout.invitation_bluetooth_start, this);
 
 		adapter = new LocalAuthorSpinnerAdapter(ctx, false);
-		spinner = new Spinner(ctx);
+		spinner = (Spinner) view.findViewById(R.id.spinner);
 		spinner.setAdapter(adapter);
 		spinner.setOnItemSelectedListener(this);
-		innerLayout.addView(spinner);
-		addView(innerLayout);
-
-		TextView faceToFace = new TextView(ctx);
-		faceToFace.setPadding(pad, pad, pad, pad);
-		faceToFace.setText(R.string.face_to_face);
-		addView(faceToFace);
 
-		continueButton = new Button(ctx);
-		continueButton.setLayoutParams(WRAP_WRAP);
-		continueButton.setText(R.string.continue_button);
+		Button continueButton = (Button) view.findViewById(R.id.continueButton);
 		continueButton.setOnClickListener(this);
-		addView(continueButton);
 
 		container.loadLocalAuthors();
 	}
-- 
GitLab