From 6c50eec550809926ddfc2c37a609a1810da985ec Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?He=CC=81ctor=20Abraham?= Date: Mon, 12 Feb 2024 16:56:46 +0100 Subject: [PATCH 1/7] Added Gravatar message in "My profile" Showing the card with the Gravatar info in the My Profile fragment. The card should contain a link to the Gravartar.com website. Design differs between light and dark modes. --- .../src/jetpack/res/drawable/ic_logo.xml | 15 ++ .../android/ui/prefs/MyProfileFragment.java | 6 + .../drawable/bg_wordpress_gravatar_info.xml | 7 + .../main/res/drawable/ic_logo_gravatar.xml | 14 ++ .../main/res/layout/my_profile_fragment.xml | 156 ++++++++++++------ WordPress/src/main/res/values/dimens.xml | 4 + WordPress/src/main/res/values/strings.xml | 2 + .../wordpress/res/drawable-night/ic_logo.xml | 15 ++ .../src/wordpress/res/drawable/ic_logo.xml | 15 ++ 9 files changed, 184 insertions(+), 50 deletions(-) create mode 100644 WordPress/src/jetpack/res/drawable/ic_logo.xml create mode 100644 WordPress/src/main/res/drawable/bg_wordpress_gravatar_info.xml create mode 100644 WordPress/src/main/res/drawable/ic_logo_gravatar.xml create mode 100644 WordPress/src/wordpress/res/drawable-night/ic_logo.xml create mode 100644 WordPress/src/wordpress/res/drawable/ic_logo.xml 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 @@ + + + + From 68441f1bb0fc5a8d3f10bdefb221f339d9ea90c1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?He=CC=81ctor=20Abraham?= Date: Mon, 12 Feb 2024 17:39:08 +0100 Subject: [PATCH 2/7] Added Gravatar Sync Info When the user updates any of the fields, we need some time until the change is propagated to Gravatar. We want to inform the user about that. Also, the user can dismiss that notification with a done button. --- .../android/ui/prefs/MyProfileFragment.java | 6 +++ .../main/res/layout/my_profile_fragment.xml | 48 ++++++++++++++++++- WordPress/src/main/res/values/strings.xml | 2 + 3 files changed, 54 insertions(+), 2 deletions(-) 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 ac4654cbd53e..01ded25760d5 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 @@ -40,6 +40,8 @@ public class MyProfileFragment extends Fragment implements TextInputDialogFragme private WPTextView mDisplayName; private WPTextView mAboutMe; private Button mLearMoreAtGravatar; + private Button mGravatarSyncButton; + private View mGravatarSyncContainer; @Inject Dispatcher mDispatcher; @Inject AccountStore mAccountStore; @@ -90,6 +92,8 @@ public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle sa mDisplayName = rootView.findViewById(R.id.display_name); mAboutMe = rootView.findViewById(R.id.about_me); mLearMoreAtGravatar = rootView.findViewById(R.id.learn_more_at_gravatar); + mGravatarSyncButton = rootView.findViewById(R.id.gravatar_sync_button); + mGravatarSyncContainer = rootView.findViewById(R.id.gravatar_sync_container); rootView.findViewById(R.id.first_name_row).setOnClickListener( createOnClickListener( @@ -116,6 +120,7 @@ public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle sa mAboutMe, true)); mLearMoreAtGravatar.setOnClickListener(v -> ActivityLauncher.openUrlExternal(getActivity(), GRAVATAR_URL)); + mGravatarSyncButton.setOnClickListener(v -> mGravatarSyncContainer.setVisibility(View.GONE)); return rootView; } @@ -180,6 +185,7 @@ private void updateMyProfileForLabel(TextView textView) { payload.params.put(restParamForTextView(textView), textView.getText().toString()); mDispatcher.dispatch(AccountActionBuilder.newPushSettingsAction(payload)); trackSettingsDidChange(restParamForTextView(textView)); + mGravatarSyncContainer.setVisibility(View.VISIBLE); } private void trackSettingsDidChange(String fieldName) { diff --git a/WordPress/src/main/res/layout/my_profile_fragment.xml b/WordPress/src/main/res/layout/my_profile_fragment.xml index c9a1955f8264..e9f62391db70 100644 --- a/WordPress/src/main/res/layout/my_profile_fragment.xml +++ b/WordPress/src/main/res/layout/my_profile_fragment.xml @@ -1,8 +1,10 @@ + android:layout_height="match_parent" + android:animateLayoutChanges="true"> @@ -132,4 +135,45 @@ app:icon="@drawable/ic_external_white_24dp" /> + + + + + + + + diff --git a/WordPress/src/main/res/values/strings.xml b/WordPress/src/main/res/values/strings.xml index f3887828dd20..94489959c095 100644 --- a/WordPress/src/main/res/values/strings.xml +++ b/WordPress/src/main/res/values/strings.xml @@ -2871,6 +2871,8 @@ 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 + Updates might take some time to sync with your Gravatar profile. + Done Account Settings From 512697e2dcf31392a9b7717c6ba022421eac220a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?He=CC=81ctor=20Abraham?= Date: Wed, 14 Feb 2024 09:35:15 +0100 Subject: [PATCH 3/7] Remove unnecessary quotes in string --- WordPress/src/main/res/values/strings.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/WordPress/src/main/res/values/strings.xml b/WordPress/src/main/res/values/strings.xml index 94489959c095..7f51471a4dd7 100644 --- a/WordPress/src/main/res/values/strings.xml +++ b/WordPress/src/main/res/values/strings.xml @@ -2869,7 +2869,7 @@ 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." + 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 Updates might take some time to sync with your Gravatar profile. Done From 6b2cc45e8d6d9c81fad9d163d26db9501571e91c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?He=CC=81ctor=20Abraham?= Date: Wed, 14 Feb 2024 11:44:43 +0100 Subject: [PATCH 4/7] Fixing profile fields list constraint in MyProfileFragment The list height was wrap_content, so when the space was limited with the new Gravatar view, the list was unusable. It kept behind the Gravatar view. This was visible, for example, in landscape or with a bigger text size. Adding the constraint to the top of the Gravatar view should minimize the issue. There are still some corners case where the UX can be improved. --- WordPress/src/main/res/layout/my_profile_fragment.xml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/WordPress/src/main/res/layout/my_profile_fragment.xml b/WordPress/src/main/res/layout/my_profile_fragment.xml index e9f62391db70..191a0038fc57 100644 --- a/WordPress/src/main/res/layout/my_profile_fragment.xml +++ b/WordPress/src/main/res/layout/my_profile_fragment.xml @@ -9,7 +9,9 @@ From e33f86581e85d0e66ae4140d8a0ffcd921d8c599 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?He=CC=81ctor=20Abraham?= Date: Fri, 16 Feb 2024 11:07:06 +0100 Subject: [PATCH 5/7] Move Gravatar info banner from "MyProfileFragment" to "MeFragment" After reviewing with designers, we want to show the informative banner on the first screen as users can modify their avatar in the "Profile" fragment. The sync information banner will be shown in both fragments, MyProfile and MeFragment, after any modification on the Gravatar profile. The sync banner is reused, so we've extracted it to a separate XML layout. This commit mainly moves the logic and view from the MeFragment to the MyProfile one. --- .../drawable-night/ic_logo_plus_gravatar.xml | 28 ++++++ .../src/jetpack/res/drawable/ic_logo.xml | 15 ---- .../res/drawable/ic_logo_plus_gravatar.xml | 28 ++++++ .../wordpress/android/ui/main/MeFragment.kt | 8 ++ .../android/ui/prefs/MyProfileFragment.java | 5 -- .../drawable/bg_wordpress_gravatar_info.xml | 2 +- .../bg_wordpress_gravatar_sync_info.xml | 7 ++ .../main/res/drawable/ic_logo_gravatar.xml | 14 --- .../res/layout/gravatar_sync_info_banner.xml | 40 +++++++++ WordPress/src/main/res/layout/me_fragment.xml | 71 ++++++++++++++- .../main/res/layout/my_profile_fragment.xml | 86 +------------------ .../src/main/res/values-night/colors.xml | 4 + .../src/main/res/values-night/styles.xml | 3 + WordPress/src/main/res/values/attrs.xml | 4 + WordPress/src/main/res/values/colors.xml | 4 + WordPress/src/main/res/values/dimens.xml | 3 - WordPress/src/main/res/values/strings.xml | 5 +- WordPress/src/main/res/values/styles.xml | 3 + .../wordpress/res/drawable-night/ic_logo.xml | 15 ---- .../drawable-night/ic_logo_plus_gravatar.xml | 24 ++++++ .../src/wordpress/res/drawable/ic_logo.xml | 15 ---- .../res/drawable/ic_logo_plus_gravatar.xml | 24 ++++++ 22 files changed, 255 insertions(+), 153 deletions(-) create mode 100644 WordPress/src/jetpack/res/drawable-night/ic_logo_plus_gravatar.xml delete mode 100644 WordPress/src/jetpack/res/drawable/ic_logo.xml create mode 100644 WordPress/src/jetpack/res/drawable/ic_logo_plus_gravatar.xml create mode 100644 WordPress/src/main/res/drawable/bg_wordpress_gravatar_sync_info.xml delete mode 100644 WordPress/src/main/res/drawable/ic_logo_gravatar.xml create mode 100644 WordPress/src/main/res/layout/gravatar_sync_info_banner.xml delete mode 100644 WordPress/src/wordpress/res/drawable-night/ic_logo.xml create mode 100644 WordPress/src/wordpress/res/drawable-night/ic_logo_plus_gravatar.xml delete mode 100644 WordPress/src/wordpress/res/drawable/ic_logo.xml create mode 100644 WordPress/src/wordpress/res/drawable/ic_logo_plus_gravatar.xml diff --git a/WordPress/src/jetpack/res/drawable-night/ic_logo_plus_gravatar.xml b/WordPress/src/jetpack/res/drawable-night/ic_logo_plus_gravatar.xml new file mode 100644 index 000000000000..466aaf0e0ff3 --- /dev/null +++ b/WordPress/src/jetpack/res/drawable-night/ic_logo_plus_gravatar.xml @@ -0,0 +1,28 @@ + + + + + + + + diff --git a/WordPress/src/jetpack/res/drawable/ic_logo.xml b/WordPress/src/jetpack/res/drawable/ic_logo.xml deleted file mode 100644 index 4d7225822e2c..000000000000 --- a/WordPress/src/jetpack/res/drawable/ic_logo.xml +++ /dev/null @@ -1,15 +0,0 @@ - - - - - diff --git a/WordPress/src/jetpack/res/drawable/ic_logo_plus_gravatar.xml b/WordPress/src/jetpack/res/drawable/ic_logo_plus_gravatar.xml new file mode 100644 index 000000000000..d7d7e4bac4ac --- /dev/null +++ b/WordPress/src/jetpack/res/drawable/ic_logo_plus_gravatar.xml @@ -0,0 +1,28 @@ + + + + + + + + diff --git a/WordPress/src/main/java/org/wordpress/android/ui/main/MeFragment.kt b/WordPress/src/main/java/org/wordpress/android/ui/main/MeFragment.kt index 0528ccae8684..347e700f21d3 100644 --- a/WordPress/src/main/java/org/wordpress/android/ui/main/MeFragment.kt +++ b/WordPress/src/main/java/org/wordpress/android/ui/main/MeFragment.kt @@ -200,6 +200,12 @@ class MeFragment : Fragment(R.layout.me_fragment), OnScrollToTopListener { rowSupport.setOnClickListener { ActivityLauncher.viewHelp(requireContext(), ME_SCREEN_HELP, viewModel.getSite(), null) } + learnMoreAtGravatar.setOnClickListener { + ActivityLauncher.openUrlExternal(activity, GRAVATAR_URL) + } + gravatarSyncView.gravatarSyncButton.setOnClickListener { + gravatarSyncView.gravatarSyncContainer.visibility = View.GONE + } if (BuildConfig.IS_JETPACK_APP) meAboutIcon.setImageResource(R.drawable.ic_jetpack_logo_white_24dp) @@ -691,6 +697,7 @@ class MeFragment : Fragment(R.layout.me_fragment), OnScrollToTopListener { if (event.success) { AnalyticsTracker.track(ME_GRAVATAR_UPLOADED) binding?.loadAvatar(event.filePath) + binding?.gravatarSyncView?.gravatarSyncContainer?.visibility = View.VISIBLE } else { ToastUtils.showToast( activity, @@ -709,6 +716,7 @@ class MeFragment : Fragment(R.layout.me_fragment), OnScrollToTopListener { companion object { private const val IS_DISCONNECTING = "IS_DISCONNECTING" private const val IS_UPDATING_GRAVATAR = "IS_UPDATING_GRAVATAR" + private const val GRAVATAR_URL = "https://www.gravatar.com"; fun newInstance(): MeFragment { return MeFragment() } 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 01ded25760d5..d880322609a2 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 @@ -23,7 +23,6 @@ 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; @@ -39,7 +38,6 @@ public class MyProfileFragment extends Fragment implements TextInputDialogFragme private WPTextView mLastName; private WPTextView mDisplayName; private WPTextView mAboutMe; - private Button mLearMoreAtGravatar; private Button mGravatarSyncButton; private View mGravatarSyncContainer; @@ -49,7 +47,6 @@ 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(); @@ -91,7 +88,6 @@ 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); mGravatarSyncButton = rootView.findViewById(R.id.gravatar_sync_button); mGravatarSyncContainer = rootView.findViewById(R.id.gravatar_sync_container); @@ -119,7 +115,6 @@ 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)); mGravatarSyncButton.setOnClickListener(v -> mGravatarSyncContainer.setVisibility(View.GONE)); 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 index 3d6c96044319..f9b6826d3195 100644 --- a/WordPress/src/main/res/drawable/bg_wordpress_gravatar_info.xml +++ b/WordPress/src/main/res/drawable/bg_wordpress_gravatar_info.xml @@ -1,7 +1,7 @@ - + diff --git a/WordPress/src/main/res/drawable/bg_wordpress_gravatar_sync_info.xml b/WordPress/src/main/res/drawable/bg_wordpress_gravatar_sync_info.xml new file mode 100644 index 000000000000..0920b9a9a1af --- /dev/null +++ b/WordPress/src/main/res/drawable/bg_wordpress_gravatar_sync_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 deleted file mode 100644 index 57ea54c36b70..000000000000 --- a/WordPress/src/main/res/drawable/ic_logo_gravatar.xml +++ /dev/null @@ -1,14 +0,0 @@ - - - - diff --git a/WordPress/src/main/res/layout/gravatar_sync_info_banner.xml b/WordPress/src/main/res/layout/gravatar_sync_info_banner.xml new file mode 100644 index 000000000000..4a3d104edd90 --- /dev/null +++ b/WordPress/src/main/res/layout/gravatar_sync_info_banner.xml @@ -0,0 +1,40 @@ + + + + + + + + diff --git a/WordPress/src/main/res/layout/me_fragment.xml b/WordPress/src/main/res/layout/me_fragment.xml index 0661d0dc88b1..d7adbad671d2 100644 --- a/WordPress/src/main/res/layout/me_fragment.xml +++ b/WordPress/src/main/res/layout/me_fragment.xml @@ -238,7 +238,7 @@ android:id="@+id/me_design_system_settings" style="@style/MeListRowTextView" android:text="@string/preference_design_system" /> - + + + + + + + + + + + + + + + + + diff --git a/WordPress/src/main/res/layout/my_profile_fragment.xml b/WordPress/src/main/res/layout/my_profile_fragment.xml index 191a0038fc57..5cf6c337bf60 100644 --- a/WordPress/src/main/res/layout/my_profile_fragment.xml +++ b/WordPress/src/main/res/layout/my_profile_fragment.xml @@ -11,7 +11,7 @@ android:layout_width="match_parent" android:layout_height="0dp" android:layout_marginBottom="@dimen/margin_small" - app:layout_constraintBottom_toTopOf="@+id/gravatar_info_container" + app:layout_constraintBottom_toTopOf="@+id/gravatar_sync_container" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="parent"> @@ -90,92 +90,14 @@ - - - - - - - - - - - - - - - - - - - - - + tools:visibility="visible" /> diff --git a/WordPress/src/main/res/values-night/colors.xml b/WordPress/src/main/res/values-night/colors.xml index 4fed9a9fe846..ff2b633e7bde 100644 --- a/WordPress/src/main/res/values-night/colors.xml +++ b/WordPress/src/main/res/values-night/colors.xml @@ -115,4 +115,8 @@ @color/black @color/white + + #1C1C1E + #2C2C2E + diff --git a/WordPress/src/main/res/values-night/styles.xml b/WordPress/src/main/res/values-night/styles.xml index 686c482b8cf9..54e8280b64c1 100644 --- a/WordPress/src/main/res/values-night/styles.xml +++ b/WordPress/src/main/res/values-night/styles.xml @@ -30,6 +30,9 @@ @color/background_dark_elevated ?attr/colorSurface + @color/gravatar_info_banner + @color/gravatar_sync_info_banner + @color/material_on_surface_emphasis_medium ?attr/colorPrimary @color/on_surface_emphasis_lowest_disabled diff --git a/WordPress/src/main/res/values/attrs.xml b/WordPress/src/main/res/values/attrs.xml index c6eec240f04c..4c496caa5e9c 100644 --- a/WordPress/src/main/res/values/attrs.xml +++ b/WordPress/src/main/res/values/attrs.xml @@ -22,6 +22,10 @@ + + + + diff --git a/WordPress/src/main/res/values/colors.xml b/WordPress/src/main/res/values/colors.xml index 808a85d7e5d7..dabb3e1b6711 100644 --- a/WordPress/src/main/res/values/colors.xml +++ b/WordPress/src/main/res/values/colors.xml @@ -150,4 +150,8 @@ #DEDEDE + + #FAFAFA + #2C2C2E + diff --git a/WordPress/src/main/res/values/dimens.xml b/WordPress/src/main/res/values/dimens.xml index b3c131621c03..f67241180b4f 100644 --- a/WordPress/src/main/res/values/dimens.xml +++ b/WordPress/src/main/res/values/dimens.xml @@ -764,7 +764,4 @@ 24dp 4dp - - 30dp - -10dp diff --git a/WordPress/src/main/res/values/strings.xml b/WordPress/src/main/res/values/strings.xml index 7f51471a4dd7..dc4df0c3b0cc 100644 --- a/WordPress/src/main/res/values/strings.xml +++ b/WordPress/src/main/res/values/strings.xml @@ -2869,8 +2869,9 @@ 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 + Your WordPress.com profile is powered by Gravatar + Updating your avatar, name, and about info here will also update it across all sites that use Gravatar profiles. + What is Gravatar? Updates might take some time to sync with your Gravatar profile. Done diff --git a/WordPress/src/main/res/values/styles.xml b/WordPress/src/main/res/values/styles.xml index 6166eb13334b..de43d8f78c93 100644 --- a/WordPress/src/main/res/values/styles.xml +++ b/WordPress/src/main/res/values/styles.xml @@ -49,6 +49,9 @@ @color/neutral_5 @color/blue_0 + @color/gravatar_info_banner + @color/gravatar_sync_info_banner + @color/wp_grey_lighten_30 @android:color/white diff --git a/WordPress/src/wordpress/res/drawable-night/ic_logo.xml b/WordPress/src/wordpress/res/drawable-night/ic_logo.xml deleted file mode 100644 index a69d5abb5312..000000000000 --- a/WordPress/src/wordpress/res/drawable-night/ic_logo.xml +++ /dev/null @@ -1,15 +0,0 @@ - - - - diff --git a/WordPress/src/wordpress/res/drawable-night/ic_logo_plus_gravatar.xml b/WordPress/src/wordpress/res/drawable-night/ic_logo_plus_gravatar.xml new file mode 100644 index 000000000000..0bb208c0899c --- /dev/null +++ b/WordPress/src/wordpress/res/drawable-night/ic_logo_plus_gravatar.xml @@ -0,0 +1,24 @@ + + + + + + diff --git a/WordPress/src/wordpress/res/drawable/ic_logo.xml b/WordPress/src/wordpress/res/drawable/ic_logo.xml deleted file mode 100644 index c7770d87517e..000000000000 --- a/WordPress/src/wordpress/res/drawable/ic_logo.xml +++ /dev/null @@ -1,15 +0,0 @@ - - - - diff --git a/WordPress/src/wordpress/res/drawable/ic_logo_plus_gravatar.xml b/WordPress/src/wordpress/res/drawable/ic_logo_plus_gravatar.xml new file mode 100644 index 000000000000..ab99e681d54d --- /dev/null +++ b/WordPress/src/wordpress/res/drawable/ic_logo_plus_gravatar.xml @@ -0,0 +1,24 @@ + + + + + + From 1e331558d7940e6d431aef4ff14aa1ee0e943c7a Mon Sep 17 00:00:00 2001 From: Maxime Biais Date: Mon, 19 Feb 2024 10:00:56 +0100 Subject: [PATCH 6/7] Fix for widow words --- WordPress/src/main/res/layout/me_fragment.xml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/WordPress/src/main/res/layout/me_fragment.xml b/WordPress/src/main/res/layout/me_fragment.xml index d7adbad671d2..c1820e85576a 100644 --- a/WordPress/src/main/res/layout/me_fragment.xml +++ b/WordPress/src/main/res/layout/me_fragment.xml @@ -420,6 +420,7 @@ From d53a304487ad3ff1056756b1e303be8dcfdf3e00 Mon Sep 17 00:00:00 2001 From: Maxime Biais Date: Mon, 19 Feb 2024 10:01:30 +0100 Subject: [PATCH 7/7] Update Gravatar info text size and background color on light theme --- WordPress/src/main/res/layout/me_fragment.xml | 3 +-- WordPress/src/main/res/values/colors.xml | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/WordPress/src/main/res/layout/me_fragment.xml b/WordPress/src/main/res/layout/me_fragment.xml index c1820e85576a..14a5ba98377e 100644 --- a/WordPress/src/main/res/layout/me_fragment.xml +++ b/WordPress/src/main/res/layout/me_fragment.xml @@ -423,8 +423,7 @@ app:fixWidowWords="true" android:layout_marginTop="@dimen/margin_extra_large" android:text="@string/gravatar_info_title" - android:textAppearance="?attr/textAppearanceHeadline6" - android:textStyle="bold" /> + android:textStyle="bold"/> #DEDEDE - #FAFAFA + #F2F2F7 #2C2C2E