kavin/LibreTube
1
0
Fork 0
mirror of https://github.com/libre-tube/LibreTube.git synced 2025-04-29 00:10:32 +05:30
Code Issues Projects Releases Wiki Activity

Merge pull request #5773 from Bnyro/master

Browse Source 
fix: comment expands when tapping in timestamp
This commit is contained in:
Bnyro 2024-03-19 21:52:37 +01:00 committed by GitHub
commit 21214cfecf
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
app/src/main/java/com/github/libretube/ui/adapters/CommentPagingAdapter.kt
View File

@ -40,10 +40,16 @@ class CommentPagingAdapter(
private val dismiss: () -> Unit private val dismiss: () -> Unit
) : PagingDataAdapter<Comment, CommentsViewHolder>(CommentCallback) { ) : PagingDataAdapter<Comment, CommentsViewHolder>(CommentCallback) {
private val isRepliesAdapter = parentComment != null private val isRepliesAdapter = parentComment != null
private var clickEventConsumedByLinkHandler = false
override fun getItemCount() = (if (isRepliesAdapter) 1 else 0) + super.getItemCount() override fun getItemCount() = (if (isRepliesAdapter) 1 else 0) + super.getItemCount()
private fun navigateToReplies(comment: Comment) { private fun navigateToReplies(comment: Comment) {
if (clickEventConsumedByLinkHandler) {
clickEventConsumedByLinkHandler = false
return
}
val args = bundleOf(IntentData.videoId to videoId, IntentData.comment to comment) val args = bundleOf(IntentData.videoId to videoId, IntentData.comment to comment)
fragment!!.parentFragmentManager.commit { fragment!!.parentFragmentManager.commit {
replace<CommentsRepliesFragment>(R.id.commentFragContainer, args = args) replace<CommentsRepliesFragment>(R.id.commentFragContainer, args = args)
@ -66,8 +72,12 @@ class CommentPagingAdapter(
.getString(R.string.commentedTimeWithSeparator, comment.commentedTime) .getString(R.string.commentedTimeWithSeparator, comment.commentedTime)
commentText.movementMethod = LinkMovementMethodCompat.getInstance() commentText.movementMethod = LinkMovementMethodCompat.getInstance()
val linkHandler = LinkHandler {
clickEventConsumedByLinkHandler = true
handleLink?.invoke(it)
}
commentText.text = comment.commentText?.replace("</a>", "</a> ") commentText.text = comment.commentText?.replace("</a>", "</a> ")
?.parseAsHtml(tagHandler = HtmlParser(LinkHandler(handleLink ?: {}))) ?.parseAsHtml(tagHandler = HtmlParser(linkHandler))
ImageHelper.loadImage(comment.thumbnail, commentorImage, true) ImageHelper.loadImage(comment.thumbnail, commentorImage, true)
likesTextView.text = comment.likeCount.formatShort() likesTextView.text = comment.likeCount.formatShort()