Skip to content

Commit 749c0be

Browse files
Suyog-Bauskaramrhossamdev
Suyog-Bauskar
and
amrhossamdev
authored
Fix duplicate content descriptions (#1424)
Signed-off-by: Amr <[email protected]> Co-authored-by: Amr <[email protected]>
1 parent 989efc4 commit 749c0be

File tree

7 files changed

+46
-3
lines changed

7 files changed

+46
-3
lines changed

‎onebusaway-android/src/main/java/org/onebusaway/android/ui/ArrivalsListHeader.java

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -359,8 +359,10 @@ public void onClick(View v) {
359359
mEtaContainer1 = mView.findViewById(R.id.eta_container1);
360360
mEtaRouteFavorite1 = (ImageButton) mEtaContainer1.findViewById(R.id.eta_route_favorite);
361361
mEtaRouteFavorite1.setColorFilter(mView.getResources().getColor(R.color.header_text_color));
362+
mEtaRouteFavorite1.setContentDescription(mContext.getString(R.string.arrival_favorite_first_description));
362363
mEtaReminder1 = (ImageButton) mEtaContainer1.findViewById(R.id.reminder);
363364
mEtaReminder1.setColorFilter(mView.getResources().getColor(R.color.header_text_color));
365+
mEtaReminder1.setContentDescription(mContext.getString(R.string.arrival_reminder_first_description));
364366
mEtaRouteName1 = (TextView) mEtaContainer1.findViewById(R.id.eta_route_name);
365367
mEtaRouteDirection1 = (TextView) mEtaContainer1.findViewById(R.id.eta_route_direction);
366368
mEtaAndMin1 = (RelativeLayout) mEtaContainer1.findViewById(R.id.eta_and_min);
@@ -369,15 +371,18 @@ public void onClick(View v) {
369371
mEtaRealtime1 = (ViewGroup) mEtaContainer1.findViewById(R.id.eta_realtime_indicator);
370372
mEtaMoreVert1 = (ImageButton) mEtaContainer1.findViewById(R.id.eta_more_vert);
371373
mEtaMoreVert1.setColorFilter(mView.getResources().getColor(R.color.header_text_color));
374+
mEtaMoreVert1.setContentDescription(mContext.getString(R.string.arrival_options_first_description));
372375

373376
mEtaSeparator = mView.findViewById(R.id.eta_separator);
374377

375378
// Second ETA row
376379
mEtaContainer2 = mView.findViewById(R.id.eta_container2);
377380
mEtaRouteFavorite2 = (ImageButton) mEtaContainer2.findViewById(R.id.eta_route_favorite);
378381
mEtaRouteFavorite2.setColorFilter(mView.getResources().getColor(R.color.header_text_color));
382+
mEtaRouteFavorite2.setContentDescription(mContext.getString(R.string.arrival_favorite_second_description));
379383
mEtaReminder2 = (ImageButton) mEtaContainer2.findViewById(R.id.reminder);
380384
mEtaReminder2.setColorFilter(mView.getResources().getColor(R.color.header_text_color));
385+
mEtaReminder2.setContentDescription(mContext.getString(R.string.arrival_reminder_second_description));
381386
mEtaRouteName2 = (TextView) mEtaContainer2.findViewById(R.id.eta_route_name);
382387
mEtaAndMin2 = (RelativeLayout) mEtaContainer2.findViewById(R.id.eta_and_min);
383388
mEtaRouteDirection2 = (TextView) mEtaContainer2.findViewById(R.id.eta_route_direction);
@@ -386,6 +391,7 @@ public void onClick(View v) {
386391
mEtaRealtime2 = (ViewGroup) mEtaContainer2.findViewById(R.id.eta_realtime_indicator);
387392
mEtaMoreVert2 = (ImageButton) mEtaContainer2.findViewById(R.id.eta_more_vert);
388393
mEtaMoreVert2.setColorFilter(mView.getResources().getColor(R.color.header_text_color));
394+
mEtaMoreVert2.setContentDescription(mContext.getString(R.string.arrival_options_second_description));
389395

390396
mProgressBar = (ProgressBar) mView.findViewById(R.id.header_loading_spinner);
391397
mStopInfo = (ImageButton) mView.findViewById(R.id.stop_info_button);

‎onebusaway-android/src/main/res/layout/arrivals_list_header_row_template.xml

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@
1010
<ImageButton
1111
android:id="@+id/eta_route_favorite"
1212
android:src="@drawable/ic_toggle_star"
13-
android:contentDescription="@string/stop_info_favorite"
1413
android:background="?attr/selectableItemBackground"
1514
android:layout_width="48dp"
1615
android:layout_height="48dp"
@@ -23,7 +22,6 @@
2322
<ImageButton
2423
android:id="@+id/reminder"
2524
android:src="@drawable/ic_drawer_alarm"
26-
android:contentDescription="@string/trip_info_reminder_content_description"
2725
android:background="?attr/selectableItemBackground"
2826
android:maxHeight="12dp"
2927
android:maxWidth="12dp"
@@ -94,7 +92,6 @@
9492
<ImageButton
9593
android:id="@+id/eta_more_vert"
9694
android:src="@drawable/ic_navigation_more_vert"
97-
android:contentDescription="@string/stop_info_item_options_title"
9895
android:background="?attr/selectableItemBackground"
9996
android:layout_width="48dp"
10097
android:layout_height="48dp"

‎onebusaway-android/src/main/res/values-es/strings.xml

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1160,4 +1160,12 @@
11601160
<!-- Destination reminder feedback Activity -->
11611161
<string name="feedback_like_button_description">Sí, me avisaron en el momento oportuno</string>
11621162
<string name="feedback_dislike_button_description">No, no me avisaron en el momento oportuno</string>
1163+
1164+
<!-- Accessibility content descriptions for ETA rows -->
1165+
<string name="arrival_favorite_first_description">Guardar la primera ruta como favorita</string>
1166+
<string name="arrival_favorite_second_description">Guardar la segunda ruta como favorita</string>
1167+
<string name="arrival_reminder_first_description">Establecer recordatorio para la primera llegada</string>
1168+
<string name="arrival_reminder_second_description">Establecer recordatorio para la segunda llegada</string>
1169+
<string name="arrival_options_first_description">Opciones para la primera llegada</string>
1170+
<string name="arrival_options_second_description">Opciones para segunda llegada</string>
11631171
</resources>

‎onebusaway-android/src/main/res/values-fi/strings.xml

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -769,4 +769,12 @@
769769
<!-- Destination reminder feedback Activity -->
770770
<string name="feedback_like_button_description">Kyllä, minulle ilmoitettiin oikeaan aikaan</string>
771771
<string name="feedback_dislike_button_description">Ei, minulle ei ilmoitettu oikeaan aikaan</string>
772+
773+
<!-- Accessibility content descriptions for ETA rows -->
774+
<string name="arrival_favorite_first_description">Tallenna ensimmäinen reitti suosikiksi</string>
775+
<string name="arrival_favorite_second_description">Tallenna toinen reitti suosikiksi</string>
776+
<string name="arrival_reminder_first_description">Aseta muistutus ensimmäisestä saapumisesta</string>
777+
<string name="arrival_reminder_second_description">Aseta muistutus toiselle saapumiselle</string>
778+
<string name="arrival_options_first_description">Vaihtoehdot ensimmäiselle saapumiselle</string>
779+
<string name="arrival_options_second_description">Vaihtoehdot toiselle saapumiselle</string>
772780
</resources>

‎onebusaway-android/src/main/res/values-it/strings.xml

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1069,4 +1069,12 @@
10691069
<string name="map_option_zoom_out">Riduci</string>
10701070
<string name="map_option_zoom_in">Ingrandisci</string>
10711071
<string name="map_option_layers_close">Chiudi pulsante livelli mappa</string>
1072+
1073+
<!-- Accessibility content descriptions for ETA rows -->
1074+
<string name="arrival_favorite_first_description">Salva il primo percorso come preferito</string>
1075+
<string name="arrival_favorite_second_description">Salva il secondo percorso come preferito</string>
1076+
<string name="arrival_reminder_first_description">Imposta promemoria per il primo arrivo</string>
1077+
<string name="arrival_reminder_second_description">Imposta promemoria per il secondo arrivo</string>
1078+
<string name="arrival_options_first_description">Opzioni per il primo arrivo</string>
1079+
<string name="arrival_options_second_description">Opzioni per il secondo arrivo</string>
10721080
</resources>

‎onebusaway-android/src/main/res/values-pl/strings.xml

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -787,4 +787,12 @@
787787
<!-- Destination reminder feedback Activity -->
788788
<string name="feedback_like_button_description">Tak, zostałem powiadomiony we właściwym czasie</string>
789789
<string name="feedback_dislike_button_description">Nie, nie zostałem powiadomiony we właściwym czasie</string>
790+
791+
<!-- Accessibility content descriptions for ETA rows -->
792+
<string name="arrival_favorite_first_description">Zapisz pierwszą trasę jako ulubioną</string>
793+
<string name="arrival_favorite_second_description">Zapisz drugą trasę jako ulubioną</string>
794+
<string name="arrival_reminder_first_description">Ustaw przypomnienie o pierwszym przybyciu</string>
795+
<string name="arrival_reminder_second_description">Ustaw przypomnienie o drugim przybyciu</string>
796+
<string name="arrival_options_first_description">Opcje pierwszego przyjazdu</string>
797+
<string name="arrival_options_second_description">Opcje drugiego przyjazdu</string>
790798
</resources>

‎onebusaway-android/src/main/res/values/strings.xml

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1309,4 +1309,12 @@
13091309
<string name="map_option_zoom_out">Zoom out</string>
13101310
<string name="map_option_zoom_in">Zoom in</string>
13111311
<string name="map_option_layers_close">Close Map Layers Button</string>
1312+
1313+
<!-- Accessibility content descriptions for ETA rows -->
1314+
<string name="arrival_favorite_first_description">Save first route as favorite</string>
1315+
<string name="arrival_favorite_second_description">Save second route as favorite</string>
1316+
<string name="arrival_reminder_first_description">Set reminder for first arrival</string>
1317+
<string name="arrival_reminder_second_description">Set reminder for second arrival</string>
1318+
<string name="arrival_options_first_description">Options for first arrival</string>
1319+
<string name="arrival_options_second_description">Options for second arrival</string>
13121320
</resources>

0 commit comments

Comments
 (0)