From ef8fb0f7e8ea243484a5ce6d0bd63b075d78499e Mon Sep 17 00:00:00 2001
From: Andrew Dolgov <fox@madoka.volgo-balt.ru>
Date: Tue, 19 Mar 2013 14:44:11 +0400
Subject: implement different resources for selected and selected+unread
 headlines (refs #595)

---
 res/layout-port/headlines_row_selected.xml         |   3 +-
 res/layout-port/headlines_row_selected_unread.xml  |  98 +++++++++++++++++++
 res/layout-sw600dp-port/headlines_row_selected.xml |   3 +-
 .../headlines_row_selected_unread.xml              |  81 ++++++++++++++++
 res/layout-sw600dp/headlines_row_selected.xml      |   2 +-
 .../headlines_row_selected_unread.xml              |  94 ++++++++++++++++++
 res/layout/headlines_row_selected.xml              |   2 +-
 res/layout/headlines_row_selected_unread.xml       | 106 +++++++++++++++++++++
 8 files changed, 383 insertions(+), 6 deletions(-)
 create mode 100644 res/layout-port/headlines_row_selected_unread.xml
 create mode 100644 res/layout-sw600dp-port/headlines_row_selected_unread.xml
 create mode 100644 res/layout-sw600dp/headlines_row_selected_unread.xml
 create mode 100644 res/layout/headlines_row_selected_unread.xml

(limited to 'res')

diff --git a/res/layout-port/headlines_row_selected.xml b/res/layout-port/headlines_row_selected.xml
index 07119bf7..6ea9953f 100644
--- a/res/layout-port/headlines_row_selected.xml
+++ b/res/layout-port/headlines_row_selected.xml
@@ -14,7 +14,6 @@
             android:layout_weight="1"
             android:orientation="vertical"
             android:padding="3dip" >
-
 
             <TextView
                 android:id="@+id/title"
@@ -25,7 +24,7 @@
                 android:text="There are many variations of passages of Lorem Ipsum available"
                 android:textColor="?headlineSelectedTextColor"
                 android:textSize="16sp"
-                android:textStyle="bold" />
+                android:textStyle="normal" />
 
             <TextView
                 android:id="@+id/feed_title"
diff --git a/res/layout-port/headlines_row_selected_unread.xml b/res/layout-port/headlines_row_selected_unread.xml
new file mode 100644
index 00000000..07119bf7
--- /dev/null
+++ b/res/layout-port/headlines_row_selected_unread.xml
@@ -0,0 +1,98 @@
+<?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="?headlineSelectedBackgroundSolid"
+    android:gravity="center_vertical"
+    android:orientation="vertical" >
+
+        <LinearLayout
+            android:id="@+id/linearLayout1"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_weight="1"
+            android:orientation="vertical"
+            android:padding="3dip" >
+
+
+            <TextView
+                android:id="@+id/title"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:ellipsize="end"
+                android:singleLine="false"
+                android:text="There are many variations of passages of Lorem Ipsum available"
+                android:textColor="?headlineSelectedTextColor"
+                android:textSize="16sp"
+                android:textStyle="bold" />
+
+            <TextView
+                android:id="@+id/feed_title"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_weight="0"
+                android:ellipsize="end"
+                android:gravity="right"
+                android:singleLine="true"
+                android:text="{Feed title...}"
+                android:textColor="?headlineSelectedExcerptTextColor"
+                android:textSize="10sp" />
+
+            <TextView
+                android:id="@+id/excerpt"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_weight="1"
+                android:text="Neque porro quisquam est qui dolorem ipsum quia dolor sit amet, consectetur, adipisci velit..."
+                android:textColor="?headlineSelectedExcerptTextColor"
+                android:textSize="13sp" />
+
+
+            <LinearLayout
+                android:id="@+id/linearLayout4"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_weight="0"
+                android:gravity="center"
+                android:orientation="horizontal"
+                android:paddingRight="4dp" >
+
+                <CheckBox
+                    android:id="@+id/selected"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_weight="0"
+                    android:focusable="false" />
+
+
+
+                <TextView
+                    android:id="@+id/date"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_weight="1"
+                    android:text="Jan 01, 00:00"
+                    android:textColor="?headlineSelectedExcerptTextColor"
+                    android:textSize="10sp"
+                    android:textStyle="italic" />
+
+                <ImageView
+                    android:id="@+id/marked"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_weight="0"
+                    android:clickable="true"
+                    android:src="@android:drawable/star_off" />
+
+                <ImageView
+                    android:id="@+id/published"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_weight="0"
+                    android:clickable="true"
+                    android:src="@drawable/ic_rss_bw" />
+            </LinearLayout>
+        </LinearLayout>
+
+</LinearLayout>
\ No newline at end of file
diff --git a/res/layout-sw600dp-port/headlines_row_selected.xml b/res/layout-sw600dp-port/headlines_row_selected.xml
index 0805077d..cdcc20e7 100644
--- a/res/layout-sw600dp-port/headlines_row_selected.xml
+++ b/res/layout-sw600dp-port/headlines_row_selected.xml
@@ -29,7 +29,6 @@
             android:layout_height="wrap_content"
             android:layout_weight="1"
             android:orientation="vertical" >
-
 
             <TextView
                 android:id="@+id/title"
@@ -40,7 +39,7 @@
                 android:text="{Title...}"
                 android:textColor="?headlineSelectedTextColor"
                 android:textSize="16sp"
-                android:textStyle="bold" >
+                android:textStyle="normal" >
 
             </TextView>
 
diff --git a/res/layout-sw600dp-port/headlines_row_selected_unread.xml b/res/layout-sw600dp-port/headlines_row_selected_unread.xml
new file mode 100644
index 00000000..0805077d
--- /dev/null
+++ b/res/layout-sw600dp-port/headlines_row_selected_unread.xml
@@ -0,0 +1,81 @@
+<?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="?headlineSelectedBackgroundSolid"
+    android:padding="4sp"
+    android:orientation="vertical" >
+
+    <LinearLayout
+        android:id="@+id/linearLayout6"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:gravity="center_vertical"
+        android:orientation="horizontal" >
+
+        <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="false"
+                android:text="{Title...}"
+                android:textColor="?headlineSelectedTextColor"
+                android:textSize="16sp"
+                android:textStyle="bold" >
+
+            </TextView>
+
+            <TextView
+                android:id="@+id/excerpt"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:text="{Content excerpt...}"
+                android:textColor="?headlineSelectedExcerptTextColor"
+                android:textSize="13sp" >
+            </TextView>
+        </LinearLayout>
+
+        <LinearLayout
+            android:id="@+id/linearLayout4"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:gravity="center"
+            android:paddingRight="15px" >
+
+            <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
+                android:id="@+id/published"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:clickable="true"
+                android:src="@drawable/ic_rss_bw" />
+        </LinearLayout>
+
+    </LinearLayout>
+
+</LinearLayout>
\ No newline at end of file
diff --git a/res/layout-sw600dp/headlines_row_selected.xml b/res/layout-sw600dp/headlines_row_selected.xml
index 0157fb65..ed84f9f6 100644
--- a/res/layout-sw600dp/headlines_row_selected.xml
+++ b/res/layout-sw600dp/headlines_row_selected.xml
@@ -39,7 +39,7 @@
                 android:text="{Title...}"
                 android:textColor="?headlineSelectedTextColor"
                 android:textSize="16sp"
-                android:textStyle="bold" >
+                android:textStyle="normal" >
             </TextView>
 
             <TextView
diff --git a/res/layout-sw600dp/headlines_row_selected_unread.xml b/res/layout-sw600dp/headlines_row_selected_unread.xml
new file mode 100644
index 00000000..0157fb65
--- /dev/null
+++ b/res/layout-sw600dp/headlines_row_selected_unread.xml
@@ -0,0 +1,94 @@
+<?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:padding="4sp"
+    android:orientation="vertical" >
+
+    <LinearLayout
+        android:id="@+id/linearLayout6"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:gravity="center_vertical"
+        android:orientation="horizontal" >
+
+        <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="false"
+                android:text="{Title...}"
+                android:textColor="?headlineSelectedTextColor"
+                android:textSize="16sp"
+                android:textStyle="bold" >
+            </TextView>
+
+            <TextView
+                android:id="@+id/excerpt"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:text="{Content excerpt...}"
+                android:textColor="?headlineSelectedExcerptTextColor"
+                android:textSize="13sp" >
+            </TextView>
+
+
+            <TextView
+                android:id="@+id/date"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="Jan 01"
+                android:textColor="?headlineSelectedExcerptTextColor"
+                android:textSize="11sp"
+                android:textStyle="italic" />
+
+        </LinearLayout>
+
+
+
+
+
+
+        <LinearLayout
+            android:id="@+id/linearLayout4"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:gravity="center"
+            android:paddingRight="15px" >
+
+            <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
+                android:id="@+id/published"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:clickable="true"
+                android:src="@drawable/ic_rss_bw" />
+        </LinearLayout>
+    </LinearLayout>
+
+</LinearLayout>
\ No newline at end of file
diff --git a/res/layout/headlines_row_selected.xml b/res/layout/headlines_row_selected.xml
index c4423d57..eefe8639 100644
--- a/res/layout/headlines_row_selected.xml
+++ b/res/layout/headlines_row_selected.xml
@@ -41,7 +41,7 @@
                 android:text="{Title...}"
                 android:textColor="?headlineSelectedTextColor"
                 android:textSize="16sp"
-                android:textStyle="bold" >
+                android:textStyle="normal" >
 
             </TextView>
 
diff --git a/res/layout/headlines_row_selected_unread.xml b/res/layout/headlines_row_selected_unread.xml
new file mode 100644
index 00000000..c4423d57
--- /dev/null
+++ b/res/layout/headlines_row_selected_unread.xml
@@ -0,0 +1,106 @@
+<?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="?headlineSelectedBackgroundSolid"
+    android:orientation="vertical" >
+
+    <LinearLayout
+        android:id="@+id/linearLayout6"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:gravity="center_vertical"
+        android:orientation="horizontal" >
+
+        <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"
+            android:padding="3dp" >
+
+
+            <TextView
+                android:id="@+id/title"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:ellipsize="end"
+                android:singleLine="false"
+                android:text="{Title...}"
+                android:textColor="?headlineSelectedTextColor"
+                android:textSize="16sp"
+                android:textStyle="bold" >
+
+            </TextView>
+
+            <TextView
+                android:id="@+id/feed_title"
+                android:layout_width="wrap_content"
+                android:layout_height="match_parent"
+                android:ellipsize="end"
+                android:gravity="center_horizontal|right"
+                android:singleLine="true"
+                android:text="{Feed title...}"
+                android:textColor="?headlineSelectedExcerptTextColor"
+                android:textSize="10sp" />
+
+            <TextView
+                android:id="@+id/excerpt"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:text="{Content excerpt...}"
+                android:textColor="?headlineSelectedExcerptTextColor"
+                android:textSize="13sp" >
+            </TextView>
+
+
+            <TextView
+                android:id="@+id/date"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:gravity="center_horizontal"
+                android:text="Jan 01"
+                android:textColor="?headlineSelectedExcerptTextColor"
+                android:textSize="10sp"
+                android:textStyle="italic" />
+
+        </LinearLayout>
+
+
+
+        <LinearLayout
+            android:id="@+id/linearLayout4"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:gravity="center"
+            android:paddingRight="6dp" >
+
+            <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
+                android:id="@+id/published"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:clickable="true"
+                android:src="@drawable/ic_rss_bw" />
+        </LinearLayout>
+    </LinearLayout>
+
+</LinearLayout>
\ No newline at end of file
-- 
cgit v1.2.3-54-g00ecf