The redesign of comment details content #20798
+748
−1,367
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -4,9 +4,17 @@ package org.wordpress.android.ui.comments | |
|
|
||
| import android.os.Bundle | ||
| import androidx.core.view.isVisible | ||
| import com.gravatar.AvatarQueryOptions | ||
| import com.gravatar.AvatarUrl | ||
| import com.gravatar.types.Email | ||
| import org.wordpress.android.R | ||
| import org.wordpress.android.fluxc.model.CommentModel | ||
| import org.wordpress.android.fluxc.model.SiteModel | ||
| import org.wordpress.android.ui.comments.unified.CommentIdentifier | ||
| import org.wordpress.android.ui.comments.unified.CommentSource | ||
| import org.wordpress.android.ui.engagement.BottomSheetUiState | ||
| import org.wordpress.android.ui.reader.tracker.ReaderTracker | ||
| import org.wordpress.android.util.WPAvatarUtils | ||
|
|
||
| /** | ||
| * Used when called from comment list | ||
|
|
@@ -23,6 +31,28 @@ class SiteCommentDetailFragment : CommentDetailFragment() { | |
| } | ||
| } | ||
|
|
||
| override fun getUserProfileUiState(): BottomSheetUiState.UserProfileUiState { | ||
| return BottomSheetUiState.UserProfileUiState( | ||
| userAvatarUrl = CommentExtension.getAvatarUrl( | ||
| mComment!!, | ||
|
There was a problem hiding this comment. Nit pick: I wonder if we should avoid the non-null assertion operator for There was a problem hiding this comment. Hmmm, I just reviewed the I plan to replace it with |
||
| resources.getDimensionPixelSize(R.dimen.avatar_sz_large) | ||
| ), | ||
| blavatarUrl = "", | ||
| userName = mComment!!.authorName ?: getString(R.string.anonymous), | ||
| userLogin = mComment!!.authorEmail ?: "", | ||
| // keep them empty because there's no data for displaying on UI | ||
| userBio = "", | ||
| siteTitle = "", | ||
| siteUrl = "", | ||
| siteId = 0L, | ||
| blogPreviewSource = ReaderTracker.SOURCE_SITE_COMMENTS_USER_PROFILE | ||
| ) | ||
| } | ||
|
|
||
| override fun getCommentIdentifier(): CommentIdentifier = | ||
| CommentIdentifier.SiteCommentIdentifier(mComment!!.id, mComment!!.remoteCommentId) | ||
|
|
||
|
|
||
| override fun handleHeaderVisibility() { | ||
| mBinding?.headerView?.isVisible = true | ||
| } | ||
|
|
@@ -48,3 +78,19 @@ class SiteCommentDetailFragment : CommentDetailFragment() { | |
| } | ||
| } | ||
| } | ||
|
|
||
| object CommentExtension { | ||
| fun getAvatarUrl(comment: CommentModel, size: Int): String = when { | ||
| comment.authorProfileImageUrl != null -> WPAvatarUtils.rewriteAvatarUrl( | ||
| comment.authorProfileImageUrl!!, | ||
| size | ||
| ) | ||
|
|
||
| comment.authorEmail != null -> AvatarUrl( | ||
| Email(comment.authorEmail!!), | ||
| AvatarQueryOptions(size, null, null, null) | ||
| ).url().toString() | ||
|
|
||
| else -> "" | ||
| } | ||
| } | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,41 @@ | ||
| @file:Suppress("DEPRECATION") | ||
|
|
||
| package org.wordpress.android.ui.comments.unified | ||
|
|
||
| import android.view.LayoutInflater | ||
| import android.view.View | ||
| import android.widget.PopupWindow | ||
| import org.wordpress.android.R | ||
| import org.wordpress.android.databinding.CommentActionsBinding | ||
| import org.wordpress.android.ui.comments.CommentDetailFragment | ||
| import org.wordpress.android.util.ToastUtils | ||
|
|
||
| object CommentActionPopupHandler { | ||
| @JvmStatic | ||
| fun show(anchorView: View, listener: CommentDetailFragment.OnActionClickListener?) { | ||
| val popupWindow = PopupWindow(anchorView.context, null, R.style.WordPress) | ||
| popupWindow.isOutsideTouchable = true | ||
| popupWindow.elevation = anchorView.context.resources.getDimension(R.dimen.popup_over_toolbar_elevation) | ||
| popupWindow.contentView = CommentActionsBinding | ||
| .inflate(LayoutInflater.from(anchorView.context)) | ||
| .apply { | ||
| textUserInfo.setOnClickListener { | ||
| listener?.onUserInfoClicked() | ||
| popupWindow.dismiss() | ||
| } | ||
| textShare.setOnClickListener { | ||
| ToastUtils.showToast(it.context, "not yet implemented") | ||
| popupWindow.dismiss() | ||
| } | ||
| textEditComment.setOnClickListener { | ||
| listener?.onEditCommentClicked() | ||
| popupWindow.dismiss() | ||
| } | ||
| textChangeStatus.setOnClickListener { | ||
| ToastUtils.showToast(it.context, "not yet implemented") | ||
| popupWindow.dismiss() | ||
| } | ||
| }.root | ||
| popupWindow.showAsDropDown(anchorView) | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I'm not sure if it's safe to use the not-null assertion for
mNote. Shouldn't we use the same approach as for themComment?There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
In
NotificationCommentDetailFragment,mNoteshould be non-null afteronCreate().I replaced with
notehere.