From 283bd84b73f38884ecd982da6972dd19e8103559 Mon Sep 17 00:00:00 2001 From: Andrew Dolgov Date: Thu, 8 May 2025 09:58:13 +0300 Subject: use tertiary colors for selected row views --- .../main/java/org/fox/ttrss/HeadlinesFragment.java | 10 +- .../ttrss/offline/OfflineHeadlinesFragment.java | 9 +- .../src/main/res/layout/feeds_row_selected.xml | 8 +- .../res/layout/headlines_row_compact_selected.xml | 136 ++++++++++++++++++++ .../headlines_row_compact_selected_unread.xml | 131 +++++++++++++++++++ .../res/layout/headlines_row_compact_unread.xml | 122 ++++++++++++++++++ .../res/layout/headlines_row_selected_compact.xml | 138 --------------------- .../headlines_row_selected_unread_compact.xml | 134 -------------------- .../res/layout/headlines_row_unread_compact.xml | 122 ------------------ 9 files changed, 399 insertions(+), 411 deletions(-) create mode 100755 org.fox.ttrss/src/main/res/layout/headlines_row_compact_selected.xml create mode 100755 org.fox.ttrss/src/main/res/layout/headlines_row_compact_selected_unread.xml create mode 100755 org.fox.ttrss/src/main/res/layout/headlines_row_compact_unread.xml delete mode 100755 org.fox.ttrss/src/main/res/layout/headlines_row_selected_compact.xml delete mode 100755 org.fox.ttrss/src/main/res/layout/headlines_row_selected_unread_compact.xml delete mode 100755 org.fox.ttrss/src/main/res/layout/headlines_row_unread_compact.xml (limited to 'org.fox.ttrss/src/main') 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"> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/org.fox.ttrss/src/main/res/layout/headlines_row_compact_selected_unread.xml b/org.fox.ttrss/src/main/res/layout/headlines_row_compact_selected_unread.xml new file mode 100755 index 00000000..0d8d930d --- /dev/null +++ b/org.fox.ttrss/src/main/res/layout/headlines_row_compact_selected_unread.xml @@ -0,0 +1,131 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/org.fox.ttrss/src/main/res/layout/headlines_row_compact_unread.xml b/org.fox.ttrss/src/main/res/layout/headlines_row_compact_unread.xml new file mode 100755 index 00000000..222d19d1 --- /dev/null +++ b/org.fox.ttrss/src/main/res/layout/headlines_row_compact_unread.xml @@ -0,0 +1,122 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file 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_selected_compact.xml deleted file mode 100755 index 9b7db471..00000000 --- a/org.fox.ttrss/src/main/res/layout/headlines_row_selected_compact.xml +++ /dev/null @@ -1,138 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file 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_selected_unread_compact.xml deleted file mode 100755 index 7d083908..00000000 --- a/org.fox.ttrss/src/main/res/layout/headlines_row_selected_unread_compact.xml +++ /dev/null @@ -1,134 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file 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_unread_compact.xml deleted file mode 100755 index 222d19d1..00000000 --- a/org.fox.ttrss/src/main/res/layout/headlines_row_unread_compact.xml +++ /dev/null @@ -1,122 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file -- cgit v1.2.3-54-g00ecf