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

Improve dialog for avatar confirmation

Browse Source
This commit is contained in:
Sebastian Kürten
2020-12-04 09:29:27 +01:00
committed by Torsten Grote
parent b22f302fdd
commit f75e789493
3 changed files with 6 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
briar-android/src/main/java/org/briarproject/briar/android/settings/ConfirmAvatarDialogFragment.java
View File

@@ -72,9 +72,8 @@ public class ConfirmAvatarDialogFragment extends DialogFragment {
builder.setView(view); builder.setView(view);
builder.setTitle(R.string.dialog_confirm_profile_picture_title); 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.setNegativeButton(R.string.cancel, null);
builder.setPositiveButton(R.string.dialog_confirm_profile_picture_set, builder.setPositiveButton(R.string.change,
(dialog, id) -> settingsViewModel.setAvatar(uri)); (dialog, id) -> settingsViewModel.setAvatar(uri));
ImageView imageView = view.findViewById(R.id.image); ImageView imageView = view.findViewById(R.id.image);

6
briar-android/src/main/res/layout/fragment_confirm_avatar_dialog.xml
View File

@@ -1,5 +1,5 @@
<?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:layout_width="match_parent" android:layout_width="match_parent"
@@ -10,6 +10,7 @@
<de.hdodenhof.circleimageview.CircleImageView <de.hdodenhof.circleimageview.CircleImageView
android:id="@+id/image" android:id="@+id/image"
style="@style/BriarAvatar" style="@style/BriarAvatar"
android:layout_marginTop="@dimen/listitem_vertical_margin"
android:layout_width="@dimen/listitem_picture_size" android:layout_width="@dimen/listitem_picture_size"
android:layout_height="@dimen/listitem_picture_size" android:layout_height="@dimen/listitem_picture_size"
android:layout_gravity="bottom|left|start" android:layout_gravity="bottom|left|start"
@@ -18,6 +19,7 @@
tools:src="@mipmap/ic_launcher_round" /> tools:src="@mipmap/ic_launcher_round" />
<TextView <TextView
android:layout_marginTop="@dimen/listitem_vertical_margin"
android:id="@+id/username" android:id="@+id/username"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="0dp" android:layout_height="0dp"
@@ -39,4 +41,4 @@
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/image" /> app:layout_constraintTop_toBottomOf="@+id/image" />
</androidx.constraintlayout.widget.ConstraintLayout > </androidx.constraintlayout.widget.ConstraintLayout>

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

@@ -455,10 +455,8 @@
<!-- Settings Profile Picture --> <!-- Settings Profile Picture -->
<string name="change_profile_picture">Tap to change your profile picture</string> <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_title">Change profile picture</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_remark">Only your contacts can see your profile image</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 --> <!-- Settings Display -->
<string name="pref_language_title">Language &amp; region</string> <string name="pref_language_title">Language &amp; region</string>