From b1754846f883938375de07dd270933525df1541b Mon Sep 17 00:00:00 2001 From: LucasGGamerM Date: Thu, 12 Oct 2023 22:02:38 -0300 Subject: [PATCH] fix: this fixes an issue where the app wouldn't want to compile because of the StringRes at the title and CharSequence as the subtitle This addresses that by resolving the StringRes and making the app compile again cc: @sk22 --- .../android/fragments/settings/SettingsDisplayFragment.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mastodon/src/main/java/org/joinmastodon/android/fragments/settings/SettingsDisplayFragment.java b/mastodon/src/main/java/org/joinmastodon/android/fragments/settings/SettingsDisplayFragment.java index b14543ab3..8783dde11 100644 --- a/mastodon/src/main/java/org/joinmastodon/android/fragments/settings/SettingsDisplayFragment.java +++ b/mastodon/src/main/java/org/joinmastodon/android/fragments/settings/SettingsDisplayFragment.java @@ -59,7 +59,7 @@ public class SettingsDisplayFragment extends BaseSettingsFragment{ lp=s.getLocalPreferences(); onDataLoaded(List.of( themeItem=new ListItem<>(R.string.settings_theme, getAppearanceValue(), R.drawable.ic_fluent_weather_moon_24_regular, this::onAppearanceClick), - colorItem=new ListItem<>(R.string.sk_settings_color_palette, getAppearanceValue(), R.drawable.ic_fluent_weather_moon_24_regular, this::onColorClick), + colorItem=new ListItem<>(getString(R.string.sk_settings_color_palette), getColorPaletteValue(), R.drawable.ic_fluent_color_24_regular, this::onColorClick), trueBlackModeItem=new CheckableListItem<>(R.string.sk_settings_true_black, R.string.mo_setting_true_black_summary, CheckableListItem.Style.SWITCH, GlobalUserPreferences.trueBlackTheme, R.drawable.ic_fluent_dark_theme_24_regular, this::onTrueBlackModeClick, true), publishTextItem=new ListItem<>(getString(R.string.sk_settings_publish_button_text), getPublishButtonText(), R.drawable.ic_fluent_send_24_regular, this::onPublishTextClick), autoRevealCWsItem=new ListItem<>(R.string.sk_settings_auto_reveal_equal_spoilers, getAutoRevealSpoilersText(), R.drawable.ic_fluent_eye_24_regular, this::onAutoRevealSpoilersClick),