From 9c98f64e6bed0787a9f267f3a4ea2a3ceb506bdf Mon Sep 17 00:00:00 2001
From: Andrew Dolgov <fox@fakecake.org>
Date: Wed, 7 May 2025 12:27:25 +0300
Subject: drop some ripples and update compact headline views

---
 .../main/java/org/fox/ttrss/HeadlinesFragment.java | 34 +++++++++++++---------
 .../src/main/res/layout/fragment_article.xml       |  2 --
 .../headlines_row_selected_unread_compact.xml      |  7 +----
 .../res/layout/headlines_row_unread_compact.xml    | 17 +----------
 4 files changed, 23 insertions(+), 37 deletions(-)

(limited to 'org.fox.ttrss')

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 6cc92d87..2b92283d 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
@@ -72,6 +72,7 @@ import com.bumptech.glide.request.target.GlideDrawableImageViewTarget;
 import com.bumptech.glide.request.target.Target;
 import com.google.android.material.button.MaterialButton;
 import com.google.android.material.dialog.MaterialAlertDialogBuilder;
+import com.google.android.material.divider.MaterialDividerItemDecoration;
 import com.google.android.material.snackbar.Snackbar;
 import com.google.gson.JsonElement;
 
@@ -361,6 +362,13 @@ public class HeadlinesFragment extends androidx.fragment.app.Fragment {
 		m_list.setLayoutManager(m_layoutManager);
 		m_list.setItemAnimator(new DefaultItemAnimator());
 
+		if (m_compactLayoutMode) {
+			MaterialDividerItemDecoration materialDivider = new MaterialDividerItemDecoration(m_list.getContext(), m_layoutManager.getOrientation());
+			materialDivider.setDividerInsetStart(dpToPx(80));
+
+			m_list.addItemDecoration(materialDivider);
+		}
+
 		ArticleListAdapter adapter = new ArticleListAdapter(getActivity(), R.layout.headlines_row, m_articles);
 
 		m_adapter = new HeaderViewRecyclerAdapter(adapter);
@@ -1675,18 +1683,6 @@ public class HeadlinesFragment extends androidx.fragment.app.Fragment {
 			}
 		}
 
-		public int pxToDp(int px) {
-			DisplayMetrics displayMetrics = getContext().getResources().getDisplayMetrics();
-			int dp = Math.round(px / (displayMetrics.xdpi / DisplayMetrics.DENSITY_DEFAULT));
-			return dp;
-		}
-
-		public int dpToPx(int dp) {
-			DisplayMetrics displayMetrics = getContext().getResources().getDisplayMetrics();
-			int px = Math.round(dp * (displayMetrics.xdpi / DisplayMetrics.DENSITY_DEFAULT));
-			return px;
-		}
-
 		private void adjustTitleTextView(int score, TextView tv, int position) {
 			int viewType = getItemViewType(position);
 			if (origTitleColors[viewType] == null)
@@ -1839,7 +1835,19 @@ public class HeadlinesFragment extends androidx.fragment.app.Fragment {
         m_adapter.notifyDataSetChanged();
     }
 
-    @Override
+	public int pxToDp(int px) {
+		DisplayMetrics displayMetrics = getContext().getResources().getDisplayMetrics();
+		int dp = Math.round(px / (displayMetrics.xdpi / DisplayMetrics.DENSITY_DEFAULT));
+		return dp;
+	}
+
+	public int dpToPx(int dp) {
+		DisplayMetrics displayMetrics = getContext().getResources().getDisplayMetrics();
+		int px = Math.round(dp * (displayMetrics.xdpi / DisplayMetrics.DENSITY_DEFAULT));
+		return px;
+	}
+
+	@Override
 	public void onPause() {
 		super.onPause();
 
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 0c2593ab..3bca35de 100755
--- a/org.fox.ttrss/src/main/res/layout/fragment_article.xml
+++ b/org.fox.ttrss/src/main/res/layout/fragment_article.xml
@@ -81,7 +81,6 @@
                 <TextView
                     android:id="@+id/comments"
                     tools:text="comments"
-                    android:background="@drawable/ripple"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:textAlignment="viewStart"
@@ -94,7 +93,6 @@
                 <TextView
                     android:id="@+id/host"
                     tools:text="host"
-                    android:background="@drawable/ripple"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:textAlignment="viewStart"
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
index 5daace2a..7d083908 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_selected_unread_compact.xml
@@ -107,9 +107,7 @@
             android:layout_weight="1"
             tools:text="Jan 01"
             android:textColor="?colorSecondary"
-            android:textSize="12sp"
-            />
-
+            android:textSize="12sp" />
 
         <com.google.android.material.button.MaterialButton
             android:id="@+id/marked"
@@ -118,11 +116,8 @@
             android:layout_gravity="bottom|end"
             android:layout_height="wrap_content"
             android:layout_weight="0"
-            android:clickable="true"
             app:icon="?ic_star_outline" />
 
-
-
     </LinearLayout>
 
     <!-- <ImageView
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
index d4e274f2..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_unread_compact.xml
@@ -106,32 +106,17 @@
             android:ellipsize="none"
             android:layout_weight="1"
             tools:text="Jan 01"
-            android:textSize="12sp"
-            />
-
+            android:textSize="12sp" />
 
         <com.google.android.material.button.MaterialButton
             android:id="@+id/marked"
             style="?attr/materialIconButtonStyle"
-            android:background="@drawable/ripple"
             android:layout_width="wrap_content"
             android:layout_gravity="bottom|end"
             android:layout_height="wrap_content"
             android:layout_weight="0"
-            android:clickable="true"
             app:icon="?ic_star_outline" />
 
     </LinearLayout>
 
-    <!-- <ImageView
-        android:id="@+id/article_menu_button"
-        android:layout_gravity="center"
-        android:layout_width="wrap_content"
-        android:layout_height="16dp"
-        android:layout_weight="0"
-        android:paddingLeft="4dp"
-        android:paddingRight="4dp"
-        android:src="@drawable/ic_action_overflow" /> -->
-
-
 </LinearLayout>
\ No newline at end of file
-- 
cgit v1.2.3-54-g00ecf