diff --git a/mastodon/src/main/java/org/joinmastodon/android/fragments/ComposeFragment.java b/mastodon/src/main/java/org/joinmastodon/android/fragments/ComposeFragment.java index 2e205f45b..935b5f6fe 100644 --- a/mastodon/src/main/java/org/joinmastodon/android/fragments/ComposeFragment.java +++ b/mastodon/src/main/java/org/joinmastodon/android/fragments/ComposeFragment.java @@ -529,7 +529,7 @@ public class ComposeFragment extends MastodonToolbarFragment implements OnBackPr case PUBLIC -> R.drawable.ic_fluent_earth_20_regular; case UNLISTED -> R.drawable.ic_fluent_people_community_20_regular; case PRIVATE -> R.drawable.ic_fluent_people_checkmark_20_regular; - case DIRECT -> R.drawable.ic_at_symbol; + case DIRECT -> R.drawable.ic_fluent_mention_20_regular; }); visibilityIcon.setBounds(0, 0, V.dp(20), V.dp(20)); Drawable replyArrow = getActivity().getDrawable(R.drawable.ic_fluent_arrow_reply_20_filled); @@ -1475,7 +1475,7 @@ public class ComposeFragment extends MastodonToolbarFragment implements OnBackPr case PUBLIC -> R.drawable.ic_fluent_earth_24_regular; case UNLISTED -> R.drawable.ic_fluent_people_community_24_regular; case PRIVATE -> R.drawable.ic_fluent_people_checkmark_24_regular; - case DIRECT -> R.drawable.ic_at_symbol; + case DIRECT -> R.drawable.ic_fluent_mention_24_regular; }); } diff --git a/mastodon/src/main/java/org/joinmastodon/android/fragments/SettingsFragment.java b/mastodon/src/main/java/org/joinmastodon/android/fragments/SettingsFragment.java index 3dd55f914..ae8938d03 100644 --- a/mastodon/src/main/java/org/joinmastodon/android/fragments/SettingsFragment.java +++ b/mastodon/src/main/java/org/joinmastodon/android/fragments/SettingsFragment.java @@ -211,7 +211,7 @@ public class SettingsFragment extends MastodonToolbarFragment{ items.add(new SwitchItem(R.string.notify_favorites, R.drawable.ic_fluent_star_24_regular, pushSubscription.alerts.favourite, i->onNotificationsChanged(PushNotification.Type.FAVORITE, i.checked))); items.add(new SwitchItem(R.string.notify_follow, R.drawable.ic_fluent_person_add_24_regular, pushSubscription.alerts.follow, i->onNotificationsChanged(PushNotification.Type.FOLLOW, i.checked))); items.add(new SwitchItem(R.string.notify_reblog, R.drawable.ic_fluent_arrow_repeat_all_24_regular, pushSubscription.alerts.reblog, i->onNotificationsChanged(PushNotification.Type.REBLOG, i.checked))); - items.add(new SwitchItem(R.string.notify_mention, R.drawable.ic_at_symbol, pushSubscription.alerts.mention, i->onNotificationsChanged(PushNotification.Type.MENTION, i.checked))); + items.add(new SwitchItem(R.string.notify_mention, R.drawable.ic_fluent_mention_24_regular, pushSubscription.alerts.mention, i->onNotificationsChanged(PushNotification.Type.MENTION, i.checked))); items.add(new SwitchItem(R.string.sk_notify_posts, R.drawable.ic_fluent_alert_24_regular, pushSubscription.alerts.status, i->onNotificationsChanged(PushNotification.Type.STATUS, i.checked))); items.add(new HeaderItem(R.string.settings_account)); 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 e47c66013..2dec70ed8 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 @@ -98,7 +98,7 @@ public class ExtendedFooterStatusDisplayItem extends StatusDisplayItem{ case PUBLIC -> R.drawable.ic_fluent_earth_20_regular; case UNLISTED -> R.drawable.ic_fluent_people_community_20_regular; case PRIVATE -> R.drawable.ic_fluent_people_checkmark_20_regular; - case DIRECT -> R.drawable.ic_at_symbol; + case DIRECT -> R.drawable.ic_fluent_mention_20_regular; }); } diff --git a/mastodon/src/main/res/drawable/ic_at_symbol.xml b/mastodon/src/main/res/drawable/ic_at_symbol.xml deleted file mode 100644 index 7cf7d9098..000000000 --- a/mastodon/src/main/res/drawable/ic_at_symbol.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - diff --git a/mastodon/src/main/res/drawable/ic_fluent_mention_20_regular.xml b/mastodon/src/main/res/drawable/ic_fluent_mention_20_regular.xml new file mode 100644 index 000000000..77a55c495 --- /dev/null +++ b/mastodon/src/main/res/drawable/ic_fluent_mention_20_regular.xml @@ -0,0 +1,3 @@ + + + diff --git a/mastodon/src/main/res/drawable/ic_fluent_mention_24_regular.xml b/mastodon/src/main/res/drawable/ic_fluent_mention_24_regular.xml new file mode 100644 index 000000000..d7a3744e2 --- /dev/null +++ b/mastodon/src/main/res/drawable/ic_fluent_mention_24_regular.xml @@ -0,0 +1,3 @@ + + + diff --git a/mastodon/src/main/res/menu/compose_visibility.xml b/mastodon/src/main/res/menu/compose_visibility.xml index 2a72c8c1c..fde3eeca8 100644 --- a/mastodon/src/main/res/menu/compose_visibility.xml +++ b/mastodon/src/main/res/menu/compose_visibility.xml @@ -10,6 +10,6 @@ android:icon="@drawable/ic_fluent_people_checkmark_24_regular" android:title="@string/visibility_followers_only"/> \ No newline at end of file