From 9f79620d58e718299f22af425f522159c942ae16 Mon Sep 17 00:00:00 2001 From: Thomas Date: Tue, 25 Mar 2025 09:41:53 +0100 Subject: [PATCH] Fix issue #1150 - Allow to disable fullscreen media for Pixelfed --- .../mastodon/ui/drawer/StatusAdapter.java | 4 +- .../settings/FragmentPixelfedSettings.java | 89 +++++++++++++++++++ .../settings/FragmentSettingsCategories.java | 8 ++ .../res/navigation/nav_graph_settings.xml | 12 +++ app/src/main/res/values/strings.xml | 8 ++ app/src/main/res/xml/pref_categories.xml | 7 ++ app/src/main/res/xml/pref_pixelfed.xml | 13 +++ 7 files changed, 140 insertions(+), 1 deletion(-) create mode 100644 app/src/main/java/app/fedilab/android/mastodon/ui/fragment/settings/FragmentPixelfedSettings.java create mode 100644 app/src/main/res/xml/pref_pixelfed.xml 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 2e6a1a51..1ae652b6 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 @@ -211,6 +211,7 @@ public class StatusAdapter extends RecyclerView.Adapter public FetchMoreCallBack fetchMoreCallBack; private Context context; private boolean visiblePixelfed; + private boolean pixelfedFullScreenMedia; private RecyclerView mRecyclerView; public StatusAdapter(List statuses, Timeline.TimeLineEnum timelineType, boolean minified, boolean canBeFederated, boolean checkRemotely) { @@ -3178,7 +3179,7 @@ public class StatusAdapter extends RecyclerView.Adapter } else if(timelineType == Timeline.TimeLineEnum.REMOTE && pinnedTimeline != null && pinnedTimeline.remoteInstance != null && pinnedTimeline.remoteInstance.type == RemoteInstance.InstanceType.PIXELFED){ return STATUS_PIXELFED; }else { - if(timelineType != Timeline.TimeLineEnum.UNKNOWN && getCurrentAccount(context).software != null && getCurrentAccount(context).software.trim().toLowerCase().equals("pixelfed")) { + if(pixelfedFullScreenMedia && timelineType != Timeline.TimeLineEnum.UNKNOWN && getCurrentAccount(context).software != null && getCurrentAccount(context).software.trim().toLowerCase().equals("pixelfed")) { return STATUS_PIXELFED; } else { return STATUS_VISIBLE; @@ -3198,6 +3199,7 @@ public class StatusAdapter extends RecyclerView.Adapter context = parent.getContext(); SharedPreferences sharedpreferences = PreferenceManager.getDefaultSharedPreferences(context); visiblePixelfed = sharedpreferences.getBoolean(context.getString(R.string.SET_PIXELFED_PRESENTATION) + MainActivity.currentUserID + MainActivity.currentInstance, false); + pixelfedFullScreenMedia = sharedpreferences.getBoolean(context.getString(R.string.SET_PIXELFED_FULL_MEDIA) + MainActivity.currentUserID + MainActivity.currentInstance, true); if (viewType == STATUS_HIDDEN) { //Hidden statuses - ie: filtered DrawerStatusHiddenBinding itemBinding = DrawerStatusHiddenBinding.inflate(LayoutInflater.from(parent.getContext()), parent, false); return new StatusViewHolder(itemBinding); diff --git a/app/src/main/java/app/fedilab/android/mastodon/ui/fragment/settings/FragmentPixelfedSettings.java b/app/src/main/java/app/fedilab/android/mastodon/ui/fragment/settings/FragmentPixelfedSettings.java new file mode 100644 index 00000000..32b27b6b --- /dev/null +++ b/app/src/main/java/app/fedilab/android/mastodon/ui/fragment/settings/FragmentPixelfedSettings.java @@ -0,0 +1,89 @@ +package app.fedilab.android.mastodon.ui.fragment.settings; +/* Copyright 2025 Thomas Schneider + * + * This file is a part of Fedilab + * + * This program is free software; you can redistribute it and/or modify it under the terms of the + * GNU General Public License as published by the Free Software Foundation; either version 3 of the + * License, or (at your option) any later version. + * + * Fedilab is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even + * the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General + * Public License for more details. + * + * You should have received a copy of the GNU General Public License along with Fedilab; if not, + * see . */ + +import android.annotation.SuppressLint; +import android.content.SharedPreferences; +import android.os.Bundle; + +import androidx.preference.PreferenceFragmentCompat; +import androidx.preference.PreferenceManager; +import androidx.preference.SwitchPreferenceCompat; + +import app.fedilab.android.R; +import app.fedilab.android.activities.MainActivity; +import app.fedilab.android.mastodon.helper.Helper; + +public class FragmentPixelfedSettings extends PreferenceFragmentCompat implements SharedPreferences.OnSharedPreferenceChangeListener { + + boolean recreate; + + @Override + public void onCreatePreferences(Bundle savedInstanceState, String rootKey) { + addPreferencesFromResource(R.xml.pref_pixelfed); + createPref(); + } + + @SuppressLint("ApplySharedPref") + private void createPref() { + getPreferenceScreen().removeAll(); + SharedPreferences sharedpreferences = PreferenceManager.getDefaultSharedPreferences(requireActivity()); + addPreferencesFromResource(R.xml.pref_pixelfed); + SwitchPreferenceCompat SET_PIXELFED_FULL_MEDIA = findPreference(getString(R.string.SET_PIXELFED_FULL_MEDIA)); + if (SET_PIXELFED_FULL_MEDIA != null) { + boolean checked = sharedpreferences.getBoolean(getString(R.string.SET_PIXELFED_FULL_MEDIA) + MainActivity.currentUserID + MainActivity.currentInstance, false); + SET_PIXELFED_FULL_MEDIA.setChecked(checked); + } + recreate = false; + } + + @Override + public void onSharedPreferenceChanged(SharedPreferences sharedPreferences, String key) { + if (getActivity() != null) { + SharedPreferences sharedpreferences = PreferenceManager.getDefaultSharedPreferences(requireActivity()); + SharedPreferences.Editor editor = sharedpreferences.edit(); + if (key.compareToIgnoreCase(getString(R.string.SET_PIXELFED_FULL_MEDIA)) == 0) { + SwitchPreferenceCompat SET_PIXELFED_FULL_MEDIA = findPreference(getString(R.string.SET_PIXELFED_FULL_MEDIA)); + if (SET_PIXELFED_FULL_MEDIA != null) { + editor.putBoolean(getString(R.string.SET_PIXELFED_FULL_MEDIA) + MainActivity.currentUserID + MainActivity.currentInstance, SET_PIXELFED_FULL_MEDIA.isChecked()); + } + } + recreate = true; + editor.apply(); + } + } + + @Override + public void onResume() { + super.onResume(); + + getPreferenceScreen().getSharedPreferences() + .registerOnSharedPreferenceChangeListener(this); + } + + @Override + public void onPause() { + super.onPause(); + getPreferenceScreen().getSharedPreferences() + .unregisterOnSharedPreferenceChangeListener(this); + if (recreate) { + recreate = false; + requireActivity().recreate(); + Helper.recreateMainActivity(requireActivity()); + } + } + + +} diff --git a/app/src/main/java/app/fedilab/android/mastodon/ui/fragment/settings/FragmentSettingsCategories.java b/app/src/main/java/app/fedilab/android/mastodon/ui/fragment/settings/FragmentSettingsCategories.java index a6a9fec3..b628431b 100644 --- a/app/src/main/java/app/fedilab/android/mastodon/ui/fragment/settings/FragmentSettingsCategories.java +++ b/app/src/main/java/app/fedilab/android/mastodon/ui/fragment/settings/FragmentSettingsCategories.java @@ -111,6 +111,14 @@ public class FragmentSettingsCategories extends PreferenceFragmentCompat { return false; }); } + Preference pref_category_key_pixelfed = findPreference(getString(R.string.pref_category_key_pixelfed)); + if (pref_category_key_pixelfed != null) { + pref_category_key_pixelfed.setOnPreferenceClickListener(preference -> { + NavController navController = Navigation.findNavController(requireActivity(), R.id.fragment_container); + navController.navigate(FragmentSettingsCategoriesDirections.Companion.categoriesToPixelfed()); + return false; + }); + } Preference pref_category_key_home_cache = findPreference(getString(R.string.pref_category_key_home_cache)); if (pref_category_key_home_cache != null) { diff --git a/app/src/main/res/navigation/nav_graph_settings.xml b/app/src/main/res/navigation/nav_graph_settings.xml index e52f44e4..bc89c544 100644 --- a/app/src/main/res/navigation/nav_graph_settings.xml +++ b/app/src/main/res/navigation/nav_graph_settings.xml @@ -52,6 +52,13 @@ app:exitAnim="@anim/exit" app:popEnterAnim="@anim/pop_enter" app:popExitAnim="@anim/pop_exit" /> + + + First letter in capital for replies Resize pictures Resize videos + + + Fullscreen media + Medias will take the whole width of the screen and aspect ratio for the height will be respected. + Mb @@ -1162,6 +1167,8 @@ SET_DISPLAY_BOOKMARK SET_PIXELFED_PRESENTATION + SET_PIXELFED_FULL_MEDIA + SET_DISPLAY_QUOTES SET_DISPLAY_REACTIONS @@ -1728,6 +1735,7 @@ pref_category_interface pref_category_compose pref_category_privacy + pref_category_key_pixelfed pref_category_key_home_cache pref_category_theming pref_category_administration diff --git a/app/src/main/res/xml/pref_categories.xml b/app/src/main/res/xml/pref_categories.xml index 3cd38c88..d3a84b49 100644 --- a/app/src/main/res/xml/pref_categories.xml +++ b/app/src/main/res/xml/pref_categories.xml @@ -46,6 +46,13 @@ app:icon="@drawable/ic_shield" app:key="@string/pref_category_key_privacy" /> + + + + + + + \ No newline at end of file