From 17e1cd1fe90f0d6407fca079827e4b7878b4094d Mon Sep 17 00:00:00 2001 From: sk Date: Wed, 25 Jan 2023 23:51:42 +0100 Subject: [PATCH] replace visibility icons --- .../joinmastodon/android/fragments/ComposeFragment.java | 8 ++++---- .../ui/displayitems/ExtendedFooterStatusDisplayItem.java | 4 ++-- .../android/ui/displayitems/FooterStatusDisplayItem.java | 4 ++-- .../displayitems/ReblogOrReplyLineStatusDisplayItem.java | 4 ++-- .../res/drawable/ic_fluent_lock_closed_20_regular.xml | 3 +++ .../main/res/drawable/ic_fluent_lock_closed_24_filled.xml | 3 +++ .../res/drawable/ic_fluent_lock_closed_24_regular.xml | 3 +++ .../main/res/drawable/ic_fluent_lock_open_20_regular.xml | 3 +++ .../main/res/drawable/ic_fluent_lock_open_24_regular.xml | 3 +++ mastodon/src/main/res/menu/compose_visibility.xml | 4 ++-- 10 files changed, 27 insertions(+), 12 deletions(-) create mode 100644 mastodon/src/main/res/drawable/ic_fluent_lock_closed_20_regular.xml create mode 100644 mastodon/src/main/res/drawable/ic_fluent_lock_closed_24_filled.xml create mode 100644 mastodon/src/main/res/drawable/ic_fluent_lock_closed_24_regular.xml create mode 100644 mastodon/src/main/res/drawable/ic_fluent_lock_open_20_regular.xml create mode 100644 mastodon/src/main/res/drawable/ic_fluent_lock_open_24_regular.xml 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 42ebfff6f..83044c67b 100644 --- a/mastodon/src/main/java/org/joinmastodon/android/fragments/ComposeFragment.java +++ b/mastodon/src/main/java/org/joinmastodon/android/fragments/ComposeFragment.java @@ -656,8 +656,8 @@ public class ComposeFragment extends MastodonToolbarFragment implements OnBackPr view.findViewById(R.id.visibility).setVisibility(View.GONE); Drawable visibilityIcon = getActivity().getDrawable(switch(replyTo.visibility){ 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 UNLISTED -> R.drawable.ic_fluent_lock_open_20_regular; + case PRIVATE -> R.drawable.ic_fluent_lock_closed_20_filled; case DIRECT -> R.drawable.ic_fluent_mention_20_regular; case LOCAL -> R.drawable.ic_fluent_eye_20_regular; }); @@ -1869,8 +1869,8 @@ public class ComposeFragment extends MastodonToolbarFragment implements OnBackPr } visibilityBtn.setImageResource(switch(statusVisibility){ 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 UNLISTED -> R.drawable.ic_fluent_lock_open_24_regular; + case PRIVATE -> R.drawable.ic_fluent_lock_closed_24_filled; case DIRECT -> R.drawable.ic_fluent_mention_24_regular; case LOCAL -> R.drawable.ic_fluent_eye_24_regular; }); 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 954989b81..209a1456d 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 @@ -96,8 +96,8 @@ public class ExtendedFooterStatusDisplayItem extends StatusDisplayItem{ visibility.setImageResource(switch (s.visibility) { 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 UNLISTED -> R.drawable.ic_fluent_lock_open_20_regular; + case PRIVATE -> R.drawable.ic_fluent_lock_closed_20_filled; case DIRECT -> R.drawable.ic_fluent_mention_20_regular; case LOCAL -> R.drawable.ic_fluent_eye_20_regular; }); diff --git a/mastodon/src/main/java/org/joinmastodon/android/ui/displayitems/FooterStatusDisplayItem.java b/mastodon/src/main/java/org/joinmastodon/android/ui/displayitems/FooterStatusDisplayItem.java index be0df7997..1e2018fb4 100644 --- a/mastodon/src/main/java/org/joinmastodon/android/ui/displayitems/FooterStatusDisplayItem.java +++ b/mastodon/src/main/java/org/joinmastodon/android/ui/displayitems/FooterStatusDisplayItem.java @@ -239,8 +239,8 @@ public class FooterStatusDisplayItem extends StatusDisplayItem{ Drawable checkMark = ctx.getDrawable(R.drawable.ic_fluent_checkmark_circle_20_regular); Drawable publicDrawable = ctx.getDrawable(R.drawable.ic_fluent_earth_24_regular); - Drawable unlistedDrawable = ctx.getDrawable(R.drawable.ic_fluent_people_community_24_regular); - Drawable followersDrawable = ctx.getDrawable(R.drawable.ic_fluent_people_checkmark_24_regular); + Drawable unlistedDrawable = ctx.getDrawable(R.drawable.ic_fluent_lock_open_24_regular); + Drawable followersDrawable = ctx.getDrawable(R.drawable.ic_fluent_lock_closed_24_filled); StatusPrivacy defaultVisibility = session.preferences != null ? session.preferences.postingDefaultVisibility : null; // e.g. post visibility is unlisted, but default is public diff --git a/mastodon/src/main/java/org/joinmastodon/android/ui/displayitems/ReblogOrReplyLineStatusDisplayItem.java b/mastodon/src/main/java/org/joinmastodon/android/ui/displayitems/ReblogOrReplyLineStatusDisplayItem.java index c1695a90a..366d5ba9f 100644 --- a/mastodon/src/main/java/org/joinmastodon/android/ui/displayitems/ReblogOrReplyLineStatusDisplayItem.java +++ b/mastodon/src/main/java/org/joinmastodon/android/ui/displayitems/ReblogOrReplyLineStatusDisplayItem.java @@ -55,8 +55,8 @@ public class ReblogOrReplyLineStatusDisplayItem extends StatusDisplayItem{ this.visibility = visibility; this.iconEnd = visibility != null ? switch (visibility) { 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 UNLISTED -> R.drawable.ic_fluent_lock_open_20_regular; + case PRIVATE -> R.drawable.ic_fluent_lock_closed_20_filled; default -> 0; } : 0; } diff --git a/mastodon/src/main/res/drawable/ic_fluent_lock_closed_20_regular.xml b/mastodon/src/main/res/drawable/ic_fluent_lock_closed_20_regular.xml new file mode 100644 index 000000000..e46089499 --- /dev/null +++ b/mastodon/src/main/res/drawable/ic_fluent_lock_closed_20_regular.xml @@ -0,0 +1,3 @@ + + + diff --git a/mastodon/src/main/res/drawable/ic_fluent_lock_closed_24_filled.xml b/mastodon/src/main/res/drawable/ic_fluent_lock_closed_24_filled.xml new file mode 100644 index 000000000..213c715c9 --- /dev/null +++ b/mastodon/src/main/res/drawable/ic_fluent_lock_closed_24_filled.xml @@ -0,0 +1,3 @@ + + + diff --git a/mastodon/src/main/res/drawable/ic_fluent_lock_closed_24_regular.xml b/mastodon/src/main/res/drawable/ic_fluent_lock_closed_24_regular.xml new file mode 100644 index 000000000..b9889347b --- /dev/null +++ b/mastodon/src/main/res/drawable/ic_fluent_lock_closed_24_regular.xml @@ -0,0 +1,3 @@ + + + diff --git a/mastodon/src/main/res/drawable/ic_fluent_lock_open_20_regular.xml b/mastodon/src/main/res/drawable/ic_fluent_lock_open_20_regular.xml new file mode 100644 index 000000000..c2648899b --- /dev/null +++ b/mastodon/src/main/res/drawable/ic_fluent_lock_open_20_regular.xml @@ -0,0 +1,3 @@ + + + diff --git a/mastodon/src/main/res/drawable/ic_fluent_lock_open_24_regular.xml b/mastodon/src/main/res/drawable/ic_fluent_lock_open_24_regular.xml new file mode 100644 index 000000000..4e1ed6b76 --- /dev/null +++ b/mastodon/src/main/res/drawable/ic_fluent_lock_open_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 3b6070dd4..8ea6608a3 100644 --- a/mastodon/src/main/res/menu/compose_visibility.xml +++ b/mastodon/src/main/res/menu/compose_visibility.xml @@ -16,10 +16,10 @@ android:icon="@drawable/ic_fluent_earth_24_regular" android:title="@string/visibility_public"/>