From 987841940260c9f4799d2796eede5f67f2790eea Mon Sep 17 00:00:00 2001 From: Bnyro Date: Tue, 19 Mar 2024 21:52:10 +0100 Subject: [PATCH] fix: comment expands when tapping in timestamp --- .../libretube/ui/adapters/CommentPagingAdapter.kt | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/app/src/main/java/com/github/libretube/ui/adapters/CommentPagingAdapter.kt b/app/src/main/java/com/github/libretube/ui/adapters/CommentPagingAdapter.kt index a60fbf389..2c163291d 100644 --- a/app/src/main/java/com/github/libretube/ui/adapters/CommentPagingAdapter.kt +++ b/app/src/main/java/com/github/libretube/ui/adapters/CommentPagingAdapter.kt @@ -40,10 +40,16 @@ class CommentPagingAdapter( private val dismiss: () -> Unit ) : PagingDataAdapter(CommentCallback) { private val isRepliesAdapter = parentComment != null + private var clickEventConsumedByLinkHandler = false override fun getItemCount() = (if (isRepliesAdapter) 1 else 0) + super.getItemCount() private fun navigateToReplies(comment: Comment) { + if (clickEventConsumedByLinkHandler) { + clickEventConsumedByLinkHandler = false + return + } + val args = bundleOf(IntentData.videoId to videoId, IntentData.comment to comment) fragment!!.parentFragmentManager.commit { replace(R.id.commentFragContainer, args = args) @@ -66,8 +72,12 @@ class CommentPagingAdapter( .getString(R.string.commentedTimeWithSeparator, comment.commentedTime) commentText.movementMethod = LinkMovementMethodCompat.getInstance() + val linkHandler = LinkHandler { + clickEventConsumedByLinkHandler = true + handleLink?.invoke(it) + } commentText.text = comment.commentText?.replace("", " ") - ?.parseAsHtml(tagHandler = HtmlParser(LinkHandler(handleLink ?: {}))) + ?.parseAsHtml(tagHandler = HtmlParser(linkHandler)) ImageHelper.loadImage(comment.thumbnail, commentorImage, true) likesTextView.text = comment.likeCount.formatShort()