From c7809add2065c7e58707e6167e0f0f83e6c07eec Mon Sep 17 00:00:00 2001
From: ameba23 <ameba23@systemli.org>
Date: Thu, 10 Feb 2022 10:18:39 +0100
Subject: [PATCH] Improve social backup setup explainer screen, and add image

---
 .../res/drawable/ic_social_backup_group.xml   |  7 +++++++
 ...fragment_social_backup_setup_explainer.xml | 20 +++++++++----------
 briar-android/src/main/res/values/strings.xml |  2 +-
 3 files changed, 18 insertions(+), 11 deletions(-)
 create mode 100644 briar-android/src/main/res/drawable/ic_social_backup_group.xml

diff --git a/briar-android/src/main/res/drawable/ic_social_backup_group.xml b/briar-android/src/main/res/drawable/ic_social_backup_group.xml
new file mode 100644
index 000000000..b056737ab
--- /dev/null
+++ b/briar-android/src/main/res/drawable/ic_social_backup_group.xml
@@ -0,0 +1,7 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+	android:height="72dp"
+	android:width="72dp"
+	android:viewportWidth="24"
+	android:viewportHeight="24">
+	<path android:fillColor="#000" android:pathData="M12,5.5A3.5,3.5 0 0,1 15.5,9A3.5,3.5 0 0,1 12,12.5A3.5,3.5 0 0,1 8.5,9A3.5,3.5 0 0,1 12,5.5M5,8C5.56,8 6.08,8.15 6.53,8.42C6.38,9.85 6.8,11.27 7.66,12.38C7.16,13.34 6.16,14 5,14A3,3 0 0,1 2,11A3,3 0 0,1 5,8M19,8A3,3 0 0,1 22,11A3,3 0 0,1 19,14C17.84,14 16.84,13.34 16.34,12.38C17.2,11.27 17.62,9.85 17.47,8.42C17.92,8.15 18.44,8 19,8M5.5,18.25C5.5,16.18 8.41,14.5 12,14.5C15.59,14.5 18.5,16.18 18.5,18.25V20H5.5V18.25M0,20V18.5C0,17.11 1.89,15.94 4.45,15.6C3.86,16.28 3.5,17.22 3.5,18.25V20H0M24,20H20.5V18.25C20.5,17.22 20.14,16.28 19.55,15.6C22.11,15.94 24,17.11 24,18.5V20Z" />
+</vector>
\ No newline at end of file
diff --git a/briar-android/src/main/res/layout/fragment_social_backup_setup_explainer.xml b/briar-android/src/main/res/layout/fragment_social_backup_setup_explainer.xml
index e0e03c288..7fbc82122 100644
--- a/briar-android/src/main/res/layout/fragment_social_backup_setup_explainer.xml
+++ b/briar-android/src/main/res/layout/fragment_social_backup_setup_explainer.xml
@@ -22,15 +22,15 @@
 		app:layout_constraintTop_toTopOf="parent"
 		tools:layout_editor_absoluteX="16dp" />
 
-<!--	<ImageView-->
-<!--		android:id="@+id/imageView"-->
-<!--		android:layout_width="wrap_content"-->
-<!--		android:layout_height="wrap_content"-->
-<!--		android:layout_marginTop="24dp"-->
-<!--		app:layout_constraintEnd_toEndOf="parent"-->
-<!--		app:layout_constraintStart_toStartOf="parent"-->
-<!--		app:layout_constraintTop_toBottomOf="@+id/textView"-->
-<!--		app:srcCompat="@drawable/qr_code_social_backup" />-->
+	<ImageView
+		android:id="@+id/imageView"
+		android:layout_width="wrap_content"
+		android:layout_height="wrap_content"
+		android:layout_marginTop="24dp"
+		app:layout_constraintEnd_toEndOf="parent"
+		app:layout_constraintStart_toStartOf="parent"
+		app:layout_constraintTop_toBottomOf="@+id/textView"
+		app:srcCompat="@drawable/ic_social_backup_group" />
 
 	<TextView
 		android:id="@+id/textViewExplain"
@@ -42,7 +42,7 @@
 		android:textSize="20sp"
 		app:layout_constraintEnd_toEndOf="parent"
 		app:layout_constraintStart_toStartOf="parent"
-		app:layout_constraintTop_toBottomOf="@+id/textView"
+		app:layout_constraintTop_toBottomOf="@+id/imageView"
 		tools:layout_editor_absoluteX="16dp" />
 
 	<Button
diff --git a/briar-android/src/main/res/values/strings.xml b/briar-android/src/main/res/values/strings.xml
index 628aad146..bbccc09c4 100644
--- a/briar-android/src/main/res/values/strings.xml
+++ b/briar-android/src/main/res/values/strings.xml
@@ -672,7 +672,7 @@
 	<string name="backup_done_info">Backup pieces sent to trusted contacts</string>
 
 	<string name="social_backup_setup_explainer_title">Backup your Briar identity and contacts list using trusted contacts</string>
-	<string name="social_backup_setup_explainer_long">You can choose a set of trusted contacts to send backup pieces to.\n\nYou set how many of these contacts must help you recover your account.\n\nFor example, you can choose three trusted contacts and that any two of them are needed to recover.</string>
+	<string name="social_backup_setup_explainer_long">Choose a set of trusted contacts to send backup pieces to.\n\nYou decide how many of these contacts must help you recover your account.\n\nFor example, you can choose three trusted contacts and that any two of them are needed to recover.</string>
 	<string name="social_backup_setup_explainer_button">Choose trusted contacts</string>
 
 	<string name="social_backup_onboarding_title">Backup your Briar account</string>