From f75e7894936dc70605480feacfda71a4996793ad Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sebastian=20K=C3=BCrten?= <sebastian@mobanisto.de>
Date: Fri, 4 Dec 2020 09:29:27 +0100
Subject: [PATCH] Improve dialog for avatar confirmation

---
 .../briar/android/settings/ConfirmAvatarDialogFragment.java | 3 +--
 .../src/main/res/layout/fragment_confirm_avatar_dialog.xml  | 6 ++++--
 briar-android/src/main/res/values/strings.xml               | 4 +---
 3 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/briar-android/src/main/java/org/briarproject/briar/android/settings/ConfirmAvatarDialogFragment.java b/briar-android/src/main/java/org/briarproject/briar/android/settings/ConfirmAvatarDialogFragment.java
index bd28e7c5f..fcaaca986 100644
--- a/briar-android/src/main/java/org/briarproject/briar/android/settings/ConfirmAvatarDialogFragment.java
+++ b/briar-android/src/main/java/org/briarproject/briar/android/settings/ConfirmAvatarDialogFragment.java
@@ -72,9 +72,8 @@ public class ConfirmAvatarDialogFragment extends DialogFragment {
 		builder.setView(view);
 
 		builder.setTitle(R.string.dialog_confirm_profile_picture_title);
-		builder.setMessage(R.string.dialog_confirm_profile_picture_question);
 		builder.setNegativeButton(R.string.cancel, null);
-		builder.setPositiveButton(R.string.dialog_confirm_profile_picture_set,
+		builder.setPositiveButton(R.string.change,
 				(dialog, id) -> settingsViewModel.setAvatar(uri));
 
 		ImageView imageView = view.findViewById(R.id.image);
diff --git a/briar-android/src/main/res/layout/fragment_confirm_avatar_dialog.xml b/briar-android/src/main/res/layout/fragment_confirm_avatar_dialog.xml
index a36219976..59d16b5da 100644
--- a/briar-android/src/main/res/layout/fragment_confirm_avatar_dialog.xml
+++ b/briar-android/src/main/res/layout/fragment_confirm_avatar_dialog.xml
@@ -1,5 +1,5 @@
 <?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:tools="http://schemas.android.com/tools"
 	android:layout_width="match_parent"
@@ -10,6 +10,7 @@
 	<de.hdodenhof.circleimageview.CircleImageView
 		android:id="@+id/image"
 		style="@style/BriarAvatar"
+		android:layout_marginTop="@dimen/listitem_vertical_margin"
 		android:layout_width="@dimen/listitem_picture_size"
 		android:layout_height="@dimen/listitem_picture_size"
 		android:layout_gravity="bottom|left|start"
@@ -18,6 +19,7 @@
 		tools:src="@mipmap/ic_launcher_round" />
 
 	<TextView
+		android:layout_marginTop="@dimen/listitem_vertical_margin"
 		android:id="@+id/username"
 		android:layout_width="wrap_content"
 		android:layout_height="0dp"
@@ -39,4 +41,4 @@
 		app:layout_constraintStart_toStartOf="parent"
 		app:layout_constraintTop_toBottomOf="@+id/image" />
 
-</androidx.constraintlayout.widget.ConstraintLayout >
\ No newline at end of file
+</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/briar-android/src/main/res/values/strings.xml b/briar-android/src/main/res/values/strings.xml
index e2022c331..8eff30b30 100644
--- a/briar-android/src/main/res/values/strings.xml
+++ b/briar-android/src/main/res/values/strings.xml
@@ -455,10 +455,8 @@
 
 	<!-- Settings Profile Picture -->
 	<string name="change_profile_picture">Tap to change your profile picture</string>
-	<string name="dialog_confirm_profile_picture_title">Please confirm</string>
-	<string name="dialog_confirm_profile_picture_question">Do you want to use this image as your profile picture?</string>
+	<string name="dialog_confirm_profile_picture_title">Change profile picture</string>
 	<string name="dialog_confirm_profile_picture_remark">Only your contacts can see your profile image</string>
-	<string name="dialog_confirm_profile_picture_set">Set picture</string>
 
 	<!-- Settings Display -->
 	<string name="pref_language_title">Language &amp; region</string>