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

Merge branch '2162-mailbox-pairing-ui-end' into 'master'

Browse Source 
Implement final parts of UI for pairing Briar with mailbox

Closes #2162

See merge request briar/briar!1590
This commit is contained in:
akwizgran
2022-02-25 14:27:34 +00:00
parent 4df523aaf8 9fa3ee18a4
commit a54e1d424c
17 changed files with 402 additions and 192 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
briar-android/src/main/res/layout/fragment_mailbox_setup_download.xml
View File

@@ -35,7 +35,7 @@
android:layout_marginHorizontal="@dimen/margin_xlarge"
android:layout_marginTop="@dimen/margin_xlarge"
android:layout_marginBottom="@dimen/margin_large"
android:text="@string/mailbox_setup_intro"
android:text="@string/mailbox_setup_download"
android:textAppearance="@style/TextAppearance.MaterialComponents.Body1"
app:layout_constraintBottom_toTopOf="@+id/scanButton"
app:layout_constraintEnd_toEndOf="parent"

51
briar-android/src/main/res/layout/fragment_mailbox_status.xml Normal file
View File

@@ -0,0 +1,51 @@
<?xml version="1.0" encoding="utf-8"?>
<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
tools:context=".android.mailbox.MailboxActivity">
<ImageView
android:id="@+id/imageView"
android:layout_width="32dp"
android:layout_height="32dp"
android:layout_marginStart="16dp"
android:layout_marginLeft="16dp"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toStartOf="@+id/statusTitleView"
app:layout_constraintHorizontal_chainStyle="packed"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintVertical_chainStyle="packed"
app:srcCompat="@drawable/ic_check_circle_outline"
app:tint="@color/briar_brand_green"
tools:ignore="ContentDescription" />
<TextView
android:id="@+id/statusTitleView"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginHorizontal="16dp"
android:text="@string/mailbox_status_connected_title"
android:textAppearance="@style/TextAppearance.MaterialComponents.Headline6"
app:layout_constrainedWidth="true"
app:layout_constraintBottom_toBottomOf="@+id/imageView"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toEndOf="@+id/imageView"
app:layout_constraintTop_toTopOf="@+id/imageView" />
<TextView
android:id="@+id/statusInfoView"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_margin="16dp"
android:gravity="center"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/statusTitleView"
app:layout_constraintVertical_bias="0.0"
tools:text="@string/mailbox_status_connected_info" />
</androidx.constraintlayout.widget.ConstraintLayout>

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

@@ -614,7 +614,7 @@
<!-- Mailbox -->
<string name="mailbox_settings_title">Mailbox</string>
<string name="mailbox_setup_title">Mailbox Setup</string>
<string name="mailbox_setup_title">Mailbox setup</string>
<string name="mailbox_setup_intro">A Mailbox enables your contacts to send you messages while you are offline. The Mailbox will receive your messages and store them until you come online.\n
\nYou can install the Briar Mailbox app on a spare device. Keep it connected to power and Wi-Fi so it\'s always online.</string>
<string name="mailbox_setup_download">First, install the Mailbox app on another device by searching for \"Briar Mailbox\" on Google Play or wherever you downloaded Briar.\n
@@ -624,10 +624,28 @@
<string name="permission_camera_qr_denied_body">You have denied access to the camera, but scanning a QR code requires using the camera.\n\nPlease consider granting access.</string>
<string name="mailbox_setup_connecting">Connecting…</string>
<string name="mailbox_setup_qr_code_wrong_title">Wrong QR code</string>
<string name="mailbox_setup_qr_code_wrong_description">The scanned code is invalid. Please open the Briar Mailbox app on your mailbox device and scan the QR code it presents.</string>
<string name="mailbox_setup_qr_code_wrong_description">The scanned code is invalid. Please open the Briar Mailbox app on your Mailbox device and scan the QR code it presents.</string>
<string name="mailbox_setup_already_paired_title">Mailbox already linked</string>
<string name="mailbox_setup_already_paired_description">Unlink the Mailbox on your other device and try again.</string>
<string name="mailbox_setup_io_error_title">Could not connect</string>
<string name="mailbox_setup_io_error_description">Ensure that both devices are connected to the Internet and try again.</string>
<string name="mailbox_setup_assertion_error_title">Mailbox error</string>
<string name="mailbox_setup_assertion_error_description">Please send feedback (with anonymous data) via the Briar app if the issue persists.</string>
<string name="mailbox_setup_camera_error_title" translatable="false">@string/camera_error</string>
<string name="mailbox_setup_camera_error_description">Could not access camera. Try again, maybe after rebooting device.</string>
<string name="mailbox_setup_paired_title">Connected</string>
<string name="mailbox_setup_paired_description">Your Mailbox has been successfully linked with Briar.\n
\nKeep your Mailbox connected to power and Wi-Fi so it\'s always online.</string>
<string name="tor_offline_title">Offline</string>
<string name="tor_offline_description">Ensure that this device is online and connections to the internet are allowed.\n\nAfterwards, wait for the globe icon in connection settings to turn green.</string>
<string name="tor_offline_description">Ensure that this device is online and connections to the Internet are allowed.\n
\nAfterwards, wait for the globe icon in the connection settings screen to turn green.</string>
<string name="tor_offline_button_check">Check connection settings</string>
<string name="mailbox_status_title">Mailbox status</string>
<string name="mailbox_status_connected_title">Mailbox is running</string>
<!-- Example for string substitution: Last connection: 3min ago-->
<string name="mailbox_status_connected_info">Last connection: %s</string>
<!-- Indicates that there never was a connection to the mailbox. Last connection: Never -->
<string name="mailbox_status_connected_never">Never</string>
<!-- Conversation Settings -->
<string name="disappearing_messages_title">Disappearing messages</string>

6
briar-android/src/main/res/xml/network_security_config.xml Normal file
View File

@@ -0,0 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<network-security-config>
<domain-config cleartextTrafficPermitted="true">
<domain includeSubdomains="true">onion</domain>
</domain-config>
</network-security-config>