From 5030bda394eaccd943ef4d2d2dfbd2b60371a67b Mon Sep 17 00:00:00 2001 From: Thomas Date: Sun, 24 Aug 2025 10:45:24 +0200 Subject: [PATCH] Remove quote button --- .../android/mastodon/ui/drawer/StatusAdapter.java | 11 ----------- .../settings/FragmentExtraFeaturesSettings.java | 11 ----------- .../res/layouts/mastodon/layout/drawer_status.xml | 13 ------------- app/src/main/res/xml/pref_extra_features.xml | 5 +++-- 4 files changed, 3 insertions(+), 37 deletions(-) diff --git a/app/src/main/java/app/fedilab/android/mastodon/ui/drawer/StatusAdapter.java b/app/src/main/java/app/fedilab/android/mastodon/ui/drawer/StatusAdapter.java index cfccc84e..3178f813 100644 --- a/app/src/main/java/app/fedilab/android/mastodon/ui/drawer/StatusAdapter.java +++ b/app/src/main/java/app/fedilab/android/mastodon/ui/drawer/StatusAdapter.java @@ -817,13 +817,6 @@ public class StatusAdapter extends RecyclerView.Adapter int truncate_toots_size = sharedpreferences.getInt(context.getString(R.string.SET_TRUNCATE_TOOTS_SIZE), 0); - if (extraFeatures) { - if (displayQuote) { - holder.binding.actionButtonQuote.setVisibility(View.VISIBLE); - } else { - holder.binding.actionButtonQuote.setVisibility(View.GONE); - } - } if (status.isMaths == null) { if (status.content != null && Helper.mathsPattern.matcher(status.content).find()) { @@ -1320,9 +1313,6 @@ public class StatusAdapter extends RecyclerView.Adapter holder.binding.statusAddCustomEmoji.setIconSize((int) (normalSize * scaleIcon)); holder.binding.statusAddCustomEmoji.requestLayout(); - holder.binding.actionButtonQuote.setIconSize((int) (normalSize * scaleIcon)); - holder.binding.actionButtonQuote.requestLayout(); - holder.binding.statusEmoji.setIconSize((int) (normalSize * scaleIcon)); holder.binding.statusEmoji.requestLayout(); @@ -3190,7 +3180,6 @@ public class StatusAdapter extends RecyclerView.Adapter if (theme_icons_color != -1) { Helper.changeDrawableColor(context, holder.binding.actionButtonReply, theme_icons_color); Helper.changeDrawableColor(context, holder.binding.statusAddCustomEmoji, theme_icons_color); - Helper.changeDrawableColor(context, holder.binding.actionButtonQuote, theme_icons_color); Helper.changeDrawableColor(context, holder.binding.statusEmoji, theme_icons_color); Helper.changeDrawableColor(context, holder.binding.actionButtonMore, theme_icons_color); Helper.changeDrawableColor(context, R.drawable.ic_round_star_24, theme_icons_color); diff --git a/app/src/main/java/app/fedilab/android/mastodon/ui/fragment/settings/FragmentExtraFeaturesSettings.java b/app/src/main/java/app/fedilab/android/mastodon/ui/fragment/settings/FragmentExtraFeaturesSettings.java index 4212c66e..76bf8d7e 100644 --- a/app/src/main/java/app/fedilab/android/mastodon/ui/fragment/settings/FragmentExtraFeaturesSettings.java +++ b/app/src/main/java/app/fedilab/android/mastodon/ui/fragment/settings/FragmentExtraFeaturesSettings.java @@ -70,11 +70,6 @@ public class FragmentExtraFeaturesSettings extends PreferenceFragmentCompat impl SET_DISPLAY_TRANSLATE.setChecked(checked); } - SwitchPreferenceCompat SET_DISPLAY_QUOTES = findPreference(getString(R.string.SET_DISPLAY_QUOTES)); - if (SET_DISPLAY_QUOTES != null) { - boolean checked = sharedpreferences.getBoolean(getString(R.string.SET_DISPLAY_QUOTES) + MainActivity.currentUserID + MainActivity.currentInstance, true); - SET_DISPLAY_QUOTES.setChecked(checked); - } SwitchPreferenceCompat SET_DISPLAY_REACTIONS = findPreference(getString(R.string.SET_DISPLAY_REACTIONS)); if (SET_DISPLAY_REACTIONS != null) { @@ -116,12 +111,6 @@ public class FragmentExtraFeaturesSettings extends PreferenceFragmentCompat impl editor.putBoolean(getString(R.string.SET_DISPLAY_TRANSLATE) + MainActivity.currentUserID + MainActivity.currentInstance, SET_DISPLAY_TRANSLATE.isChecked()); } } - if (key.compareToIgnoreCase(getString(R.string.SET_DISPLAY_QUOTES)) == 0) { - SwitchPreferenceCompat SET_DISPLAY_QUOTES = findPreference(getString(R.string.SET_DISPLAY_QUOTES)); - if (SET_DISPLAY_QUOTES != null) { - editor.putBoolean(getString(R.string.SET_DISPLAY_QUOTES) + MainActivity.currentUserID + MainActivity.currentInstance, SET_DISPLAY_QUOTES.isChecked()); - } - } if (key.compareToIgnoreCase(getString(R.string.SET_DISPLAY_REACTIONS)) == 0) { SwitchPreferenceCompat SET_DISPLAY_REACTIONS = findPreference(getString(R.string.SET_DISPLAY_REACTIONS)); if (SET_DISPLAY_REACTIONS != null) { diff --git a/app/src/main/res/layouts/mastodon/layout/drawer_status.xml b/app/src/main/res/layouts/mastodon/layout/drawer_status.xml index 9ae96acb..b017b15d 100644 --- a/app/src/main/res/layouts/mastodon/layout/drawer_status.xml +++ b/app/src/main/res/layouts/mastodon/layout/drawer_status.xml @@ -720,19 +720,6 @@ - - - + app:title="@string/set_display_quote_indication" /> -->