isoron/loop
1
1
Fork 0
mirror of https://github.com/iSoron/uhabits.git synced 2025-12-06 09:08:52 -06:00
Code Issues Packages Projects Releases Wiki Activity

Ensure RingView.diameter is never zero

Browse Source 
In rare cases, it seems either that `onDraw` is called before `onMeasure` or
that `onMeasure` is called with a view that has zero height/width. This causes
`reallocateCache` to produce an IllegalArgumentException. This patch ensures
that diameter is never zero.

Fixes #904
This commit is contained in:
Alinson S. Xavier
2021-05-23 11:21:49 -05:00
parent d87961d800
commit b33dd2a994
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
uhabits-android/src/main/java/org/isoron/uhabits/activities/common/views/RingView.kt
View File

@@ -41,6 +41,7 @@ import org.isoron.uhabits.utils.InterfaceUtils.getFontAwesome
import org.isoron.uhabits.utils.InterfaceUtils.spToPixels import org.isoron.uhabits.utils.InterfaceUtils.spToPixels
import org.isoron.uhabits.utils.PaletteUtils.getAndroidTestColor import org.isoron.uhabits.utils.PaletteUtils.getAndroidTestColor
import org.isoron.uhabits.utils.StyledResources import org.isoron.uhabits.utils.StyledResources
import kotlin.math.max
import kotlin.math.min import kotlin.math.min
import kotlin.math.roundToLong import kotlin.math.roundToLong
@@ -48,7 +49,7 @@ class RingView : View {
private var color: Int private var color: Int
private var precision: Float private var precision: Float
private var percentage: Float private var percentage: Float
private var diameter = 0 private var diameter = 1
private var thickness: Float private var thickness: Float
private var rect: RectF? = null private var rect: RectF? = null
private var pRing: TextPaint? = null private var pRing: TextPaint? = null
@@ -169,7 +170,7 @@ class RingView : View {
super.onMeasure(widthMeasureSpec, heightMeasureSpec) super.onMeasure(widthMeasureSpec, heightMeasureSpec)
val width = MeasureSpec.getSize(widthMeasureSpec) val width = MeasureSpec.getSize(widthMeasureSpec)
val height = MeasureSpec.getSize(heightMeasureSpec) val height = MeasureSpec.getSize(heightMeasureSpec)
diameter = min(height, width) diameter = max(1, min(height, width))
pRing!!.textSize = textSize pRing!!.textSize = textSize
em = pRing!!.measureText("M") em = pRing!!.measureText("M")
setMeasuredDimension(diameter, diameter) setMeasuredDimension(diameter, diameter)