diff options
author | Allan Wang <me@allanwang.ca> | 2019-10-19 22:38:45 -0700 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-10-19 22:38:45 -0700 |
commit | cd068b144ef533bccafc20b8b25ff72b56a93e23 (patch) | |
tree | f1136e879ef1e92b7f0390c23ea52f34a8e96e1e /colorpicker | |
parent | 8d42b8ec4049b62424ec3ea9cd80487409e381d9 (diff) | |
parent | 7007e61879bf33c09115b5d8bc16f27af2731045 (diff) | |
download | kau-cd068b144ef533bccafc20b8b25ff72b56a93e23.tar.gz kau-cd068b144ef533bccafc20b8b25ff72b56a93e23.tar.bz2 kau-cd068b144ef533bccafc20b8b25ff72b56a93e23.zip |
Merge pull request #233 from AllanWang/kotlin-math
Convert java math to kotlin math
Diffstat (limited to 'colorpicker')
-rw-r--r-- | colorpicker/src/main/kotlin/ca/allanwang/kau/colorpicker/CircleView.kt | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/colorpicker/src/main/kotlin/ca/allanwang/kau/colorpicker/CircleView.kt b/colorpicker/src/main/kotlin/ca/allanwang/kau/colorpicker/CircleView.kt index 29257d8..39fb1cf 100644 --- a/colorpicker/src/main/kotlin/ca/allanwang/kau/colorpicker/CircleView.kt +++ b/colorpicker/src/main/kotlin/ca/allanwang/kau/colorpicker/CircleView.kt @@ -41,6 +41,7 @@ import ca.allanwang.kau.utils.getDip import ca.allanwang.kau.utils.setBackgroundColorRes import ca.allanwang.kau.utils.toColor import ca.allanwang.kau.utils.toHSV +import kotlin.math.roundToInt /** * Created by Allan Wang on 2017-06-10. @@ -214,7 +215,7 @@ class CircleView @JvmOverloads constructor(context: Context, attrs: AttributeSet @ColorInt fun translucentColor(color: Int): Int { val factor = 0.7f - val alpha = Math.round(Color.alpha(color) * factor) + val alpha = (Color.alpha(color) * factor).roundToInt() val red = Color.red(color) val green = Color.green(color) val blue = Color.blue(color) |