headline layout tweaks

1 files changed, 72 insertions, 66 deletions

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 58d2051c..627dba0b 100755
--- a/org.fox.ttrss/src/main/res/layout/headlines_row.xml
+++ b/org.fox.ttrss/src/main/res/layout/headlines_row.xml
@@ -28,96 +28,102 @@
                     android:id="@+id/flavorImageLoadingBar"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:layout_gravity="center" />
-
-                <org.fox.ttrss.util.EnlargingImageView
-                    android:id="@+id/flavor_image"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:layout_below="@+id/headline_header"
                     android:layout_gravity="center"
-                    android:adjustViewBounds="true"
-                    android:cropToPadding="true"
-                    android:scaleType="fitCenter"
-                    android:src="@drawable/drawer_header"
                     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" />
-
-                <TextView
-                    android:id="@+id/flavor_image_prompt"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:layout_gravity="bottom"
-                    android:background="#90000000"
-                    android:gravity="center"
-                    android:text="@string/flavor_image_prompt"
-                    android:textAppearance="?android:attr/textAppearanceSmall"
-                    android:textColor="@android:color/primary_text_dark"
-                    android:visibility="gone" />
+                    android:visibility="visible" />
 
                 <RelativeLayout
-                    android:id="@+id/headline_header"
                     android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:background="#ccffffff"
-                    android:padding="16dp">
+                    android:layout_height="wrap_content">
 
-                    <TextView
-                        android:id="@+id/title"
+                    <org.fox.ttrss.util.EnlargingImageView
+                        android:id="@+id/flavor_image"
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
-                        android:layout_span="2"
-                        android:gravity="center_vertical"
-                        android:paddingBottom="8dp"
-                        android:singleLine="false"
-                        android:text="Sample entry title"
-                        android:textColor="?headlineExcerptTextColor"
-                        android:textSize="18sp"
-                        android:textStyle="normal" />
-
-                    <LinearLayout
+                        android:layout_gravity="center"
+                        android:adjustViewBounds="true"
+                        android:cropToPadding="true"
+                        android:scaleType="fitCenter"
+                        android:src="@drawable/drawer_header"
+                        android:visibility="visible"
+                        android:layout_centerHorizontal="true" />
+
+                    <RelativeLayout
+                        android:id="@+id/headline_header"
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
-                        android:layout_below="@+id/title"
-                        android:orientation="horizontal">
+                        android:background="#ccffffff"
+                        android:padding="16dp">
 
                         <TextView
-                            android:id="@+id/feed_title"
-                            android:layout_width="0dp"
+                            android:id="@+id/title"
+                            android:layout_width="match_parent"
                             android:layout_height="wrap_content"
-                            android:layout_weight="0.5"
-                            android:ellipsize="end"
-                            android:fontFamily="sans-serif-light"
+                            android:layout_span="2"
                             android:gravity="center_vertical"
-                            android:singleLine="true"
-                            android:text="Example Feed AAA AAA AAAAAA AAAA AAAAA AA A A AA AA"
-                            android:textColor="?headlineSecondaryTextColor"
-                            android:textSize="12sp" />
-
-                        <TextView
-                            android:id="@+id/date"
-                            android:layout_width="0dp"
+                            android:paddingBottom="8dp"
+                            android:singleLine="false"
+                            android:text="Sample entry title"
+                            android:textColor="?headlineExcerptTextColor"
+                            android:textSize="18sp"
+                            android:textStyle="normal" />
+
+                        <LinearLayout
+                            android:layout_width="match_parent"
                             android:layout_height="wrap_content"
-                            android:layout_weight="0.5"
-                            android:ellipsize="none"
-                            android:fontFamily="sans-serif-light"
-                            android:gravity="right|center_vertical"
-                            android:singleLine="true"
-                            android:text="Jan 01, 12:00, 1970"
-                            android:textColor="?headlineSecondaryTextColor"
-                            android:textSize="12sp" />
-
-                    </LinearLayout>
+                            android:layout_below="@+id/title"
+                            android:orientation="horizontal">
+
+                            <TextView
+                                android:id="@+id/feed_title"
+                                android:layout_width="0dp"
+                                android:layout_height="wrap_content"
+                                android:layout_weight="0.5"
+                                android:ellipsize="end"
+                                android:fontFamily="sans-serif-light"
+                                android:gravity="center_vertical"
+                                android:singleLine="true"
+                                android:text="Example Feed AAA AAA AAAAAA AAAA AAAAA AA A A AA AA"
+                                android:textColor="?headlineSecondaryTextColor"
+                                android:textSize="12sp" />
+
+                            <TextView
+                                android:id="@+id/date"
+                                android:layout_width="0dp"
+                                android:layout_height="wrap_content"
+                                android:layout_weight="0.5"
+                                android:ellipsize="none"
+                                android:fontFamily="sans-serif-light"
+                                android:gravity="right|center_vertical"
+                                android:singleLine="true"
+                                android:text="Jan 01, 12:00, 1970"
+                                android:textColor="?headlineSecondaryTextColor"
+                                android:textSize="12sp" />
+
+                        </LinearLayout>
+                    </RelativeLayout>
                 </RelativeLayout>
 
+                <TextView
+                    android:id="@+id/flavor_image_prompt"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_gravity="bottom"
+                    android:background="#90000000"
+                    android:gravity="center"
+                    android:text="@string/flavor_image_prompt"
+                    android:textAppearance="?android:attr/textAppearanceSmall"
+                    android:textColor="@android:color/primary_text_dark"
+                    android:visibility="visible" />
+
             </FrameLayout>
         </TableRow>