use tertiary colors for selected row views

6 files changed, 13 insertions, 25 deletions

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 b0ffa853..723b0069 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
@@ -2,14 +2,12 @@ package org.fox.ttrss;
 
 import android.annotation.SuppressLint;
 import android.app.Activity;
-import android.app.AlertDialog;
 import android.app.Dialog;
 import android.content.Context;
 import android.content.DialogInterface;
 import android.content.Intent;
 import android.content.SharedPreferences;
 import android.content.res.ColorStateList;
-import android.content.res.Resources.Theme;
 import android.graphics.Paint;
 import android.graphics.Point;
 import android.graphics.SurfaceTexture;
@@ -49,14 +47,12 @@ import android.widget.ImageView;
 import android.widget.ListView;
 import android.widget.PopupMenu;
 import android.widget.ProgressBar;
-import android.widget.RelativeLayout;
 import android.widget.TextView;
 
 import androidx.core.app.ActivityCompat;
 import androidx.core.app.ActivityOptionsCompat;
 import androidx.core.view.ViewCompat;
 import androidx.recyclerview.widget.DefaultItemAnimator;
-import androidx.recyclerview.widget.DividerItemDecoration;
 import androidx.recyclerview.widget.ItemTouchHelper;
 import androidx.recyclerview.widget.LinearLayoutManager;
 import androidx.recyclerview.widget.RecyclerView;
@@ -914,13 +910,13 @@ public class HeadlinesFragment extends androidx.fragment.app.Fragment {
 					layoutId = R.layout.headlines_row_loadmore;
 					break;
 				case VIEW_UNREAD:
-					layoutId = m_compactLayoutMode ? R.layout.headlines_row_unread_compact : R.layout.headlines_row_unread;
+					layoutId = m_compactLayoutMode ? R.layout.headlines_row_compact_unread : R.layout.headlines_row_unread;
 					break;
 				case VIEW_SELECTED:
-					layoutId = m_compactLayoutMode ? R.layout.headlines_row_selected_compact : R.layout.headlines_row;
+					layoutId = m_compactLayoutMode ? R.layout.headlines_row_compact_selected : R.layout.headlines_row;
 					break;
 				case VIEW_SELECTED_UNREAD:
-					layoutId = m_compactLayoutMode ? R.layout.headlines_row_selected_unread_compact : R.layout.headlines_row_unread;
+					layoutId = m_compactLayoutMode ? R.layout.headlines_row_compact_selected_unread : R.layout.headlines_row_unread;
 					break;
 			}
 
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 bde4f52f..853f960e 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
@@ -1,14 +1,12 @@
 package org.fox.ttrss.offline;
 
 import android.app.Activity;
-import android.app.AlertDialog;
 import android.app.Dialog;
 import android.content.Context;
 import android.content.DialogInterface;
 import android.content.Intent;
 import android.content.SharedPreferences;
 import android.content.res.ColorStateList;
-import android.content.res.Resources.Theme;
 import android.database.Cursor;
 import android.database.sqlite.SQLiteStatement;
 import android.graphics.Paint;
@@ -42,7 +40,6 @@ import android.widget.ImageView;
 import android.widget.ListView;
 import android.widget.PopupMenu;
 import android.widget.ProgressBar;
-import android.widget.RelativeLayout;
 import android.widget.TextView;
 
 import com.amulyakhare.textdrawable.TextDrawable;
@@ -677,13 +674,13 @@ public class OfflineHeadlinesFragment extends Fragment implements OnItemClickLis
                         layoutId = R.layout.headlines_row_loadmore;
                         break;
                     case VIEW_UNREAD:
-                        layoutId = m_compactLayoutMode ? R.layout.headlines_row_unread_compact : R.layout.headlines_row_unread;
+                        layoutId = m_compactLayoutMode ? R.layout.headlines_row_compact_unread : R.layout.headlines_row_unread;
                         break;
                     case VIEW_SELECTED:
-                        layoutId = m_compactLayoutMode ? R.layout.headlines_row_selected_compact : R.layout.headlines_row;
+                        layoutId = m_compactLayoutMode ? R.layout.headlines_row_compact_selected : R.layout.headlines_row;
                         break;
                     case VIEW_SELECTED_UNREAD:
-                        layoutId = m_compactLayoutMode ? R.layout.headlines_row_selected_unread_compact : R.layout.headlines_row_unread;
+                        layoutId = m_compactLayoutMode ? R.layout.headlines_row_compact_selected_unread : R.layout.headlines_row_unread;
                         break;
                 }
 
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 3e9255b5..c12c732d 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
@@ -4,8 +4,8 @@
     xmlns:tools="http://schemas.android.com/tools"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
-    app:cardBackgroundColor="?attr/colorSurfaceContainerHighest"
-    android:backgroundTint="?colorSurfaceDim"
+    app:strokeWidth="0dp"
+    app:cardBackgroundColor="?colorTertiaryContainer"
     android:layout_height="wrap_content">
 
     <LinearLayout
@@ -28,7 +28,7 @@
             android:layout_height="21dp"
             android:layout_weight="0"
             android:scaleType="fitXY"
-            app:tint="?colorOnPrimaryContainer"
+            app:tint="?colorOnTertiaryContainer"
             android:src="?ic_rss_box" />
 
         <TextView
@@ -43,7 +43,7 @@
             android:paddingEnd="16dp"
             android:singleLine="true"
             tools:text="Feed title"
-            android:textColor="?colorPrimary"
+            android:textColor="?colorOnTertiaryContainer"
             android:textSize="14sp" />
 
         <TextView
diff --git a/org.fox.ttrss/src/main/res/layout/headlines_row_selected_compact.xml b/org.fox.ttrss/src/main/res/layout/headlines_row_compact_selected.xml
index 9b7db471..6030df54 100755
--- a/org.fox.ttrss/src/main/res/layout/headlines_row_selected_compact.xml
+++ b/org.fox.ttrss/src/main/res/layout/headlines_row_compact_selected.xml
@@ -8,7 +8,8 @@
     android:layout_width="fill_parent"
     android:layout_height="wrap_content"
     android:orientation="horizontal"
-    android:background="?colorPrimaryContainer"
+    android:background="?colorTertiaryContainer"
+    android:textColor="?colorOnTertiaryContainer"
     tools:ignore="HardcodedText" >
 
     <FrameLayout
@@ -50,7 +51,6 @@
             android:maxLines="2"
             android:ellipsize="end"
             tools:text="Sample entry title"
-            android:textColor="?colorOnPrimaryContainer"
             android:textSize="18sp"
             android:layout_span="2" />
 
@@ -62,7 +62,6 @@
             android:layout_width="match_parent"
             android:layout_height="match_parent"
             tools:text="Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua."
-            android:textColor="?colorOnPrimaryContainer"
             android:textSize="13sp"
             android:layout_span="2"
             android:paddingTop="4dp" />
@@ -82,7 +81,6 @@
                 android:singleLine="true"
                 tools:text="Example Feed"
                 android:textAlignment="viewStart"
-                android:textColor="?colorOnPrimaryContainer"
                 android:textSize="12sp"
                 android:layout_weight="0.5"
                 android:paddingTop="4dp" />
diff --git a/org.fox.ttrss/src/main/res/layout/headlines_row_selected_unread_compact.xml b/org.fox.ttrss/src/main/res/layout/headlines_row_compact_selected_unread.xml
index 7d083908..0d8d930d 100755
--- a/org.fox.ttrss/src/main/res/layout/headlines_row_selected_unread_compact.xml
+++ b/org.fox.ttrss/src/main/res/layout/headlines_row_compact_selected_unread.xml
@@ -8,7 +8,7 @@
     android:layout_width="fill_parent"
     android:layout_height="wrap_content"
     android:orientation="horizontal"
-    android:background="?colorPrimaryContainer"
+    android:background="?colorTertiaryContainer"
     tools:ignore="HardcodedText" >
 
     <FrameLayout
@@ -48,7 +48,6 @@
             android:maxLines="2"
             android:ellipsize="end"
             tools:text="Sample entry title"
-            android:textColor="?colorOnPrimaryContainer"
             android:textStyle="bold"
             android:textSize="18sp"
             android:layout_span="2" />
@@ -61,7 +60,6 @@
             android:layout_width="match_parent"
             android:layout_height="match_parent"
             tools:text="Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua."
-            android:textColor="?colorOnPrimaryContainer"
             android:textSize="13sp"
             android:layout_span="2"
             android:paddingTop="4dp" />
@@ -81,7 +79,6 @@
                 android:singleLine="true"
                 tools:text="Example Feed"
                 android:textAlignment="viewStart"
-                android:textColor="?colorOnPrimaryContainer"
                 android:textSize="12sp"
                 android:layout_weight="0.5"
                 android:paddingTop="4dp" />
diff --git a/org.fox.ttrss/src/main/res/layout/headlines_row_unread_compact.xml b/org.fox.ttrss/src/main/res/layout/headlines_row_compact_unread.xml
index 222d19d1..222d19d1 100755
--- a/org.fox.ttrss/src/main/res/layout/headlines_row_unread_compact.xml
+++ b/org.fox.ttrss/src/main/res/layout/headlines_row_compact_unread.xml