Make chart bars not clickable on the TRAFFIC tab for accessibility

wordpress-mobile · Mar 2, 2024 · 668dd97 · 668dd97
1 parent 411dbf9
commit 668dd97
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 8 deletions.
diff --git a/...rg/wordpress/android/ui/stats/refresh/lists/sections/traffic/TrafficBarChartViewHolder.kt b/...rg/wordpress/android/ui/stats/refresh/lists/sections/traffic/TrafficBarChartViewHolder.kt
@@ -43,11 +43,7 @@ class TrafficBarChartViewHolder(parent: ViewGroup) : BlockListItemViewHolder(
             if (hasData(item.entries)) {
                 chart.post {
                     val cutContentDescriptions = takeEntriesWithinGraphWidth(barCount, item.entryContentDescriptions)
-                    accessibilityHelper = BarChartAccessibilityHelper(
-                        chart,
-                        contentDescriptions = cutContentDescriptions,
-                        accessibilityEvent = accessibilityEvent
-                    )
+                    accessibilityHelper = BarChartAccessibilityHelper(chart, cutContentDescriptions)
 
                     ViewCompat.setAccessibilityDelegate(chart, accessibilityHelper)
                 }

diff --git a/...src/main/java/org/wordpress/android/ui/stats/refresh/utils/BarChartAccessibilityHelper.kt b/...src/main/java/org/wordpress/android/ui/stats/refresh/utils/BarChartAccessibilityHelper.kt
@@ -12,7 +12,7 @@ import com.github.mikephil.charting.interfaces.datasets.IBarDataSet
 class BarChartAccessibilityHelper(
     private val barChart: BarChart,
     private val contentDescriptions: List<String>,
-    private val accessibilityEvent: BarChartAccessibilityEvent
+    private val accessibilityEvent: BarChartAccessibilityEvent? = null
 ) : ExploreByTouchHelper(barChart) {
     private val dataSet: IBarDataSet = barChart.data.dataSets.first()
 
@@ -51,7 +51,7 @@ class BarChartAccessibilityHelper(
         when (action) {
             AccessibilityNodeInfoCompat.ACTION_CLICK -> {
                 val entry = dataSet.getEntryForIndex(virtualViewId)
-                accessibilityEvent.onHighlight(entry, virtualViewId)
+                accessibilityEvent?.onHighlight(entry, virtualViewId)
                 return true
             }
         }
@@ -74,7 +74,7 @@ class BarChartAccessibilityHelper(
             }
         }
 
-        node.addAction(AccessibilityActionCompat.ACTION_CLICK)
+        accessibilityEvent?.let { node.addAction(AccessibilityActionCompat.ACTION_CLICK) }
         val entryRectF = barChart.getBarBounds(dataSet.getEntryForIndex(virtualViewId))
         val entryRect = Rect()
         entryRectF.round(entryRect)