@@ -134,47 +134,31 @@ class SegmentedControl @JvmOverloads constructor(
134134 val bgColorStateList = ColorStateList (
135135 arrayOf(
136136 intArrayOf(android.R .attr.state_checked),
137- <<<<<<<< HEAD : android/ app/ src/ main/ java/ org/ groestlcoin/ bluewallet/ components/ segmentedcontrol/ CustomSegmentedControl .kt
138- intArrayOf(- android.R .attr.state_checked)
139- ========
140137 intArrayOf(- android.R .attr.state_checked),
141- >>>>>>>> upstream/ master: blue_modules/ Views / SegmentedControl / android/ io/ bluewallet/ bluewallet/ components/ segmentedcontrol/ SegmentedControl .kt
142138 ),
143139 intArrayOf(selectedBgColor, unselectedBgColor),
144140 )
145141
146142 val textColorStateList = ColorStateList (
147143 arrayOf(
148144 intArrayOf(android.R .attr.state_checked),
149- <<<<<<<< HEAD : android/ app/ src/ main/ java/ org/ groestlcoin/ bluewallet/ components/ segmentedcontrol/ CustomSegmentedControl .kt
150- intArrayOf(- android.R .attr.state_checked)
151- ========
152145 intArrayOf(- android.R .attr.state_checked),
153- >>>>>>>> upstream/ master: blue_modules/ Views / SegmentedControl / android/ io/ bluewallet/ bluewallet/ components/ segmentedcontrol/ SegmentedControl .kt
154146 ),
155147 intArrayOf(selectedTextColor, unselectedTextColor),
156148 )
157149
158150 val strokeColorStateList = ColorStateList (
159151 arrayOf(
160152 intArrayOf(android.R .attr.state_checked),
161- <<<<<<<< HEAD : android/ app/ src/ main/ java/ org/ groestlcoin/ bluewallet/ components/ segmentedcontrol/ CustomSegmentedControl .kt
162- intArrayOf(- android.R .attr.state_checked)
163- ========
164153 intArrayOf(- android.R .attr.state_checked),
165- >>>>>>>> upstream/ master: blue_modules/ Views / SegmentedControl / android/ io/ bluewallet/ bluewallet/ components/ segmentedcontrol/ SegmentedControl .kt
166154 ),
167155 intArrayOf(borderColor, borderColor),
168156 )
169157
170158 val rippleColorStateList = ColorStateList (
171159 arrayOf(
172160 intArrayOf(android.R .attr.state_checked),
173- <<<<<<<< HEAD : android/ app/ src/ main/ java/ org/ groestlcoin/ bluewallet/ components/ segmentedcontrol/ CustomSegmentedControl .kt
174- intArrayOf(- android.R .attr.state_checked)
175- ========
176161 intArrayOf(- android.R .attr.state_checked),
177- >>>>>>>> upstream/ master: blue_modules/ Views / SegmentedControl / android/ io/ bluewallet/ bluewallet/ components/ segmentedcontrol/ SegmentedControl .kt
178162 ),
179163 intArrayOf(rippleColorSelected, rippleColor),
180164 )
@@ -276,4 +260,4 @@ class SegmentedControl @JvmOverloads constructor(
276260
277261 override fun getEventData (): WritableMap = eventData
278262 }
279- }
263+ }
0 commit comments