From f3a9b191043adbf22812f33a1fd705668000b1d8 Mon Sep 17 00:00:00 2001 From: sk Date: Wed, 28 Dec 2022 01:58:44 +0100 Subject: [PATCH] replace mute icon --- .../org/joinmastodon/android/fragments/ProfileFragment.java | 2 +- .../android/ui/displayitems/HeaderStatusDisplayItem.java | 2 +- .../main/java/org/joinmastodon/android/ui/utils/UiUtils.java | 2 +- mastodon/src/main/res/drawable/ic_fluent_eye_24_regular.xml | 3 +++ mastodon/src/main/res/drawable/ic_fluent_eye_28_regular.xml | 3 +++ .../src/main/res/drawable/ic_fluent_eye_off_24_regular.xml | 3 +++ .../src/main/res/drawable/ic_fluent_speaker_0_24_regular.xml | 3 +++ .../src/main/res/drawable/ic_fluent_speaker_0_28_regular.xml | 3 +++ .../src/main/res/drawable/ic_fluent_speaker_2_24_regular.xml | 3 --- .../src/main/res/drawable/ic_fluent_speaker_2_28_regular.xml | 3 --- .../main/res/drawable/ic_fluent_speaker_mute_24_regular.xml | 3 --- .../main/res/drawable/ic_fluent_speaker_mute_28_regular.xml | 3 --- .../src/main/res/drawable/ic_fluent_speaker_off_24_regular.xml | 3 +++ .../src/main/res/drawable/ic_fluent_speaker_off_28_regular.xml | 3 +++ mastodon/src/main/res/menu/post.xml | 2 +- mastodon/src/main/res/menu/profile.xml | 2 +- 16 files changed, 26 insertions(+), 17 deletions(-) create mode 100644 mastodon/src/main/res/drawable/ic_fluent_eye_24_regular.xml create mode 100644 mastodon/src/main/res/drawable/ic_fluent_eye_28_regular.xml create mode 100644 mastodon/src/main/res/drawable/ic_fluent_eye_off_24_regular.xml create mode 100644 mastodon/src/main/res/drawable/ic_fluent_speaker_0_24_regular.xml create mode 100644 mastodon/src/main/res/drawable/ic_fluent_speaker_0_28_regular.xml delete mode 100644 mastodon/src/main/res/drawable/ic_fluent_speaker_2_24_regular.xml delete mode 100644 mastodon/src/main/res/drawable/ic_fluent_speaker_2_28_regular.xml delete mode 100644 mastodon/src/main/res/drawable/ic_fluent_speaker_mute_24_regular.xml delete mode 100644 mastodon/src/main/res/drawable/ic_fluent_speaker_mute_28_regular.xml create mode 100644 mastodon/src/main/res/drawable/ic_fluent_speaker_off_24_regular.xml create mode 100644 mastodon/src/main/res/drawable/ic_fluent_speaker_off_28_regular.xml diff --git a/mastodon/src/main/java/org/joinmastodon/android/fragments/ProfileFragment.java b/mastodon/src/main/java/org/joinmastodon/android/fragments/ProfileFragment.java index a31ae2938..770efee67 100644 --- a/mastodon/src/main/java/org/joinmastodon/android/fragments/ProfileFragment.java +++ b/mastodon/src/main/java/org/joinmastodon/android/fragments/ProfileFragment.java @@ -562,7 +562,7 @@ public class ProfileFragment extends LoaderFragment implements OnBackPressedList MenuItem mute = menu.findItem(R.id.mute); mute.setTitle(getString(relationship.muting ? R.string.unmute_user : R.string.mute_user, account.getShortUsername())); - mute.setIcon(relationship.muting ? R.drawable.ic_fluent_speaker_2_24_regular : R.drawable.ic_fluent_speaker_mute_24_regular); + mute.setIcon(relationship.muting ? R.drawable.ic_fluent_speaker_0_24_regular : R.drawable.ic_fluent_speaker_off_24_regular); UiUtils.insetPopupMenuIcon(getContext(), mute); menu.findItem(R.id.block).setTitle(getString(relationship.blocking ? R.string.unblock_user : R.string.block_user, account.getShortUsername())); diff --git a/mastodon/src/main/java/org/joinmastodon/android/ui/displayitems/HeaderStatusDisplayItem.java b/mastodon/src/main/java/org/joinmastodon/android/ui/displayitems/HeaderStatusDisplayItem.java index ef7003116..d54ea8bfd 100644 --- a/mastodon/src/main/java/org/joinmastodon/android/ui/displayitems/HeaderStatusDisplayItem.java +++ b/mastodon/src/main/java/org/joinmastodon/android/ui/displayitems/HeaderStatusDisplayItem.java @@ -377,7 +377,7 @@ public class HeaderStatusDisplayItem extends StatusDisplayItem{ report.setVisible(true); follow.setVisible(relationship==null || relationship.following || (!relationship.blocking && !relationship.blockedBy && !relationship.domainBlocking && !relationship.muting)); mute.setTitle(item.parentFragment.getString(relationship!=null && relationship.muting ? R.string.unmute_user : R.string.mute_user, account.getShortUsername())); - mute.setIcon(relationship!=null && relationship.muting ? R.drawable.ic_fluent_speaker_2_24_regular : R.drawable.ic_fluent_speaker_mute_24_regular); + mute.setIcon(relationship!=null && relationship.muting ? R.drawable.ic_fluent_speaker_0_24_regular : R.drawable.ic_fluent_speaker_off_24_regular); UiUtils.insetPopupMenuIcon(item.parentFragment.getContext(), mute); block.setTitle(item.parentFragment.getString(relationship!=null && relationship.blocking ? R.string.unblock_user : R.string.block_user, account.getShortUsername())); report.setTitle(item.parentFragment.getString(R.string.report_user, account.getShortUsername())); diff --git a/mastodon/src/main/java/org/joinmastodon/android/ui/utils/UiUtils.java b/mastodon/src/main/java/org/joinmastodon/android/ui/utils/UiUtils.java index 16ffb85a5..48bdde0d6 100644 --- a/mastodon/src/main/java/org/joinmastodon/android/ui/utils/UiUtils.java +++ b/mastodon/src/main/java/org/joinmastodon/android/ui/utils/UiUtils.java @@ -416,7 +416,7 @@ public class UiUtils{ showConfirmationAlert(activity, activity.getString(currentlyMuted ? R.string.confirm_unmute_title : R.string.confirm_mute_title), activity.getString(currentlyMuted ? R.string.confirm_unmute : R.string.confirm_mute, account.displayName), activity.getString(currentlyMuted ? R.string.do_unmute : R.string.do_mute), - currentlyMuted ? R.drawable.ic_fluent_speaker_2_28_regular : R.drawable.ic_fluent_speaker_mute_28_regular, + currentlyMuted ? R.drawable.ic_fluent_speaker_0_28_regular : R.drawable.ic_fluent_speaker_off_28_regular, ()->{ new SetAccountMuted(account.id, !currentlyMuted) .setCallback(new Callback<>(){ diff --git a/mastodon/src/main/res/drawable/ic_fluent_eye_24_regular.xml b/mastodon/src/main/res/drawable/ic_fluent_eye_24_regular.xml new file mode 100644 index 000000000..e1be468be --- /dev/null +++ b/mastodon/src/main/res/drawable/ic_fluent_eye_24_regular.xml @@ -0,0 +1,3 @@ + + + diff --git a/mastodon/src/main/res/drawable/ic_fluent_eye_28_regular.xml b/mastodon/src/main/res/drawable/ic_fluent_eye_28_regular.xml new file mode 100644 index 000000000..16db3874e --- /dev/null +++ b/mastodon/src/main/res/drawable/ic_fluent_eye_28_regular.xml @@ -0,0 +1,3 @@ + + + diff --git a/mastodon/src/main/res/drawable/ic_fluent_eye_off_24_regular.xml b/mastodon/src/main/res/drawable/ic_fluent_eye_off_24_regular.xml new file mode 100644 index 000000000..f9fbcb35b --- /dev/null +++ b/mastodon/src/main/res/drawable/ic_fluent_eye_off_24_regular.xml @@ -0,0 +1,3 @@ + + + diff --git a/mastodon/src/main/res/drawable/ic_fluent_speaker_0_24_regular.xml b/mastodon/src/main/res/drawable/ic_fluent_speaker_0_24_regular.xml new file mode 100644 index 000000000..8a35ff41e --- /dev/null +++ b/mastodon/src/main/res/drawable/ic_fluent_speaker_0_24_regular.xml @@ -0,0 +1,3 @@ + + + diff --git a/mastodon/src/main/res/drawable/ic_fluent_speaker_0_28_regular.xml b/mastodon/src/main/res/drawable/ic_fluent_speaker_0_28_regular.xml new file mode 100644 index 000000000..53c6f5b6a --- /dev/null +++ b/mastodon/src/main/res/drawable/ic_fluent_speaker_0_28_regular.xml @@ -0,0 +1,3 @@ + + + diff --git a/mastodon/src/main/res/drawable/ic_fluent_speaker_2_24_regular.xml b/mastodon/src/main/res/drawable/ic_fluent_speaker_2_24_regular.xml deleted file mode 100644 index 8ba6f262d..000000000 --- a/mastodon/src/main/res/drawable/ic_fluent_speaker_2_24_regular.xml +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/mastodon/src/main/res/drawable/ic_fluent_speaker_2_28_regular.xml b/mastodon/src/main/res/drawable/ic_fluent_speaker_2_28_regular.xml deleted file mode 100644 index 486228e0e..000000000 --- a/mastodon/src/main/res/drawable/ic_fluent_speaker_2_28_regular.xml +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/mastodon/src/main/res/drawable/ic_fluent_speaker_mute_24_regular.xml b/mastodon/src/main/res/drawable/ic_fluent_speaker_mute_24_regular.xml deleted file mode 100644 index 8cd5f52dc..000000000 --- a/mastodon/src/main/res/drawable/ic_fluent_speaker_mute_24_regular.xml +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/mastodon/src/main/res/drawable/ic_fluent_speaker_mute_28_regular.xml b/mastodon/src/main/res/drawable/ic_fluent_speaker_mute_28_regular.xml deleted file mode 100644 index b45d213d3..000000000 --- a/mastodon/src/main/res/drawable/ic_fluent_speaker_mute_28_regular.xml +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/mastodon/src/main/res/drawable/ic_fluent_speaker_off_24_regular.xml b/mastodon/src/main/res/drawable/ic_fluent_speaker_off_24_regular.xml new file mode 100644 index 000000000..e1b6ba1c9 --- /dev/null +++ b/mastodon/src/main/res/drawable/ic_fluent_speaker_off_24_regular.xml @@ -0,0 +1,3 @@ + + + diff --git a/mastodon/src/main/res/drawable/ic_fluent_speaker_off_28_regular.xml b/mastodon/src/main/res/drawable/ic_fluent_speaker_off_28_regular.xml new file mode 100644 index 000000000..05defaa38 --- /dev/null +++ b/mastodon/src/main/res/drawable/ic_fluent_speaker_off_28_regular.xml @@ -0,0 +1,3 @@ + + + diff --git a/mastodon/src/main/res/menu/post.xml b/mastodon/src/main/res/menu/post.xml index b0de637d0..81b192207 100644 --- a/mastodon/src/main/res/menu/post.xml +++ b/mastodon/src/main/res/menu/post.xml @@ -8,7 +8,7 @@ - + diff --git a/mastodon/src/main/res/menu/profile.xml b/mastodon/src/main/res/menu/profile.xml index 1f2a99a2d..2bef29ade 100644 --- a/mastodon/src/main/res/menu/profile.xml +++ b/mastodon/src/main/res/menu/profile.xml @@ -1,7 +1,7 @@ - +