drop all custom/hardcoded color refs, replace with m3 theme alternatives

13 files changed, 9 insertions, 72 deletions

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">
 
-    <View
-        android:layout_gravity="top|center_horizontal"
-        android:layout_marginTop="10dp"
+    <com.google.android.material.divider.MaterialDivider
         android:layout_width="match_parent"
-        android:layout_height="1dp"
-        android:background="?colorOutlineVariant"/>
+        android:layout_marginTop="8dp"
+        android:layout_height="wrap_content"/>
 
 </FrameLayout>
\ 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" />
 
 </LinearLayout>
\ 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" />
 
         <TextView
diff --git a/org.fox.ttrss/src/main/res/layout/feeds_row_selected.xml b/org.fox.ttrss/src/main/res/layout/feeds_row_selected.xml
index 7cad355d..3e9255b5 100755
--- a/org.fox.ttrss/src/main/res/layout/feeds_row_selected.xml
+++ b/org.fox.ttrss/src/main/res/layout/feeds_row_selected.xml
@@ -43,7 +43,7 @@
             android:paddingEnd="16dp"
             android:singleLine="true"
             tools:text="Feed title"
-            android:textColor="?feedlistSelectedTextColor"
+            android:textColor="?colorPrimary"
             android:textSize="14sp" />
 
         <TextView
diff --git a/org.fox.ttrss/src/main/res/layout/feeds_row_toggle.xml b/org.fox.ttrss/src/main/res/layout/feeds_row_toggle.xml
index 15f88849..3b76fc79 100755
--- a/org.fox.ttrss/src/main/res/layout/feeds_row_toggle.xml
+++ b/org.fox.ttrss/src/main/res/layout/feeds_row_toggle.xml
@@ -35,8 +35,7 @@
         android:paddingStart="16dp"
         android:paddingEnd="16dp"
         android:singleLine="true"
-        tools:text="Unread only"
-        android:textColor="?feedlistTextColor"
+        tools:text="@string/unread_only"
         android:textSize="14sp" />
 
     <com.google.android.material.materialswitch.MaterialSwitch
diff --git a/org.fox.ttrss/src/main/res/layout/fragment_article.xml b/org.fox.ttrss/src/main/res/layout/fragment_article.xml
index ed8f2958..e8fe04aa 100755
--- a/org.fox.ttrss/src/main/res/layout/fragment_article.xml
+++ b/org.fox.ttrss/src/main/res/layout/fragment_article.xml
@@ -16,8 +16,6 @@
         android:layout_height="wrap_content">
 
         <com.google.android.material.appbar.AppBarLayout
-            android:elevation="0dp"
-            app:elevation="0dp"
             android:backgroundTint="?colorSurfaceContainerLow"
             android:layout_width="match_parent"
             android:layout_height="match_parent">
@@ -138,11 +136,9 @@
 
             </LinearLayout>
 
-            <View
-                android:layout_gravity="top|center_horizontal"
+            <com.google.android.material.divider.MaterialDivider
                 android:layout_width="match_parent"
-                android:layout_height="1dp"
-                android:background="?articleHeaderSeparator"/>
+                android:layout_height="wrap_content"/>
 
         </com.google.android.material.appbar.AppBarLayout>
 
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 @@
         <item name="ic_action_trending_flat">@drawable/baseline_trending_flat_24</item>
         <item name="ic_action_trending_down">@drawable/baseline_trending_down_24</item>
 
-        <item name="feedlistTextColor">@android:color/white</item>
-        <item name="headlineTitleHighScoreUnreadTextColor">#00FF00</item>
-        <item name="parentBtnBackground">#101010</item>
-        <item name="ttrssHorizontalDivider">@android:drawable/divider_horizontal_dark</item>
-        <item name="feedlistSelectedTextColor">@android:color/white</item>
-        <item name="articleHeader">@android:color/transparent</item>
-        <item name="articleTextColor">#e0e0e0</item>
-        <item name="articleHeaderSeparator">#303030</item>
-
         <item name="colorPrimary">@color/md_theme_primary</item>
         <item name="colorOnPrimary">@color/md_theme_onPrimary</item>
         <item name="colorPrimaryContainer">@color/md_theme_primaryContainer</item>
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 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <attr name="ttrssHorizontalDivider" format="reference|color" />
-    <attr name="feedlistTextColor" format="reference|color" />
-    <attr name="feedlistSelectedTextColor" format="reference|color" />
-    <attr name="headlineTitleHighScoreUnreadTextColor" format="reference|color" />
-    <attr name="parentBtnBackground" format="reference|color" />
-    <attr name="articleHeader" format="reference|color" />
-    <attr name="articleTextColor" format="reference|color" />
-    <attr name="articleHeaderSeparator" format="reference|color" />
     <attr name="ic_rss_box" format="reference"/>
     <attr name="ic_checkbox_marked" format="reference" />
     <attr name="ic_star" format="reference" />
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 @@
         <item name="ic_action_trending_flat">@drawable/baseline_trending_flat_24</item>
         <item name="ic_action_trending_down">@drawable/baseline_trending_down_24</item>
 
-        <item name="ttrssHorizontalDivider">@android:drawable/divider_horizontal_bright</item>
-        <item name="feedlistTextColor">@android:color/black</item>
-        <item name="feedlistSelectedTextColor">@android:color/black</item>
-        <item name="headlineTitleHighScoreUnreadTextColor">#008000</item>
-        <item name="parentBtnBackground">#dddddd</item>
-        <item name="articleHeader">@android:color/transparent</item>
-        <item name="articleTextColor">@android:color/black</item>
-        <item name="articleHeaderSeparator">#cccccc</item>
-
         <item name="colorPrimary">@color/md_theme_primary</item>
         <item name="colorOnPrimary">@color/md_theme_onPrimary</item>
         <item name="colorPrimaryContainer">@color/md_theme_primaryContainer</item>