diff --git a/Habitica/res/layout/avatar_with_bars.xml b/Habitica/res/layout/avatar_with_bars.xml index faa19c233..6b2798b7b 100644 --- a/Habitica/res/layout/avatar_with_bars.xml +++ b/Habitica/res/layout/avatar_with_bars.xml @@ -26,6 +26,7 @@ android:layout_gravity="center_vertical" android:layout_marginEnd="16dp" android:layout_marginRight="16dp" + android:contentDescription="@string/sidebar_avatar" app:showBackground="true" app:showMount="true" app:showPet="true"/> diff --git a/Habitica/res/layout/habit_item_card.xml b/Habitica/res/layout/habit_item_card.xml index d707610c2..66632b7e8 100644 --- a/Habitica/res/layout/habit_item_card.xml +++ b/Habitica/res/layout/habit_item_card.xml @@ -38,7 +38,8 @@ style="@style/HabitButton" android:layout_width="match_parent" android:layout_height="match_parent" - android:background="@drawable/selection_highlight" /> + android:background="@drawable/selection_highlight" + android:contentDescription="@string/positive_habit_form" /> + android:background="@drawable/selection_highlight" + android:contentDescription="@string/negative_habit_form" /> diff --git a/Habitica/res/layout/main_navigation_view.xml b/Habitica/res/layout/main_navigation_view.xml index d44ef55ce..43a1d455f 100644 --- a/Habitica/res/layout/main_navigation_view.xml +++ b/Habitica/res/layout/main_navigation_view.xml @@ -12,8 +12,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_alignParentBottom="true" - android:layout_alignTop="@id/item_wrapper" - android:clickable="true"> + android:layout_alignTop="@id/item_wrapper"> this.currencyContentDescription = context.getString(R.string.gold_plural) + "gems" -> this.currencyContentDescription = context.getString(R.string.gems) + "hourglasses" -> this.currencyContentDescription = context.getString(R.string.mystic_hourglasses) + else -> this.currencyContentDescription = "" + } + } + private fun configureCurrency() { if ("gold" == currency) { icon = HabiticaIconsHelper.imageOfGold() @@ -87,7 +99,9 @@ class CurrencyView : androidx.appcompat.widget.AppCompatTextView { var value = 0.0 set(value) { field = value - text = NumberAbbreviator.abbreviate(context, value) + val abbreviatedValue = NumberAbbreviator.abbreviate(context, value) + text = abbreviatedValue + contentDescription = "$abbreviatedValue $currencyContentDescription" updateVisibility() }