diff options
| author | Allan Wang <me@allanwang.ca> | 2017-07-09 00:24:40 -0700 |
|---|---|---|
| committer | Allan Wang <me@allanwang.ca> | 2017-07-09 00:24:40 -0700 |
| commit | 40d6788abfa46ac99f46b32fd4aeb78e67c3b6f6 (patch) | |
| tree | 523f72bd0c53817815fd0ab1aa7c3124a3264745 /colorpicker/src/main | |
| parent | bcc7dd36752829b650b583fd6ee6168de3e6f95a (diff) | |
| download | kau-40d6788abfa46ac99f46b32fd4aeb78e67c3b6f6.tar.gz kau-40d6788abfa46ac99f46b32fd4aeb78e67c3b6f6.tar.bz2 kau-40d6788abfa46ac99f46b32fd4aeb78e67c3b6f6.zip | |
Clean up gradle and test build
Diffstat (limited to 'colorpicker/src/main')
| -rw-r--r-- | colorpicker/src/main/kotlin/ca/allanwang/kau/colorpicker/ColorPickerDialog.kt | 1 | ||||
| -rw-r--r-- | colorpicker/src/main/kotlin/ca/allanwang/kau/colorpicker/ColorPickerView.kt | 3 |
2 files changed, 1 insertions, 3 deletions
diff --git a/colorpicker/src/main/kotlin/ca/allanwang/kau/colorpicker/ColorPickerDialog.kt b/colorpicker/src/main/kotlin/ca/allanwang/kau/colorpicker/ColorPickerDialog.kt index 6d23ade..e987c2c 100644 --- a/colorpicker/src/main/kotlin/ca/allanwang/kau/colorpicker/ColorPickerDialog.kt +++ b/colorpicker/src/main/kotlin/ca/allanwang/kau/colorpicker/ColorPickerDialog.kt @@ -4,7 +4,6 @@ import android.content.Context import android.graphics.Color import android.support.annotation.DimenRes import android.support.annotation.StringRes -import ca.allanwang.kau.R import ca.allanwang.kau.utils.string import com.afollestad.materialdialogs.MaterialDialog import com.afollestad.materialdialogs.Theme diff --git a/colorpicker/src/main/kotlin/ca/allanwang/kau/colorpicker/ColorPickerView.kt b/colorpicker/src/main/kotlin/ca/allanwang/kau/colorpicker/ColorPickerView.kt index 6565585..04345a1 100644 --- a/colorpicker/src/main/kotlin/ca/allanwang/kau/colorpicker/ColorPickerView.kt +++ b/colorpicker/src/main/kotlin/ca/allanwang/kau/colorpicker/ColorPickerView.kt @@ -11,7 +11,6 @@ import android.util.AttributeSet import android.view.View import android.view.ViewGroup import android.widget.* -import ca.allanwang.kau.R import ca.allanwang.kau.utils.* import com.afollestad.materialdialogs.DialogAction import com.afollestad.materialdialogs.MaterialDialog @@ -29,7 +28,7 @@ internal class ColorPickerView @JvmOverloads constructor( var selectedColor: Int = -1 var isInSub: Boolean = false var isInCustom: Boolean = false - var circleSize: Int = context.dimen(R.dimen.kau_cp_circle_size).toInt() + var circleSize: Int = context.dimen(R.dimen.kau_color_circle_size).toInt() val backgroundColor = context.resolveColor(R.attr.md_background_color, if (context.resolveColor(android.R.attr.textColorPrimary).isColorDark) Color.WHITE else 0xff424242.toInt()) val backgroundColorTint = backgroundColor.colorToForeground() |