add headlines flavor images

1 files changed, 32 insertions, 18 deletions

diff --git a/res/layout/headlines_row_unread.xml b/res/layout/headlines_row_unread.xml
index b54f91d6..70fc7a9e 100644
--- a/res/layout/headlines_row_unread.xml
+++ b/res/layout/headlines_row_unread.xml
@@ -14,7 +14,10 @@
         android:layout_height="match_parent"

         android:background="?headlineUnreadBackground"

         android:orientation="vertical"

-        android:paddingTop="6dp" android:paddingLeft="6dp" android:paddingRight="6dp" android:paddingBottom="2dp" > >

+        android:paddingBottom="2dp"

+        android:paddingLeft="6dp"

+        android:paddingRight="6dp"

+        android:paddingTop="6dp" >

 

         <LinearLayout

             android:id="@+id/linearLayout6"

@@ -51,16 +54,16 @@
                 android:layout_height="wrap_content"

                 android:layout_weight="1"

                 android:ellipsize="end"

+                android:fontFamily="sans-serif-light"

                 android:gravity="center_vertical"

                 android:singleLine="true"

-                android:fontFamily="sans-serif-light"

-                android:text="Example Feed"                

+                android:text="Example Feed"

                 android:textColor="?headlineSecondaryTextColor"

                 android:textSize="12sp" />

 

             <TextView

                 android:id="@+id/date"

-                android:layout_width="wrap_content"                

+                android:layout_width="wrap_content"

                 android:layout_height="wrap_content"

                 android:layout_weight="1"

                 android:fontFamily="sans-serif-light"

@@ -70,23 +73,34 @@
                 android:textSize="12sp" />

         </LinearLayout>

 

+        <FrameLayout

+            android:paddingTop="3dp"

+            android:id="@+id/flavorImageHolder"

+            android:layout_width="match_parent"

+            android:layout_gravity="center"

+            android:layout_height="wrap_content" >

+

+            <ImageView

+                android:id="@+id/flavor_image"

+                android:layout_width="wrap_content"

+                android:layout_height="wrap_content"

+                android:adjustViewBounds="true"

+                android:maxHeight="128dp"

+                android:scaleType="centerInside"

+                android:src="@null"

+                android:visibility="gone" />

+        </FrameLayout>

+

         <TextView

             android:id="@+id/excerpt"

             android:layout_width="match_parent"

             android:layout_height="match_parent"

-            android:paddingTop="3dp"

             android:lineSpacingExtra="2sp"

+            android:paddingTop="3dp"

             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" />

 

-        <WebView

-            android:id="@+id/content"

-            android:layout_width="match_parent"

-            android:layout_height="match_parent"

-            android:paddingTop="3dp"

-            android:visibility="gone" />

-        

         <LinearLayout

             android:layout_width="match_parent"

             android:layout_height="wrap_content"

@@ -95,7 +109,7 @@
             <CheckBox

                 android:id="@+id/selected"

                 android:layout_width="wrap_content"

-                android:layout_height="wrap_content"                

+                android:layout_height="wrap_content"

                 android:layout_weight="0"

                 android:focusable="false" />

 

@@ -105,30 +119,30 @@
                 android:layout_height="match_parent"

                 android:layout_weight="1"

                 android:ellipsize="end"

+                android:fontFamily="sans-serif-light"

                 android:gravity="center_vertical"

                 android:singleLine="true"

                 android:text="by Author"

-                android:fontFamily="sans-serif-light"

-                android:textStyle="italic"

                 android:textColor="?headlineSecondaryTextColor"

-                android:textSize="12sp" />

+                android:textSize="12sp"

+                android:textStyle="italic" />

 

             <ImageView

                 android:id="@+id/marked"

                 android:layout_width="wrap_content"

                 android:layout_height="wrap_content"

+                android:layout_marginRight="8dp"

                 android:layout_weight="0"

                 android:clickable="true"

-                android:layout_marginRight="8dp"

                 android:src="@drawable/ic_star_empty" />

 

             <ImageView

                 android:id="@+id/published"

                 android:layout_width="wrap_content"

                 android:layout_height="wrap_content"

+                android:layout_marginRight="6dp"

                 android:layout_weight="0"

                 android:clickable="true"

-                android:layout_marginRight="6dp"

                 android:src="@drawable/ic_unpublished" />

 

             <ImageView