mirrors/Fedilab
1
0
Fork 1
mirror of https://codeberg.org/tom79/Fedilab.git synced 2025-09-15 08:20:18 +03:00
Code Issues Projects Releases Packages Wiki Activity

Remove quote button

Browse source
This commit is contained in:
Thomas 2025-08-24 10:45:24 +02:00
parent 335fbdf983
commit 5030bda394
4 changed files with 3 additions and 37 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
app/src/main/java/app/fedilab/android/mastodon/ui/drawer/StatusAdapter.java
View file

@ -817,13 +817,6 @@ public class StatusAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder>
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<RecyclerView.ViewHolder>
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<RecyclerView.ViewHolder>
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);

11
app/src/main/java/app/fedilab/android/mastodon/ui/fragment/settings/FragmentExtraFeaturesSettings.java
View file

@ -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) {

13
app/src/main/res/layouts/mastodon/layout/drawer_status.xml
View file

@ -720,19 +720,6 @@
</RelativeLayout>
<com.google.android.material.button.MaterialButton
android:id="@+id/action_button_quote"
style="@style/Widget.Material3.Button.IconButton"
android:layout_width="0dp"
android:layout_height="48dp"
android:contentDescription="@string/action_quote"
android:visibility="gone"
app:icon="@drawable/ic_baseline_format_quote_24"
app:iconGravity="textStart"
app:iconSize="28dp"
app:iconTint="?colorControlNormal"
app:layout_constraintWidth_max="48dp" />
<RelativeLayout
android:id="@+id/action_button_favorite_container"
android:layout_width="0dp"

5
app/src/main/res/xml/pref_extra_features.xml
View file

@ -35,12 +35,13 @@
app:key="bottom_icon"
app:summary="@string/icons_extra_features_visibility_summary"
app:title="@string/icons_extra_features">
<SwitchPreferenceCompat
<!-- <SwitchPreferenceCompat
android:defaultValue="true"
app:iconSpaceReserved="false"
app:key="@string/SET_DISPLAY_QUOTES"
app:singleLineTitle="false"
app:title="@string/set_display_quote_indication" />
app:title="@string/set_display_quote_indication" /> -->
<SwitchPreferenceCompat
android:defaultValue="true"
app:iconSpaceReserved="false"