From 04be7c9b920d297926d04eee488636589ca1d9ed Mon Sep 17 00:00:00 2001 From: Torsten Grote Date: Tue, 8 Dec 2015 16:31:43 -0200 Subject: [PATCH 1/3] 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 000000000..855e9d079 --- /dev/null +++ b/briar-android/res/layout/invitation_bluetooth_start.xml @@ -0,0 +1,53 @@ + + + + + + + + + + + + + +