From 4e78a72af907ac32eccd87ebdbf6ec44a4336d36 Mon Sep 17 00:00:00 2001
From: Christian Schneppe <christian@pix-art.de>
Date: Sun, 30 Dec 2018 21:19:49 +0100
Subject: add ability to set nickname in profile

---
 src/main/res/layout/activity_edit_account.xml | 52 ++++++++++++++++++++++++++-
 1 file changed, 51 insertions(+), 1 deletion(-)

(limited to 'src/main/res/layout/activity_edit_account.xml')

diff --git a/src/main/res/layout/activity_edit_account.xml b/src/main/res/layout/activity_edit_account.xml
index 56d108b68..163fe270a 100644
--- a/src/main/res/layout/activity_edit_account.xml
+++ b/src/main/res/layout/activity_edit_account.xml
@@ -42,11 +42,57 @@
                         android:layout_height="wrap_content"
                         android:padding="@dimen/card_padding_regular">
 
+                        <RelativeLayout
+                            android:id="@+id/your_name_box"
+                            android:layout_width="wrap_content"
+                            android:layout_height="match_parent"
+                            android:layout_alignParentTop="true"
+                            android:layout_marginBottom="@dimen/activity_vertical_margin">
+
+                            <LinearLayout
+                                android:layout_width="wrap_content"
+                                android:layout_height="wrap_content"
+                                android:layout_alignParentStart="true"
+                                android:layout_alignParentLeft="true"
+                                android:layout_centerVertical="true"
+                                android:layout_toStartOf="@+id/action_edit_your_name"
+                                android:layout_toLeftOf="@+id/action_edit_your_name"
+                                android:orientation="vertical">
+
+                                <TextView
+                                    android:id="@+id/your_name"
+                                    android:layout_width="wrap_content"
+                                    android:layout_height="wrap_content"
+                                    android:text="@string/no_name_set_instructions"
+                                    android:textAppearance="@style/TextAppearance.Conversations.Body1.Tertiary" />
+
+                                <TextView
+                                    android:id="@+id/your_name_desc"
+                                    android:layout_width="wrap_content"
+                                    android:layout_height="wrap_content"
+                                    android:text="@string/your_name"
+                                    android:textAppearance="@style/TextAppearance.Conversations.Caption" />
+                            </LinearLayout>
+
+                            <ImageButton
+                                android:id="@+id/action_edit_your_name"
+                                android:layout_width="wrap_content"
+                                android:layout_height="wrap_content"
+                                android:layout_alignParentEnd="true"
+                                android:layout_alignParentRight="true"
+                                android:layout_centerVertical="true"
+                                android:alpha="?attr/icon_alpha"
+                                android:background="?attr/selectableItemBackgroundBorderless"
+                                android:padding="@dimen/image_button_padding"
+                                android:src="?attr/icon_edit_body"
+                                android:visibility="visible" />
+                        </RelativeLayout>
+
                         <com.makeramen.roundedimageview.RoundedImageView
                             android:id="@+id/avater"
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
-                            android:layout_alignParentTop="true"
+                            android:layout_below="@id/your_name_box"
                             android:layout_centerHorizontal="true"
                             android:layout_marginBottom="@dimen/avatar_item_distance"
                             android:adjustViewBounds="true"
@@ -513,6 +559,10 @@
                             </TableRow>
                         </TableLayout>
 
+                        <View
+                            android:layout_width="match_parent"
+                            android:layout_height="8dp" />
+
                         <RelativeLayout
                             android:id="@+id/pgp_fingerprint_box"
                             android:layout_width="wrap_content"
-- 
cgit v1.2.3