修正在 ConstraintLayout 中高度可能不正確的問題

aids61517 · Jul 13, 2019 · 41d262a · 41d262a
1 parent a227ddd
commit 41d262a
Showing 1 changed file with 3 additions and 8 deletions.
diff --git a/easyratingview/src/main/java/com/aids61517/easyratingview/EasyRatingView.kt b/easyratingview/src/main/java/com/aids61517/easyratingview/EasyRatingView.kt
@@ -32,7 +32,7 @@ class EasyRatingView @JvmOverloads constructor(
 
     var rating: Float = 0f
         set(value) {
-            field = value
+            field = if (value > numberStars) numberStars.toFloat() else value
             invalidate()
         }
 
@@ -65,23 +65,18 @@ class EasyRatingView @JvmOverloads constructor(
 
         val widthMode = MeasureSpec.getMode(widthMeasureSpec)
         val widthSize = MeasureSpec.getSize(widthMeasureSpec)
-        val heightMode = MeasureSpec.getMode(heightMeasureSpec)
-        val heightSize = MeasureSpec.getSize(heightMeasureSpec)
 
         var realWidth = widthSize
-        var realHeight = heightSize
         val drawableWidth = emptyDrawable.intrinsicWidth
         val drawableHeight = emptyDrawable.intrinsicHeight
         val needWidth = numberStars * drawableWidth + (numberStars - 1) * spacing
         if (widthMode == MeasureSpec.AT_MOST) {
             realWidth = if (needWidth < realWidth) needWidth else realWidth
             realWidth += paddingStart + paddingEnd
         }
-        if (heightMode == MeasureSpec.AT_MOST) {
-            realHeight = if (drawableHeight < realHeight) drawableHeight else realHeight
-            realHeight += paddingTop + paddingBottom
-        }
 
+        val expectHeight = drawableHeight + paddingTop + paddingBottom
+        val realHeight = resolveSizeAndState(expectHeight, heightMeasureSpec, 0)
         setMeasuredDimension(realWidth, realHeight)
     }