fix: clean up bill rendering discrepencies

* remove zIndex bump from globe
* drop waves above globe in stack
* remove gradient from grid

Signed-off-by: Brandon McAnsh <git@bmcreations.dev>

Author: bmc08gt

apps/flipcash/shared/bills/src/main/kotlin/com/flipcash/app/bills/CashBill.kt

@@ -288,7 +288,6 @@ private class CashBillGeometry(width: Dp, height: Dp) : Geometry(width, height)
                 fontSize = 40.nonScaledSp
             )
         }
-
 }
 
 @SuppressLint("UnusedBoxWithConstraintsScope")
@@ -364,32 +363,7 @@ internal fun CashBill(
                     topLeft = Offset(
                         x = geometry.gridPosition.x,
                         y = geometry.gridPosition.y,
-                    ),
-                    alpha = 0.5f,
-                )
-
-
-                // Waves
-                Image(
-                    modifier = Modifier
-                        .requiredWidth(geometry.globeWidth)
-                        .fillMaxHeight()
-                        .offset { IntOffset(x = geometry.wavesPosition.x.toInt(), y = 0) }
-                        .drawWithGradient(
-                            brush = { startY, endY ->
-                                CashBillDefaults.billColor(
-                                    token,
-                                    alpha = CashBillDefaults.CodeBackgroundOpacity,
-                                    startY = startY,
-                                    endY = endY
-                                )
-                            },
-                            startY = { it / 2f },
-                            blendMode = BlendMode.DstIn
-                        ),
-                    contentDescription = null,
-                    contentScale = ContentScale.FillBounds,
-                    painter = painterResource(R.drawable.ic_bill_waves),
+                    )
                 )
             }
 
@@ -403,11 +377,24 @@ internal fun CashBill(
                             x = geometry.globePosition.x.toInt(),
                             y = geometry.globePosition.y.toInt()
                         )
-                    }.zIndex(99f),
+                    },
                 painter = painterResource(R.drawable.ic_bill_globe),
                 contentDescription = null
             )
 
+            if (!hasCustomTexture) {
+                // Waves
+                Image(
+                    modifier = Modifier
+                        .requiredWidth(geometry.globeWidth)
+                        .fillMaxHeight()
+                        .offset { IntOffset(x = geometry.wavesPosition.x.toInt(), y = 0) },
+                    contentDescription = null,
+                    contentScale = ContentScale.FillBounds,
+                    painter = painterResource(R.drawable.ic_bill_waves),
+                )
+            }
+
             // Security strip
             SecurityStrip(geometry = geometry, token = token)
 
@@ -523,7 +510,7 @@ private fun SecurityStrip(
             .offset(geometry.securityStripPosition.x, geometry.securityStripPosition.y)
             .punchRectangle(CashBillDefaults.punchBrushIn(punch = Punch.SecurityStrip, token)),
     ) {
-        for (i in 0 until CashBillDefaults.SecurityStripCount) {
+        repeat(CashBillDefaults.SecurityStripCount) {
             Image(
                 modifier = Modifier
                     .weight(1f)
@@ -543,7 +530,7 @@ private fun Lines(
     spacing: Dp,
 ) {
     Row(modifier = modifier, horizontalArrangement = Arrangement.spacedBy(spacing)) {
-        for (i in 0 until count) {
+        repeat(count) {
             Box(
                 modifier = Modifier
                     .rotate(-18f)
@@ -567,7 +554,6 @@ private fun BillDecorImage(
     Canvas(
         modifier = modifier,
     ) {
-        // Hexagons
         image?.let {
             drawImage(
                 image = it,
@@ -594,7 +580,7 @@ private fun BillCode(
         modifier = modifier
             .punchCircle(
                 brush = CashBillDefaults.punchBrushIn(punch = Punch.Code, token),
-                blendMode = BlendMode.SrcOver,
+//                blendMode = BlendMode.SrcOver,
             ),
         contentAlignment = Alignment.Center
     ) {

ui/core/src/main/kotlin/com/getcode/ui/core/Modifier.kt

@@ -199,36 +199,44 @@ fun Modifier.circleBackground(color: Color, padding: Dp): Modifier {
     return this then backgroundModifier then layoutModifier
 }
 
-fun Modifier.punchRectangle(color: Color, blendMode: BlendMode = BlendMode.Src) = this.drawWithContent {
-    drawRect(
-        color,
-        blendMode = blendMode
-    )
+fun Modifier.punchRectangle(color: Color, blendMode: BlendMode = BlendMode.Src) =
+    this.drawWithContent {
+        drawRect(
+            color,
+            blendMode = blendMode
+        )
 
-    drawContent()
-}
+        drawContent()
+    }
 
-fun Modifier.punchRectangle(brush: Brush, blendMode: BlendMode = BlendMode.Src) = this.drawWithContent {
-    drawRect(
-        brush,
-        blendMode = blendMode
-    )
+fun Modifier.punchRectangle(brush: Brush, blendMode: BlendMode = BlendMode.Src) =
+    this.drawWithContent {
+        drawRect(
+            brush,
+            blendMode = blendMode
+        )
 
-    drawContent()
-}
+        drawContent()
+    }
 
-fun Modifier.punchCircle(color: Color, blendMode: BlendMode = BlendMode.Src) = this.drawWithContent {
-    drawCircle(
-        color,
-        blendMode = blendMode
-    )
+fun Modifier.punchCircle(color: Color, blendMode: BlendMode = BlendMode.Src) =
+    this.drawWithContent {
+        drawCircle(
+            color,
+            blendMode = blendMode
+        )
 
-    drawContent()
-}
+        drawContent()
+    }
 
 fun Modifier.punchCircle(brush: Brush, blendMode: BlendMode = BlendMode.Src) = this.drawWithContent {
     drawCircle(
-        brush,
+        brush = brush,
+        blendMode = BlendMode.Clear,
+    )
+
+    drawCircle(
+        brush = brush,
         blendMode = blendMode
     )
 
@@ -271,7 +279,8 @@ fun Modifier.drawWithGradient(
             drawRect(
                 brush = Brush.verticalGradient(
                     startY = startY(height.toPx()),
-                    endY = endY(height.toPx()).takeIf { it != Float.POSITIVE_INFINITY } ?: height.toPx(),
+                    endY = endY(height.toPx()).takeIf { it != Float.POSITIVE_INFINITY }
+                        ?: height.toPx(),
                     colors = colors,
                 ),
                 blendMode = blendMode
@@ -291,7 +300,6 @@ fun Modifier.drawWithGradient(
 
     val density = LocalDensity.current
 
-
     Modifier
         .onPlaced {
             height = with(density) { it.size.height.toDp() }