From 89b70936bd0efeca758d1627c376170ae51375f8 Mon Sep 17 00:00:00 2001 From: Mariotaku Lee Date: Thu, 9 Mar 2017 09:58:50 +0800 Subject: [PATCH] fixed media status size crash --- build.gradle | 2 +- .../twidere/view/holder/MediaStatusViewHolder.kt | 12 ++++-------- 2 files changed, 5 insertions(+), 9 deletions(-) diff --git a/build.gradle b/build.gradle index 6e06dfce9..b12dc2f6b 100644 --- a/build.gradle +++ b/build.gradle @@ -40,7 +40,7 @@ subprojects { ObjectCursor : '0.9.16', PlayServices : '10.2.0', MapsUtils : '0.4.4', - Crashlyrics : '2.6.6', + Crashlyrics : '2.6.7', FabricPlugin : '1.22.1', DropboxCoreSdk : '2.1.2', GoogleDriveApi : 'v3-rev61-1.22.0', diff --git a/twidere/src/main/kotlin/org/mariotaku/twidere/view/holder/MediaStatusViewHolder.kt b/twidere/src/main/kotlin/org/mariotaku/twidere/view/holder/MediaStatusViewHolder.kt index f5d74b70a..47fad5d2d 100644 --- a/twidere/src/main/kotlin/org/mariotaku/twidere/view/holder/MediaStatusViewHolder.kt +++ b/twidere/src/main/kotlin/org/mariotaku/twidere/view/holder/MediaStatusViewHolder.kt @@ -43,9 +43,7 @@ class MediaStatusViewHolder(private val adapter: IStatusesAdapter<*>, itemView: private val mediaImageView = itemView.mediaImage private val mediaTextView = itemView.mediaText - private val aspectRatioSource = SimpleAspectRatioSource().apply { - setSize(100, 100) - } + private val aspectRatioSource = SimpleAspectRatioSource() private var listener: IStatusViewHolder.StatusClickListener? = null @@ -74,11 +72,7 @@ class MediaStatusViewHolder(private val adapter: IStatusesAdapter<*>, itemView: mediaTextView.text = status.text_unescaped } - if (firstMedia.width > 0 && firstMedia.height > 0) { - aspectRatioSource.setSize(firstMedia.width, firstMedia.height) - } else { - aspectRatioSource.setSize(100, 100) - } + aspectRatioSource.setSize(firstMedia.width, firstMedia.height) mediaImageContainer.tag = firstMedia mediaImageContainer.requestLayout() @@ -133,10 +127,12 @@ class MediaStatusViewHolder(private val adapter: IStatusesAdapter<*>, itemView: private var height: Int = 0 override fun getWidth(): Int { + if (width <= 0 || height <= 0) return 100 return width } override fun getHeight(): Int { + if (width <= 0 || height <= 0) return 100 return height }