From 8d88bfa622bb62880b98d761798fd558bba2cee5 Mon Sep 17 00:00:00 2001 From: Jarvis Lin Date: Thu, 9 May 2024 09:49:26 +0300 Subject: [PATCH 01/24] Update layouts and remove some redundant logic --- .../ui/comments/CommentDetailFragment.java | 19 ---- .../blocks/CommentUserNoteBlock.kt | 68 +------------ .../notifications_list_divider_full_width.xml | 4 - .../res/layout/comment_detail_fragment.xml | 95 ++++++------------- .../res/layout/note_block_comment_user.xml | 82 +++------------- .../src/main/res/layout/note_block_user.xml | 6 -- 6 files changed, 47 insertions(+), 227 deletions(-) delete mode 100644 WordPress/src/main/res/drawable/notifications_list_divider_full_width.xml 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 932c7ea0360e..d0c641ad5ca1 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 @@ -96,7 +96,6 @@ import org.wordpress.android.util.AppLog; import org.wordpress.android.util.AppLog.T; import org.wordpress.android.util.ColorUtils; -import org.wordpress.android.util.DateTimeUtils; import org.wordpress.android.util.EditTextUtils; import org.wordpress.android.util.HtmlUtils; import org.wordpress.android.util.NetworkUtils; @@ -687,11 +686,6 @@ private void showCommentWhenNonNull( binding.textName.setText( comment.getAuthorName() == null ? getString(R.string.anonymous) : comment.getAuthorName() ); - binding.textDate.setText( - DateTimeUtils.javaDateToTimeSpan( - DateTimeUtils.dateFromIso8601(comment.getDatePublished()), WordPress.getContext() - ) - ); String renderingError = getString(R.string.comment_unable_to_show_error); binding.textContent.post(() -> CommentUtils.displayHtmlComment( @@ -1109,19 +1103,6 @@ private void updateStatusViews( toggleLikeButton(actionBinding, comment.getILike()); } - // comment status is only shown if this comment is from one of this user's blogs and the - // comment hasn't been CommentStatus.APPROVED - if (mIsUsersBlog && commentStatus != CommentStatus.APPROVED) { - binding.textStatus.setText(getString(statusTextResId).toUpperCase(Locale.getDefault())); - binding.textStatus.setTextColor(statusColor); - if (binding.textStatus.getVisibility() != View.VISIBLE) { - binding.textStatus.clearAnimation(); - AniUtils.fadeIn(binding.textStatus, AniUtils.Duration.LONG); - } - } else { - binding.textStatus.setVisibility(View.GONE); - } - if (canModerate()) { setModerateButtonForStatus(actionBinding, commentStatus); actionBinding.btnModerate.setOnClickListener( diff --git a/WordPress/src/main/java/org/wordpress/android/ui/notifications/blocks/CommentUserNoteBlock.kt b/WordPress/src/main/java/org/wordpress/android/ui/notifications/blocks/CommentUserNoteBlock.kt index 28c4e5db7dee..ae8025dc84b4 100644 --- a/WordPress/src/main/java/org/wordpress/android/ui/notifications/blocks/CommentUserNoteBlock.kt +++ b/WordPress/src/main/java/org/wordpress/android/ui/notifications/blocks/CommentUserNoteBlock.kt @@ -57,18 +57,13 @@ class CommentUserNoteBlock( mNoteBlockHolder = view.tag as CommentUserNoteBlockHolder setUserName() setUserCommentAgo() - setUserCommentSite() setUserAvatar() setUserComment() - setCommentStatus(view) return view } private fun setUserName() { - mNoteBlockHolder?.mNameTextView?.text = HtmlCompat.fromHtml( - "$noteText", - HtmlCompat.FROM_HTML_MODE_LEGACY - ) + mNoteBlockHolder?.mNameTextView?.text = noteText.toString() } private fun setUserCommentAgo() { @@ -78,24 +73,6 @@ class CommentUserNoteBlock( ) } - private fun setUserCommentSite() { - if (!TextUtils.isEmpty(metaHomeTitle) || !TextUtils.isEmpty(metaSiteUrl)) { - mNoteBlockHolder?.mBulletTextView?.visibility = View.VISIBLE - mNoteBlockHolder?.mSiteTextView?.visibility = View.VISIBLE - if (!TextUtils.isEmpty(metaHomeTitle)) { - mNoteBlockHolder?.mSiteTextView?.text = metaHomeTitle - } else { - mNoteBlockHolder?.mSiteTextView?.text = - metaSiteUrl?.replace("http://", "")?.replace("https://", "") - } - } else { - mNoteBlockHolder?.mBulletTextView?.visibility = View.GONE - mNoteBlockHolder?.mSiteTextView?.visibility = View.GONE - } - mNoteBlockHolder?.mSiteTextView?.importantForAccessibility = - View.IMPORTANT_FOR_ACCESSIBILITY_NO - } - @SuppressLint("ClickableViewAccessibility") private fun setUserAvatar() { var imageUrl = "" @@ -132,42 +109,6 @@ class CommentUserNoteBlock( mNoteBlockHolder?.mCommentTextView?.text = spannable } - @Suppress("MagicNumber") - private fun setCommentStatus(view: View) { - // Change display based on comment status and type: - // 1. Comment replies are indented and have a 'pipe' background - // 2. Unapproved comments have different background and text color - var paddingStart = ViewCompat.getPaddingStart(view) - val paddingTop = view.paddingTop - val paddingEnd = ViewCompat.getPaddingEnd(view) - val paddingBottom = view.paddingBottom - if (mCommentStatus == CommentStatus.UNAPPROVED) { - if (hasCommentNestingLevel()) { - paddingStart = mIndentedLeftPadding - view.setBackgroundResource(R.drawable.bg_rectangle_warning_surface_with_padding) - } else { - view.setBackgroundResource(R.drawable.bg_rectangle_warning_surface) - } - mNoteBlockHolder?.mDividerView?.visibility = View.INVISIBLE - } else { - if (hasCommentNestingLevel()) { - paddingStart = mIndentedLeftPadding - view.setBackgroundResource(R.drawable.comment_reply_background) - mNoteBlockHolder?.mDividerView?.visibility = View.INVISIBLE - } else { - view.setBackgroundColor(mNormalBackgroundColor) - mNoteBlockHolder?.mDividerView?.visibility = View.VISIBLE - } - } - ViewCompat.setPaddingRelative(view, paddingStart, paddingTop, paddingEnd, paddingBottom) - // If status was changed, fade in the view - if (mStatusChanged) { - mStatusChanged = false - view.alpha = 0.4f - view.animate().alpha(1.0f).start() - } - } - private fun getCommentTextOfNotification(noteBlockHolder: CommentUserNoteBlockHolder?): Spannable { val builder = mNotificationsUtilsWrapper.getSpannableContentForRanges( mCommentData, @@ -199,8 +140,6 @@ class CommentUserNoteBlock( private inner class CommentUserNoteBlockHolder constructor(view: View) { val mAvatarImageView: ImageView = view.findViewById(R.id.user_avatar) val mNameTextView: TextView = view.findViewById(R.id.user_name) - val mBulletTextView: TextView = view.findViewById(R.id.user_comment_bullet) - val mDividerView: View = view.findViewById(R.id.divider_view) val mAgoTextView: TextView = view.findViewById(R.id.user_comment_ago).apply { visibility = View.VISIBLE } @@ -211,11 +150,6 @@ class CommentUserNoteBlock( onNoteBlockTextClickListener?.showReaderPostComments() } } - val mSiteTextView: TextView = view.findViewById(R.id.user_comment_site).apply { - setOnClickListener { - onNoteBlockTextClickListener?.showSitePreview(metaSiteId, metaSiteUrl) - } - } } fun configureResources(context: Context?) { diff --git a/WordPress/src/main/res/drawable/notifications_list_divider_full_width.xml b/WordPress/src/main/res/drawable/notifications_list_divider_full_width.xml deleted file mode 100644 index 57341d697972..000000000000 --- a/WordPress/src/main/res/drawable/notifications_list_divider_full_width.xml +++ /dev/null @@ -1,4 +0,0 @@ - - - diff --git a/WordPress/src/main/res/layout/comment_detail_fragment.xml b/WordPress/src/main/res/layout/comment_detail_fragment.xml index e7f39c3f815b..146b4ad197a9 100644 --- a/WordPress/src/main/res/layout/comment_detail_fragment.xml +++ b/WordPress/src/main/res/layout/comment_detail_fragment.xml @@ -5,6 +5,7 @@ --> - + android:paddingTop="@dimen/margin_large"> + android:layout_width="@dimen/avatar_sz_medium" + android:layout_height="@dimen/avatar_sz_medium" + android:importantForAccessibility="no" + app:layout_constraintBottom_toBottomOf="parent" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toTopOf="parent" /> + android:singleLine="true" + android:textAppearance="?attr/textAppearanceBody2" + android:textColor="@color/material_on_surface_emphasis_high_type" + app:layout_constraintBottom_toTopOf="@+id/text_post_title" + app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintStart_toEndOf="@+id/image_avatar" + app:layout_constraintTop_toTopOf="@+id/image_avatar" + tools:text="Bob Ross" /> - - - - - + android:singleLine="true" + android:textAppearance="?attr/textAppearanceBody2" + android:textColor="@color/material_on_surface_emphasis_medium" + app:layout_constraintBottom_toBottomOf="parent" + app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintStart_toEndOf="@+id/image_avatar" + app:layout_constraintTop_toBottomOf="@+id/text_name" + tools:text="bobross" /> + - - - - - - - - - - - - - - - - - - - - From 65a6bb0916a781f1489843d09411119b70269719 Mon Sep 17 00:00:00 2001 From: Jarvis Lin Date: Fri, 10 May 2024 16:21:24 +0300 Subject: [PATCH 04/24] Fix lint issues --- .../blocks/CommentUserNoteBlock.kt | 4 ---- .../res/anim/notifications_button_scale.xml | 15 ------------ .../ic_time_neutral_400_16dp.png | Bin 17807 -> 0 bytes .../bg_rectangle_warning_surface.xml | 16 ------------- ...rectangle_warning_surface_with_padding.xml | 22 ------------------ .../comment_reply_background.xml | 20 ---------------- .../ic_time_neutral_400_16dp.png | Bin 17721 -> 0 bytes .../ic_time_neutral_400_16dp.png | Bin 17909 -> 0 bytes .../drawable/bg_rectangle_warning_surface.xml | 16 ------------- ...rectangle_warning_surface_with_padding.xml | 22 ------------------ .../res/drawable/comment_reply_background.xml | 20 ---------------- .../src/main/res/menu/menu_comment_more.xml | 20 ---------------- WordPress/src/main/res/values/dimens.xml | 3 --- .../src/main/res/values/reader_styles.xml | 8 ------- WordPress/src/main/res/values/styles.xml | 21 ----------------- 15 files changed, 187 deletions(-) delete mode 100644 WordPress/src/main/res/anim/notifications_button_scale.xml delete mode 100644 WordPress/src/main/res/drawable-hdpi/ic_time_neutral_400_16dp.png delete mode 100644 WordPress/src/main/res/drawable-ldrtl/bg_rectangle_warning_surface.xml delete mode 100644 WordPress/src/main/res/drawable-ldrtl/bg_rectangle_warning_surface_with_padding.xml delete mode 100644 WordPress/src/main/res/drawable-ldrtl/comment_reply_background.xml delete mode 100644 WordPress/src/main/res/drawable-xhdpi/ic_time_neutral_400_16dp.png delete mode 100644 WordPress/src/main/res/drawable-xxhdpi/ic_time_neutral_400_16dp.png delete mode 100644 WordPress/src/main/res/drawable/bg_rectangle_warning_surface.xml delete mode 100644 WordPress/src/main/res/drawable/bg_rectangle_warning_surface_with_padding.xml delete mode 100644 WordPress/src/main/res/drawable/comment_reply_background.xml delete mode 100644 WordPress/src/main/res/menu/menu_comment_more.xml diff --git a/WordPress/src/main/java/org/wordpress/android/ui/notifications/blocks/CommentUserNoteBlock.kt b/WordPress/src/main/java/org/wordpress/android/ui/notifications/blocks/CommentUserNoteBlock.kt index ae8025dc84b4..7f6ba33b33e1 100644 --- a/WordPress/src/main/java/org/wordpress/android/ui/notifications/blocks/CommentUserNoteBlock.kt +++ b/WordPress/src/main/java/org/wordpress/android/ui/notifications/blocks/CommentUserNoteBlock.kt @@ -8,8 +8,6 @@ import android.text.TextUtils import android.view.View import android.widget.ImageView import android.widget.TextView -import androidx.core.text.HtmlCompat -import androidx.core.view.ViewCompat import org.wordpress.android.R import org.wordpress.android.fluxc.model.CommentStatus import org.wordpress.android.fluxc.tools.FormattableContent @@ -133,8 +131,6 @@ class CommentUserNoteBlock( return builder } - private fun hasCommentNestingLevel(): Boolean = mCommentData?.nestLevel?.let { return it > 0 } ?: false - override fun getViewHolder(view: View): Any = CommentUserNoteBlockHolder(view) private inner class CommentUserNoteBlockHolder constructor(view: View) { diff --git a/WordPress/src/main/res/anim/notifications_button_scale.xml b/WordPress/src/main/res/anim/notifications_button_scale.xml deleted file mode 100644 index f95e66bd4a05..000000000000 --- a/WordPress/src/main/res/anim/notifications_button_scale.xml +++ /dev/null @@ -1,15 +0,0 @@ - - - - diff --git a/WordPress/src/main/res/drawable-hdpi/ic_time_neutral_400_16dp.png b/WordPress/src/main/res/drawable-hdpi/ic_time_neutral_400_16dp.png deleted file mode 100644 index f09acf8570ecb5131f257396cce3a2709f630cfb..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 17807 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 fGd)@}77TEA;8WMr~dVL diff --git a/WordPress/src/main/res/drawable-ldrtl/bg_rectangle_warning_surface.xml b/WordPress/src/main/res/drawable-ldrtl/bg_rectangle_warning_surface.xml deleted file mode 100644 index 1f246053cd9f..000000000000 --- a/WordPress/src/main/res/drawable-ldrtl/bg_rectangle_warning_surface.xml +++ /dev/null @@ -1,16 +0,0 @@ - - - - - - - - - - - - - - diff --git a/WordPress/src/main/res/drawable-ldrtl/bg_rectangle_warning_surface_with_padding.xml b/WordPress/src/main/res/drawable-ldrtl/bg_rectangle_warning_surface_with_padding.xml deleted file mode 100644 index e16836bd0485..000000000000 --- a/WordPress/src/main/res/drawable-ldrtl/bg_rectangle_warning_surface_with_padding.xml +++ /dev/null @@ -1,22 +0,0 @@ - - - - - - - - - - - - - - - - - - - diff --git a/WordPress/src/main/res/drawable-ldrtl/comment_reply_background.xml b/WordPress/src/main/res/drawable-ldrtl/comment_reply_background.xml deleted file mode 100644 index 6959a71d6bd1..000000000000 --- a/WordPress/src/main/res/drawable-ldrtl/comment_reply_background.xml +++ /dev/null @@ -1,20 +0,0 @@ - - - - - - - - - - - - - - - diff --git a/WordPress/src/main/res/drawable-xhdpi/ic_time_neutral_400_16dp.png b/WordPress/src/main/res/drawable-xhdpi/ic_time_neutral_400_16dp.png deleted file mode 100644 index 83fb565331a84dc38e8c5c2d2611f72c5a913cea..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 17721 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 diff --git a/WordPress/src/main/res/drawable/bg_rectangle_warning_surface.xml b/WordPress/src/main/res/drawable/bg_rectangle_warning_surface.xml deleted file mode 100644 index 14f35576d8f6..000000000000 --- a/WordPress/src/main/res/drawable/bg_rectangle_warning_surface.xml +++ /dev/null @@ -1,16 +0,0 @@ - - - - - - - - - - - - - - diff --git a/WordPress/src/main/res/drawable/bg_rectangle_warning_surface_with_padding.xml b/WordPress/src/main/res/drawable/bg_rectangle_warning_surface_with_padding.xml deleted file mode 100644 index a7d384a6dda9..000000000000 --- a/WordPress/src/main/res/drawable/bg_rectangle_warning_surface_with_padding.xml +++ /dev/null @@ -1,22 +0,0 @@ - - - - - - - - - - - - - - - - - - - diff --git a/WordPress/src/main/res/drawable/comment_reply_background.xml b/WordPress/src/main/res/drawable/comment_reply_background.xml deleted file mode 100644 index 8e62422e2933..000000000000 --- a/WordPress/src/main/res/drawable/comment_reply_background.xml +++ /dev/null @@ -1,20 +0,0 @@ - - - - - - - - - - - - - - - diff --git a/WordPress/src/main/res/menu/menu_comment_more.xml b/WordPress/src/main/res/menu/menu_comment_more.xml deleted file mode 100644 index b9d51bf80d92..000000000000 --- a/WordPress/src/main/res/menu/menu_comment_more.xml +++ /dev/null @@ -1,20 +0,0 @@ - - - - - - diff --git a/WordPress/src/main/res/values/dimens.xml b/WordPress/src/main/res/values/dimens.xml index e659b3615736..30deac8cb317 100644 --- a/WordPress/src/main/res/values/dimens.xml +++ b/WordPress/src/main/res/values/dimens.xml @@ -265,7 +265,6 @@ 72dp - 6dp 240dp 10dp 0dp @@ -273,8 +272,6 @@ 20dp 17dp 22dp - 14dp - 6dp 8dp 12dp 18dp diff --git a/WordPress/src/main/res/values/reader_styles.xml b/WordPress/src/main/res/values/reader_styles.xml index f9aea6b3e587..64b2b7484182 100644 --- a/WordPress/src/main/res/values/reader_styles.xml +++ b/WordPress/src/main/res/values/reader_styles.xml @@ -124,14 +124,6 @@ bold - - - - - - -