Skip to content
This repository was archived by the owner on Oct 16, 2024. It is now read-only.

Added borderColorSelected #6

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Added borderColorSelected #6

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
3115799
Added borderColorSelected
simone-gasparini Jul 9, 2020
f7246f4
Added borderColorSelected
simone-gasparini Jul 9, 2020
ddd5d8d
Added borderColorSelected
simone-gasparini Jul 9, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 9 additions & 2 deletions segmented/src/main/java/com/creageek/segmentedbutton/SegmentedButton.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,7 @@ class SegmentedButton : RadioGroup, View.OnClickListener {
private var segmentFontChecked: Typeface? = null

private val borderColor: Int
private val borderColorSelected: Int
private val borderWidth: Int
private val borderInnerWidth: Int
private val r: Float
Expand Down Expand Up @@ -131,6 +132,11 @@ class SegmentedButton : RadioGroup, View.OnClickListener {
ContextCompat.getColor(context, R.color.default_border_color)
)

borderColorSelected = getColor(
R.styleable.SegmentedButton_borderColorSelected,
ContextCompat.getColor(context, R.color.default_border_color_selected)
)

borderWidth = getDimensionPixelSize(
R.styleable.SegmentedButton_borderWidth,
context.resources.getDimensionPixelSize(R.dimen.default_border_width)
Expand Down Expand Up @@ -226,7 +232,8 @@ class SegmentedButton : RadioGroup, View.OnClickListener {
type,
segmentColor,
segmentColorSelected,
borderColor
borderColor,
borderColorSelected
)

val rippleState = wrapSegmentStateDrawableWithRipple(
Expand Down Expand Up @@ -375,4 +382,4 @@ class SegmentedButton : RadioGroup, View.OnClickListener {
}
onFinishInflate()
}
}
}
3 changes: 2 additions & 1 deletion segmented/src/main/res/values/attrs.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
<attr name="rippleColor" format="color"/>
<attr name="rippleColorChecked" format="color"/>
<attr name="borderColor" format="color"/>
<attr name="borderColorSelected" format="color"/>
<attr name="borderWidth" format="dimension"/>
<attr name="cornerRadius" format="dimension"/>
<attr name="segmentFont" format="reference"/>
Expand All @@ -20,4 +21,4 @@
<enum name="wrap" value="1"/>
</attr>
</declare-styleable>
</resources>
</resources>
3 changes: 2 additions & 1 deletion segmented/src/main/res/values/colors.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,4 +10,5 @@
<color name="default_ripple_color_checked">#C695A4</color>

<color name="default_border_color">#e4e4e4</color>
</resources>
<color name="default_border_color_selected">#7F6A93</color>
</resources>