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

Improve UI for showing qr code

Browse Source
This commit is contained in:
ameba23
2021-04-26 13:03:42 +02:00
parent 61a052fc65
commit c2b7657041
3 changed files with 15 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
briar-android/src/main/java/org/briarproject/briar/android/socialbackup/recover/OwnerReturnShardFragment.java
View File

@@ -134,13 +134,13 @@ public class OwnerReturnShardFragment extends BaseFragment
private void onReturnShardStateChanged( private void onReturnShardStateChanged(
@Nullable SecretOwnerTask.State state) { @Nullable SecretOwnerTask.State state) {
if (state instanceof SecretOwnerTask.State.Listening) { if (state instanceof SecretOwnerTask.State.Listening) {
status.setText(R.string.waiting_for_contact_to_scan);
Bitmap qrCode = viewModel.getQrCodeBitmap(); Bitmap qrCode = viewModel.getQrCodeBitmap();
qrCodeView.setQrCode(qrCode); qrCodeView.setQrCode(qrCode);
} else if (state instanceof SecretOwnerTask.State.ReceivingShard) { } else if (state instanceof SecretOwnerTask.State.ReceivingShard) {
statusView.setVisibility(VISIBLE);
status.setText(R.string.connecting_to_device); status.setText(R.string.connecting_to_device);
} else if (state instanceof SecretOwnerTask.State.SendingAck) { } else if (state instanceof SecretOwnerTask.State.SendingAck) {
status.setText(R.string.waiting_for_contact_to_scan); status.setText(R.string.recovery_sending_ack);
} else if (state instanceof SecretOwnerTask.State.Success) { } else if (state instanceof SecretOwnerTask.State.Success) {
status.setText("Success"); status.setText("Success");
} else if (state instanceof SecretOwnerTask.State.Failure) { } else if (state instanceof SecretOwnerTask.State.Failure) {

23
briar-android/src/main/res/layout/fragment_recovery_owner_qr.xml
View File

@@ -28,18 +28,19 @@
android:visibility="visible" android:visibility="visible"
tools:visibility="visible"> tools:visibility="visible">
<ProgressBar <!-- <ProgressBar-->
style="?android:attr/progressBarStyleLarge" <!-- style="?android:attr/progressBarStyleLarge"-->
android:layout_width="wrap_content" <!-- android:layout_width="wrap_content"-->
android:layout_height="wrap_content" /> <!-- android:layout_height="wrap_content" />-->
<TextView <TextView
android:id="@+id/connect_status" android:id="@+id/connect_status"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:gravity="center" android:gravity="center"
android:paddingTop="@dimen/margin_large" android:paddingTop="@dimen/margin_large"
tools:text="@string/waiting_for_contact_to_scan" /> android:textSize="20sp"
android:text="@string/waiting_for_contact_to_scan" />
</LinearLayout> </LinearLayout>
<org.briarproject.briar.android.view.QrCodeView <org.briarproject.briar.android.view.QrCodeView

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

@@ -687,6 +687,7 @@
<string name="recovery_shard_received">Account backup piece received</string> <string name="recovery_shard_received">Account backup piece received</string>
<string name="recovery_account_recovered">Account recovered</string> <string name="recovery_account_recovered">Account recovered</string>
<string name="recovery_account_recovered_explain">You must now set a new password for your account</string> <string name="recovery_account_recovered_explain">You must now set a new password for your account</string>
<string name="recovery_sending_ack">Sending acknowledgement</string>
<!-- recovery from the custodian's POV --> <!-- recovery from the custodian's POV -->