Implement display name editing

res/layout/activity_home.xml

@@ -26,7 +26,7 @@
                 android:layout_height="@dimen/small_profile_picture_size"
                 android:layout_marginLeft="8dp"
                 android:layout_alignParentLeft="true"
-                android:layout_centerVertical="true"/>
+                android:layout_centerVertical="true" />
 
             <TextView
                 android:layout_width="wrap_content"

res/layout/activity_landing.xml

@@ -9,7 +9,7 @@
     <View
         android:layout_width="match_parent"
         android:layout_height="0dp"
-        android:layout_weight="1"/>
+        android:layout_weight="1" />
 
     <TextView
         android:layout_width="match_parent"
@@ -30,7 +30,7 @@
     <View
         android:layout_width="match_parent"
         android:layout_height="0dp"
-        android:layout_weight="1"/>
+        android:layout_weight="1" />
 
     <Button
         style="@style/MediumProminentFilledButton"

res/layout/activity_settings.xml

@@ -3,6 +3,7 @@
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
     android:scrollbars="none">
 
     <LinearLayout
@@ -12,29 +13,101 @@
         android:orientation="vertical"
         android:gravity="center_horizontal">
 
+        <android.support.v7.widget.Toolbar
+            android:id="@+id/toolbar"
+            android:layout_width="match_parent"
+            android:layout_height="?attr/actionBarSize"
+            android:minHeight="?attr/actionBarSize"
+            app:contentInsetLeft="20dp"
+            app:contentInsetRight="20dp"
+            android:theme="?attr/actionBarStyle">
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:gravity="center_vertical"
+                android:orientation="horizontal">
+
+                <ImageView
+                    android:id="@+id/cancelButton"
+                    android:layout_width="24dp"
+                    android:layout_height="24dp"
+                    android:src="@drawable/ic_close_white_24dp"
+                    android:visibility="gone" />
+
+                <TextView
+                    android:id="@+id/titleTextView"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="Settings"
+                    android:textColor="@color/text"
+                    android:textSize="@dimen/very_large_font_size"
+                    android:fontFamily="sans-serif-medium" />
+
+                <View
+                    android:layout_width="0dp"
+                    android:layout_height="match_parent"
+                    android:layout_weight="1" />
+
+                <ImageView
+                    android:id="@+id/saveButton"
+                    android:layout_width="24dp"
+                    android:layout_height="24dp"
+                    android:src="@drawable/ic_check_white_24dp"
+                    android:visibility="gone" />
+
+                <ImageView
+                    android:id="@+id/showQRCodeButton"
+                    android:layout_width="24dp"
+                    android:layout_height="24dp"
+                    android:src="@drawable/ic_qr_code" />
+
+            </LinearLayout>
+
+        </android.support.v7.widget.Toolbar>
+
         <org.thoughtcrime.securesms.loki.redesign.views.ProfilePictureView
             android:id="@+id/profilePictureView"
             android:layout_width="@dimen/large_profile_picture_size"
             android:layout_height="@dimen/large_profile_picture_size"
             android:layout_marginTop="@dimen/medium_spacing" />
 
-        <TextView
-            android:id="@+id/displayNameTextView"
-            android:layout_width="wrap_content"
+        <RelativeLayout
+            android:id="@+id/displayNameContainer"
+            android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_marginLeft="@dimen/large_spacing"
             android:layout_marginTop="@dimen/small_spacing"
-            android:layout_marginRight="@dimen/large_spacing"
-            android:textColor="@color/text"
-            android:textSize="@dimen/very_large_font_size"
-            android:textStyle="bold" />
+            android:layout_marginRight="@dimen/large_spacing">
+
+            <EditText
+                style="@style/SessionEditText"
+                android:id="@+id/displayNameEditText"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_centerInParent="true"
+                android:paddingTop="12dp"
+                android:paddingBottom="12dp"
+                android:visibility="invisible"
+                android:hint="Enter a display name" />
+
+            <TextView
+                android:id="@+id/displayNameTextView"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_centerInParent="true"
+                android:textColor="@color/text"
+                android:textSize="@dimen/very_large_font_size"
+                android:textStyle="bold" />
+
+        </RelativeLayout>
 
         <org.thoughtcrime.securesms.loki.redesign.views.SeparatorView
             android:id="@+id/separatorView"
             android:layout_width="match_parent"
             android:layout_height="32dp"
             android:layout_marginLeft="@dimen/large_spacing"
-            android:layout_marginTop="@dimen/large_spacing"
+            android:layout_marginTop="20dp"
             android:layout_marginRight="@dimen/large_spacing"/>
 
         <TextView

res/values/dimens.xml

@@ -18,7 +18,7 @@
     <dimen name="medium_profile_picture_size">46dp</dimen>
     <dimen name="large_profile_picture_size">76dp</dimen>
     <dimen name="conversation_view_status_indicator_size">14dp</dimen>
-    <dimen name="border_thickness">2dp</dimen>
+    <dimen name="border_thickness">1dp</dimen>
     <dimen name="profile_picture_border_thickness">1dp</dimen>
     <dimen name="new_conversation_button_size">56dp</dimen>
     <dimen name="tab_bar_height">48dp</dimen>

res/values/styles.xml

@@ -35,7 +35,7 @@
         <item name="android:background">@drawable/prominent_filled_button_medium_background</item>
         <item name="android:textAllCaps">false</item>
         <item name="android:textSize">@dimen/medium_font_size</item>
-        <item name="android:textStyle">bold</item>
+        <item name="android:fontFamily">sans-serif-medium</item>
         <item name="android:textColor">@color/text</item>
     </style>
 
@@ -43,7 +43,7 @@
         <item name="android:background">@drawable/prominent_outline_button_medium_background</item>
         <item name="android:textAllCaps">false</item>
         <item name="android:textSize">@dimen/medium_font_size</item>
-        <item name="android:textStyle">bold</item>
+        <item name="android:fontFamily">sans-serif-medium</item>
         <item name="android:textColor">@color/accent</item>
     </style>
 
@@ -51,7 +51,7 @@
         <item name="android:background">@drawable/unimportant_filled_button_medium_background</item>
         <item name="android:textAllCaps">false</item>
         <item name="android:textSize">@dimen/medium_font_size</item>
-        <item name="android:textStyle">bold</item>
+        <item name="android:fontFamily">sans-serif-medium</item>
         <item name="android:textColor">@color/text</item>
     </style>
 
@@ -59,7 +59,7 @@
         <item name="android:background">@drawable/unimportant_outline_button_medium_background</item>
         <item name="android:textAllCaps">false</item>
         <item name="android:textSize">@dimen/medium_font_size</item>
-        <item name="android:textStyle">bold</item>
+        <item name="android:fontFamily">sans-serif-medium</item>
         <item name="android:textColor">@color/text</item>
     </style>
 
@@ -90,7 +90,7 @@
         <item name="android:paddingRight">@dimen/medium_spacing</item>
         <item name="android:paddingBottom">12dp</item>
         <item name="android:textSize">@dimen/medium_font_size</item>
-        <item name="android:textStyle">bold</item>
+        <item name="android:fontFamily">sans-serif-medium</item>
         <item name="android:textColor">@color/fake_chat_bubble_text</item>
         <item name="android:elevation">20dp</item>
     </style>
@@ -102,7 +102,7 @@
         <item name="android:paddingRight">@dimen/medium_spacing</item>
         <item name="android:paddingBottom">12dp</item>
         <item name="android:textSize">@dimen/medium_font_size</item>
-        <item name="android:textStyle">bold</item>
+        <item name="android:fontFamily">sans-serif-medium</item>
         <item name="android:textColor">@color/text</item>
         <item name="android:elevation">20dp</item>
     </style>