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

Fix explainer fragment

Browse Source
This commit is contained in:
ameba23
2022-02-04 09:08:13 +01:00
parent c9140195cc
commit 5b63aa28d3
2 changed files with 54 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files

103
briar-android/src/main/res/layout/fragment_social_backup_setup_explainer.xml
View File

@@ -1,60 +1,59 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android" <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto" xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools" xmlns:tools="http://schemas.android.com/tools"
android:id="@+id/linearLayout" 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"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="match_parent"
android:layout_marginTop="24dp" android:paddingLeft="@dimen/margin_large"
android:gravity="center" android:paddingTop="@dimen/margin_medium"
android:text="@string/social_backup_setup_explainer_title" android:paddingRight="@dimen/margin_large"
android:textSize="24sp" android:paddingBottom="@dimen/margin_medium"
app:layout_constraintTop_toTopOf="parent" tools:ignore="VectorDrawableCompat">
tools:layout_editor_absoluteX="16dp" />
<ImageView <TextView
android:id="@+id/imageView" android:id="@+id/textView"
android:layout_width="wrap_content" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginTop="24dp" android:layout_marginTop="24dp"
app:layout_constraintEnd_toEndOf="parent" android:gravity="center"
app:layout_constraintStart_toStartOf="parent" android:text="@string/social_backup_setup_explainer_title"
app:layout_constraintTop_toBottomOf="@+id/textView" android:textSize="24sp"
app:srcCompat="@drawable/qr_code_social_backup" /> app:layout_constraintTop_toTopOf="parent"
tools:layout_editor_absoluteX="16dp" />
<TextView <ImageView
android:id="@+id/textViewExplain" android:id="@+id/imageView"
android:layout_width="match_parent" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginTop="24dp" android:layout_marginTop="24dp"
android:gravity="center" app:layout_constraintEnd_toEndOf="parent"
android:text="@string/social_backup_setup_explainer_long" app:layout_constraintStart_toStartOf="parent"
android:textSize="20sp" app:layout_constraintTop_toBottomOf="@+id/textView"
app:layout_constraintEnd_toEndOf="parent" app:srcCompat="@drawable/qr_code_social_backup" />
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/imageView"
tools:layout_editor_absoluteX="16dp" />
<Button <TextView
android:id="@+id/button" android:id="@+id/textViewExplain"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginTop="24dp" android:layout_marginTop="24dp"
android:text="@string/social_backup_setup_explainer_button" android:gravity="center"
app:layout_constraintEnd_toEndOf="parent" android:text="@string/social_backup_setup_explainer_long"
app:layout_constraintHorizontal_bias="0.0" android:textSize="20sp"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toBottomOf="@+id/textViewExplain" /> 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> </androidx.constraintlayout.widget.ConstraintLayout>

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

@@ -671,9 +671,9 @@
<string name="backup_created">Backup created 1/6/2020</string> <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_title">Backup your Briar identity and contacts list using trusted contacts</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_long">You must choose a set of contacts to send backup pieces to.</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_button">Choose trusted contacts</string>
<!-- recovery from the secret owner's POV --> <!-- recovery from the secret owner's POV -->