Apply badge color mask only for default color (#35)

* Reuse super state instead of instantiate a new one during the saving instance

* Apply badge color mask only if there is no badge color defined

* Remove lint warnings

* Update screenshots for tests

Author: andremion

counterfab/src/main/java/com/andremion/counterfab/CounterFab.kt

@@ -30,10 +30,12 @@ import android.util.AttributeSet
 import android.util.Property
 import android.view.animation.OvershootInterpolator
 import androidx.annotation.IntRange
+import androidx.core.graphics.ColorUtils
 import androidx.core.os.bundleOf
 import androidx.core.view.ViewCompat
 import com.google.android.material.floatingactionbutton.FloatingActionButton
 import com.google.android.material.stateful.ExtendableSavedState
+import kotlin.math.max
 
 private val STATE_KEY = CounterFab::class.java.name + ".STATE"
 private const val COUNT_STATE = "COUNT"
@@ -78,11 +80,7 @@ class CounterFab @JvmOverloads constructor(
     private val textPadding = TEXT_PADDING_DP * resources.displayMetrics.density
 
     private val circlePaint = Paint(Paint.ANTI_ALIAS_FLAG).apply {
-        style = Paint.Style.FILL
-    }
-    private val maskPaint = Paint(Paint.ANTI_ALIAS_FLAG).apply {
-        style = Paint.Style.FILL
-        color = MASK_COLOR
+        style = Style.FILL
     }
     private val textPaint = Paint(Paint.ANTI_ALIAS_FLAG).apply {
         style = Style.FILL_AND_STROKE
@@ -158,7 +156,9 @@ class CounterFab @JvmOverloads constructor(
                 circlePaint.color
             }
         }
-    }
+    }.applyColorMask()
+
+    private fun Int.applyColorMask() = ColorUtils.compositeColors(MASK_COLOR, this)
 
     /**
      * Increase the current count value by 1
@@ -199,7 +199,7 @@ class CounterFab @JvmOverloads constructor(
     }
 
     private fun calculateCircleBounds() {
-        val circleRadius = Math.max(textBounds.width(), textBounds.height()) / 2f + textPadding
+        val circleRadius = max(textBounds.width(), textBounds.height()) / 2f + textPadding
         val circleEnd = (circleRadius * 2).toInt()
         if (isSizeMini) {
             val circleStart = (circleRadius / 2).toInt()
@@ -245,8 +245,6 @@ class CounterFab @JvmOverloads constructor(
             val radius = circleBounds.width() / 2f * animationFactor
             // Solid circle
             canvas.drawCircle(cx, cy, radius, circlePaint)
-            // Mask circle
-            canvas.drawCircle(cx, cy, radius, maskPaint)
             // Count text
             textPaint.textSize = textSize * animationFactor
             canvas.drawText(countText, cx, cy + textBounds.height() / 2f, textPaint)