From 46545a7be8af42012107d9e4c52307d212c3a8f6 Mon Sep 17 00:00:00 2001
From: Oguz Kocer <oguz.kocer@automattic.com>
Date: Tue, 17 Nov 2015 21:56:02 +0200
Subject: [PATCH 01/48] My profile activity introduced

---
 WordPress/src/main/AndroidManifest.xml        |  5 +++
 .../android/ui/me/MyProfileActivity.java      | 40 +++++++++++++++++++
 .../main/res/layout/my_profile_activity.xml   |  8 ++++
 WordPress/src/main/res/values/strings.xml     |  1 +
 4 files changed, 54 insertions(+)
 create mode 100644 WordPress/src/main/java/org/wordpress/android/ui/me/MyProfileActivity.java
 create mode 100644 WordPress/src/main/res/layout/my_profile_activity.xml

diff --git a/WordPress/src/main/AndroidManifest.xml b/WordPress/src/main/AndroidManifest.xml
index be660ec674f5..089c01dc4dd1 100644
--- a/WordPress/src/main/AndroidManifest.xml
+++ b/WordPress/src/main/AndroidManifest.xml
@@ -316,6 +316,11 @@
             android:theme="@style/CalypsoTheme"
             android:windowSoftInputMode="stateHidden"/>
 
+        <!--Me activities-->
+        <activity
+            android:name=".ui.me.MyProfileActivity"
+            android:theme="@style/CalypsoTheme" />
+
 		<!-- Services -->
         <service
             android:name=".ui.posts.services.PostUploadService"
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/me/MyProfileActivity.java b/WordPress/src/main/java/org/wordpress/android/ui/me/MyProfileActivity.java
new file mode 100644
index 000000000000..2e230e0a98ef
--- /dev/null
+++ b/WordPress/src/main/java/org/wordpress/android/ui/me/MyProfileActivity.java
@@ -0,0 +1,40 @@
+package org.wordpress.android.ui.me;
+
+import android.os.Bundle;
+import android.support.v7.app.ActionBar;
+import android.support.v7.app.AppCompatActivity;
+import android.view.MenuItem;
+
+import org.wordpress.android.R;
+import org.wordpress.android.ui.ActivityLauncher;
+
+public class MyProfileActivity extends AppCompatActivity {
+    @Override
+    public void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+
+        ActionBar actionBar = getSupportActionBar();
+        if (actionBar != null) {
+            actionBar.setHomeButtonEnabled(true);
+            actionBar.setDisplayHomeAsUpEnabled(true);
+        }
+        setContentView(R.layout.my_profile_activity);
+
+        setTitle(R.string.my_profile);
+    }
+
+    @Override
+    public void finish() {
+        super.finish();
+        ActivityLauncher.slideOutToRight(this);
+    }
+
+    @Override
+    public boolean onOptionsItemSelected(final MenuItem item) {
+        if (item.getItemId() == android.R.id.home) {
+            onBackPressed();
+            return true;
+        }
+        return super.onOptionsItemSelected(item);
+    }
+}
diff --git a/WordPress/src/main/res/layout/my_profile_activity.xml b/WordPress/src/main/res/layout/my_profile_activity.xml
new file mode 100644
index 000000000000..928dcf2a41c9
--- /dev/null
+++ b/WordPress/src/main/res/layout/my_profile_activity.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:background="@color/alert_yellow"
+    android:orientation="vertical">
+
+</LinearLayout>
\ No newline at end of file
diff --git a/WordPress/src/main/res/values/strings.xml b/WordPress/src/main/res/values/strings.xml
index 76cb4d5d8645..c2cb12cd069b 100644
--- a/WordPress/src/main/res/values/strings.xml
+++ b/WordPress/src/main/res/values/strings.xml
@@ -1051,6 +1051,7 @@
     <string name="hs__invalid_email_error">Enter a valid email address</string>
 
     <!--Me-->
+    <string name="my_profile">My Profile</string>
     <string name="me_btn_settings">Account Settings</string>
     <string name="me_btn_support">Help &amp; Support</string>
     <string name="me_btn_login_logout">Login/Logout</string>

From ad59f5862be99f56bedc24428f7c5abe5165e643 Mon Sep 17 00:00:00 2001
From: Oguz Kocer <oguz.kocer@automattic.com>
Date: Tue, 17 Nov 2015 21:56:24 +0200
Subject: [PATCH 02/48] Link added to me page for the my profile activity

---
 .../android/ui/ActivityLauncher.java          |  6 ++++++
 .../wordpress/android/ui/main/MeFragment.java |  7 +++++++
 WordPress/src/main/res/layout/me_fragment.xml | 21 ++++++++++++++++++-
 3 files changed, 33 insertions(+), 1 deletion(-)

diff --git a/WordPress/src/main/java/org/wordpress/android/ui/ActivityLauncher.java b/WordPress/src/main/java/org/wordpress/android/ui/ActivityLauncher.java
index b421dd23a93a..ba107e50d15a 100644
--- a/WordPress/src/main/java/org/wordpress/android/ui/ActivityLauncher.java
+++ b/WordPress/src/main/java/org/wordpress/android/ui/ActivityLauncher.java
@@ -20,6 +20,7 @@
 import org.wordpress.android.ui.accounts.SignInActivity;
 import org.wordpress.android.ui.comments.CommentsActivity;
 import org.wordpress.android.ui.main.SitePickerActivity;
+import org.wordpress.android.ui.me.MyProfileActivity;
 import org.wordpress.android.ui.media.MediaBrowserActivity;
 import org.wordpress.android.ui.media.WordPressMediaUtils;
 import org.wordpress.android.ui.posts.EditPostActivity;
@@ -172,6 +173,11 @@ public static void addMedia(Activity activity) {
         WordPressMediaUtils.launchPictureLibrary(activity);
     }
 
+    public static void viewMyProfile(Context context) {
+        Intent intent = new Intent(context, MyProfileActivity.class);
+        slideInFromRight(context, intent);
+    }
+
     public static void viewAccountSettings(Activity activity) {
         Intent intent = new Intent(activity, SettingsActivity.class);
         slideInFromRightForResult(activity, intent, RequestCodes.ACCOUNT_SETTINGS);
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/main/MeFragment.java b/WordPress/src/main/java/org/wordpress/android/ui/main/MeFragment.java
index d367af217a66..03a87b0d426f 100644
--- a/WordPress/src/main/java/org/wordpress/android/ui/main/MeFragment.java
+++ b/WordPress/src/main/java/org/wordpress/android/ui/main/MeFragment.java
@@ -60,6 +60,13 @@ public View onCreateView(LayoutInflater inflater, ViewGroup container,
         addDropShadowToAvatar();
         refreshAccountDetails();
 
+        rootView.findViewById(R.id.row_my_profile).setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                ActivityLauncher.viewMyProfile(getActivity());
+            }
+        });
+
         rootView.findViewById(R.id.row_settings).setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
diff --git a/WordPress/src/main/res/layout/me_fragment.xml b/WordPress/src/main/res/layout/me_fragment.xml
index f943bd62918e..9162a66f1800 100644
--- a/WordPress/src/main/res/layout/me_fragment.xml
+++ b/WordPress/src/main/res/layout/me_fragment.xml
@@ -53,10 +53,29 @@
             tools:text="username" />
 
         <LinearLayout
-            android:id="@+id/row_settings"
+            android:id="@+id/row_my_profile"
             style="@style/MeListRowLayout"
             android:layout_marginTop="@dimen/me_list_margin_top">
 
+            <ImageView
+                android:id="@+id/me_my_profile_icon"
+                style="@style/MeListRowIcon"
+                android:contentDescription="@string/my_profile"
+                android:src="@drawable/me_icon_settings" />
+
+            <org.wordpress.android.widgets.WPTextView
+                android:id="@+id/me_my_profile_text_view"
+                style="@style/MeListRowTextView"
+                android:text="@string/my_profile" />
+
+        </LinearLayout>
+
+        <View style="@style/MeListSectionDividerView" />
+
+        <LinearLayout
+            android:id="@+id/row_settings"
+            style="@style/MeListRowLayout">
+
             <ImageView
                 android:id="@+id/me_settings_icon"
                 style="@style/MeListRowIcon"

From 2fb87f1a26f7eb6bf2b5b5f8a1b4a3ac02377123 Mon Sep 17 00:00:00 2001
From: Oguz Kocer <oguz.kocer@automattic.com>
Date: Wed, 18 Nov 2015 14:38:33 +0200
Subject: [PATCH 03/48] My profile labels added

---
 .../main/res/layout/my_profile_activity.xml   | 21 ++++++++++++++++++-
 WordPress/src/main/res/values/strings.xml     |  8 ++++++-
 WordPress/src/main/res/values/styles.xml      | 12 +++++++++++
 3 files changed, 39 insertions(+), 2 deletions(-)

diff --git a/WordPress/src/main/res/layout/my_profile_activity.xml b/WordPress/src/main/res/layout/my_profile_activity.xml
index 928dcf2a41c9..ef1a69445f47 100644
--- a/WordPress/src/main/res/layout/my_profile_activity.xml
+++ b/WordPress/src/main/res/layout/my_profile_activity.xml
@@ -2,7 +2,26 @@
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="@color/alert_yellow"
     android:orientation="vertical">
 
+    <TextView
+        style="@style/MyProfileLabel"
+        android:id="@+id/first_name"
+        android:text="@string/first_name"/>
+
+    <TextView
+        style="@style/MyProfileLabel"
+        android:id="@+id/last_name"
+        android:text="@string/last_name"/>
+
+    <TextView
+        style="@style/MyProfileLabel"
+        android:id="@+id/display_name"
+        android:text="@string/public_display_name"/>
+
+    <TextView
+        style="@style/MyProfileLabel"
+        android:id="@+id/about_me"
+        android:text="@string/about_me"/>
+
 </LinearLayout>
\ No newline at end of file
diff --git a/WordPress/src/main/res/values/strings.xml b/WordPress/src/main/res/values/strings.xml
index c2cb12cd069b..a6a7b1655975 100644
--- a/WordPress/src/main/res/values/strings.xml
+++ b/WordPress/src/main/res/values/strings.xml
@@ -1051,7 +1051,6 @@
     <string name="hs__invalid_email_error">Enter a valid email address</string>
 
     <!--Me-->
-    <string name="my_profile">My Profile</string>
     <string name="me_btn_settings">Account Settings</string>
     <string name="me_btn_support">Help &amp; Support</string>
     <string name="me_btn_login_logout">Login/Logout</string>
@@ -1100,4 +1099,11 @@
     <string name="theme_web_activity">Theme Web Activity</string>
     <string name="could_not_load_theme">Could not load theme</string>
 
+    <!--My profile-->
+    <string name="my_profile">My Profile</string>
+    <string name="first_name">First Name</string>
+    <string name="last_name">Last Name</string>
+    <string name="public_display_name">Public Display Name</string>
+    <string name="about_me">About Me</string>
+
 </resources>
diff --git a/WordPress/src/main/res/values/styles.xml b/WordPress/src/main/res/values/styles.xml
index ecca82fdb37a..570ca1573ed1 100644
--- a/WordPress/src/main/res/values/styles.xml
+++ b/WordPress/src/main/res/values/styles.xml
@@ -321,4 +321,16 @@
         <item name="android:background">@drawable/fab_menu_label_background</item>
         <item name="android:textColor">@color/white</item>
     </style>
+
+    <style name="MyProfileLabel">
+        <item name="android:background">?android:attr/selectableItemBackground</item>
+        <item name="android:layout_width">wrap_content</item>
+        <item name="android:layout_height">wrap_content</item>
+        <item name="android:layout_marginLeft">@dimen/margin_extra_large</item>
+        <item name="android:layout_marginRight">@dimen/margin_extra_large</item>
+        <item name="android:textColor">@color/grey_dark</item>
+        <item name="android:textSize">@dimen/text_sz_large</item>
+        <item name="android:paddingTop">@dimen/margin_medium</item>
+        <item name="android:paddingBottom">@dimen/margin_medium</item>
+    </style>
 </resources>

From ef28245aa6ac2082546021567fc23646ffe478e9 Mon Sep 17 00:00:00 2001
From: Oguz Kocer <oguz.kocer@automattic.com>
Date: Wed, 18 Nov 2015 16:25:55 +0200
Subject: [PATCH 04/48] Dividers added to my profile page

---
 .../main/res/layout/my_profile_activity.xml   | 25 +++++++++++++------
 WordPress/src/main/res/values/colors.xml      |  2 +-
 WordPress/src/main/res/values/styles.xml      | 12 ++++++---
 3 files changed, 27 insertions(+), 12 deletions(-)

diff --git a/WordPress/src/main/res/layout/my_profile_activity.xml b/WordPress/src/main/res/layout/my_profile_activity.xml
index ef1a69445f47..237dd637c5ba 100644
--- a/WordPress/src/main/res/layout/my_profile_activity.xml
+++ b/WordPress/src/main/res/layout/my_profile_activity.xml
@@ -5,23 +5,32 @@
     android:orientation="vertical">
 
     <TextView
-        style="@style/MyProfileLabel"
         android:id="@+id/first_name"
-        android:text="@string/first_name"/>
+        style="@style/MyProfileLabel"
+        android:layout_marginTop="@dimen/margin_medium"
+        android:text="@string/first_name" />
+
+    <View style="@style/MyProfileDividerView" />
 
     <TextView
-        style="@style/MyProfileLabel"
         android:id="@+id/last_name"
-        android:text="@string/last_name"/>
+        style="@style/MyProfileLabel"
+        android:text="@string/last_name" />
+
+    <View style="@style/MyProfileDividerView" />
 
     <TextView
-        style="@style/MyProfileLabel"
         android:id="@+id/display_name"
-        android:text="@string/public_display_name"/>
+        style="@style/MyProfileLabel"
+        android:text="@string/public_display_name" />
+
+    <View style="@style/MyProfileDividerView" />
 
     <TextView
-        style="@style/MyProfileLabel"
         android:id="@+id/about_me"
-        android:text="@string/about_me"/>
+        style="@style/MyProfileLabel"
+        android:text="@string/about_me" />
+
+    <View style="@style/MyProfileDividerView" />
 
 </LinearLayout>
\ No newline at end of file
diff --git a/WordPress/src/main/res/values/colors.xml b/WordPress/src/main/res/values/colors.xml
index 6a18bfb0de3d..cfa42542176f 100644
--- a/WordPress/src/main/res/values/colors.xml
+++ b/WordPress/src/main/res/values/colors.xml
@@ -141,7 +141,7 @@
     <color name="background_grey">@color/grey_lighten_30</color>
 
     <!--Me-->
-    <color name="me_list_row_border">#D8E3EA</color>
+    <color name="me_divider">#D8E3EA</color>
 
     <color name="passcodelock_background">@color/color_primary</color>
     <color name="passcodelock_prompt_text_color">@color/white</color>
diff --git a/WordPress/src/main/res/values/styles.xml b/WordPress/src/main/res/values/styles.xml
index 570ca1573ed1..fa28158f8108 100644
--- a/WordPress/src/main/res/values/styles.xml
+++ b/WordPress/src/main/res/values/styles.xml
@@ -314,7 +314,7 @@
         <item name="android:layout_width">match_parent</item>
         <item name="android:layout_height">1dp</item>
         <item name="android:layout_gravity">center_vertical</item>
-        <item name="android:background">@color/me_list_row_border</item>
+        <item name="android:background">@color/me_divider</item>
     </style>
 
     <style name="fab_menu_label_style">
@@ -330,7 +330,13 @@
         <item name="android:layout_marginRight">@dimen/margin_extra_large</item>
         <item name="android:textColor">@color/grey_dark</item>
         <item name="android:textSize">@dimen/text_sz_large</item>
-        <item name="android:paddingTop">@dimen/margin_medium</item>
-        <item name="android:paddingBottom">@dimen/margin_medium</item>
+        <item name="android:paddingTop">@dimen/margin_extra_large</item>
+        <item name="android:paddingBottom">@dimen/margin_extra_large</item>
+    </style>
+
+    <style name="MyProfileDividerView">
+        <item name="android:layout_width">match_parent</item>
+        <item name="android:layout_height">1dp</item>
+        <item name="android:background">@color/me_divider</item>
     </style>
 </resources>

From 04519ba8747b2269900ec000b00a0aa1a144a5d8 Mon Sep 17 00:00:00 2001
From: Oguz Kocer <oguz.kocer@automattic.com>
Date: Wed, 18 Nov 2015 16:47:48 +0200
Subject: [PATCH 05/48] My profile page now uses the correct text view & font

---
 WordPress/src/main/res/layout/my_profile_activity.xml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/WordPress/src/main/res/layout/my_profile_activity.xml b/WordPress/src/main/res/layout/my_profile_activity.xml
index 237dd637c5ba..2de1b7ad821b 100644
--- a/WordPress/src/main/res/layout/my_profile_activity.xml
+++ b/WordPress/src/main/res/layout/my_profile_activity.xml
@@ -4,7 +4,7 @@
     android:layout_height="match_parent"
     android:orientation="vertical">
 
-    <TextView
+    <org.wordpress.android.widgets.WPTextView
         android:id="@+id/first_name"
         style="@style/MyProfileLabel"
         android:layout_marginTop="@dimen/margin_medium"
@@ -12,21 +12,21 @@
 
     <View style="@style/MyProfileDividerView" />
 
-    <TextView
+    <org.wordpress.android.widgets.WPTextView
         android:id="@+id/last_name"
         style="@style/MyProfileLabel"
         android:text="@string/last_name" />
 
     <View style="@style/MyProfileDividerView" />
 
-    <TextView
+    <org.wordpress.android.widgets.WPTextView
         android:id="@+id/display_name"
         style="@style/MyProfileLabel"
         android:text="@string/public_display_name" />
 
     <View style="@style/MyProfileDividerView" />
 
-    <TextView
+    <org.wordpress.android.widgets.WPTextView
         android:id="@+id/about_me"
         style="@style/MyProfileLabel"
         android:text="@string/about_me" />

From f004610b03477357a7b00e15d2de9d4ef0e7d309 Mon Sep 17 00:00:00 2001
From: Oguz Kocer <oguz.kocer@automattic.com>
Date: Thu, 19 Nov 2015 21:31:59 +0200
Subject: [PATCH 06/48] Basic input dialog added to my profile for first name

---
 .../android/ui/me/MyProfileActivity.java      | 35 +++++++++++++++++++
 .../src/main/res/layout/my_profile_dialog.xml | 27 ++++++++++++++
 WordPress/src/main/res/values/styles.xml      |  7 ++--
 3 files changed, 64 insertions(+), 5 deletions(-)
 create mode 100644 WordPress/src/main/res/layout/my_profile_dialog.xml

diff --git a/WordPress/src/main/java/org/wordpress/android/ui/me/MyProfileActivity.java b/WordPress/src/main/java/org/wordpress/android/ui/me/MyProfileActivity.java
index 2e230e0a98ef..83004e696df8 100644
--- a/WordPress/src/main/java/org/wordpress/android/ui/me/MyProfileActivity.java
+++ b/WordPress/src/main/java/org/wordpress/android/ui/me/MyProfileActivity.java
@@ -1,12 +1,17 @@
 package org.wordpress.android.ui.me;
 
+import android.app.AlertDialog;
+import android.content.DialogInterface;
 import android.os.Bundle;
 import android.support.v7.app.ActionBar;
 import android.support.v7.app.AppCompatActivity;
+import android.view.LayoutInflater;
 import android.view.MenuItem;
+import android.view.View;
 
 import org.wordpress.android.R;
 import org.wordpress.android.ui.ActivityLauncher;
+import org.wordpress.android.widgets.OpenSansEditText;
 
 public class MyProfileActivity extends AppCompatActivity {
     @Override
@@ -21,6 +26,13 @@ public void onCreate(Bundle savedInstanceState) {
         setContentView(R.layout.my_profile_activity);
 
         setTitle(R.string.my_profile);
+
+        findViewById(R.id.first_name).setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                showInputDialog();
+            }
+        });
     }
 
     @Override
@@ -37,4 +49,27 @@ public boolean onOptionsItemSelected(final MenuItem item) {
         }
         return super.onOptionsItemSelected(item);
     }
+
+    protected void showInputDialog() {
+        LayoutInflater layoutInflater = LayoutInflater.from(MyProfileActivity.this);
+        View promptView = layoutInflater.inflate(R.layout.my_profile_dialog, null);
+        AlertDialog.Builder alertDialogBuilder = new AlertDialog.Builder(MyProfileActivity.this);
+        alertDialogBuilder.setView(promptView);
+
+        final OpenSansEditText editText = (OpenSansEditText) promptView.findViewById(R.id.edittext);
+        alertDialogBuilder.setCancelable(false)
+                .setPositiveButton(R.string.ok, new DialogInterface.OnClickListener() {
+                    public void onClick(DialogInterface dialog, int id) {
+                    }
+                })
+                .setNegativeButton(R.string.cancel,
+                        new DialogInterface.OnClickListener() {
+                            public void onClick(DialogInterface dialog, int id) {
+                                dialog.cancel();
+                            }
+                        });
+
+        AlertDialog alert = alertDialogBuilder.create();
+        alert.show();
+    }
 }
diff --git a/WordPress/src/main/res/layout/my_profile_dialog.xml b/WordPress/src/main/res/layout/my_profile_dialog.xml
new file mode 100644
index 000000000000..48d9665c8f16
--- /dev/null
+++ b/WordPress/src/main/res/layout/my_profile_dialog.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="vertical"
+    android:padding="@dimen/margin_extra_large">
+
+    <org.wordpress.android.widgets.WPTextView
+        android:id="@+id/textView"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="@string/first_name"
+        android:textColor="@color/grey_dark"
+        android:textSize="@dimen/text_sz_extra_large"
+        android:textStyle="bold"
+        app:fontVariation="light" />
+
+    <org.wordpress.android.widgets.OpenSansEditText
+        android:id="@+id/edittext"
+        android:layout_width="fill_parent"
+        android:layout_height="wrap_content"
+        android:padding="10dp" />
+
+    <!--android:hint="Enter text here.."-->
+
+</LinearLayout>
\ No newline at end of file
diff --git a/WordPress/src/main/res/values/styles.xml b/WordPress/src/main/res/values/styles.xml
index fa28158f8108..2bc893c47d47 100644
--- a/WordPress/src/main/res/values/styles.xml
+++ b/WordPress/src/main/res/values/styles.xml
@@ -324,14 +324,11 @@
 
     <style name="MyProfileLabel">
         <item name="android:background">?android:attr/selectableItemBackground</item>
-        <item name="android:layout_width">wrap_content</item>
+        <item name="android:layout_width">match_parent</item>
         <item name="android:layout_height">wrap_content</item>
-        <item name="android:layout_marginLeft">@dimen/margin_extra_large</item>
-        <item name="android:layout_marginRight">@dimen/margin_extra_large</item>
         <item name="android:textColor">@color/grey_dark</item>
         <item name="android:textSize">@dimen/text_sz_large</item>
-        <item name="android:paddingTop">@dimen/margin_extra_large</item>
-        <item name="android:paddingBottom">@dimen/margin_extra_large</item>
+        <item name="android:padding">@dimen/margin_extra_large</item>
     </style>
 
     <style name="MyProfileDividerView">

From cae4632760f73cf5f8264abb771501c9eccdbcb1 Mon Sep 17 00:00:00 2001
From: Oguz Kocer <oguz.kocer@automattic.com>
Date: Mon, 23 Nov 2015 17:15:25 +0200
Subject: [PATCH 07/48] My profile refactored and the labels are added in, the
 dialog is now connected to labels

---
 .../android/ui/me/MyProfileActivity.java      | 30 +++++++-
 .../main/res/layout/my_profile_activity.xml   | 71 ++++++++++++++-----
 .../src/main/res/layout/my_profile_dialog.xml | 10 +--
 WordPress/src/main/res/values/styles.xml      | 17 ++++-
 4 files changed, 100 insertions(+), 28 deletions(-)

diff --git a/WordPress/src/main/java/org/wordpress/android/ui/me/MyProfileActivity.java b/WordPress/src/main/java/org/wordpress/android/ui/me/MyProfileActivity.java
index 83004e696df8..37d434d0de91 100644
--- a/WordPress/src/main/java/org/wordpress/android/ui/me/MyProfileActivity.java
+++ b/WordPress/src/main/java/org/wordpress/android/ui/me/MyProfileActivity.java
@@ -12,8 +12,15 @@
 import org.wordpress.android.R;
 import org.wordpress.android.ui.ActivityLauncher;
 import org.wordpress.android.widgets.OpenSansEditText;
+import org.wordpress.android.widgets.WPTextView;
 
 public class MyProfileActivity extends AppCompatActivity {
+
+    private WPTextView mFirstName;
+    private WPTextView mLastName;
+    private WPTextView mDisplayName;
+    private WPTextView mAboutMe;
+
     @Override
     public void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
@@ -27,7 +34,14 @@ public void onCreate(Bundle savedInstanceState) {
 
         setTitle(R.string.my_profile);
 
-        findViewById(R.id.first_name).setOnClickListener(new View.OnClickListener() {
+        mFirstName = (WPTextView) findViewById(R.id.first_name);
+        mLastName = (WPTextView) findViewById(R.id.last_name);
+        mDisplayName = (WPTextView) findViewById(R.id.display_name);
+        mAboutMe = (WPTextView) findViewById(R.id.about_me);
+
+        refreshDetails();
+
+        findViewById(R.id.first_name_row).setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
                 showInputDialog();
@@ -56,10 +70,14 @@ protected void showInputDialog() {
         AlertDialog.Builder alertDialogBuilder = new AlertDialog.Builder(MyProfileActivity.this);
         alertDialogBuilder.setView(promptView);
 
-        final OpenSansEditText editText = (OpenSansEditText) promptView.findViewById(R.id.edittext);
+        final WPTextView textView = (WPTextView) promptView.findViewById(R.id.my_profile_dialog_label);
+        final OpenSansEditText editText = (OpenSansEditText) promptView.findViewById(R.id.my_profile_dialog_input);
+        textView.setText(R.string.first_name);
         alertDialogBuilder.setCancelable(false)
                 .setPositiveButton(R.string.ok, new DialogInterface.OnClickListener() {
                     public void onClick(DialogInterface dialog, int id) {
+                        mFirstName.setVisibility(View.VISIBLE);
+                        mFirstName.setText(editText.getText());
                     }
                 })
                 .setNegativeButton(R.string.cancel,
@@ -72,4 +90,12 @@ public void onClick(DialogInterface dialog, int id) {
         AlertDialog alert = alertDialogBuilder.create();
         alert.show();
     }
+
+    private void refreshDetails() {
+        // TODO: check if we have user details and set them, if we don't hide all the labels
+        mFirstName.setVisibility(View.GONE);
+        mLastName.setVisibility(View.GONE);
+        mDisplayName.setVisibility(View.GONE);
+        mAboutMe.setVisibility(View.GONE);
+    }
 }
diff --git a/WordPress/src/main/res/layout/my_profile_activity.xml b/WordPress/src/main/res/layout/my_profile_activity.xml
index 2de1b7ad821b..fac966df5d66 100644
--- a/WordPress/src/main/res/layout/my_profile_activity.xml
+++ b/WordPress/src/main/res/layout/my_profile_activity.xml
@@ -4,32 +4,69 @@
     android:layout_height="match_parent"
     android:orientation="vertical">
 
-    <org.wordpress.android.widgets.WPTextView
-        android:id="@+id/first_name"
-        style="@style/MyProfileLabel"
-        android:layout_marginTop="@dimen/margin_medium"
-        android:text="@string/first_name" />
+    <LinearLayout
+        android:id="@+id/first_name_row"
+        style="@style/MyProfileRow"
+        android:layout_marginTop="@dimen/margin_medium">
+
+        <org.wordpress.android.widgets.WPTextView
+            style="@style/MyProfileLabel"
+            android:text="@string/first_name" />
+
+        <org.wordpress.android.widgets.WPTextView
+            android:id="@+id/first_name"
+            android:text="@string/first_name"
+            style="@style/MyProfileText" />
+
+    </LinearLayout>
 
     <View style="@style/MyProfileDividerView" />
 
-    <org.wordpress.android.widgets.WPTextView
-        android:id="@+id/last_name"
-        style="@style/MyProfileLabel"
-        android:text="@string/last_name" />
+    <LinearLayout
+        android:id="@+id/last_name_row"
+        style="@style/MyProfileRow">
+
+        <org.wordpress.android.widgets.WPTextView
+            style="@style/MyProfileLabel"
+            android:text="@string/last_name" />
+
+        <org.wordpress.android.widgets.WPTextView
+            android:id="@+id/last_name"
+            style="@style/MyProfileText" />
+
+    </LinearLayout>
 
     <View style="@style/MyProfileDividerView" />
 
-    <org.wordpress.android.widgets.WPTextView
-        android:id="@+id/display_name"
-        style="@style/MyProfileLabel"
-        android:text="@string/public_display_name" />
+    <LinearLayout
+        android:id="@+id/display_name_row"
+        style="@style/MyProfileRow">
+
+        <org.wordpress.android.widgets.WPTextView
+            style="@style/MyProfileLabel"
+            android:text="@string/public_display_name" />
+
+        <org.wordpress.android.widgets.WPTextView
+            android:id="@+id/display_name"
+            style="@style/MyProfileText" />
+
+    </LinearLayout>
 
     <View style="@style/MyProfileDividerView" />
 
-    <org.wordpress.android.widgets.WPTextView
-        android:id="@+id/about_me"
-        style="@style/MyProfileLabel"
-        android:text="@string/about_me" />
+    <LinearLayout
+        android:id="@+id/about_me_row"
+        style="@style/MyProfileRow">
+
+        <org.wordpress.android.widgets.WPTextView
+            style="@style/MyProfileLabel"
+            android:text="@string/about_me" />
+
+        <org.wordpress.android.widgets.WPTextView
+            android:id="@+id/about_me"
+            style="@style/MyProfileText" />
+
+    </LinearLayout>
 
     <View style="@style/MyProfileDividerView" />
 
diff --git a/WordPress/src/main/res/layout/my_profile_dialog.xml b/WordPress/src/main/res/layout/my_profile_dialog.xml
index 48d9665c8f16..3956150a156c 100644
--- a/WordPress/src/main/res/layout/my_profile_dialog.xml
+++ b/WordPress/src/main/res/layout/my_profile_dialog.xml
@@ -7,21 +7,17 @@
     android:padding="@dimen/margin_extra_large">
 
     <org.wordpress.android.widgets.WPTextView
-        android:id="@+id/textView"
+        android:id="@+id/my_profile_dialog_label"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:text="@string/first_name"
         android:textColor="@color/grey_dark"
         android:textSize="@dimen/text_sz_extra_large"
         android:textStyle="bold"
         app:fontVariation="light" />
 
     <org.wordpress.android.widgets.OpenSansEditText
-        android:id="@+id/edittext"
+        android:id="@+id/my_profile_dialog_input"
         android:layout_width="fill_parent"
-        android:layout_height="wrap_content"
-        android:padding="10dp" />
-
-    <!--android:hint="Enter text here.."-->
+        android:layout_height="wrap_content" />
 
 </LinearLayout>
\ No newline at end of file
diff --git a/WordPress/src/main/res/values/styles.xml b/WordPress/src/main/res/values/styles.xml
index 2bc893c47d47..5ca00302217b 100644
--- a/WordPress/src/main/res/values/styles.xml
+++ b/WordPress/src/main/res/values/styles.xml
@@ -322,13 +322,26 @@
         <item name="android:textColor">@color/white</item>
     </style>
 
-    <style name="MyProfileLabel">
+    <style name="MyProfileRow">
         <item name="android:background">?android:attr/selectableItemBackground</item>
         <item name="android:layout_width">match_parent</item>
         <item name="android:layout_height">wrap_content</item>
+        <item name="android:orientation">vertical</item>
+        <item name="android:padding">@dimen/margin_extra_large</item>
+    </style>
+
+    <style name="MyProfileLabel">
+        <item name="android:layout_width">wrap_content</item>
+        <item name="android:layout_height">wrap_content</item>
         <item name="android:textColor">@color/grey_dark</item>
         <item name="android:textSize">@dimen/text_sz_large</item>
-        <item name="android:padding">@dimen/margin_extra_large</item>
+    </style>
+
+    <style name="MyProfileText">
+        <item name="android:layout_width">wrap_content</item>
+        <item name="android:layout_height">wrap_content</item>
+        <item name="android:textColor">@color/grey_darken_10</item>
+        <item name="android:textSize">@dimen/text_sz_medium</item>
     </style>
 
     <style name="MyProfileDividerView">

From 5735b59cd1f9e976f37c44a21dcda13312b5e180 Mon Sep 17 00:00:00 2001
From: Oguz Kocer <oguz.kocer@automattic.com>
Date: Thu, 3 Dec 2015 23:45:03 +0200
Subject: [PATCH 08/48] First name, last name and about me added to Account
 model

---
 .../android/models/AccountModel.java          | 33 +++++++++++++++++++
 1 file changed, 33 insertions(+)

diff --git a/WordPress/src/main/java/org/wordpress/android/models/AccountModel.java b/WordPress/src/main/java/org/wordpress/android/models/AccountModel.java
index deed724741fc..b97774ee2941 100644
--- a/WordPress/src/main/java/org/wordpress/android/models/AccountModel.java
+++ b/WordPress/src/main/java/org/wordpress/android/models/AccountModel.java
@@ -17,6 +17,9 @@ public class AccountModel {
     private int mVisibleSiteCount;
     private String mAccessToken;
     private String mEmail;
+    private String mFirstName;
+    private String mLastName;
+    private String mAboutMe;
 
     public AccountModel() {
         init();
@@ -33,6 +36,9 @@ public void init() {
         mVisibleSiteCount = 0;
         mAccessToken = "";
         mEmail = "";
+        mFirstName = "";
+        mLastName = "";
+        mAboutMe = "";
     }
 
     public void updateFromRestResponse(JSONObject json) {
@@ -45,6 +51,9 @@ public void updateFromRestResponse(JSONObject json) {
         mSiteCount = json.optInt("site_count");
         mVisibleSiteCount = json.optInt("visible_site_count");
         mEmail = json.optString("email");
+        mFirstName = json.optString("first_name");
+        mLastName = json.optString("last_name");
+        mAboutMe = json.optString("description");
     }
 
     public long getUserId() {
@@ -130,4 +139,28 @@ public void setEmail(String email) {
     public String getEmail() {
         return StringUtils.notNullStr(mEmail);
     }
+
+    public String getFirstName() {
+        return mFirstName;
+    }
+
+    public void setFirstName(String mFirstName) {
+        this.mFirstName = mFirstName;
+    }
+
+    public String getLastName() {
+        return mLastName;
+    }
+
+    public void setLastName(String mLastName) {
+        this.mLastName = mLastName;
+    }
+
+    public String getAboutMe() {
+        return mAboutMe;
+    }
+
+    public void setAboutMe(String mAboutMe) {
+        this.mAboutMe = mAboutMe;
+    }
 }

From d671ba77ec3d0a9b791e41a5625e1d2261f7ecb4 Mon Sep 17 00:00:00 2001
From: Oguz Kocer <oguz.kocer@automattic.com>
Date: Fri, 4 Dec 2015 01:43:27 +0200
Subject: [PATCH 09/48] Fixed getter/setters for new properties

---
 .../org/wordpress/android/models/AccountModel.java   | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/WordPress/src/main/java/org/wordpress/android/models/AccountModel.java b/WordPress/src/main/java/org/wordpress/android/models/AccountModel.java
index b97774ee2941..311f2884c7f1 100644
--- a/WordPress/src/main/java/org/wordpress/android/models/AccountModel.java
+++ b/WordPress/src/main/java/org/wordpress/android/models/AccountModel.java
@@ -144,23 +144,23 @@ public String getFirstName() {
         return mFirstName;
     }
 
-    public void setFirstName(String mFirstName) {
-        this.mFirstName = mFirstName;
+    public void setFirstName(String firstName) {
+        mFirstName = firstName;
     }
 
     public String getLastName() {
         return mLastName;
     }
 
-    public void setLastName(String mLastName) {
-        this.mLastName = mLastName;
+    public void setLastName(String lastName) {
+        mLastName = lastName;
     }
 
     public String getAboutMe() {
         return mAboutMe;
     }
 
-    public void setAboutMe(String mAboutMe) {
-        this.mAboutMe = mAboutMe;
+    public void setAboutMe(String aboutMe) {
+        mAboutMe = aboutMe;
     }
 }

From 0c722347a814326b6e61b7ef3f241beed3e8b205 Mon Sep 17 00:00:00 2001
From: Oguz Kocer <oguz.kocer@automattic.com>
Date: Fri, 4 Dec 2015 01:44:14 +0200
Subject: [PATCH 10/48] First name, last name and about me db migration added

---
 .../main/java/org/wordpress/android/WordPressDB.java |  5 ++++-
 .../org/wordpress/android/datasets/AccountTable.java | 12 ++++++++++++
 2 files changed, 16 insertions(+), 1 deletion(-)

diff --git a/WordPress/src/main/java/org/wordpress/android/WordPressDB.java b/WordPress/src/main/java/org/wordpress/android/WordPressDB.java
index 4b0ce4a817a1..0f0df0df88e8 100644
--- a/WordPress/src/main/java/org/wordpress/android/WordPressDB.java
+++ b/WordPress/src/main/java/org/wordpress/android/WordPressDB.java
@@ -80,7 +80,7 @@ public class WordPressDB {
     public static final String COLUMN_NAME_VIDEO_PRESS_SHORTCODE = "videoPressShortcode";
     public static final String COLUMN_NAME_UPLOAD_STATE          = "uploadState";
 
-    private static final int DATABASE_VERSION = 38;
+    private static final int DATABASE_VERSION = 39;
 
     private static final String CREATE_TABLE_BLOGS = "create table if not exists accounts (id integer primary key autoincrement, "
             + "url text, blogName text, username text, password text, imagePlacement text, centerThumbnail boolean, fullSizeImage boolean, maxImageWidth text, maxImageWidthId integer);";
@@ -380,6 +380,9 @@ public WordPressDB(Context ctx) {
             case 37:
                 resetThemeTable();
                 currentVersion++;
+            case 38:
+                AccountTable.migrationAddFirstNameLastNameAboutMeFields(db);
+                currentVersion++;
         }
         db.setVersion(DATABASE_VERSION);
     }
diff --git a/WordPress/src/main/java/org/wordpress/android/datasets/AccountTable.java b/WordPress/src/main/java/org/wordpress/android/datasets/AccountTable.java
index 1a75b7c91bbd..1e6d4c3a1543 100644
--- a/WordPress/src/main/java/org/wordpress/android/datasets/AccountTable.java
+++ b/WordPress/src/main/java/org/wordpress/android/datasets/AccountTable.java
@@ -37,6 +37,12 @@ public static void migrationAddEmailAddressField(SQLiteDatabase db) {
         db.execSQL("ALTER TABLE " + ACCOUNT_TABLE + " ADD email TEXT DEFAULT '';");
     }
 
+    public static void migrationAddFirstNameLastNameAboutMeFields(SQLiteDatabase db) {
+        db.execSQL("ALTER TABLE " + ACCOUNT_TABLE + " ADD first_name TEXT DEFAULT '';");
+        db.execSQL("ALTER TABLE " + ACCOUNT_TABLE + " ADD last_name TEXT DEFAULT '';");
+        db.execSQL("ALTER TABLE " + ACCOUNT_TABLE + " ADD about_me TEXT DEFAULT '';");
+    }
+
     private static void dropTables(SQLiteDatabase db) {
         db.execSQL("DROP TABLE IF EXISTS " + ACCOUNT_TABLE);
     }
@@ -59,6 +65,9 @@ public static void save(Account account, SQLiteDatabase database) {
         values.put("visible_site_count", account.getVisibleSiteCount());
         values.put("access_token", account.getAccessToken());
         values.put("email", account.getEmail());
+        values.put("first_name", account.getFirstName());
+        values.put("last_name", account.getLastName());
+        values.put("about_me", account.getAboutMe());
         database.insertWithOnConflict(ACCOUNT_TABLE, null, values, SQLiteDatabase.CONFLICT_REPLACE);
     }
 
@@ -84,6 +93,9 @@ private static Account getAccountByLocalId(long localId) {
                 account.setVisibleSiteCount(c.getInt(c.getColumnIndex("visible_site_count")));
                 account.setAccessToken(c.getString(c.getColumnIndex("access_token")));
                 account.setEmail(c.getString(c.getColumnIndex("email")));
+                account.setFirstName(c.getString(c.getColumnIndex("first_name")));
+                account.setLastName(c.getString(c.getColumnIndex("last_name")));
+                account.setAboutMe(c.getString(c.getColumnIndex("about_me")));
             }
             return account;
         } finally {

From 3a770a8b93bad107fe37a12cb835ee779f228aab Mon Sep 17 00:00:00 2001
From: Oguz Kocer <oguz.kocer@automattic.com>
Date: Fri, 4 Dec 2015 17:40:30 +0200
Subject: [PATCH 11/48] Updating account settings separated from the main call

---
 .../org/wordpress/android/models/Account.java | 20 +++++++++++++++++++
 .../android/models/AccountModel.java          |  3 +++
 2 files changed, 23 insertions(+)

diff --git a/WordPress/src/main/java/org/wordpress/android/models/Account.java b/WordPress/src/main/java/org/wordpress/android/models/Account.java
index 31ae0d058408..cd795b08f28d 100644
--- a/WordPress/src/main/java/org/wordpress/android/models/Account.java
+++ b/WordPress/src/main/java/org/wordpress/android/models/Account.java
@@ -37,6 +37,26 @@ public void onErrorResponse(VolleyError volleyError) {
         WordPress.getRestClientUtilsV1_1().get("me", listener, errorListener);
     }
 
+    public void fetchAccountSettings() {
+        com.wordpress.rest.RestRequest.Listener listener = new RestRequest.Listener() {
+            @Override
+            public void onResponse(JSONObject jsonObject) {
+                if (jsonObject != null) {
+                    updateAccountSettingsFromRestResponse(jsonObject);
+                    save();
+                }
+            }
+        };
+
+        RestRequest.ErrorListener errorListener = new RestRequest.ErrorListener() {
+            @Override
+            public void onErrorResponse(VolleyError volleyError) {
+                AppLog.e(T.API, volleyError);
+            }
+        };
+
+        WordPress.getRestClientUtilsV1_1().get("me/settings", listener, errorListener);
+    }
 
     public void signout() {
         init();
diff --git a/WordPress/src/main/java/org/wordpress/android/models/AccountModel.java b/WordPress/src/main/java/org/wordpress/android/models/AccountModel.java
index 311f2884c7f1..67736afbd026 100644
--- a/WordPress/src/main/java/org/wordpress/android/models/AccountModel.java
+++ b/WordPress/src/main/java/org/wordpress/android/models/AccountModel.java
@@ -51,6 +51,9 @@ public void updateFromRestResponse(JSONObject json) {
         mSiteCount = json.optInt("site_count");
         mVisibleSiteCount = json.optInt("visible_site_count");
         mEmail = json.optString("email");
+    }
+
+    public void updateAccountSettingsFromRestResponse(JSONObject json) {
         mFirstName = json.optString("first_name");
         mLastName = json.optString("last_name");
         mAboutMe = json.optString("description");

From b3d66235e44ef4e457bd32b4694aca6447b10fb2 Mon Sep 17 00:00:00 2001
From: Oguz Kocer <oguz.kocer@automattic.com>
Date: Fri, 4 Dec 2015 18:25:30 +0200
Subject: [PATCH 12/48] Fetching account settings and updating UI

---
 .../android/ui/me/MyProfileActivity.java      | 24 +++++++++++++++----
 1 file changed, 19 insertions(+), 5 deletions(-)

diff --git a/WordPress/src/main/java/org/wordpress/android/ui/me/MyProfileActivity.java b/WordPress/src/main/java/org/wordpress/android/ui/me/MyProfileActivity.java
index 37d434d0de91..00dc86b5df39 100644
--- a/WordPress/src/main/java/org/wordpress/android/ui/me/MyProfileActivity.java
+++ b/WordPress/src/main/java/org/wordpress/android/ui/me/MyProfileActivity.java
@@ -10,6 +10,8 @@
 import android.view.View;
 
 import org.wordpress.android.R;
+import org.wordpress.android.models.Account;
+import org.wordpress.android.models.AccountHelper;
 import org.wordpress.android.ui.ActivityLauncher;
 import org.wordpress.android.widgets.OpenSansEditText;
 import org.wordpress.android.widgets.WPTextView;
@@ -25,6 +27,8 @@ public class MyProfileActivity extends AppCompatActivity {
     public void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
 
+        AccountHelper.getDefaultAccount().fetchAccountSettings();
+
         ActionBar actionBar = getSupportActionBar();
         if (actionBar != null) {
             actionBar.setHomeButtonEnabled(true);
@@ -92,10 +96,20 @@ public void onClick(DialogInterface dialog, int id) {
     }
 
     private void refreshDetails() {
-        // TODO: check if we have user details and set them, if we don't hide all the labels
-        mFirstName.setVisibility(View.GONE);
-        mLastName.setVisibility(View.GONE);
-        mDisplayName.setVisibility(View.GONE);
-        mAboutMe.setVisibility(View.GONE);
+        Account account = AccountHelper.getDefaultAccount();
+        updateLabel(mFirstName, account != null ? account.getFirstName() : null);
+        updateLabel(mLastName, account != null ? account.getLastName() : null);
+        updateLabel(mDisplayName, account != null ? account.getDisplayName() : null);
+        updateLabel(mAboutMe, account != null ? account.getAboutMe() : null);
+    }
+
+    private void updateLabel(WPTextView textView, String text) {
+        if (text == null || text.isEmpty()) {
+            textView.setVisibility(View.GONE);
+        }
+        else {
+            textView.setVisibility(View.VISIBLE);
+            textView.setText(text);
+        }
     }
 }

From c4cd55f69557be8aa9e11b44bf0fa6027d59b5b4 Mon Sep 17 00:00:00 2001
From: Oguz Kocer <oguz.kocer@automattic.com>
Date: Fri, 4 Dec 2015 18:59:45 +0200
Subject: [PATCH 13/48] Added a callback to /me/settings call to update the my
 profile screen

---
 .../java/org/wordpress/android/models/Account.java   |  4 +++-
 .../wordpress/android/ui/me/MyProfileActivity.java   | 12 +++++++++++-
 2 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/WordPress/src/main/java/org/wordpress/android/models/Account.java b/WordPress/src/main/java/org/wordpress/android/models/Account.java
index cd795b08f28d..112cece31388 100644
--- a/WordPress/src/main/java/org/wordpress/android/models/Account.java
+++ b/WordPress/src/main/java/org/wordpress/android/models/Account.java
@@ -9,6 +9,7 @@
 import org.wordpress.android.datasets.ReaderUserTable;
 import org.wordpress.android.util.AppLog;
 import org.wordpress.android.util.AppLog.T;
+import org.xmlrpc.android.ApiHelper;
 
 /**
  * Class for managing logged in user informations.
@@ -37,13 +38,14 @@ public void onErrorResponse(VolleyError volleyError) {
         WordPress.getRestClientUtilsV1_1().get("me", listener, errorListener);
     }
 
-    public void fetchAccountSettings() {
+    public void fetchAccountSettings(final ApiHelper.GenericCallback callback) {
         com.wordpress.rest.RestRequest.Listener listener = new RestRequest.Listener() {
             @Override
             public void onResponse(JSONObject jsonObject) {
                 if (jsonObject != null) {
                     updateAccountSettingsFromRestResponse(jsonObject);
                     save();
+                    callback.onSuccess();
                 }
             }
         };
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/me/MyProfileActivity.java b/WordPress/src/main/java/org/wordpress/android/ui/me/MyProfileActivity.java
index 00dc86b5df39..dd567e839048 100644
--- a/WordPress/src/main/java/org/wordpress/android/ui/me/MyProfileActivity.java
+++ b/WordPress/src/main/java/org/wordpress/android/ui/me/MyProfileActivity.java
@@ -15,6 +15,7 @@
 import org.wordpress.android.ui.ActivityLauncher;
 import org.wordpress.android.widgets.OpenSansEditText;
 import org.wordpress.android.widgets.WPTextView;
+import org.xmlrpc.android.ApiHelper;
 
 public class MyProfileActivity extends AppCompatActivity {
 
@@ -27,7 +28,16 @@ public class MyProfileActivity extends AppCompatActivity {
     public void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
 
-        AccountHelper.getDefaultAccount().fetchAccountSettings();
+        AccountHelper.getDefaultAccount().fetchAccountSettings(new ApiHelper.GenericCallback() {
+            @Override
+            public void onSuccess() {
+                refreshDetails();
+            }
+
+            @Override
+            public void onFailure(ApiHelper.ErrorType errorType, String errorMessage, Throwable throwable) {
+            }
+        });
 
         ActionBar actionBar = getSupportActionBar();
         if (actionBar != null) {

From 86b0fe4106124d88082585bdf8a45af5c9658dd8 Mon Sep 17 00:00:00 2001
From: Oguz Kocer <oguz.kocer@automattic.com>
Date: Sat, 5 Dec 2015 23:15:20 +0200
Subject: [PATCH 14/48] DialogUtils introduced

---
 .../wordpress/android/util/DialogUtils.java   | 42 +++++++++++++++++++
 1 file changed, 42 insertions(+)
 create mode 100644 WordPress/src/main/java/org/wordpress/android/util/DialogUtils.java

diff --git a/WordPress/src/main/java/org/wordpress/android/util/DialogUtils.java b/WordPress/src/main/java/org/wordpress/android/util/DialogUtils.java
new file mode 100644
index 000000000000..8fd6824711c8
--- /dev/null
+++ b/WordPress/src/main/java/org/wordpress/android/util/DialogUtils.java
@@ -0,0 +1,42 @@
+package org.wordpress.android.util;
+
+import android.app.AlertDialog;
+import android.content.Context;
+import android.content.DialogInterface;
+import android.view.LayoutInflater;
+import android.view.View;
+
+import org.wordpress.android.widgets.OpenSansEditText;
+import org.wordpress.android.widgets.WPTextView;
+
+public class DialogUtils {
+    public static void showMyProfileDialog(Context context, String title, final Callback callback) {
+        LayoutInflater layoutInflater = LayoutInflater.from(context);
+        View promptView = layoutInflater.inflate(org.wordpress.android.R.layout.my_profile_dialog, null);
+        AlertDialog.Builder alertDialogBuilder = new AlertDialog.Builder(context);
+        alertDialogBuilder.setView(promptView);
+
+        final WPTextView textView = (WPTextView) promptView.findViewById(org.wordpress.android.R.id.my_profile_dialog_label);
+        final OpenSansEditText editText = (OpenSansEditText) promptView.findViewById(org.wordpress.android.R.id.my_profile_dialog_input);
+        textView.setText(title);
+        alertDialogBuilder.setCancelable(false)
+                .setPositiveButton(org.wordpress.android.R.string.ok, new DialogInterface.OnClickListener() {
+                    public void onClick(DialogInterface dialog, int id) {
+                        callback.onSuccessfulInput(editText.getText().toString());
+                    }
+                })
+                .setNegativeButton(org.wordpress.android.R.string.cancel,
+                        new DialogInterface.OnClickListener() {
+                            public void onClick(DialogInterface dialog, int id) {
+                                dialog.cancel();
+                            }
+                        });
+
+        AlertDialog alert = alertDialogBuilder.create();
+        alert.show();
+    }
+
+    public interface Callback {
+        void onSuccessfulInput(String input);
+    }
+}

From 010153460766ab05eda2accbaf3a362157545702 Mon Sep 17 00:00:00 2001
From: Oguz Kocer <oguz.kocer@automattic.com>
Date: Sat, 5 Dec 2015 23:16:11 +0200
Subject: [PATCH 15/48] Use DialogUtils for editing first name in My Profile

---
 .../android/ui/me/MyProfileActivity.java      | 40 ++++---------------
 1 file changed, 8 insertions(+), 32 deletions(-)

diff --git a/WordPress/src/main/java/org/wordpress/android/ui/me/MyProfileActivity.java b/WordPress/src/main/java/org/wordpress/android/ui/me/MyProfileActivity.java
index dd567e839048..d87c8ff98a15 100644
--- a/WordPress/src/main/java/org/wordpress/android/ui/me/MyProfileActivity.java
+++ b/WordPress/src/main/java/org/wordpress/android/ui/me/MyProfileActivity.java
@@ -1,11 +1,8 @@
 package org.wordpress.android.ui.me;
 
-import android.app.AlertDialog;
-import android.content.DialogInterface;
 import android.os.Bundle;
 import android.support.v7.app.ActionBar;
 import android.support.v7.app.AppCompatActivity;
-import android.view.LayoutInflater;
 import android.view.MenuItem;
 import android.view.View;
 
@@ -13,7 +10,7 @@
 import org.wordpress.android.models.Account;
 import org.wordpress.android.models.AccountHelper;
 import org.wordpress.android.ui.ActivityLauncher;
-import org.wordpress.android.widgets.OpenSansEditText;
+import org.wordpress.android.util.DialogUtils;
 import org.wordpress.android.widgets.WPTextView;
 import org.xmlrpc.android.ApiHelper;
 
@@ -58,7 +55,13 @@ public void onFailure(ApiHelper.ErrorType errorType, String errorMessage, Throwa
         findViewById(R.id.first_name_row).setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
-                showInputDialog();
+                DialogUtils.showMyProfileDialog(MyProfileActivity.this, getString(org.wordpress.android.R.string.first_name), new DialogUtils.Callback() {
+                    @Override
+                    public void onSuccessfulInput(String input) {
+                        mFirstName.setVisibility(View.VISIBLE);
+                        mFirstName.setText(input);
+                    }
+                });
             }
         });
     }
@@ -78,33 +81,6 @@ public boolean onOptionsItemSelected(final MenuItem item) {
         return super.onOptionsItemSelected(item);
     }
 
-    protected void showInputDialog() {
-        LayoutInflater layoutInflater = LayoutInflater.from(MyProfileActivity.this);
-        View promptView = layoutInflater.inflate(R.layout.my_profile_dialog, null);
-        AlertDialog.Builder alertDialogBuilder = new AlertDialog.Builder(MyProfileActivity.this);
-        alertDialogBuilder.setView(promptView);
-
-        final WPTextView textView = (WPTextView) promptView.findViewById(R.id.my_profile_dialog_label);
-        final OpenSansEditText editText = (OpenSansEditText) promptView.findViewById(R.id.my_profile_dialog_input);
-        textView.setText(R.string.first_name);
-        alertDialogBuilder.setCancelable(false)
-                .setPositiveButton(R.string.ok, new DialogInterface.OnClickListener() {
-                    public void onClick(DialogInterface dialog, int id) {
-                        mFirstName.setVisibility(View.VISIBLE);
-                        mFirstName.setText(editText.getText());
-                    }
-                })
-                .setNegativeButton(R.string.cancel,
-                        new DialogInterface.OnClickListener() {
-                            public void onClick(DialogInterface dialog, int id) {
-                                dialog.cancel();
-                            }
-                        });
-
-        AlertDialog alert = alertDialogBuilder.create();
-        alert.show();
-    }
-
     private void refreshDetails() {
         Account account = AccountHelper.getDefaultAccount();
         updateLabel(mFirstName, account != null ? account.getFirstName() : null);

From 2e47efcb8ce86eb1fd59679af7fab0e0d03b3c65 Mon Sep 17 00:00:00 2001
From: Oguz Kocer <oguz.kocer@automattic.com>
Date: Sat, 5 Dec 2015 23:21:35 +0200
Subject: [PATCH 16/48] All labels in My Profile screen is now editable

A new helper method introduced to create the onClickListener for the dialog which makes it easy to add new labels and avoids code duplication.
---
 .../android/ui/me/MyProfileActivity.java      | 32 ++++++++++++-------
 1 file changed, 20 insertions(+), 12 deletions(-)

diff --git a/WordPress/src/main/java/org/wordpress/android/ui/me/MyProfileActivity.java b/WordPress/src/main/java/org/wordpress/android/ui/me/MyProfileActivity.java
index d87c8ff98a15..aaf4c0240c92 100644
--- a/WordPress/src/main/java/org/wordpress/android/ui/me/MyProfileActivity.java
+++ b/WordPress/src/main/java/org/wordpress/android/ui/me/MyProfileActivity.java
@@ -52,18 +52,10 @@ public void onFailure(ApiHelper.ErrorType errorType, String errorMessage, Throwa
 
         refreshDetails();
 
-        findViewById(R.id.first_name_row).setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View v) {
-                DialogUtils.showMyProfileDialog(MyProfileActivity.this, getString(org.wordpress.android.R.string.first_name), new DialogUtils.Callback() {
-                    @Override
-                    public void onSuccessfulInput(String input) {
-                        mFirstName.setVisibility(View.VISIBLE);
-                        mFirstName.setText(input);
-                    }
-                });
-            }
-        });
+        findViewById(R.id.first_name_row).setOnClickListener(createOnClickListener(getString(org.wordpress.android.R.string.first_name), mFirstName));
+        findViewById(R.id.last_name_row).setOnClickListener(createOnClickListener(getString(R.string.last_name), mLastName));
+        findViewById(R.id.display_name_row).setOnClickListener(createOnClickListener(getString(R.string.public_display_name), mDisplayName));
+        findViewById(R.id.about_me_row).setOnClickListener(createOnClickListener(getString(R.string.about_me), mAboutMe));
     }
 
     @Override
@@ -98,4 +90,20 @@ private void updateLabel(WPTextView textView, String text) {
             textView.setText(text);
         }
     }
+
+    // helper method to create onClickListener to avoid code duplication
+    private View.OnClickListener createOnClickListener(final String dialogTitle, final WPTextView textView) {
+        return new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                DialogUtils.showMyProfileDialog(MyProfileActivity.this, dialogTitle, new DialogUtils.Callback() {
+                    @Override
+                    public void onSuccessfulInput(String input) {
+                        textView.setVisibility(View.VISIBLE);
+                        textView.setText(input);
+                    }
+                });
+            }
+        };
+    }
 }

From 9f9cb12bb1d8a82d60897b5c3ff954c2f88de4f2 Mon Sep 17 00:00:00 2001
From: Oguz Kocer <oguz.kocer@automattic.com>
Date: Sun, 6 Dec 2015 11:58:54 +0200
Subject: [PATCH 17/48] Adds the ability to add hint to input dialog

---
 .../wordpress/android/ui/me/MyProfileActivity.java  | 10 +++++++---
 .../org/wordpress/android/util/DialogUtils.java     | 13 +++++++++++++
 WordPress/src/main/res/layout/my_profile_dialog.xml |  8 ++++++++
 WordPress/src/main/res/values/strings.xml           |  1 +
 4 files changed, 29 insertions(+), 3 deletions(-)

diff --git a/WordPress/src/main/java/org/wordpress/android/ui/me/MyProfileActivity.java b/WordPress/src/main/java/org/wordpress/android/ui/me/MyProfileActivity.java
index aaf4c0240c92..810ef45939da 100644
--- a/WordPress/src/main/java/org/wordpress/android/ui/me/MyProfileActivity.java
+++ b/WordPress/src/main/java/org/wordpress/android/ui/me/MyProfileActivity.java
@@ -55,7 +55,7 @@ public void onFailure(ApiHelper.ErrorType errorType, String errorMessage, Throwa
         findViewById(R.id.first_name_row).setOnClickListener(createOnClickListener(getString(org.wordpress.android.R.string.first_name), mFirstName));
         findViewById(R.id.last_name_row).setOnClickListener(createOnClickListener(getString(R.string.last_name), mLastName));
         findViewById(R.id.display_name_row).setOnClickListener(createOnClickListener(getString(R.string.public_display_name), mDisplayName));
-        findViewById(R.id.about_me_row).setOnClickListener(createOnClickListener(getString(R.string.about_me), mAboutMe));
+        findViewById(R.id.about_me_row).setOnClickListener(createOnClickListener(getString(R.string.about_me), getString(R.string.about_me_hint), mAboutMe));
     }
 
     @Override
@@ -91,12 +91,16 @@ private void updateLabel(WPTextView textView, String text) {
         }
     }
 
-    // helper method to create onClickListener to avoid code duplication
     private View.OnClickListener createOnClickListener(final String dialogTitle, final WPTextView textView) {
+        return createOnClickListener(dialogTitle, null, textView);
+    }
+
+    // helper method to create onClickListener to avoid code duplication
+    private View.OnClickListener createOnClickListener(final String dialogTitle, final String hint, final WPTextView textView) {
         return new View.OnClickListener() {
             @Override
             public void onClick(View v) {
-                DialogUtils.showMyProfileDialog(MyProfileActivity.this, dialogTitle, new DialogUtils.Callback() {
+                DialogUtils.showMyProfileDialog(MyProfileActivity.this, dialogTitle, hint, new DialogUtils.Callback() {
                     @Override
                     public void onSuccessfulInput(String input) {
                         textView.setVisibility(View.VISIBLE);
diff --git a/WordPress/src/main/java/org/wordpress/android/util/DialogUtils.java b/WordPress/src/main/java/org/wordpress/android/util/DialogUtils.java
index 8fd6824711c8..2b9aa1a64432 100644
--- a/WordPress/src/main/java/org/wordpress/android/util/DialogUtils.java
+++ b/WordPress/src/main/java/org/wordpress/android/util/DialogUtils.java
@@ -11,6 +11,10 @@
 
 public class DialogUtils {
     public static void showMyProfileDialog(Context context, String title, final Callback callback) {
+        showMyProfileDialog(context, title, null, callback);
+    }
+
+    public static void showMyProfileDialog(Context context, String title, String hint, final Callback callback) {
         LayoutInflater layoutInflater = LayoutInflater.from(context);
         View promptView = layoutInflater.inflate(org.wordpress.android.R.layout.my_profile_dialog, null);
         AlertDialog.Builder alertDialogBuilder = new AlertDialog.Builder(context);
@@ -18,7 +22,16 @@ public static void showMyProfileDialog(Context context, String title, final Call
 
         final WPTextView textView = (WPTextView) promptView.findViewById(org.wordpress.android.R.id.my_profile_dialog_label);
         final OpenSansEditText editText = (OpenSansEditText) promptView.findViewById(org.wordpress.android.R.id.my_profile_dialog_input);
+        final WPTextView hintView = (WPTextView) promptView.findViewById(org.wordpress.android.R.id.my_profile_dialog_hint);
+
         textView.setText(title);
+        if (hint != null && !hint.isEmpty()) {
+            hintView.setText(hint);
+        }
+        else {
+            hintView.setVisibility(View.GONE);
+        }
+
         alertDialogBuilder.setCancelable(false)
                 .setPositiveButton(org.wordpress.android.R.string.ok, new DialogInterface.OnClickListener() {
                     public void onClick(DialogInterface dialog, int id) {
diff --git a/WordPress/src/main/res/layout/my_profile_dialog.xml b/WordPress/src/main/res/layout/my_profile_dialog.xml
index 3956150a156c..bae10acf3f64 100644
--- a/WordPress/src/main/res/layout/my_profile_dialog.xml
+++ b/WordPress/src/main/res/layout/my_profile_dialog.xml
@@ -20,4 +20,12 @@
         android:layout_width="fill_parent"
         android:layout_height="wrap_content" />
 
+    <org.wordpress.android.widgets.WPTextView
+        android:id="@+id/my_profile_dialog_hint"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="@dimen/margin_medium"
+        android:textColor="@color/grey_darken_10"
+        android:textSize="@dimen/text_sz_small" />
+
 </LinearLayout>
\ No newline at end of file
diff --git a/WordPress/src/main/res/values/strings.xml b/WordPress/src/main/res/values/strings.xml
index a7b5545023f8..eed0465f725d 100644
--- a/WordPress/src/main/res/values/strings.xml
+++ b/WordPress/src/main/res/values/strings.xml
@@ -1107,5 +1107,6 @@
     <string name="last_name">Last Name</string>
     <string name="public_display_name">Public Display Name</string>
     <string name="about_me">About Me</string>
+    <string name="about_me_hint">A few words about you…</string>
 
 </resources>

From a83e7b215fd64df184a4a50e4a2a9b83b46eb7de Mon Sep 17 00:00:00 2001
From: Oguz Kocer <oguz.kocer@automattic.com>
Date: Sun, 6 Dec 2015 12:00:51 +0200
Subject: [PATCH 18/48] Use updateLabel method, so the visibility of labels are
 correctly set

---
 .../java/org/wordpress/android/ui/me/MyProfileActivity.java    | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/WordPress/src/main/java/org/wordpress/android/ui/me/MyProfileActivity.java b/WordPress/src/main/java/org/wordpress/android/ui/me/MyProfileActivity.java
index 810ef45939da..d56158f7f8d5 100644
--- a/WordPress/src/main/java/org/wordpress/android/ui/me/MyProfileActivity.java
+++ b/WordPress/src/main/java/org/wordpress/android/ui/me/MyProfileActivity.java
@@ -103,8 +103,7 @@ public void onClick(View v) {
                 DialogUtils.showMyProfileDialog(MyProfileActivity.this, dialogTitle, hint, new DialogUtils.Callback() {
                     @Override
                     public void onSuccessfulInput(String input) {
-                        textView.setVisibility(View.VISIBLE);
-                        textView.setText(input);
+                        updateLabel(textView, input);
                     }
                 });
             }

From ed1f445502f93f077e3f389f30044d1066c5d521 Mon Sep 17 00:00:00 2001
From: Oguz Kocer <oguz.kocer@automattic.com>
Date: Sun, 6 Dec 2015 22:08:31 +0200
Subject: [PATCH 19/48] Save button added to my profile screen

---
 .../org/wordpress/android/ui/me/MyProfileActivity.java | 10 ++++++++++
 WordPress/src/main/res/menu/my_profile.xml             | 10 ++++++++++
 2 files changed, 20 insertions(+)
 create mode 100644 WordPress/src/main/res/menu/my_profile.xml

diff --git a/WordPress/src/main/java/org/wordpress/android/ui/me/MyProfileActivity.java b/WordPress/src/main/java/org/wordpress/android/ui/me/MyProfileActivity.java
index d56158f7f8d5..029db6c1447b 100644
--- a/WordPress/src/main/java/org/wordpress/android/ui/me/MyProfileActivity.java
+++ b/WordPress/src/main/java/org/wordpress/android/ui/me/MyProfileActivity.java
@@ -3,6 +3,7 @@
 import android.os.Bundle;
 import android.support.v7.app.ActionBar;
 import android.support.v7.app.AppCompatActivity;
+import android.view.Menu;
 import android.view.MenuItem;
 import android.view.View;
 
@@ -69,10 +70,19 @@ public boolean onOptionsItemSelected(final MenuItem item) {
         if (item.getItemId() == android.R.id.home) {
             onBackPressed();
             return true;
+        } else if (item.getItemId() == R.id.menu_save) {
+            return true;
         }
         return super.onOptionsItemSelected(item);
     }
 
+    @Override
+    public boolean onCreateOptionsMenu(Menu menu) {
+        super.onCreateOptionsMenu(menu);
+        getMenuInflater().inflate(R.menu.my_profile, menu);
+        return true;
+    }
+
     private void refreshDetails() {
         Account account = AccountHelper.getDefaultAccount();
         updateLabel(mFirstName, account != null ? account.getFirstName() : null);
diff --git a/WordPress/src/main/res/menu/my_profile.xml b/WordPress/src/main/res/menu/my_profile.xml
new file mode 100644
index 000000000000..bb5a3b1e665a
--- /dev/null
+++ b/WordPress/src/main/res/menu/my_profile.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<menu xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto">
+
+    <item
+        android:id="@+id/menu_save"
+        android:title="@string/save"
+        app:showAsAction="always" />
+
+</menu>
\ No newline at end of file

From f157e77e177780f73c8fbdfaafb8ffd557970f59 Mon Sep 17 00:00:00 2001
From: Oguz Kocer <oguz.kocer@automattic.com>
Date: Sun, 6 Dec 2015 22:11:41 +0200
Subject: [PATCH 20/48] Possible NPE fixed in Account model

---
 .../src/main/java/org/wordpress/android/models/Account.java   | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/WordPress/src/main/java/org/wordpress/android/models/Account.java b/WordPress/src/main/java/org/wordpress/android/models/Account.java
index 112cece31388..95f05869daef 100644
--- a/WordPress/src/main/java/org/wordpress/android/models/Account.java
+++ b/WordPress/src/main/java/org/wordpress/android/models/Account.java
@@ -45,7 +45,9 @@ public void onResponse(JSONObject jsonObject) {
                 if (jsonObject != null) {
                     updateAccountSettingsFromRestResponse(jsonObject);
                     save();
-                    callback.onSuccess();
+                    if (callback != null) {
+                        callback.onSuccess();
+                    }
                 }
             }
         };

From 5142cbdd3141bf4cb15c9b2c041355f6e0cba42d Mon Sep 17 00:00:00 2001
From: Oguz Kocer <oguz.kocer@automattic.com>
Date: Sun, 6 Dec 2015 22:29:16 +0200
Subject: [PATCH 21/48] Save button updates the account settings

---
 .../org/wordpress/android/models/Account.java | 32 +++++++++++++++++++
 .../android/ui/me/MyProfileActivity.java      | 19 +++++++++++
 2 files changed, 51 insertions(+)

diff --git a/WordPress/src/main/java/org/wordpress/android/models/Account.java b/WordPress/src/main/java/org/wordpress/android/models/Account.java
index 95f05869daef..0c903366071c 100644
--- a/WordPress/src/main/java/org/wordpress/android/models/Account.java
+++ b/WordPress/src/main/java/org/wordpress/android/models/Account.java
@@ -11,6 +11,9 @@
 import org.wordpress.android.util.AppLog.T;
 import org.xmlrpc.android.ApiHelper;
 
+import java.util.HashMap;
+import java.util.Map;
+
 /**
  * Class for managing logged in user informations.
  */
@@ -62,6 +65,35 @@ public void onErrorResponse(VolleyError volleyError) {
         WordPress.getRestClientUtilsV1_1().get("me/settings", listener, errorListener);
     }
 
+    public void postAccountSettings(String firstName, String lastName, String displayName, String aboutMe, final ApiHelper.GenericCallback callback) {
+        com.wordpress.rest.RestRequest.Listener listener = new RestRequest.Listener() {
+            @Override
+            public void onResponse(JSONObject jsonObject) {
+                if (jsonObject != null) {
+                    updateAccountSettingsFromRestResponse(jsonObject);
+                    save();
+                    if (callback != null) {
+                        callback.onSuccess();
+                    }
+                }
+            }
+        };
+
+        RestRequest.ErrorListener errorListener = new RestRequest.ErrorListener() {
+            @Override
+            public void onErrorResponse(VolleyError volleyError) {
+                AppLog.e(T.API, volleyError);
+            }
+        };
+
+        Map<String, String> params = new HashMap<>();
+        params.put("first_name", firstName);
+        params.put("last_name", lastName);
+        params.put("display_name", displayName);
+        params.put("description", aboutMe);
+        WordPress.getRestClientUtilsV1_1().post("me/settings", params, null, listener, errorListener);
+    }
+
     public void signout() {
         init();
         save();
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/me/MyProfileActivity.java b/WordPress/src/main/java/org/wordpress/android/ui/me/MyProfileActivity.java
index 029db6c1447b..1ca39e5f4293 100644
--- a/WordPress/src/main/java/org/wordpress/android/ui/me/MyProfileActivity.java
+++ b/WordPress/src/main/java/org/wordpress/android/ui/me/MyProfileActivity.java
@@ -71,6 +71,7 @@ public boolean onOptionsItemSelected(final MenuItem item) {
             onBackPressed();
             return true;
         } else if (item.getItemId() == R.id.menu_save) {
+            saveMyProfile();
             return true;
         }
         return super.onOptionsItemSelected(item);
@@ -91,6 +92,24 @@ private void refreshDetails() {
         updateLabel(mAboutMe, account != null ? account.getAboutMe() : null);
     }
 
+    private void saveMyProfile() {
+        String firstName = mFirstName.getText().toString();
+        String lastName = mLastName.getText().toString();
+        String displayName = mDisplayName.getText().toString();
+        String aboutMe = mAboutMe.getText().toString();
+
+        AccountHelper.getDefaultAccount().postAccountSettings(firstName, lastName, displayName, aboutMe, new ApiHelper.GenericCallback() {
+            @Override
+            public void onSuccess() {
+                refreshDetails();
+            }
+
+            @Override
+            public void onFailure(ApiHelper.ErrorType errorType, String errorMessage, Throwable throwable) {
+            }
+        });
+    }
+
     private void updateLabel(WPTextView textView, String text) {
         if (text == null || text.isEmpty()) {
             textView.setVisibility(View.GONE);

From 75de500e48a69b98075981db4fe992a5b4843810 Mon Sep 17 00:00:00 2001
From: Oguz Kocer <oguz.kocer@automattic.com>
Date: Mon, 7 Dec 2015 14:28:18 +0200
Subject: [PATCH 22/48] Progress dialog added for save action

---
 .../wordpress/android/ui/me/MyProfileActivity.java  | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/WordPress/src/main/java/org/wordpress/android/ui/me/MyProfileActivity.java b/WordPress/src/main/java/org/wordpress/android/ui/me/MyProfileActivity.java
index 1ca39e5f4293..becab937db70 100644
--- a/WordPress/src/main/java/org/wordpress/android/ui/me/MyProfileActivity.java
+++ b/WordPress/src/main/java/org/wordpress/android/ui/me/MyProfileActivity.java
@@ -1,5 +1,6 @@
 package org.wordpress.android.ui.me;
 
+import android.app.ProgressDialog;
 import android.os.Bundle;
 import android.support.v7.app.ActionBar;
 import android.support.v7.app.AppCompatActivity;
@@ -21,6 +22,7 @@ public class MyProfileActivity extends AppCompatActivity {
     private WPTextView mLastName;
     private WPTextView mDisplayName;
     private WPTextView mAboutMe;
+    private ProgressDialog mProgressDialog;
 
     @Override
     public void onCreate(Bundle savedInstanceState) {
@@ -98,14 +100,18 @@ private void saveMyProfile() {
         String displayName = mDisplayName.getText().toString();
         String aboutMe = mAboutMe.getText().toString();
 
+        mProgressDialog = ProgressDialog.show(this, null, getText(R.string.saving_changes), false);
+
         AccountHelper.getDefaultAccount().postAccountSettings(firstName, lastName, displayName, aboutMe, new ApiHelper.GenericCallback() {
             @Override
             public void onSuccess() {
                 refreshDetails();
+                dismissProgressDialog();
             }
 
             @Override
             public void onFailure(ApiHelper.ErrorType errorType, String errorMessage, Throwable throwable) {
+                dismissProgressDialog();
             }
         });
     }
@@ -138,4 +144,11 @@ public void onSuccessfulInput(String input) {
             }
         };
     }
+
+    private void dismissProgressDialog() {
+        if (mProgressDialog != null && mProgressDialog.isShowing()) {
+            mProgressDialog.dismiss();
+        }
+        mProgressDialog = null;
+    }
 }

From b6289d64d9d2a8fb025bb810b4af9977be99691b Mon Sep 17 00:00:00 2001
From: Oguz Kocer <oguz.kocer@automattic.com>
Date: Tue, 8 Dec 2015 20:44:49 +0200
Subject: [PATCH 23/48] Account settings icon added

---
 .../drawable-hdpi/me_icon_account_settings.png   | Bin 0 -> 1035 bytes
 .../drawable-xhdpi/me_icon_account_settings.png  | Bin 0 -> 1312 bytes
 .../drawable-xxhdpi/me_icon_account_settings.png | Bin 0 -> 2059 bytes
 WordPress/src/main/res/layout/me_fragment.xml    |   2 +-
 4 files changed, 1 insertion(+), 1 deletion(-)
 create mode 100644 WordPress/src/main/res/drawable-hdpi/me_icon_account_settings.png
 create mode 100644 WordPress/src/main/res/drawable-xhdpi/me_icon_account_settings.png
 create mode 100644 WordPress/src/main/res/drawable-xxhdpi/me_icon_account_settings.png

diff --git a/WordPress/src/main/res/drawable-hdpi/me_icon_account_settings.png b/WordPress/src/main/res/drawable-hdpi/me_icon_account_settings.png
new file mode 100644
index 0000000000000000000000000000000000000000..f5285b4f5cb8d8cc0068619d33aeff3b7e4057f4
GIT binary patch
literal 1035
zcmV+m1oZofP)<h;3K|Lk000e1NJLTq001Na001Ni1^@s6;Q*MJ00001b5ch_0Itp)
z=>Px&#Ysd#R9Fe^S5HV4K^ULe-QEjK%8DrU(4m6p64}9XWC}izAPv%_D1(gb(j~=M
z67|xhpaM;*r!P>03Jm;5ryxD3bm&x<p#PQ<X7sk*oxbn+_Axs<^PatWLE*wO^L^j%
z`+dKiotd2_WaawDMu29kx4n0Gi>4cIW%;gS7q%R&cqfZx@@bg>syL-aNj5Q6j_1!>
z5Tk6bM<TYAGNo7%E81BJGNU7#AhBE|<LnB=aQ3phN<pS+8X}9?Gg{ag8}AP3`YS?d
zsTfb$5JL=NajvEO$&QTM!$>D}b@hP0=ivG&!q@@;`{R~%Z<P@$(KLFSP_ofWUQWvh
zn+2X@mi1#g910zRoWt-i`P293N(KjO9FapRs3SIZno@e*12e{4u$80f;nK7~!5Gg0
zW@B@0*$pu#AgD7oRKQ611tf0}!GF>QL7yp!Z@*9*ndf-}Pt8ck%(WO4fHkldF9!QQ
zL2c2oorG$QB1mB~m>=EDc1q*(bNP5<AANvliX6WiY9(rNUf)X68Fk<tzJ~Z#4io6Y
zaKCdLx30Cm{IL+61bec*Z?qpqpcn4I3ghuu3u_8K-Xz4l^=NZA6dr=rq}tq=Z9DrV
zVthnx(UE<Ip^t+zFi#UeMyBFcJYpWNe9tFJ!REDrHKBC{Gw_7lcrf<yl{6nIJ0<#M
zcE{bZE=p*F7=sahIp?^$FV~kZiZS0D@`C1>ny=8eJ=@pXZjaASXQ;8ZObk*<1z`Z5
ztO#52vKGEP7kw&Qg;jAQk5Z7TNUr@#K`>X|$cl&Z*Y1+}Wj+;F#f=<NLFc0*c@Xn$
z38{jHb|Tf!)KO!NWQ_nrV3qyNW$%7ltZZqh`oOF5jZnv(@g3oC_-UFw2y>~fYkj!S
z@I-tcV~9a4@Avg#pVRX4Ca@;&_q`T}GF>OMSk1DOiaRiFda%#jB(Su-)s&bs@S0#1
zodjei8vMQ#V@+OAAgLoZdIe4zO*|-9eK^%zZLU3Vj_3EiG7L~+nRqndLAmHJ9X~8n
z<PHc*o=;kNASAnBFYgP^CvyEH2j?NJ;#mlT0YT`Tc`)Av%`-T9K7sqJWm!d_DFXY)
zEXIH7V&s$Sun2OvE^A6~0(Y`TfGRMDJOm!Z;r4yc5<iEUaS4X1j#9GP!^&DXEPV&^
zKG(G`ia(7qZjVDL$OFh){KX0D+C$}^2V)a)$E`B!%RkEU)A^*YEL{S|l7)uT;D)mi
zgM3*D!bJFon8H?erHje%yze&z*=Yo+V|?+I{(mt7KLIQ3ZzIJOQ_KJW002ovPDHLk
FV1f?6=F$KF

literal 0
HcmV?d00001

diff --git a/WordPress/src/main/res/drawable-xhdpi/me_icon_account_settings.png b/WordPress/src/main/res/drawable-xhdpi/me_icon_account_settings.png
new file mode 100644
index 0000000000000000000000000000000000000000..0f1fbd5a74a1ca6b4375bf15480987388e389964
GIT binary patch
literal 1312
zcmV+*1>gFKP)<h;3K|Lk000e1NJLTq001xm001xu1^@s6R|5Hm00001b5ch_0Itp)
z=>Px(+DSw~RA>e5SZ#<ERTzHHd|fxP*s`#UK=NvE4UP6k8U;z}R`}N-TEz%Tiqd|i
zw#%^VuKfrjDJ%#h*Mj!1RO=cBMO$DQK?||h5CTj3a7m@@&e!REXYYmCne#Ds_UiU=
z2QK%V_kExDeV#MtoS8WQ?W;Wk|L+lCt&~4FJbII1T0g0BMqzOCo}TWXRWZ%@jAnv$
zvD{=`x){c+yL2(l_**J~aYIXvF|Li7KLG$*avVT=m*z!)`{vQB7|Sz-Sl7<|BOT3<
zRK?DD5xZ}Hu-LYpXBdO0P{8%7VhtbX{C8|0^gQo%ciY3~8ulXpS^@p<9KREcFzV~+
z{x(^_bzP&h{GMGnCHfdJC+W-I<~0=4?^VZN!hBH@*FQYE3L?|!+q(Xnq&?kM3UJ*K
zr&R9z4j3zQ;FDPFeF*u8@3ZsH0^<md`u*vI1^Xvz(@~FMMxCZ@JYs;c85pbp&a1WR
z)JoUg?8)+4G6&h6a_6%|p4vFd%W;bIf(5;f#XVGBaMUSV=33`;urmy-**URx%mLu#
z45Dt3-U0XUu^S!Js3PfWWZ)}d$Gd*P3!}2TW#ccRdeY~BW12(rO`Zr7hmvUyipa-)
zk%JblWx-bnmI@T%E|(4OLKFnhC0fuzg0=+*=0JXeM|>xbyh?5A{6hLsn`|g>qKHW1
zV%h9f5jL|11`Z!vYFQ=~YU*KwyOf6{pZ8CXA53qFjl#6`+RN5%X9n9}VC$U@g0RxN
zW#gGfKKjoHAmiR6$L}^7JBr>#)Yn}^J`AD<G5HByEctPe)|r;^QEm|&ehWF@^x|Xd
zzf9*BPN6t33fAC5>W4Hy)TfcpOP=r)OBhkEv@Pa<Ttwt4Rw#fRyL!4$!(ZMSTtMGb
zUvW*)v{Cqlt~y4!CgR%2A?6~?q7XpwyB~k(SNuCG!Nz7B$+u*4UWFqJVO25cJ6q=<
z4U^u11Y${|Eok~<0%J~-7OSbPxdX%k7n(AO_s69lbF$5Z>9D%mlrYa7$Q1r38MFd$
zi&U-w=h~}pEh<Qd)zzlDS^*fN6aZjvC@LTaR#RIeVCc|?H{d+HMMV&ws!z}pRuv=i
z5r(iLU&6M8I3)U+rnK<B;n8KV!1)4K@rn#;wxL3=2eVE3UL8|WMdCZq?NGAEV=j`w
zfBmaOM!<jKWp3!bk3U6a_e$=X&P=b<_=NSx8vFdrZewq#&w1svktN4>qR)0e`oMi@
zzwnzl@cDCA@ei5`5`Bd}nM<A5rRx>y(+3TY!W|;8a1qm&5AHsPM1c9Q5f?lVJ|(Ix
z6hMKsFx-R6FNi=_(ncJJi>#(pK>ZY8Km?=@7?FK0Hbu?>*@*<zlL{cGSDiXQhfCDP
z0+Toq2YfGB=}q&cXv+2VMOfX%IebDnqaeHkM|>~UiZNI_=AcNB*+$c`s-s1xy!Hir
z*!1B$YblM()2C5K0{ykg&-c;yK@v0g?%3)uz~pl|T1+OCwdruzah#{oza7QoKHSAo
zf5Z2^*Dm|vu8ervPRHw|g&p(_y*TYl_0QEVPT%G}x#`c8y--)V2Aatj6XI}Ei@}&y
zk*8WM6EH)Zf2|b&d1CZg8WAlOz&X<j$P?2bm*>C50)iX@^f7sew`1BP&>n%A5%?RK
W()Z2un=hpR0000<MNUMnLSTZ%poPo;

literal 0
HcmV?d00001

diff --git a/WordPress/src/main/res/drawable-xxhdpi/me_icon_account_settings.png b/WordPress/src/main/res/drawable-xxhdpi/me_icon_account_settings.png
new file mode 100644
index 0000000000000000000000000000000000000000..78dac6b9caaa201ccc5ee4c286114459f0068d08
GIT binary patch
literal 2059
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

literal 0
HcmV?d00001

diff --git a/WordPress/src/main/res/layout/me_fragment.xml b/WordPress/src/main/res/layout/me_fragment.xml
index 9162a66f1800..7076248ec31a 100644
--- a/WordPress/src/main/res/layout/me_fragment.xml
+++ b/WordPress/src/main/res/layout/me_fragment.xml
@@ -80,7 +80,7 @@
                 android:id="@+id/me_settings_icon"
                 style="@style/MeListRowIcon"
                 android:contentDescription="@string/me_btn_settings"
-                android:src="@drawable/me_icon_settings" />
+                android:src="@drawable/me_icon_account_settings" />
 
             <org.wordpress.android.widgets.WPTextView
                 android:id="@+id/me_settings_text_view"

From 6da28565d019c8afce7122f4f33b61e6eb2ec866 Mon Sep 17 00:00:00 2001
From: Oguz Kocer <oguz.kocer@automattic.com>
Date: Tue, 8 Dec 2015 20:45:22 +0200
Subject: [PATCH 24/48] Me settings icon renamed as my profile icon

---
 ...{me_icon_settings.png => me_icon_my_profile.png} | Bin
 ...{me_icon_settings.png => me_icon_my_profile.png} | Bin
 ...{me_icon_settings.png => me_icon_my_profile.png} | Bin
 WordPress/src/main/res/layout/me_fragment.xml       |   2 +-
 4 files changed, 1 insertion(+), 1 deletion(-)
 rename WordPress/src/main/res/drawable-hdpi/{me_icon_settings.png => me_icon_my_profile.png} (100%)
 rename WordPress/src/main/res/drawable-xhdpi/{me_icon_settings.png => me_icon_my_profile.png} (100%)
 rename WordPress/src/main/res/drawable-xxhdpi/{me_icon_settings.png => me_icon_my_profile.png} (100%)

diff --git a/WordPress/src/main/res/drawable-hdpi/me_icon_settings.png b/WordPress/src/main/res/drawable-hdpi/me_icon_my_profile.png
similarity index 100%
rename from WordPress/src/main/res/drawable-hdpi/me_icon_settings.png
rename to WordPress/src/main/res/drawable-hdpi/me_icon_my_profile.png
diff --git a/WordPress/src/main/res/drawable-xhdpi/me_icon_settings.png b/WordPress/src/main/res/drawable-xhdpi/me_icon_my_profile.png
similarity index 100%
rename from WordPress/src/main/res/drawable-xhdpi/me_icon_settings.png
rename to WordPress/src/main/res/drawable-xhdpi/me_icon_my_profile.png
diff --git a/WordPress/src/main/res/drawable-xxhdpi/me_icon_settings.png b/WordPress/src/main/res/drawable-xxhdpi/me_icon_my_profile.png
similarity index 100%
rename from WordPress/src/main/res/drawable-xxhdpi/me_icon_settings.png
rename to WordPress/src/main/res/drawable-xxhdpi/me_icon_my_profile.png
diff --git a/WordPress/src/main/res/layout/me_fragment.xml b/WordPress/src/main/res/layout/me_fragment.xml
index 7076248ec31a..ba8ad040970a 100644
--- a/WordPress/src/main/res/layout/me_fragment.xml
+++ b/WordPress/src/main/res/layout/me_fragment.xml
@@ -61,7 +61,7 @@
                 android:id="@+id/me_my_profile_icon"
                 style="@style/MeListRowIcon"
                 android:contentDescription="@string/my_profile"
-                android:src="@drawable/me_icon_settings" />
+                android:src="@drawable/me_icon_my_profile" />
 
             <org.wordpress.android.widgets.WPTextView
                 android:id="@+id/me_my_profile_text_view"

From a77e56cfa8a8b50bf76a0396eef618a41f098773 Mon Sep 17 00:00:00 2001
From: Oguz Kocer <oguz.kocer@automattic.com>
Date: Thu, 10 Dec 2015 19:38:58 +0200
Subject: [PATCH 25/48] Track my profile and account settings events

---
 .../main/java/org/wordpress/android/ui/ActivityLauncher.java    | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/WordPress/src/main/java/org/wordpress/android/ui/ActivityLauncher.java b/WordPress/src/main/java/org/wordpress/android/ui/ActivityLauncher.java
index ba107e50d15a..4db2c043bce3 100644
--- a/WordPress/src/main/java/org/wordpress/android/ui/ActivityLauncher.java
+++ b/WordPress/src/main/java/org/wordpress/android/ui/ActivityLauncher.java
@@ -175,11 +175,13 @@ public static void addMedia(Activity activity) {
 
     public static void viewMyProfile(Context context) {
         Intent intent = new Intent(context, MyProfileActivity.class);
+        AnalyticsUtils.trackWithCurrentBlogDetails(AnalyticsTracker.Stat.OPENED_MY_PROFILE);
         slideInFromRight(context, intent);
     }
 
     public static void viewAccountSettings(Activity activity) {
         Intent intent = new Intent(activity, SettingsActivity.class);
+        AnalyticsUtils.trackWithCurrentBlogDetails(AnalyticsTracker.Stat.OPENED_ACCOUNT_SETTINGS);
         slideInFromRightForResult(activity, intent, RequestCodes.ACCOUNT_SETTINGS);
     }
 

From a5c24e9a8400ff277cb9b0b6555911c8aa51cd3c Mon Sep 17 00:00:00 2001
From: Oguz Kocer <oguz.kocer@automattic.com>
Date: Tue, 15 Dec 2015 13:37:52 +0200
Subject: [PATCH 26/48] Unescape html for my profile labels

---
 .../org/wordpress/android/ui/me/MyProfileActivity.java   | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/WordPress/src/main/java/org/wordpress/android/ui/me/MyProfileActivity.java b/WordPress/src/main/java/org/wordpress/android/ui/me/MyProfileActivity.java
index becab937db70..be1cf466fd70 100644
--- a/WordPress/src/main/java/org/wordpress/android/ui/me/MyProfileActivity.java
+++ b/WordPress/src/main/java/org/wordpress/android/ui/me/MyProfileActivity.java
@@ -13,6 +13,7 @@
 import org.wordpress.android.models.AccountHelper;
 import org.wordpress.android.ui.ActivityLauncher;
 import org.wordpress.android.util.DialogUtils;
+import org.wordpress.android.util.StringUtils;
 import org.wordpress.android.widgets.WPTextView;
 import org.xmlrpc.android.ApiHelper;
 
@@ -88,10 +89,10 @@ public boolean onCreateOptionsMenu(Menu menu) {
 
     private void refreshDetails() {
         Account account = AccountHelper.getDefaultAccount();
-        updateLabel(mFirstName, account != null ? account.getFirstName() : null);
-        updateLabel(mLastName, account != null ? account.getLastName() : null);
-        updateLabel(mDisplayName, account != null ? account.getDisplayName() : null);
-        updateLabel(mAboutMe, account != null ? account.getAboutMe() : null);
+        updateLabel(mFirstName, account != null ? StringUtils.unescapeHTML(account.getFirstName()) : null);
+        updateLabel(mLastName, account != null ? StringUtils.unescapeHTML(account.getLastName()) : null);
+        updateLabel(mDisplayName, account != null ? StringUtils.unescapeHTML(account.getDisplayName()) : null);
+        updateLabel(mAboutMe, account != null ? StringUtils.unescapeHTML(account.getAboutMe()) : null);
     }
 
     private void saveMyProfile() {

From 2589d1f98e1082e672b3e9f8c6567fcf97e6a2ab Mon Sep 17 00:00:00 2001
From: Oguz Kocer <oguz.kocer@automattic.com>
Date: Tue, 15 Dec 2015 13:49:10 +0200
Subject: [PATCH 27/48] Show the initial text in my profile dialogs as selected

---
 .../wordpress/android/ui/me/MyProfileActivity.java   | 12 ++++--------
 .../java/org/wordpress/android/util/DialogUtils.java | 11 ++++++-----
 2 files changed, 10 insertions(+), 13 deletions(-)

diff --git a/WordPress/src/main/java/org/wordpress/android/ui/me/MyProfileActivity.java b/WordPress/src/main/java/org/wordpress/android/ui/me/MyProfileActivity.java
index be1cf466fd70..168f03b21406 100644
--- a/WordPress/src/main/java/org/wordpress/android/ui/me/MyProfileActivity.java
+++ b/WordPress/src/main/java/org/wordpress/android/ui/me/MyProfileActivity.java
@@ -56,9 +56,9 @@ public void onFailure(ApiHelper.ErrorType errorType, String errorMessage, Throwa
 
         refreshDetails();
 
-        findViewById(R.id.first_name_row).setOnClickListener(createOnClickListener(getString(org.wordpress.android.R.string.first_name), mFirstName));
-        findViewById(R.id.last_name_row).setOnClickListener(createOnClickListener(getString(R.string.last_name), mLastName));
-        findViewById(R.id.display_name_row).setOnClickListener(createOnClickListener(getString(R.string.public_display_name), mDisplayName));
+        findViewById(R.id.first_name_row).setOnClickListener(createOnClickListener(getString(org.wordpress.android.R.string.first_name), null, mFirstName));
+        findViewById(R.id.last_name_row).setOnClickListener(createOnClickListener(getString(R.string.last_name), null, mLastName));
+        findViewById(R.id.display_name_row).setOnClickListener(createOnClickListener(getString(R.string.public_display_name), null, mDisplayName));
         findViewById(R.id.about_me_row).setOnClickListener(createOnClickListener(getString(R.string.about_me), getString(R.string.about_me_hint), mAboutMe));
     }
 
@@ -127,16 +127,12 @@ private void updateLabel(WPTextView textView, String text) {
         }
     }
 
-    private View.OnClickListener createOnClickListener(final String dialogTitle, final WPTextView textView) {
-        return createOnClickListener(dialogTitle, null, textView);
-    }
-
     // helper method to create onClickListener to avoid code duplication
     private View.OnClickListener createOnClickListener(final String dialogTitle, final String hint, final WPTextView textView) {
         return new View.OnClickListener() {
             @Override
             public void onClick(View v) {
-                DialogUtils.showMyProfileDialog(MyProfileActivity.this, dialogTitle, hint, new DialogUtils.Callback() {
+                DialogUtils.showMyProfileDialog(MyProfileActivity.this, dialogTitle, textView.getText().toString(), hint, new DialogUtils.Callback() {
                     @Override
                     public void onSuccessfulInput(String input) {
                         updateLabel(textView, input);
diff --git a/WordPress/src/main/java/org/wordpress/android/util/DialogUtils.java b/WordPress/src/main/java/org/wordpress/android/util/DialogUtils.java
index 2b9aa1a64432..441dbd0aa030 100644
--- a/WordPress/src/main/java/org/wordpress/android/util/DialogUtils.java
+++ b/WordPress/src/main/java/org/wordpress/android/util/DialogUtils.java
@@ -10,11 +10,7 @@
 import org.wordpress.android.widgets.WPTextView;
 
 public class DialogUtils {
-    public static void showMyProfileDialog(Context context, String title, final Callback callback) {
-        showMyProfileDialog(context, title, null, callback);
-    }
-
-    public static void showMyProfileDialog(Context context, String title, String hint, final Callback callback) {
+    public static void showMyProfileDialog(Context context, String title, String initialText, String hint, final Callback callback) {
         LayoutInflater layoutInflater = LayoutInflater.from(context);
         View promptView = layoutInflater.inflate(org.wordpress.android.R.layout.my_profile_dialog, null);
         AlertDialog.Builder alertDialogBuilder = new AlertDialog.Builder(context);
@@ -32,6 +28,11 @@ public static void showMyProfileDialog(Context context, String title, String hin
             hintView.setVisibility(View.GONE);
         }
 
+        if (initialText != null && !initialText.isEmpty()) {
+            editText.setText(initialText);
+            editText.setSelection(0, initialText.length());
+        }
+
         alertDialogBuilder.setCancelable(false)
                 .setPositiveButton(org.wordpress.android.R.string.ok, new DialogInterface.OnClickListener() {
                     public void onClick(DialogInterface dialog, int id) {

From 3f3b9ad29aece8ae805fde5ee2a29798e2beaa7e Mon Sep 17 00:00:00 2001
From: Oguz Kocer <oguz.kocer@automattic.com>
Date: Tue, 15 Dec 2015 13:56:02 +0200
Subject: [PATCH 28/48] Fixed a bug where you couldn't delete your my profile
 labels

---
 .../java/org/wordpress/android/ui/me/MyProfileActivity.java     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/WordPress/src/main/java/org/wordpress/android/ui/me/MyProfileActivity.java b/WordPress/src/main/java/org/wordpress/android/ui/me/MyProfileActivity.java
index 168f03b21406..39a24cd67f67 100644
--- a/WordPress/src/main/java/org/wordpress/android/ui/me/MyProfileActivity.java
+++ b/WordPress/src/main/java/org/wordpress/android/ui/me/MyProfileActivity.java
@@ -118,12 +118,12 @@ public void onFailure(ApiHelper.ErrorType errorType, String errorMessage, Throwa
     }
 
     private void updateLabel(WPTextView textView, String text) {
+        textView.setText(text);
         if (text == null || text.isEmpty()) {
             textView.setVisibility(View.GONE);
         }
         else {
             textView.setVisibility(View.VISIBLE);
-            textView.setText(text);
         }
     }
 

From 0bd01f5802e54fd6458f1e08a57f34a565073d6f Mon Sep 17 00:00:00 2001
From: Oguz Kocer <oguz.kocer@automattic.com>
Date: Tue, 15 Dec 2015 14:02:12 +0200
Subject: [PATCH 29/48] Fixed a bug where the display name wouldn't be updated
 in the db after post me/settings

---
 .../src/main/java/org/wordpress/android/models/AccountModel.java | 1 +
 1 file changed, 1 insertion(+)

diff --git a/WordPress/src/main/java/org/wordpress/android/models/AccountModel.java b/WordPress/src/main/java/org/wordpress/android/models/AccountModel.java
index 67736afbd026..fa1e9eec373f 100644
--- a/WordPress/src/main/java/org/wordpress/android/models/AccountModel.java
+++ b/WordPress/src/main/java/org/wordpress/android/models/AccountModel.java
@@ -56,6 +56,7 @@ public void updateFromRestResponse(JSONObject json) {
     public void updateAccountSettingsFromRestResponse(JSONObject json) {
         mFirstName = json.optString("first_name");
         mLastName = json.optString("last_name");
+        mDisplayName = json.optString("display_name");
         mAboutMe = json.optString("description");
     }
 

From e04a89a0d35bf94df6bc66774a06aa1c763ca80a Mon Sep 17 00:00:00 2001
From: Oguz Kocer <oguz.kocer@automattic.com>
Date: Wed, 16 Dec 2015 17:37:18 +0200
Subject: [PATCH 30/48] Hide my profile row when not logged in with
 WordPress.com

---
 .../main/java/org/wordpress/android/ui/main/MeFragment.java | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/WordPress/src/main/java/org/wordpress/android/ui/main/MeFragment.java b/WordPress/src/main/java/org/wordpress/android/ui/main/MeFragment.java
index 03a87b0d426f..852f5eaf20e8 100644
--- a/WordPress/src/main/java/org/wordpress/android/ui/main/MeFragment.java
+++ b/WordPress/src/main/java/org/wordpress/android/ui/main/MeFragment.java
@@ -36,6 +36,7 @@ public class MeFragment extends Fragment {
     private TextView mDisplayNameTextView;
     private TextView mUsernameTextView;
     private TextView mLoginLogoutTextView;
+    private View mMyProfileView;
     private View mNotificationsView;
     private View mNotificationsDividerView;
     private ProgressDialog mDisconnectProgressDialog;
@@ -54,13 +55,14 @@ public View onCreateView(LayoutInflater inflater, ViewGroup container,
         mDisplayNameTextView = (TextView) rootView.findViewById(R.id.me_display_name);
         mUsernameTextView = (TextView) rootView.findViewById(R.id.me_username);
         mLoginLogoutTextView = (TextView) rootView.findViewById(R.id.me_login_logout_text_view);
+        mMyProfileView = rootView.findViewById(R.id.row_my_profile);
         mNotificationsView = rootView.findViewById(R.id.row_notifications);
         mNotificationsDividerView = rootView.findViewById(R.id.me_notifications_divider);
 
         addDropShadowToAvatar();
         refreshAccountDetails();
 
-        rootView.findViewById(R.id.row_my_profile).setOnClickListener(new View.OnClickListener() {
+        mMyProfileView.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
                 ActivityLauncher.viewMyProfile(getActivity());
@@ -148,6 +150,7 @@ private void refreshAccountDetails() {
             mDisplayNameTextView.setVisibility(View.VISIBLE);
             mUsernameTextView.setVisibility(View.VISIBLE);
             mAvatarFrame.setVisibility(View.VISIBLE);
+            mMyProfileView.setVisibility(View.VISIBLE);
             mNotificationsView.setVisibility(View.VISIBLE);
             mNotificationsDividerView.setVisibility(View.VISIBLE);
 
@@ -168,6 +171,7 @@ private void refreshAccountDetails() {
             mDisplayNameTextView.setVisibility(View.GONE);
             mUsernameTextView.setVisibility(View.GONE);
             mAvatarFrame.setVisibility(View.GONE);
+            mMyProfileView.setVisibility(View.GONE);
             mNotificationsView.setVisibility(View.GONE);
             mNotificationsDividerView.setVisibility(View.GONE);
             mLoginLogoutTextView.setText(R.string.me_connect_to_wordpress_com);

From d5a3328625e558a42053d5413003eae0144096a6 Mon Sep 17 00:00:00 2001
From: Oguz Kocer <oguz.kocer@automattic.com>
Date: Wed, 16 Dec 2015 17:51:39 +0200
Subject: [PATCH 31/48] Save button removed from My Profile page

---
 .../org/wordpress/android/ui/me/MyProfileActivity.java | 10 ----------
 WordPress/src/main/res/menu/my_profile.xml             | 10 ----------
 2 files changed, 20 deletions(-)
 delete mode 100644 WordPress/src/main/res/menu/my_profile.xml

diff --git a/WordPress/src/main/java/org/wordpress/android/ui/me/MyProfileActivity.java b/WordPress/src/main/java/org/wordpress/android/ui/me/MyProfileActivity.java
index 39a24cd67f67..c6f587f81c2d 100644
--- a/WordPress/src/main/java/org/wordpress/android/ui/me/MyProfileActivity.java
+++ b/WordPress/src/main/java/org/wordpress/android/ui/me/MyProfileActivity.java
@@ -73,20 +73,10 @@ public boolean onOptionsItemSelected(final MenuItem item) {
         if (item.getItemId() == android.R.id.home) {
             onBackPressed();
             return true;
-        } else if (item.getItemId() == R.id.menu_save) {
-            saveMyProfile();
-            return true;
         }
         return super.onOptionsItemSelected(item);
     }
 
-    @Override
-    public boolean onCreateOptionsMenu(Menu menu) {
-        super.onCreateOptionsMenu(menu);
-        getMenuInflater().inflate(R.menu.my_profile, menu);
-        return true;
-    }
-
     private void refreshDetails() {
         Account account = AccountHelper.getDefaultAccount();
         updateLabel(mFirstName, account != null ? StringUtils.unescapeHTML(account.getFirstName()) : null);
diff --git a/WordPress/src/main/res/menu/my_profile.xml b/WordPress/src/main/res/menu/my_profile.xml
deleted file mode 100644
index bb5a3b1e665a..000000000000
--- a/WordPress/src/main/res/menu/my_profile.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<menu xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto">
-
-    <item
-        android:id="@+id/menu_save"
-        android:title="@string/save"
-        app:showAsAction="always" />
-
-</menu>
\ No newline at end of file

From 855b485214b10327e62280a2899542bca7d64cab Mon Sep 17 00:00:00 2001
From: Oguz Kocer <oguz.kocer@automattic.com>
Date: Wed, 16 Dec 2015 17:52:18 +0200
Subject: [PATCH 32/48] Posting account settings now accepts the params instead
 of certain fields.

Since we are going to change how we save the profile changes from the "Save" button to just closing the dialog, having a flexible method would be easier. In order to make sure we use correct parameters, Account.RestParam enum is introduced.
---
 .../org/wordpress/android/models/Account.java | 27 ++++++++++++++-----
 1 file changed, 21 insertions(+), 6 deletions(-)

diff --git a/WordPress/src/main/java/org/wordpress/android/models/Account.java b/WordPress/src/main/java/org/wordpress/android/models/Account.java
index 0c903366071c..6d566e91258e 100644
--- a/WordPress/src/main/java/org/wordpress/android/models/Account.java
+++ b/WordPress/src/main/java/org/wordpress/android/models/Account.java
@@ -65,7 +65,7 @@ public void onErrorResponse(VolleyError volleyError) {
         WordPress.getRestClientUtilsV1_1().get("me/settings", listener, errorListener);
     }
 
-    public void postAccountSettings(String firstName, String lastName, String displayName, String aboutMe, final ApiHelper.GenericCallback callback) {
+    public void postAccountSettings(Map<String, String> params, final ApiHelper.GenericCallback callback) {
         com.wordpress.rest.RestRequest.Listener listener = new RestRequest.Listener() {
             @Override
             public void onResponse(JSONObject jsonObject) {
@@ -86,11 +86,6 @@ public void onErrorResponse(VolleyError volleyError) {
             }
         };
 
-        Map<String, String> params = new HashMap<>();
-        params.put("first_name", firstName);
-        params.put("last_name", lastName);
-        params.put("display_name", displayName);
-        params.put("description", aboutMe);
         WordPress.getRestClientUtilsV1_1().post("me/settings", params, null, listener, errorListener);
     }
 
@@ -102,4 +97,24 @@ public void signout() {
     public void save() {
         AccountTable.save(this);
     }
+
+    public enum RestParam {
+        FIRST_NAME,
+        LAST_NAME,
+        DISPLAY_NAME,
+        ABOUT_ME;
+
+        public static String toString(RestParam param) {
+            switch (param) {
+                case FIRST_NAME:
+                    return "first_name";
+                case LAST_NAME:
+                    return "last_name";
+                case DISPLAY_NAME:
+                    return "display_name";
+                case ABOUT_ME:
+                    return "description";
+            }
+        }
+    }
 }

From d77e21433dd348d29385f924e33c71bbf6317e0e Mon Sep 17 00:00:00 2001
From: Oguz Kocer <oguz.kocer@automattic.com>
Date: Wed, 16 Dec 2015 18:11:12 +0200
Subject: [PATCH 33/48] When you update labels in my profile, it'll silently
 update the server

---
 .../org/wordpress/android/models/Account.java |  2 +-
 .../android/ui/me/MyProfileActivity.java      | 40 ++++++++++---------
 2 files changed, 22 insertions(+), 20 deletions(-)

diff --git a/WordPress/src/main/java/org/wordpress/android/models/Account.java b/WordPress/src/main/java/org/wordpress/android/models/Account.java
index 6d566e91258e..fc453eaf7e5d 100644
--- a/WordPress/src/main/java/org/wordpress/android/models/Account.java
+++ b/WordPress/src/main/java/org/wordpress/android/models/Account.java
@@ -11,7 +11,6 @@
 import org.wordpress.android.util.AppLog.T;
 import org.xmlrpc.android.ApiHelper;
 
-import java.util.HashMap;
 import java.util.Map;
 
 /**
@@ -115,6 +114,7 @@ public static String toString(RestParam param) {
                 case ABOUT_ME:
                     return "description";
             }
+            return "";
         }
     }
 }
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/me/MyProfileActivity.java b/WordPress/src/main/java/org/wordpress/android/ui/me/MyProfileActivity.java
index c6f587f81c2d..ffeb6d6df578 100644
--- a/WordPress/src/main/java/org/wordpress/android/ui/me/MyProfileActivity.java
+++ b/WordPress/src/main/java/org/wordpress/android/ui/me/MyProfileActivity.java
@@ -1,12 +1,11 @@
 package org.wordpress.android.ui.me;
 
-import android.app.ProgressDialog;
 import android.os.Bundle;
 import android.support.v7.app.ActionBar;
 import android.support.v7.app.AppCompatActivity;
-import android.view.Menu;
 import android.view.MenuItem;
 import android.view.View;
+import android.widget.TextView;
 
 import org.wordpress.android.R;
 import org.wordpress.android.models.Account;
@@ -17,13 +16,15 @@
 import org.wordpress.android.widgets.WPTextView;
 import org.xmlrpc.android.ApiHelper;
 
+import java.util.HashMap;
+import java.util.Map;
+
 public class MyProfileActivity extends AppCompatActivity {
 
     private WPTextView mFirstName;
     private WPTextView mLastName;
     private WPTextView mDisplayName;
     private WPTextView mAboutMe;
-    private ProgressDialog mProgressDialog;
 
     @Override
     public void onCreate(Bundle savedInstanceState) {
@@ -85,24 +86,16 @@ private void refreshDetails() {
         updateLabel(mAboutMe, account != null ? StringUtils.unescapeHTML(account.getAboutMe()) : null);
     }
 
-    private void saveMyProfile() {
-        String firstName = mFirstName.getText().toString();
-        String lastName = mLastName.getText().toString();
-        String displayName = mDisplayName.getText().toString();
-        String aboutMe = mAboutMe.getText().toString();
-
-        mProgressDialog = ProgressDialog.show(this, null, getText(R.string.saving_changes), false);
-
-        AccountHelper.getDefaultAccount().postAccountSettings(firstName, lastName, displayName, aboutMe, new ApiHelper.GenericCallback() {
+    private void updateMyProfileForLabel(TextView textView) {
+        Map<String, String> params = new HashMap<>();
+        params.put(restParamForTextView(textView), textView.getText().toString());
+        AccountHelper.getDefaultAccount().postAccountSettings(params, new ApiHelper.GenericCallback() {
             @Override
             public void onSuccess() {
-                refreshDetails();
-                dismissProgressDialog();
             }
 
             @Override
             public void onFailure(ApiHelper.ErrorType errorType, String errorMessage, Throwable throwable) {
-                dismissProgressDialog();
             }
         });
     }
@@ -126,16 +119,25 @@ public void onClick(View v) {
                     @Override
                     public void onSuccessfulInput(String input) {
                         updateLabel(textView, input);
+                        updateMyProfileForLabel(textView);
                     }
                 });
             }
         };
     }
 
-    private void dismissProgressDialog() {
-        if (mProgressDialog != null && mProgressDialog.isShowing()) {
-            mProgressDialog.dismiss();
+    // helper method to get the rest parameter for a text view
+    private String restParamForTextView(TextView textView) {
+        Account.RestParam param = null;
+        if (textView == mFirstName) {
+            param = Account.RestParam.FIRST_NAME;
+        } else if (textView == mLastName) {
+            param = Account.RestParam.LAST_NAME;
+        } else if (textView == mDisplayName) {
+            param = Account.RestParam.DISPLAY_NAME;
+        } else if (textView == mAboutMe) {
+            param = Account.RestParam.ABOUT_ME;
         }
-        mProgressDialog = null;
+        return Account.RestParam.toString(param);
     }
 }

From dafb90583d7a4499c9e456b6de3f24d35872507a Mon Sep 17 00:00:00 2001
From: Oguz Kocer <oguz.kocer@automattic.com>
Date: Wed, 16 Dec 2015 18:22:25 +0200
Subject: [PATCH 34/48] Change the capitilization for the my profile labels

---
 WordPress/src/main/res/values/strings.xml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/WordPress/src/main/res/values/strings.xml b/WordPress/src/main/res/values/strings.xml
index 2e7d7831a208..56e641891b57 100644
--- a/WordPress/src/main/res/values/strings.xml
+++ b/WordPress/src/main/res/values/strings.xml
@@ -1110,10 +1110,10 @@
 
     <!--My profile-->
     <string name="my_profile">My Profile</string>
-    <string name="first_name">First Name</string>
-    <string name="last_name">Last Name</string>
-    <string name="public_display_name">Public Display Name</string>
-    <string name="about_me">About Me</string>
+    <string name="first_name">First name</string>
+    <string name="last_name">Last name</string>
+    <string name="public_display_name">Public display name</string>
+    <string name="about_me">About me</string>
     <string name="about_me_hint">A few words about you…</string>
 
 </resources>

From 1fb9464bac2350f3c2a7b231c3b2f013eecab7c5 Mon Sep 17 00:00:00 2001
From: Oguz Kocer <oguz.kocer@automattic.com>
Date: Thu, 17 Dec 2015 20:37:22 +0200
Subject: [PATCH 35/48] Check if finishing for my profile activity for success
 callback

---
 .../java/org/wordpress/android/ui/me/MyProfileActivity.java   | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/WordPress/src/main/java/org/wordpress/android/ui/me/MyProfileActivity.java b/WordPress/src/main/java/org/wordpress/android/ui/me/MyProfileActivity.java
index ffeb6d6df578..482bd29b7b64 100644
--- a/WordPress/src/main/java/org/wordpress/android/ui/me/MyProfileActivity.java
+++ b/WordPress/src/main/java/org/wordpress/android/ui/me/MyProfileActivity.java
@@ -33,7 +33,9 @@ public void onCreate(Bundle savedInstanceState) {
         AccountHelper.getDefaultAccount().fetchAccountSettings(new ApiHelper.GenericCallback() {
             @Override
             public void onSuccess() {
-                refreshDetails();
+                if (!isFinishing()) {
+                    refreshDetails();
+                }
             }
 
             @Override

From 5de8502e6b22359df6940f933b1fc6d7c973c774 Mon Sep 17 00:00:00 2001
From: Oguz Kocer <oguz.kocer@automattic.com>
Date: Thu, 17 Dec 2015 20:42:07 +0200
Subject: [PATCH 36/48] Use StringUtils.notNullStr() for new account model
 properties

---
 .../java/org/wordpress/android/models/AccountModel.java     | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/WordPress/src/main/java/org/wordpress/android/models/AccountModel.java b/WordPress/src/main/java/org/wordpress/android/models/AccountModel.java
index fa1e9eec373f..4d8f18c3396d 100644
--- a/WordPress/src/main/java/org/wordpress/android/models/AccountModel.java
+++ b/WordPress/src/main/java/org/wordpress/android/models/AccountModel.java
@@ -145,7 +145,7 @@ public String getEmail() {
     }
 
     public String getFirstName() {
-        return mFirstName;
+        return StringUtils.notNullStr(mFirstName);
     }
 
     public void setFirstName(String firstName) {
@@ -153,7 +153,7 @@ public void setFirstName(String firstName) {
     }
 
     public String getLastName() {
-        return mLastName;
+        return StringUtils.notNullStr(mLastName);
     }
 
     public void setLastName(String lastName) {
@@ -161,7 +161,7 @@ public void setLastName(String lastName) {
     }
 
     public String getAboutMe() {
-        return mAboutMe;
+        return StringUtils.notNullStr(mAboutMe);
     }
 
     public void setAboutMe(String aboutMe) {

From 219f8fd01ff0b23210cf51f26f8bf0c9c618c844 Mon Sep 17 00:00:00 2001
From: Oguz Kocer <oguz.kocer@automattic.com>
Date: Thu, 17 Dec 2015 20:44:20 +0200
Subject: [PATCH 37/48] Set My Profile's title in the manifest

---
 WordPress/src/main/AndroidManifest.xml                          | 1 +
 .../java/org/wordpress/android/ui/me/MyProfileActivity.java     | 2 --
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/WordPress/src/main/AndroidManifest.xml b/WordPress/src/main/AndroidManifest.xml
index c31f646e2147..a7a9b12883cb 100644
--- a/WordPress/src/main/AndroidManifest.xml
+++ b/WordPress/src/main/AndroidManifest.xml
@@ -319,6 +319,7 @@
         <!--Me activities-->
         <activity
             android:name=".ui.me.MyProfileActivity"
+            android:label="@string/my_profile"
             android:theme="@style/CalypsoTheme" />
 
 		<!-- Services -->
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/me/MyProfileActivity.java b/WordPress/src/main/java/org/wordpress/android/ui/me/MyProfileActivity.java
index 482bd29b7b64..6e0ee2e1984a 100644
--- a/WordPress/src/main/java/org/wordpress/android/ui/me/MyProfileActivity.java
+++ b/WordPress/src/main/java/org/wordpress/android/ui/me/MyProfileActivity.java
@@ -50,8 +50,6 @@ public void onFailure(ApiHelper.ErrorType errorType, String errorMessage, Throwa
         }
         setContentView(R.layout.my_profile_activity);
 
-        setTitle(R.string.my_profile);
-
         mFirstName = (WPTextView) findViewById(R.id.first_name);
         mLastName = (WPTextView) findViewById(R.id.last_name);
         mDisplayName = (WPTextView) findViewById(R.id.display_name);

From 5e4dca458c3639d1369bfb21ad476b18ad19deb0 Mon Sep 17 00:00:00 2001
From: Oguz Kocer <oguz.kocer@automattic.com>
Date: Thu, 17 Dec 2015 20:48:45 +0200
Subject: [PATCH 38/48] Use TextUtils.isEmpty() instead of manual null & empty
 check

---
 .../java/org/wordpress/android/ui/me/MyProfileActivity.java  | 3 ++-
 .../main/java/org/wordpress/android/util/DialogUtils.java    | 5 +++--
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/WordPress/src/main/java/org/wordpress/android/ui/me/MyProfileActivity.java b/WordPress/src/main/java/org/wordpress/android/ui/me/MyProfileActivity.java
index 6e0ee2e1984a..8b1a50234ab4 100644
--- a/WordPress/src/main/java/org/wordpress/android/ui/me/MyProfileActivity.java
+++ b/WordPress/src/main/java/org/wordpress/android/ui/me/MyProfileActivity.java
@@ -3,6 +3,7 @@
 import android.os.Bundle;
 import android.support.v7.app.ActionBar;
 import android.support.v7.app.AppCompatActivity;
+import android.text.TextUtils;
 import android.view.MenuItem;
 import android.view.View;
 import android.widget.TextView;
@@ -102,7 +103,7 @@ public void onFailure(ApiHelper.ErrorType errorType, String errorMessage, Throwa
 
     private void updateLabel(WPTextView textView, String text) {
         textView.setText(text);
-        if (text == null || text.isEmpty()) {
+        if (TextUtils.isEmpty(text)) {
             textView.setVisibility(View.GONE);
         }
         else {
diff --git a/WordPress/src/main/java/org/wordpress/android/util/DialogUtils.java b/WordPress/src/main/java/org/wordpress/android/util/DialogUtils.java
index 441dbd0aa030..deb80185d980 100644
--- a/WordPress/src/main/java/org/wordpress/android/util/DialogUtils.java
+++ b/WordPress/src/main/java/org/wordpress/android/util/DialogUtils.java
@@ -3,6 +3,7 @@
 import android.app.AlertDialog;
 import android.content.Context;
 import android.content.DialogInterface;
+import android.text.TextUtils;
 import android.view.LayoutInflater;
 import android.view.View;
 
@@ -21,14 +22,14 @@ public static void showMyProfileDialog(Context context, String title, String ini
         final WPTextView hintView = (WPTextView) promptView.findViewById(org.wordpress.android.R.id.my_profile_dialog_hint);
 
         textView.setText(title);
-        if (hint != null && !hint.isEmpty()) {
+        if (!TextUtils.isEmpty(hint)) {
             hintView.setText(hint);
         }
         else {
             hintView.setVisibility(View.GONE);
         }
 
-        if (initialText != null && !initialText.isEmpty()) {
+        if (!TextUtils.isEmpty(initialText)) {
             editText.setText(initialText);
             editText.setSelection(0, initialText.length());
         }

From 13b388ae6c991fab05787b93d2804c28318a2267 Mon Sep 17 00:00:00 2001
From: Oguz Kocer <oguz.kocer@automattic.com>
Date: Thu, 17 Dec 2015 20:54:37 +0200
Subject: [PATCH 39/48] Remove unnecessary usage of 'org.wordpress.android.' in
 some places

---
 .../wordpress/android/ui/me/MyProfileActivity.java  |  2 +-
 .../org/wordpress/android/util/DialogUtils.java     | 13 +++++++------
 2 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/WordPress/src/main/java/org/wordpress/android/ui/me/MyProfileActivity.java b/WordPress/src/main/java/org/wordpress/android/ui/me/MyProfileActivity.java
index 8b1a50234ab4..bc0206b45a49 100644
--- a/WordPress/src/main/java/org/wordpress/android/ui/me/MyProfileActivity.java
+++ b/WordPress/src/main/java/org/wordpress/android/ui/me/MyProfileActivity.java
@@ -58,7 +58,7 @@ public void onFailure(ApiHelper.ErrorType errorType, String errorMessage, Throwa
 
         refreshDetails();
 
-        findViewById(R.id.first_name_row).setOnClickListener(createOnClickListener(getString(org.wordpress.android.R.string.first_name), null, mFirstName));
+        findViewById(R.id.first_name_row).setOnClickListener(createOnClickListener(getString(R.string.first_name), null, mFirstName));
         findViewById(R.id.last_name_row).setOnClickListener(createOnClickListener(getString(R.string.last_name), null, mLastName));
         findViewById(R.id.display_name_row).setOnClickListener(createOnClickListener(getString(R.string.public_display_name), null, mDisplayName));
         findViewById(R.id.about_me_row).setOnClickListener(createOnClickListener(getString(R.string.about_me), getString(R.string.about_me_hint), mAboutMe));
diff --git a/WordPress/src/main/java/org/wordpress/android/util/DialogUtils.java b/WordPress/src/main/java/org/wordpress/android/util/DialogUtils.java
index deb80185d980..f4a8fdf67ebb 100644
--- a/WordPress/src/main/java/org/wordpress/android/util/DialogUtils.java
+++ b/WordPress/src/main/java/org/wordpress/android/util/DialogUtils.java
@@ -7,19 +7,20 @@
 import android.view.LayoutInflater;
 import android.view.View;
 
+import org.wordpress.android.R;
 import org.wordpress.android.widgets.OpenSansEditText;
 import org.wordpress.android.widgets.WPTextView;
 
 public class DialogUtils {
     public static void showMyProfileDialog(Context context, String title, String initialText, String hint, final Callback callback) {
         LayoutInflater layoutInflater = LayoutInflater.from(context);
-        View promptView = layoutInflater.inflate(org.wordpress.android.R.layout.my_profile_dialog, null);
+        View promptView = layoutInflater.inflate(R.layout.my_profile_dialog, null);
         AlertDialog.Builder alertDialogBuilder = new AlertDialog.Builder(context);
         alertDialogBuilder.setView(promptView);
 
-        final WPTextView textView = (WPTextView) promptView.findViewById(org.wordpress.android.R.id.my_profile_dialog_label);
-        final OpenSansEditText editText = (OpenSansEditText) promptView.findViewById(org.wordpress.android.R.id.my_profile_dialog_input);
-        final WPTextView hintView = (WPTextView) promptView.findViewById(org.wordpress.android.R.id.my_profile_dialog_hint);
+        final WPTextView textView = (WPTextView) promptView.findViewById(R.id.my_profile_dialog_label);
+        final OpenSansEditText editText = (OpenSansEditText) promptView.findViewById(R.id.my_profile_dialog_input);
+        final WPTextView hintView = (WPTextView) promptView.findViewById(R.id.my_profile_dialog_hint);
 
         textView.setText(title);
         if (!TextUtils.isEmpty(hint)) {
@@ -35,12 +36,12 @@ public static void showMyProfileDialog(Context context, String title, String ini
         }
 
         alertDialogBuilder.setCancelable(false)
-                .setPositiveButton(org.wordpress.android.R.string.ok, new DialogInterface.OnClickListener() {
+                .setPositiveButton(R.string.ok, new DialogInterface.OnClickListener() {
                     public void onClick(DialogInterface dialog, int id) {
                         callback.onSuccessfulInput(editText.getText().toString());
                     }
                 })
-                .setNegativeButton(org.wordpress.android.R.string.cancel,
+                .setNegativeButton(R.string.cancel,
                         new DialogInterface.OnClickListener() {
                             public void onClick(DialogInterface dialog, int id) {
                                 dialog.cancel();

From 316b394d571d63315db0bd6cd91ce1260bc82848 Mon Sep 17 00:00:00 2001
From: Oguz Kocer <oguz.kocer@automattic.com>
Date: Thu, 17 Dec 2015 20:55:08 +0200
Subject: [PATCH 40/48] My Profile dialog is now cancelable

---
 .../src/main/java/org/wordpress/android/util/DialogUtils.java   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/WordPress/src/main/java/org/wordpress/android/util/DialogUtils.java b/WordPress/src/main/java/org/wordpress/android/util/DialogUtils.java
index f4a8fdf67ebb..ea30a72e5ab1 100644
--- a/WordPress/src/main/java/org/wordpress/android/util/DialogUtils.java
+++ b/WordPress/src/main/java/org/wordpress/android/util/DialogUtils.java
@@ -35,7 +35,7 @@ public static void showMyProfileDialog(Context context, String title, String ini
             editText.setSelection(0, initialText.length());
         }
 
-        alertDialogBuilder.setCancelable(false)
+        alertDialogBuilder.setCancelable(true)
                 .setPositiveButton(R.string.ok, new DialogInterface.OnClickListener() {
                     public void onClick(DialogInterface dialog, int id) {
                         callback.onSuccessfulInput(editText.getText().toString());

From 2fe452f175202f9006f767da616cef1b853df313 Mon Sep 17 00:00:00 2001
From: Oguz Kocer <oguz.kocer@automattic.com>
Date: Fri, 18 Dec 2015 17:52:39 +0200
Subject: [PATCH 41/48] MyProfileActivity moved to prefs package

---
 WordPress/src/main/AndroidManifest.xml                          | 2 +-
 .../main/java/org/wordpress/android/ui/ActivityLauncher.java    | 2 +-
 .../wordpress/android/ui/{me => prefs}/MyProfileActivity.java   | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)
 rename WordPress/src/main/java/org/wordpress/android/ui/{me => prefs}/MyProfileActivity.java (99%)

diff --git a/WordPress/src/main/AndroidManifest.xml b/WordPress/src/main/AndroidManifest.xml
index a7a9b12883cb..b57f791769d3 100644
--- a/WordPress/src/main/AndroidManifest.xml
+++ b/WordPress/src/main/AndroidManifest.xml
@@ -318,7 +318,7 @@
 
         <!--Me activities-->
         <activity
-            android:name=".ui.me.MyProfileActivity"
+            android:name=".ui.prefs.MyProfileActivity"
             android:label="@string/my_profile"
             android:theme="@style/CalypsoTheme" />
 
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/ActivityLauncher.java b/WordPress/src/main/java/org/wordpress/android/ui/ActivityLauncher.java
index 4db2c043bce3..aa59a625250c 100644
--- a/WordPress/src/main/java/org/wordpress/android/ui/ActivityLauncher.java
+++ b/WordPress/src/main/java/org/wordpress/android/ui/ActivityLauncher.java
@@ -20,7 +20,7 @@
 import org.wordpress.android.ui.accounts.SignInActivity;
 import org.wordpress.android.ui.comments.CommentsActivity;
 import org.wordpress.android.ui.main.SitePickerActivity;
-import org.wordpress.android.ui.me.MyProfileActivity;
+import org.wordpress.android.ui.prefs.MyProfileActivity;
 import org.wordpress.android.ui.media.MediaBrowserActivity;
 import org.wordpress.android.ui.media.WordPressMediaUtils;
 import org.wordpress.android.ui.posts.EditPostActivity;
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/me/MyProfileActivity.java b/WordPress/src/main/java/org/wordpress/android/ui/prefs/MyProfileActivity.java
similarity index 99%
rename from WordPress/src/main/java/org/wordpress/android/ui/me/MyProfileActivity.java
rename to WordPress/src/main/java/org/wordpress/android/ui/prefs/MyProfileActivity.java
index bc0206b45a49..21f0fa273935 100644
--- a/WordPress/src/main/java/org/wordpress/android/ui/me/MyProfileActivity.java
+++ b/WordPress/src/main/java/org/wordpress/android/ui/prefs/MyProfileActivity.java
@@ -1,4 +1,4 @@
-package org.wordpress.android.ui.me;
+package org.wordpress.android.ui.prefs;
 
 import android.os.Bundle;
 import android.support.v7.app.ActionBar;

From d0fe00bd5b4a810b4b3febf2f46208e1dbc62680 Mon Sep 17 00:00:00 2001
From: Oguz Kocer <oguz.kocer@automattic.com>
Date: Fri, 18 Dec 2015 18:11:19 +0200
Subject: [PATCH 42/48] Instead of using callbacks, use EventBus to update UI
 for my profile changes

---
 .../org/wordpress/android/models/Account.java | 15 +++----
 .../android/ui/prefs/MyProfileActivity.java   | 44 +++++++++----------
 .../android/ui/prefs/PrefsEvents.java         |  5 +++
 3 files changed, 33 insertions(+), 31 deletions(-)
 create mode 100644 WordPress/src/main/java/org/wordpress/android/ui/prefs/PrefsEvents.java

diff --git a/WordPress/src/main/java/org/wordpress/android/models/Account.java b/WordPress/src/main/java/org/wordpress/android/models/Account.java
index fc453eaf7e5d..e8678de8cebd 100644
--- a/WordPress/src/main/java/org/wordpress/android/models/Account.java
+++ b/WordPress/src/main/java/org/wordpress/android/models/Account.java
@@ -7,12 +7,14 @@
 import org.wordpress.android.WordPress;
 import org.wordpress.android.datasets.AccountTable;
 import org.wordpress.android.datasets.ReaderUserTable;
+import org.wordpress.android.ui.prefs.PrefsEvents;
 import org.wordpress.android.util.AppLog;
 import org.wordpress.android.util.AppLog.T;
-import org.xmlrpc.android.ApiHelper;
 
 import java.util.Map;
 
+import de.greenrobot.event.EventBus;
+
 /**
  * Class for managing logged in user informations.
  */
@@ -40,16 +42,14 @@ public void onErrorResponse(VolleyError volleyError) {
         WordPress.getRestClientUtilsV1_1().get("me", listener, errorListener);
     }
 
-    public void fetchAccountSettings(final ApiHelper.GenericCallback callback) {
+    public void fetchAccountSettings() {
         com.wordpress.rest.RestRequest.Listener listener = new RestRequest.Listener() {
             @Override
             public void onResponse(JSONObject jsonObject) {
                 if (jsonObject != null) {
                     updateAccountSettingsFromRestResponse(jsonObject);
                     save();
-                    if (callback != null) {
-                        callback.onSuccess();
-                    }
+                    EventBus.getDefault().post(new PrefsEvents.MyProfileDetailsChanged());
                 }
             }
         };
@@ -64,16 +64,13 @@ public void onErrorResponse(VolleyError volleyError) {
         WordPress.getRestClientUtilsV1_1().get("me/settings", listener, errorListener);
     }
 
-    public void postAccountSettings(Map<String, String> params, final ApiHelper.GenericCallback callback) {
+    public void postAccountSettings(Map<String, String> params) {
         com.wordpress.rest.RestRequest.Listener listener = new RestRequest.Listener() {
             @Override
             public void onResponse(JSONObject jsonObject) {
                 if (jsonObject != null) {
                     updateAccountSettingsFromRestResponse(jsonObject);
                     save();
-                    if (callback != null) {
-                        callback.onSuccess();
-                    }
                 }
             }
         };
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/prefs/MyProfileActivity.java b/WordPress/src/main/java/org/wordpress/android/ui/prefs/MyProfileActivity.java
index 21f0fa273935..86c359aea513 100644
--- a/WordPress/src/main/java/org/wordpress/android/ui/prefs/MyProfileActivity.java
+++ b/WordPress/src/main/java/org/wordpress/android/ui/prefs/MyProfileActivity.java
@@ -15,11 +15,12 @@
 import org.wordpress.android.util.DialogUtils;
 import org.wordpress.android.util.StringUtils;
 import org.wordpress.android.widgets.WPTextView;
-import org.xmlrpc.android.ApiHelper;
 
 import java.util.HashMap;
 import java.util.Map;
 
+import de.greenrobot.event.EventBus;
+
 public class MyProfileActivity extends AppCompatActivity {
 
     private WPTextView mFirstName;
@@ -31,18 +32,7 @@ public class MyProfileActivity extends AppCompatActivity {
     public void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
 
-        AccountHelper.getDefaultAccount().fetchAccountSettings(new ApiHelper.GenericCallback() {
-            @Override
-            public void onSuccess() {
-                if (!isFinishing()) {
-                    refreshDetails();
-                }
-            }
-
-            @Override
-            public void onFailure(ApiHelper.ErrorType errorType, String errorMessage, Throwable throwable) {
-            }
-        });
+        AccountHelper.getDefaultAccount().fetchAccountSettings();
 
         ActionBar actionBar = getSupportActionBar();
         if (actionBar != null) {
@@ -70,6 +60,18 @@ public void finish() {
         ActivityLauncher.slideOutToRight(this);
     }
 
+    @Override
+    protected void onStop() {
+        EventBus.getDefault().unregister(this);
+        super.onStop();
+    }
+
+    @Override
+    protected void onStart() {
+        super.onStart();
+        EventBus.getDefault().register(this);
+    }
+
     @Override
     public boolean onOptionsItemSelected(final MenuItem item) {
         if (item.getItemId() == android.R.id.home) {
@@ -90,15 +92,7 @@ private void refreshDetails() {
     private void updateMyProfileForLabel(TextView textView) {
         Map<String, String> params = new HashMap<>();
         params.put(restParamForTextView(textView), textView.getText().toString());
-        AccountHelper.getDefaultAccount().postAccountSettings(params, new ApiHelper.GenericCallback() {
-            @Override
-            public void onSuccess() {
-            }
-
-            @Override
-            public void onFailure(ApiHelper.ErrorType errorType, String errorMessage, Throwable throwable) {
-            }
-        });
+        AccountHelper.getDefaultAccount().postAccountSettings(params);
     }
 
     private void updateLabel(WPTextView textView, String text) {
@@ -141,4 +135,10 @@ private String restParamForTextView(TextView textView) {
         }
         return Account.RestParam.toString(param);
     }
+
+    public void onEventMainThread(PrefsEvents.MyProfileDetailsChanged event) {
+        if (!isFinishing()) {
+            refreshDetails();
+        }
+    }
 }
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/prefs/PrefsEvents.java b/WordPress/src/main/java/org/wordpress/android/ui/prefs/PrefsEvents.java
new file mode 100644
index 000000000000..8fa04f078dd1
--- /dev/null
+++ b/WordPress/src/main/java/org/wordpress/android/ui/prefs/PrefsEvents.java
@@ -0,0 +1,5 @@
+package org.wordpress.android.ui.prefs;
+
+public class PrefsEvents {
+    public static class MyProfileDetailsChanged {}
+}

From 90505d340aa71b68996bc763e4ae7fce8aa7b439 Mon Sep 17 00:00:00 2001
From: Oguz Kocer <oguz.kocer@automattic.com>
Date: Fri, 18 Dec 2015 18:24:49 +0200
Subject: [PATCH 43/48] Me screen shows the updated information when navigated
 in

MeFragment now listens for the MyProfileDetailsChanged changed event and onResume of the fragment we always update the account details just to make sure.
---
 .../wordpress/android/ui/main/MeFragment.java | 20 +++++++++++++++++++
 1 file changed, 20 insertions(+)

diff --git a/WordPress/src/main/java/org/wordpress/android/ui/main/MeFragment.java b/WordPress/src/main/java/org/wordpress/android/ui/main/MeFragment.java
index 852f5eaf20e8..b49df4b2630d 100644
--- a/WordPress/src/main/java/org/wordpress/android/ui/main/MeFragment.java
+++ b/WordPress/src/main/java/org/wordpress/android/ui/main/MeFragment.java
@@ -22,12 +22,15 @@
 import org.wordpress.android.models.Account;
 import org.wordpress.android.models.AccountHelper;
 import org.wordpress.android.ui.ActivityLauncher;
+import org.wordpress.android.ui.prefs.PrefsEvents;
 import org.wordpress.android.util.GravatarUtils;
 import org.wordpress.android.util.HelpshiftHelper.Tag;
 import org.wordpress.android.widgets.WPNetworkImageView;
 
 import java.lang.ref.WeakReference;
 
+import de.greenrobot.event.EventBus;
+
 public class MeFragment extends Fragment {
     private static final String IS_DISCONNECTING = "IS_DISCONNECTING";
 
@@ -117,6 +120,19 @@ public void onSaveInstanceState(Bundle outState) {
         super.onSaveInstanceState(outState);
     }
 
+    @Override
+    public void onStop() {
+        EventBus.getDefault().unregister(this);
+        super.onStop();
+    }
+
+    @Override
+    public void onResume() {
+        super.onResume();
+        refreshAccountDetails();
+        EventBus.getDefault().register(this);
+    }
+
     @Override
     public void onDestroy() {
         if (mDisconnectProgressDialog != null) {
@@ -238,4 +254,8 @@ protected void onPostExecute(Void aVoid) {
             mDisconnectProgressDialog = null;
         }
     }
+
+    public void onEventMainThread(PrefsEvents.MyProfileDetailsChanged event) {
+        refreshAccountDetails();
+    }
 }

From 43c8df6b0752b166c27559235cda38f0e4642f74 Mon Sep 17 00:00:00 2001
From: Oguz Kocer <oguz.kocer@automattic.com>
Date: Fri, 18 Dec 2015 19:33:35 +0200
Subject: [PATCH 44/48] Me screen icons updated with gridicons counterparts

---
 .../drawable-hdpi/me_icon_login_logout.png    | Bin 1215 -> 665 bytes
 .../res/drawable-hdpi/me_icon_my_profile.png  | Bin
 .../drawable-hdpi/me_icon_notifications.png   | Bin
 .../res/drawable-hdpi/me_icon_support.png     | Bin 830 -> 956 bytes
 .../drawable-xhdpi/me_icon_login_logout.png   | Bin 1470 -> 609 bytes
 .../res/drawable-xhdpi/me_icon_my_profile.png | Bin
 .../drawable-xhdpi/me_icon_notifications.png  | Bin
 .../res/drawable-xhdpi/me_icon_support.png    | Bin 803 -> 1329 bytes
 .../drawable-xxhdpi/me_icon_login_logout.png  | Bin 2274 -> 822 bytes
 .../drawable-xxhdpi/me_icon_my_profile.png    | Bin
 .../drawable-xxhdpi/me_icon_notifications.png | Bin
 .../res/drawable-xxhdpi/me_icon_support.png   | Bin 1415 -> 1953 bytes
 .../me_icon_account_settings.png              | Bin 0 -> 2793 bytes
 .../drawable-xxxhdpi/me_icon_login_logout.png | Bin 0 -> 1132 bytes
 .../drawable-xxxhdpi/me_icon_my_profile.png   | Bin 0 -> 1841 bytes
 .../me_icon_notifications.png                 | Bin 0 -> 1815 bytes
 .../res/drawable-xxxhdpi/me_icon_support.png  | Bin 0 -> 2662 bytes
 17 files changed, 0 insertions(+), 0 deletions(-)
 mode change 100755 => 100644 WordPress/src/main/res/drawable-hdpi/me_icon_my_profile.png
 mode change 100755 => 100644 WordPress/src/main/res/drawable-hdpi/me_icon_notifications.png
 mode change 100755 => 100644 WordPress/src/main/res/drawable-xhdpi/me_icon_my_profile.png
 mode change 100755 => 100644 WordPress/src/main/res/drawable-xhdpi/me_icon_notifications.png
 mode change 100755 => 100644 WordPress/src/main/res/drawable-xxhdpi/me_icon_my_profile.png
 mode change 100755 => 100644 WordPress/src/main/res/drawable-xxhdpi/me_icon_notifications.png
 create mode 100644 WordPress/src/main/res/drawable-xxxhdpi/me_icon_account_settings.png
 create mode 100644 WordPress/src/main/res/drawable-xxxhdpi/me_icon_login_logout.png
 create mode 100644 WordPress/src/main/res/drawable-xxxhdpi/me_icon_my_profile.png
 create mode 100644 WordPress/src/main/res/drawable-xxxhdpi/me_icon_notifications.png
 create mode 100644 WordPress/src/main/res/drawable-xxxhdpi/me_icon_support.png

diff --git a/WordPress/src/main/res/drawable-hdpi/me_icon_login_logout.png b/WordPress/src/main/res/drawable-hdpi/me_icon_login_logout.png
index 0a147a3e3f837782b50eb2a8392ff565a89c3db0..a36bba233e1d0b5451f2a212fac9a2764f249d7b 100644
GIT binary patch
delta 628
zcmV-)0*n2>37G|uFn<D5Nkl<ZSPAWyJxc>Y5QcXz@nRzi3W63|TUppAg5O|~Rt=IL
zpx8=;oZv?*`U6xXwibdSv52)Pw6V4^A}B<x4CdCEGb6{|ZL;ym*(7kx?c6(?Co_}X
zJ;vIfb_RlFfUCl{Pp&2n9vQQ_h^aIxzrlFPw!h9ZshMY$Mt|k^1=`8wbDZ-9RgjKf
z2v+8TO|36Y-0J8_W6%v*%uG-ioQreT!wj}Z^Xl5DEW|RAPY7`%7%R|N*BYE>Q7f4E
zol7^?1B5*TJ>bM6OlEP?(w&TSyQkL<5NF&ZpRV<kOgHc^I_vPPr%_x>fNUW)=^_B@
z@N(ERyY9Agd4G$1e%4bmKT)$jxy)O~=YvMHqX3OQ1ZB(u6q7ad9WBWaO-}aZJ@N`&
z`9NcAdR3-E0XkTn`z*axlJK{?Yy=ew5JKoeg$ASx6{x9IeL!VVSy*uIVJ#nrChtT|
zt*4wu4+KOjvg(VKexDtbph7K~643P^P=;{vbIqlF3xB7880@}lR5A?2xo~X?1f*Kr
z>XEJNU&ID_%`@08o&Isd;C-kibHU6KG-Zayp#kZ@gq9&)n9zXwyQ_V0wi=<b$Ymlw
z+CWY1p2&UgUNEuoH<st0;P{a+&5i<`B9H3*8CudqxX95(pjLYJu~PXMtp|hJmH-ii
zY^`*%EN%Pbv8QB);GeZ4HJXGw{c>=lF_fp$NFzV@0NJ8iG+4yZ!Rt^QpyG0n?ifyo
zMO`iFJSEGdrt`2HpOWCO7GD&Z&DNTY_t|%UrueT{>1KaGTi?!roPlp)N#Dgz>c+nS
O0000<MNUMnLSTZ112a_s

delta 1183
zcmV;Q1YrA_1-}W9Fn<JjNkl<ZSPAV{U1(fI6rOYM?Pi-4Y6B(y#0R0TDoAOy#M(8L
zDk!uitOkp|3I0%Mlb8lXQ6Jo`*r;eBuOivFRU3&EO0!w5ptP>EqL#K|(Fjeen4g-Y
zal7{(zgc_PnYnj=^Clg*%sJnjbMAL%&Y77j#En*Y2B`9IZGWT5kH)vNOHaf4w}`Xy
zwY~98)3td9t(+iKACgRGHn1x`Wx>Ud%e#x~5aH4KqLi$ylGvbBpibuh$jAsR#6t~6
zD!MJ3kVo945nvI~^g5Mg6RPulRn2S4p*KGNY7Na_+w3@WuD2_8wrW(vU?`VcG5gDG
z2a!GVVmx-*7=PB(sxy>KW!H<p^XJ&}Mhn;69}~mlyR-;Zlx#NZ%=|p}h3AS1x8R;i
zq$b|0<WiAP@{?@4C%hwqd94h>ENm7uP${4}cH$CmL(*^Zac1xNL@M)=ubX{YLh1BR
z5ijq3?2{=u@?1%-E|KLenpPnAdNMWMW#UpVOXz|-)qe{z8#N~qi;m;;Xjm1c|M9I^
zBJr7NhMi(?Xe`%k;-Q2R>D+2K^qR&((5}AtmT!W1WyEe>`=lW8t!jmhw0(Adu203J
z97>1^SDr)0tWk|g&^rU&orhJdR=IE6-3w$#yNKwj>H|`{WzwryC?Su$9jX!JEAoso
zu)5TJ@qdm<6vYA633}_vDL1BK0YYyNkGEkq)~iO4KU~g%>BowYGlW^f=~8M;q<wsV
z(2_;>sArROC9;l`Lg<pk^pA#+$ZNWy^mIS)J5u301(JKoovI!ngd_WA)u1Tbkskt>
z4>+7rzZ(9>{GrgE#TgAJahs|K2w^_kR0AnDuYYR0Y+}CNAMZR#7VpF|kIKZ4*v(J*
zV_`j(XiCLV&9|t!mf>;$UpTKVGB9gtdKEf-X{7P>hP`GKqI_y;ExHjesCr<AK<T1t
zAm#b|Lc57Isw1VfSeO9qeL+G@ljh4%o)4N>BYJVqA>OR{lF;54AasYl<rEzLQk_V6
zaeq~BR6g+s<8~=pHGk5JAV4S{Cl^&SraB?Wy@`>`BP!O2%pSjL`Z3$uITs)#9Z)qN
z1Rce@gNL&>nRu;wawPMDd03+=j}LUmepO?H5-Oh1LL5~M5p3PkRrk<=^w%pjyar|e
zaQ0!3#h__wJN7;k3nf%EvaEh=(FMa{D}R1-j=z=q@^%9+tIC;i$s5B5>01oZp|G0+
zs;+!P-aLzSKNzsUy$HWygBCR%?C<W-%2wLSYAPnM%o+1eB@IZNk4Ei{dv?TTrK+}y
zgruRo1Iuft>g3Dv$iNjM2OY-&T|(bd+-FeQfoi($gv;9W3TnEq=ZX8z`*GC1Dt{q)
z(C#0Zcp1C*E9RlA2C7NM%tWZ^v2tW&jH-nE7bQm~c7o9Rc!GzoZ&ayA&P1cuGhxf5
zy46fbI=y-H`xbZR&mR0Q@5Pd=Rs)rjWogT53QOQHpSlS70puUa1-=|Z!f!`_yMW&c
xf|xm8fPNA4K8fd;-1N+S#*cBM{}|uQz`qC{jkJrdEO!6^002ovPDHLkV1m*cReAsb

diff --git a/WordPress/src/main/res/drawable-hdpi/me_icon_my_profile.png b/WordPress/src/main/res/drawable-hdpi/me_icon_my_profile.png
old mode 100755
new mode 100644
diff --git a/WordPress/src/main/res/drawable-hdpi/me_icon_notifications.png b/WordPress/src/main/res/drawable-hdpi/me_icon_notifications.png
old mode 100755
new mode 100644
diff --git a/WordPress/src/main/res/drawable-hdpi/me_icon_support.png b/WordPress/src/main/res/drawable-hdpi/me_icon_support.png
index 0ee051e23eb05dddcd7c579dd15c7ea8e9525ade..7561db04dd1d0e5325a79e41656de2db61784f9e 100644
GIT binary patch
delta 922
zcmV;L17-Za2D}H5Fn<GfNkl<ZSPAV|O-L0{6h7yTKS7HiDJYZ(N{FJ38_Pu!XtasI
zFjNTKM<51)Db2$7f*>lRO^Y=AiLfZzRJ;~O*(zxpS{oIG7PZx<^G@f?do#|Rd2?qb
zo@L;L=RNoQesk`<XU+()J^r%{U{buMX{IXbn@$>l=K-jJ0DtxaApd005<6Vt^^67d
za(#CC6YJ*-vUq=E12Tt)cT`o@T|uN?K-?S4J<$&$yq#NH7&5!NSK`>j0yH?0ZA$^%
zLBP5=PW?Irw7_ZV>F;cL?w9%397j7aGyX2k+w<&C!H9RU6(8cuUTQ+>GQ?oAPZ05<
z#y+u#h@SR!wSRQ5As@fs2+a^b&0x8~NO<unzJpK-oRS%mGb1SuGb#t4Z{dYfXDR^5
zzD?D&v$4+%(L4cu2h7g{VGV;l%2_xV1zHYzZgsKVfBP!@hW6D4(B3BA{B<N4v#k7s
z{!6W&eLgTV_O=Z%HNyL|(<gJ6^1u>{8Mj;}6H11p=zmooZd#76Gh`9ukM(t)`RaA%
zr85)RZVvj$%L~w4r&i~t_j!w_k|C+Uj4?*hLj%aT!2vqbk6#~0qvA9_#2yRsBLiKn
zb9Uf0d<B&O2r7dMY#}CmbOZ{Z!t1~h>1RaX+mb!N=jDW>X%Nb5VnEhE(ORhi!x4qf
z#h5N2-+#5IhEU6(fU#_V;j%K7!<BoE+U^vbb!h#p##AySFG}T5={>npzA<;dy!dr>
za<bhL=FQPJhahF#cNH{*#Po_4Kzx1_p;s}C=F0nxD{qe@PmgBXd8Z!odY8k~&uUB`
zAiZgb^n=5Xb+a7h;>_iPle95>fJl0o`VDb3#eZ9TBt4!rMU&}s(H5!(AuW433LtjK
zfFKbdzV3~DGa9{4lhDPOu8HrK;fyQ!YlIq8$&j?2To-ziVBtgko)5v4*znUfb168L
z#9m^0^_2`s4-8z+y$VsZfVtk)V#?0}7G>kgIhGyMWdJCE<eeftut&bBq{Q;R$0V4t
zWq-nuhP<k}_Hx|zL$=9t%bLYUoME>gYl}mEUG^6o|FS_-w#<Phog5KloOQWp@m;E0
zlsF|bR0OcKntTRD@^w(oOo=bu7e`cviirZ)N*{_gDA{jm$SDuk64fdBlx7>T4LdXL
wQx^%{8S?AeYw5c;^PdeRgKjgoat3|_J`-6*@vZnk0RR9107*qoM6N<$g2^tu#{d8T

delta 795
zcmV+$1LXX?2fhZ7Fn<F0Nkl<ZSPAWx&1(}u6u{rxO&bx!D2Srs#e+~hv{Dg@CA5tq
zB7z5N>cxZp1NEzoSHZ@JEqM0hAeh=qMerarX)1!3Qay;Cyy&5LsTzg4v^&rDw#l+7
zv+JfwG>6P#cjkTm_RZ|f0JK`G0<~2Dz3vm!voXt}I4bB+NPkhUZX<nz&>{mqM58!2
ze5UVvm>4cl=4t+<t>_^T?F{2sl?~!o1iUyp)c@jdeh$!`$=QQ8+4DqDb5;BjB7$Y2
z*?le9_ukJ&<c2(KrEWD6Msi4e$s_%s<^Tc0;UJ^B=|bd*NHQYYRkx%8fxLOrPjb%*
zA!ZmfK5{PctbgpbR-y9fU%rvHa3y+`4b$mt?q)gl{{t!$@S7`lgQ0pv)D%Dt2g2EA
z0+PS5qp5%psNDrZM3O<HTSXp1?Q(I1O!KMHFcROJhkyC~-ke0dmvbvoQr@d<Tz@Uk
zy{T6_c+u?9<#B+b=H?VD7j*`8lr5I>z_MC7<rmihx_>;_v(%1lN4RD${S0f7OI(RB
zd2VN4?^X)#`o(jO4pCkiihtqPiS*R`Rug`8tlAVcNOdZp37xaEKoPI<+%M?#B8!-4
zMcU|N`7Y$#w|-lXc{OcY@59hV$7j7_bg=se%if4QGnFS;)&78rm*Az5WdEb}{(j@k
zWbU}NtbZO5&|aMlA-xm1TOpm1k4zZ`GR%Mjlb)POBH;m@Emt?nUoIP77hnGN>1;}}
zBAT1-OTSv63Yf8MewdUR=dbq7<*#vFiiQanMh1_5t`?{QCX=1%RiIAuU8>-QmJVSj
z1I8+3o&isF!5I?%lxdR6lwm~974>hthT`_BDu1v=1&qH3z*u&!3t?r3&!+7<yVUta
zV9wIUsB?8?p<%=$H57kK(3apzEV&V?=mZ1tCD^-w!^W)zDzJQfapLV};|H&9`f8f8
zT41D_QYi!R7%$atVXGTFWnrTP*j-N!ESLr)!a_A1NLZ_d3i!VIs`&UgRNsiLXiZRo
ZKNK=R4E|GOPzC@1002ovPDHLkV1nraiVFY$

diff --git a/WordPress/src/main/res/drawable-xhdpi/me_icon_login_logout.png b/WordPress/src/main/res/drawable-xhdpi/me_icon_login_logout.png
index 3a5d1cf6667dd9ebf189621837f75fe6e0750d35..4373360d75fc1d9b47e27b868ac62d1ccbf2d62b 100644
GIT binary patch
delta 572
zcmV-C0>k~j3*iKiFn<CYNkl<ZXa((A!Ab)$5KWfqRq!VG4<5ZLSSx-)D}F}ND!3l3
z;%A7~KM+bqyz0$=5WERq)o$EZ8d#Q0nru@$g#?x?vy++kCbLO)M~K*B1Y!hY1m+n5
zX>*?5KCCY%OV>h)Eh*)iP1p6AQtCrU@%)|rw9|wAch_;09)C$-4E{|Dxk?S5My`bV
z%t>raOCq5_Ao8;U51+6-nq3Njqnspwv~jdiT`ho*8s)v5^T*8{GTkT}Ci!LWQE7SE
zhnD;F^bGh|nWJtb5IXo5cY_p{t6lOPa5dnoXM2|bJdyGYHuHON(yFJE?6XOsZf|g;
z!2>kzU1ov}fqzU5pM+3f#fZC*U_;=vwf8zy!(CqzYzQFoAfbM<h7So=1VEy5*m&_F
z!H$4036=zWNCe*pif0`FnME6~PNRJyIDuIJHrdo9*rt#Pv`MzG1Tv-0anuN&LbkJx
zDS|dx_olxoYe_%<ep@N(Y4DJ-odFl{Yzer6XGy>ZJbya^zTjCAr~;l90Z~h~ZL1By
zni`u`sMD-pVR_Ubi%X@Jnfl=SfXPWwRz52g_YG`J_!dTU`5uPezY~B{TXO}jZLmop
z4am1&cmiY!;Xi)y-(@*>eIsSkAJqy>4?JY_4CF-!4?ERV1Na~bpn`%TL^WiSM~w>{
z?a7*U4K<PgDkrF*<c{t`OtppqTd*0TI-_mIK1Lu$AVy$*5%>eZH26pq{al>@0000<
KMNUMnLSTaaeg5VE

delta 1440
zcmV;R1z-B%1ilN9Fn<MjNkl<ZXa((9U1%It6uxI>l8Qd4h&C}Q#X?_v5CkiwnsztA
zhe9hQx@jU+A4;ASDJ9tm>VpXBCbd={L_ts#H`y(%DE^SzHT9?3R1k_5#Q#Pcn-{fE
zTC<&*<2jR^u$et~c4l|_w(~MG-#O>I=eu+7x%ZAzt*g}oO@H+OG!-2ZTr8e$|HV1?
zoI-rWa|3v5t=aKxCUZwQBrLYciX9O#pptxc*&Q)U7{87#V+lMM32?|1e$Q81C9K-s
z!1I+8pj4-jkAw+s(V;6TAbJ)}c(w#I(Rqo4#;!sW#bX;B#~D_rZcv8$_@33qzEmn@
zH<Jw_LatC6LVp*wDNyGPQys`=dQL{+j5UOElck-uZGTA(ZbyaP=;GLkbI$8g8Vd6v
z-hJq*SCzsov~CQbgJ10}l(vS&__oLba)qNQO8N~7Tp5Gv(TT&yZ}JJ_-Y2F{T|>S8
zWOW>(GO2T>a>dg6YFv6=nT+H?*#2Uv3mrAZ#F7iT_J6e!9tCqR{C&O1i|T6EQ6G#?
zmDYyw)D<u@Gh;2<co3D+^fLS~+}HhcSR-M!Y+ve61@OJ-gLtFs;+vwa0@f99V!?fk
zd^gA>@DEs41^`H3;}@9LAc?pjF%a>+V^gJvBpYL)0(e6Ph|fsDpy0A;!q(Burtc(s
z9E>@@fPV)`gjmg}d&Xb>=%-Z@XQ+VR+=X2<K5vr(m4U+}{psVPtpRYfKRs=L+AW1r
z)mwA%{Fz;nEmQyn4oN}OQ?sKxdS4Q4O@P!Puh4KjB~hS)ehJqK@G1}Donnw?SV_Kd
zFiPH~p}9wlLELyCe{^-wrWH_j)Rv$#zf&WpvwwrVpGdYOu<Ss(L_EI=T*f8Ccp!*t
z1<+O@9d!2I0X`J*1VQSg!xA01?#3Xl7ohN#pfkTyMK~hi0`^x#tj3Kdv;2htx`NJH
z0SM3$bmsRq6V6C@4Mu0+NLY;%)ppC66JXjVsTu*=-6+-nPHA<bV(cAkr3R`oKEQit
zV1NG@Svk~K`{<sXwzjj1CSmZRKM>Ic&=;V+n<ODfE5BF%KJWoPu|qski3+x+9YVCV
zoew(m`+u%=vxFy!S(i|AcCO7yD}bbm0?J^^D|3PhbZtmEX$8>eIV<I4IL`eNo+PGg
zL&`}j01WkoloTzMHH(Sl*9@j>L&`}jV1HFx`}?$@)Xrj5>vEHy_B4}VSnOC~rk57c
zbwMA_g>wqxS^>NJx@jT8*<b*_Q+XQagScdC24hZIZF4dQ&MxJ&(yA5Uxgq3Nx-Y#^
zLwC_vcwDkIgE1#_iyWF<LIvDzb-YHO?stih`hWjezLb`1jbO~hoKh_3z`01aP=5iu
z7y%ehOM$e=Su}<YB_V=2n2R~3wm1jfZ~0IGOg7TLIZq3q_>+m|!gaJZPVdc^o@iuF
za16&XhsPyk&uw!Kg2{s-O~e-_KfAT8>~E-tY7P`WF@5H5sj-pDe%^<*cdlfWVjz!s
zjs#d}SJvHo1~&bnBZ?$|gO`3O+J7^&n23k#<px0gXrOw}HO(XKXw6+^*z;`TEeNl$
zyhwR<UMQ8z9P|L77ERMi4QDogU5y8yBMaa_{=GrF)VJ%32(}XQos*}6y7Q?WJqPQB
z#uC6}{3UG1c{gl0)oV1=PQ%7B&F%Gi-sh-0iG4@^&cr+}brak7Yvj(H%zqs<d2S>2
z7w{9~3Nl_eHi+mxPtR+7ypcQCc`lV+#gn!#A*2lp@HzR9*~Ne7hG-Fbn8?<%Fy9t-
zr=)2rsgtzZdWRP&U7Zi(U|Xcd>XG>N7Y}{jxp=v}jsErDM-#D&5~RZqR1QEmPmRs<
umY8>yyfKsZHa=JD-s*u?4;e)3f&T%4>GE#>1>{ix0000<MNUMnLSTY{UAB(^

diff --git a/WordPress/src/main/res/drawable-xhdpi/me_icon_my_profile.png b/WordPress/src/main/res/drawable-xhdpi/me_icon_my_profile.png
old mode 100755
new mode 100644
diff --git a/WordPress/src/main/res/drawable-xhdpi/me_icon_notifications.png b/WordPress/src/main/res/drawable-xhdpi/me_icon_notifications.png
old mode 100755
new mode 100644
diff --git a/WordPress/src/main/res/drawable-xhdpi/me_icon_support.png b/WordPress/src/main/res/drawable-xhdpi/me_icon_support.png
index ef3af62083bf3c1f0b24e808ca66744d3318bf6a..3bb07bd24f07162a3ce76520c1d6a15c646969bd 100644
GIT binary patch
delta 1298
zcmV+t1?~Ey2C)i|Fn<K=Nkl<ZXa((A-EUMy6rb7M-n9veZ4|Hx(E#BIAB-e^MBk`<
zgeWzoM3z)cObjR*KN3?2aI3NF10N5diBA<u_o0Hs#As;y7Z@N$dE(2rmV#*sS!2Ar
z?eTY(-p$>axp(h$w{8u+$?lyqb3T4&&Y8J$&lO_vTAYCgdw&LGz1;u&+n-h^9p^Pc
z^sJPkjf7|uLgL34jls|ukr)$FUYhp29}e!`a^wD3ZT~en;GVv)tSKqqlTvm_A=lYJ
zAwgG&=zL+CPP*M2Z`;TQdFSMS`_<5r^rI~wla!x8!IGdt+cqMVmqbVYxjS{#eYY!b
zD{t*U-{8pWNPmN`A-LSuSQI}TnLzsO-JfayK8jBrOQ;<Yw9F2U97ejFtv7hK$vRm#
z+qh3gAPEe`iol1*hMJcxZ#@Mo+XJ%m*Cg@X?TN`ZkAKwlcQqraY77{ckFRJwjeBPd
z-ukd$qA+2sYX^SFuJEgB3L&J25T^eQypI)5ux+0VyMITf5HDEHO9)5ug(<H?KXzK`
zj9S>Cz<8^4T3WAzp{~1)ty8=^c~g^X!nWAZHNg8kj9G(+!MqeSG(+?oNxC`X(al66
z(JWH($pne#@xXfr@q9S0BRqk#Sb9w|#t85e)=4FAU@-PW3Zec3M}^}BQ8?x9+H%ii
zjQg^KKYzB6Oy}UprZ670pC`pDPOmmSv5kw^NhbE$fM<hPE8_=twV#Lr&wM?ZtyA7i
zVFw((&UBoMvG9?_#A|c_A>L+UuG0777iTVPR(U@CW@M?_$4(*w=hXfv8WYrE8rM>Y
zPn9Xhi9I_(r8uBn9RIWM(u&s9b{KpcW6$9J2!B%RvUhFr1=sEJeE#gf@EanT$oX`f
zd(rdOsHa$M5toj{akLqDFstj^9&4IFLRHSX6l?RVmNr48>;S;G7*s@d&0;$iWHO`>
ztq(HTw=2OTDgaIIAL-usSA{MTu@`Y!4(}S}_H09o0CMUHm1)j2(KR^Gbs+P~uR$Hz
zfq&6WSZ7;<eR10SqNMU^4q(e_(-wv*6@v!wtDcvC&V8%nZjiliVE9#$5NFV5ZHBQ0
zb#YsB0D3hhRVWTk)8b$dyxZUZP}*7fC18ILN8Ze%V>38l7Pajy6pOzEWt{ZNVbCuJ
z`)u11VO3>Ji+D_BniHKamR}Fu{-2*hzJJsNo-yEPGOl9LA^=0|z*?2jmQIW2JK5Z*
ztym=gEVc?BEdr&|M+M8mAxzjb2e@vta3Cv44A?XWxag#aEf~^-&A1o$<wkzTv0z;-
z$a{8fsL+k|pzR<w`mq6B*}t>>X;nsx05jmIdtPO1G#!S?=m3}dFkR(su;Ji=g?}-b
za2OrnHy<wdnFJcq$5>2nV~j<64)_4MR*9GTJxFBh_hQyjYtH*PkO>nWu=uokH%5S&
zN>u>VD$%TI@u>zaX{=q^8&;8EU7-%}V5uHM)XVLLT(BKg6JksiTU`i9*_Rs~0%K>$
z`22LEKH8JnP<v?+=;+R^$!_G)*?;*#s%vFiT-;^b`e<cOoCx?5TwXtfqsC!$*vR?v
zaqgV+y*-)s&%j(2JS(&Y@_+uoQJO(sR9vgXOu3k%njdy09ni%(t1Z|P0Oij*0zvsw
z2@+L2#BrPL*@@3Kd^~8#N4}sFe!EehS$+G9_r)1_P-oy@lD4p|tFy7u01E&B07*qo
IM6N<$g4M%>H~;_u

delta 767
zcmV<b0s#H73Zn*)Fn<EwNkl<ZXa((9zi-n(6uv8^z{E-=q?VBlHWpBuR7gx6IzSL&
zgoyzOiS{pOgDSD2E=UN`LdnoQi7O;Vlm)TUPR+kSXzuZzbLX6$*g4x5J4UvY+^=`<
zec!vg=X++Xd`b_L9w<GKrw4e@H~{ea=hia@d>zMbWBXcA#(!p;bKXUL9me74^~35O
zwjqvwAAz@xZ;O9=e?KDVN*pD&WD$J((!#|jFE{R;nd+QVg5>!;!4nR0oW$UBtim|1
zyr4R-+`Ri7fW1)d9LpQufBimde*N&n1cSE%a?hL0nZC^6{2AF962Jp%G$R`!V=VIu
z&$OeBvSU&Pv48CBx9Cuhja2#ynCQ+$h6v&B0SNZ4e$Z}Gv{XO}K|q0}5{dXCRpAII
z67I_u8-*l5BvjNaE&&-e3rj#ns=^X*w-NsRKLq5pRuRj!)Umwz;zVBO^%dykirR17
z!y<%;yjBbeU_#;7kz-580$@f!W<%{9VY{X&sUa*w9DlqztdG{b6~Ku=*$^oh70afF
zY)cGoTDf!3eo9w|DC;Ac4^EhgoVea_u0yZ?6O*i~VFb1wukjHAVZzkE{i!)I;YKf>
z%rCH&R~yySC|yxw68s^8zY`{hcDkFj>Y}%W!UW^=+W_xwn}O#;!AneTr1BD)I6%kA
zCIwG%o_|6m7yK4*SOXy<_q=CYMk*@=g5cjf&gE`b9O32tzGpC`(m(IJBfxNXPTZga
zC1?*LRb_AUk%g;78t@^UBD)E^9;s5TKvv+<j`sDg;`@4+I0^;9N4iZ8?lxLW=RJ0e
zp?Z0eJcY<fGBlnj3MBzg#wfH>h^6_|w(-O!ka!fl0&AN@ECOl4PlH4(0%_l{iU5_i
zR>J6@=!R|AxA&c82I3fB0!zB?sUBk8P}=%dZS{olxfRCvX%bzrwonoSCUeq|m<a+z
xGAW6fA&`cI$tq_m;~wlxEtbYg4;0q}{{S+kK2JN>>P7$n002ovPDHLkV1h}*Zan}1

diff --git a/WordPress/src/main/res/drawable-xxhdpi/me_icon_login_logout.png b/WordPress/src/main/res/drawable-xxhdpi/me_icon_login_logout.png
index 6efd45d4a9388b3af4de3953a92cc764eb549909..f174c9119e32d06a96daa9cb053a42590216cf97 100644
GIT binary patch
delta 787
zcmV+u1MK|b5w-@9Fn<E@Nkl<ZcmeI(KXcPC6aa9^$z2z|07Dm6zC_72z}%6x3$Qao
z%25u|&g{U_mXR4qFZ4^WvM}%ky7aDzc+W(4#*r<_ey+{)^WsF3rKewB{O@d~WDx-o
z5CIVo0TB=Z5fA}~fOeFX73rhX*;AFMCratNu<@<3#*}qNseenQ%n!9xA71Q@-$UO}
z)cg_*G(GupI~fd5A*50BVR=WGFBjK)ll_Oky)A1tNCLOl9m2toN2_>(f8fA*t~Cn+
zO8-{f$eip1Myt58W#pfOfd1}t$j7eVVY)A@-%VK$VL-4$F6*Sdy5{2=hD@&LX!ZQj
zcH{d18{hG#^MAFYR#9Ab8;W&c22l+4fA%3jp5IM?`V92uWVYp*zqgug22Iaqhr@yX
zj%%+%NrRxHkn0G7ect3ztYi*rRfv*k{mND>jd?xU9Ut27F>7`il*d5~#HyM}tbnFx
z-=1YNCz~l%kyrtlEAv?y^D_&R{agi!70|)s2fr3q%YQ9OBvwF}E!0TtfT)pJ0#PEd
z1)@S?4Mc&&9;hx-FM#SG1>I4^0jQUv>pSXkV*6X2Oe%Zr)|(89fy$n7x0XRM0k_fC
zW|Cx(M_+&nfb2aa0dfFY9IR?>AJoR($hRNAZVon*3#IiPhf7+N#leE!WKb2H-T+m_
z=><?79Dnveb#Yh&QQ)uzqQYSbM2W)=h#H3-klxTcF(-it;9FRoC{A|ozr!<O*QE1j
z$gVc7GFCu1LA=qGN2-d0{k3*2hJ(i}MRy=w*K~*k4=bb(E!4rm_}FETMMtFTg}G;M
zo!au)HCrHrc)35mhy}^FXAP8}Y?bc<<WUnK4}Vb5Q4Ah&zjQs-UUX#fj7e6FaglXa
z&{1Fp!HaC2T$+z73<%!x>!i;O#1-@yFyLtTJDtON)FG%joFr~TJn&CzZVAgE2m)V$
zgfQmKg%Z_s`bs8j(I^f^6q-Rc`rf_NYbP#i5fA|p5CIVo0TB=Z5%@>o4^~52ED8>8
RtqcGF002ovPDHLkV1k2TaYX<C

delta 2250
zcmV;*2sQV%2I3KrFn<V~Nkl<ZcmeHPYm5{{5bmB?xI;nZ5j^CNsECTMs8LKr+&e^r
zpn_pJ_+d1}M0^I+V=?Lv{c(GX(F7HR#7O+X9;>`W@Wt&4sGyNVjW42v7=uFMfdmxx
zxS6tQkG;&zO;6X%zAkY$A=6z|U61d2x~pqC2vPgh5U3$gLw}%p2*~Q0?r%Af{`zdg
zJ~r91tqG=K?zN3!JL9qIj`o+V9A&@&lw6ycZrkuC05lZBmr@=y47s3XZsXPht<ui{
z0Z?L1W}=Yx9sp7220%)Y6JT5$pWpa{n^%dxQ3)ej8xmgd0*A)s>B!gWD3ic|00>{J
zNq+I^_<m!H<$nzbfG~(Lnm}}X&G7K-fdWwY2+BON29O5e8bCFGGze(ewHc%VD5Bv9
zVkg@>rrAQw5Fo}%A-|Cl*0eM??F*!&2;mnuXGeAaW6u#FuSGS7gaIGL=QiyqLZv84
zCjC<Siy>XsiPe~|#QHcR<#7b*fq3)O_C9o1r*+LXaDS2db(hYc>g#K3Dtn6*cFK8F
zAtiWRS#xfKvEcq_^khG!3_{Vb*vidcpMl`K-wzxz4lopK`Bv+?ofj~C2`%#K`Y%Tc
zu-<ip)8hinKlG=yarxF?`W<6928#yh@bRNGa~jpgpkCy1PpJ9DbB^VXKZ;sLsx;yB
zyzQT(zkj`(PJ^kEQPGP6DAAr-jI(5pN_l~f2hPh1?Q%RNz~x%KAZF~hGi_Qqmq2KM
zlBsQzaprIhmba!O<q20@o?R@bJdsRg=Xx>~#83deyl%%BTgWud9_}vqiNbzK$T&kY
zTtyaGtJ+eZoyV0A1<=W^u2o(OqQdB|8yd`&3V&Wn$m5L0w{g4L$y9b0K<+iBtOyKH
zTYGjA<~cKX2ISB6b%XDTMx)(4`EXLPn6&ClF%OfL-#HpUz}?CAEGve<00G#~bDY4x
z=%KoZn7ZhmoBw3V7b&zj)^s2u&FT2MvDQ1=wy;PCzPS~-6bPWx3-hhISkOreRX3B<
zI)B+x@}Fvseh<RD8)s6NPA_i#S0~dQcj@E;0c3$>l|DflOP9`zeyTHG4u0M)h^INa
zZCftZ$*}=i)}F;&1E%N{VsgJ{X>;Q;y<GVuE{u$M1z+)BwH5#-zm(2i<R`}lsN1%i
z{S*~=rYWB*w5#=u#U^&)8SF`p{am+wpMRem8z3QB8T0OHe#3GG8gFjggcXGyPMT+1
zikY7D(?k|P`NRsu#eRy2C#6x<SIh06G{kB*&E3as?22XUKOgO;7y2xKq&PLXFhKdl
zonxpWKUVUqz&La8(D(4K=9`1jRu8$ZsLDMSK(?^2Qz<CWaXN2*I2Ju#=nsVFBY(4R
z=)@VaUFVA};7XMY3n1LR#;X(*=pf_=g?5OiE}7Kvl_t@zElOrD11{}tx*AM?r0-Tp
zI!%y2xpcF;IQzcz6UH5Bw;$h+XBhT=KR)p=X;e-CCP3<9RIl-fIM~|`+>p;;_MP(@
zmZyV!){DoXnGn%t^HRVFl`bAY0Dr?&3LNy%0MX42!!Tykbr**|Twm$>i!r;Hn;jMd
zAT07L<KqD&MZME;ulD(3^kFYLmzK|;%(E}Si&K=BJehxDzu3HLoH_h2tq&5;P|5HL
zULgO)H&ux;DL-I#QcXDYVoEwr-zIw>oAj?Fzx~#cQCda$_`Ic9GYIP^+JEi)q}9!?
z(s{d59;$72>2HQeIHt1B0tnXv?dyYu^8pDE&o6nTD1dMu{6(dpK$n)du+SbzPnKUk
z@v&wQ*4_5%g2rt04xLOj_#D6d;$s11g7{V!9432HUfz&BM<-WFKKVm_>1_JN#{x)1
zjI7QGF64u9Ct<oyu9AH6hkyLi+VqK!1yD;YdJr>O?NI`qc~I+2B?Z7<s53`#QG6;n
z7C=3NjSVU#y>u*Lwxu$6_V%mTAV2Vob(7u&|G3xyNmIP7HztG)&>H5F07o}hhU}9c
z9C=+_Y=D-;8fhonr8f$f?X$9v>E+5N(PJMt7bbR{j!Wqb8z9nPn13Rv)YOLoNu1(M
zeMlAR^w<TKpPYEG;Ku(^c@nR@e2147@Dq^kCy&%cjO!Q2qWaG-I#o<QeZs-76kp-F
zakzGfl;2}v|4KY1;8Laj1)4#m4D*V(TAh;v!@Ihzt-9|{&Jo45$qw0LfrEx94jnk;
zPauG3Kzv@~7F52G+JCwq{%OY3U$oq>8|f!IWKZW4@yUORgCiRlpuEyZ-Q)P|<QSm8
zD5m=#wx%+RO1-<0KGIA2xig3S9wZ~|O(f77<OHN`?Y1a>+x|GfB`O>)f5dGyj#qOx
zJ9UL=C)Re%1WP0k7|w3hV*)<`83s&SGIwg0Ycn)JWFXPrv40S3Siv>cD~FezaGJkS
zS1-3Nnic)Km#%5h*(!gW!3-H+Cq@$3SD`fIL-FRO*ZWfadqn|6suQV>6}Y=;Q+h8q
z5TsLhJlSsGry0C|x(}rMquz}CG1eN{Nfk;e!cjekN)~h~NBJqNvz3=IAy(jB>xaEr
zYHHB{WwY7H?tg>UW~>?At~OI;juanGYA|Ppx#<>ek#@vOM#(sCnSrLRLq%De<X2d5
z$g!elkTbgcngn8bu!Y;Hp@eN*knyDcSkN`c?LkQaBIWtr%@XfmQ+e~<?L-;+op_9x
z6J)ni`B3yL=2lEj$w>V*l#ID~mFSaQvR?{t$lsFBAb%$aiB#qe+;tMXvzv2dh&G<B
z5S%zSL*`m2D?sD~9dPM3scnfC?B2+AEP&iDI+eG?nl^FHRsr<pMavG5)1kI>W&&ov
z_hMOX7XF6;$}1<%F<$MS@~^Rhie0*Tj@S4gw2A`cbS#<9Hi&LJYDsYw791wv%RU}w
z+X%d|FhdM)TMWT_JtuJb9m831n7+%=r<wfM2Q0Ar)sUSwYV8^VH3Vu1)DWm4@c%~O
YKe6uAf*)s%6aWAK07*qoM6N<$f|*lR2LJ#7

diff --git a/WordPress/src/main/res/drawable-xxhdpi/me_icon_my_profile.png b/WordPress/src/main/res/drawable-xxhdpi/me_icon_my_profile.png
old mode 100755
new mode 100644
diff --git a/WordPress/src/main/res/drawable-xxhdpi/me_icon_notifications.png b/WordPress/src/main/res/drawable-xxhdpi/me_icon_notifications.png
old mode 100755
new mode 100644
diff --git a/WordPress/src/main/res/drawable-xxhdpi/me_icon_support.png b/WordPress/src/main/res/drawable-xxhdpi/me_icon_support.png
index 9e2584ab363ed1ea991d27bcc6965cd18dd2f7ef..58482a5d6a2040aa7dec866e5f551328e90638c3 100644
GIT binary patch
delta 1926
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
M07*qoM6N<$g1h0F`Tzg`

delta 1384
zcmV-u1(*7v4~GkoFn<L>Nkl<ZcmeI2UuYaf7{KS-yQU3!h#=B5ih{+WP@ydqq*Rk!
ze9%%cK6nj%5DP8zsc0=Gc@QfI$u(9=@I`$P1e>#hC}Ob>mqRMniV(z7!9KMVQqZWO
zt-W0CcKUsLH^<K1?(N<FyW8z7Bs25Pd^6woySbTfW{)xTD1QQqfFhs>C<2OrBA^H;
z0u}_oLMDl(Pv=qqFv=L;juqQE=L1rM4j0h28)(8JW3Y&}<)-$JF8FDZEufh*zxK1z
ze{-C%SN$9?=)TaQ&sg%lBa`W!D}Ib+2`H1zKh1UhOV0R1ehd<JAHd)`Xxb|i<0C(N
z9lHTgW#+70ihn8`0fZp2WdByLGf5L2)>7kZ70sDb^8qu)2aLX$Wp47)459@YyUw}k
zsC#u_)XTyx&7jI|)xEB|vCOMa5}@i<?#7NT)-l2p*Y?!`VifDd?eXMO(oCb<f<Uuv
zZu3??Wlk?lai*s!xWs-Jdy>7MA5HK2$7+oF8D!Naet$CHJs1FQ!=3H`{>`nH{=anM
zi-kQ_j^3Mq8cA#_m-X*v=5rt8jFXs1g+{%5OM-9?A*46VUMoOm8b%)8%Vd9eLWmV0
zL86xO4LUD<B#H`<AYn>@@m(LB`Kgyg3Xlnm$a2mSYwXUG3XmXTk#fBffvXv00f$7u
z!MHh9fPZWN39$ksNZ6zbkPR3imH`1Pii+5z7Cz~WCtCGS0tB30ZdEZV?W}!*2b}EJ
zah;|%5}@kw-$^%O^~RNkWHWlcQ4%yM)B&OwaIt$De8NDmcGhz8Rsuv9N2svmq!gk0
zrK(RglTT!GoAGM-@tVLPBLSjYwM0TY=%5psYJc*j{-#i8@KQStNPtN3t$nGp_$J_!
zb~@?Cw&Vl(Vz!MApm^tV)GTw#Hvl4qiSg87Opf8AU2y84`|1swk5zq;%v&oJUT2&?
zC<z@3mVl7HKDGb3lbV*?!2r$!u(Crx9j`WQL|e&bvYmV|8<m;Q@8rPWHp^PcOK&ym
z6@MnihyFm>votm7_)jNXI>d<>!D!FfFfMvS^}4N;(WzC=;1srXJyQYr5@@ivj`jYI
z>&+djaWnHj4surb26r#xj>oD^y-ee<O0uSagi>|jU$9Jn(vz9by`yvH0uX)`G#H!O
zmpUhP=yTy@_WYJ2FMNwH>j&HE8n5n+pnuu&E7nd&?%F~D5->IyFr1le?u9kIcoE@j
zY1>Y%$B3U=nn7)M-c%uYIJ4RO))FsI<C3tqsVVlA%aiHd*Qh#VK>ov-J@;E5|M%|!
z+?@t7#u>ud@?x3mPhl$ka>brSV-2op?+a;&fb8K+XLASfP)RTC+IFh6{Fm?rQ-6G4
zN>4SZ6x#lO;ZZF$E3`ra6bu~UgkLFsI=9zp>t9Q!p%&JJut-M(4nn?waCW>o{>-0d
z-~rE|NWfX9HHW@d=9wcP1qjF<&WB%Jy#H45<{<vi@?DI0g)O!z{sLndgS=te1`ZV(
zz;USwhoTYZ;8renE2-X8aJJ6W*ncWp2^9Hpxy~Mr+^)6K+}SJZZ?9ba8W-Q^ThowR
z;nBmjp8>2v{=y+wkL-DDwXgq?G2FPnmt7CO<TD`u;Rpnsg5)Eh;NWx;l23qwhtnxY
zo&n+2M<@qR0f^EtziyrZ_4Pk|D(F+W8IH(@1<5lYGE^8Hc1mLp3?yF0Jz+esJ0;J6
z!iG{m-hq*k!p2RBv7jJD9uNTw5>hMx1qmrOfP#V)D?mX&iX9-oA;l7q-;k)k*gl`;
q^BZF8oN`PNPy`eKML-c~O5iTKi@U_K&|bIz0000<MNUMnLSTY&aG<;Z

diff --git a/WordPress/src/main/res/drawable-xxxhdpi/me_icon_account_settings.png b/WordPress/src/main/res/drawable-xxxhdpi/me_icon_account_settings.png
new file mode 100644
index 0000000000000000000000000000000000000000..c84ce34e0a537a8447d3e4124df139e3478ba234
GIT binary patch
literal 2793
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

literal 0
HcmV?d00001

diff --git a/WordPress/src/main/res/drawable-xxxhdpi/me_icon_login_logout.png b/WordPress/src/main/res/drawable-xxxhdpi/me_icon_login_logout.png
new file mode 100644
index 0000000000000000000000000000000000000000..90489dd5ba6e6379cdb8cfe83391fa6001d8c7dd
GIT binary patch
literal 1132
zcmeAS@N?(olHy`uVBq!ia0vp^2_VeD1|%QND7OGojKx9jP7LeL$-HD>U{UjQaSW+o
zd^>l)pNON(@pL~X-qsHcWl=MKFon5<$T@KN^c*{N<ECckI@Vh^1*LjBJ4JplxEO})
zW9T%y^^;)^E3f#D!usR6n<CTx|0%08-dtW|u6XC%xik6CKHt14`>juU>4ruIjs|Qf
zMuh3s*2U8E_r+Z|-h2Gii`!nSwKH2kuPgPMX6_}cx%i(}?!K9mAGUvGFR$~u_C6{+
zo6&QVv2}In$GJhzI<M_|ertlj(_Ta8rC+W+IR9|7N~CN{N2K`TsSHi_<++9CYim~O
zIk@+~m;Y}U^RlTWEdAZhnf4n$yqpsu^<DAT&x3M|i?jbNy?1a)OxY=p%TG_t;mbd=
zPkn<s!`%XPSv${#c0FqRsclS4H?#JnSvN{Ox8*r|M=8IC@nwi{(d?&($`|Mx-??|?
z?C1IG?<U<3-;w*^N&W7>wts^U?7RB)Xq=bXRC}hB$MHXIDJXo>WMC8!nCbB3g9Mmv
z{vbX7yU?%92~+2?DlcG@Y<!>jx2vwkBjNnb)z7Y8nZE9?Y{22|p9<LQ=VxY|dHwbG
zX-~VePfgt%IBlhCPHEW+DI8E*z*9FZG>C~MCFJ=2`#JAzl@7E%Dc&6<q_Ci&?85u{
zz+-<jRHDmORU8}`b3c`Qeeol{UUdo!hX%)jyAweA6_x-wf&yMlEFl~mii}KIEI+0(
zF!Hkem;xkOe@tRv<YBZ^abO5;*uuh*q396A^t;$m_x9~w5qE#{uhs4gDERZn<LQ0>
z0~{PWi+(WhGcj>5D5&I|yPw7Nfv`$SndKo4j;7r<94u2df2>leE|zE7le8^--ofRI
z1rpMq=$i7+Zz}nxcIWANN!8ibpNpr9mtFo}zU$_Z2tm842RSmF&P{S>vSW!jVCFfg
ziJ#FoL;RD+q4ox*JG){te+UG)+mzp7ui-esxUT9Yw;fAJpuGHNPI-_g+V~konVb%^
zHwZB<eBj*R>frH1WZ&oWO*%b$)XwVZ-0|LjX4%)xvU!g`=&W#fbM)3H_o|FA54-Kz
z)f>w6f}2@5HaINu*A4NU(B!{R@qkjpq*E#$hn8Ce*YmIV9TRx<H?NA~-~N*qmrHO=
zGpSi6tlXdxl5^AJ1LOQdet$VuB;5WX;F&RJ=1f8522LL<YZedT)NAaFJ_(m@Dmu*4
z*lfp<z%=>Xxp}M?zkggFZxpi2&Ef8z=v~ZuUjyS~PI*sx+RqThlNhy)?@Oz`LTqPJ
z)Q`)nq&EIOB<66sVa{3?!QC(OKCa|fZ@&CJZ|jcfY1|gS_toxwDrZ&3TlM<s;obX_
zwm0cENcm)MShD|HviUv5fB$yy^M#%e$yIH*7Prteq9<_n<PuA%wX-H}+o}Ef_=H0x
tZZEebN@|<eY49>BFknLkg&cp_-|~OyT-bGZF0lAu@O1TaS?83{1OQCH>k$9|

literal 0
HcmV?d00001

diff --git a/WordPress/src/main/res/drawable-xxxhdpi/me_icon_my_profile.png b/WordPress/src/main/res/drawable-xxxhdpi/me_icon_my_profile.png
new file mode 100644
index 0000000000000000000000000000000000000000..48b7f24887f3c31932c6f5b850a4ea05c6c728a5
GIT binary patch
literal 1841
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
bMzB@#ZPh|QPVKCpG7vEP#oDA4<s9`7FsEo!

literal 0
HcmV?d00001

diff --git a/WordPress/src/main/res/drawable-xxxhdpi/me_icon_notifications.png b/WordPress/src/main/res/drawable-xxxhdpi/me_icon_notifications.png
new file mode 100644
index 0000000000000000000000000000000000000000..b41a3ccc8c2c3b6dc7a14923d768dd885f9aac5d
GIT binary patch
literal 1815
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
FV1k`TQ6~TZ

literal 0
HcmV?d00001

diff --git a/WordPress/src/main/res/drawable-xxxhdpi/me_icon_support.png b/WordPress/src/main/res/drawable-xxxhdpi/me_icon_support.png
new file mode 100644
index 0000000000000000000000000000000000000000..665b8f0f0e80c18b3ebb1c00d85730359532f839
GIT binary patch
literal 2662
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
UnsbdruK)l507*qoM6N<$g0uz|oB#j-

literal 0
HcmV?d00001


From ba913a0a688d43e0906ea75ee4933a24dbd9eb79 Mon Sep 17 00:00:00 2001
From: Oguz Kocer <oguz.kocer@automattic.com>
Date: Fri, 18 Dec 2015 19:35:52 +0200
Subject: [PATCH 45/48] Display name field defaults to username

---
 .../wordpress/android/ui/prefs/MyProfileActivity.java    | 9 +++++++--
 WordPress/src/main/res/values/strings.xml                | 1 +
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/WordPress/src/main/java/org/wordpress/android/ui/prefs/MyProfileActivity.java b/WordPress/src/main/java/org/wordpress/android/ui/prefs/MyProfileActivity.java
index 86c359aea513..9b642f8a2cb4 100644
--- a/WordPress/src/main/java/org/wordpress/android/ui/prefs/MyProfileActivity.java
+++ b/WordPress/src/main/java/org/wordpress/android/ui/prefs/MyProfileActivity.java
@@ -50,7 +50,7 @@ public void onCreate(Bundle savedInstanceState) {
 
         findViewById(R.id.first_name_row).setOnClickListener(createOnClickListener(getString(R.string.first_name), null, mFirstName));
         findViewById(R.id.last_name_row).setOnClickListener(createOnClickListener(getString(R.string.last_name), null, mLastName));
-        findViewById(R.id.display_name_row).setOnClickListener(createOnClickListener(getString(R.string.public_display_name), null, mDisplayName));
+        findViewById(R.id.display_name_row).setOnClickListener(createOnClickListener(getString(R.string.public_display_name), getString(R.string.public_display_name_hint), mDisplayName));
         findViewById(R.id.about_me_row).setOnClickListener(createOnClickListener(getString(R.string.about_me), getString(R.string.about_me_hint), mAboutMe));
     }
 
@@ -98,7 +98,12 @@ private void updateMyProfileForLabel(TextView textView) {
     private void updateLabel(WPTextView textView, String text) {
         textView.setText(text);
         if (TextUtils.isEmpty(text)) {
-            textView.setVisibility(View.GONE);
+            if (textView == mDisplayName) {
+                Account account = AccountHelper.getDefaultAccount();
+                mDisplayName.setText(account.getUserName());
+            } else {
+                textView.setVisibility(View.GONE);
+            }
         }
         else {
             textView.setVisibility(View.VISIBLE);
diff --git a/WordPress/src/main/res/values/strings.xml b/WordPress/src/main/res/values/strings.xml
index 77c3261ce158..d34f5b56aa0b 100644
--- a/WordPress/src/main/res/values/strings.xml
+++ b/WordPress/src/main/res/values/strings.xml
@@ -1115,6 +1115,7 @@
     <string name="first_name">First name</string>
     <string name="last_name">Last name</string>
     <string name="public_display_name">Public display name</string>
+    <string name="public_display_name_hint">Display name will default to your username if it is not set</string>
     <string name="about_me">About me</string>
     <string name="about_me_hint">A few words about you…</string>
 

From b974355a9ac2bccf212f98237ec6929e7fbf7e55 Mon Sep 17 00:00:00 2001
From: Oguz Kocer <oguz.kocer@automattic.com>
Date: Fri, 18 Dec 2015 20:10:05 +0200
Subject: [PATCH 46/48] My profile view is wrapped inside of a ScrollView

---
 .../main/res/layout/my_profile_activity.xml   | 103 +++++++++---------
 1 file changed, 54 insertions(+), 49 deletions(-)

diff --git a/WordPress/src/main/res/layout/my_profile_activity.xml b/WordPress/src/main/res/layout/my_profile_activity.xml
index fac966df5d66..97458ab00e38 100644
--- a/WordPress/src/main/res/layout/my_profile_activity.xml
+++ b/WordPress/src/main/res/layout/my_profile_activity.xml
@@ -1,73 +1,78 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:orientation="vertical">
+    android:layout_height="wrap_content">
 
     <LinearLayout
-        android:id="@+id/first_name_row"
-        style="@style/MyProfileRow"
-        android:layout_marginTop="@dimen/margin_medium">
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:orientation="vertical">
 
-        <org.wordpress.android.widgets.WPTextView
-            style="@style/MyProfileLabel"
-            android:text="@string/first_name" />
+        <LinearLayout
+            android:id="@+id/first_name_row"
+            style="@style/MyProfileRow"
+            android:layout_marginTop="@dimen/margin_medium">
 
-        <org.wordpress.android.widgets.WPTextView
-            android:id="@+id/first_name"
-            android:text="@string/first_name"
-            style="@style/MyProfileText" />
+            <org.wordpress.android.widgets.WPTextView
+                style="@style/MyProfileLabel"
+                android:text="@string/first_name" />
 
-    </LinearLayout>
+            <org.wordpress.android.widgets.WPTextView
+                android:id="@+id/first_name"
+                android:text="@string/first_name"
+                style="@style/MyProfileText" />
 
-    <View style="@style/MyProfileDividerView" />
+        </LinearLayout>
 
-    <LinearLayout
-        android:id="@+id/last_name_row"
-        style="@style/MyProfileRow">
+        <View style="@style/MyProfileDividerView" />
 
-        <org.wordpress.android.widgets.WPTextView
-            style="@style/MyProfileLabel"
-            android:text="@string/last_name" />
+        <LinearLayout
+            android:id="@+id/last_name_row"
+            style="@style/MyProfileRow">
 
-        <org.wordpress.android.widgets.WPTextView
-            android:id="@+id/last_name"
-            style="@style/MyProfileText" />
+            <org.wordpress.android.widgets.WPTextView
+                style="@style/MyProfileLabel"
+                android:text="@string/last_name" />
 
-    </LinearLayout>
+            <org.wordpress.android.widgets.WPTextView
+                android:id="@+id/last_name"
+                style="@style/MyProfileText" />
 
-    <View style="@style/MyProfileDividerView" />
+        </LinearLayout>
 
-    <LinearLayout
-        android:id="@+id/display_name_row"
-        style="@style/MyProfileRow">
+        <View style="@style/MyProfileDividerView" />
 
-        <org.wordpress.android.widgets.WPTextView
-            style="@style/MyProfileLabel"
-            android:text="@string/public_display_name" />
+        <LinearLayout
+            android:id="@+id/display_name_row"
+            style="@style/MyProfileRow">
 
-        <org.wordpress.android.widgets.WPTextView
-            android:id="@+id/display_name"
-            style="@style/MyProfileText" />
+            <org.wordpress.android.widgets.WPTextView
+                style="@style/MyProfileLabel"
+                android:text="@string/public_display_name" />
 
-    </LinearLayout>
+            <org.wordpress.android.widgets.WPTextView
+                android:id="@+id/display_name"
+                style="@style/MyProfileText" />
 
-    <View style="@style/MyProfileDividerView" />
+        </LinearLayout>
 
-    <LinearLayout
-        android:id="@+id/about_me_row"
-        style="@style/MyProfileRow">
+        <View style="@style/MyProfileDividerView" />
 
-        <org.wordpress.android.widgets.WPTextView
-            style="@style/MyProfileLabel"
-            android:text="@string/about_me" />
+        <LinearLayout
+            android:id="@+id/about_me_row"
+            style="@style/MyProfileRow">
 
-        <org.wordpress.android.widgets.WPTextView
-            android:id="@+id/about_me"
-            style="@style/MyProfileText" />
+            <org.wordpress.android.widgets.WPTextView
+                style="@style/MyProfileLabel"
+                android:text="@string/about_me" />
 
-    </LinearLayout>
+            <org.wordpress.android.widgets.WPTextView
+                android:id="@+id/about_me"
+                style="@style/MyProfileText" />
 
-    <View style="@style/MyProfileDividerView" />
+        </LinearLayout>
 
-</LinearLayout>
\ No newline at end of file
+        <View style="@style/MyProfileDividerView" />
+
+    </LinearLayout>
+</ScrollView>
\ No newline at end of file

From 5a02a148fa3bf5215df34a632ddf91c719494082 Mon Sep 17 00:00:00 2001
From: Oguz Kocer <oguz.kocer@automattic.com>
Date: Fri, 18 Dec 2015 20:19:49 +0200
Subject: [PATCH 47/48] xxxhdpi icons for /me moved to future folder

---
 .../drawable-xxxhdpi/me_icon_account_settings.png   | Bin
 .../res/drawable-xxxhdpi/me_icon_login_logout.png   | Bin
 .../res/drawable-xxxhdpi/me_icon_my_profile.png     | Bin
 .../res/drawable-xxxhdpi/me_icon_notifications.png  | Bin
 .../res/drawable-xxxhdpi/me_icon_support.png        | Bin
 5 files changed, 0 insertions(+), 0 deletions(-)
 rename WordPress/src/{main => future}/res/drawable-xxxhdpi/me_icon_account_settings.png (100%)
 rename WordPress/src/{main => future}/res/drawable-xxxhdpi/me_icon_login_logout.png (100%)
 rename WordPress/src/{main => future}/res/drawable-xxxhdpi/me_icon_my_profile.png (100%)
 rename WordPress/src/{main => future}/res/drawable-xxxhdpi/me_icon_notifications.png (100%)
 rename WordPress/src/{main => future}/res/drawable-xxxhdpi/me_icon_support.png (100%)

diff --git a/WordPress/src/main/res/drawable-xxxhdpi/me_icon_account_settings.png b/WordPress/src/future/res/drawable-xxxhdpi/me_icon_account_settings.png
similarity index 100%
rename from WordPress/src/main/res/drawable-xxxhdpi/me_icon_account_settings.png
rename to WordPress/src/future/res/drawable-xxxhdpi/me_icon_account_settings.png
diff --git a/WordPress/src/main/res/drawable-xxxhdpi/me_icon_login_logout.png b/WordPress/src/future/res/drawable-xxxhdpi/me_icon_login_logout.png
similarity index 100%
rename from WordPress/src/main/res/drawable-xxxhdpi/me_icon_login_logout.png
rename to WordPress/src/future/res/drawable-xxxhdpi/me_icon_login_logout.png
diff --git a/WordPress/src/main/res/drawable-xxxhdpi/me_icon_my_profile.png b/WordPress/src/future/res/drawable-xxxhdpi/me_icon_my_profile.png
similarity index 100%
rename from WordPress/src/main/res/drawable-xxxhdpi/me_icon_my_profile.png
rename to WordPress/src/future/res/drawable-xxxhdpi/me_icon_my_profile.png
diff --git a/WordPress/src/main/res/drawable-xxxhdpi/me_icon_notifications.png b/WordPress/src/future/res/drawable-xxxhdpi/me_icon_notifications.png
similarity index 100%
rename from WordPress/src/main/res/drawable-xxxhdpi/me_icon_notifications.png
rename to WordPress/src/future/res/drawable-xxxhdpi/me_icon_notifications.png
diff --git a/WordPress/src/main/res/drawable-xxxhdpi/me_icon_support.png b/WordPress/src/future/res/drawable-xxxhdpi/me_icon_support.png
similarity index 100%
rename from WordPress/src/main/res/drawable-xxxhdpi/me_icon_support.png
rename to WordPress/src/future/res/drawable-xxxhdpi/me_icon_support.png

From a7a51ac4e75d22b311003146808da1fd76fd2b23 Mon Sep 17 00:00:00 2001
From: Oguz Kocer <oguz.kocer@automattic.com>
Date: Mon, 21 Dec 2015 18:25:02 +0200
Subject: [PATCH 48/48] Account.RestParam enum refactored to use constructors

---
 .../org/wordpress/android/models/Account.java | 26 ++++++++-----------
 1 file changed, 11 insertions(+), 15 deletions(-)

diff --git a/WordPress/src/main/java/org/wordpress/android/models/Account.java b/WordPress/src/main/java/org/wordpress/android/models/Account.java
index e8678de8cebd..24b72ce92997 100644
--- a/WordPress/src/main/java/org/wordpress/android/models/Account.java
+++ b/WordPress/src/main/java/org/wordpress/android/models/Account.java
@@ -95,23 +95,19 @@ public void save() {
     }
 
     public enum RestParam {
-        FIRST_NAME,
-        LAST_NAME,
-        DISPLAY_NAME,
-        ABOUT_ME;
+        FIRST_NAME("first_name"),
+        LAST_NAME("last_name"),
+        DISPLAY_NAME("display_name"),
+        ABOUT_ME("description");
+
+        private String description;
+
+        RestParam(String description) {
+            this.description = description;
+        }
 
         public static String toString(RestParam param) {
-            switch (param) {
-                case FIRST_NAME:
-                    return "first_name";
-                case LAST_NAME:
-                    return "last_name";
-                case DISPLAY_NAME:
-                    return "display_name";
-                case ABOUT_ME:
-                    return "description";
-            }
-            return "";
+            return param.description;
         }
     }
 }