Commit 9584e322 authored by 0xd9a's avatar 0xd9a
Browse files

Add content descriptions to tabs in top bar

parent 1c28b200

app/src/main/java/app/fedilab/android/mastodon/helper/PinnedTimelineHelper.java

+10 −0
Original line number Diff line number Diff line
@@ -393,9 +393,11 @@ public class PinnedTimelineHelper { 
                    switch (pinnedTimeline.type) {

                        case LIST:

                            tabCustomViewBinding.icon.setImageResource(R.drawable.ic_tl_list);

                            tab.setContentDescription(activity.getString(R.string.cd_list_timeline, name));

                            break;

                        case TAG:

                            tabCustomViewBinding.icon.setImageResource(R.drawable.ic_tl_tag);

                            tab.setContentDescription("#" + name);

                            break;

                        case REMOTE:

                            switch (pinnedTimeline.remoteInstance.type) {
@@ -422,6 +424,7 @@ public class PinnedTimelineHelper { 
                                    tabCustomViewBinding.icon.setImageResource(R.drawable.peertube_icon);

                                    break;

                            }

                            tab.setContentDescription(name);

                            break;

                    }

                    tab.setCustomView(tabCustomViewBinding.getRoot());
@@ -430,24 +433,31 @@ public class PinnedTimelineHelper { 
                    switch (pinnedTimeline.type) {

                        case HOME:

                            tabCustomDefaultViewBinding.icon.setImageResource(R.drawable.ic_baseline_home_24);

                            tab.setContentDescription(R.string.tab_home_timeline);

                            break;

                        case LOCAL:

                            tabCustomDefaultViewBinding.icon.setImageResource(R.drawable.ic_baseline_supervisor_account_24);

                            tab.setContentDescription(R.string.tab_local_timeline);

                            break;

                        case PUBLIC:

                            tabCustomDefaultViewBinding.icon.setImageResource(R.drawable.ic_baseline_public_24);

                            tab.setContentDescription(R.string.tab_public_timeline);

                            break;

                        case NOTIFICATION:

                            tabCustomDefaultViewBinding.icon.setImageResource(R.drawable.ic_baseline_notifications_24);

                            tab.setContentDescription(R.string.notifications);

                            break;

                        case DIRECT:

                            tabCustomDefaultViewBinding.icon.setImageResource(R.drawable.ic_baseline_mail_24);

                            tab.setContentDescription(R.string.tab_private_mentions);

                            break;

                        case BUBBLE:

                            tabCustomDefaultViewBinding.icon.setImageResource(R.drawable.ic_baseline_bubble_chart_24);

                            tab.setContentDescription(R.string.tab_bubble_timeline);

                            break;

                        case TREND_MESSAGE:

                            tabCustomDefaultViewBinding.icon.setImageResource(R.drawable.baseline_moving_24);

                            tab.setContentDescription(R.string.trending);

                            break;

                    }

                    tab.setCustomView(tabCustomDefaultViewBinding.getRoot());

app/src/main/res/values/strings.xml

+2 −0
Original line number Diff line number Diff line
@@ -82,7 +82,9 @@ 
    <string name="tab_local_timeline">@string/local_menu</string>

    <string name="tab_public_timeline">Public timeline</string>

    <string name="tab_private_mentions">Private mentions</string>

    <string name="tab_bubble_timeline">Bubble timeline</string>

    <string name="cd_translated_content">Translated content: %s</string>

    <string name="cd_list_timeline">%s. List timeline</string>



    <!-- Status -->

    <string name="no_status">No message to display</string>