Improve accessibility in Manage timelines page (f9e9445d) · Commits · Android-smartphones / Fedilab

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

+4 −4

Original line number	Diff line number	Diff line
		@@ -72,15 +72,15 @@ public class ReorderBottomMenuAdapter extends RecyclerView.Adapter<RecyclerView.
		switch (bottomMenu.bottom_menu.get(position).item_menu_type) {
		case HOME:
		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;
		case LOCAL:
		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;
		case PUBLIC:
		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;
		case NOTIFICATION:
		holder.binding.icon.setImageResource(R.drawable.ic_baseline_notifications_24);
		@@ -88,7 +88,7 @@ public class ReorderBottomMenuAdapter extends RecyclerView.Adapter<RecyclerView.
		break;
		case DIRECT:
		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;
		}
		holder.binding.text.setText(title);

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

+17 −10

Original line number	Diff line number	Diff line
		@@ -117,26 +117,33 @@ public class ReorderTabAdapter extends RecyclerView.Adapter<RecyclerView.ViewHol
		break;
		case TAG:
		holder.binding.icon.setImageResource(R.drawable.ic_baseline_label_24);
		if (pinned.pinnedTimelines.get(position).tagTimeline.displayName != null)
		holder.binding.text.setText(pinned.pinnedTimelines.get(position).tagTimeline.displayName);
		else
		holder.binding.text.setText(pinned.pinnedTimelines.get(position).tagTimeline.name);
		if (pinned.pinnedTimelines.get(position).tagTimeline.displayName != null) {
		String tagTimelineDisplayName = pinned.pinnedTimelines.get(position).tagTimeline.displayName;
		holder.binding.text.setText(tagTimelineDisplayName);
		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;
		case LIST:
		String listTitle = pinned.pinnedTimelines.get(position).mastodonList.title;
		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;
		case HOME:
		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;
		case LOCAL:
		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;
		case PUBLIC:
		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;
		case NOTIFICATION:
		holder.binding.icon.setImageResource(R.drawable.ic_baseline_notifications_24);
		@@ -144,11 +151,11 @@ public class ReorderTabAdapter extends RecyclerView.Adapter<RecyclerView.ViewHol
		break;
		case DIRECT:
		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;
		case BUBBLE:
		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;
		case TREND_MESSAGE:
		holder.binding.icon.setImageResource(R.drawable.baseline_moving_24);

app/src/main/res/layouts/mastodon/layout/drawer_reorder.xml

+2 −2

Original line number	Diff line number	Diff line
		@@ -19,7 +19,7 @@
		android:layout_width="40dp"
		android:layout_height="40dp"
		android:layout_gravity="center"
		android:contentDescription="@string/instance_logo"
		android:importantForAccessibility="no"
		android:scaleType="center"
		tools:src="@drawable/ic_baseline_home_24" />

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

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

+1 −0

Original line number	Diff line number	Diff line
		@@ -85,6 +85,7 @@
		<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>
		<string name="cd_hash_tag_timeline">%s. Hash tag timeline</string>

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