From a74c285f776c273c654565b5d043230b07a483fe Mon Sep 17 00:00:00 2001 From: sk Date: Mon, 17 Jul 2023 22:51:45 +0200 Subject: [PATCH] fix alt text editor theme closes sk22#700 --- .../android/fragments/ComposeImageDescriptionFragment.java | 3 +++ .../org/joinmastodon/android/ui/utils/ColorPalette.java | 7 +++++-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/mastodon/src/main/java/org/joinmastodon/android/fragments/ComposeImageDescriptionFragment.java b/mastodon/src/main/java/org/joinmastodon/android/fragments/ComposeImageDescriptionFragment.java index 90fdf6fcb..5e53cb728 100644 --- a/mastodon/src/main/java/org/joinmastodon/android/fragments/ComposeImageDescriptionFragment.java +++ b/mastodon/src/main/java/org/joinmastodon/android/fragments/ComposeImageDescriptionFragment.java @@ -23,11 +23,13 @@ import android.view.inputmethod.InputMethodManager; import android.widget.EditText; import android.widget.ImageView; +import org.joinmastodon.android.GlobalUserPreferences; import org.joinmastodon.android.R; import org.joinmastodon.android.api.MastodonAPIController; import org.joinmastodon.android.model.Attachment; import org.joinmastodon.android.ui.M3AlertDialogBuilder; import org.joinmastodon.android.ui.photoviewer.PhotoViewer; +import org.joinmastodon.android.ui.utils.ColorPalette; import org.joinmastodon.android.ui.utils.UiUtils; import org.joinmastodon.android.ui.views.FixedAspectRatioImageView; @@ -61,6 +63,7 @@ public class ComposeImageDescriptionFragment extends MastodonToolbarFragment imp public void onAttach(Activity activity){ super.onAttach(activity); themeWrapper=new ContextThemeWrapper(activity, R.style.Theme_Mastodon_Dark); + ColorPalette.palettes.get(GlobalUserPreferences.color).apply(themeWrapper, GlobalUserPreferences.ThemePreference.DARK); setTitle(R.string.add_alt_text); } diff --git a/mastodon/src/main/java/org/joinmastodon/android/ui/utils/ColorPalette.java b/mastodon/src/main/java/org/joinmastodon/android/ui/utils/ColorPalette.java index c7ba9ff59..b11c6e3f2 100644 --- a/mastodon/src/main/java/org/joinmastodon/android/ui/utils/ColorPalette.java +++ b/mastodon/src/main/java/org/joinmastodon/android/ui/utils/ColorPalette.java @@ -2,7 +2,6 @@ package org.joinmastodon.android.ui.utils; import static org.joinmastodon.android.GlobalUserPreferences.ColorPreference; import static org.joinmastodon.android.GlobalUserPreferences.ThemePreference; -import static org.joinmastodon.android.GlobalUserPreferences.theme; import static org.joinmastodon.android.GlobalUserPreferences.trueBlackTheme; import android.content.Context; @@ -49,7 +48,11 @@ public class ColorPalette { public ColorPalette dark(@StyleRes int res, @StyleRes int auto) { dark = res; autoDark = auto; return this; } public ColorPalette black(@StyleRes int res, @StyleRes int auto) { dark = res; autoBlack = auto; return this; } - public void apply(Context context) { + public void apply(Context context) { + apply(context, GlobalUserPreferences.theme); + } + + public void apply(Context context, ThemePreference theme) { if (!((dark != 0 && autoDark != 0) || (black != 0 && autoBlack != 0) || light != 0 || base != 0)) { throw new IllegalStateException("Invalid color scheme definition"); }