From f8440268689a1e229b17e9dccf9876ece28b66e1 Mon Sep 17 00:00:00 2001 From: Tyler Heck Date: Tue, 23 Oct 2018 11:22:14 -0400 Subject: [PATCH 01/21] Add image types for avatar with background and avatar without background --- .../wordpress/android/util/image/ImagePlaceholderManager.kt | 4 ++++ .../main/java/org/wordpress/android/util/image/ImageType.kt | 2 ++ 2 files changed, 6 insertions(+) diff --git a/WordPress/src/main/java/org/wordpress/android/util/image/ImagePlaceholderManager.kt b/WordPress/src/main/java/org/wordpress/android/util/image/ImagePlaceholderManager.kt index a2e5ec265e42..34ec469d508e 100644 --- a/WordPress/src/main/java/org/wordpress/android/util/image/ImagePlaceholderManager.kt +++ b/WordPress/src/main/java/org/wordpress/android/util/image/ImagePlaceholderManager.kt @@ -12,6 +12,8 @@ class ImagePlaceholderManager @Inject constructor() { ImageType.PHOTO -> R.color.grey_lighten_30 ImageType.VIDEO -> R.color.grey_lighten_30 ImageType.AVATAR -> R.drawable.ic_placeholder_gravatar_grey_lighten_20_100dp + ImageType.AVATAR_WITH_BACKGROUND -> R.drawable.bg_oval_grey_user_32dp + ImageType.AVATAR_WITHOUT_BACKGROUND -> R.drawable.ic_user_circle_grey_24dp ImageType.BLAVATAR -> R.drawable.ic_placeholder_blavatar_grey_lighten_20_40dp ImageType.PLAN -> R.drawable.ic_reader_blue_wordpress_18dp ImageType.THEME -> R.color.grey_lighten_30 @@ -26,6 +28,8 @@ class ImagePlaceholderManager @Inject constructor() { ImageType.PHOTO -> R.color.grey_light ImageType.VIDEO -> R.color.grey_light ImageType.AVATAR -> R.drawable.shape_oval_grey_light + ImageType.AVATAR_WITH_BACKGROUND -> R.drawable.bg_oval_grey_user_32dp + ImageType.AVATAR_WITHOUT_BACKGROUND -> R.drawable.ic_user_circle_grey_24dp ImageType.BLAVATAR -> R.color.grey_light ImageType.PLAN -> R.drawable.ic_reader_blue_wordpress_18dp ImageType.THEME -> R.drawable.theme_loading diff --git a/WordPress/src/main/java/org/wordpress/android/util/image/ImageType.kt b/WordPress/src/main/java/org/wordpress/android/util/image/ImageType.kt index 9022a5033881..f0ff821bccfd 100644 --- a/WordPress/src/main/java/org/wordpress/android/util/image/ImageType.kt +++ b/WordPress/src/main/java/org/wordpress/android/util/image/ImageType.kt @@ -5,6 +5,8 @@ enum class ImageType { PHOTO, VIDEO, AVATAR, + AVATAR_WITH_BACKGROUND, + AVATAR_WITHOUT_BACKGROUND, BLAVATAR, PLAN, THEME, From 002cea7ae94a37069068678fb3e57d2f12eb6ef4 Mon Sep 17 00:00:00 2001 From: Tyler Heck Date: Tue, 23 Oct 2018 11:36:10 -0400 Subject: [PATCH 02/21] Refactor image types into alphabetical order --- .../util/image/ImagePlaceholderManager.kt | 16 ++++++++-------- .../wordpress/android/util/image/ImageType.kt | 8 ++++---- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/WordPress/src/main/java/org/wordpress/android/util/image/ImagePlaceholderManager.kt b/WordPress/src/main/java/org/wordpress/android/util/image/ImagePlaceholderManager.kt index 34ec469d508e..6904f46cd1ff 100644 --- a/WordPress/src/main/java/org/wordpress/android/util/image/ImagePlaceholderManager.kt +++ b/WordPress/src/main/java/org/wordpress/android/util/image/ImagePlaceholderManager.kt @@ -8,33 +8,33 @@ import javax.inject.Singleton class ImagePlaceholderManager @Inject constructor() { fun getErrorResource(imgType: ImageType): Int? { return when (imgType) { - ImageType.IMAGE -> null // don't display any error drawable - ImageType.PHOTO -> R.color.grey_lighten_30 - ImageType.VIDEO -> R.color.grey_lighten_30 ImageType.AVATAR -> R.drawable.ic_placeholder_gravatar_grey_lighten_20_100dp ImageType.AVATAR_WITH_BACKGROUND -> R.drawable.bg_oval_grey_user_32dp ImageType.AVATAR_WITHOUT_BACKGROUND -> R.drawable.ic_user_circle_grey_24dp ImageType.BLAVATAR -> R.drawable.ic_placeholder_blavatar_grey_lighten_20_40dp + ImageType.IMAGE -> null // don't display any error drawable + ImageType.PHOTO -> R.color.grey_lighten_30 ImageType.PLAN -> R.drawable.ic_reader_blue_wordpress_18dp + ImageType.PLUGIN -> R.drawable.plugin_placeholder ImageType.THEME -> R.color.grey_lighten_30 ImageType.UNKNOWN -> R.drawable.ic_notice_grey_500_48dp - ImageType.PLUGIN -> R.drawable.plugin_placeholder + ImageType.VIDEO -> R.color.grey_lighten_30 } } fun getPlaceholderResource(imgType: ImageType): Int? { return when (imgType) { - ImageType.IMAGE -> null // don't display any placeholder - ImageType.PHOTO -> R.color.grey_light - ImageType.VIDEO -> R.color.grey_light ImageType.AVATAR -> R.drawable.shape_oval_grey_light ImageType.AVATAR_WITH_BACKGROUND -> R.drawable.bg_oval_grey_user_32dp ImageType.AVATAR_WITHOUT_BACKGROUND -> R.drawable.ic_user_circle_grey_24dp ImageType.BLAVATAR -> R.color.grey_light + ImageType.IMAGE -> null // don't display any placeholder + ImageType.PHOTO -> R.color.grey_light ImageType.PLAN -> R.drawable.ic_reader_blue_wordpress_18dp + ImageType.PLUGIN -> R.drawable.plugin_placeholder ImageType.THEME -> R.drawable.theme_loading ImageType.UNKNOWN -> R.drawable.legacy_dashicon_format_image_big_grey - ImageType.PLUGIN -> R.drawable.plugin_placeholder + ImageType.VIDEO -> R.color.grey_light } } } diff --git a/WordPress/src/main/java/org/wordpress/android/util/image/ImageType.kt b/WordPress/src/main/java/org/wordpress/android/util/image/ImageType.kt index f0ff821bccfd..5a6152918276 100644 --- a/WordPress/src/main/java/org/wordpress/android/util/image/ImageType.kt +++ b/WordPress/src/main/java/org/wordpress/android/util/image/ImageType.kt @@ -1,15 +1,15 @@ package org.wordpress.android.util.image enum class ImageType { - IMAGE, - PHOTO, - VIDEO, AVATAR, AVATAR_WITH_BACKGROUND, AVATAR_WITHOUT_BACKGROUND, BLAVATAR, + IMAGE, + PHOTO, PLAN, + PLUGIN, THEME, UNKNOWN, - PLUGIN + VIDEO } From dc314dc34b03b514d4b95229bac1166f5ca6f01c Mon Sep 17 00:00:00 2001 From: Tyler Heck Date: Tue, 23 Oct 2018 12:04:26 -0400 Subject: [PATCH 03/21] Add deprecated annotation to avatar image type --- .../main/java/org/wordpress/android/util/image/ImageType.kt | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/WordPress/src/main/java/org/wordpress/android/util/image/ImageType.kt b/WordPress/src/main/java/org/wordpress/android/util/image/ImageType.kt index 5a6152918276..891382a72e65 100644 --- a/WordPress/src/main/java/org/wordpress/android/util/image/ImageType.kt +++ b/WordPress/src/main/java/org/wordpress/android/util/image/ImageType.kt @@ -1,6 +1,11 @@ package org.wordpress.android.util.image enum class ImageType { + @Deprecated( + message = "Use AVATAR_WITH_BACKGROUND or AVATAR_WITHOUT_BACKGROUND instead.", + replaceWith = ReplaceWith( + expression = "AVATAR_WITH_BACKGROUND", + imports = ["org.wordpress.android.util.image.ImageType"])) AVATAR, AVATAR_WITH_BACKGROUND, AVATAR_WITHOUT_BACKGROUND, From 9bd79f3dac41c8408dad8bcee9c0478f909441e0 Mon Sep 17 00:00:00 2001 From: Tyler Heck Date: Tue, 23 Oct 2018 12:12:33 -0400 Subject: [PATCH 04/21] Update image type to avatar without background for login header view holder --- .../android/ui/accounts/login/LoginHeaderViewHolder.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/WordPress/src/main/java/org/wordpress/android/ui/accounts/login/LoginHeaderViewHolder.java b/WordPress/src/main/java/org/wordpress/android/ui/accounts/login/LoginHeaderViewHolder.java index 0cb7cda1172e..69e81ae4c361 100644 --- a/WordPress/src/main/java/org/wordpress/android/ui/accounts/login/LoginHeaderViewHolder.java +++ b/WordPress/src/main/java/org/wordpress/android/ui/accounts/login/LoginHeaderViewHolder.java @@ -46,7 +46,8 @@ public void updateLoggedInAsHeading(Context context, ImageManager imageManager, if (isAfterLogin) { mLoggedInAsHeading.setVisibility(View.VISIBLE); mUserDetailsCard.setVisibility(View.VISIBLE); - imageManager.loadIntoCircle(mAvatarImageView, ImageType.AVATAR, StringUtils.notNullStr(avatarUrl)); + imageManager.loadIntoCircle(mAvatarImageView, ImageType.AVATAR_WITHOUT_BACKGROUND, + StringUtils.notNullStr(avatarUrl)); mUsernameTextView.setText(context.getString(R.string.login_username_at, username)); if (!TextUtils.isEmpty(displayName)) { From af0b7374eca98d7342b56682c820d521696c15c0 Mon Sep 17 00:00:00 2001 From: Tyler Heck Date: Tue, 23 Oct 2018 12:15:56 -0400 Subject: [PATCH 05/21] Update image type to avatar without background for signup epilogue fragment --- .../android/ui/accounts/signup/SignupEpilogueFragment.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/WordPress/src/main/java/org/wordpress/android/ui/accounts/signup/SignupEpilogueFragment.java b/WordPress/src/main/java/org/wordpress/android/ui/accounts/signup/SignupEpilogueFragment.java index d6f655ac400d..4d91f20a0555 100644 --- a/WordPress/src/main/java/org/wordpress/android/ui/accounts/signup/SignupEpilogueFragment.java +++ b/WordPress/src/main/java/org/wordpress/android/ui/accounts/signup/SignupEpilogueFragment.java @@ -273,7 +273,7 @@ public void onActivityCreated(@Nullable Bundle savedInstanceState) { } else { AnalyticsTracker.track(AnalyticsTracker.Stat.SIGNUP_SOCIAL_EPILOGUE_VIEWED); new DownloadAvatarAndUploadGravatarThread(mPhotoUrl, mEmailAddress, mAccount.getAccessToken()).start(); - mImageManager.loadIntoCircle(mHeaderAvatar, ImageType.AVATAR, mPhotoUrl); + mImageManager.loadIntoCircle(mHeaderAvatar, ImageType.AVATAR_WITHOUT_BACKGROUND, mPhotoUrl); } } else { mDialog = (FullScreenDialogFragment) getFragmentManager().findFragmentByTag(FullScreenDialogFragment.TAG); @@ -293,7 +293,7 @@ public void onActivityCreated(@Nullable Bundle savedInstanceState) { mHeaderEmailAddress.setText(mEmailAddress); mHeaderAvatarAdd.setVisibility(mIsAvatarAdded ? View.GONE : View.VISIBLE); } - mImageManager.loadIntoCircle(mHeaderAvatar, ImageType.AVATAR, mPhotoUrl); + mImageManager.loadIntoCircle(mHeaderAvatar, ImageType.AVATAR_WITHOUT_BACKGROUND, mPhotoUrl); } } @@ -545,7 +545,7 @@ protected void loadAvatar(final String avatarUrl, String injectFilePath) { if (bitmap != null) { mImageManager.load(mHeaderAvatar, bitmap); } else { - mImageManager.loadIntoCircle(mHeaderAvatar, ImageType.AVATAR, + mImageManager.loadIntoCircle(mHeaderAvatar, ImageType.AVATAR_WITHOUT_BACKGROUND, newAvatarUploaded ? injectFilePath : avatarUrl, new RequestListener() { @Override public void onLoadFailed(@Nullable Exception e) { From 6cb20584157f2a86f347c6fdb89d15be36633e96 Mon Sep 17 00:00:00 2001 From: Tyler Heck Date: Tue, 23 Oct 2018 12:19:29 -0400 Subject: [PATCH 06/21] Update image type to avatar with background for comment adapter --- .../java/org/wordpress/android/ui/comments/CommentAdapter.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/WordPress/src/main/java/org/wordpress/android/ui/comments/CommentAdapter.java b/WordPress/src/main/java/org/wordpress/android/ui/comments/CommentAdapter.java index 3bb9f45617a1..b3a7d6122798 100644 --- a/WordPress/src/main/java/org/wordpress/android/ui/comments/CommentAdapter.java +++ b/WordPress/src/main/java/org/wordpress/android/ui/comments/CommentAdapter.java @@ -247,7 +247,8 @@ public void onBindViewHolder(RecyclerView.ViewHolder viewHolder, int position) { holder.mContainerView.setBackgroundColor(mSelectedColor); } else { checkmarkVisibility = View.GONE; - mImageManager.loadIntoCircle(holder.mImgAvatar, ImageType.AVATAR, getAvatarForDisplay(comment, mAvatarSz)); + mImageManager.loadIntoCircle(holder.mImgAvatar, ImageType.AVATAR_WITH_BACKGROUND, + getAvatarForDisplay(comment, mAvatarSz)); holder.mContainerView.setBackgroundColor(mUnselectedColor); } From b70d77ebc37d68f253165008b0a024eda4d56dc3 Mon Sep 17 00:00:00 2001 From: Tyler Heck Date: Tue, 23 Oct 2018 12:24:39 -0400 Subject: [PATCH 07/21] Update image type to avatar with background for comment detail fragment --- .../wordpress/android/ui/comments/CommentDetailFragment.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/WordPress/src/main/java/org/wordpress/android/ui/comments/CommentDetailFragment.java b/WordPress/src/main/java/org/wordpress/android/ui/comments/CommentDetailFragment.java index c0b6eb5c723d..ac2dd580796f 100644 --- a/WordPress/src/main/java/org/wordpress/android/ui/comments/CommentDetailFragment.java +++ b/WordPress/src/main/java/org/wordpress/android/ui/comments/CommentDetailFragment.java @@ -65,7 +65,6 @@ import org.wordpress.android.ui.suggestion.service.SuggestionEvents; import org.wordpress.android.ui.suggestion.util.SuggestionServiceConnectionManager; import org.wordpress.android.ui.suggestion.util.SuggestionUtils; -import org.wordpress.android.util.analytics.AnalyticsUtils; import org.wordpress.android.util.AniUtils; import org.wordpress.android.util.AppLog; import org.wordpress.android.util.AppLog.T; @@ -77,6 +76,7 @@ import org.wordpress.android.util.SiteUtils; import org.wordpress.android.util.ToastUtils; import org.wordpress.android.util.WPLinkMovementMethod; +import org.wordpress.android.util.analytics.AnalyticsUtils; import org.wordpress.android.util.image.ImageManager; import org.wordpress.android.util.image.ImageType; import org.wordpress.android.widgets.SuggestionAutoCompleteText; @@ -661,7 +661,7 @@ private void showComment() { } else if (mComment.getAuthorEmail() != null) { avatarUrl = GravatarUtils.gravatarFromEmail(mComment.getAuthorEmail(), avatarSz); } - mImageManager.loadIntoCircle(imgAvatar, ImageType.AVATAR, avatarUrl); + mImageManager.loadIntoCircle(imgAvatar, ImageType.AVATAR_WITH_BACKGROUND, avatarUrl); updateStatusViews(); From a5b71602a8233e600a466ba9445998ec25cd7320 Mon Sep 17 00:00:00 2001 From: Tyler Heck Date: Tue, 23 Oct 2018 12:27:22 -0400 Subject: [PATCH 08/21] Update image type to avatar without background for me fragment --- .../src/main/java/org/wordpress/android/ui/main/MeFragment.java | 2 +- 1 file changed, 1 insertion(+), 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 21d5c60316dc..d78a5625dd93 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 @@ -324,7 +324,7 @@ private void loadAvatar(final String avatarUrl, String injectFilePath) { if (bitmap != null) { mImageManager.load(mAvatarImageView, bitmap); } else { - mImageManager.loadIntoCircle(mAvatarImageView, ImageType.AVATAR, + mImageManager.loadIntoCircle(mAvatarImageView, ImageType.AVATAR_WITHOUT_BACKGROUND, newAvatarUploaded ? injectFilePath : avatarUrl, new RequestListener() { @Override public void onLoadFailed(@Nullable Exception e) { From ef4b2ec3dc2730812bf5c867587c5ce35fd9d9a0 Mon Sep 17 00:00:00 2001 From: Tyler Heck Date: Tue, 23 Oct 2018 12:28:24 -0400 Subject: [PATCH 09/21] Update image type to avatar with background for notifications detail list fragment --- .../ui/notifications/NotificationsDetailListFragment.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/WordPress/src/main/java/org/wordpress/android/ui/notifications/NotificationsDetailListFragment.java b/WordPress/src/main/java/org/wordpress/android/ui/notifications/NotificationsDetailListFragment.java index 6dee8a7c9a0b..deb837bb8227 100644 --- a/WordPress/src/main/java/org/wordpress/android/ui/notifications/NotificationsDetailListFragment.java +++ b/WordPress/src/main/java/org/wordpress/android/ui/notifications/NotificationsDetailListFragment.java @@ -334,7 +334,7 @@ protected List doInBackground(Void... params) { // Add the note header if one was provided if (mNote.getHeader() != null) { - ImageType imageType = mNote.isFollowType() ? ImageType.BLAVATAR : ImageType.AVATAR; + ImageType imageType = mNote.isFollowType() ? ImageType.BLAVATAR : ImageType.AVATAR_WITH_BACKGROUND; HeaderNoteBlock headerNoteBlock = new HeaderNoteBlock( getActivity(), transformToFormattableContentList(mNote.getHeader()), From d7b01d5098aac1f9842c06fc4672b383bf35e4a1 Mon Sep 17 00:00:00 2001 From: Tyler Heck Date: Tue, 23 Oct 2018 12:29:10 -0400 Subject: [PATCH 10/21] Update image type to avatar with background for notes adapter --- .../android/ui/notifications/adapters/NotesAdapter.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/WordPress/src/main/java/org/wordpress/android/ui/notifications/adapters/NotesAdapter.java b/WordPress/src/main/java/org/wordpress/android/ui/notifications/adapters/NotesAdapter.java index 2ef041fbba09..d25ab00ecbbb 100644 --- a/WordPress/src/main/java/org/wordpress/android/ui/notifications/adapters/NotesAdapter.java +++ b/WordPress/src/main/java/org/wordpress/android/ui/notifications/adapters/NotesAdapter.java @@ -284,7 +284,7 @@ public void onBindViewHolder(NoteViewHolder noteViewHolder, int position) { } String avatarUrl = GravatarUtils.fixGravatarUrl(note.getIconURL(), mAvatarSz); - mImageManager.loadIntoCircle(noteViewHolder.mImgAvatar, ImageType.AVATAR, avatarUrl); + mImageManager.loadIntoCircle(noteViewHolder.mImgAvatar, ImageType.AVATAR_WITH_BACKGROUND, avatarUrl); boolean isUnread = note.isUnread(); From 69b9b2e15084bc9d8e84154c613e9d3ba007445b Mon Sep 17 00:00:00 2001 From: Tyler Heck Date: Tue, 23 Oct 2018 12:30:52 -0400 Subject: [PATCH 11/21] Update image type to avatar with background for comment user note block --- .../android/ui/notifications/blocks/CommentUserNoteBlock.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/WordPress/src/main/java/org/wordpress/android/ui/notifications/blocks/CommentUserNoteBlock.java b/WordPress/src/main/java/org/wordpress/android/ui/notifications/blocks/CommentUserNoteBlock.java index daa33551672f..6067aeba68ee 100644 --- a/WordPress/src/main/java/org/wordpress/android/ui/notifications/blocks/CommentUserNoteBlock.java +++ b/WordPress/src/main/java/org/wordpress/android/ui/notifications/blocks/CommentUserNoteBlock.java @@ -118,7 +118,7 @@ public void onClick(View v) { noteBlockHolder.mAvatarImageView.setOnTouchListener(null); noteBlockHolder.mAvatarImageView.setContentDescription(null); } - mImageManager.loadIntoCircle(noteBlockHolder.mAvatarImageView, ImageType.AVATAR, imageUrl); + mImageManager.loadIntoCircle(noteBlockHolder.mAvatarImageView, ImageType.AVATAR_WITH_BACKGROUND, imageUrl); noteBlockHolder.mCommentTextView .setText(getCommentTextOfNotification(noteBlockHolder)); From 699574a8ccae9603c04b3697c1e88f1d72b733d9 Mon Sep 17 00:00:00 2001 From: Tyler Heck Date: Tue, 23 Oct 2018 12:31:18 -0400 Subject: [PATCH 12/21] Update image type to avatar with background for reader note block --- .../android/ui/notifications/blocks/HeaderNoteBlock.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/WordPress/src/main/java/org/wordpress/android/ui/notifications/blocks/HeaderNoteBlock.java b/WordPress/src/main/java/org/wordpress/android/ui/notifications/blocks/HeaderNoteBlock.java index 14c28a12cabe..e47cb092332c 100644 --- a/WordPress/src/main/java/org/wordpress/android/ui/notifications/blocks/HeaderNoteBlock.java +++ b/WordPress/src/main/java/org/wordpress/android/ui/notifications/blocks/HeaderNoteBlock.java @@ -60,7 +60,7 @@ public View configureView(View view) { Spannable spannable = mNotificationsUtilsWrapper.getSpannableContentForRanges(mHeadersList.get(0)); noteBlockHolder.mNameTextView.setText(spannable); - if (mImageType == ImageType.AVATAR) { + if (mImageType == ImageType.AVATAR_WITH_BACKGROUND) { mImageManager.loadIntoCircle(noteBlockHolder.mAvatarImageView, mImageType, getAvatarUrl()); } else { mImageManager.load(noteBlockHolder.mAvatarImageView, mImageType, getAvatarUrl()); From 14cc01b653e35669bb48e4193d437888373b11f8 Mon Sep 17 00:00:00 2001 From: Tyler Heck Date: Tue, 23 Oct 2018 12:31:44 -0400 Subject: [PATCH 13/21] Update image type to avatar with background for user note block --- .../android/ui/notifications/blocks/UserNoteBlock.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/WordPress/src/main/java/org/wordpress/android/ui/notifications/blocks/UserNoteBlock.java b/WordPress/src/main/java/org/wordpress/android/ui/notifications/blocks/UserNoteBlock.java index a782ad0fa5e2..18182d76620a 100644 --- a/WordPress/src/main/java/org/wordpress/android/ui/notifications/blocks/UserNoteBlock.java +++ b/WordPress/src/main/java/org/wordpress/android/ui/notifications/blocks/UserNoteBlock.java @@ -111,7 +111,7 @@ public View configureView(View view) { //noinspection AndroidLintClickableViewAccessibility noteBlockHolder.mAvatarImageView.setOnTouchListener(null); } - mImageManager.loadIntoCircle(noteBlockHolder.mAvatarImageView, ImageType.AVATAR, imageUrl); + mImageManager.loadIntoCircle(noteBlockHolder.mAvatarImageView, ImageType.AVATAR_WITH_BACKGROUND, imageUrl); return view; } From e2e5e7275a21b7d346a58a7d5733422041113bea Mon Sep 17 00:00:00 2001 From: Tyler Heck Date: Tue, 23 Oct 2018 12:32:12 -0400 Subject: [PATCH 14/21] Update image type to avatar with background for people list fragment --- .../org/wordpress/android/ui/people/PeopleListFragment.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/WordPress/src/main/java/org/wordpress/android/ui/people/PeopleListFragment.java b/WordPress/src/main/java/org/wordpress/android/ui/people/PeopleListFragment.java index 7eaaf10f0177..67cd3b6762fb 100644 --- a/WordPress/src/main/java/org/wordpress/android/ui/people/PeopleListFragment.java +++ b/WordPress/src/main/java/org/wordpress/android/ui/people/PeopleListFragment.java @@ -400,7 +400,7 @@ public void onBindViewHolder(@NonNull RecyclerView.ViewHolder holder, int positi if (person != null) { String avatarUrl = GravatarUtils.fixGravatarUrl(person.getAvatarUrl(), mAvatarSz); - mImageManager.loadIntoCircle(peopleViewHolder.mImgAvatar, ImageType.AVATAR, avatarUrl); + mImageManager.loadIntoCircle(peopleViewHolder.mImgAvatar, ImageType.AVATAR_WITH_BACKGROUND, avatarUrl); peopleViewHolder.mTxtDisplayName.setText(StringEscapeUtils.unescapeHtml4(person.getDisplayName())); if (person.getRole() != null) { peopleViewHolder.mTxtRole.setVisibility(View.VISIBLE); From f35821abd2933671fd263cf5c4b2a579fc6fe476 Mon Sep 17 00:00:00 2001 From: Tyler Heck Date: Tue, 23 Oct 2018 12:37:15 -0400 Subject: [PATCH 15/21] Update image type to avatar with background for person detail fragment --- .../org/wordpress/android/ui/people/PersonDetailFragment.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/WordPress/src/main/java/org/wordpress/android/ui/people/PersonDetailFragment.java b/WordPress/src/main/java/org/wordpress/android/ui/people/PersonDetailFragment.java index 66f19ac8c327..bea166fdae8e 100644 --- a/WordPress/src/main/java/org/wordpress/android/ui/people/PersonDetailFragment.java +++ b/WordPress/src/main/java/org/wordpress/android/ui/people/PersonDetailFragment.java @@ -143,7 +143,7 @@ public void refreshPersonDetails() { int avatarSz = getResources().getDimensionPixelSize(R.dimen.people_avatar_sz); String avatarUrl = GravatarUtils.fixGravatarUrl(person.getAvatarUrl(), avatarSz); - mImageManager.loadIntoCircle(mAvatarImageView, ImageType.AVATAR, avatarUrl); + mImageManager.loadIntoCircle(mAvatarImageView, ImageType.AVATAR_WITH_BACKGROUND, avatarUrl); mDisplayNameTextView.setText(StringEscapeUtils.unescapeHtml4(person.getDisplayName())); if (person.getRole() != null) { mRoleTextView.setText(RoleUtils.getDisplayName(person.getRole(), mUserRoles)); From 6be3ec2b38e0d3bb3fa01b6b00ec38ec034811b2 Mon Sep 17 00:00:00 2001 From: Tyler Heck Date: Tue, 23 Oct 2018 12:38:34 -0400 Subject: [PATCH 16/21] Update image type to avatar with background for publicize connection adapter --- .../ui/publicize/adapters/PublicizeConnectionAdapter.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/WordPress/src/main/java/org/wordpress/android/ui/publicize/adapters/PublicizeConnectionAdapter.java b/WordPress/src/main/java/org/wordpress/android/ui/publicize/adapters/PublicizeConnectionAdapter.java index c33e03a90a60..ea4f8851dc0e 100644 --- a/WordPress/src/main/java/org/wordpress/android/ui/publicize/adapters/PublicizeConnectionAdapter.java +++ b/WordPress/src/main/java/org/wordpress/android/ui/publicize/adapters/PublicizeConnectionAdapter.java @@ -99,7 +99,8 @@ public void onBindViewHolder(ConnectionViewHolder holder, int position) { holder.mTxtUser.setText(connection.getExternalDisplayName()); holder.mDivider.setVisibility(position == 0 ? View.GONE : View.VISIBLE); - mImageManager.loadIntoCircle(holder.mImgAvatar, ImageType.AVATAR, connection.getExternalProfilePictureUrl()); + mImageManager.loadIntoCircle(holder.mImgAvatar, ImageType.AVATAR_WITH_BACKGROUND, + connection.getExternalProfilePictureUrl()); holder.mBtnConnect.setAction(PublicizeConstants.ConnectAction.DISCONNECT); holder.mBtnConnect.setOnClickListener(new View.OnClickListener() { From 258e24b9232565d227c04807907c72f313052869 Mon Sep 17 00:00:00 2001 From: Tyler Heck Date: Tue, 23 Oct 2018 12:54:48 -0400 Subject: [PATCH 17/21] Update image type to avatar with background for stats authors fragment --- .../org/wordpress/android/ui/stats/StatsAuthorsFragment.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/WordPress/src/main/java/org/wordpress/android/ui/stats/StatsAuthorsFragment.java b/WordPress/src/main/java/org/wordpress/android/ui/stats/StatsAuthorsFragment.java index a752bfb2cd0b..0a1a99bc12e9 100644 --- a/WordPress/src/main/java/org/wordpress/android/ui/stats/StatsAuthorsFragment.java +++ b/WordPress/src/main/java/org/wordpress/android/ui/stats/StatsAuthorsFragment.java @@ -254,7 +254,7 @@ public View getGroupView(int groupPosition, boolean isExpanded, // icon // holder.showNetworkImage(icon); - mImageManager.loadIntoCircle(holder.networkImageView, ImageType.AVATAR, + mImageManager.loadIntoCircle(holder.networkImageView, ImageType.AVATAR_WITH_BACKGROUND, GravatarUtils.fixGravatarUrl(icon, mResourceVars.mHeaderAvatarSizePx)); holder.networkImageView.setVisibility(View.VISIBLE); From 8f334ec48de9b8f5b39af7814bdfb1aa47cfe63f Mon Sep 17 00:00:00 2001 From: Tyler Heck Date: Tue, 23 Oct 2018 13:10:18 -0400 Subject: [PATCH 18/21] Update image type to avatar with background for stats comments fragment --- .../org/wordpress/android/ui/stats/StatsCommentsFragment.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/WordPress/src/main/java/org/wordpress/android/ui/stats/StatsCommentsFragment.java b/WordPress/src/main/java/org/wordpress/android/ui/stats/StatsCommentsFragment.java index 655495988fb9..50cd0c373eb5 100644 --- a/WordPress/src/main/java/org/wordpress/android/ui/stats/StatsCommentsFragment.java +++ b/WordPress/src/main/java/org/wordpress/android/ui/stats/StatsCommentsFragment.java @@ -233,7 +233,7 @@ public View getView(int position, View convertView, @NonNull ViewGroup parent) { currentRowData.getViews())); // avatar - mImageManager.loadIntoCircle(holder.networkImageView, ImageType.AVATAR, + mImageManager.loadIntoCircle(holder.networkImageView, ImageType.AVATAR_WITH_BACKGROUND, GravatarUtils.fixGravatarUrl(currentRowData.getAvatar(), mResourceVars.mHeaderAvatarSizePx)); holder.networkImageView.setVisibility(View.VISIBLE); From 00314e29a46f1a0644fe8208101002166b5a4577 Mon Sep 17 00:00:00 2001 From: Tyler Heck Date: Tue, 23 Oct 2018 13:10:35 -0400 Subject: [PATCH 19/21] Update image type to avatar with background for stats followers fragment --- .../org/wordpress/android/ui/stats/StatsFollowersFragment.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/WordPress/src/main/java/org/wordpress/android/ui/stats/StatsFollowersFragment.java b/WordPress/src/main/java/org/wordpress/android/ui/stats/StatsFollowersFragment.java index 19ce7562221f..860eb32a9295 100644 --- a/WordPress/src/main/java/org/wordpress/android/ui/stats/StatsFollowersFragment.java +++ b/WordPress/src/main/java/org/wordpress/android/ui/stats/StatsFollowersFragment.java @@ -381,7 +381,7 @@ public void onClick(View view) { holder.totalsTextView.getText())); // Avatar - mImageManager.loadIntoCircle(holder.networkImageView, ImageType.AVATAR, + mImageManager.loadIntoCircle(holder.networkImageView, ImageType.AVATAR_WITH_BACKGROUND, GravatarUtils.fixGravatarUrl(currentRowData.getAvatar(), mResourceVars.mHeaderAvatarSizePx)); holder.networkImageView.setVisibility(View.VISIBLE); From 679695c054b500f9fe03e9e5c5cfccbc25cf733c Mon Sep 17 00:00:00 2001 From: Tyler Heck Date: Tue, 23 Oct 2018 13:13:11 -0400 Subject: [PATCH 20/21] Update image type to avatar with background for suggestion adapter --- .../android/ui/suggestion/adapters/SuggestionAdapter.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/WordPress/src/main/java/org/wordpress/android/ui/suggestion/adapters/SuggestionAdapter.java b/WordPress/src/main/java/org/wordpress/android/ui/suggestion/adapters/SuggestionAdapter.java index 3bfb52f2e32c..ab1b5be3c435 100644 --- a/WordPress/src/main/java/org/wordpress/android/ui/suggestion/adapters/SuggestionAdapter.java +++ b/WordPress/src/main/java/org/wordpress/android/ui/suggestion/adapters/SuggestionAdapter.java @@ -79,7 +79,7 @@ public View getView(int position, View convertView, ViewGroup parent) { if (suggestion != null) { String avatarUrl = GravatarUtils.fixGravatarUrl(suggestion.getImageUrl(), mAvatarSz); - mImageManager.loadIntoCircle(holder.mImgAvatar, ImageType.AVATAR, avatarUrl); + mImageManager.loadIntoCircle(holder.mImgAvatar, ImageType.AVATAR_WITH_BACKGROUND, avatarUrl); holder.mTxtUserLogin .setText(convertView.getResources().getString(R.string.at_username, suggestion.getUserLogin())); holder.mTxtDisplayName.setText(suggestion.getDisplayName()); From 254ff804d81d83fce5ac2494287142ae3e64ea77 Mon Sep 17 00:00:00 2001 From: Tyler Heck Date: Tue, 23 Oct 2018 13:14:07 -0400 Subject: [PATCH 21/21] Update image type to avatar with background for activity log detail fragment --- .../ui/activitylog/detail/ActivityLogDetailFragment.kt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/WordPress/src/main/java/org/wordpress/android/ui/activitylog/detail/ActivityLogDetailFragment.kt b/WordPress/src/main/java/org/wordpress/android/ui/activitylog/detail/ActivityLogDetailFragment.kt index 58b2486b9cfd..589d734e3ad1 100644 --- a/WordPress/src/main/java/org/wordpress/android/ui/activitylog/detail/ActivityLogDetailFragment.kt +++ b/WordPress/src/main/java/org/wordpress/android/ui/activitylog/detail/ActivityLogDetailFragment.kt @@ -20,7 +20,7 @@ import org.wordpress.android.ui.notifications.utils.FormattableContentClickHandl import org.wordpress.android.ui.notifications.utils.NotificationsUtilsWrapper import org.wordpress.android.ui.posts.BasicFragmentDialog import org.wordpress.android.util.image.ImageManager -import org.wordpress.android.util.image.ImageType.AVATAR +import org.wordpress.android.util.image.ImageType.AVATAR_WITH_BACKGROUND import org.wordpress.android.viewmodel.activitylog.ACTIVITY_LOG_ID_KEY import org.wordpress.android.viewmodel.activitylog.ACTIVITY_LOG_REWIND_ID_KEY import org.wordpress.android.viewmodel.activitylog.ActivityLogDetailViewModel @@ -127,7 +127,7 @@ class ActivityLogDetailFragment : Fragment() { private fun setActorIcon(actorIcon: String?, showJetpackIcon: Boolean?) { when { actorIcon != null && actorIcon != "" -> { - imageManager.loadIntoCircle(activityActorIcon, AVATAR, actorIcon) + imageManager.loadIntoCircle(activityActorIcon, AVATAR_WITH_BACKGROUND, actorIcon) activityActorIcon.visibility = View.VISIBLE activityJetpackActorIcon.visibility = View.GONE }