From a782160dd303a3ebf694bf4abf12769b0bd65915 Mon Sep 17 00:00:00 2001 From: FineFindus <63370021+FineFindus@users.noreply.github.com> Date: Mon, 9 Jan 2023 21:30:52 +0100 Subject: [PATCH] refactor: use getContentDescription instead of duplicate code --- .../android/ui/displayitems/AudioStatusDisplayItem.java | 2 +- .../ui/displayitems/ExtendedFooterStatusDisplayItem.java | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/mastodon/src/main/java/org/joinmastodon/android/ui/displayitems/AudioStatusDisplayItem.java b/mastodon/src/main/java/org/joinmastodon/android/ui/displayitems/AudioStatusDisplayItem.java index d7c1723a9..3d3acef9c 100644 --- a/mastodon/src/main/java/org/joinmastodon/android/ui/displayitems/AudioStatusDisplayItem.java +++ b/mastodon/src/main/java/org/joinmastodon/android/ui/displayitems/AudioStatusDisplayItem.java @@ -130,7 +130,7 @@ public class AudioStatusDisplayItem extends StatusDisplayItem{ playPauseBtn.setImageResource(playing ? R.drawable.ic_fluent_pause_circle_24_filled : R.drawable.ic_fluent_play_circle_24_filled); playPauseBtn.setContentDescription(MastodonApp.context.getResources().getString(playing ? R.string.pause : R.string.play)); if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) { - playPauseBtn.setTooltipText(MastodonApp.context.getResources().getString(playing ? R.string.pause : R.string.play)); + playPauseBtn.setTooltipText(playPauseBtn.getContentDescription()); } if(!playing){ lastRemainingSeconds=-1; diff --git a/mastodon/src/main/java/org/joinmastodon/android/ui/displayitems/ExtendedFooterStatusDisplayItem.java b/mastodon/src/main/java/org/joinmastodon/android/ui/displayitems/ExtendedFooterStatusDisplayItem.java index 060b43819..40641f36c 100644 --- a/mastodon/src/main/java/org/joinmastodon/android/ui/displayitems/ExtendedFooterStatusDisplayItem.java +++ b/mastodon/src/main/java/org/joinmastodon/android/ui/displayitems/ExtendedFooterStatusDisplayItem.java @@ -102,10 +102,10 @@ public class ExtendedFooterStatusDisplayItem extends StatusDisplayItem{ case DIRECT -> R.drawable.ic_fluent_mention_24_regular; }); - if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) { - visibility.setTooltipText(UiUtils.getVisibilityText(s)); - } visibility.setContentDescription(UiUtils.getVisibilityText(s)); + if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) { + visibility.setTooltipText(visibility.getContentDescription()); + } } @Override