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

Merge branch '2151-bluetooth-connect-ui' into 'master'

Browse Source 
Add simple UI for Connect via Bluetooth feature

Closes #2151 and #1821

See merge request briar/briar!1524
This commit is contained in:
akwizgran
2021-08-30 13:58:26 +00:00
parent be9255029b 822a58c8a6
commit 2b61b01b4e
51 changed files with 836 additions and 494 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
briar-android/src/main/res/values/strings.xml
View File

@@ -178,15 +178,6 @@
<string name="set_contact_alias">Change contact name</string>
<string name="set_contact_alias_hint">Contact name</string>
<string name="menu_item_disappearing_messages">Disappearing messages</string>
<string name="menu_item_connect_via_bluetooth">Connect via Bluetooth</string>
<string name="dialog_title_connect_via_bluetooth">Connect via Bluetooth</string>
<string name="dialog_message_connect_via_bluetooth">Your contact needs to be nearby for this to work.\n\nYou and your contact should both press \"Start\" at the same time.</string>
<string name="toast_connect_via_bluetooth_already_discovering">Already trying to connect via Bluetooth</string>
<string name="toast_connect_via_bluetooth_not_discoverable">Cannot continue without Bluetooth</string>
<string name="toast_connect_via_bluetooth_no_location_permission">Cannot continue without location permission</string>
<string name="toast_connect_via_bluetooth_start">Connecting via Bluetooth…</string>
<string name="toast_connect_via_bluetooth_success">Successfully connected via Bluetooth</string>
<string name="toast_connect_via_bluetooth_error">Could not connect via Bluetooth</string>
<!-- The first placeholder will show a duration like "7 days". The second placeholder at the end will add "Tap to learn more." -->
<string name="auto_delete_msg_you_enabled">Your messages will disappear after %1$s. %2$s</string>
<!-- The placeholder at the end will add "Tap to learn more." -->
@@ -342,6 +333,18 @@
<string name="introduction_response_declined_received">%1$s declined the introduction to %2$s.</string>
<string name="introduction_response_declined_received_by_introducee">%1$s says that %2$s declined the introduction.</string>
<!-- Connect via Bluetooth -->
<string name="menu_item_connect_via_bluetooth">Connect via Bluetooth</string>
<string name="connect_via_bluetooth_title">Connect via Bluetooth</string>
<string name="connect_via_bluetooth_intro">In case Bluetooth connections do not work automatically, you can use this screen to connect manually.\n\nYour contact needs to be nearby for this to work.\n\nYou and your contact should both press \"Start\" at the same time.</string>
<string name="connect_via_bluetooth_already_discovering">Already trying to connect via Bluetooth. Please try again shortly.</string>
<string name="connect_via_bluetooth_no_location_permission">Cannot continue without location permission</string>
<string name="connect_via_bluetooth_start">Connecting via Bluetooth…</string>
<string name="connect_via_bluetooth_success">Successfully connected via Bluetooth</string>
<string name="connect_via_bluetooth_error">Could not connect via Bluetooth.</string>
<string name="connect_via_bluetooth_error_not_supported">Bluetooth is not supported by device.</string>
<!-- Private Groups -->
<string name="groups_list_empty">No groups to show</string>
<string name="groups_list_empty_action">Tap the + icon to create a group, or ask your contacts to share groups with you</string>
@@ -707,7 +710,6 @@
<string name="permission_hotspot_location_denied_body">You have denied access to your location, but Briar needs this permission to create a Wi-Fi hotspot.\n\nPlease consider granting access.</string>
<string name="wifi_settings_title">Wi-Fi setting</string>
<string name="wifi_settings_request_enable_body">To create a Wi-Fi hotspot, Briar needs to use Wi-Fi. Please enable it.</string>
<string name="wifi_settings_request_denied_body">You have denied permission to enable Wi-Fi, but Briar needs to use Wi-Fi.\n\nPlease consider enabling it.</string>
<string name="hotspot_tab_manual">Manual</string>
<!-- The placeholder to be inserted into the string 'hotspot_manual_wifi': People can connect by %s -->