Convert java math to kotlin math

2 files changed, 5 insertions, 2 deletions

diff --git a/core/src/main/kotlin/ca/allanwang/kau/ui/views/CollapsibleViewDelegate.kt b/core/src/main/kotlin/ca/allanwang/kau/ui/views/CollapsibleViewDelegate.kt
index 2a057cb..4e6326e 100644
--- a/core/src/main/kotlin/ca/allanwang/kau/ui/views/CollapsibleViewDelegate.kt
+++ b/core/src/main/kotlin/ca/allanwang/kau/ui/views/CollapsibleViewDelegate.kt
@@ -23,6 +23,7 @@ import ca.allanwang.kau.utils.KAU_EXPANDED
 import ca.allanwang.kau.utils.KAU_EXPANDING
 import ca.allanwang.kau.utils.goneIf
 import java.lang.ref.WeakReference
+import kotlin.math.roundToInt
 
 /**
  * Created by Allan Wang on 2017-08-03.
@@ -107,7 +108,7 @@ class CollapsibleViewDelegate : CollapsibleView {
         val v = view ?: return Pair(0, 0)
         val size = v.measuredHeight
         v.goneIf(expansion == 0f && size == 0)
-        return Pair(v.measuredWidth, Math.round(size * expansion))
+        return Pair(v.measuredWidth, (size * expansion).roundToInt())
     }
 
     private fun animateSize(target: Float) {
diff --git a/core/src/main/kotlin/ca/allanwang/kau/ui/views/RippleCanvas.kt b/core/src/main/kotlin/ca/allanwang/kau/ui/views/RippleCanvas.kt
index a972447..bd8f689 100644
--- a/core/src/main/kotlin/ca/allanwang/kau/ui/views/RippleCanvas.kt
+++ b/core/src/main/kotlin/ca/allanwang/kau/ui/views/RippleCanvas.kt
@@ -27,6 +27,8 @@ import android.graphics.PorterDuff
 import android.graphics.PorterDuffXfermode
 import android.util.AttributeSet
 import android.view.View
+import kotlin.math.hypot
+import kotlin.math.max
 
 /**
  * Created by Allan Wang on 2016-11-17.
@@ -93,7 +95,7 @@ class RippleCanvas @JvmOverloads constructor(
             END -> h
             else -> startY
         }
-        val maxRadius = Math.hypot(Math.max(x, w - x).toDouble(), Math.max(y, h - y).toDouble()).toFloat()
+        val maxRadius = hypot(max(x, w - x).toDouble(), max(y, h - y).toDouble()).toFloat()
         val ripple = Ripple(color, x, y, 0f, maxRadius)
         ripples.add(ripple)
         val animator = ValueAnimator.ofFloat(0f, maxRadius)