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 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