Fix dialog colors in Settings (246bc7e5) · Commits · Android-smartphones / Fedilab

app/src/main/java/app/fedilab/android/mastodon/ui/fragment/settings/FragmentComposeSettings.java

+11 −0

Original line number	Diff line number	Diff line
		@@ -19,6 +19,7 @@ import android.content.SharedPreferences;
		import android.os.Bundle;

		import androidx.preference.EditTextPreference;
		import androidx.preference.ListPreference;
		import androidx.preference.MultiSelectListPreference;
		import androidx.preference.PreferenceFragmentCompat;
		import androidx.preference.PreferenceManager;
		@@ -30,6 +31,7 @@ import java.util.Set;
		import app.fedilab.android.BaseMainActivity;
		import app.fedilab.android.R;
		import app.fedilab.android.mastodon.client.entities.app.Languages;
		import app.fedilab.android.mastodon.helper.Helper;

		public class FragmentComposeSettings extends PreferenceFragmentCompat implements SharedPreferences.OnSharedPreferenceChangeListener {

		@@ -43,12 +45,21 @@ public class FragmentComposeSettings extends PreferenceFragmentCompat implements
		private void createPref() {

		SharedPreferences sharedPreferences = PreferenceManager.getDefaultSharedPreferences(requireActivity());

		//Theme for dialogs
		ListPreference SET_THREAD_MESSAGE = findPreference(getString(R.string.SET_THREAD_MESSAGE));
		if (SET_THREAD_MESSAGE != null) {
		SET_THREAD_MESSAGE.getContext().setTheme(Helper.dialogStyle());
		}
		//---------

		EditTextPreference SET_WATERMARK_TEXT = findPreference(getString(R.string.SET_WATERMARK_TEXT));
		if (SET_WATERMARK_TEXT != null) {
		String val = sharedPreferences.getString(getString(R.string.SET_WATERMARK_TEXT) + BaseMainActivity.currentUserID + BaseMainActivity.currentInstance, sharedPreferences.getString(getString(R.string.SET_WATERMARK_TEXT), null));
		SET_WATERMARK_TEXT.setText(val);
		}


		MultiSelectListPreference SET_SELECTED_LANGUAGE = findPreference(getString(R.string.SET_SELECTED_LANGUAGE));
		if (SET_SELECTED_LANGUAGE != null) {

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

+13 −2

Original line number	Diff line number	Diff line
		@@ -25,6 +25,7 @@ import androidx.preference.SwitchPreferenceCompat;

		import app.fedilab.android.R;
		import app.fedilab.android.activities.MainActivity;
		import app.fedilab.android.mastodon.helper.Helper;

		public class FragmentExtraFeaturesSettings extends PreferenceFragmentCompat implements SharedPreferences.OnSharedPreferenceChangeListener {

		@@ -41,6 +42,18 @@ public class FragmentExtraFeaturesSettings extends PreferenceFragmentCompat impl
		addPreferencesFromResource(R.xml.pref_extra_features);
		PreferenceScreen preferenceScreen = getPreferenceScreen();
		SharedPreferences sharedpreferences = PreferenceManager.getDefaultSharedPreferences(requireActivity());

		//Theme for dialogs
		ListPreference SET_POST_FORMAT = findPreference(getString(R.string.SET_POST_FORMAT));
		if (SET_POST_FORMAT != null) {
		SET_POST_FORMAT.getContext().setTheme(Helper.dialogStyle());
		}
		ListPreference SET_COMPOSE_LOCAL_ONLY = findPreference(getString(R.string.SET_DEFAULT_LOCALE_NEW));
		if (SET_COMPOSE_LOCAL_ONLY != null) {
		SET_COMPOSE_LOCAL_ONLY.getContext().setTheme(Helper.dialogStyle());
		}
		//---------

		SwitchPreferenceCompat SET_EXTAND_EXTRA_FEATURES = findPreference(getString(R.string.SET_EXTAND_EXTRA_FEATURES));
		if (SET_EXTAND_EXTRA_FEATURES != null) {
		boolean checked = sharedpreferences.getBoolean(getString(R.string.SET_EXTAND_EXTRA_FEATURES) + MainActivity.currentUserID + MainActivity.currentInstance, false);
		@@ -69,13 +82,11 @@ public class FragmentExtraFeaturesSettings extends PreferenceFragmentCompat impl
		SET_DISPLAY_REACTIONS.setChecked(checked);
		}

		ListPreference SET_POST_FORMAT = findPreference(getString(R.string.SET_POST_FORMAT));
		if (SET_POST_FORMAT != null) {
		String format = sharedpreferences.getString(getString(R.string.SET_POST_FORMAT) + MainActivity.currentUserID + MainActivity.currentInstance, "text/plain");
		SET_POST_FORMAT.setValue(format);
		}

		ListPreference SET_COMPOSE_LOCAL_ONLY = findPreference(getString(R.string.SET_COMPOSE_LOCAL_ONLY));
		if (SET_COMPOSE_LOCAL_ONLY != null) {
		int localOnly = sharedpreferences.getInt(getString(R.string.SET_COMPOSE_LOCAL_ONLY) + MainActivity.currentUserID + MainActivity.currentInstance, 0);
		SET_COMPOSE_LOCAL_ONLY.setValue(String.valueOf(localOnly));

app/src/main/java/app/fedilab/android/mastodon/ui/fragment/settings/FragmentHomeCacheSettings.java

+9 −1

Original line number	Diff line number	Diff line
		@@ -63,13 +63,21 @@ public class FragmentHomeCacheSettings extends PreferenceFragmentCompat implemen
		return;
		}
		SharedPreferences sharedpreferences = PreferenceManager.getDefaultSharedPreferences(requireActivity());

		//Theme for dialogs
		ListPreference SET_FETCH_HOME_DELAY_VALUE = findPreference(getString(R.string.SET_FETCH_HOME_DELAY_VALUE));
		if (SET_FETCH_HOME_DELAY_VALUE != null) {
		SET_FETCH_HOME_DELAY_VALUE.getContext().setTheme(Helper.dialogStyle());
		}
		//---------


		SwitchPreference SET_FETCH_HOME = findPreference(getString(R.string.SET_FETCH_HOME));
		if (SET_FETCH_HOME != null) {
		boolean checked = sharedpreferences.getBoolean(getString(R.string.SET_FETCH_HOME) + MainActivity.currentUserID + MainActivity.currentInstance, false);
		SET_FETCH_HOME.setChecked(checked);
		}

		ListPreference SET_FETCH_HOME_DELAY_VALUE = findPreference(getString(R.string.SET_FETCH_HOME_DELAY_VALUE));
		if (SET_FETCH_HOME_DELAY_VALUE != null) {
		String timeRefresh = sharedpreferences.getString(getString(R.string.SET_FETCH_HOME_DELAY_VALUE) + MainActivity.currentUserID + MainActivity.currentInstance, "60");
		SET_FETCH_HOME_DELAY_VALUE.setValue(timeRefresh);

app/src/main/java/app/fedilab/android/mastodon/ui/fragment/settings/FragmentInterfaceSettings.java

+8 −1

Original line number	Diff line number	Diff line
		@@ -33,6 +33,7 @@ import app.fedilab.android.BuildConfig;
		import app.fedilab.android.R;
		import app.fedilab.android.activities.MainActivity;
		import app.fedilab.android.mastodon.helper.Helper;
		import app.fedilab.android.mastodon.helper.ImageListPreference;
		import app.fedilab.android.mastodon.helper.LogoHelper;
		import es.dmoral.toasty.Toasty;

		@@ -54,6 +55,13 @@ public class FragmentInterfaceSettings extends PreferenceFragmentCompat implemen
		Toasty.error(requireActivity(), getString(R.string.toast_error), Toasty.LENGTH_SHORT).show();
		return;
		}

		//Theme for dialogs
		ImageListPreference SET_LOGO_LAUNCHER = findPreference(getString(R.string.SET_LOGO_LAUNCHER));
		if (SET_LOGO_LAUNCHER != null) {
		SET_LOGO_LAUNCHER.getContext().setTheme(Helper.dialogStyle());
		}
		//---------
		SeekBarPreference SET_FONT_SCALE = findPreference(getString(R.string.SET_FONT_SCALE_INT));
		if (SET_FONT_SCALE != null) {
		SET_FONT_SCALE.setMax(180);
		@@ -64,7 +72,6 @@ public class FragmentInterfaceSettings extends PreferenceFragmentCompat implemen
		SET_FONT_SCALE_ICON.setMax(180);
		SET_FONT_SCALE_ICON.setMin(80);
		}
		ListPreference SET_LOGO_LAUNCHER = findPreference(getString(R.string.SET_LOGO_LAUNCHER));
		if (SET_LOGO_LAUNCHER != null) {
		SET_LOGO_LAUNCHER.setIcon(LogoHelper.getDrawable(SET_LOGO_LAUNCHER.getValue()));
		}

app/src/main/java/app/fedilab/android/mastodon/ui/fragment/settings/FragmentLanguageSettings.java

+9 −0

Original line number	Diff line number	Diff line
		@@ -18,6 +18,7 @@ import android.annotation.SuppressLint;
		import android.content.SharedPreferences;
		import android.os.Bundle;

		import androidx.preference.ListPreference;
		import androidx.preference.Preference;
		import androidx.preference.PreferenceFragmentCompat;
		import androidx.preference.PreferenceManager;
		@@ -37,6 +38,14 @@ public class FragmentLanguageSettings extends PreferenceFragmentCompat implement
		private void createPref() {
		Preference SET_TRANSLATE_VALUES_RESET = findPreference(getString(R.string.SET_TRANSLATE_VALUES_RESET));
		SharedPreferences sharedPreferences = PreferenceManager.getDefaultSharedPreferences(requireActivity());

		//Theme for dialogs
		ListPreference SET_DEFAULT_LOCALE_NEW = findPreference(getString(R.string.SET_DEFAULT_LOCALE_NEW));
		if (SET_DEFAULT_LOCALE_NEW != null) {
		SET_DEFAULT_LOCALE_NEW.getContext().setTheme(Helper.dialogStyle());
		}
		//---------

		if (SET_TRANSLATE_VALUES_RESET != null) {
		SET_TRANSLATE_VALUES_RESET.setOnPreferenceClickListener(preference -> {
		SharedPreferences.Editor editor = sharedPreferences.edit();