performance optimizations

add new resource attrs
ibrahimsn98 · Dec 16, 2018 · 53dbada · 53dbada
1 parent a2babcf
commit 53dbada
Show file tree

Hide file tree

Showing 3 changed files with 32 additions and 17 deletions.
diff --git a/particle/build.gradle b/particle/build.gradle
@@ -7,8 +7,8 @@ android {
     defaultConfig {
         minSdkVersion 22
         targetSdkVersion 28
-        versionCode 1
-        versionName "1.0"
+        versionCode 2
+        versionName "1.1"
 
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
 

diff --git a/particle/src/main/java/me/ibrahimsn/particle/ParticleView.kt b/particle/src/main/java/me/ibrahimsn/particle/ParticleView.kt
@@ -9,32 +9,45 @@ import android.util.AttributeSet
 import android.view.View
 import android.view.ViewTreeObserver
 import kotlin.random.Random
-import android.support.v4.content.ContextCompat
-
 
 class ParticleView : View {
 
+    private lateinit var particles: Array<Particle>
+
     private var count = 20
     private var background = Color.RED
-
-    private var paint: Paint = Paint()
-    private lateinit var particles: Array<Particle>
+    private var minRadius = 5
+    private var maxRadius = 10
+
+    private val paint: Paint = Paint().apply {
+        isAntiAlias = true
+        style = Paint.Style.FILL_AND_STROKE
+        color = Color.WHITE
+        strokeWidth = 2F
+    }
 
     constructor(context: Context) : super(context)
     constructor(context: Context, attrs: AttributeSet?) : super(context, attrs) {
         val a = context.obtainStyledAttributes(attrs, R.styleable.ParticleView, 0, 0)
-        count = a.getInt(R.styleable.ParticleView_particleCount, 15)
-        background = a.getColor(R.styleable.ParticleView_backgroundColor, ContextCompat.getColor(context, android.R.color.holo_red_light))
-        a.recycle()
 
+        count = a.getInt(R.styleable.ParticleView_particleCount, count)
+        minRadius = a.getInt(R.styleable.ParticleView_minParticleRadius, minRadius)
+        maxRadius = a.getInt(R.styleable.ParticleView_maxParticleRadius, maxRadius)
+        background = a.getColor(R.styleable.ParticleView_backgroundColor, background)
+
+        if (count > 50)
+            count = 50
+
+        if (minRadius <= 0)
+            minRadius = 1
+
+        if (maxRadius <= minRadius)
+            maxRadius = minRadius + 1
+
+        a.recycle()
     }
 
     init {
-        paint.isAntiAlias = true
-        paint.style = Paint.Style.FILL_AND_STROKE
-        paint.color = Color.WHITE
-        paint.strokeWidth = 2F
-
         viewTreeObserver.addOnPreDrawListener(object: ViewTreeObserver.OnPreDrawListener {
             override fun onPreDraw(): Boolean {
                 if (viewTreeObserver.isAlive)
@@ -44,7 +57,7 @@ class ParticleView : View {
 
                 for (i in 0 until count)
                     array[i] = Particle(
-                        Random.nextInt(5, 10).toFloat(),
+                        Random.nextInt(minRadius, maxRadius).toFloat(),
                         Random.nextInt(0, width).toFloat(),
                         Random.nextInt(0, height).toFloat(),
                         Random.nextInt(-2, 2),
@@ -83,7 +96,7 @@ class ParticleView : View {
             canvas.drawCircle(particles[i].x, particles[i].y, particles[i].radius, paint)
         }
 
-        postInvalidateDelayed(5)
+        postInvalidateDelayed(20)
         invalidate()
     }
 

diff --git a/particle/src/main/res/values/attrs.xml b/particle/src/main/res/values/attrs.xml
@@ -3,5 +3,7 @@
     <declare-styleable name="ParticleView">
         <attr name="backgroundColor" format="color" />
         <attr name="particleCount" format="integer" />
+        <attr name="minParticleRadius" format="integer" />
+        <attr name="maxParticleRadius" format="integer" />
     </declare-styleable>
 </resources>