From 42b2cde1e27eda4bdaab6de1f3605a704a308eef Mon Sep 17 00:00:00 2001 From: sk Date: Wed, 21 Dec 2022 19:46:24 +0100 Subject: [PATCH] use UiUtils.getThemeColor --- .../android/fragments/ComposeFragment.java | 5 +---- .../android/fragments/SettingsFragment.java | 4 +--- .../onboarding/CustomWelcomeFragment.java | 5 ----- .../displayitems/TextStatusDisplayItem.java | 19 +++++++------------ 4 files changed, 9 insertions(+), 24 deletions(-) diff --git a/mastodon/src/main/java/org/joinmastodon/android/fragments/ComposeFragment.java b/mastodon/src/main/java/org/joinmastodon/android/fragments/ComposeFragment.java index 935b5f6fe..2d5161056 100644 --- a/mastodon/src/main/java/org/joinmastodon/android/fragments/ComposeFragment.java +++ b/mastodon/src/main/java/org/joinmastodon/android/fragments/ComposeFragment.java @@ -672,11 +672,8 @@ public class ComposeFragment extends MastodonToolbarFragment implements OnBackPr @SuppressLint("ClickableViewAccessibility") private Button buildLanguageSelector() { - TypedValue typedValue = new TypedValue(); - getActivity().getTheme().resolveAttribute(android.R.attr.textColorSecondary, typedValue, true); - languageButton=new Button(getActivity()); - languageButton.setTextColor(typedValue.data); + languageButton.setTextColor(UiUtils.getThemeColor(getActivity(), android.R.attr.textColorSecondary)); languageButton.setBackground(getActivity().getDrawable(R.drawable.bg_text_button)); languageButton.setPadding(V.dp(8), 0, V.dp(8), 0); languageButton.setCompoundDrawablesRelativeWithIntrinsicBounds(getActivity().getDrawable(R.drawable.ic_fluent_local_language_16_regular), null, null, null); diff --git a/mastodon/src/main/java/org/joinmastodon/android/fragments/SettingsFragment.java b/mastodon/src/main/java/org/joinmastodon/android/fragments/SettingsFragment.java index ae8938d03..3b4e401e2 100644 --- a/mastodon/src/main/java/org/joinmastodon/android/fragments/SettingsFragment.java +++ b/mastodon/src/main/java/org/joinmastodon/android/fragments/SettingsFragment.java @@ -907,9 +907,7 @@ public class SettingsFragment extends MastodonToolbarFragment{ @Override public void onBind(SmallTextItem item){ text.setText(item.text); - TypedValue val = new TypedValue(); - getContext().getTheme().resolveAttribute(android.R.attr.textColorSecondary, val, true); - text.setTextColor(getResources().getColor(val.resourceId, getContext().getTheme())); + text.setTextColor(UiUtils.getThemeColor(getActivity(), android.R.attr.textColorSecondary)); text.setLayoutParams(new LinearLayout.LayoutParams(LinearLayout.LayoutParams.WRAP_CONTENT, LinearLayout.LayoutParams.WRAP_CONTENT)); text.setTextSize(TypedValue.COMPLEX_UNIT_SP, 14); } diff --git a/mastodon/src/main/java/org/joinmastodon/android/fragments/onboarding/CustomWelcomeFragment.java b/mastodon/src/main/java/org/joinmastodon/android/fragments/onboarding/CustomWelcomeFragment.java index 719c42e43..2bcdee729 100644 --- a/mastodon/src/main/java/org/joinmastodon/android/fragments/onboarding/CustomWelcomeFragment.java +++ b/mastodon/src/main/java/org/joinmastodon/android/fragments/onboarding/CustomWelcomeFragment.java @@ -205,11 +205,6 @@ public class CustomWelcomeFragment extends InstanceCatalogFragment { public InstanceViewHolder(){ super(getActivity(), R.layout.item_instance_custom, list); - -// itemView.setPadding(V.dp(16), V.dp(16), V.dp(16), V.dp(16)); -// TypedValue value = new TypedValue(); -// getActivity().getTheme().resolveAttribute(android.R.attr.selectableItemBackground, value, true); -// itemView.setBackground(getActivity().getTheme().getDrawable(R.drawable.bg_search_field)); title=findViewById(R.id.title); description=findViewById(R.id.description); userCount=findViewById(R.id.user_count); diff --git a/mastodon/src/main/java/org/joinmastodon/android/ui/displayitems/TextStatusDisplayItem.java b/mastodon/src/main/java/org/joinmastodon/android/ui/displayitems/TextStatusDisplayItem.java index 8d31f9f20..19633096e 100644 --- a/mastodon/src/main/java/org/joinmastodon/android/ui/displayitems/TextStatusDisplayItem.java +++ b/mastodon/src/main/java/org/joinmastodon/android/ui/displayitems/TextStatusDisplayItem.java @@ -25,6 +25,7 @@ import org.joinmastodon.android.model.StatusPrivacy; import org.joinmastodon.android.model.TranslatedStatus; import org.joinmastodon.android.ui.text.HtmlParser; import org.joinmastodon.android.ui.utils.CustomEmojiHelper; +import org.joinmastodon.android.ui.utils.UiUtils; import org.joinmastodon.android.ui.views.LinkedTextView; import me.grishka.appkit.api.Callback; @@ -82,7 +83,7 @@ public class TextStatusDisplayItem extends StatusDisplayItem{ private final LinearLayout spoilerHeader; private final TextView spoilerTitle, spoilerTitleInline, translateInfo; private final View spoilerOverlay, borderTop, borderBottom, textWrap, translateWrap, translateProgress; - private final Drawable backgroundColor, borderColor; + private final int backgroundColor, borderColor; private final Button translateButton; public Holder(Activity activity, ViewGroup parent){ @@ -100,14 +101,8 @@ public class TextStatusDisplayItem extends StatusDisplayItem{ translateInfo=findViewById(R.id.translate_info); translateProgress=findViewById(R.id.translate_progress); itemView.setOnClickListener(v->item.parentFragment.onRevealSpoilerClick(this)); - - TypedValue outValue=new TypedValue(); - activity.getTheme().resolveAttribute(R.attr.colorBackgroundLight, outValue, true); - backgroundColor=activity.getDrawable(outValue.resourceId); -// activity.getTheme().resolveAttribute(R.attr.colorBackgroundLightest, outValue, true); -// backgroundColorInset=activity.getDrawable(outValue.resourceId); - activity.getTheme().resolveAttribute(R.attr.colorPollVoted, outValue, true); - borderColor=activity.getDrawable(outValue.resourceId); + backgroundColor=UiUtils.getThemeColor(activity, R.attr.colorBackgroundLight); + borderColor=UiUtils.getThemeColor(activity, R.attr.colorPollVoted); } @Override @@ -118,10 +113,10 @@ public class TextStatusDisplayItem extends StatusDisplayItem{ text.setTextIsSelectable(item.textSelectable); spoilerTitleInline.setTextIsSelectable(item.textSelectable); text.setInvalidateOnEveryFrame(false); - spoilerTitleInline.setBackground(item.inset ? null : backgroundColor); + spoilerTitleInline.setBackgroundColor(item.inset ? 0 : backgroundColor); spoilerTitleInline.setPadding(spoilerTitleInline.getPaddingLeft(), item.inset ? 0 : V.dp(14), spoilerTitleInline.getPaddingRight(), item.inset ? 0 : V.dp(14)); - borderTop.setBackground(item.inset ? null : borderColor); - borderBottom.setBackground(item.inset ? null : borderColor); + borderTop.setBackgroundColor(item.inset ? 0 : borderColor); + borderBottom.setBackgroundColor(item.inset ? 0 : borderColor); if(!TextUtils.isEmpty(item.status.spoilerText)){ spoilerTitle.setText(item.parsedSpoilerText); spoilerTitleInline.setText(item.parsedSpoilerText);