diff options
author | Thomas <tschneider.ac@gmail.com> | 2024-01-16 17:54:54 +0100 |
---|---|---|
committer | Thomas <tschneider.ac@gmail.com> | 2024-01-16 17:54:54 +0100 |
commit | 1f2e6c4327eb5aca4a06829c21530da5c8f13a1d (patch) | |
tree | 285eaec81dd9f9bc1680d12e582df2a892457725 /app/src/main/java/app/fedilab/android/mastodon/ui/fragment/settings/FragmentInterfaceSettings.java | |
parent | a1370693fb564d48aa56a602b7b912e864480f74 (diff) | |
parent | 886b74c171f3e92f9bb394150a1ce99cf3491d76 (diff) |
Merge branch 'develop'3.27.0
Diffstat (limited to 'app/src/main/java/app/fedilab/android/mastodon/ui/fragment/settings/FragmentInterfaceSettings.java')
-rw-r--r-- | app/src/main/java/app/fedilab/android/mastodon/ui/fragment/settings/FragmentInterfaceSettings.java | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/app/src/main/java/app/fedilab/android/mastodon/ui/fragment/settings/FragmentInterfaceSettings.java b/app/src/main/java/app/fedilab/android/mastodon/ui/fragment/settings/FragmentInterfaceSettings.java index c18a0c8f4..3019cccba 100644 --- a/app/src/main/java/app/fedilab/android/mastodon/ui/fragment/settings/FragmentInterfaceSettings.java +++ b/app/src/main/java/app/fedilab/android/mastodon/ui/fragment/settings/FragmentInterfaceSettings.java @@ -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())); } @@ -120,6 +127,9 @@ public class FragmentInterfaceSettings extends PreferenceFragmentCompat implemen editor.putString(getString(R.string.SET_LOGO_LAUNCHER), newLauncher); } } + if (key.compareToIgnoreCase(getString(R.string.SET_DISABLE_TOPBAR_SCROLLING)) == 0) { + recreate = true; + } editor.apply(); } } |