Skip to content

Commit 095fb42

Browse files
authored
Merge pull request #718 from AppDevNext/FormatAccessibilityDescription
Format accessibilityDescription
2 parents 5f58a33 + dd88f8b commit 095fb42

1 file changed

Lines changed: 4 additions & 11 deletions

File tree

  • chartLib/src/main/kotlin/info/appdev/charting/charts

chartLib/src/main/kotlin/info/appdev/charting/charts/LineChart.kt

Lines changed: 4 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@ import android.util.AttributeSet
55
import info.appdev.charting.data.LineData
66
import info.appdev.charting.interfaces.dataprovider.LineDataProvider
77
import info.appdev.charting.renderer.LineChartRenderer
8-
import java.util.Locale
98

109
open class LineChart : BarLineChartBase<LineData>, LineDataProvider {
1110

@@ -39,9 +38,6 @@ open class LineChart : BarLineChartBase<LineData>, LineDataProvider {
3938

4039
override val accessibilityDescription: String
4140
get() {
42-
val lineData = lineData
43-
val numberOfPoints = lineData.entryCount
44-
4541
// Min and max values...
4642
val yAxisValueFormatter = axisLeft.valueFormatter
4743
val minVal = yAxisValueFormatter?.getFormattedValue(lineData.yMin, null)
@@ -51,13 +47,10 @@ open class LineChart : BarLineChartBase<LineData>, LineDataProvider {
5147
val xAxisValueFormatter = xAxis.valueFormatter
5248
val minRange = xAxisValueFormatter?.getFormattedValue(lineData.xMin, null)
5349
val maxRange = xAxisValueFormatter?.getFormattedValue(lineData.xMax, null)
54-
val entries = if (numberOfPoints == 1) "entry" else "entries"
55-
return String.format(
56-
Locale.getDefault(), "The line chart has %d %s. " +
57-
"The minimum value is %s and maximum value is %s." +
58-
"Data ranges from %s to %s.",
59-
numberOfPoints, entries, minVal, maxVal, minRange, maxRange
60-
)
50+
val pluralOrSingular = if (lineData.entryCount == 1) "entry" else "entries"
51+
return "The line chart has ${lineData.entryCount} $pluralOrSingular. " +
52+
"The minimum value is $minVal and maximum value is $maxVal." +
53+
"Data ranges from $minRange to $maxRange."
6154
}
6255

6356
}

0 commit comments

Comments
 (0)