use long for time values

Author: UrAvgCode

app/src/main/java/com/uravgcode/chooser/chooser/presentation/Chooser.kt

@@ -54,7 +54,7 @@ class Chooser(
 
     private val screenHeight = resources.displayMetrics.heightPixels
     private val scale = resources.displayMetrics.density
-    private var lastTime = System.currentTimeMillis()
+    private var previousTime = System.currentTimeMillis()
 
     private val handler = Handler(Looper.getMainLooper())
 
@@ -78,8 +78,9 @@ class Chooser(
     }
 
     override fun onDraw(canvas: Canvas) {
-        val deltaTime = (System.currentTimeMillis() - lastTime).toInt()
-        lastTime = System.currentTimeMillis()
+        val currentTime = System.currentTimeMillis()
+        val deltaTime = currentTime - previousTime
+        previousTime = currentTime
 
         circles.update(deltaTime)
 
@@ -175,9 +176,9 @@ class Chooser(
                 }, 150)
             },
             when (mode) {
-                Mode.SINGLE -> Circle.Companion.circleLifetime
-                Mode.GROUP -> GroupCircle.Companion.circleLifetime
-                Mode.ORDER -> OrderCircle.Companion.circleLifetime
+                Mode.SINGLE -> Circle.circleLifetime
+                Mode.GROUP -> GroupCircle.circleLifetime
+                Mode.ORDER -> OrderCircle.circleLifetime
             }
         )
     }
@@ -257,9 +258,10 @@ class Chooser(
         soundManager.playFingerUp()
         vibrate(40)
 
-        handler.postDelayed({
-            chooseOrder(number + 1)
-        }, (min(3000 / circles.size, 800).toLong()))
+        handler.postDelayed(
+            { chooseOrder(number + 1) },
+            min(3000L / circles.size, 800L)
+        )
     }
 
     private fun vibrate(millis: Long) {

app/src/main/java/com/uravgcode/chooser/chooser/presentation/circle/Circle.kt

@@ -61,7 +61,7 @@ open class Circle(var x: Float, var y: Float, radius: Float, var color: Int) {
 
     protected var timeMillis = 0L
 
-    open fun update(deltaTime: Int) {
+    open fun update(deltaTime: Long) {
         val radius = coreRadius + radiusVariance * sin(timeMillis * 0.006f)
         val innerRadius = radius * 0.6f
         val strokeWidth = radius * 0.19f

app/src/main/java/com/uravgcode/chooser/chooser/presentation/circle/GroupCircle.kt

@@ -31,7 +31,7 @@ class GroupCircle(x: Float, y: Float, radius: Float) : Circle(x, y, radius, Colo
         ringPaintLight.color = grayStroke
     }
 
-    override fun update(deltaTime: Int) {
+    override fun update(deltaTime: Long) {
         super.update(deltaTime)
         if (color == corePaint.color || blend > 1f) return
 

app/src/main/java/com/uravgcode/chooser/chooser/presentation/circle/OrderCircle.kt

@@ -42,7 +42,7 @@ class OrderCircle(x: Float, y: Float, radius: Float, color: Int) : Circle(x, y,
 
     private var number: Int? = null
 
-    override fun update(deltaTime: Int) {
+    override fun update(deltaTime: Long) {
         super.update(deltaTime)
         corePaint.color = if (coreRadius <= defaultRadius) {
             color

app/src/main/java/com/uravgcode/chooser/chooser/presentation/component/Number.kt

@@ -30,9 +30,9 @@ class Number(private var x: Float, private var y: Float, color: Int, private val
     private val xOrigin = x
     private var alpha = 255f
     private var alphaSpeed = 0f
-    private var time = 0
+    private var time = 0L
 
-    fun update(deltaTime: Int) {
+    fun update(deltaTime: Long) {
         alphaSpeed += deltaTime * 0.00004f
         alpha -= alphaSpeed * deltaTime
         alphaSpeed += deltaTime * 0.00004f

app/src/main/java/com/uravgcode/chooser/chooser/presentation/manager/CircleManager.kt

@@ -45,7 +45,7 @@ class CircleManager : MutableMap<Int, Circle> {
         }
     }
 
-    fun update(deltaTime: Int) {
+    fun update(deltaTime: Long) {
         activeCircles.forEach { (_, circle) -> circle.update(deltaTime) }
         deadCircles.forEach { it.update(deltaTime) }
         deadCircles.removeAll { it.isMarkedForDeletion() }