Merge pull request #47 from gdg-berlin-android/add/yubico

Add Yubico as a sponsor

Author: mariobodemann

app/src/main/java/de/berlindroid/zepatch/MainActivity.kt

@@ -163,7 +163,7 @@ private fun PatchableList(
                 onClick = { onItemClicked(name) },
             ) {
                 Column(
-                    modifier = Modifier.padding(8.dp),
+                    modifier = Modifier.padding(8.dp)
                 ) {
                     Row(
                         modifier = Modifier.fillMaxWidth(),
@@ -176,7 +176,12 @@ private fun PatchableList(
                         )
                     }
                     Box(Modifier.height(4.dp))
-                    PatchableBoundingBox(patchable = patchable)
+                    Row(
+                        modifier = Modifier.fillMaxWidth(),
+                        horizontalArrangement = Arrangement.Center
+                    ) {
+                        PatchableBoundingBox(patchable = patchable)
+                    }
                 }
             }
         }

app/src/main/java/de/berlindroid/zepatch/patchable/Demo.kt

@@ -94,6 +94,26 @@ fun GoogleLogo(
 }
 
 
+@OptIn(ExperimentalMaterial3Api::class)
+@Patch("YubicoLogo")
+@Composable
+fun YubicoLogo(
+    shouldCapture: Boolean = false,
+    onBitmap: (ImageBitmap) -> Unit = {},
+) {
+    SafeArea(
+        shouldCapture = shouldCapture,
+        onBitmap = onBitmap,
+    ) {
+        Image(
+            modifier = Modifier.size(200.dp),
+            painter = painterResource(R.drawable.yubico),
+            contentDescription = null
+        )
+    }
+}
+
+
 @OptIn(ExperimentalMaterial3Api::class)
 @Patch("Android")
 @Composable

app/src/main/java/de/berlindroid/zepatch/ui/PatchableToReducedBitmap.kt

@@ -90,14 +90,14 @@ fun PatchableToReducedBitmap(
             supportingText = {
                 if (!isValidColorCount(colorText)) {
                     Text(
-                        text = "Please enter a valid number (3 or more)",
+                        text = "Please enter a valid color count (between 1 and 7)",
                         color = androidx.compose.material3.MaterialTheme.colorScheme.error
                     )
                 }
             }
         )
 
-        Button(enabled = isValidColorCount(colorText) , onClick = computeReducedBitmap) { Text("Reduce") }
+        Button(enabled = isValidColorCount(colorText), onClick = computeReducedBitmap) { Text("Reduce") }
 
         reducedImage?.let {
             Image(
@@ -109,14 +109,8 @@ fun PatchableToReducedBitmap(
     }
 }
 
-fun isValidColorCount(colorCountText: String): Boolean  =
-    when {
-        colorCountText.isEmpty() -> false
-        colorCountText.toIntOrNull() == null -> false
-        colorCountText.toInt() < 3 -> false
-        else -> true
-    }
-
+fun isValidColorCount(colorCountText: String): Boolean =
+    (colorCountText.toIntOrNull() ?: -1) in 1..7
 
 
 @Preview(showBackground = true)

app/src/main/java/de/berlindroid/zepatch/utils/Text.kt

@@ -17,13 +17,9 @@ data class Histogram(
     val spread: Map<Color, Amount>
 )
 
-val Histogram.colors : Set<Color>
+val Histogram.colors: Set<Color>
     get() = spread.keys
 
-fun Histogram.hasAlpha(): Boolean = colors.firstOrNull {
-    it.alpha < 0xff
-} != null
-
 fun Bitmap.colorHistogram(): Histogram {
     // all colors
     val result = mutableMapOf<Color, Amount>()
@@ -45,21 +41,29 @@ fun Bitmap.colorHistogram(): Histogram {
 }
 
 fun Bitmap.reduceColors(maxColorCounts: Int): Pair<Bitmap, Histogram> {
-    var histogram = colorHistogram().mergeSimilarColors().removeLowCounts()
-    val hasAlpha = histogram.hasAlpha()
-    val desiredColorCount = (if (hasAlpha) 1 else 0) + maxColorCounts
+    val minDistance = 25
+    var histogram =
+        colorHistogram()
+            .mergeSimilarColors(maxColorCounts, minDistance)
+            .removeLowCounts(maxColorCounts, minDistance)
 
     var maxTries = 3
-    while (histogram.colors.size > desiredColorCount && maxTries > 0) {
-        histogram = histogram.mergeSimilarColors().removeLowCounts()
+    while (histogram.colors.size > maxColorCounts && maxTries > 0) {
+        histogram = histogram
+            .mergeSimilarColors(maxColorCounts, minDistance)
+            .removeLowCounts(maxColorCounts, minDistance)
         maxTries--
     }
 
     maxTries = 3
     var currentDistance = 50
+
     // reduce more aggressively
-    while (histogram.colors.size > desiredColorCount && maxTries > 0) {
-        histogram = histogram.mergeSimilarColors(currentDistance).removeLowCounts()
+    while (histogram.colors.size > maxColorCounts && maxTries > 0) {
+        histogram = histogram
+            .mergeSimilarColors(maxColorCounts, currentDistance)
+            .removeLowCounts(maxColorCounts, currentDistance)
+
         currentDistance = (currentDistance * 1.25f).toInt()
         maxTries--
     } // todo if not reject and give up
@@ -69,7 +73,7 @@ fun Bitmap.reduceColors(maxColorCounts: Int): Pair<Bitmap, Histogram> {
             .spread
             .toList()
             .sortedByDescending { it.second }
-            .take(desiredColorCount)
+            .take(maxColorCounts)
             .toMap()
     )
 
@@ -86,7 +90,11 @@ fun Bitmap.reduceColors(maxColorCounts: Int): Pair<Bitmap, Histogram> {
     return result to histogram
 }
 
-fun Histogram.mergeSimilarColors(distance: Int = 25): Histogram {
+fun Histogram.mergeSimilarColors(maxColorCounts: Int, distance: Int): Histogram {
+    if (spread.size <= maxColorCounts) {
+        return this
+    }
+
     val result = mutableMapOf<Color, Amount>()
 
     for (e in spread) {
@@ -109,7 +117,11 @@ fun Histogram.mergeSimilarColors(distance: Int = 25): Histogram {
     return Histogram(result)
 }
 
-fun Histogram.removeLowCounts(threshold: Int = 25): Histogram {
+fun Histogram.removeLowCounts(maxColorCounts: Int, threshold: Int): Histogram {
+    if (spread.size <= maxColorCounts) {
+        return this
+    }
+
     val result = mutableMapOf<Color, Amount>()
     var removedCount = 0
 
@@ -143,27 +155,21 @@ private fun IntArray.filteredBy(targetPixels: List<Int>): IntArray {
 }
 
 private fun distance(a: Int, b: Int): Float {
-    val aA = a.alpha
+    val aR = a.red
+    val aG = a.green
+    val aB = a.blue
 
-    return if (aA < 0xff) {
-        0f
-    } else {
-        val aR = a.red
-        val aG = a.green
-        val aB = a.blue
+    val aLAB = DoubleArray(3)
+    RGBToLAB(aR, aG, aB, aLAB)
 
-        val aLAB = DoubleArray(3)
-        RGBToLAB(aR, aG, aB, aLAB)
+    val bR = b.red
+    val bG = b.green
+    val bB = b.blue
 
-        val bR = b.red
-        val bG = b.green
-        val bB = b.blue
+    val bLAB = DoubleArray(3)
+    RGBToLAB(bR, bG, bB, bLAB)
 
-        val bLAB = DoubleArray(3)
-        RGBToLAB(bR, bG, bB, bLAB)
-
-        ColorUtils.distanceEuclidean(aLAB, bLAB).toFloat()
-    }
+    return ColorUtils.distanceEuclidean(aLAB, bLAB).toFloat()
 }