From d9e3c77419989897c26f0156720058a54a61c2f5 Mon Sep 17 00:00:00 2001
From: Andrew Dolgov <noreply@fakecake.org>
Date: Fri, 10 Jul 2015 23:09:02 +0300
Subject: [PATCH] headline layout fixes

---
 .../java/org/fox/ttrss/HeadlinesFragment.java |  2 --
 .../src/main/res/layout/headlines_row.xml     |  5 ++--
 .../main/res/layout/headlines_row_unread.xml  | 23 +++++++++----------
 3 files changed, 14 insertions(+), 16 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 289ffed6..8994b46d 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
@@ -1395,8 +1395,6 @@ public class HeadlinesFragment extends Fragment implements OnItemClickListener,
 
 				lp.addRule(RelativeLayout.BELOW, R.id.headline_header);
 
-				if (w < h) lp.topMargin = dpToPx(8);
-
 			} else {
 				lp.addRule(RelativeLayout.BELOW, 0);
 				lp.topMargin = 0;
diff --git a/org.fox.ttrss/src/main/res/layout/headlines_row.xml b/org.fox.ttrss/src/main/res/layout/headlines_row.xml
index 9916187c..b5764477 100755
--- a/org.fox.ttrss/src/main/res/layout/headlines_row.xml
+++ b/org.fox.ttrss/src/main/res/layout/headlines_row.xml
@@ -48,13 +48,14 @@
                         android:id="@+id/flavor_image"
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
+                        android:layout_centerHorizontal="true"
                         android:layout_gravity="center"
                         android:adjustViewBounds="true"
+                        android:background="@android:color/transparent"
                         android:cropToPadding="true"
                         android:scaleType="fitCenter"
                         android:src="@drawable/drawer_header"
-                        android:visibility="visible"
-                        android:layout_centerHorizontal="true" />
+                        android:visibility="visible" />
 
                     <RelativeLayout
                         android:id="@+id/headline_header"
diff --git a/org.fox.ttrss/src/main/res/layout/headlines_row_unread.xml b/org.fox.ttrss/src/main/res/layout/headlines_row_unread.xml
index 56579318..fba42d4f 100755
--- a/org.fox.ttrss/src/main/res/layout/headlines_row_unread.xml
+++ b/org.fox.ttrss/src/main/res/layout/headlines_row_unread.xml
@@ -2,8 +2,8 @@
 <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
     android:id="@+id/headlines_row"
-    android:layout_width="fill_parent"
-    android:layout_height="wrap_content"
+    android:layout_width="wrap_content"
+    android:layout_height="match_parent"
     android:background="?headlineUnreadBackground"
     tools:ignore="HardcodedText">
 
@@ -29,33 +29,34 @@
                     android:id="@+id/flavorImageLoadingBar"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:layout_gravity="center" />
+                    android:layout_gravity="center"
+                    android:visibility="visible" />
 
                 <ImageView
                     android:id="@+id/flavor_video_play"
                     android:layout_width="match_parent"
-                    android:layout_height="match_parent"
+                    android:layout_height="fill_parent"
                     android:layout_gravity="center"
                     android:scaleType="fitXY"
                     android:src="@drawable/flavor_video_play"
-                    android:visibility="gone" />
+                    android:visibility="visible" />
 
                 <RelativeLayout
                     android:layout_width="match_parent"
-                    android:layout_height="match_parent">
+                    android:layout_height="wrap_content">
 
                     <org.fox.ttrss.util.EnlargingImageView
                         android:id="@+id/flavor_image"
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
+                        android:layout_centerHorizontal="true"
                         android:layout_gravity="center"
                         android:adjustViewBounds="true"
+                        android:background="@android:color/transparent"
                         android:cropToPadding="true"
                         android:scaleType="fitCenter"
                         android:src="@drawable/drawer_header"
-                        android:visibility="visible"
-                        android:layout_alignParentLeft="true"
-                        android:layout_alignParentStart="true" />
+                        android:visibility="visible" />
 
                     <RelativeLayout
                         android:id="@+id/headline_header"
@@ -141,8 +142,6 @@
                 android:lineSpacingExtra="2sp"
                 android:maxLines="5"
                 android:padding="16dp"
-                android:paddingBottom="8dp"
-                android:paddingTop="8dp"
                 android:text="Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua."
                 android:textColor="?headlineExcerptTextColor"
                 android:textSize="13sp" />
@@ -202,7 +201,7 @@
                     android:clickable="true"
                     android:paddingLeft="4dp"
                     android:paddingRight="4dp"
-                    android:src="?ic_checkbox_marked" />
+                    android:src="?ic_rss_box" />
 
                 <ImageView
                     android:id="@+id/article_menu_button"