From f88aa097dfa381c63812c12c22f67dd3e97206a5 Mon Sep 17 00:00:00 2001 From: Andrew Dolgov Date: Wed, 7 May 2025 18:10:22 +0300 Subject: drop all custom/hardcoded color refs, replace with m3 theme alternatives --- .../src/main/java/org/fox/ttrss/ArticleFragment.java | 12 +----------- .../src/main/java/org/fox/ttrss/HeadlinesFragment.java | 9 --------- .../java/org/fox/ttrss/offline/OfflineArticleFragment.java | 2 +- .../java/org/fox/ttrss/offline/OfflineHeadlinesFragment.java | 9 --------- 4 files changed, 2 insertions(+), 30 deletions(-) (limited to 'org.fox.ttrss/src/main/java/org/fox') diff --git a/org.fox.ttrss/src/main/java/org/fox/ttrss/ArticleFragment.java b/org.fox.ttrss/src/main/java/org/fox/ttrss/ArticleFragment.java index 0d9a37c2..621238c1 100755 --- a/org.fox.ttrss/src/main/java/org/fox/ttrss/ArticleFragment.java +++ b/org.fox.ttrss/src/main/java/org/fox/ttrss/ArticleFragment.java @@ -457,18 +457,8 @@ public class ArticleFragment extends androidx.fragment.app.Fragment { scoreView.setIconResource(tv.resourceId); - Resources.Theme theme = m_activity.getTheme(); - TypedValue tvColorHighScore = new TypedValue(); - theme.resolveAttribute(R.attr.headlineTitleHighScoreUnreadTextColor, tvColorHighScore, true); - TypedValue tvPrimary = new TypedValue(); m_activity.getTheme().resolveAttribute(R.attr.colorPrimary, tvPrimary, true); - - if (m_article.score > Article.SCORE_HIGH) - scoreView.setIconTint(ColorStateList.valueOf(tvColorHighScore.data)); - else - scoreView.setIconTint(ColorStateList.valueOf(tvPrimary.data)); - } protected void renderContent(Bundle savedInstanceState) { @@ -480,7 +470,7 @@ public class ArticleFragment extends androidx.fragment.app.Fragment { ws.setSupportZoom(false); TypedValue tvTextColor = new TypedValue(); - getActivity().getTheme().resolveAttribute(R.attr.articleTextColor, tvTextColor, true); + getActivity().getTheme().resolveAttribute(R.attr.colorOnSurface, tvTextColor, true); String textColor = String.format("#%06X", (0xFFFFFF & tvTextColor.data)); diff --git a/org.fox.ttrss/src/main/java/org/fox/ttrss/HeadlinesFragment.java b/org.fox.ttrss/src/main/java/org/fox/ttrss/HeadlinesFragment.java index 2b92283d..b0ffa853 100755 --- a/org.fox.ttrss/src/main/java/org/fox/ttrss/HeadlinesFragment.java +++ b/org.fox.ttrss/src/main/java/org/fox/ttrss/HeadlinesFragment.java @@ -857,7 +857,6 @@ public class HeadlinesFragment extends androidx.fragment.app.Fragment { public static final int VIEW_COUNT = VIEW_AMR_FOOTER + 1; private final Integer[] origTitleColors = new Integer[VIEW_COUNT]; - private final int titleHighScoreUnreadColor; private ColorGenerator m_colorGenerator = ColorGenerator.DEFAULT; private TextDrawable.IBuilder m_drawableBuilder = TextDrawable.builder().round(); @@ -900,11 +899,6 @@ public class HeadlinesFragment extends androidx.fragment.app.Fragment { flavorImageEnabled = "HL_DEFAULT".equals(headlineMode) || "HL_COMPACT".equals(headlineMode); m_cmgr = (ConnectivityManager) m_activity.getSystemService(Context.CONNECTIVITY_SERVICE); - - Theme theme = context.getTheme(); - TypedValue tv = new TypedValue(); - theme.resolveAttribute(R.attr.headlineTitleHighScoreUnreadTextColor, tv, true); - titleHighScoreUnreadColor = tv.data; } @Override @@ -1691,9 +1685,6 @@ public class HeadlinesFragment extends androidx.fragment.app.Fragment { if (score < Article.SCORE_LOW) { tv.setPaintFlags(tv.getPaintFlags() | Paint.STRIKE_THRU_TEXT_FLAG); - } else if (score > Article.SCORE_HIGH) { - tv.setTextColor(titleHighScoreUnreadColor); - tv.setPaintFlags(tv.getPaintFlags() & ~Paint.STRIKE_THRU_TEXT_FLAG); } else { tv.setTextColor(origTitleColors[viewType].intValue()); tv.setPaintFlags(tv.getPaintFlags() & ~Paint.STRIKE_THRU_TEXT_FLAG); diff --git a/org.fox.ttrss/src/main/java/org/fox/ttrss/offline/OfflineArticleFragment.java b/org.fox.ttrss/src/main/java/org/fox/ttrss/offline/OfflineArticleFragment.java index aac19b51..9451f8f6 100755 --- a/org.fox.ttrss/src/main/java/org/fox/ttrss/offline/OfflineArticleFragment.java +++ b/org.fox.ttrss/src/main/java/org/fox/ttrss/offline/OfflineArticleFragment.java @@ -327,7 +327,7 @@ public class OfflineArticleFragment extends Fragment { } TypedValue tvTextColor = new TypedValue(); - getActivity().getTheme().resolveAttribute(R.attr.articleTextColor, tvTextColor, true); + getActivity().getTheme().resolveAttribute(R.attr.colorOnSurface, tvTextColor, true); String textColor = String.format("#%06X", (0xFFFFFF & tvTextColor.data)); diff --git a/org.fox.ttrss/src/main/java/org/fox/ttrss/offline/OfflineHeadlinesFragment.java b/org.fox.ttrss/src/main/java/org/fox/ttrss/offline/OfflineHeadlinesFragment.java index cad9e028..bde4f52f 100755 --- a/org.fox.ttrss/src/main/java/org/fox/ttrss/offline/OfflineHeadlinesFragment.java +++ b/org.fox.ttrss/src/main/java/org/fox/ttrss/offline/OfflineHeadlinesFragment.java @@ -566,7 +566,6 @@ public class OfflineHeadlinesFragment extends Fragment implements OnItemClickLis public static final int VIEW_COUNT = VIEW_LOADMORE+1; private final Integer[] origTitleColors = new Integer[VIEW_COUNT]; - private final int titleHighScoreUnreadColor; private ColorGenerator m_colorGenerator = ColorGenerator.DEFAULT; private TextDrawable.IBuilder m_drawableBuilder = TextDrawable.builder().round(); @@ -578,11 +577,6 @@ public class OfflineHeadlinesFragment extends Fragment implements OnItemClickLis String[] from, int[] to, int flags) { super(context, layout, c, from, to, flags); - Theme theme = context.getTheme(); - TypedValue tv = new TypedValue(); - theme.resolveAttribute(R.attr.headlineTitleHighScoreUnreadTextColor, tv, true); - titleHighScoreUnreadColor = tv.data; - String headlineMode = m_prefs.getString("headline_mode", "HL_DEFAULT"); showFlavorImage = "HL_DEFAULT".equals(headlineMode) || "HL_COMPACT".equals(headlineMode); @@ -1194,9 +1188,6 @@ public class OfflineHeadlinesFragment extends Fragment implements OnItemClickLis if (score < -500) { tv.setPaintFlags(tv.getPaintFlags() | Paint.STRIKE_THRU_TEXT_FLAG); - } else if (score > 500) { - tv.setTextColor(titleHighScoreUnreadColor); - tv.setPaintFlags(tv.getPaintFlags() & ~Paint.STRIKE_THRU_TEXT_FLAG); } else { tv.setTextColor(origTitleColors[viewType].intValue()); tv.setPaintFlags(tv.getPaintFlags() & ~Paint.STRIKE_THRU_TEXT_FLAG); -- cgit v1.2.3-54-g00ecf