diff --git a/WordPress/src/jetpack/res/drawable/ic_logo.xml b/WordPress/src/jetpack/res/drawable/ic_logo.xml
new file mode 100644
index 000000000000..4d7225822e2c
--- /dev/null
+++ b/WordPress/src/jetpack/res/drawable/ic_logo.xml
@@ -0,0 +1,15 @@
+
+
+
+
+
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/prefs/MyProfileFragment.java b/WordPress/src/main/java/org/wordpress/android/ui/prefs/MyProfileFragment.java
index e9b9b1dd5181..ac4654cbd53e 100644
--- a/WordPress/src/main/java/org/wordpress/android/ui/prefs/MyProfileFragment.java
+++ b/WordPress/src/main/java/org/wordpress/android/ui/prefs/MyProfileFragment.java
@@ -5,6 +5,7 @@
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
+import android.widget.Button;
import android.widget.TextView;
import androidx.annotation.Nullable;
@@ -22,6 +23,7 @@
import org.wordpress.android.fluxc.store.AccountStore;
import org.wordpress.android.fluxc.store.AccountStore.OnAccountChanged;
import org.wordpress.android.fluxc.store.AccountStore.PushAccountSettingsPayload;
+import org.wordpress.android.ui.ActivityLauncher;
import org.wordpress.android.ui.TextInputDialogFragment;
import org.wordpress.android.util.NetworkUtils;
import org.wordpress.android.util.ToastUtils;
@@ -37,6 +39,7 @@ public class MyProfileFragment extends Fragment implements TextInputDialogFragme
private WPTextView mLastName;
private WPTextView mDisplayName;
private WPTextView mAboutMe;
+ private Button mLearMoreAtGravatar;
@Inject Dispatcher mDispatcher;
@Inject AccountStore mAccountStore;
@@ -44,6 +47,7 @@ public class MyProfileFragment extends Fragment implements TextInputDialogFragme
private static final String TRACK_PROPERTY_FIELD_NAME = "field_name";
private static final String TRACK_PROPERTY_PAGE = "page";
private static final String TRACK_PROPERTY_PAGE_MY_PROFILE = "my_profile";
+ private static final String GRAVATAR_URL = "https://www.gravatar.com";
public static MyProfileFragment newInstance() {
return new MyProfileFragment();
@@ -85,6 +89,7 @@ public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle sa
mLastName = rootView.findViewById(R.id.last_name);
mDisplayName = rootView.findViewById(R.id.display_name);
mAboutMe = rootView.findViewById(R.id.about_me);
+ mLearMoreAtGravatar = rootView.findViewById(R.id.learn_more_at_gravatar);
rootView.findViewById(R.id.first_name_row).setOnClickListener(
createOnClickListener(
@@ -110,6 +115,7 @@ public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle sa
getString(R.string.about_me_hint),
mAboutMe,
true));
+ mLearMoreAtGravatar.setOnClickListener(v -> ActivityLauncher.openUrlExternal(getActivity(), GRAVATAR_URL));
return rootView;
}
diff --git a/WordPress/src/main/res/drawable/bg_wordpress_gravatar_info.xml b/WordPress/src/main/res/drawable/bg_wordpress_gravatar_info.xml
new file mode 100644
index 000000000000..3d6c96044319
--- /dev/null
+++ b/WordPress/src/main/res/drawable/bg_wordpress_gravatar_info.xml
@@ -0,0 +1,7 @@
+
+
+
+
+
+
diff --git a/WordPress/src/main/res/drawable/ic_logo_gravatar.xml b/WordPress/src/main/res/drawable/ic_logo_gravatar.xml
new file mode 100644
index 000000000000..57ea54c36b70
--- /dev/null
+++ b/WordPress/src/main/res/drawable/ic_logo_gravatar.xml
@@ -0,0 +1,14 @@
+
+
+
+
diff --git a/WordPress/src/main/res/layout/my_profile_fragment.xml b/WordPress/src/main/res/layout/my_profile_fragment.xml
index c18f9810d3c1..c9a1955f8264 100644
--- a/WordPress/src/main/res/layout/my_profile_fragment.xml
+++ b/WordPress/src/main/res/layout/my_profile_fragment.xml
@@ -1,79 +1,135 @@
-
+ android:layout_height="match_parent">
-
+ app:layout_constraintEnd_toEndOf="parent"
+ app:layout_constraintStart_toStartOf="parent"
+ app:layout_constraintTop_toTopOf="parent">
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:orientation="vertical">
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
+
+
+
+
-
+
-
+
+
+
+
+
+
+
+
+
+
+
+
-
+
+
+
-
+
diff --git a/WordPress/src/main/res/values/dimens.xml b/WordPress/src/main/res/values/dimens.xml
index 80496b1f890f..b3c131621c03 100644
--- a/WordPress/src/main/res/values/dimens.xml
+++ b/WordPress/src/main/res/values/dimens.xml
@@ -763,4 +763,8 @@
4dp
24dp
4dp
+
+
+ 30dp
+ -10dp
diff --git a/WordPress/src/main/res/values/strings.xml b/WordPress/src/main/res/values/strings.xml
index f7531852e2c6..f3887828dd20 100644
--- a/WordPress/src/main/res/values/strings.xml
+++ b/WordPress/src/main/res/values/strings.xml
@@ -2869,6 +2869,8 @@
You have active premium upgrades on your site. Please cancel your upgrades prior to deleting your site.
Show purchases
Checking purchases
+ "Gravatar keeps your profile information safe and up to date, automatically syncing any updates made here with your Gravatar profile."
+ Learn more on Gravatar.com
Account Settings
diff --git a/WordPress/src/wordpress/res/drawable-night/ic_logo.xml b/WordPress/src/wordpress/res/drawable-night/ic_logo.xml
new file mode 100644
index 000000000000..a69d5abb5312
--- /dev/null
+++ b/WordPress/src/wordpress/res/drawable-night/ic_logo.xml
@@ -0,0 +1,15 @@
+
+
+
+
diff --git a/WordPress/src/wordpress/res/drawable/ic_logo.xml b/WordPress/src/wordpress/res/drawable/ic_logo.xml
new file mode 100644
index 000000000000..c7770d87517e
--- /dev/null
+++ b/WordPress/src/wordpress/res/drawable/ic_logo.xml
@@ -0,0 +1,15 @@
+
+
+
+