Merge branch 'main' into add-dynamic-framerate

konfetti/compose/src/main/java/nl/dionsegijn/konfetti/compose/DrawShapes.kt

@@ -71,10 +71,5 @@ fun Shape.draw(drawScope: DrawScope, particle: Particle, imageResource: ImageBit
                 drawable.draw(it.nativeCanvas)
             }
         }
-        is Shape.Text -> {
-            drawScope.drawIntoCanvas {
-                it.nativeCanvas.drawText(text, particle.x, particle.y, particle.paint)
-            }
-        }
     }
 }

konfetti/core/src/main/java/nl/dionsegijn/konfetti/core/Particle.kt

@@ -1,6 +1,5 @@
 package nl.dionsegijn.konfetti.core
 
-import android.graphics.Paint
 import nl.dionsegijn.konfetti.core.models.Shape
 
 /**
@@ -25,5 +24,4 @@ data class Particle(
     val scaleX: Float,
     val shape: Shape,
     val alpha: Int,
-    val paint: Paint
 )

konfetti/core/src/main/java/nl/dionsegijn/konfetti/core/PartySystem.kt

@@ -65,6 +65,5 @@ fun Confetti.toParticle(): Particle {
         scaleX,
         shape,
         alpha,
-        paint
     )
 }

konfetti/core/src/main/java/nl/dionsegijn/konfetti/core/emitter/Confetti.kt

@@ -25,13 +25,6 @@ class Confetti(
     val rotationSpeed2D: Float = 1f,
     val pixelDensity: Float
 ) {
-    val paint: Paint = Paint()
-
-    init {
-        if (shape is Shape.Text) {
-            paint.textSize = shape.textSizeInPixels
-        }
-    }
 
     var rotation = 0f
     private var rotationWidth = width

konfetti/core/src/main/java/nl/dionsegijn/konfetti/core/models/Shape.kt

@@ -39,9 +39,4 @@ sealed interface Shape {
                 drawable.intrinsicHeight.toFloat() / drawable.intrinsicWidth
             }
     }
-
-    data class Text(
-        val text: String,
-        val textSizeInPixels: Float
-    ) : Shape
 }

konfetti/xml/src/main/java/nl/dionsegijn/konfetti/xml/DrawShapes.kt

@@ -20,7 +20,7 @@ import nl.dionsegijn.konfetti.core.models.Shape.Text
  * `size` and must vertically/horizontally center their asset if it does not have an equal width
  * and height.
  */
-fun Shape.draw(particle: Particle, canvas: Canvas, paint: Paint, size: Float) {
+fun Shape.draw(canvas: Canvas, paint: Paint, size: Float) {
 
     when (this) {
         Square -> canvas.drawRect(0f, 0f, size, size, paint)
@@ -50,8 +50,5 @@ fun Shape.draw(particle: Particle, canvas: Canvas, paint: Paint, size: Float) {
             drawable.setBounds(0, top, size.toInt(), top + height)
             drawable.draw(canvas)
         }
-        is Text -> {
-            canvas.drawText(text, particle.x, particle.y, particle.paint)
-        }
     }
 }

konfetti/xml/src/main/java/nl/dionsegijn/konfetti/xml/KonfettiView.kt

@@ -89,7 +89,7 @@ open class KonfettiView : View {
         canvas.rotate(rotation, centerX, width / 2)
         canvas.scale(scaleX, 1f)
 
-        shape.draw(this, canvas, paint, width)
+        shape.draw(canvas, paint, width)
         canvas.restoreToCount(saveCount)
     }