diff --git a/app/src/main/java/com/keylesspalace/tusky/AccountActivity.java b/app/src/main/java/com/keylesspalace/tusky/AccountActivity.java
index bbdaf4e3..ebf1ebd9 100644
--- a/app/src/main/java/com/keylesspalace/tusky/AccountActivity.java
+++ b/app/src/main/java/com/keylesspalace/tusky/AccountActivity.java
@@ -289,6 +289,16 @@ public class AccountActivity extends BaseActivity {
updateButtons();
}
+ private void updateFollowButton(FloatingActionButton button) {
+ if (following) {
+ button.setImageResource(R.drawable.ic_person_minus_24px);
+ button.setContentDescription(getString(R.string.action_unfollow));
+ } else {
+ button.setImageResource(R.drawable.ic_person_add_24dp);
+ button.setContentDescription(getString(R.string.action_follow));
+ }
+ }
+
private void updateButtons() {
invalidateOptionsMenu();
@@ -297,24 +307,13 @@ public class AccountActivity extends BaseActivity {
if(!isSelf && !blocking) {
floatingBtn.show();
- if (following) {
- floatingBtn.setImageResource(R.drawable.ic_person_minus_24px);
- } else {
- floatingBtn.setImageResource(R.drawable.ic_person_add_24dp);
- }
+ updateFollowButton(floatingBtn);
floatingBtn.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
-
follow(accountId);
-
- if (following) {
- floatingBtn.setImageResource(R.drawable.ic_person_minus_24px);
- } else {
- floatingBtn.setImageResource(R.drawable.ic_person_add_24dp);
- }
-
+ updateFollowButton(floatingBtn);
}
});
}
diff --git a/app/src/main/res/layout/activity_account.xml b/app/src/main/res/layout/activity_account.xml
index 41b8c1e2..e3504dd6 100644
--- a/app/src/main/res/layout/activity_account.xml
+++ b/app/src/main/res/layout/activity_account.xml
@@ -36,7 +36,8 @@
app:layout_collapseMode="pin"
android:fitsSystemWindows="true"
android:layout_alignTop="@+id/account_header_info"
- android:layout_alignBottom="@id/account_header_info" />
+ android:layout_alignBottom="@id/account_header_info"
+ android:contentDescription="@null" />
+ android:layout_toRightOf="@id/account_username"
+ android:contentDescription="@string/description_account_locked"/>
@@ -181,6 +183,7 @@
android:layout_gravity="bottom|end"
android:layout_margin="16dp"
android:layout_height="wrap_content"
- app:srcCompat="@drawable/ic_person_add_24dp"/>
+ app:srcCompat="@drawable/ic_person_add_24dp"
+ android:contentDescription="@string/action_follow" />
diff --git a/app/src/main/res/layout/activity_compose.xml b/app/src/main/res/layout/activity_compose.xml
index fd3dd798..8361da98 100644
--- a/app/src/main/res/layout/activity_compose.xml
+++ b/app/src/main/res/layout/activity_compose.xml
@@ -1,5 +1,6 @@
-
+ app:srcCompat="@drawable/ic_attach_file_24dp"
+ android:contentDescription="@string/action_photo_pick" />
+ app:srcCompat="@drawable/ic_public_24dp"
+ android:contentDescription="@string/action_compose_options" />
+ android:src="@drawable/elephant_friend"
+ android:contentDescription="@string/description_elephant_friend" />
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index 39e2effa..5da1b06e 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -1,5 +1,6 @@
-
-
+ app:srcCompat="@drawable/ic_create_24dp"
+ android:contentDescription="@string/action_compose" />
+ android:layout_height="match_parent">
+
+
diff --git a/app/src/main/res/layout/item_blocked_user.xml b/app/src/main/res/layout/item_blocked_user.xml
index b1d2b4d5..c6c374e3 100644
--- a/app/src/main/res/layout/item_blocked_user.xml
+++ b/app/src/main/res/layout/item_blocked_user.xml
@@ -24,7 +24,8 @@
style="?attr/image_button_style"
android:layout_alignParentRight="true"
android:layout_marginLeft="16dp"
- android:layout_centerVertical="true" />
+ android:layout_centerVertical="true"
+ android:contentDescription="@string/action_unblock" />
+ android:tint="?attr/colorAccent"
+ android:contentDescription="@string/action_follow" />
+ android:layout_alignParentLeft="true"
+ android:contentDescription="@null" />
+ android:tint="?android:textColorTertiary"
+ android:contentDescription="@null" />
+ android:layout_marginRight="10dp"
+ android:contentDescription="@null" />
+
+ android:layout_marginTop="@dimen/status_media_preview_top_margin"
+ android:contentDescription="@null" />
+ android:layout_marginTop="@dimen/status_media_preview_top_margin"
+ android:contentDescription="@null" />
+
+ android:scaleType="centerCrop"
+ android:contentDescription="@null" />
+ android:scaleType="centerCrop"
+ android:contentDescription="@null" />
+
+ style="?attr/image_button_style"
+ android:contentDescription="@string/action_reply" />
+ android:layout_height="32dp"
+ android:contentDescription="@string/action_reblog" />
+ android:id="@+id/status_favourite"
+ android:contentDescription="@string/action_favourite" />
+ style="?attr/image_button_style"
+ android:contentDescription="@string/action_more" />
+ app:srcCompat="@drawable/ic_repeat_24dp"
+ android:contentDescription="@null" />
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_centerInParent="true">
-
+ android:id="@+id/title"
+ android:layout_centerHorizontal="true"
+ android:textAllCaps="true"
+ android:textStyle="normal|bold" />
-
-
-
-
-
+
\ No newline at end of file
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 730fa649..cc255d97 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -46,6 +46,10 @@
Report @%s
Additional comments?
+ Reply
+ Boost
+ Favourite
+ More
Compose
Login with Mastodon
Log Out
@@ -76,6 +80,7 @@
Unmute
Mention
NSFW
+ Options
Share toot URL to…
@@ -121,7 +126,8 @@
Appearance
Use the Light Theme
Browser
- Use Chrome Custom Tabs
+ Use Chrome Custom Tabs
+ Hide follow button while scrolling
%s mentioned you
%1$s, %2$s, %3$s and %4$d others
@@ -129,4 +135,7 @@
%1$s and %2$s
%d new interactions
+ Elephant Friend
+ Locked Account
+
diff --git a/app/src/main/res/xml/preferences.xml b/app/src/main/res/xml/preferences.xml
index 6dd7527d..e149cc1b 100644
--- a/app/src/main/res/xml/preferences.xml
+++ b/app/src/main/res/xml/preferences.xml
@@ -11,7 +11,7 @@