diff --git a/app/src/main/java/app/fedilab/android/drawers/StatusListAdapter.java b/app/src/main/java/app/fedilab/android/drawers/StatusListAdapter.java index 63f449a66..9a2f01a1e 100644 --- a/app/src/main/java/app/fedilab/android/drawers/StatusListAdapter.java +++ b/app/src/main/java/app/fedilab/android/drawers/StatusListAdapter.java @@ -584,6 +584,8 @@ public class StatusListAdapter extends RecyclerView.Adapter implements OnPostAct boolean isModerator = sharedpreferences.getBoolean(Helper.PREF_IS_MODERATOR, false); boolean isAdmin = sharedpreferences.getBoolean(Helper.PREF_IS_ADMINISTRATOR, false); + boolean fedilab_features_button = sharedpreferences.getBoolean(Helper.SET_DISPLAY_FEDILAB_FEATURES_BUTTON, true); + boolean new_badge = sharedpreferences.getBoolean(Helper.SET_DISPLAY_NEW_BADGE, true); boolean bot_icon = sharedpreferences.getBoolean(Helper.SET_DISPLAY_BOT_ICON, true); @@ -988,7 +990,7 @@ public class StatusListAdapter extends RecyclerView.Adapter implements OnPostAct }); } - if( holder.cached_status != null) { + if( holder.cached_status != null && (holder.getItemViewType() == DISPLAYED_STATUS && !fedilab_features_button)) { if (status.iscached()) { holder.cached_status.setVisibility(View.VISIBLE); } else { @@ -1002,7 +1004,10 @@ public class StatusListAdapter extends RecyclerView.Adapter implements OnPostAct }); } - if( holder.fedilab_features != null) { + if (holder.fedilab_features != null && !fedilab_features_button) + holder.fedilab_features.setVisibility(View.GONE); + + if (holder.fedilab_features != null && fedilab_features_button) { TooltipCompat.setTooltipText(holder.fedilab_features, context.getString(R.string.app_features)); holder.fedilab_features.setOnClickListener(new View.OnClickListener() { @Override @@ -2355,7 +2360,7 @@ public class StatusListAdapter extends RecyclerView.Adapter implements OnPostAct popup.getMenu().findItem(R.id.action_block_domain).setVisible(false); popup.getMenu().findItem(R.id.action_mute_conversation).setVisible(false); } - if( holder.getItemViewType() == DISPLAYED_STATUS){ + if (holder.getItemViewType() == DISPLAYED_STATUS && fedilab_features_button) { popup.getMenu().findItem(R.id.action_translate).setVisible(false); popup.getMenu().findItem(R.id.action_bookmark).setVisible(false); popup.getMenu().findItem(R.id.action_timed_mute).setVisible(false); diff --git a/app/src/main/java/app/fedilab/android/fragments/SettingsFragment.java b/app/src/main/java/app/fedilab/android/fragments/SettingsFragment.java index cc2d46cda..333f7e44e 100644 --- a/app/src/main/java/app/fedilab/android/fragments/SettingsFragment.java +++ b/app/src/main/java/app/fedilab/android/fragments/SettingsFragment.java @@ -673,6 +673,19 @@ public class SettingsFragment extends Fragment { } }); + boolean fedilab_features_button = sharedpreferences.getBoolean(Helper.SET_DISPLAY_FEDILAB_FEATURES_BUTTON, true); + final CheckBox set_fedilab_features_button = rootView.findViewById(R.id.set_display_fedilab_features_button); + set_fedilab_features_button.setChecked(fedilab_features_button); + + set_fedilab_features_button.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + SharedPreferences.Editor editor = sharedpreferences.edit(); + editor.putBoolean(Helper.SET_DISPLAY_FEDILAB_FEATURES_BUTTON, set_fedilab_features_button.isChecked()); + editor.apply(); + } + }); + boolean bot_icon = sharedpreferences.getBoolean(Helper.SET_DISPLAY_BOT_ICON, true); final CheckBox set_bot_icon = rootView.findViewById(R.id.set_display_bot_icon); set_bot_icon.setChecked(bot_icon); diff --git a/app/src/main/java/app/fedilab/android/helper/Helper.java b/app/src/main/java/app/fedilab/android/helper/Helper.java index 2c19c8215..55d0d9b91 100644 --- a/app/src/main/java/app/fedilab/android/helper/Helper.java +++ b/app/src/main/java/app/fedilab/android/helper/Helper.java @@ -351,6 +351,7 @@ public class Helper { public static final String SET_REMEMBER_POSITION_HOME = "set_remember_position"; public static final String SET_DISPLAY_ADMIN_MENU = "set_display_admin_menu"; public static final String SET_DISPLAY_ADMIN_STATUSES = "set_display_admin_statuses"; + public static final String SET_DISPLAY_FEDILAB_FEATURES_BUTTON = "set_display_fedilab_features_button"; public static final int S_NO = 0; static final int S_512KO = 1; diff --git a/app/src/main/res/layout-sw600dp/fragment_settings.xml b/app/src/main/res/layout-sw600dp/fragment_settings.xml index 334725c4e..6d07073d5 100644 --- a/app/src/main/res/layout-sw600dp/fragment_settings.xml +++ b/app/src/main/res/layout-sw600dp/fragment_settings.xml @@ -306,6 +306,15 @@ android:text="@string/set_display_new_badge" android:layout_height="wrap_content" /> + + + + + + + + Mark as resolved Mark as unresolved Empty content! + Display Fedilab features button %d vote %d votes