fix #104 , wrong 'tap to show' button in vertical arrange thumbnails
This commit is contained in:
parent
d97dc031df
commit
981551c6e3
|
@ -91,7 +91,7 @@ internal class ItemViewHolder(
|
|||
|
||||
private lateinit var flMedia : View
|
||||
private lateinit var llMedia : View
|
||||
private lateinit var btnShowMedia : BlurhashView
|
||||
private lateinit var btnShowMedia : TextView
|
||||
private lateinit var ivMedia1 : MyNetworkImageView
|
||||
private lateinit var ivMedia2 : MyNetworkImageView
|
||||
private lateinit var ivMedia3 : MyNetworkImageView
|
||||
|
@ -290,10 +290,17 @@ internal class ItemViewHolder(
|
|||
cardBackground.width = (density * 1f)
|
||||
}
|
||||
|
||||
btnShowMedia.text = SpannableString(activity.getString(R.string.tap_to_show)).apply{
|
||||
(btnShowMedia as? BlurhashView)?.text =
|
||||
SpannableString(activity.getString(R.string.tap_to_show))
|
||||
.apply {
|
||||
val colorBg = getAttributeColor(activity, R.attr.colorShowMediaBackground)
|
||||
.applyAlphaMultiplier(0.5f)
|
||||
setSpan(BackgroundColorSpan(colorBg),0, this.length, Spannable.SPAN_EXCLUSIVE_EXCLUSIVE)
|
||||
setSpan(
|
||||
BackgroundColorSpan(colorBg),
|
||||
0,
|
||||
this.length,
|
||||
Spannable.SPAN_EXCLUSIVE_EXCLUSIVE
|
||||
)
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -1316,8 +1323,11 @@ internal class ItemViewHolder(
|
|||
setMedia(media_attachments, sb, ivMedia3, 2)
|
||||
setMedia(media_attachments, sb, ivMedia4, 3)
|
||||
|
||||
val m0 = if( media_attachments.isEmpty() ) null else media_attachments[0] as? TootAttachment
|
||||
btnShowMedia.blurhash = m0?.blurhash
|
||||
(btnShowMedia as? BlurhashView)?.let {
|
||||
val m0 =
|
||||
if(media_attachments.isEmpty()) null else media_attachments[0] as? TootAttachment
|
||||
it.blurhash = m0?.blurhash
|
||||
}
|
||||
|
||||
if(sb.isNotEmpty()) {
|
||||
tvMediaDescription.visibility = View.VISIBLE
|
||||
|
@ -3302,20 +3312,22 @@ internal class ItemViewHolder(
|
|||
}
|
||||
}
|
||||
|
||||
btnShowMedia = blurhashView {
|
||||
btnShowMedia = textView {
|
||||
|
||||
background =
|
||||
ContextCompat.getDrawable(context, R.drawable.btn_bg_transparent)
|
||||
|
||||
padding = dip(4)
|
||||
|
||||
minHeightCompat = dip(40)
|
||||
|
||||
errorColor = getAttributeColor(
|
||||
context,
|
||||
R.attr.colorShowMediaBackground
|
||||
)
|
||||
gravity = Gravity.CENTER_VERTICAL or Gravity.END
|
||||
|
||||
textColor = getAttributeColor(
|
||||
context,
|
||||
R.attr.colorShowMediaText
|
||||
)
|
||||
text = context.getString(R.string.tap_to_show)
|
||||
|
||||
}.lparams(matchParent, matchParent)
|
||||
}.lparams(wrapContent,wrapContent){
|
||||
gravity = Gravity.END
|
||||
}
|
||||
|
||||
}
|
||||
} else {
|
||||
|
|
Loading…
Reference in New Issue