diff --git a/mastodon/src/main/java/org/joinmastodon/android/GlobalUserPreferences.java b/mastodon/src/main/java/org/joinmastodon/android/GlobalUserPreferences.java index 5ffa48d54..7894d965c 100644 --- a/mastodon/src/main/java/org/joinmastodon/android/GlobalUserPreferences.java +++ b/mastodon/src/main/java/org/joinmastodon/android/GlobalUserPreferences.java @@ -7,6 +7,7 @@ public class GlobalUserPreferences{ public static boolean playGifs; public static boolean useCustomTabs; public static boolean trueBlackTheme; + public static boolean showInteractionCounts; public static ThemePreference theme; private static SharedPreferences getPrefs(){ @@ -18,6 +19,7 @@ public class GlobalUserPreferences{ playGifs=prefs.getBoolean("playGifs", true); useCustomTabs=prefs.getBoolean("useCustomTabs", true); trueBlackTheme=prefs.getBoolean("trueBlackTheme", false); + showInteractionCounts=prefs.getBoolean("showInteractionCounts", true); theme=ThemePreference.values()[prefs.getInt("theme", 0)]; } @@ -26,6 +28,7 @@ public class GlobalUserPreferences{ .putBoolean("playGifs", playGifs) .putBoolean("useCustomTabs", useCustomTabs) .putBoolean("trueBlackTheme", trueBlackTheme) + .putBoolean("showInteractionCounts", showInteractionCounts) .putInt("theme", theme.ordinal()) .apply(); } 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 8b1590595..924afeea9 100644 --- a/mastodon/src/main/java/org/joinmastodon/android/fragments/SettingsFragment.java +++ b/mastodon/src/main/java/org/joinmastodon/android/fragments/SettingsFragment.java @@ -102,6 +102,10 @@ public class SettingsFragment extends MastodonToolbarFragment{ GlobalUserPreferences.useCustomTabs=i.checked; GlobalUserPreferences.save(); })); + items.add(new SwitchItem(R.string.settings_show_interaction_counts, R.drawable.ic_fluent_number_row_24_regular, GlobalUserPreferences.showInteractionCounts, i->{ + GlobalUserPreferences.showInteractionCounts=i.checked; + GlobalUserPreferences.save(); + })); items.add(new HeaderItem(R.string.settings_notifications)); items.add(notificationPolicyItem=new NotificationPolicyItem()); 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 7fb6c4a3a..a12470ffa 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 @@ -11,6 +11,7 @@ import android.widget.Button; import android.widget.ImageView; import android.widget.TextView; +import org.joinmastodon.android.GlobalUserPreferences; import org.joinmastodon.android.R; import org.joinmastodon.android.api.session.AccountSessionManager; import org.joinmastodon.android.fragments.BaseStatusListFragment; @@ -92,7 +93,7 @@ public class FooterStatusDisplayItem extends StatusDisplayItem{ } private void bindButton(TextView btn, long count){ - if(count>0 && !item.hideCounts){ + if(GlobalUserPreferences.showInteractionCounts && count>0 && !item.hideCounts){ btn.setText(DecimalFormat.getIntegerInstance().format(count)); btn.setCompoundDrawablePadding(V.dp(8)); }else{ diff --git a/mastodon/src/main/res/drawable/ic_fluent_number_row_24_regular.xml b/mastodon/src/main/res/drawable/ic_fluent_number_row_24_regular.xml new file mode 100644 index 000000000..655915498 --- /dev/null +++ b/mastodon/src/main/res/drawable/ic_fluent_number_row_24_regular.xml @@ -0,0 +1,3 @@ + + + diff --git a/mastodon/src/main/res/values-de-rDE/strings.xml b/mastodon/src/main/res/values-de-rDE/strings.xml index 0c19347fb..f900090db 100644 --- a/mastodon/src/main/res/values-de-rDE/strings.xml +++ b/mastodon/src/main/res/values-de-rDE/strings.xml @@ -238,6 +238,7 @@ App-Verhalten Spiele animierte GIFs, Avatare und Emojis ab In-App-Browser verwenden + Interaktions-Anzahlen anzeigen Benachrichtigungen Benachrichtige mich, wenn irgendjemand diff --git a/mastodon/src/main/res/values/strings.xml b/mastodon/src/main/res/values/strings.xml index 2ee4d9975..4212d80c5 100644 --- a/mastodon/src/main/res/values/strings.xml +++ b/mastodon/src/main/res/values/strings.xml @@ -244,6 +244,7 @@ Behavior Play animated avatars and emoji Use in-app browser + Show interaction counts Notifications Notify me when anyone