Fix duplicate content descriptions (#1424)

Signed-off-by: Amr <[email protected]>
Co-authored-by: Amr <[email protected]>

Author: Suyog-Bauskar

Diff for: onebusaway-android/src/main/java/org/onebusaway/android/ui/ArrivalsListHeader.java

@@ -359,8 +359,10 @@ public void onClick(View v) {
         mEtaContainer1 = mView.findViewById(R.id.eta_container1);
         mEtaRouteFavorite1 = (ImageButton) mEtaContainer1.findViewById(R.id.eta_route_favorite);
         mEtaRouteFavorite1.setColorFilter(mView.getResources().getColor(R.color.header_text_color));
+        mEtaRouteFavorite1.setContentDescription(mContext.getString(R.string.arrival_favorite_first_description));
         mEtaReminder1 = (ImageButton) mEtaContainer1.findViewById(R.id.reminder);
         mEtaReminder1.setColorFilter(mView.getResources().getColor(R.color.header_text_color));
+        mEtaReminder1.setContentDescription(mContext.getString(R.string.arrival_reminder_first_description));
         mEtaRouteName1 = (TextView) mEtaContainer1.findViewById(R.id.eta_route_name);
         mEtaRouteDirection1 = (TextView) mEtaContainer1.findViewById(R.id.eta_route_direction);
         mEtaAndMin1 = (RelativeLayout) mEtaContainer1.findViewById(R.id.eta_and_min);
@@ -369,15 +371,18 @@ public void onClick(View v) {
         mEtaRealtime1 = (ViewGroup) mEtaContainer1.findViewById(R.id.eta_realtime_indicator);
         mEtaMoreVert1 = (ImageButton) mEtaContainer1.findViewById(R.id.eta_more_vert);
         mEtaMoreVert1.setColorFilter(mView.getResources().getColor(R.color.header_text_color));
+        mEtaMoreVert1.setContentDescription(mContext.getString(R.string.arrival_options_first_description));
 
         mEtaSeparator = mView.findViewById(R.id.eta_separator);
 
         // Second ETA row
         mEtaContainer2 = mView.findViewById(R.id.eta_container2);
         mEtaRouteFavorite2 = (ImageButton) mEtaContainer2.findViewById(R.id.eta_route_favorite);
         mEtaRouteFavorite2.setColorFilter(mView.getResources().getColor(R.color.header_text_color));
+        mEtaRouteFavorite2.setContentDescription(mContext.getString(R.string.arrival_favorite_second_description));
         mEtaReminder2 = (ImageButton) mEtaContainer2.findViewById(R.id.reminder);
         mEtaReminder2.setColorFilter(mView.getResources().getColor(R.color.header_text_color));
+        mEtaReminder2.setContentDescription(mContext.getString(R.string.arrival_reminder_second_description));
         mEtaRouteName2 = (TextView) mEtaContainer2.findViewById(R.id.eta_route_name);
         mEtaAndMin2 = (RelativeLayout) mEtaContainer2.findViewById(R.id.eta_and_min);
         mEtaRouteDirection2 = (TextView) mEtaContainer2.findViewById(R.id.eta_route_direction);
@@ -386,6 +391,7 @@ public void onClick(View v) {
         mEtaRealtime2 = (ViewGroup) mEtaContainer2.findViewById(R.id.eta_realtime_indicator);
         mEtaMoreVert2 = (ImageButton) mEtaContainer2.findViewById(R.id.eta_more_vert);
         mEtaMoreVert2.setColorFilter(mView.getResources().getColor(R.color.header_text_color));
+        mEtaMoreVert2.setContentDescription(mContext.getString(R.string.arrival_options_second_description));
 
         mProgressBar = (ProgressBar) mView.findViewById(R.id.header_loading_spinner);
         mStopInfo = (ImageButton) mView.findViewById(R.id.stop_info_button);

Diff for: onebusaway-android/src/main/res/layout/arrivals_list_header_row_template.xml

@@ -10,7 +10,6 @@
         <ImageButton
                 android:id="@+id/eta_route_favorite"
                 android:src="@drawable/ic_toggle_star"
-                android:contentDescription="@string/stop_info_favorite"
                 android:background="?attr/selectableItemBackground"
                 android:layout_width="48dp"
                 android:layout_height="48dp"
@@ -23,7 +22,6 @@
         <ImageButton
                 android:id="@+id/reminder"
                 android:src="@drawable/ic_drawer_alarm"
-                android:contentDescription="@string/trip_info_reminder_content_description"
                 android:background="?attr/selectableItemBackground"
                 android:maxHeight="12dp"
                 android:maxWidth="12dp"
@@ -94,7 +92,6 @@
     <ImageButton
             android:id="@+id/eta_more_vert"
             android:src="@drawable/ic_navigation_more_vert"
-            android:contentDescription="@string/stop_info_item_options_title"
             android:background="?attr/selectableItemBackground"
             android:layout_width="48dp"
             android:layout_height="48dp"

Diff for: onebusaway-android/src/main/res/values-es/strings.xml

@@ -1160,4 +1160,12 @@
     <!-- Destination reminder feedback Activity -->
     <string name="feedback_like_button_description">Sí, me avisaron en el momento oportuno</string>
     <string name="feedback_dislike_button_description">No, no me avisaron en el momento oportuno</string>
+
+    <!-- Accessibility content descriptions for ETA rows -->
+    <string name="arrival_favorite_first_description">Guardar la primera ruta como favorita</string>
+    <string name="arrival_favorite_second_description">Guardar la segunda ruta como favorita</string>
+    <string name="arrival_reminder_first_description">Establecer recordatorio para la primera llegada</string>
+    <string name="arrival_reminder_second_description">Establecer recordatorio para la segunda llegada</string>
+    <string name="arrival_options_first_description">Opciones para la primera llegada</string>
+    <string name="arrival_options_second_description">Opciones para segunda llegada</string>
 </resources>

Diff for: onebusaway-android/src/main/res/values-fi/strings.xml

@@ -769,4 +769,12 @@
     <!-- Destination reminder feedback Activity -->
     <string name="feedback_like_button_description">Kyllä, minulle ilmoitettiin oikeaan aikaan</string>
     <string name="feedback_dislike_button_description">Ei, minulle ei ilmoitettu oikeaan aikaan</string>
+
+    <!-- Accessibility content descriptions for ETA rows -->
+    <string name="arrival_favorite_first_description">Tallenna ensimmäinen reitti suosikiksi</string>
+    <string name="arrival_favorite_second_description">Tallenna toinen reitti suosikiksi</string>
+    <string name="arrival_reminder_first_description">Aseta muistutus ensimmäisestä saapumisesta</string>
+    <string name="arrival_reminder_second_description">Aseta muistutus toiselle saapumiselle</string>
+    <string name="arrival_options_first_description">Vaihtoehdot ensimmäiselle saapumiselle</string>
+    <string name="arrival_options_second_description">Vaihtoehdot toiselle saapumiselle</string>
 </resources>

Diff for: onebusaway-android/src/main/res/values-it/strings.xml

@@ -1069,4 +1069,12 @@
     <string name="map_option_zoom_out">Riduci</string>
     <string name="map_option_zoom_in">Ingrandisci</string>
     <string name="map_option_layers_close">Chiudi pulsante livelli mappa</string>
+
+    <!-- Accessibility content descriptions for ETA rows -->
+    <string name="arrival_favorite_first_description">Salva il primo percorso come preferito</string>
+    <string name="arrival_favorite_second_description">Salva il secondo percorso come preferito</string>
+    <string name="arrival_reminder_first_description">Imposta promemoria per il primo arrivo</string>
+    <string name="arrival_reminder_second_description">Imposta promemoria per il secondo arrivo</string>
+    <string name="arrival_options_first_description">Opzioni per il primo arrivo</string>
+    <string name="arrival_options_second_description">Opzioni per il secondo arrivo</string>
 </resources>

Diff for: onebusaway-android/src/main/res/values-pl/strings.xml

@@ -787,4 +787,12 @@
     <!-- Destination reminder feedback Activity -->
     <string name="feedback_like_button_description">Tak, zostałem powiadomiony we właściwym czasie</string>
     <string name="feedback_dislike_button_description">Nie, nie zostałem powiadomiony we właściwym czasie</string>
+
+    <!-- Accessibility content descriptions for ETA rows -->
+    <string name="arrival_favorite_first_description">Zapisz pierwszą trasę jako ulubioną</string>
+    <string name="arrival_favorite_second_description">Zapisz drugą trasę jako ulubioną</string>
+    <string name="arrival_reminder_first_description">Ustaw przypomnienie o pierwszym przybyciu</string>
+    <string name="arrival_reminder_second_description">Ustaw przypomnienie o drugim przybyciu</string>
+    <string name="arrival_options_first_description">Opcje pierwszego przyjazdu</string>
+    <string name="arrival_options_second_description">Opcje drugiego przyjazdu</string>
 </resources>

Diff for: onebusaway-android/src/main/res/values/strings.xml

@@ -1309,4 +1309,12 @@
     <string name="map_option_zoom_out">Zoom out</string>
     <string name="map_option_zoom_in">Zoom in</string>
     <string name="map_option_layers_close">Close Map Layers Button</string>
+
+    <!-- Accessibility content descriptions for ETA rows -->
+    <string name="arrival_favorite_first_description">Save first route as favorite</string>
+    <string name="arrival_favorite_second_description">Save second route as favorite</string>
+    <string name="arrival_reminder_first_description">Set reminder for first arrival</string>
+    <string name="arrival_reminder_second_description">Set reminder for second arrival</string>
+    <string name="arrival_options_first_description">Options for first arrival</string>
+    <string name="arrival_options_second_description">Options for second arrival</string>
 </resources>