From 4dd0d94c2c284937e4e3ebd9c4bdc96508df2850 Mon Sep 17 00:00:00 2001 From: stom79 Date: Fri, 22 Dec 2017 07:00:02 +0100 Subject: [PATCH] Fixes issue #175 - Hide Post Numbers --- .../drawers/NotificationsListAdapter.java | 7 +++++-- .../mastodon/drawers/StatusListAdapter.java | 20 ++++++++++--------- .../mastodon/fragments/SettingsFragment.java | 16 +++++++++++++++ .../gouv/etalab/mastodon/helper/Helper.java | 1 + .../res/layout-sw600dp/fragment_settings.xml | 8 ++++++++ app/src/main/res/layout/fragment_settings.xml | 7 +++++++ app/src/main/res/values/strings.xml | 2 ++ 7 files changed, 50 insertions(+), 11 deletions(-) diff --git a/app/src/main/java/fr/gouv/etalab/mastodon/drawers/NotificationsListAdapter.java b/app/src/main/java/fr/gouv/etalab/mastodon/drawers/NotificationsListAdapter.java index ee403eb10..897871f2b 100644 --- a/app/src/main/java/fr/gouv/etalab/mastodon/drawers/NotificationsListAdapter.java +++ b/app/src/main/java/fr/gouv/etalab/mastodon/drawers/NotificationsListAdapter.java @@ -257,8 +257,11 @@ public class NotificationsListAdapter extends RecyclerView.Adapter implements On holder.notification_status_content.setMovementMethod(null); holder.notification_status_content.setMovementMethod(LinkMovementMethod.getInstance()); - holder.status_favorite_count.setText(String.valueOf(status.getFavourites_count())); - holder.status_reblog_count.setText(String.valueOf(status.getReblogs_count())); + boolean displayBoost = sharedpreferences.getBoolean(Helper.SET_DISPLAY_BOOST_COUNT, true); + if( displayBoost) { + holder.status_favorite_count.setText(String.valueOf(status.getFavourites_count())); + holder.status_reblog_count.setText(String.valueOf(status.getReblogs_count())); + } holder.status_date.setText(Helper.dateDiff(context, status.getCreated_at())); Helper.absoluteDateTimeReveal(context, holder.status_date, status.getCreated_at()); diff --git a/app/src/main/java/fr/gouv/etalab/mastodon/drawers/StatusListAdapter.java b/app/src/main/java/fr/gouv/etalab/mastodon/drawers/StatusListAdapter.java index ea505c661..38ca33065 100644 --- a/app/src/main/java/fr/gouv/etalab/mastodon/drawers/StatusListAdapter.java +++ b/app/src/main/java/fr/gouv/etalab/mastodon/drawers/StatusListAdapter.java @@ -595,15 +595,17 @@ public class StatusListAdapter extends RecyclerView.Adapter implements OnPostAct holder.status_mention_spoiler.setMovementMethod(null); holder.status_mention_spoiler.setMovementMethod(LinkMovementMethod.getInstance()); - if( status.getReblog() == null) - holder.status_favorite_count.setText(String.valueOf(status.getFavourites_count())); - else - holder.status_favorite_count.setText(String.valueOf(status.getReblog().getFavourites_count())); - if( status.getReblog() == null) - holder.status_reblog_count.setText(String.valueOf(status.getReblogs_count())); - else - holder.status_reblog_count.setText(String.valueOf(status.getReblog().getReblogs_count())); - + boolean displayBoost = sharedpreferences.getBoolean(Helper.SET_DISPLAY_BOOST_COUNT, true); + if( displayBoost) { + if( status.getReblog() == null) + holder.status_favorite_count.setText(String.valueOf(status.getFavourites_count())); + else + holder.status_favorite_count.setText(String.valueOf(status.getReblog().getFavourites_count())); + if (status.getReblog() == null) + holder.status_reblog_count.setText(String.valueOf(status.getReblogs_count())); + else + holder.status_reblog_count.setText(String.valueOf(status.getReblog().getReblogs_count())); + } holder.status_toot_date.setText(Helper.dateDiff(context, status.getCreated_at())); Helper.absoluteDateTimeReveal(context, holder.status_toot_date, status.getCreated_at()); diff --git a/app/src/main/java/fr/gouv/etalab/mastodon/fragments/SettingsFragment.java b/app/src/main/java/fr/gouv/etalab/mastodon/fragments/SettingsFragment.java index b40414a14..565172b5f 100644 --- a/app/src/main/java/fr/gouv/etalab/mastodon/fragments/SettingsFragment.java +++ b/app/src/main/java/fr/gouv/etalab/mastodon/fragments/SettingsFragment.java @@ -225,10 +225,26 @@ public class SettingsFragment extends Fragment { SharedPreferences.Editor editor = sharedpreferences.edit(); editor.putBoolean(Helper.SET_DISABLE_GIF, set_disable_gif.isChecked()); editor.apply(); + if( getActivity() != null) + getActivity().recreate(); } }); + boolean displayBoost = sharedpreferences.getBoolean(Helper.SET_DISPLAY_BOOST_COUNT, true); + final CheckBox set_disable_counts = rootView.findViewById(R.id.set_disable_counts); + set_disable_counts.setChecked(displayBoost); + set_disable_counts.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + SharedPreferences.Editor editor = sharedpreferences.edit(); + editor.putBoolean(Helper.SET_DISPLAY_BOOST_COUNT, set_disable_counts.isChecked()); + editor.apply(); + if( getActivity() != null) + getActivity().recreate(); + } + }); + boolean livenotif = sharedpreferences.getBoolean(Helper.SET_LIVE_NOTIFICATIONS, true); final CheckBox set_live_notif = rootView.findViewById(R.id.set_live_notify); set_live_notif.setChecked(livenotif); diff --git a/app/src/main/java/fr/gouv/etalab/mastodon/helper/Helper.java b/app/src/main/java/fr/gouv/etalab/mastodon/helper/Helper.java index 8e9e532cc..af441d640 100644 --- a/app/src/main/java/fr/gouv/etalab/mastodon/helper/Helper.java +++ b/app/src/main/java/fr/gouv/etalab/mastodon/helper/Helper.java @@ -267,6 +267,7 @@ public class Helper { public static final String SET_DISPLAY_LOCAL = "set_display_local"; public static final String SET_DISPLAY_GLOBAL = "set_display_global"; public static final String SET_ALLOW_CROSS_ACTIONS = "set_allow_cross_actions"; + public static final String SET_DISPLAY_BOOST_COUNT = "set_display_boost_count"; //End points public static final String EP_AUTHORIZE = "/oauth/authorize"; diff --git a/app/src/main/res/layout-sw600dp/fragment_settings.xml b/app/src/main/res/layout-sw600dp/fragment_settings.xml index b6f465f30..c7e8a8960 100644 --- a/app/src/main/res/layout-sw600dp/fragment_settings.xml +++ b/app/src/main/res/layout-sw600dp/fragment_settings.xml @@ -127,6 +127,14 @@ android:text="@string/set_disable_gif" android:layout_height="wrap_content" /> + + + + + + + %1$s has moved to %2$s + + Show boosts/favourites count \ No newline at end of file