Kaladaran/briar
0
0
Fork 0
mirror of https://code.briarproject.org/briar/briar.git synced 2026-02-15 12:19:54 +01:00
Code Issues Projects Releases Wiki Activity

More compact layout for first add contact screen.

Browse Source
This commit is contained in:
akwizgran
2015-12-14 17:43:12 +00:00
parent 527ac0c1e0
commit f6cb3926fb
2 changed files with 3 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
briar-android/res/layout/invitation_bluetooth_start.xml
View File

@@ -39,14 +39,6 @@
android:spinnerMode="dropdown" android:spinnerMode="dropdown"
android:layout_marginTop="@dimen/margin_medium"/> 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 <ImageView
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
@@ -57,11 +49,11 @@
android:layout_marginTop="@dimen/margin_medium"/> android:layout_marginTop="@dimen/margin_medium"/>
<TextView <TextView
android:id="@+id/explanationView" android:id="@+id/faceToFaceView"
style="@style/BriarTextBody" style="@style/BriarTextBody"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:text="@string/bluetooth_explanation" android:text="@string/face_to_face"
android:layout_marginTop="@dimen/margin_medium"/> android:layout_marginTop="@dimen/margin_medium"/>
<Button <Button

3
briar-android/res/values/strings.xml
View File

@@ -37,8 +37,7 @@
<string name="no_contacts">No contacts</string> <string name="no_contacts">No contacts</string>
<string name="add_contact_title">Add a Contact</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="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="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="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="continue_button">Continue</string>
<string name="your_invitation_code">Your invitation code is</string> <string name="your_invitation_code">Your invitation code is</string>
<string name="enter_invitation_code">Please enter your contact\'s invitation code:</string> <string name="enter_invitation_code">Please enter your contact\'s invitation code:</string>