mirrors/Fedilab
1
0
Fork 1
mirror of https://codeberg.org/tom79/Fedilab.git synced 2025-09-15 08:20:18 +03:00
Code Issues Projects Releases Packages Wiki Activity

Improve accessibility in Manage timelines page

Browse source
This commit is contained in:
0xd9a 2025-08-15 01:56:56 +05:30
parent 9584e32298
commit f9e9445ddd
4 changed files with 24 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
app/src/main/java/app/fedilab/android/mastodon/ui/drawer/ReorderBottomMenuAdapter.java
View file

@ -72,15 +72,15 @@ public class ReorderBottomMenuAdapter extends RecyclerView.Adapter<RecyclerView.
switch (bottomMenu.bottom_menu.get(position).item_menu_type) { switch (bottomMenu.bottom_menu.get(position).item_menu_type) {
case HOME: case HOME:
holder.binding.icon.setImageResource(R.drawable.ic_baseline_home_24); holder.binding.icon.setImageResource(R.drawable.ic_baseline_home_24);
title = context.getString(R.string.home_menu); title = context.getString(R.string.tab_home_timeline);
break; break;
case LOCAL: case LOCAL:
holder.binding.icon.setImageResource(R.drawable.ic_baseline_people_alt_24); holder.binding.icon.setImageResource(R.drawable.ic_baseline_people_alt_24);
title = context.getString(R.string.local); title = context.getString(R.string.tab_local_timeline);
break; break;
case PUBLIC: case PUBLIC:
holder.binding.icon.setImageResource(R.drawable.ic_baseline_public_24); holder.binding.icon.setImageResource(R.drawable.ic_baseline_public_24);
title = context.getString(R.string.v_public); title = context.getString(R.string.tab_public_timeline);
break; break;
case NOTIFICATION: case NOTIFICATION:
holder.binding.icon.setImageResource(R.drawable.ic_baseline_notifications_24); holder.binding.icon.setImageResource(R.drawable.ic_baseline_notifications_24);
@ -88,7 +88,7 @@ public class ReorderBottomMenuAdapter extends RecyclerView.Adapter<RecyclerView.
break; break;
case DIRECT: case DIRECT:
holder.binding.icon.setImageResource(R.drawable.ic_baseline_mail_24); holder.binding.icon.setImageResource(R.drawable.ic_baseline_mail_24);
title = context.getString(R.string.v_private); title = context.getString(R.string.tab_private_mentions);
break; break;
} }
holder.binding.text.setText(title); holder.binding.text.setText(title);

27
app/src/main/java/app/fedilab/android/mastodon/ui/drawer/ReorderTabAdapter.java
View file

@ -117,26 +117,33 @@ public class ReorderTabAdapter extends RecyclerView.Adapter<RecyclerView.ViewHol
break; break;
case TAG: case TAG:
holder.binding.icon.setImageResource(R.drawable.ic_baseline_label_24); holder.binding.icon.setImageResource(R.drawable.ic_baseline_label_24);
if (pinned.pinnedTimelines.get(position).tagTimeline.displayName != null) if (pinned.pinnedTimelines.get(position).tagTimeline.displayName != null) {
holder.binding.text.setText(pinned.pinnedTimelines.get(position).tagTimeline.displayName); String tagTimelineDisplayName = pinned.pinnedTimelines.get(position).tagTimeline.displayName;
else holder.binding.text.setText(tagTimelineDisplayName);
holder.binding.text.setText(pinned.pinnedTimelines.get(position).tagTimeline.name); holder.binding.getRoot().setContentDescription(context.getString(R.string.cd_hash_tag_timeline, tagTimelineDisplayName));
} else {
String tagTimelineName = pinned.pinnedTimelines.get(position).tagTimeline.name;
holder.binding.text.setText(tagTimelineName);
holder.binding.getRoot().setContentDescription("#" + tagTimelineName);
}
break; break;
case LIST: case LIST:
String listTitle = pinned.pinnedTimelines.get(position).mastodonList.title;
holder.binding.icon.setImageResource(R.drawable.ic_baseline_view_list_24); holder.binding.icon.setImageResource(R.drawable.ic_baseline_view_list_24);
holder.binding.text.setText(pinned.pinnedTimelines.get(position).mastodonList.title); holder.binding.text.setText(listTitle);
holder.binding.getRoot().setContentDescription(context.getString(R.string.cd_list_timeline, listTitle));
break; break;
case HOME: case HOME:
holder.binding.icon.setImageResource(R.drawable.ic_baseline_home_24); holder.binding.icon.setImageResource(R.drawable.ic_baseline_home_24);
holder.binding.text.setText(R.string.home_menu); holder.binding.text.setText(R.string.tab_home_timeline);
break; break;
case LOCAL: case LOCAL:
holder.binding.icon.setImageResource(R.drawable.ic_baseline_supervisor_account_24); holder.binding.icon.setImageResource(R.drawable.ic_baseline_supervisor_account_24);
holder.binding.text.setText(R.string.local_menu); holder.binding.text.setText(R.string.tab_local_timeline);
break; break;
case PUBLIC: case PUBLIC:
holder.binding.icon.setImageResource(R.drawable.ic_baseline_public_24); holder.binding.icon.setImageResource(R.drawable.ic_baseline_public_24);
holder.binding.text.setText(R.string.v_public); holder.binding.text.setText(R.string.tab_public_timeline);
break; break;
case NOTIFICATION: case NOTIFICATION:
holder.binding.icon.setImageResource(R.drawable.ic_baseline_notifications_24); holder.binding.icon.setImageResource(R.drawable.ic_baseline_notifications_24);
@ -144,11 +151,11 @@ public class ReorderTabAdapter extends RecyclerView.Adapter<RecyclerView.ViewHol
break; break;
case DIRECT: case DIRECT:
holder.binding.icon.setImageResource(R.drawable.ic_baseline_mail_24); holder.binding.icon.setImageResource(R.drawable.ic_baseline_mail_24);
holder.binding.text.setText(R.string.v_direct); holder.binding.text.setText(R.string.tab_private_mentions);
break; break;
case BUBBLE: case BUBBLE:
holder.binding.icon.setImageResource(R.drawable.ic_baseline_bubble_chart_24); holder.binding.icon.setImageResource(R.drawable.ic_baseline_bubble_chart_24);
holder.binding.text.setText(R.string.bubble); holder.binding.text.setText(R.string.tab_bubble_timeline);
break; break;
case TREND_MESSAGE: case TREND_MESSAGE:
holder.binding.icon.setImageResource(R.drawable.baseline_moving_24); holder.binding.icon.setImageResource(R.drawable.baseline_moving_24);

4
app/src/main/res/layouts/mastodon/layout/drawer_reorder.xml
View file

@ -19,7 +19,7 @@
android:layout_width="40dp" android:layout_width="40dp"
android:layout_height="40dp" android:layout_height="40dp"
android:layout_gravity="center" android:layout_gravity="center"
android:contentDescription="@string/instance_logo" android:importantForAccessibility="no"
android:scaleType="center" android:scaleType="center"
tools:src="@drawable/ic_baseline_home_24" /> tools:src="@drawable/ic_baseline_home_24" />
@ -57,7 +57,7 @@
android:layout_width="40dp" android:layout_width="40dp"
android:layout_height="40dp" android:layout_height="40dp"
android:layout_gravity="center" android:layout_gravity="center"
android:contentDescription="@string/move_timeline" android:importantForAccessibility="no"
android:scaleType="center" android:scaleType="center"
android:src="@drawable/ic_baseline_drag_handle_24" android:src="@drawable/ic_baseline_drag_handle_24"
tools:ignore="RtlHardcoded" /> tools:ignore="RtlHardcoded" />

1
app/src/main/res/values/strings.xml
View file

@ -85,6 +85,7 @@
<string name="tab_bubble_timeline">Bubble timeline</string> <string name="tab_bubble_timeline">Bubble timeline</string>
<string name="cd_translated_content">Translated content: %s</string> <string name="cd_translated_content">Translated content: %s</string>
<string name="cd_list_timeline">%s. List timeline</string> <string name="cd_list_timeline">%s. List timeline</string>
<string name="cd_hash_tag_timeline">%s. Hash tag timeline</string>
<!-- Status --> <!-- Status -->
<string name="no_status">No message to display</string> <string name="no_status">No message to display</string>