Improve expand buttons for long texts

This also improves the performance of BBCodeViews significantly

Author: rubengees

app/src/main/kotlin/com/proxerme/app/adapter/media/CommentAdapter.kt

@@ -147,20 +147,12 @@ class CommentAdapter : PagingAdapter<Comment>() {
         }
 
         private fun bindExpanded(item: Comment) {
-            val maximumHeight = DeviceUtils.convertDpToPx(comment.context, 150f)
-
-            if (comment.measureAndGetHeight(32f) <= maximumHeight) {
-                expand.visibility = View.GONE
-            } else {
-                expand.visibility = View.VISIBLE
-            }
-
             if (expandedMap.get(item.id.toLong(), false)) {
                 comment.maxHeight = Int.MAX_VALUE
 
                 ViewCompat.animate(expand).rotation(ROTATION_HALF)
             } else {
-                comment.maxHeight = maximumHeight
+                comment.maxHeight = DeviceUtils.convertDpToPx(comment.context, 150f)
 
                 ViewCompat.animate(expand).rotation(0f)
             }

app/src/main/kotlin/com/proxerme/app/adapter/news/NewsAdapter.kt

@@ -17,11 +17,11 @@ import com.proxerme.app.adapter.framework.PagingAdapter
 import com.proxerme.app.util.DeviceUtils
 import com.proxerme.app.util.TimeUtils
 import com.proxerme.app.util.bindView
-import com.proxerme.app.util.measureAndGetHeight
 import com.proxerme.library.connection.notifications.entitiy.News
 import com.proxerme.library.info.ProxerUrlHolder
 import java.util.*
 
+
 /**
  * TODO: Describe Class
  *
@@ -114,12 +114,6 @@ class NewsAdapter : PagingAdapter<News>() {
             time.text = TimeUtils.convertToRelativeReadableTime(time.context,
                     item.time)
 
-            if (description.measureAndGetHeight(14f) <= maximumHeight) {
-                expand.visibility = View.GONE
-            } else {
-                expand.visibility = View.VISIBLE
-            }
-
             if (expanded.containsKey(item.id)) {
                 description.maxHeight = Int.MAX_VALUE
 
@@ -130,6 +124,14 @@ class NewsAdapter : PagingAdapter<News>() {
                 ViewCompat.animate(expand).rotation(0f)
             }
 
+            description.post {
+                if (description.measuredHeight < maximumHeight) {
+                    expand.visibility = View.GONE
+                } else {
+                    expand.visibility = View.VISIBLE
+                }
+            }
+
             Glide.with(image.context)
                     .load(ProxerUrlHolder.getNewsImageUrl(item.id, item.imageId).toString())
                     .diskCacheStrategy(DiskCacheStrategy.SOURCE)

app/src/main/kotlin/com/proxerme/app/util/Extensions.kt

@@ -10,10 +10,8 @@ import android.support.v4.content.ContextCompat
 import android.support.v7.widget.LinearLayoutManager
 import android.support.v7.widget.RecyclerView
 import android.support.v7.widget.StaggeredGridLayoutManager
-import android.view.View
 import android.view.WindowManager
 import android.view.inputmethod.InputMethodManager
-import android.widget.TextView
 import com.proxerme.app.R
 import com.proxerme.app.activity.WebViewActivity
 import com.proxerme.app.adapter.framework.PagingAdapter
@@ -38,18 +36,6 @@ val Context.alarmManager: AlarmManager
 val Context.windowManager: WindowManager
     get() = getSystemService(Context.WINDOW_SERVICE) as WindowManager
 
-fun TextView.measureAndGetHeight(totalMarginDp: Float): Int {
-    val widthMeasureSpec = View.MeasureSpec.makeMeasureSpec(
-            DeviceUtils.getScreenWidth(context) - DeviceUtils.convertDpToPx(context, totalMarginDp),
-            View.MeasureSpec.AT_MOST)
-    val heightMeasureSpec = View.MeasureSpec.makeMeasureSpec(0,
-            View.MeasureSpec.UNSPECIFIED)
-
-    measure(widthMeasureSpec, heightMeasureSpec)
-
-    return measuredHeight
-}
-
 fun CustomTabsHelperFragment.openHttpPage(activity: Activity, url: HttpUrl) {
     val customTabsIntent = CustomTabsIntent.Builder(session)
             .setToolbarColor(ContextCompat.getColor(context, R.color.colorPrimary))

app/src/main/kotlin/com/proxerme/app/view/bbcode/BBCodeView.kt

@@ -4,9 +4,7 @@ import android.content.Context
 import android.support.v7.widget.AppCompatTextView
 import android.util.AttributeSet
 import android.view.View
-import android.view.ViewGroup
 import android.widget.LinearLayout
-import com.proxerme.app.util.DeviceUtils
 import java.util.*
 import kotlin.properties.Delegates
 
@@ -18,18 +16,11 @@ import kotlin.properties.Delegates
 class BBCodeView : LinearLayout {
 
     var bbCode by Delegates.observable<String?>(null, { property, old, new ->
-        if (old != new) {
-            build()
-        }
+        build()
     })
 
     var maxHeight = Int.MAX_VALUE
-
-    var expanded by Delegates.observable(true, { property, old, new ->
-        if (old != new) {
-            invalidate()
-        }
-    })
+    var expanded = true
 
     var spoilerStateListener: ((spoilerStates: List<Boolean>) -> Unit)? = null
 
@@ -73,29 +64,6 @@ class BBCodeView : LinearLayout {
         }
     }
 
-    fun measureAndGetHeight(totalMarginDp: Float): Int {
-        val previousMaxHeight = maxHeight
-        val previousSpoilerStates = getSpoilerStates()
-
-        maxHeight = Int.MAX_VALUE
-
-        setSpoilerStates(BooleanArray(spoilers.size, { true }).toList())
-
-        val widthMeasureSpec = View.MeasureSpec.makeMeasureSpec(DeviceUtils.getScreenWidth(context) -
-                DeviceUtils.convertDpToPx(context, totalMarginDp), View.MeasureSpec.AT_MOST)
-        val heightMeasureSpec = View.MeasureSpec.makeMeasureSpec(ViewGroup.LayoutParams.WRAP_CONTENT,
-                View.MeasureSpec.UNSPECIFIED)
-
-        measure(widthMeasureSpec, heightMeasureSpec)
-
-        val result = measuredHeight
-
-        maxHeight = previousMaxHeight
-        setSpoilerStates(previousSpoilerStates)
-
-        return result
-    }
-
     private fun build() {
         removeAllViews()
         spoilers.clear()