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

Merged Android invitation UI from add_contact repo.

Browse Source
This commit is contained in:
akwizgran
2012-11-06 15:04:01 +00:00
parent 2eb943ee2a
commit 2046ed0cac
38 changed files with 1209 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
res/drawable-hdpi/ic_launcher.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 2.3 KiB

BIN
res/drawable-ldpi/ic_launcher.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.2 KiB

BIN
res/drawable-ldpi/iconic_check_alt_green.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 499 B

BIN
res/drawable-ldpi/iconic_x_alt_red.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 552 B

BIN
res/drawable-mdpi/ic_launcher.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.6 KiB

BIN
res/drawable-xhdpi/ic_launcher.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 3.1 KiB

5
res/layout/activity_add_contact.xml Normal file
View File

@@ -0,0 +1,5 @@
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+id/add_contact_container"
android:layout_width="fill_parent"
android:layout_height="fill_parent"
android:orientation="vertical" />

5
res/layout/activity_codes_do_not_match.xml Normal file
View File

@@ -0,0 +1,5 @@
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+id/codes_do_not_match_container"
android:layout_width="fill_parent"
android:layout_height="fill_parent"
android:orientation="vertical" />

5
res/layout/activity_connection.xml Normal file
View File

@@ -0,0 +1,5 @@
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+id/connection_container"
android:layout_width="fill_parent"
android:layout_height="fill_parent"
android:orientation="vertical" />

5
res/layout/activity_connection_failed.xml Normal file
View File

@@ -0,0 +1,5 @@
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+id/connection_failed_container"
android:layout_width="fill_parent"
android:layout_height="fill_parent"
android:orientation="vertical" />

5
res/layout/activity_connection_succeeded.xml Normal file
View File

@@ -0,0 +1,5 @@
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+id/connection_succeeded_container"
android:layout_width="fill_parent"
android:layout_height="fill_parent"
android:orientation="vertical" />

5
res/layout/activity_contact_added.xml Normal file
View File

@@ -0,0 +1,5 @@
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+id/contact_added_container"
android:layout_width="fill_parent"
android:layout_height="fill_parent"
android:orientation="vertical" />

5
res/layout/activity_invitation_code.xml Normal file
View File

@@ -0,0 +1,5 @@
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+id/invitation_code_container"
android:layout_width="fill_parent"
android:layout_height="fill_parent"
android:orientation="vertical" />

5
res/layout/activity_network_setup.xml Normal file
View File

@@ -0,0 +1,5 @@
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+id/network_setup_container"
android:layout_width="fill_parent"
android:layout_height="fill_parent"
android:orientation="vertical" />

71
res/layout/activity_test_bluetooth.xml Normal file
View File

@@ -0,0 +1,71 @@
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="fill_parent"
android:layout_height="fill_parent"
android:orientation="vertical" >
<TextView
android:id="@+id/test_bt_screen_title"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="Testing Bluetooth actions"
android:textAppearance="?android:attr/textAppearanceLarge" />
<Button
android:id="@+id/button1"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="Show paired devices info"
android:onClick="showBtPairedDevicesButtonClicked" />
<Button
android:id="@+id/test_bt_conn_btn"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="Connect bluetooh"
android:onClick="testBtConnButtonClicked" />
<LinearLayout
android:layout_width="fill_parent"
android:layout_height="wrap_content" >
<Button
android:id="@+id/test_bt_sendData_btn"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:onClick="testBtSendDataButtonClicked"
android:text="Send data" />
<Button
android:id="@+id/test_bt_recvData_btn"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:onClick="testBtReceiveDataButtonClicked"
android:text="Recive data" />
</LinearLayout>
<ScrollView
android:id="@+id/test_bt_log_view"
android:layout_width="fill_parent"
android:layout_height="wrap_content" >
<LinearLayout
android:layout_width="fill_parent"
android:layout_height="fill_parent"
android:orientation="vertical" >
<TextView
android:id="@+id/test_bt_log_console_title"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="Bluetooth actions log" />
<TextView
android:id="@+id/test_bt_log_console_msgs"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="actions log..." />
</LinearLayout>
</ScrollView>
</LinearLayout>

5
res/layout/activity_wait_for_contact.xml Normal file
View File

@@ -0,0 +1,5 @@
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+id/wait_for_contact_container"
android:layout_width="fill_parent"
android:layout_height="fill_parent"
android:orientation="vertical" />

36
res/values/strings.xml
View File

@@ -1,4 +1,40 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<string name="app_name">Briar</string>
<string name="menu_settings">Settings</string>
<string name="title">Add a Contact</string>
<string name="welcome">Welcome to Briar! Add a contact to get started.</string>
<string name="add_contact_button">Add a contact</string>
<string name="face_to_face">For security reasons you must be face to face with someone to add them as a contact.</string>
<string name="same_network">Briar can add contacts via Wi-Fi or Bluetooth. To use Wi-Fi you must both be connected to the same network.</string>
<string name="wifi_not_available">Wi-Fi is not available on this device.</string>
<string name="wifi_disabled">Wi-Fi is OFF.</string>
<string name="turn_on_wifi_button">Turn on Wi-Fi</string>
<string name="wifi_disconnected">Wi-Fi is DISCONNECTED.</string>
<string name="connect_to_wifi_button">Connect to Wi-Fi</string>
<string name="wifi_connected">Wi-Fi is CONNECTED to %1$s.</string>
<string name="bluetooth_not_available">Bluetooth is not available on this device.</string>
<string name="bluetooth_disabled">Bluetooth is OFF.</string>
<string name="turn_on_bluetooth_button">Turn on Bluetooth</string>
<string name="bluetooth_not_discoverable">Bluetooth is NOT DISCOVERABLE.</string>
<string name="make_bluetooth_discoverable_button">Make Bluetooth discoverable</string>
<string name="bluetooth_enabled">Bluetooth is ON.</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>
<string name="connecting_wifi">Connecting via %1$s\u2026</string>
<string name="connecting_bluetooth">Connecting via Bluetooth\u2026</string>
<string name="connection_failed">Connection failed.</string>
<string name="check_same_network">Please check that you are both using the same network.</string>
<string name="try_again_button">Try again</string>
<string name="connected_to_contact">Connected to contact.</string>
<string name="your_confirmation_code">Your confirmation code is</string>
<string name="enter_confirmation_code">Please enter your contact\'s confirmation code:</string>
<string name="waiting_for_contact">Waiting for contact\u2026</string>
<string name="codes_do_not_match">Codes do not match!</string>
<string name="interfering">This could mean that someone is trying to interfere with your connection.</string>
<string name="contact_added">Contact added.</string>
<string name="enter_nickname">Please enter a nickname for this contact:</string>
<string name="add_another_contact_button">Add another contact</string>
<string name="done_button">Done</string>
</resources>