empathicqubit/Signal-Android
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

Fix clickable area around link previews.

Browse source
This commit is contained in:
Alex Hart 2022-09-01 14:17:02 -03:00 • committed by Greyson Parrelli
parent 13eb89746b
commit 286010ce90
2 changed files with 8 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
app/src/main/java/org/thoughtcrime/securesms/stories/StoryLinkPreviewView.kt
View file

@ -32,9 +32,10 @@ class StoryLinkPreviewView @JvmOverloads constructor(
inflate(context, R.layout.stories_text_post_link_preview, this) inflate(context, R.layout.stories_text_post_link_preview, this)
} }
private val card: View = findViewById(R.id.link_preview_card)
private val close: View = findViewById(R.id.link_preview_close) private val close: View = findViewById(R.id.link_preview_close)
private val smallImage: ThumbnailView = findViewById(R.id.link_preview_image) private val smallImage: ThumbnailView = findViewById<ThumbnailView>(R.id.link_preview_image).apply { isClickable = false }
private val largeImage: ThumbnailView = findViewById(R.id.link_preview_large) private val largeImage: ThumbnailView = findViewById<ThumbnailView>(R.id.link_preview_large).apply { isClickable = false }
private val title: TextView = findViewById(R.id.link_preview_title) private val title: TextView = findViewById(R.id.link_preview_title)
private val url: TextView = findViewById(R.id.link_preview_url) private val url: TextView = findViewById(R.id.link_preview_url)
private val description: TextView = findViewById(R.id.link_preview_description) private val description: TextView = findViewById(R.id.link_preview_description)
@ -63,7 +64,6 @@ class StoryLinkPreviewView @JvmOverloads constructor(
if (linkPreview != null) { if (linkPreview != null) {
visibility = View.VISIBLE visibility = View.VISIBLE
isClickable = true
val image = getThumbnailTarget(useLargeThumbnail) val image = getThumbnailTarget(useLargeThumbnail)
val notImage = getThumbnailTarget(!useLargeThumbnail) val notImage = getThumbnailTarget(!useLargeThumbnail)
@ -95,7 +95,6 @@ class StoryLinkPreviewView @JvmOverloads constructor(
formatUrl(linkPreview) formatUrl(linkPreview)
} else { } else {
visibility = hiddenVisibility visibility = hiddenVisibility
isClickable = false
} }
return future ?: SettableFuture(false) return future ?: SettableFuture(false)
@ -142,6 +141,10 @@ class StoryLinkPreviewView @JvmOverloads constructor(
close.setOnClickListener(onClickListener) close.setOnClickListener(onClickListener)
} }
fun setOnPreviewClickListener(onClickListener: OnClickListener?) {
card.setOnClickListener(onClickListener)
}
fun setCanClose(canClose: Boolean) { fun setCanClose(canClose: Boolean) {
close.visible = canClose close.visible = canClose
} }

2
app/src/main/java/org/thoughtcrime/securesms/stories/StoryTextPostView.kt
View file

@ -184,7 +184,7 @@ class StoryTextPostView @JvmOverloads constructor(
} }
fun setLinkPreviewClickListener(onClickListener: OnClickListener?) { fun setLinkPreviewClickListener(onClickListener: OnClickListener?) {
linkPreviewView.setOnClickListener(onClickListener) linkPreviewView.setOnPreviewClickListener(onClickListener)
} }
fun showPostContent() { fun showPostContent() {