adjust layout of compact headline rows, disable dividers for now

5 files changed, 135 insertions, 220 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 52ef4327..175b417c 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
@@ -358,12 +358,12 @@ public class HeadlinesFragment extends androidx.fragment.app.Fragment {
 		m_list.setLayoutManager(m_layoutManager);
 		m_list.setItemAnimator(new DefaultItemAnimator());
 
-		if (m_compactLayoutMode) {
+		/* 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);
 
@@ -795,7 +795,6 @@ public class HeadlinesFragment extends androidx.fragment.app.Fragment {
 			menuButtonView = v.findViewById(R.id.article_menu_button);
 			flavorImageHolder = v.findViewById(R.id.flavorImageHolder);
 			flavorImageLoadingBar = v.findViewById(R.id.flavorImageLoadingBar);
-			headlineFooter = v.findViewById(R.id.headline_footer);
 			textImage = v.findViewById(R.id.text_image);
 			textChecked = v.findViewById(R.id.text_checked);
 			headlineHeader = v.findViewById(R.id.headline_header);
@@ -1191,6 +1190,12 @@ public class HeadlinesFragment extends androidx.fragment.app.Fragment {
 					holder.excerptView.setTextSize(TypedValue.COMPLEX_UNIT_SP, headlineFontSize);
 					holder.excerptView.setText(excerpt);
 
+					if (!excerpt.isEmpty()) {
+						holder.excerptView.setVisibility(View.VISIBLE);
+					} else {
+						holder.excerptView.setVisibility(View.GONE);
+					}
+
 					if (!canShowFlavorImage()) {
 						holder.excerptView.setPadding(holder.excerptView.getPaddingLeft(),
 								0,
diff --git a/org.fox.ttrss/src/main/res/layout/headlines_row_compact.xml b/org.fox.ttrss/src/main/res/layout/headlines_row_compact.xml
index fd328276..352aad91 100755
--- a/org.fox.ttrss/src/main/res/layout/headlines_row_compact.xml
+++ b/org.fox.ttrss/src/main/res/layout/headlines_row_compact.xml
@@ -4,21 +4,23 @@
     xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:id="@+id/headlines_row"
-    android:padding="@dimen/activity_horizontal_margin"
+    android:paddingTop="16dp"
+    android:paddingBottom="16dp"
+    android:paddingStart="16dp"
+    android:paddingEnd="8dp"
     android:layout_width="fill_parent"
     android:layout_height="wrap_content"
-    android:orientation="horizontal"
-    tools:ignore="HardcodedText" >
+    android:orientation="horizontal">
 
     <FrameLayout
-        android:layout_marginRight="16dp"
-        android:layout_gravity="center_vertical|left"
+        android:layout_gravity="center_vertical|start"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginEnd="16dp">
 
         <ImageView
             android:clickable="true"
+            android:focusable="true"
             android:layout_width="48dp"
             android:layout_height="48dp"
             android:layout_gravity="center"
@@ -36,7 +38,6 @@
     <LinearLayout
         android:layout_weight="1"
         android:orientation="vertical"
-        android:layout_gravity="center"
         android:layout_width="match_parent"
         android:layout_height="wrap_content">
 
@@ -44,94 +45,64 @@
             android:id="@+id/title"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:gravity="center_vertical"
-            android:textAlignment="viewStart"
             android:maxLines="2"
             android:ellipsize="end"
             tools:text="Sample entry title"
             android:textColor="?colorPrimary"
-            android:textSize="18sp"
-            android:layout_span="2" />
+            android:textSize="18sp" />
+
+        <TextView
+            android:id="@+id/feed_title"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:ellipsize="middle"
+            android:fontFamily="sans-serif-light"
+            android:singleLine="true"
+            tools:text="Example Feed AAA AAA AAAAAA AAAA AAAAA AA A A AA AA"
+            android:textColor="?colorSecondary"
+            android:textSize="12sp"
+            android:layout_marginTop="4dp" />
 
         <TextView
             android:id="@+id/excerpt"
             android:maxLines="2"
-            android:textAlignment="viewStart"
             android:ellipsize="end"
             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="?colorSecondary"
             android:textSize="13sp"
-            android:layout_span="2"
-            android:paddingTop="4dp" />
-
-        <LinearLayout
-            android:orientation="horizontal"
-            android:layout_width="fill_parent"
-            android:layout_height="fill_parent">
-
-            <TextView
-                android:id="@+id/feed_title"
-                android:layout_width="0dp"
-                android:layout_height="wrap_content"
-                android:ellipsize="middle"
-                android:fontFamily="sans-serif-light"
-                android:gravity="center_vertical"
-                android:singleLine="true"
-                tools:text="Example Feed AAA AAA AAAAAA AAAA AAAAA AA A A AA AA"
-                android:textAlignment="viewStart"
-                android:textColor="?colorSecondary"
-                android:textSize="12sp"
-                android:layout_weight="0.5"
-                android:paddingTop="4dp" />
-
-        </LinearLayout>
-
+            android:layout_marginTop="4dp" />
     </LinearLayout>
 
     <LinearLayout
-        android:id="@+id/headline_footer"
         android:orientation="vertical"
         android:layout_weight="0"
-        android:layout_width="wrap_content"
+        android:layout_width="48dp"
         android:layout_height="match_parent">
 
         <TextView
             android:id="@+id/date"
-            android:layout_width="wrap_content"
+            android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:fontFamily="sans-serif-light"
             android:singleLine="true"
             android:ellipsize="none"
-            android:layout_weight="1"
+            android:textAlignment="viewEnd"
+            android:layout_weight="0.5"
             tools:text="Jan 01"
-            android:textColor="?colorPrimary"
+            android:textColor="?colorSecondary"
             android:textSize="12sp"
             />
 
-
         <com.google.android.material.button.MaterialButton
             android:id="@+id/marked"
             style="?attr/materialIconButtonStyle"
             android:layout_width="wrap_content"
-            android:layout_gravity="bottom|end"
-            android:layout_height="wrap_content"
-            android:layout_weight="0"
-            android:clickable="true"
+            android:paddingEnd="0dp"
+            android:layout_gravity="end"
+            android:layout_height="24dp"
+            android:layout_weight="0.5"
             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
diff --git a/org.fox.ttrss/src/main/res/layout/headlines_row_compact_selected.xml b/org.fox.ttrss/src/main/res/layout/headlines_row_compact_selected.xml
index 6030df54..5721dcb8 100755
--- a/org.fox.ttrss/src/main/res/layout/headlines_row_compact_selected.xml
+++ b/org.fox.ttrss/src/main/res/layout/headlines_row_compact_selected.xml
@@ -4,16 +4,16 @@
     xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:id="@+id/headlines_row"
-    android:padding="@dimen/activity_horizontal_margin"
+    android:paddingTop="16dp"
+    android:paddingBottom="16dp"
+    android:paddingStart="16dp"
+    android:paddingEnd="8dp"
     android:layout_width="fill_parent"
     android:layout_height="wrap_content"
-    android:orientation="horizontal"
     android:background="?colorTertiaryContainer"
-    android:textColor="?colorOnTertiaryContainer"
-    tools:ignore="HardcodedText" >
+    android:orientation="horizontal">
 
     <FrameLayout
-        android:layout_marginRight="16dp"
         android:layout_gravity="center_vertical|start"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
@@ -21,6 +21,7 @@
 
         <ImageView
             android:clickable="true"
+            android:focusable="true"
             android:layout_width="48dp"
             android:layout_height="48dp"
             android:layout_gravity="center"
@@ -38,7 +39,6 @@
     <LinearLayout
         android:layout_weight="1"
         android:orientation="vertical"
-        android:layout_gravity="center"
         android:layout_width="match_parent"
         android:layout_height="wrap_content">
 
@@ -46,91 +46,63 @@
             android:id="@+id/title"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:gravity="center_vertical"
-            android:textAlignment="viewStart"
             android:maxLines="2"
             android:ellipsize="end"
             tools:text="Sample entry title"
-            android:textSize="18sp"
-            android:layout_span="2" />
+            android:textColor="?colorOnTertiaryContainer"
+            android:textSize="18sp" />
+
+        <TextView
+            android:id="@+id/feed_title"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:ellipsize="middle"
+            android:fontFamily="sans-serif-light"
+            android:singleLine="true"
+            tools:text="Example Feed AAA AAA AAAAAA AAAA AAAAA AA A A AA AA"
+            android:textColor="?colorOnTertiaryContainer"
+            android:textSize="12sp"
+            android:layout_marginTop="4dp" />
 
         <TextView
             android:id="@+id/excerpt"
             android:maxLines="2"
-            android:textAlignment="viewStart"
             android:ellipsize="end"
             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="?colorOnTertiaryContainer"
             android:textSize="13sp"
-            android:layout_span="2"
-            android:paddingTop="4dp" />
-
-        <LinearLayout
-            android:orientation="horizontal"
-            android:layout_width="fill_parent"
-            android:layout_height="fill_parent">
-
-            <TextView
-                android:id="@+id/feed_title"
-                android:layout_width="0dp"
-                android:layout_height="wrap_content"
-                android:ellipsize="middle"
-                android:fontFamily="sans-serif-light"
-                android:gravity="center_vertical"
-                android:singleLine="true"
-                tools:text="Example Feed"
-                android:textAlignment="viewStart"
-                android:textSize="12sp"
-                android:layout_weight="0.5"
-                android:paddingTop="4dp" />
-
-        </LinearLayout>
-
+            android:layout_marginTop="4dp" />
     </LinearLayout>
 
     <LinearLayout
-        android:id="@+id/headline_footer"
         android:orientation="vertical"
         android:layout_weight="0"
-        android:layout_width="wrap_content"
+        android:layout_width="48dp"
         android:layout_height="match_parent">
 
         <TextView
             android:id="@+id/date"
-            android:layout_width="wrap_content"
+            android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:fontFamily="sans-serif-light"
             android:singleLine="true"
             android:ellipsize="none"
-            android:layout_weight="1"
+            android:textAlignment="viewEnd"
+            android:layout_weight="0.5"
             tools:text="Jan 01"
             android:textColor="?colorSecondary"
             android:textSize="12sp"
             />
 
-
         <com.google.android.material.button.MaterialButton
             android:id="@+id/marked"
             style="?attr/materialIconButtonStyle"
             android:layout_width="wrap_content"
-            android:layout_gravity="bottom|end"
-            android:layout_height="wrap_content"
-            android:layout_weight="0"
-            android:clickable="true"
+            android:paddingEnd="0dp"
+            android:layout_height="24dp"
+            android:layout_weight="0.5"
             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
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
index 0d8d930d..06813e04 100755
--- 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
@@ -4,38 +4,41 @@
     xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:id="@+id/headlines_row"
-    android:padding="@dimen/activity_horizontal_margin"
+    android:paddingTop="16dp"
+    android:paddingBottom="16dp"
+    android:paddingStart="16dp"
+    android:paddingEnd="8dp"
     android:layout_width="fill_parent"
     android:layout_height="wrap_content"
-    android:orientation="horizontal"
     android:background="?colorTertiaryContainer"
-    tools:ignore="HardcodedText" >
+    android:orientation="horizontal">
 
     <FrameLayout
-        android:layout_marginRight="8dp"
         android:layout_gravity="center_vertical|start"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_marginEnd="8dp">
+        android:layout_marginEnd="16dp">
 
         <ImageView
             android:clickable="true"
+            android:focusable="true"
             android:layout_width="48dp"
             android:layout_height="48dp"
+            android:layout_gravity="center"
             android:id="@+id/text_image"/>
 
         <ImageView
             android:layout_width="48dp"
             android:layout_height="48dp"
             android:src="@drawable/check_sm"
-            android:id="@+id/text_checked"/>
+            android:id="@+id/text_checked"
+            android:layout_gravity="center" />
 
     </FrameLayout>
 
     <LinearLayout
         android:layout_weight="1"
         android:orientation="vertical"
-        android:layout_gravity="center"
         android:layout_width="match_parent"
         android:layout_height="wrap_content">
 
@@ -43,89 +46,65 @@
             android:id="@+id/title"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:gravity="center_vertical"
-            android:textAlignment="viewStart"
             android:maxLines="2"
             android:ellipsize="end"
             tools:text="Sample entry title"
+            android:textColor="?colorOnTertiaryContainer"
             android:textStyle="bold"
-            android:textSize="18sp"
-            android:layout_span="2" />
+            android:textSize="18sp" />
+
+        <TextView
+            android:id="@+id/feed_title"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:ellipsize="middle"
+            android:fontFamily="sans-serif-light"
+            android:singleLine="true"
+            tools:text="Example Feed AAA AAA AAAAAA AAAA AAAAA AA A A AA AA"
+            android:textColor="?colorOnTertiaryContainer"
+            android:textSize="12sp"
+            android:layout_marginTop="4dp" />
 
         <TextView
             android:id="@+id/excerpt"
             android:maxLines="2"
-            android:textAlignment="viewStart"
             android:ellipsize="end"
             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="?colorOnTertiaryContainer"
             android:textSize="13sp"
-            android:layout_span="2"
-            android:paddingTop="4dp" />
-
-        <LinearLayout
-            android:orientation="horizontal"
-            android:layout_width="fill_parent"
-            android:layout_height="fill_parent">
-
-            <TextView
-                android:id="@+id/feed_title"
-                android:layout_width="0dp"
-                android:layout_height="wrap_content"
-                android:ellipsize="middle"
-                android:fontFamily="sans-serif-light"
-                android:gravity="center_vertical"
-                android:singleLine="true"
-                tools:text="Example Feed"
-                android:textAlignment="viewStart"
-                android:textSize="12sp"
-                android:layout_weight="0.5"
-                android:paddingTop="4dp" />
-
-        </LinearLayout>
-
+            android:layout_marginTop="4dp" />
     </LinearLayout>
 
     <LinearLayout
-        android:id="@+id/headline_footer"
         android:orientation="vertical"
         android:layout_weight="0"
-        android:layout_width="wrap_content"
+        android:layout_width="48dp"
         android:layout_height="match_parent">
 
         <TextView
             android:id="@+id/date"
-            android:layout_width="wrap_content"
+            android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:fontFamily="sans-serif-light"
             android:singleLine="true"
             android:ellipsize="none"
-            android:layout_weight="1"
+            android:textAlignment="viewEnd"
+            android:layout_weight="0.5"
             tools:text="Jan 01"
             android:textColor="?colorSecondary"
-            android:textSize="12sp" />
+            android:textSize="12sp"
+            />
 
         <com.google.android.material.button.MaterialButton
             android:id="@+id/marked"
             style="?attr/materialIconButtonStyle"
             android:layout_width="wrap_content"
-            android:layout_gravity="bottom|end"
-            android:layout_height="wrap_content"
-            android:layout_weight="0"
+            android:paddingEnd="0dp"
+            android:layout_gravity="end"
+            android:layout_height="24dp"
+            android:layout_weight="0.5"
             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
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
index 222d19d1..6aa1bdcd 100755
--- 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
@@ -4,15 +4,16 @@
     xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:id="@+id/headlines_row"
-    android:padding="@dimen/activity_horizontal_margin"
+    android:paddingTop="16dp"
+    android:paddingBottom="16dp"
+    android:paddingStart="16dp"
+    android:paddingEnd="8dp"
     android:layout_width="fill_parent"
     android:layout_height="wrap_content"
-    android:orientation="horizontal"
     android:background="?colorSurfaceContainerLowest"
-    tools:ignore="HardcodedText" >
+    android:orientation="horizontal">
 
     <FrameLayout
-        android:layout_marginRight="16dp"
         android:layout_gravity="center_vertical|start"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
@@ -20,6 +21,7 @@
 
         <ImageView
             android:clickable="true"
+            android:focusable="true"
             android:layout_width="48dp"
             android:layout_height="48dp"
             android:layout_gravity="center"
@@ -37,7 +39,6 @@
     <LinearLayout
         android:layout_weight="1"
         android:orientation="vertical"
-        android:layout_gravity="center"
         android:layout_width="match_parent"
         android:layout_height="wrap_content">
 
@@ -45,78 +46,65 @@
             android:id="@+id/title"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:gravity="center_vertical"
-            android:textAlignment="viewStart"
             android:maxLines="2"
             android:ellipsize="end"
             tools:text="Sample entry title"
             android:textStyle="bold"
-            android:textSize="18sp"
-            android:layout_span="2" />
+            android:textSize="18sp" />
+
+        <TextView
+            android:id="@+id/feed_title"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:ellipsize="middle"
+            android:fontFamily="sans-serif-light"
+            android:singleLine="true"
+            tools:text="Example Feed AAA AAA AAAAAA AAAA AAAAA AA A A AA AA"
+            android:textColor="?colorSecondary"
+            android:textSize="12sp"
+            android:layout_marginTop="4dp" />
 
         <TextView
             android:id="@+id/excerpt"
             android:maxLines="2"
-            android:textAlignment="viewStart"
             android:ellipsize="end"
             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="?colorSecondary"
             android:textSize="13sp"
-            android:layout_span="2"
-            android:paddingTop="4dp" />
-
-        <LinearLayout
-            android:orientation="horizontal"
-            android:layout_width="fill_parent"
-            android:layout_height="fill_parent">
-
-            <TextView
-                android:id="@+id/feed_title"
-                android:layout_width="0dp"
-                android:layout_height="wrap_content"
-                android:ellipsize="middle"
-                android:fontFamily="sans-serif-light"
-                android:gravity="center_vertical"
-                android:singleLine="true"
-                tools:text="Example Feed AAA AAA AAAAAA AAAA AAAAA AA A A AA AA"
-                android:textAlignment="viewStart"
-                android:textSize="12sp"
-                android:layout_weight="0.5"
-                android:paddingTop="4dp" />
-
-        </LinearLayout>
+            android:layout_marginTop="4dp" />
 
     </LinearLayout>
 
     <LinearLayout
-        android:id="@+id/headline_footer"
         android:orientation="vertical"
         android:layout_weight="0"
-        android:layout_width="wrap_content"
+        android:layout_width="48dp"
         android:layout_height="match_parent">
 
         <TextView
             android:id="@+id/date"
-            android:layout_width="wrap_content"
+            android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:fontFamily="sans-serif-light"
-            android:textColor="?colorSecondary"
             android:singleLine="true"
             android:ellipsize="none"
-            android:layout_weight="1"
+            android:textAlignment="viewEnd"
+            android:layout_weight="0.5"
             tools:text="Jan 01"
-            android:textSize="12sp" />
+            android:textColor="?colorSecondary"
+            android:textSize="12sp"
+            />
 
         <com.google.android.material.button.MaterialButton
             android:id="@+id/marked"
             style="?attr/materialIconButtonStyle"
             android:layout_width="wrap_content"
-            android:layout_gravity="bottom|end"
-            android:layout_height="wrap_content"
-            android:layout_weight="0"
+            android:paddingEnd="0dp"
+            android:layout_gravity="end"
+            android:layout_height="24dp"
+            android:layout_weight="0.5"
             app:icon="?ic_star_outline" />
-
     </LinearLayout>
-
 </LinearLayout>
\ No newline at end of file