From 8da85b9157ef4ffd8b04a8b817f7c6f51c641c68 Mon Sep 17 00:00:00 2001
From: Andrew Dolgov <noreply@fakecake.org>
Date: Thu, 16 Oct 2014 01:21:49 +0400
Subject: add headlines flavor images

---
 res/layout/headlines_row.xml                 | 27 ++++++++++-----
 res/layout/headlines_row_selected.xml        | 25 ++++++++++----
 res/layout/headlines_row_selected_unread.xml | 25 ++++++++++----
 res/layout/headlines_row_unread.xml          | 50 ++++++++++++++++++----------
 4 files changed, 87 insertions(+), 40 deletions(-)

(limited to 'res/layout')

diff --git a/res/layout/headlines_row.xml b/res/layout/headlines_row.xml
index 326ff49c..1d40e1bf 100644
--- a/res/layout/headlines_row.xml
+++ b/res/layout/headlines_row.xml
@@ -74,6 +74,24 @@
                 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"
@@ -83,14 +101,7 @@
             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"
diff --git a/res/layout/headlines_row_selected.xml b/res/layout/headlines_row_selected.xml
index 0418d7b8..332b239a 100644
--- a/res/layout/headlines_row_selected.xml
+++ b/res/layout/headlines_row_selected.xml
@@ -72,6 +72,24 @@
                 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"
@@ -81,13 +99,6 @@
             android:text="Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua."
             android:textColor="?headlineSelectedExcerptTextColor"
             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"
diff --git a/res/layout/headlines_row_selected_unread.xml b/res/layout/headlines_row_selected_unread.xml
index abca9eaf..553bb9f8 100644
--- a/res/layout/headlines_row_selected_unread.xml
+++ b/res/layout/headlines_row_selected_unread.xml
@@ -73,6 +73,24 @@
                 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"
@@ -82,13 +100,6 @@
             android:text="Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua."
             android:textColor="?headlineSelectedExcerptTextColor"
             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"
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
-- 
cgit v1.2.3-54-g00ecf