From de398b57ea2a9a14f34922b96505f8fc56a4dc68 Mon Sep 17 00:00:00 2001
From: Marten Rebane <marten.rebane@nortal.com>
Date: Fri, 24 Apr 2026 15:49:34 +0300
Subject: [PATCH] Info screen accessibility improvements

---
 .../ee/ria/DigiDoc/ui/component/shared/HrefDynamicText.kt  | 7 ++++++-
 app/src/main/res/values-et/strings.xml                     | 2 +-
 app/src/main/res/values/strings.xml                        | 2 +-
 3 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/app/src/main/kotlin/ee/ria/DigiDoc/ui/component/shared/HrefDynamicText.kt b/app/src/main/kotlin/ee/ria/DigiDoc/ui/component/shared/HrefDynamicText.kt
index 296fe8488..58b7c3d44 100644
--- a/app/src/main/kotlin/ee/ria/DigiDoc/ui/component/shared/HrefDynamicText.kt
+++ b/app/src/main/kotlin/ee/ria/DigiDoc/ui/component/shared/HrefDynamicText.kt
@@ -40,6 +40,7 @@ import androidx.compose.ui.platform.LocalDensity
 import androidx.compose.ui.platform.LocalUriHandler
 import androidx.compose.ui.platform.LocalWindowInfo
 import androidx.compose.ui.platform.testTag
+import androidx.compose.ui.semantics.contentDescription
 import androidx.compose.ui.semantics.semantics
 import androidx.compose.ui.text.AnnotatedString
 import androidx.compose.ui.text.SpanStyle
@@ -108,7 +109,11 @@ fun HrefDynamicText(
                 .verticalScroll(rememberScrollState())
                 .testTag("hrefDynamicText")
                 .then(pressIndicator)
-                .semantics(mergeDescendants = true) {}
+                .semantics(mergeDescendants = true) {
+                    if (!linkUrl.isEmpty()) {
+                        contentDescription = "$text1 $text2 $linkText link $linkUrl"
+                    }
+                }
                 .let {
                     val urlInText =
                         annotatedStringWithLinks
diff --git a/app/src/main/res/values-et/strings.xml b/app/src/main/res/values-et/strings.xml
index 0164a1153..79d171ba9 100644
--- a/app/src/main/res/values-et/strings.xml
+++ b/app/src/main/res/values-et/strings.xml
@@ -477,7 +477,7 @@
     <string name="main_accessibility_link_text">Rohkem infot leiab </string>
     <string name="main_accessibility_link_url">https://www.id.ee/ligipaasetavuse-teatis/</string>
     <string name="main_accessibility_link_tag">ligipääsetavuse teatisest</string>
-    <string name="main_accessibility_introduction">RIA DigiDoc on ehitatud nii, et see vastaks WCAG 2.1 AA juurdepääsetavuse suunistele. See tähendab, et RIA DigiDoc rakenduse arendamisel on kasutatud põhimõtteid, et see oleks kasutatav ilma nägemisvõimeta, piiratud nägemisvõimega, piiratud liikumisvõime või jõuga jms.</string>
+    <string name="main_accessibility_introduction">RIA DigiDoc on ehitatud nii, et see vastaks EN 301 549 juurdepääsetavuse suunistele. See tähendab, et RIA DigiDoc rakenduse arendamisel on kasutatud põhimõtteid, et see oleks kasutatav ilma nägemisvõimeta, piiratud nägemisvõimega, piiratud liikumisvõime või jõuga jms.</string>
     <string name="main_accessibility_introduction_2">Juurdepääsetavust on võimalik parandada oma nutiseadmesse sisseehitatud abivahendeid kasutades. Alljärgnevalt ülevaade põhilistest abivahenditest.</string>
     <string name="main_accessibility_introduction_screen_reader_title">Ekraanilugeja</string>
     <string name="main_accessibility_introduction_screen_reader_introduction">Ekraanilugeja on programm, mille ülesandeks on muuta nutiseadme ekraanil kujutatavat informatsiooni kasutajale sobivaks väljundiks – näiteks kõneks. Eelkõige on see abivahend vaegnägijate jaoks.</string>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 37d811938..08a9e238f 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -477,7 +477,7 @@
     <string name="main_accessibility_link_text">More information can be found on </string>
     <string name="main_accessibility_link_url">https://www.id.ee/ligipaasetavuse-teatis/</string>
     <string name="main_accessibility_link_tag">here</string>
-    <string name="main_accessibility_introduction">RIA DigiDoc is designed to comply with the WCAG 2.1 AA accessibility guidelines. This means that the RIA DigiDoc application has been developed using the principles that the application should be usable by the blind and people with visual, mobility, and strength impairments.</string>
+    <string name="main_accessibility_introduction">RIA DigiDoc is designed to comply with the EN 301 549 accessibility guidelines. This means that the RIA DigiDoc application has been developed using the principles that the application should be usable by the blind and people with visual, mobility, and strength impairments.</string>
     <string name="main_accessibility_introduction_2">Accessibility can be improved by using built-in assistive tools on your smart device. You can find an overview of the main assistive tools below.</string>
     <string name="main_accessibility_introduction_screen_reader_title">Screen reader</string>
     <string name="main_accessibility_introduction_screen_reader_introduction">A screen reader is a program that converts the information on the screen of a smart device into a user-friendly output, for instance, into speech. In particular, it is a tool for the visually impaired.</string>