diff --git a/uhabits-android/src/main/java/org/isoron/uhabits/activities/common/views/RingView.kt b/uhabits-android/src/main/java/org/isoron/uhabits/activities/common/views/RingView.kt index 34cbc82dc..59225dd2f 100644 --- a/uhabits-android/src/main/java/org/isoron/uhabits/activities/common/views/RingView.kt +++ b/uhabits-android/src/main/java/org/isoron/uhabits/activities/common/views/RingView.kt @@ -157,7 +157,7 @@ class RingView : View { pRing!!.xfermode = XFERMODE_CLEAR } else { pRing!!.color = - backgroundColor!! + backgroundColor!! } rect!!.inset(thickness, thickness) activeCanvas.drawArc(rect!!, 0f, 360f, true, pRing!!) @@ -165,17 +165,17 @@ class RingView : View { pRing!!.color = color pRing!!.textSize = textSize - if (isStrokedTextEnabled){ + if (isStrokedTextEnabled) { pRing!!.style = Paint.Style.STROKE pRing!!.strokeWidth = textSize / 15f } if (enableFontAwesome) pRing!!.typeface = getFontAwesome(context) activeCanvas.drawText( - text!!, - rect!!.centerX(), - rect!!.centerY() + 0.4f * em, - pRing!! + text!!, + rect!!.centerX(), + rect!!.centerY() + 0.4f * em, + pRing!! ) } if (activeCanvas !== canvas) canvas.drawBitmap(internalDrawingCache!!, 0f, 0f, null) diff --git a/uhabits-android/src/main/java/org/isoron/uhabits/widgets/views/CheckmarkWidgetView.kt b/uhabits-android/src/main/java/org/isoron/uhabits/widgets/views/CheckmarkWidgetView.kt index 3c343464f..72c95da64 100644 --- a/uhabits-android/src/main/java/org/isoron/uhabits/widgets/views/CheckmarkWidgetView.kt +++ b/uhabits-android/src/main/java/org/isoron/uhabits/widgets/views/CheckmarkWidgetView.kt @@ -146,14 +146,14 @@ class CheckmarkWidgetView : HabitWidgetView { } ring.setThickness(0.03f * width) super.onMeasure( - MeasureSpec.makeMeasureSpec(width, MeasureSpec.EXACTLY), - MeasureSpec.makeMeasureSpec(height, MeasureSpec.EXACTLY) + MeasureSpec.makeMeasureSpec(width, MeasureSpec.EXACTLY), + MeasureSpec.makeMeasureSpec(height, MeasureSpec.EXACTLY) ) } private fun init() { val appComponent: HabitsApplicationComponent = - (context.applicationContext as HabitsApplication).component + (context.applicationContext as HabitsApplication).component preferences = appComponent.preferences ring = findViewById(R.id.scoreRing) as RingView label = findViewById(R.id.label) as TextView