diff --git a/slidetoact/src/main/java/com/ncorti/slidetoact/SlideToActView.kt b/slidetoact/src/main/java/com/ncorti/slidetoact/SlideToActView.kt index 59577986..cfecfe20 100644 --- a/slidetoact/src/main/java/com/ncorti/slidetoact/SlideToActView.kt +++ b/slidetoact/src/main/java/com/ncorti/slidetoact/SlideToActView.kt @@ -96,7 +96,13 @@ class SlideToActView @JvmOverloads constructor ( var innerColor: Int = 0 set(value) { field = value - mInnerPaint.color = value + mTextPaint.color = value + invalidate() + } + + var textColor: Int = 0 + set(value) { + field = value mTextPaint.color = value invalidate() } @@ -179,6 +185,7 @@ class SlideToActView @JvmOverloads constructor ( init { val actualOuterColor : Int val actualInnerColor : Int + val actualTextColor : Int val layoutAttrs: TypedArray = context.theme.obtainStyledAttributes(attrs, R.styleable.SlideToActView, defStyleAttr, R.style.SlideToActView) @@ -190,9 +197,12 @@ class SlideToActView @JvmOverloads constructor ( mBorderRadius = layoutAttrs.getDimensionPixelSize(R.styleable.SlideToActView_border_radius, -1) val defaultOuter = ContextCompat.getColor(this.context, R.color.defaultAccent) - val defaultInner = ContextCompat.getColor(this.context, R.color.white) + val defaultWhite = ContextCompat.getColor(this.context, R.color.white) + actualOuterColor = layoutAttrs.getColor(R.styleable.SlideToActView_outer_color, defaultOuter) - actualInnerColor = layoutAttrs.getColor(R.styleable.SlideToActView_inner_color, defaultInner) + actualInnerColor = layoutAttrs.getColor(R.styleable.SlideToActView_inner_color, defaultWhite) + actualTextColor = layoutAttrs.getColor(R.styleable.SlideToActView_text_color, defaultWhite) + text = layoutAttrs.getString(R.styleable.SlideToActView_text) typeFace = layoutAttrs.getInt(R.styleable.SlideToActView_text_style, 0) @@ -228,6 +238,7 @@ class SlideToActView @JvmOverloads constructor ( outerColor = actualOuterColor innerColor = actualInnerColor + textColor = actualTextColor mIconMargin = context.resources.getDimensionPixelSize(R.dimen.default_icon_margin) mArrowMargin = mIconMargin diff --git a/slidetoact/src/main/res/values/attrs.xml b/slidetoact/src/main/res/values/attrs.xml index 1498fe7e..dec2bdf4 100644 --- a/slidetoact/src/main/res/values/attrs.xml +++ b/slidetoact/src/main/res/values/attrs.xml @@ -11,6 +11,7 @@ +