From f6cb3926fb5ff9b6a2d79aecb0bfae732bfa6077 Mon Sep 17 00:00:00 2001
From: akwizgran <akwizgran@users.sourceforge.net>
Date: Mon, 14 Dec 2015 17:43:12 +0000
Subject: [PATCH] More compact layout for first add contact screen.
---
.../res/layout/invitation_bluetooth_start.xml | 12 ++----------
briar-android/res/values/strings.xml | 3 +--
2 files changed, 3 insertions(+), 12 deletions(-)
diff --git a/briar-android/res/layout/invitation_bluetooth_start.xml b/briar-android/res/layout/invitation_bluetooth_start.xml
index 63bf3ea6d5..9198f7537f 100644
--- a/briar-android/res/layout/invitation_bluetooth_start.xml
+++ b/briar-android/res/layout/invitation_bluetooth_start.xml
@@ -39,14 +39,6 @@
android:spinnerMode="dropdown"
android:layout_marginTop="@dimen/margin_medium"/>
- <TextView
- android:id="@+id/faceToFaceView"
- style="@style/BriarTextBody"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:text="@string/face_to_face"
- android:layout_marginTop="@dimen/margin_medium"/>
-
<ImageView
android:layout_width="match_parent"
android:layout_height="wrap_content"
@@ -57,11 +49,11 @@
android:layout_marginTop="@dimen/margin_medium"/>
<TextView
- android:id="@+id/explanationView"
+ android:id="@+id/faceToFaceView"
style="@style/BriarTextBody"
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:text="@string/bluetooth_explanation"
+ android:text="@string/face_to_face"
android:layout_marginTop="@dimen/margin_medium"/>
<Button
diff --git a/briar-android/res/values/strings.xml b/briar-android/res/values/strings.xml
index 8a6c06144b..1df0b4897a 100644
--- a/briar-android/res/values/strings.xml
+++ b/briar-android/res/values/strings.xml
@@ -37,8 +37,7 @@
<string name="no_contacts">No contacts</string>
<string name="add_contact_title">Add a Contact</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="face_to_face">You must be face-to-face with the person you want to add as a contact. This will prevent anyone from impersonating you or reading your messages in future.</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>
--
GitLab