use proper layout separation for normal and large screens

10 files changed, 188 insertions, 14 deletions

diff --git a/res/layout/headlines_row.xml b/res/layout-land/headlines_row.xml
index 4b66b747..4b66b747 100644
--- a/res/layout/headlines_row.xml
+++ b/res/layout-land/headlines_row.xml
diff --git a/res/layout/headlines_row_selected.xml b/res/layout-land/headlines_row_selected.xml
index fa7e7ad0..fa7e7ad0 100644
--- a/res/layout/headlines_row_selected.xml
+++ b/res/layout-land/headlines_row_selected.xml
diff --git a/res/layout/headlines_row_unread.xml b/res/layout-land/headlines_row_unread.xml
index e0aa00cf..e0aa00cf 100644
--- a/res/layout/headlines_row_unread.xml
+++ b/res/layout-land/headlines_row_unread.xml
diff --git a/res/layout-large/headlines_row.xml b/res/layout-large/headlines_row.xml
new file mode 100644
index 00000000..4b66b747
--- /dev/null
+++ b/res/layout-large/headlines_row.xml
@@ -0,0 +1,45 @@
+<?xml version="1.0" encoding="utf-8"?>

+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"

+    android:layout_width="fill_parent"

+    android:gravity="center_vertical"

+    android:background="?headlineNormalBackground"

+    android:id="@+id/headlines_row" android:orientation="horizontal" android:layout_height="wrap_content">

+    <ImageView android:background="?headlineSeparatorNormal" android:paddingRight="4dip" android:layout_height="match_parent" android:layout_width="wrap_content"></ImageView>

+    <CheckBox android:focusable="false"

+         android:paddingLeft="6dip" android:paddingRight="6dip"  android:layout_height="wrap_content" android:layout_width="wrap_content" android:id="@+id/selected"></CheckBox>
+    <LinearLayout android:orientation="vertical" android:id="@+id/linearLayout1" android:layout_weight="1" android:layout_width="match_parent" android:layout_height="wrap_content">
+        <TextView android:singleLine="true" android:ellipsize="end" android:layout_width="match_parent" android:layout_height="match_parent" android:id="@+id/title" android:text="{Title...}" android:textSize="16sp"></TextView>
+        <TextView android:layout_width="match_parent" android:layout_height="match_parent" android:id="@+id/excerpt" android:text="{Content excerpt...}" android:textSize="13sp" android:textColor="#909090"></TextView>
+    </LinearLayout>
+    <LinearLayout
+        android:id="@+id/linerLayout3"
+        android:layout_width="wrap_content" android:gravity="center" android:padding="3dip" 
+        android:layout_height="wrap_content" android:orientation="vertical">
+        <TextView android:layout_width="wrap_content" android:layout_height="wrap_content" android:textColor="#909090" android:textSize="13sp" android:id="@+id/date" android:text="Jan 01"></TextView>
+        <LinearLayout

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

+            android:layout_width="wrap_content"

+            android:gravity="center"

+            android:paddingRight="2sp"

+            android:layout_height="wrap_content" >

+

+            <ImageView

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

+                android:layout_width="wrap_content"

+                android:layout_height="wrap_content"

+                android:clickable="true"

+                android:src="@android:drawable/star_off" >

+            </ImageView>

+

+            <ImageView

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

+                android:layout_width="wrap_content"

+                android:layout_height="wrap_content"

+                android:clickable="true"

+                android:src="@drawable/ic_rss_bw" >

+            </ImageView>

+        </LinearLayout>

+            

+    </LinearLayout>

+                   

+</LinearLayout>
\ No newline at end of file
diff --git a/res/layout-large/headlines_row_selected.xml b/res/layout-large/headlines_row_selected.xml
new file mode 100644
index 00000000..fa7e7ad0
--- /dev/null
+++ b/res/layout-large/headlines_row_selected.xml
@@ -0,0 +1,95 @@
+<?xml version="1.0" encoding="utf-8"?>

+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"

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

+    android:layout_width="fill_parent"

+    android:layout_height="wrap_content"

+    android:background="?headlineSelectedBackground"

+    android:gravity="center_vertical"

+    android:orientation="horizontal" >

+

+    <ImageView

+        android:layout_width="wrap_content"

+        android:layout_height="match_parent"

+        android:background="?headlineSeparatorSelected"

+        android:paddingRight="4dip" >

+    </ImageView>

+

+    <CheckBox

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

+        android:layout_width="wrap_content"

+        android:layout_height="wrap_content"

+        android:focusable="false"

+        android:paddingLeft="6dip"

+        android:paddingRight="6dip" >

+    </CheckBox>

+

+    <LinearLayout

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

+        android:layout_width="match_parent"

+        android:layout_height="wrap_content"

+        android:layout_weight="1"

+        android:orientation="vertical" >

+

+        <TextView

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

+            android:layout_width="match_parent"

+            android:layout_height="match_parent"

+            android:ellipsize="end"

+            android:singleLine="true"

+            android:text="{Title...}"

+            android:textSize="16sp" >

+        </TextView>

+

+        <TextView

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

+            android:layout_width="match_parent"

+            android:layout_height="match_parent"

+            android:text="{Content excerpt...}"

+            android:textColor="#909090"

+            android:textSize="13sp" >

+        </TextView>

+    </LinearLayout>

+

+    <LinearLayout

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

+        android:layout_width="wrap_content"

+        android:layout_height="wrap_content"

+        android:gravity="center"

+        android:orientation="vertical"

+        android:padding="3dip" >

+

+        <TextView

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

+            android:layout_width="wrap_content"

+            android:layout_height="wrap_content"

+            android:text="Jan 01"

+            android:textColor="#909090"

+            android:textSize="13sp" >

+        </TextView>

+

+        <LinearLayout

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

+            android:layout_width="wrap_content"

+            android:gravity="center"

+            android:paddingRight="2sp"

+            android:layout_height="wrap_content" >

+

+            <ImageView

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

+                android:layout_width="wrap_content"

+                android:layout_height="wrap_content"

+                android:clickable="true"

+                android:src="@android:drawable/star_off" >

+            </ImageView>

+

+            <ImageView

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

+                android:layout_width="wrap_content"

+                android:layout_height="wrap_content"

+                android:clickable="true"

+                android:src="@drawable/ic_rss_bw" >

+            </ImageView>

+        </LinearLayout>

+    </LinearLayout>

+

+</LinearLayout>
\ No newline at end of file
diff --git a/res/layout-large/headlines_row_unread.xml b/res/layout-large/headlines_row_unread.xml
new file mode 100644
index 00000000..e0aa00cf
--- /dev/null
+++ b/res/layout-large/headlines_row_unread.xml
@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="utf-8"?>

+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"

+    android:layout_width="fill_parent"

+    android:gravity="center_vertical"

+    android:background="?headlineUnreadBackground"

+    android:id="@+id/headlines_row" android:orientation="horizontal" android:layout_height="wrap_content">

+        <ImageView android:background="?headlineSeparatorUnread" android:paddingRight="4dip" android:layout_height="match_parent" android:layout_width="wrap_content"></ImageView>

+    <CheckBox android:focusable="false"

+         android:paddingLeft="6dip" android:paddingRight="6dip"  android:layout_height="wrap_content" android:layout_width="wrap_content" android:id="@+id/selected"></CheckBox>
+        
+        <LinearLayout android:layout_weight="1" android:layout_height="wrap_content" android:id="@+id/linearLayout1" android:orientation="vertical" android:layout_width="match_parent">
+            <TextView android:singleLine="true" android:ellipsize="end" android:id="@+id/title" android:textSize="16sp" android:text="{Title...}" android:layout_width="match_parent" android:layout_height="match_parent"></TextView>
+            <TextView android:id="@+id/excerpt" android:textSize="13sp" android:textColor="#909090" android:text="{Content excerpt...}" android:layout_width="match_parent" android:layout_height="match_parent"></TextView>
+        </LinearLayout>

+	

+	    <LinearLayout

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

+        android:layout_width="wrap_content" android:gravity="center" android:padding="3dip" 

+        android:layout_height="wrap_content" android:orientation="vertical">

+        <TextView android:layout_width="wrap_content" android:layout_height="wrap_content" android:textColor="#909090" android:textSize="13sp" android:id="@+id/date" android:text="Jan 01"></TextView>

+        <LinearLayout

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

+            android:layout_width="wrap_content"

+            android:gravity="center"

+            android:paddingRight="2sp"

+            android:layout_height="wrap_content" >

+

+            <ImageView

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

+                android:layout_width="wrap_content"

+                android:layout_height="wrap_content"

+                android:clickable="true"

+                android:src="@android:drawable/star_off" >

+            </ImageView>

+

+            <ImageView

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

+                android:layout_width="wrap_content"

+                android:layout_height="wrap_content"

+                android:clickable="true"

+                android:src="@drawable/ic_rss_bw" >

+            </ImageView>

+        </LinearLayout>

+            

+    </LinearLayout>

+	                   

+</LinearLayout>
\ No newline at end of file
diff --git a/res/layout-port/headlines_row_small.xml b/res/layout-port/headlines_row.xml
index 772184dd..772184dd 100644
--- a/res/layout-port/headlines_row_small.xml
+++ b/res/layout-port/headlines_row.xml
diff --git a/res/layout-port/headlines_row_small_selected.xml b/res/layout-port/headlines_row_selected.xml
index 59658b01..59658b01 100644
--- a/res/layout-port/headlines_row_small_selected.xml
+++ b/res/layout-port/headlines_row_selected.xml
diff --git a/res/layout-port/headlines_row_small_unread.xml b/res/layout-port/headlines_row_unread.xml
index 196ee8e2..196ee8e2 100644
--- a/res/layout-port/headlines_row_small_unread.xml
+++ b/res/layout-port/headlines_row_unread.xml
diff --git a/res/menu/main_menu.xml b/res/menu/main_menu.xml
index 09a7050d..bbdb0904 100644
--- a/res/menu/main_menu.xml
+++ b/res/menu/main_menu.xml
@@ -31,24 +31,11 @@
 
         <group android:id="@+id/menu_group_headlines" >
 
-            <!--  <item
-                android:id="@+id/load_more_articles"
-                android:icon="@android:drawable/ic_menu_more"
-                android:showAsAction="ifRoom|withText"
-                android:title="@string/load_more_articles"/> -->
-
             <item
                 android:id="@+id/headlines_mark_as_read"
-                android:icon="@android:drawable/ic_menu_tick"
-                android:showAsAction="ifRoom|withText"
+                android:icon="@drawable/ic_menu_tick"
                 android:title="@string/headlines_mark_as_read"/>
 
-            <!--  <item
-                android:id="@+id/show_all_articles"
-                android:icon="@android:drawable/ic_menu_agenda"
-                android:showAsAction=""
-                android:title="@string/show_all_articles"/> -->
-
             <item
                 android:id="@+id/headlines_select"
                 android:icon="@drawable/ic_menu_database"