diff options
| author | Allan Wang <me@allanwang.ca> | 2017-07-18 20:16:23 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-07-18 20:16:23 -0700 |
| commit | 8f2b5ac043f47cc44f43c3788d1377083fb339a2 (patch) | |
| tree | 8f91042414de211cbfe67a76298300884f46a765 /colorpicker/src/main/kotlin/ca | |
| parent | 4eee8d59c21b2061b9f5fd0e805ca60ab84c3585 (diff) | |
| download | kau-8f2b5ac043f47cc44f43c3788d1377083fb339a2.tar.gz kau-8f2b5ac043f47cc44f43c3788d1377083fb339a2.tar.bz2 kau-8f2b5ac043f47cc44f43c3788d1377083fb339a2.zip | |
Dev 2.1 (#8)
* Rewrite animation interfaces
* Update changelog
* Add scale factor for slide
* Remove margins in iitems and replace with decorators
* Remove mutable list
* Switch cardiitem to use lambdas for click
* status
* Utils update and imagepicker fixes
* Remove stringholder
* Add fade in fade out
* Increment about version
* Rename fromedge to direction in javadocs
* More logging
* Add logging and docs
* Make card icons visible
* Update email builder and icon padding
* Create elastic recycler activity
* Fix card iitem
* Add lint check and plurals
* Inline all the things
* Format and sort xml
* Update dependencies and increment version
Diffstat (limited to 'colorpicker/src/main/kotlin/ca')
| -rw-r--r-- | colorpicker/src/main/kotlin/ca/allanwang/kau/colorpicker/CircleView.kt | 7 |
1 files changed, 2 insertions, 5 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 04b26cb..d697c8b 100644 --- a/colorpicker/src/main/kotlin/ca/allanwang/kau/colorpicker/CircleView.kt +++ b/colorpicker/src/main/kotlin/ca/allanwang/kau/colorpicker/CircleView.kt @@ -24,10 +24,7 @@ import android.util.AttributeSet import android.view.Gravity import android.widget.FrameLayout import android.widget.Toast -import ca.allanwang.kau.utils.color -import ca.allanwang.kau.utils.getDip -import ca.allanwang.kau.utils.toColor -import ca.allanwang.kau.utils.toHSV +import ca.allanwang.kau.utils.* /** * Created by Allan Wang on 2017-06-10. @@ -82,7 +79,7 @@ class CircleView @JvmOverloads constructor(context: Context, attrs: AttributeSet } override fun setBackgroundResource(@ColorRes color: Int) { - setBackgroundColor(context.color(color)) + setBackgroundColorRes(color) } |