Skip to content

Commit 489e020

Browse files
ish-joshihannesa2
authored andcommitted
add: stub message and verified it is read by screenreader
1 parent ce88fa8 commit 489e020

9 files changed

Lines changed: 61 additions & 0 deletions

File tree

MPChartLib/src/main/java/com/github/mikephil/charting/charts/BarChart.java

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -275,4 +275,9 @@ public void setRoundedBarRadius(float mRoundedBarRadius) {
275275
this.mDrawRoundedBars = true;
276276
init();
277277
}
278+
279+
@Override
280+
public String getAccessibilityDescription() {
281+
return "This is a bar chart";
282+
}
278283
}

MPChartLib/src/main/java/com/github/mikephil/charting/charts/BubbleChart.java

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,4 +40,9 @@ protected void init() {
4040
public BubbleData getBubbleData() {
4141
return mData;
4242
}
43+
44+
@Override
45+
public String getAccessibilityDescription() {
46+
return "This is bubble chart";
47+
}
4348
}

MPChartLib/src/main/java/com/github/mikephil/charting/charts/CandleStickChart.java

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,4 +41,9 @@ protected void init() {
4141
public CandleData getCandleData() {
4242
return mData;
4343
}
44+
45+
@Override
46+
public String getAccessibilityDescription() {
47+
return "This is a candlestick";
48+
}
4449
}

MPChartLib/src/main/java/com/github/mikephil/charting/charts/Chart.java

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@
2121
import android.view.View;
2222
import android.view.ViewGroup;
2323
import android.view.ViewParent;
24+
import android.view.accessibility.AccessibilityEvent;
2425

2526
import com.github.mikephil.charting.animation.ChartAnimator;
2627
import com.github.mikephil.charting.animation.Easing.EasingFunction;
@@ -170,6 +171,11 @@ public abstract class Chart<T extends ChartData<? extends IDataSet<? extends Ent
170171
private float mExtraTopOffset = 0.f, mExtraRightOffset = 0.f, mExtraBottomOffset = 0.f, mExtraLeftOffset = 0.f;
171172

172173
/**
174+
* Tag for logging accessibility related content
175+
*/
176+
private String TAG = "abilityTag";
177+
178+
/**
173179
* default constructor for initialization in code
174180
*/
175181
public Chart(Context context) {
@@ -1654,6 +1660,22 @@ public void setUnbindEnabled(boolean enabled) {
16541660

16551661
// region accessibility
16561662

1663+
/**
1664+
*
1665+
* @return accessibility description must be created for each chart
1666+
*/
1667+
public abstract String getAccessibilityDescription();
1668+
1669+
@Override
1670+
public boolean dispatchPopulateAccessibilityEvent(AccessibilityEvent event) {
1671+
1672+
boolean completed = super.dispatchPopulateAccessibilityEvent(event);
1673+
Log.d(TAG, "Dispatch called for Chart <View> and completed as " + completed);
1674+
1675+
event.getText().add(getAccessibilityDescription());
1676+
1677+
return true;
1678+
}
16571679

16581680
// endregion
16591681
}

MPChartLib/src/main/java/com/github/mikephil/charting/charts/CombinedChart.java

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -266,4 +266,8 @@ protected void drawMarkers(Canvas canvas) {
266266
}
267267
}
268268

269+
@Override
270+
public String getAccessibilityDescription() {
271+
return "This is a combined chart";
272+
}
269273
}

MPChartLib/src/main/java/com/github/mikephil/charting/charts/LineChart.java

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -47,4 +47,9 @@ protected void onDetachedFromWindow() {
4747
}
4848
super.onDetachedFromWindow();
4949
}
50+
51+
@Override
52+
public String getAccessibilityDescription() {
53+
return "This is a line chart";
54+
}
5055
}

MPChartLib/src/main/java/com/github/mikephil/charting/charts/PieChart.java

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -801,4 +801,9 @@ protected void onDetachedFromWindow() {
801801
}
802802
super.onDetachedFromWindow();
803803
}
804+
805+
@Override
806+
public String getAccessibilityDescription() {
807+
return "This is a pie chart";
808+
}
804809
}

MPChartLib/src/main/java/com/github/mikephil/charting/charts/RadarChart.java

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -382,4 +382,9 @@ public float getYChartMin() {
382382
public float getYRange() {
383383
return mYAxis.mAxisRange;
384384
}
385+
386+
@Override
387+
public String getAccessibilityDescription() {
388+
return "This is a Radar chart";
389+
}
385390
}

MPChartLib/src/main/java/com/github/mikephil/charting/charts/ScatterChart.java

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -74,4 +74,9 @@ public static ScatterShape[] getAllDefaultShapes() {
7474
return new ScatterShape[]{SQUARE, CIRCLE, TRIANGLE, CROSS, X, CHEVRON_UP, CHEVRON_DOWN};
7575
}
7676
}
77+
78+
@Override
79+
public String getAccessibilityDescription() {
80+
return "This is scatter chart";
81+
}
7782
}

0 commit comments

Comments
 (0)