From 22a1a68e958d30fd246d8230ad98e65a2b335891 Mon Sep 17 00:00:00 2001
From: Andries Smit <mr.andries.smit@gmail.com>
Date: Mon, 31 Jan 2022 23:38:39 +0100
Subject: [PATCH] a11y add bg outdated state to description

---
 .../general/overview/OverviewFragment.kt       |  7 ++++++-
 .../main/res/layout/overview_info_layout.xml   |  2 +-
 app/src/main/res/values/strings.xml            | 18 ++++++++++--------
 3 files changed, 17 insertions(+), 10 deletions(-)

diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/overview/OverviewFragment.kt b/app/src/main/java/info/nightscout/androidaps/plugins/general/overview/OverviewFragment.kt
index fd5201ee2f..8748624e2d 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/general/overview/OverviewFragment.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/general/overview/OverviewFragment.kt
@@ -751,7 +751,7 @@ class OverviewFragment : DaggerFragment(), View.OnClickListener, OnLongClickList
         binding.infoLayout.bg.setTextColor(overviewData.lastBgColor)
         binding.infoLayout.arrow.setImageResource(trendCalculator.getTrendArrow(overviewData.lastBg).directionToIcon())
         binding.infoLayout.arrow.setColorFilter(overviewData.lastBgColor)
-        binding.infoLayout.arrow.contentDescription = trendCalculator.getTrendDescription(overviewData.lastBg) + " " + overviewData.lastBgDescription
+        binding.infoLayout.arrow.contentDescription = overviewData.lastBgDescription + " " + rh.gs(R.string.and) + " " + trendCalculator.getTrendDescription(overviewData.lastBg)
 
         val glucoseStatus = glucoseStatusProvider.glucoseStatusData
         if (glucoseStatus != null) {
@@ -771,6 +771,11 @@ class OverviewFragment : DaggerFragment(), View.OnClickListener, OnLongClickList
         binding.infoLayout.bg.paintFlags =
             if (!overviewData.isActualBg) binding.infoLayout.bg.paintFlags or Paint.STRIKE_THRU_TEXT_FLAG
             else binding.infoLayout.bg.paintFlags and Paint.STRIKE_THRU_TEXT_FLAG.inv()
+
+        val outDate = (if (!overviewData.isActualBg) rh.gs(R.string.a11y_bg_outdated) else "")
+        binding.infoLayout.bg.contentDescription =
+            rh.gs(R.string.a11y_blood_glucose) + " " +  binding.infoLayout.bg.text.toString() + " " + overviewData.lastBgDescription + " " + outDate
+
         binding.infoLayout.timeAgo.text = dateUtil.minAgo(rh, overviewData.lastBg?.timestamp)
         binding.infoLayout.timeAgo.contentDescription = dateUtil.minAgoLong(rh, overviewData.lastBg?.timestamp)
         binding.infoLayout.timeAgoShort.text = "(" + dateUtil.minAgoShort(overviewData.lastBg?.timestamp) + ")"
diff --git a/app/src/main/res/layout/overview_info_layout.xml b/app/src/main/res/layout/overview_info_layout.xml
index 2a8d2acab9..1cd5866c92 100644
--- a/app/src/main/res/layout/overview_info_layout.xml
+++ b/app/src/main/res/layout/overview_info_layout.xml
@@ -53,7 +53,7 @@
         app:layout_constraintStart_toEndOf="@+id/delta_large"
         app:layout_constraintTop_toTopOf="parent"
         tools:ignore="UseCompoundDrawables"
-        android:screenReaderFocusable="true">
+        android:focusable="true">
 
         <ImageView
             android:id="@+id/arrow"
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 1d9c967d69..b6ff80ee43 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -1165,19 +1165,21 @@
     <string name="a11y_high">heigh</string>
     <string name="a11y_inrange">in range</string>
     <string name="a11y_low">low</string>
-    <string name="a11y_arrow_double_down">down fast</string>
-    <string name="a11y_arrow_single_down">down</string>
-    <string name="a11y_arrow_forty_five_down">down trending</string>
-    <string name="a11y_arrow_flat">flat</string>
-    <string name="a11y_arrow_forty_five_up">up trending</string>
-    <string name="a11y_arrow_single_up">up</string>
-    <string name="a11y_arrow_double_up">up fast</string>
+    <string name="a11y_arrow_double_down">falling rapidly</string>
+    <string name="a11y_arrow_single_down">falling</string>
+    <string name="a11y_arrow_forty_five_down">falling slowly</string>
+    <string name="a11y_arrow_flat">stable</string>
+    <string name="a11y_arrow_forty_five_up">rising slowly</string>
+    <string name="a11y_arrow_single_up">rising</string>
+    <string name="a11y_arrow_double_up">rising rapidly</string>
     <string name="a11y_arrow_none">none</string>
     <string name="a11y_arrow_unknown">unknown</string>
     <string name="a11y_graph">graph</string>
-    <string name="a11y_bg_quality">Blood glucose quality</string>
+    <string name="a11y_bg_quality">blood glucose quality</string>
     <string name="a11_bg_quality_recalculated">recalculated</string>
     <string name="a11_bg_quality_doubles">double entries</string>
     <string name="a11y_insulin_label">insulin</string>
+    <string name="a11y_blood_glucose">blood glucose</string>
+    <string name="a11y_bg_outdated">out dated</string>
 
 </resources>