From 5b63aa28d3dff7a65596f677b6df787c9c38e23f Mon Sep 17 00:00:00 2001
From: ameba23 <ameba23@systemli.org>
Date: Fri, 4 Feb 2022 09:08:13 +0100
Subject: [PATCH] Fix explainer fragment

---
 ...fragment_social_backup_setup_explainer.xml | 103 +++++++++---------
 briar-android/src/main/res/values/strings.xml |   6 +-
 2 files changed, 54 insertions(+), 55 deletions(-)

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 ff2bbbcda..3e12fa038 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
@@ -1,60 +1,59 @@
 <?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:id="@+id/linearLayout"
-android:layout_width="match_parent"
-android:layout_height="match_parent"
-android:paddingLeft="@dimen/margin_large"
-android:paddingTop="@dimen/margin_medium"
-android:paddingRight="@dimen/margin_large"
-android:paddingBottom="@dimen/margin_medium"
-tools:ignore="VectorDrawableCompat"
-tools:showIn="@layout/activity_preview_recovery_custodian1">
-
-<TextView
-	android:id="@+id/textView"
+	xmlns:app="http://schemas.android.com/apk/res-auto"
+	xmlns:tools="http://schemas.android.com/tools"
+	android:id="@+id/linearLayout"
 	android:layout_width="match_parent"
-	android:layout_height="wrap_content"
-	android:layout_marginTop="24dp"
-	android:gravity="center"
-	android:text="@string/social_backup_setup_explainer_title"
-	android:textSize="24sp"
-	app:layout_constraintTop_toTopOf="parent"
-	tools:layout_editor_absoluteX="16dp" />
+	android:layout_height="match_parent"
+	android:paddingLeft="@dimen/margin_large"
+	android:paddingTop="@dimen/margin_medium"
+	android:paddingRight="@dimen/margin_large"
+	android:paddingBottom="@dimen/margin_medium"
+	tools:ignore="VectorDrawableCompat">
 
-<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" />
+	<TextView
+		android:id="@+id/textView"
+		android:layout_width="match_parent"
+		android:layout_height="wrap_content"
+		android:layout_marginTop="24dp"
+		android:gravity="center"
+		android:text="@string/social_backup_setup_explainer_title"
+		android:textSize="24sp"
+		app:layout_constraintTop_toTopOf="parent"
+		tools:layout_editor_absoluteX="16dp" />
 
-<TextView
-	android:id="@+id/textViewExplain"
-	android:layout_width="match_parent"
-	android:layout_height="wrap_content"
-	android:layout_marginTop="24dp"
-	android:gravity="center"
-	android:text="@string/social_backup_setup_explainer_long"
-	android:textSize="20sp"
-	app:layout_constraintEnd_toEndOf="parent"
-	app:layout_constraintStart_toStartOf="parent"
-	app:layout_constraintTop_toBottomOf="@+id/imageView"
-	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" />
 
-<Button
-	android:id="@+id/button"
-	android:layout_width="match_parent"
-	android:layout_height="wrap_content"
-	android:layout_marginTop="24dp"
-	android:text="@string/social_backup_setup_explainer_button"
-	app:layout_constraintEnd_toEndOf="parent"
-	app:layout_constraintHorizontal_bias="0.0"
-	app:layout_constraintStart_toStartOf="parent"
-	app:layout_constraintTop_toBottomOf="@+id/textViewExplain" />
+	<TextView
+		android:id="@+id/textViewExplain"
+		android:layout_width="match_parent"
+		android:layout_height="wrap_content"
+		android:layout_marginTop="24dp"
+		android:gravity="center"
+		android:text="@string/social_backup_setup_explainer_long"
+		android:textSize="20sp"
+		app:layout_constraintEnd_toEndOf="parent"
+		app:layout_constraintStart_toStartOf="parent"
+		app:layout_constraintTop_toBottomOf="@+id/imageView"
+		tools:layout_editor_absoluteX="16dp" />
+
+	<Button
+		android:id="@+id/button"
+		android:layout_width="match_parent"
+		android:layout_height="wrap_content"
+		android:layout_marginTop="24dp"
+		android:text="@string/social_backup_setup_explainer_button"
+		app:layout_constraintEnd_toEndOf="parent"
+		app:layout_constraintHorizontal_bias="0.0"
+		app:layout_constraintStart_toStartOf="parent"
+		app:layout_constraintTop_toBottomOf="@+id/textViewExplain" />
 
 </androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/briar-android/src/main/res/values/strings.xml b/briar-android/src/main/res/values/strings.xml
index dad2f8292..b4ee06f60 100644
--- a/briar-android/src/main/res/values/strings.xml
+++ b/briar-android/src/main/res/values/strings.xml
@@ -671,9 +671,9 @@
 
 	<string name="backup_created">Backup created 1/6/2020</string>
 
-	<string name="social_backup_setup_explainer_title">Setup social backup</string>
-	<string name="social_backup_setup_explainer_long">Backup your Briar identity and contacts list using trusted contact</string>
-	<string name="social_backup_setup_explainer_button">You must choose a set of contacts to send backup pieces to.</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 must choose a set of contacts to send backup pieces to.</string>
+	<string name="social_backup_setup_explainer_button">Choose trusted contacts</string>
 
 	<!-- recovery from the secret owner's POV -->