Skip to content

Commit 2bf30f7

Browse files
authored
Merge pull request #20436 from wordpress-mobile/origin/issue/20413-gradient-bar-bug-fix
Fix bars turning green issue when switching from a graph with empty data
2 parents 5e6a217 + 02daa2b commit 2bf30f7

File tree

2 files changed

+4
-27
lines changed

2 files changed

+4
-27
lines changed

WordPress/src/main/java/org/wordpress/android/ui/stats/refresh/lists/sections/traffic/TrafficBarChartViewHolder.kt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -177,6 +177,7 @@ class TrafficBarChartViewHolder(parent: ViewGroup) : BlockListItemViewHolder(
177177

178178
private fun buildDataSet(context: Context, cut: List<BarEntry>): BarDataSet {
179179
val dataSet = BarDataSet(cut, "Data")
180+
chart.renderer.paintRender.shader = null
180181
dataSet.color = ContextCompat.getColor(context, R.color.blue_50)
181182
dataSet.formLineWidth = 0f
182183
dataSet.setDrawValues(false)

WordPress/src/main/java/org/wordpress/android/ui/stats/refresh/lists/sections/viewholders/BarChartViewHolder.kt

Lines changed: 3 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -229,16 +229,8 @@ class BarChartViewHolder(parent: ViewGroup) : BlockListItemViewHolder(
229229

230230
private fun buildDataSet(context: Context, cut: List<BarEntry>): BarDataSet {
231231
val dataSet = BarDataSet(cut, "Data")
232+
chart.renderer.paintRender.shader = null
232233
dataSet.color = ContextCompat.getColor(context, R.color.stats_bar_chart_top)
233-
dataSet.setGradientColor(
234-
ContextCompat.getColor(
235-
context,
236-
R.color.stats_bar_chart_top
237-
), ContextCompat.getColor(
238-
context,
239-
R.color.stats_bar_chart_top
240-
)
241-
)
242234
dataSet.formLineWidth = 0f
243235
dataSet.setDrawValues(false)
244236
dataSet.isHighlightEnabled = true
@@ -252,16 +244,8 @@ class BarChartViewHolder(parent: ViewGroup) : BlockListItemViewHolder(
252244

253245
private fun buildOverlappingDataSet(context: Context, cut: List<BarEntry>): BarDataSet {
254246
val dataSet = BarDataSet(cut, "Overlapping data")
247+
chart.renderer.paintRender.shader = null
255248
dataSet.color = ContextCompat.getColor(context, R.color.primary_60)
256-
dataSet.setGradientColor(
257-
ContextCompat.getColor(
258-
context,
259-
R.color.stats_bar_chart_bottom
260-
), ContextCompat.getColor(
261-
context,
262-
R.color.stats_bar_chart_bottom
263-
)
264-
)
265249
dataSet.formLineWidth = 0f
266250
dataSet.setDrawValues(false)
267251
dataSet.isHighlightEnabled = true
@@ -279,16 +263,8 @@ class BarChartViewHolder(parent: ViewGroup) : BlockListItemViewHolder(
279263
BarEntry(it.x, maxEntry.y, it.data)
280264
}
281265
val dataSet = BarDataSet(highlightedDataSet, "Highlight")
266+
chart.renderer.paintRender.shader = null
282267
dataSet.color = ContextCompat.getColor(context, AndroidR.color.transparent)
283-
dataSet.setGradientColor(
284-
ContextCompat.getColor(
285-
context,
286-
AndroidR.color.transparent
287-
), ContextCompat.getColor(
288-
context,
289-
AndroidR.color.transparent
290-
)
291-
)
292268
dataSet.formLineWidth = 0f
293269
dataSet.isHighlightEnabled = true
294270
dataSet.highLightColor = ContextCompat.getColor(

0 commit comments

Comments
 (0)