feat: Cat Editor draw logic

Signed-off-by: Hu Shenghao <[email protected]>

Author: hushenghao

feature/cat-editor/src/main/java/com/dede/android_eggs/cat_editor/CatEditor.kt

@@ -31,6 +31,7 @@ import androidx.compose.ui.ExperimentalComposeUiApi
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.geometry.Offset
 import androidx.compose.ui.geometry.Size
+import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.graphics.Matrix
 import androidx.compose.ui.graphics.graphicsLayer
 import androidx.compose.ui.input.pointer.pointerInput
@@ -148,6 +149,15 @@ internal fun CatEditor(
                 label = "HighlightColorBlend"
             )
 
+            val partColorBlend: (index: Int) -> Color = { index ->
+                var color = controllerImpl.colorList[index]
+                if (selectedPart == index) {
+                    val blend = Utilities.getHighlightColor(color)
+                    color = Utilities.blendColor(color, blend, blendRatio)
+                }
+                color
+            }
+
             var canvasSize by remember { mutableStateOf(Size.Zero) }
             val canvasMatrix = remember(canvasSize) { createCanvasMatrix(canvasSize) }
 
@@ -205,17 +215,13 @@ internal fun CatEditor(
                         androidCanvasDraw(
                             canvasMatrix.asAndroidMatrix(),
                             bitmap,
-                            controllerImpl.colorList,
-                            selectedPart,
-                            blendRatio
+                            partColorBlend
                         )
                     } else {
                         // compose canvas draw
                         composeCanvasDraw(
                             canvasMatrix,
-                            controllerImpl.colorList,
-                            selectedPart,
-                            blendRatio
+                            partColorBlend
                         )
                     }
                 }

feature/cat-editor/src/main/java/com/dede/android_eggs/cat_editor/CatEditorAndroidCanvasDraw.kt

@@ -35,17 +35,15 @@ private val androidPaint = Paint(Paint.ANTI_ALIAS_FLAG)
 internal fun DrawScope.androidCanvasDraw(
     matrix: Matrix,
     bitmap: Bitmap,
-    colorList: List<androidx.compose.ui.graphics.Color>,
-    selectedPart: Int,
-    blendRatio: Float
+    onPartColor: (index: Int) -> androidx.compose.ui.graphics.Color,
 ) {
     // clear bitmap
     bitmap.eraseColor(Color.TRANSPARENT)
 
     // draw bitmap
     bitmap.applyCanvas {
         withMatrix(matrix) {
-            forEachCatDrawPart(colorList, selectedPart, blendRatio) { part, color ->
+            forEachCatDrawPart(onPartColor) { part, color ->
                 part.androidDrawLambda(this, color, androidPaint)
             }
         }

feature/cat-editor/src/main/java/com/dede/android_eggs/cat_editor/CatEditorComposeCanvasDraw.kt

@@ -7,29 +7,20 @@ import androidx.compose.ui.graphics.drawscope.withTransform
 
 
 internal fun forEachCatDrawPart(
-    colorList: List<Color>,
-    selectedPart: Int,
-    blendRatio: Float,
-    block: (part: CatParts.PathDraw, color: Color) -> Unit
+    onPartColor: (index: Int) -> Color,
+    onDrawPart: (part: CatParts.PathDraw, color: Color) -> Unit
 ) {
     CatParts.drawOrders.forEachIndexed { index, pathDraw ->
-        var color = colorList[index]
-        if (selectedPart == index) {
-            val blend = Utilities.getHighlightColor(color)
-            color = Utilities.blendColor(color, blend, blendRatio)
-        }
-        block(pathDraw, color)
+        onDrawPart(pathDraw, onPartColor(index))
     }
 }
 
 internal fun DrawScope.composeCanvasDraw(
     matrix: Matrix,
-    colorList: List<Color>,
-    selectedPart: Int,
-    blendRatio: Float
+    onPartColor: (index: Int) -> Color
 ) {
     withTransform({ transform(matrix) }) {
-        forEachCatDrawPart(colorList, selectedPart, blendRatio) { part, color ->
+        forEachCatDrawPart(onPartColor) { part, color ->
             part.drawLambda(this, color)
         }
     }