From cd93801638770a142c88431483b1f5bd387999a3 Mon Sep 17 00:00:00 2001
From: Gideon Okuro <gideonollonde@gmail.com>
Date: Wed, 25 Oct 2023 20:14:19 +0300
Subject: [PATCH] profile: accessibility enhancements (fixes #2632) (#2635)

Co-authored-by: dogi <dogi@users.noreply.github.com>
---
 app/build.gradle                                      | 4 ++--
 app/src/main/res/layout/activity_become_member.xml    | 6 ++++++
 app/src/main/res/layout/fragment_achievement.xml      | 1 +
 app/src/main/res/layout/fragment_edit_achievement.xml | 8 ++++++--
 app/src/main/res/values-ar/strings.xml                | 1 +
 app/src/main/res/values-es/strings.xml                | 1 +
 app/src/main/res/values-fr/strings.xml                | 1 +
 app/src/main/res/values-ne/strings.xml                | 1 +
 app/src/main/res/values-so/strings.xml                | 1 +
 app/src/main/res/values/strings.xml                   | 1 +
 10 files changed, 21 insertions(+), 4 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index c85a0acc6d..b28de3d523 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -10,8 +10,8 @@ android {
         applicationId "org.ole.planet.myplanet"
         minSdkVersion 21
         targetSdkVersion 34
-        versionCode 1112
-        versionName "0.11.12"
+        versionCode 1113
+        versionName "0.11.13"
         ndkVersion '21.3.6528147'
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         vectorDrawables.useSupportLibrary = true
diff --git a/app/src/main/res/layout/activity_become_member.xml b/app/src/main/res/layout/activity_become_member.xml
index 4e48f5011e..9c8e97c1cc 100644
--- a/app/src/main/res/layout/activity_become_member.xml
+++ b/app/src/main/res/layout/activity_become_member.xml
@@ -155,6 +155,7 @@
                         android:layout_height="wrap_content"
                         android:background="@drawable/border"
                         android:entries="@array/language"
+                        android:contentDescription="@string/language"
                         android:padding="@dimen/padding_normal" />
 
                 </LinearLayout>
@@ -221,12 +222,14 @@
                         android:id="@+id/male"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
+                        android:contentDescription="@string/male"
                         android:text="@string/male" />
 
                     <RadioButton
                         android:id="@+id/female"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
+                        android:contentDescription="@string/female"
                         android:text="@string/female" />
 
 
@@ -259,6 +262,7 @@
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
                         android:entries="@array/level"
+                        android:contentDescription="@string/level"
                         android:padding="@dimen/padding_small" />
                 </RelativeLayout>
             </LinearLayout>
@@ -274,6 +278,7 @@
                     style="@style/Widget.MaterialComponents.Button.TextButton"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
+                    android:contentDescription="@string/button_cancel"
                     android:text="@string/button_cancel"
                     android:textSize="@dimen/text_size_mid"
                     android:textStyle="bold" />
@@ -284,6 +289,7 @@
                     android:layout_height="wrap_content"
                     android:text="@string/become_a_member"
                     android:textSize="@dimen/text_size_mid"
+                    android:contentDescription="@string/become_a_member"
                     android:theme="@style/FocusButton" />
 
 
diff --git a/app/src/main/res/layout/fragment_achievement.xml b/app/src/main/res/layout/fragment_achievement.xml
index 54d48a77cc..ce263b79ba 100644
--- a/app/src/main/res/layout/fragment_achievement.xml
+++ b/app/src/main/res/layout/fragment_achievement.xml
@@ -45,6 +45,7 @@
                     android:drawableStart="@drawable/ic_edit"
                     android:drawablePadding="@dimen/padding_normal"
                     android:padding="@dimen/padding_normal"
+                    android:contentDescription="@string/edit_achievement"
                     android:text="@string/edit_achievement" />
 
 
diff --git a/app/src/main/res/layout/fragment_edit_achievement.xml b/app/src/main/res/layout/fragment_edit_achievement.xml
index cc660071b4..6a836b3a8a 100644
--- a/app/src/main/res/layout/fragment_edit_achievement.xml
+++ b/app/src/main/res/layout/fragment_edit_achievement.xml
@@ -44,6 +44,7 @@
                     android:layout_height="wrap_content"
                     android:drawableLeft="@drawable/ic_edit"
                     android:drawablePadding="@dimen/padding_normal"
+                    android:contentDescription="@string/edit_achievement"
                     android:padding="@dimen/padding_normal"
                     android:text="@string/edit_achievement" />
 
@@ -209,6 +210,7 @@
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:padding="@dimen/padding_normal"
+                    android:contentDescription="@string/add_an_achievement"
                     android:text="@string/add_an_achievement"
                     android:theme="@style/PrimaryButton" />
 
@@ -230,7 +232,7 @@
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:padding="@dimen/padding_normal"
-
+                    android:contentDescription="@string/add_a_reference"
                     android:text="@string/add_a_reference"
                     android:theme="@style/PrimaryButton" />
 
@@ -240,7 +242,7 @@
                     android:layout_height="wrap_content"
                     android:layout_gravity="center"
                     android:padding="@dimen/padding_normal"
-                    android:text="Allow your achievements to be shared with the nation"
+                    android:text="@string/send_to_nation"
                     android:textSize="@dimen/text_size_large" />
 
                 <LinearLayout
@@ -252,6 +254,7 @@
                         android:id="@+id/btn_update"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
+                        android:contentDescription="@string/button_update"
                         android:text="@string/button_update"
                         android:theme="@style/PrimaryButton" />
 
@@ -259,6 +262,7 @@
                         android:id="@+id/btn_cancel"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
+                        android:contentDescription="@string/button_cancel"
                         android:text="@string/button_cancel"
                         android:theme="@style/AccentButton" />
 
diff --git a/app/src/main/res/values-ar/strings.xml b/app/src/main/res/values-ar/strings.xml
index a39d9c05c6..5f5b43704a 100644
--- a/app/src/main/res/values-ar/strings.xml
+++ b/app/src/main/res/values-ar/strings.xml
@@ -947,5 +947,6 @@
     <string name="request_failed_please_retry">الطلب فشل، يرجى إعادة المحاولة</string>
     <string name="confirm_removal">تأكيد الحذف</string>
     <string name="returning_user">مستخدم عائد</string>
+    <string name="send_to_nation">اسمح بمشاركة إنجازاتك مع الوطن</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 12769f9954..0594884956 100644
--- a/app/src/main/res/values-es/strings.xml
+++ b/app/src/main/res/values-es/strings.xml
@@ -952,5 +952,6 @@
     <string name="request_failed_please_retry">La solicitud ha fallado, por favor inténtelo de nuevo</string>
     <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>
 
 </resources>
diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml
index 71c2ff5850..056d1977db 100644
--- a/app/src/main/res/values-fr/strings.xml
+++ b/app/src/main/res/values-fr/strings.xml
@@ -952,5 +952,6 @@
     <string name="request_failed_please_retry">La demande a échoué, veuillez réessayer</string>
     <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>
 
 </resources>
diff --git a/app/src/main/res/values-ne/strings.xml b/app/src/main/res/values-ne/strings.xml
index 22aa2b20c9..765c09ed5a 100644
--- a/app/src/main/res/values-ne/strings.xml
+++ b/app/src/main/res/values-ne/strings.xml
@@ -952,5 +952,6 @@
     <string name="request_failed_please_retry">अनुरोध असफल भयो, कृपया पुन: प्रयास गर्नुहोस्</string>
     <string name="confirm_removal">हटाउनु हेरदैछ</string>
     <string name="returning_user">पुनराबृत्ति गर्ने प्रयोगकर्ता</string>
+    <string name="send_to_nation">तपाइको उपलब्धिहरूलाई देशसँग साझा गर्न अनुमति दिनुहोस्</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 04eed2fcd2..34cdf8c6f4 100644
--- a/app/src/main/res/values-so/strings.xml
+++ b/app/src/main/res/values-so/strings.xml
@@ -941,5 +941,6 @@
     <string name="request_failed_please_retry">Codka lama yimaado, fadlan dib ugu ciyaar</string>
     <string name="confirm_removal">Xaqiiji tirtirka</string>
     <string name="returning_user">Isticmaale sare leh</string>
+    <string name="send_to_nation">Geli codbixiyeyaashaaga qaranka</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 ac99eec7ed..848110f643 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -1042,5 +1042,6 @@
     <string name="request_failed_please_retry">Request failed, please retry</string>
     <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>
 
 </resources>