From 931c02a7e7a8d592bbe461ac866a8d45354a9fd2 Mon Sep 17 00:00:00 2001
From: Gideon Okuro <gideonollonde@gmail.com>
Date: Mon, 6 Nov 2023 19:50:12 +0300
Subject: [PATCH] resources: more accessibility in viewer (fixes #2631) (#2637)

Co-authored-by: dogi <dogi@users.noreply.github.com>
---
 app/build.gradle                                      | 4 ++--
 app/src/main/res/layout/activity_audio_player.xml     | 1 +
 app/src/main/res/layout/activity_exo_player_video.xml | 1 +
 app/src/main/res/layout/activity_image_viewer.xml     | 1 +
 app/src/main/res/layout/activity_pdfreader.xml        | 2 ++
 app/src/main/res/layout/content_web_view.xml          | 3 +++
 app/src/main/res/values-ar/strings.xml                | 6 ++++++
 app/src/main/res/values-es/strings.xml                | 6 ++++++
 app/src/main/res/values-fr/strings.xml                | 6 ++++++
 app/src/main/res/values-ne/strings.xml                | 6 ++++++
 app/src/main/res/values-so/strings.xml                | 6 ++++++
 app/src/main/res/values/strings.xml                   | 6 ++++++
 12 files changed, 46 insertions(+), 2 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index 92256d6ba0..f7434f1d59 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -9,8 +9,8 @@ android {
         applicationId "org.ole.planet.myplanet"
         minSdkVersion 21
         targetSdkVersion 34
-        versionCode 1134
-        versionName "0.11.34"
+        versionCode 1135
+        versionName "0.11.35"
         ndkVersion '21.3.6528147'
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         vectorDrawables.useSupportLibrary = true
diff --git a/app/src/main/res/layout/activity_audio_player.xml b/app/src/main/res/layout/activity_audio_player.xml
index e19c5c9986..ebd391f8f1 100644
--- a/app/src/main/res/layout/activity_audio_player.xml
+++ b/app/src/main/res/layout/activity_audio_player.xml
@@ -12,6 +12,7 @@
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:layout_gravity="center"
+        android:contentDescription="@string/jcplayer_description"
         android:gravity="center" />
 
 </androidx.coordinatorlayout.widget.CoordinatorLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_exo_player_video.xml b/app/src/main/res/layout/activity_exo_player_video.xml
index e18e8e45e8..28f387dc93 100644
--- a/app/src/main/res/layout/activity_exo_player_video.xml
+++ b/app/src/main/res/layout/activity_exo_player_video.xml
@@ -8,6 +8,7 @@
     <com.google.android.exoplayer2.ui.SimpleExoPlayerView
         android:id="@+id/exo_player_simple"
         android:layout_width="match_parent"
+        android:contentDescription="@string/video_player"
         android:layout_height="match_parent" />
 
 </androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/app/src/main/res/layout/activity_image_viewer.xml b/app/src/main/res/layout/activity_image_viewer.xml
index aad56a1e91..774113afcc 100644
--- a/app/src/main/res/layout/activity_image_viewer.xml
+++ b/app/src/main/res/layout/activity_image_viewer.xml
@@ -28,6 +28,7 @@
 
         <ImageView
             android:id="@+id/imageViewer"
+            android:contentDescription="@string/image_resource"
             android:layout_width="match_parent"
             android:layout_height="match_parent" />
 
diff --git a/app/src/main/res/layout/activity_pdfreader.xml b/app/src/main/res/layout/activity_pdfreader.xml
index 0a78880851..dd9d1b9534 100644
--- a/app/src/main/res/layout/activity_pdfreader.xml
+++ b/app/src/main/res/layout/activity_pdfreader.xml
@@ -43,6 +43,7 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:src="@drawable/ic_mic"
+            android:contentDescription="@string/record_audio"
             app:fab_label="Record Audio" />
 
         <com.github.clans.fab.FloatingActionButton
@@ -50,6 +51,7 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:src="@drawable/ic_play_white"
+            android:contentDescription="@string/play_audio"
             app:fab_label="Play Audio" />
     </com.github.clans.fab.FloatingActionMenu>
 </androidx.coordinatorlayout.widget.CoordinatorLayout>
diff --git a/app/src/main/res/layout/content_web_view.xml b/app/src/main/res/layout/content_web_view.xml
index 73f86fd0e8..69601a01a9 100644
--- a/app/src/main/res/layout/content_web_view.xml
+++ b/app/src/main/res/layout/content_web_view.xml
@@ -22,6 +22,7 @@
             android:layout_height="40dp"
             android:layout_gravity="center_vertical"
             android:padding="8dp"
+            android:contentDescription="@string/finish"
             android:src="@android:drawable/ic_menu_close_clear_cancel"
             ads:tint="#000000" />
 
@@ -61,12 +62,14 @@
         android:id="@+id/pBar"
         style="?android:attr/progressBarStyleHorizontal"
         android:layout_width="match_parent"
+        android:contentDescription="@string/progress_bar"
         android:layout_height="wrap_content" />
 
     <WebView
         android:id="@+id/wv"
         android:layout_width="match_parent"
         android:layout_height="0dp"
+        android:contentDescription="@string/web_view"
         android:layout_weight="1" />
 
 </LinearLayout>
diff --git a/app/src/main/res/values-ar/strings.xml b/app/src/main/res/values-ar/strings.xml
index 8a207b26b2..3e4fe3991b 100644
--- a/app/src/main/res/values-ar/strings.xml
+++ b/app/src/main/res/values-ar/strings.xml
@@ -948,5 +948,11 @@
     <string name="confirm_removal">تأكيد الحذف</string>
     <string name="returning_user">مستخدم عائد</string>
     <string name="send_to_nation">اسمح بمشاركة إنجازاتك مع الوطن</string>
+    <string name="jcplayer_description">مشغل الصوت</string>
+    <string name="image_resource">مصدر الصورة</string>
+    <string name="play_audio">تشغيل الصوت</string>
+    <string name="video_player">مشغل الفيديو</string>
+    <string name="progress_bar">شريط التقدم</string>
+    <string name="web_view">عرض الويب</string>
 
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml
index b6e5c4bdfb..56510e6309 100644
--- a/app/src/main/res/values-es/strings.xml
+++ b/app/src/main/res/values-es/strings.xml
@@ -953,5 +953,11 @@
     <string name="confirm_removal">Confirmar eliminación</string>
     <string name="returning_user">Usuario recurrente</string>
     <string name="send_to_nation">Permite que tus logros se compartan con la nación</string>
+    <string name="jcplayer_description">reproductor de audio</string>
+    <string name="image_resource">recurso de imagen</string>
+    <string name="play_audio">reproducir audio</string>
+    <string name="video_player">reproductor de video</string>
+    <string name="progress_bar">barra de progreso</string>
+    <string name="web_view">vista web</string>
 
 </resources>
diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml
index 176e467206..5afda1f946 100644
--- a/app/src/main/res/values-fr/strings.xml
+++ b/app/src/main/res/values-fr/strings.xml
@@ -953,5 +953,11 @@
     <string name="confirm_removal">Confirmer la suppression</string>
     <string name="returning_user">Utilisateur régulier</string>
     <string name="send_to_nation">Autorisez la partage de vos réalisations avec la nation</string>
+    <string name="jcplayer_description">lecteur audio</string>
+    <string name="image_resource">ressource d\'image</string>
+    <string name="play_audio">lire l\'audio</string>
+    <string name="video_player">lecteur vidéo</string>
+    <string name="progress_bar">barre de progression</string>
+    <string name="web_view">vue web</string>
 
 </resources>
diff --git a/app/src/main/res/values-ne/strings.xml b/app/src/main/res/values-ne/strings.xml
index 49392df9bd..80bf937920 100644
--- a/app/src/main/res/values-ne/strings.xml
+++ b/app/src/main/res/values-ne/strings.xml
@@ -953,5 +953,11 @@
     <string name="confirm_removal">हटाउनु हेरदैछ</string>
     <string name="returning_user">पुनराबृत्ति गर्ने प्रयोगकर्ता</string>
     <string name="send_to_nation">तपाइको उपलब्धिहरूलाई देशसँग साझा गर्न अनुमति दिनुहोस्</string>
+    <string name="jcplayer_description">आडियो प्लेयर</string>
+    <string name="image_resource">तस्वीर स्रोत</string>
+    <string name="play_audio">आडियो प्ले गर्नुहोस्</string>
+    <string name="video_player">भिडियो प्लेयर</string>
+    <string name="progress_bar">प्रगति पट्टि</string>
+    <string name="web_view">वेब दृश्य</string>
 
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-so/strings.xml b/app/src/main/res/values-so/strings.xml
index 2a8eb6dc73..2deeb9bc85 100644
--- a/app/src/main/res/values-so/strings.xml
+++ b/app/src/main/res/values-so/strings.xml
@@ -942,5 +942,11 @@
     <string name="confirm_removal">Xaqiiji tirtirka</string>
     <string name="returning_user">Isticmaale sare leh</string>
     <string name="send_to_nation">Geli codbixiyeyaashaaga qaranka</string>
+    <string name="jcplayer_description">qalabka codka</string>
+    <string name="image_resource">deriska sawirka</string>
+    <string name="play_audio">bixi codka</string>
+    <string name="video_player">qalabka fiidyowga</string>
+    <string name="progress_bar">balka soo socda</string>
+    <string name="web_view">barashada webka</string>
 
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 0e77f2c41f..7a30408948 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -1043,5 +1043,11 @@
     <string name="confirm_removal">Confirm removal</string>
     <string name="returning_user">Returning user</string>
     <string name="send_to_nation">Allow your achievements to be shared with the nation</string>
+    <string name="jcplayer_description">audio player</string>
+    <string name="image_resource">image resource</string>
+    <string name="play_audio">play audio</string>
+    <string name="video_player">video player</string>
+    <string name="progress_bar">progress bar</string>
+    <string name="web_view">web view</string>
 
 </resources>