diff options
| author | Allan Wang <me@allanwang.ca> | 2017-10-13 23:42:57 -0400 |
|---|---|---|
| committer | Allan Wang <me@allanwang.ca> | 2017-10-13 23:42:57 -0400 |
| commit | afc1a0261985dcf8e7d73255c291098af1fdc966 (patch) | |
| tree | 5fad06062bf746b14f807e619d011cf41d83cf59 /colorpicker/src/main/kotlin | |
| parent | 1edb6e1ac1297f6feb229d8f89e07a88de1ae2e9 (diff) | |
| parent | a0b35316f7bb6014ebbd3e18be870e860b30ea71 (diff) | |
| download | kau-afc1a0261985dcf8e7d73255c291098af1fdc966.tar.gz kau-afc1a0261985dcf8e7d73255c291098af1fdc966.tar.bz2 kau-afc1a0261985dcf8e7d73255c291098af1fdc966.zip | |
Merge dev3.4.4
Diffstat (limited to 'colorpicker/src/main/kotlin')
| -rw-r--r-- | colorpicker/src/main/kotlin/ca/allanwang/kau/colorpicker/CircleView.kt | 4 |
1 files changed, 0 insertions, 4 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 d697c8b..ed98090 100644 --- a/colorpicker/src/main/kotlin/ca/allanwang/kau/colorpicker/CircleView.kt +++ b/colorpicker/src/main/kotlin/ca/allanwang/kau/colorpicker/CircleView.kt @@ -194,7 +194,6 @@ class CircleView @JvmOverloads constructor(context: Context, attrs: AttributeSet companion object { @ColorInt - @JvmStatic private fun translucentColor(color: Int): Int { val factor = 0.7f val alpha = Math.round(Color.alpha(color) * factor) @@ -205,7 +204,6 @@ class CircleView @JvmOverloads constructor(context: Context, attrs: AttributeSet } @ColorInt - @JvmStatic fun shiftColor(@ColorInt color: Int, @FloatRange(from = 0.0, to = 2.0) by: Float): Int { if (by == 1f) return color @@ -215,11 +213,9 @@ class CircleView @JvmOverloads constructor(context: Context, attrs: AttributeSet } @ColorInt - @JvmStatic fun shiftColorDown(@ColorInt color: Int): Int = shiftColor(color, 0.9f) @ColorInt - @JvmStatic fun shiftColorUp(@ColorInt color: Int): Int = shiftColor(color, 1.1f) } }
\ No newline at end of file |