From c2b76570413535b543848b36b96ef81e65e50efb Mon Sep 17 00:00:00 2001
From: ameba23 <ameba23@systemli.org>
Date: Mon, 26 Apr 2021 13:03:42 +0200
Subject: [PATCH] Improve UI for showing qr code

---
 .../recover/OwnerReturnShardFragment.java     |  4 ++--
 .../res/layout/fragment_recovery_owner_qr.xml | 23 ++++++++++---------
 briar-android/src/main/res/values/strings.xml |  1 +
 3 files changed, 15 insertions(+), 13 deletions(-)

diff --git a/briar-android/src/main/java/org/briarproject/briar/android/socialbackup/recover/OwnerReturnShardFragment.java b/briar-android/src/main/java/org/briarproject/briar/android/socialbackup/recover/OwnerReturnShardFragment.java
index 01c4dcecb..d66043907 100644
--- a/briar-android/src/main/java/org/briarproject/briar/android/socialbackup/recover/OwnerReturnShardFragment.java
+++ b/briar-android/src/main/java/org/briarproject/briar/android/socialbackup/recover/OwnerReturnShardFragment.java
@@ -134,13 +134,13 @@ public class OwnerReturnShardFragment extends BaseFragment
 	private void onReturnShardStateChanged(
 			@Nullable SecretOwnerTask.State state) {
 		if (state instanceof SecretOwnerTask.State.Listening) {
+			status.setText(R.string.waiting_for_contact_to_scan);
 			Bitmap qrCode = viewModel.getQrCodeBitmap();
 			qrCodeView.setQrCode(qrCode);
 		} else if (state instanceof SecretOwnerTask.State.ReceivingShard) {
-			statusView.setVisibility(VISIBLE);
 			status.setText(R.string.connecting_to_device);
 		} 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) {
 			status.setText("Success");
 		} else if (state instanceof SecretOwnerTask.State.Failure) {
diff --git a/briar-android/src/main/res/layout/fragment_recovery_owner_qr.xml b/briar-android/src/main/res/layout/fragment_recovery_owner_qr.xml
index 59b6d03cf..486d899f2 100644
--- a/briar-android/src/main/res/layout/fragment_recovery_owner_qr.xml
+++ b/briar-android/src/main/res/layout/fragment_recovery_owner_qr.xml
@@ -28,18 +28,19 @@
 			android:visibility="visible"
 			tools:visibility="visible">
 
-			<ProgressBar
-				style="?android:attr/progressBarStyleLarge"
-				android:layout_width="wrap_content"
-				android:layout_height="wrap_content" />
+<!--			<ProgressBar-->
+<!--				style="?android:attr/progressBarStyleLarge"-->
+<!--				android:layout_width="wrap_content"-->
+<!--				android:layout_height="wrap_content" />-->
 
-		<TextView
-			android:id="@+id/connect_status"
-			android:layout_width="match_parent"
-			android:layout_height="wrap_content"
-			android:gravity="center"
-			android:paddingTop="@dimen/margin_large"
-			tools:text="@string/waiting_for_contact_to_scan" />
+			<TextView
+				android:id="@+id/connect_status"
+				android:layout_width="match_parent"
+				android:layout_height="wrap_content"
+				android:gravity="center"
+				android:paddingTop="@dimen/margin_large"
+				android:textSize="20sp"
+				android:text="@string/waiting_for_contact_to_scan" />
 		</LinearLayout>
 
 		<org.briarproject.briar.android.view.QrCodeView
diff --git a/briar-android/src/main/res/values/strings.xml b/briar-android/src/main/res/values/strings.xml
index 857571c8d..169d513f3 100644
--- a/briar-android/src/main/res/values/strings.xml
+++ b/briar-android/src/main/res/values/strings.xml
@@ -687,6 +687,7 @@
 	<string name="recovery_shard_received">Account backup piece received</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_sending_ack">Sending acknowledgement</string>
 
 	<!-- recovery from the custodian's POV -->