From 52312b0c824f2f1f3adbae517d1a72076866245d Mon Sep 17 00:00:00 2001
From: Scott Jackson <scottmmjackson@gmail.com>
Date: Thu, 15 Jun 2023 12:53:01 -0400
Subject: [PATCH] Small Accessibility Tweaks:
 https://github.com/dessalines/jerboa/issues/616

---
 .../jerboa/ui/components/common/VoteHelpers.kt    | 15 ++++++++++++++-
 .../ui/components/community/CommunityLink.kt      |  2 +-
 app/src/main/res/values/strings.xml               | 14 +++++++++-----
 3 files changed, 24 insertions(+), 7 deletions(-)

diff --git a/app/src/main/java/com/jerboa/ui/components/common/VoteHelpers.kt b/app/src/main/java/com/jerboa/ui/components/common/VoteHelpers.kt
index 3ca1d0f15..756ea349f 100644
--- a/app/src/main/java/com/jerboa/ui/components/common/VoteHelpers.kt
+++ b/app/src/main/java/com/jerboa/ui/components/common/VoteHelpers.kt
@@ -35,11 +35,24 @@ fun <T> VoteGeneric(
     } else {
         null
     }
+    val contentDescription: String = if (type == VoteType.Upvote) {
+        if (myVote == 1) {
+            stringResource(R.string.upvoted)
+        } else {
+            stringResource(R.string.upvote)
+        }
+    } else {
+        if (myVote == 1) {
+            stringResource(R.string.downvoted)
+        } else {
+            stringResource(R.string.downvote)
+        }
+    }
     ActionBarButton(
         onClick = { onVoteClick(item) },
         contentColor = iconAndColor.second,
         icon = iconAndColor.first,
-        contentDescription = stringResource(R.string.voteToggle),
+        contentDescription = contentDescription,
         text = votesStr,
         account = account,
     )
diff --git a/app/src/main/java/com/jerboa/ui/components/community/CommunityLink.kt b/app/src/main/java/com/jerboa/ui/components/community/CommunityLink.kt
index 1fc5ec127..fb347a73d 100644
--- a/app/src/main/java/com/jerboa/ui/components/community/CommunityLink.kt
+++ b/app/src/main/java/com/jerboa/ui/components/community/CommunityLink.kt
@@ -88,7 +88,7 @@ fun CommunityLink(
             if (showDefaultIcon) {
                 Icon(
                     imageVector = Icons.Outlined.Forum,
-                    contentDescription = "TODO",
+                    contentDescription = "",
                     modifier = Modifier.size(size),
                 )
             }
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 92fbca93d..200afd3d1 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -119,7 +119,7 @@
     <string name="create_report_report">Report</string>
     <string name="create_report_type_your_reason">Type your reason</string>
     <string name="create_report_view_model_report_created">Report Created</string>
-    <string name="dialog_moreOptions">Show more options</string>
+    <string name="dialog_moreOptions">More options</string>
     <string name="dialogs_active">Active</string>
     <string name="dialogs_all">All</string>
     <string name="dialogs_done">Done</string>
@@ -139,7 +139,7 @@
     <string name="dialogs_unread">Unread</string>
     <string name="floating_createPost">Create post</string>
     <string name="form_submit">Submit</string>
-    <string name="homeHeader_filter">Select listing filter</string>
+    <string name="homeHeader_filter">Select feed</string>
     <string name="home_add_account">Add Account</string>
     <string name="home_all">All</string>
     <string name="home_communities">Communities</string>
@@ -157,7 +157,7 @@
     <string name="home_subscriptions">Subscriptions</string>
     <string name="home_switch_to">Switch to %1$s/%2$s</string>
     <string name="inbox_back">Back</string>
-    <string name="inbox_filter">Select inbox filter</string>
+    <string name="inbox_filter">Filter</string>
     <string name="inbox_inbox">Inbox</string>
     <string name="inbox_markAllRead">Mark all as read</string>
     <string name="input_fields_cancel">Cancel</string>
@@ -207,7 +207,7 @@
     <string name="markdownHelper_insertList">Insert list</string>
     <string name="markdownHelper_insertQuote">Insert quote</string>
     <string name="markdownHelper_preview">View preview</string>
-    <string name="moreOptions">Show more options</string>
+    <string name="moreOptions">More options</string>
     <string name="personProfile_viewAvatar">View avatar image</string>
     <string name="personProfile_viewBanner">View banner image</string>
     <string name="person_iconAdmin">Is administrator</string>
@@ -256,7 +256,7 @@
     <string name="private_message_reply_type_your_message_placeholder">Type your message</string>
     <string name="private_message_to">"to "</string>
     <string name="removeBookmark">Remove from bookmarks</string>
-    <string name="selectSort">Select sort option</string>
+    <string name="selectSort">Sort by</string>
     <string name="settings_about_about">About</string>
     <string name="settings_about_developer_matrix_chatroom">Developer Matrix chatroom</string>
     <string name="settings_about_donate_to_jerboa_development">Donate to Jerboa development</string>
@@ -289,4 +289,8 @@
     <string name="topAppBar_back">Back</string>
     <string name="utils_login_first">Login first</string>
     <string name="voteToggle">Toggle vote</string>
+    <string name="upvote">Upvote</string>
+    <string name="downvote">Downvote</string>
+    <string name="upvoted">Upvoted</string>
+    <string name="downvoted">Downvoted</string>
 </resources>