From 97e92defd99b4d9b4bbb85a6a7170a70b05cae75 Mon Sep 17 00:00:00 2001 From: Andrew Dolgov Date: Tue, 6 May 2025 19:58:35 +0300 Subject: drawer style tweaks --- org.fox.ttrss/src/main/res/layout/feeds_goback.xml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'org.fox.ttrss/src/main/res/layout/feeds_goback.xml') diff --git a/org.fox.ttrss/src/main/res/layout/feeds_goback.xml b/org.fox.ttrss/src/main/res/layout/feeds_goback.xml index bb263237..90aac490 100755 --- a/org.fox.ttrss/src/main/res/layout/feeds_goback.xml +++ b/org.fox.ttrss/src/main/res/layout/feeds_goback.xml @@ -1,5 +1,6 @@ + android:src="?ic_go_back" + app:tint="?colorAccent" /> -- cgit v1.2.3-54-g00ecf From 695fa66d417e0f00db1c20c6034201079340b4d5 Mon Sep 17 00:00:00 2001 From: Andrew Dolgov Date: Wed, 7 May 2025 07:03:44 +0300 Subject: switch to static material3 colorset --- org.fox.ttrss/src/main/AndroidManifest.xml | 4 +- .../main/java/org/fox/ttrss/HeadlinesFragment.java | 10 +- .../ttrss/offline/OfflineHeadlinesFragment.java | 8 +- .../src/main/res/layout/activity_gallery.xml | 4 +- .../src/main/res/layout/activity_master_phone.xml | 2 +- org.fox.ttrss/src/main/res/layout/feeds_goback.xml | 2 +- org.fox.ttrss/src/main/res/layout/feeds_row.xml | 2 +- .../src/main/res/layout/feeds_row_selected.xml | 2 +- .../src/main/res/layout/headlines_row.xml | 4 +- .../src/main/res/layout/headlines_row_unread.xml | 4 +- org.fox.ttrss/src/main/res/values-night/colors.xml | 143 ++++++++++++++++++++ org.fox.ttrss/src/main/res/values-night/style.xml | 21 --- .../src/main/res/values-night/theme_overlays.xml | 98 ++++++++++++++ org.fox.ttrss/src/main/res/values-night/themes.xml | 89 +++++++++++++ org.fox.ttrss/src/main/res/values/colors.xml | 147 ++++++++++++++++++++- org.fox.ttrss/src/main/res/values/style.xml | 53 -------- .../src/main/res/values/theme_overlays.xml | 98 ++++++++++++++ org.fox.ttrss/src/main/res/values/themes.xml | 86 ++++++++++++ 18 files changed, 677 insertions(+), 100 deletions(-) create mode 100644 org.fox.ttrss/src/main/res/values-night/colors.xml delete mode 100644 org.fox.ttrss/src/main/res/values-night/style.xml create mode 100644 org.fox.ttrss/src/main/res/values-night/theme_overlays.xml create mode 100644 org.fox.ttrss/src/main/res/values-night/themes.xml mode change 100755 => 100644 org.fox.ttrss/src/main/res/values/colors.xml delete mode 100755 org.fox.ttrss/src/main/res/values/style.xml create mode 100644 org.fox.ttrss/src/main/res/values/theme_overlays.xml create mode 100644 org.fox.ttrss/src/main/res/values/themes.xml (limited to 'org.fox.ttrss/src/main/res/layout/feeds_goback.xml') diff --git a/org.fox.ttrss/src/main/AndroidManifest.xml b/org.fox.ttrss/src/main/AndroidManifest.xml index b5da6cd3..b79e3b05 100755 --- a/org.fox.ttrss/src/main/AndroidManifest.xml +++ b/org.fox.ttrss/src/main/AndroidManifest.xml @@ -98,7 +98,7 @@ android:excludeFromRecents="true" android:label="@string/app_name" android:exported="true" - android:theme="@style/DarkDialogTheme" > + android:theme="@style/MaterialAlertDialog.Material3" > @@ -112,7 +112,7 @@ android:excludeFromRecents="true" android:label="@string/subscribe_name" android:exported="true" - android:theme="@style/DarkDialogTheme" > + android:theme="@style/MaterialAlertDialog.Material3" > 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 ef2e23a6..06e815f0 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 @@ -1032,8 +1032,8 @@ public class HeadlinesFragment extends androidx.fragment.app.Fragment { } - TypedValue tvAccent = new TypedValue(); - m_activity.getTheme().resolveAttribute(R.attr.colorAccent, tvAccent, true); + TypedValue tvTertiary = new TypedValue(); + m_activity.getTheme().resolveAttribute(R.attr.colorTertiary, tvTertiary, true); TypedValue tvPrimary = new TypedValue(); m_activity.getTheme().resolveAttribute(R.attr.colorPrimary, tvPrimary, true); @@ -1046,7 +1046,7 @@ public class HeadlinesFragment extends androidx.fragment.app.Fragment { if (article.marked) - holder.markedView.setIconTint(ColorStateList.valueOf(tvAccent.data)); + holder.markedView.setIconTint(ColorStateList.valueOf(tvTertiary.data)); else holder.markedView.setIconTint(ColorStateList.valueOf(tvPrimary.data)); @@ -1077,7 +1077,7 @@ public class HeadlinesFragment extends androidx.fragment.app.Fragment { holder.scoreView.setIconResource(tv.resourceId); if (article.score > Article.SCORE_HIGH) - holder.scoreView.setIconTint(ColorStateList.valueOf(tvAccent.data)); + holder.scoreView.setIconTint(ColorStateList.valueOf(tvTertiary.data)); else holder.scoreView.setIconTint(ColorStateList.valueOf(tvPrimary.data)); @@ -1137,7 +1137,7 @@ public class HeadlinesFragment extends androidx.fragment.app.Fragment { holder.publishedView.setIconResource(tv.resourceId); if (article.published) - holder.publishedView.setIconTint(ColorStateList.valueOf(tvAccent.data)); + holder.publishedView.setIconTint(ColorStateList.valueOf(tvTertiary.data)); else holder.publishedView.setIconTint(ColorStateList.valueOf(tvPrimary.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 368ec95c..8500d7c7 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 @@ -790,8 +790,8 @@ public class OfflineHeadlinesFragment extends Fragment implements OnItemClickLis holder.feedTitleView.setVisibility(View.GONE); } - TypedValue tvAccent = new TypedValue(); - m_activity.getTheme().resolveAttribute(R.attr.colorAccent, tvAccent, true); + TypedValue tvTertiary = new TypedValue(); + m_activity.getTheme().resolveAttribute(R.attr.colorTertiary, tvTertiary, true); TypedValue tvPrimary = new TypedValue(); m_activity.getTheme().resolveAttribute(R.attr.colorPrimary, tvPrimary, true); @@ -814,7 +814,7 @@ public class OfflineHeadlinesFragment extends Fragment implements OnItemClickLis holder.markedView.setIconResource(tv.resourceId); if (marked) - holder.markedView.setIconTint(ColorStateList.valueOf(tvAccent.data)); + holder.markedView.setIconTint(ColorStateList.valueOf(tvTertiary.data)); else holder.markedView.setIconTint(ColorStateList.valueOf(tvPrimary.data)); @@ -845,7 +845,7 @@ public class OfflineHeadlinesFragment extends Fragment implements OnItemClickLis holder.publishedView.setIconResource(tv.resourceId); if (published) - holder.publishedView.setIconTint(ColorStateList.valueOf(tvAccent.data)); + holder.publishedView.setIconTint(ColorStateList.valueOf(tvTertiary.data)); else holder.publishedView.setIconTint(ColorStateList.valueOf(tvPrimary.data)); diff --git a/org.fox.ttrss/src/main/res/layout/activity_gallery.xml b/org.fox.ttrss/src/main/res/layout/activity_gallery.xml index 9770c4c8..9326a19e 100644 --- a/org.fox.ttrss/src/main/res/layout/activity_gallery.xml +++ b/org.fox.ttrss/src/main/res/layout/activity_gallery.xml @@ -20,11 +20,11 @@ android:layout_height="26dp" android:layout_weight="0" android:background="@drawable/ripple" - android:src="?ic_dots_vertical_circle" + android:src="?ic_dots_vertical" android:layout_alignParentRight="true" android:layout_marginRight="8dp" android:layout_marginTop="@dimen/activity_vertical_margin" - app:tint="?colorAccent" /> + app:tint="?colorTertiary" /> + app:tint="?colorTertiary" /> - #cccccc - - #F4511E - - - - - \ No newline at end of file diff --git a/org.fox.ttrss/src/main/res/values/theme_overlays.xml b/org.fox.ttrss/src/main/res/values/theme_overlays.xml new file mode 100644 index 00000000..e81f18fb --- /dev/null +++ b/org.fox.ttrss/src/main/res/values/theme_overlays.xml @@ -0,0 +1,98 @@ + + + + diff --git a/org.fox.ttrss/src/main/res/values/themes.xml b/org.fox.ttrss/src/main/res/values/themes.xml new file mode 100644 index 00000000..54613ad9 --- /dev/null +++ b/org.fox.ttrss/src/main/res/values/themes.xml @@ -0,0 +1,86 @@ + + + -- cgit v1.2.3-54-g00ecf 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 --------- org.fox.ttrss/src/main/res/layout/drawer_divider.xml | 8 +++----- org.fox.ttrss/src/main/res/layout/feeds_goback.xml | 1 - org.fox.ttrss/src/main/res/layout/feeds_row.xml | 1 - org.fox.ttrss/src/main/res/layout/feeds_row_selected.xml | 2 +- org.fox.ttrss/src/main/res/layout/feeds_row_toggle.xml | 3 +-- org.fox.ttrss/src/main/res/layout/fragment_article.xml | 8 ++------ org.fox.ttrss/src/main/res/values-night/themes.xml | 9 --------- org.fox.ttrss/src/main/res/values/attrs.xml | 8 -------- org.fox.ttrss/src/main/res/values/themes.xml | 9 --------- 13 files changed, 9 insertions(+), 72 deletions(-) (limited to 'org.fox.ttrss/src/main/res/layout/feeds_goback.xml') 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); diff --git a/org.fox.ttrss/src/main/res/layout/drawer_divider.xml b/org.fox.ttrss/src/main/res/layout/drawer_divider.xml index 1e0166e8..3b4ab6fc 100644 --- a/org.fox.ttrss/src/main/res/layout/drawer_divider.xml +++ b/org.fox.ttrss/src/main/res/layout/drawer_divider.xml @@ -4,11 +4,9 @@ android:layout_width="fill_parent" android:layout_height="fill_parent"> - + android:layout_marginTop="8dp" + android:layout_height="wrap_content"/> \ No newline at end of file diff --git a/org.fox.ttrss/src/main/res/layout/feeds_goback.xml b/org.fox.ttrss/src/main/res/layout/feeds_goback.xml index d826da41..f4c580a3 100755 --- a/org.fox.ttrss/src/main/res/layout/feeds_goback.xml +++ b/org.fox.ttrss/src/main/res/layout/feeds_goback.xml @@ -33,7 +33,6 @@ android:paddingStart="16dp" android:singleLine="true" android:text=".." - android:textColor="?feedlistTextColor" android:textSize="14sp" /> \ No newline at end of file diff --git a/org.fox.ttrss/src/main/res/layout/feeds_row.xml b/org.fox.ttrss/src/main/res/layout/feeds_row.xml index 3ebcf0eb..32e20c26 100755 --- a/org.fox.ttrss/src/main/res/layout/feeds_row.xml +++ b/org.fox.ttrss/src/main/res/layout/feeds_row.xml @@ -37,7 +37,6 @@ android:paddingEnd="16dp" android:singleLine="true" tools:text="Feed title" - android:textColor="?feedlistTextColor" android:textSize="14sp" /> @@ -138,11 +136,9 @@ - + android:layout_height="wrap_content"/> diff --git a/org.fox.ttrss/src/main/res/values-night/themes.xml b/org.fox.ttrss/src/main/res/values-night/themes.xml index f072def8..196b4ad4 100644 --- a/org.fox.ttrss/src/main/res/values-night/themes.xml +++ b/org.fox.ttrss/src/main/res/values-night/themes.xml @@ -26,15 +26,6 @@ @drawable/baseline_trending_flat_24 @drawable/baseline_trending_down_24 - @android:color/white - #00FF00 - #101010 - @android:drawable/divider_horizontal_dark - @android:color/white - @android:color/transparent - #e0e0e0 - #303030 - @color/md_theme_primary @color/md_theme_onPrimary @color/md_theme_primaryContainer diff --git a/org.fox.ttrss/src/main/res/values/attrs.xml b/org.fox.ttrss/src/main/res/values/attrs.xml index 49daa405..daf2323c 100755 --- a/org.fox.ttrss/src/main/res/values/attrs.xml +++ b/org.fox.ttrss/src/main/res/values/attrs.xml @@ -1,13 +1,5 @@ - - - - - - - - diff --git a/org.fox.ttrss/src/main/res/values/themes.xml b/org.fox.ttrss/src/main/res/values/themes.xml index f9186c3e..4cc0d590 100644 --- a/org.fox.ttrss/src/main/res/values/themes.xml +++ b/org.fox.ttrss/src/main/res/values/themes.xml @@ -26,15 +26,6 @@ @drawable/baseline_trending_flat_24 @drawable/baseline_trending_down_24 - @android:drawable/divider_horizontal_bright - @android:color/black - @android:color/black - #008000 - #dddddd - @android:color/transparent - @android:color/black - #cccccc - @color/md_theme_primary @color/md_theme_onPrimary @color/md_theme_primaryContainer -- cgit v1.2.3-54-g00ecf