From c396ab425878bb2e7c5195d739b070377cb6aa1e Mon Sep 17 00:00:00 2001
From: Andrew Dolgov <fox@fakecake.org>
Date: Sun, 12 May 2013 18:35:40 +0400
Subject: update all headline views (remove unnecessary variants), add separate
 color for secondary headline text

---
 res/layout-sw600dp/headlines_row.xml               | 125 --------------------
 res/layout-sw600dp/headlines_row_selected.xml      | 125 --------------------
 .../headlines_row_selected_unread.xml              | 126 ---------------------
 res/layout-sw600dp/headlines_row_unread.xml        | 126 ---------------------
 4 files changed, 502 deletions(-)
 delete mode 100644 res/layout-sw600dp/headlines_row.xml
 delete mode 100644 res/layout-sw600dp/headlines_row_selected.xml
 delete mode 100644 res/layout-sw600dp/headlines_row_selected_unread.xml
 delete mode 100644 res/layout-sw600dp/headlines_row_unread.xml

(limited to 'res/layout-sw600dp')

diff --git a/res/layout-sw600dp/headlines_row.xml b/res/layout-sw600dp/headlines_row.xml
deleted file mode 100644
index 80da7423..00000000
--- a/res/layout-sw600dp/headlines_row.xml
+++ /dev/null
@@ -1,125 +0,0 @@
-<?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="?headlineNormalBackground"
-    android:orientation="vertical"
-    android:padding="6dp" >
-
-    <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="0dp"
-            android:paddingRight="0dp" />
-
-        <TextView
-            android:id="@+id/title"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_weight="1"
-            android:ellipsize="end"
-            android:gravity="center_vertical"
-            android:singleLine="false"
-            android:text="{Title...}"
-            android:textColor="?headlineTextColor"
-            android:textSize="16sp" />
-
-    </LinearLayout>
-
-    <LinearLayout
-        android:id="@+id/linearLayout1"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_weight="1"
-        android:gravity="center_vertical"
-        android:orientation="horizontal"
-        android:paddingLeft="6dp"
-        android:paddingTop="6dp" >
-
-        <TextView
-            android:id="@+id/feed_title"
-            android:layout_width="wrap_content"
-            android:layout_height="match_parent"
-            android:layout_weight="0.25"
-            android:ellipsize="end"
-            android:gravity="center_vertical"
-            android:singleLine="true"
-            android:text="{Feed title...}"
-            android:textColor="?headlineExcerptTextColor"
-            android:textSize="12sp"
-            android:textStyle="italic" />
-
-        <TextView
-            android:id="@+id/date"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_weight="0.5"
-            android:gravity="right|center_vertical"
-            android:text="Jan 01"
-            android:textColor="?headlineExcerptTextColor"
-            android:textSize="12sp"
-            android:textStyle="italic" />
-
-    </LinearLayout>
-
-    <TextView
-        android:id="@+id/excerpt"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:paddingLeft="6dp"
-        android:paddingRight="0dp"
-        android:paddingTop="6dp"
-        android:text="{Content excerpt...}"
-        android:textColor="?headlineExcerptTextColor"
-        android:textSize="13sp" />
-
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:gravity="center_vertical"
-        android:paddingLeft="6dp"
-        android:paddingRight="0dp"
-        android:paddingTop="0dp" >
-
-        <TextView
-            android:id="@+id/author"
-            android:layout_width="wrap_content"
-            android:layout_height="match_parent"
-            android:layout_weight="1"
-            android:ellipsize="end"
-            android:gravity="center_vertical"
-            android:singleLine="true"
-            android:text="{Author}"
-            android:textColor="?headlineExcerptTextColor"
-            android:textSize="12sp" />
-
-        <ImageView
-            android:id="@+id/marked"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_weight="0"
-            android:clickable="true"
-            android:paddingRight="6dp"
-            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>
\ No newline at end of file
diff --git a/res/layout-sw600dp/headlines_row_selected.xml b/res/layout-sw600dp/headlines_row_selected.xml
deleted file mode 100644
index 3cfd98e8..00000000
--- a/res/layout-sw600dp/headlines_row_selected.xml
+++ /dev/null
@@ -1,125 +0,0 @@
-<?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:orientation="vertical"
-    android:padding="6dp" >
-
-    <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="0dp"
-            android:paddingRight="0dp" />
-
-        <TextView
-            android:id="@+id/title"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_weight="1"
-            android:ellipsize="end"
-            android:gravity="center_vertical"
-            android:singleLine="false"
-            android:text="{Title...}"
-            android:textColor="?headlineSelectedTextColor"
-            android:textSize="16sp" />
-
-    </LinearLayout>
-
-    <LinearLayout
-        android:id="@+id/linearLayout1"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_weight="1"
-        android:gravity="center_vertical"
-        android:orientation="horizontal"
-        android:paddingLeft="6dp"
-        android:paddingTop="6dp" >
-
-        <TextView
-            android:id="@+id/feed_title"
-            android:layout_width="wrap_content"
-            android:layout_height="match_parent"
-            android:layout_weight="0.25"
-            android:ellipsize="end"
-            android:gravity="center_vertical"
-            android:singleLine="true"
-            android:text="{Feed title...}"
-            android:textColor="?headlineSelectedExcerptTextColor"
-            android:textSize="12sp"
-            android:textStyle="italic" />
-
-        <TextView
-            android:id="@+id/date"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_weight="0.5"
-            android:gravity="right|center_vertical"
-            android:text="Jan 01"
-            android:textColor="?headlineSelectedExcerptTextColor"
-            android:textSize="12sp"
-            android:textStyle="italic" />
-
-    </LinearLayout>
-
-    <TextView
-        android:id="@+id/excerpt"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:paddingLeft="6dp"
-        android:paddingRight="0dp"
-        android:paddingTop="6dp"
-        android:text="{Content excerpt...}"
-        android:textColor="?headlineSelectedExcerptTextColor"
-        android:textSize="13sp" />
-
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:gravity="center_vertical"
-        android:paddingLeft="6dp"
-        android:paddingRight="0dp"
-        android:paddingTop="0dp" >
-
-        <TextView
-            android:id="@+id/author"
-            android:layout_width="wrap_content"
-            android:layout_height="match_parent"
-            android:layout_weight="1"
-            android:ellipsize="end"
-            android:gravity="center_vertical"
-            android:singleLine="true"
-            android:text="{Author}"
-            android:textColor="?headlineSelectedExcerptTextColor"
-            android:textSize="12sp" />
-
-        <ImageView
-            android:id="@+id/marked"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_weight="0"
-            android:clickable="true"
-            android:paddingRight="6dp"
-            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>
\ No newline at end of file
diff --git a/res/layout-sw600dp/headlines_row_selected_unread.xml b/res/layout-sw600dp/headlines_row_selected_unread.xml
deleted file mode 100644
index 2d3354b6..00000000
--- a/res/layout-sw600dp/headlines_row_selected_unread.xml
+++ /dev/null
@@ -1,126 +0,0 @@
-<?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:orientation="vertical"
-    android:padding="6dp" >
-
-    <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="0dp"
-            android:paddingRight="0dp" />
-
-        <TextView
-            android:id="@+id/title"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_weight="1"
-            android:ellipsize="end"
-            android:gravity="center_vertical"
-            android:singleLine="false"
-            android:text="{Title...}"
-            android:textColor="?headlineSelectedTextColor"
-            android:textSize="16sp"
-            android:textStyle="bold" />
-
-    </LinearLayout>
-
-    <LinearLayout
-        android:id="@+id/linearLayout1"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_weight="1"
-        android:gravity="center_vertical"
-        android:orientation="horizontal"
-        android:paddingLeft="6dp"
-        android:paddingTop="6dp" >
-
-        <TextView
-            android:id="@+id/feed_title"
-            android:layout_width="wrap_content"
-            android:layout_height="match_parent"
-            android:layout_weight="0.25"
-            android:ellipsize="end"
-            android:gravity="center_vertical"
-            android:singleLine="true"
-            android:text="{Feed title...}"
-            android:textColor="?headlineSelectedExcerptTextColor"
-            android:textSize="12sp"
-            android:textStyle="italic" />
-
-        <TextView
-            android:id="@+id/date"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_weight="0.5"
-            android:gravity="right|center_vertical"
-            android:text="Jan 01"
-            android:textColor="?headlineSelectedExcerptTextColor"
-            android:textSize="12sp"
-            android:textStyle="italic" />
-
-    </LinearLayout>
-
-    <TextView
-        android:id="@+id/excerpt"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:paddingLeft="6dp"
-        android:paddingRight="0dp"
-        android:paddingTop="6dp"
-        android:text="{Content excerpt...}"
-        android:textColor="?headlineSelectedExcerptTextColor"
-        android:textSize="13sp" />
-
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:gravity="center_vertical"
-        android:paddingLeft="6dp"
-        android:paddingRight="0dp"
-        android:paddingTop="0dp" >
-
-        <TextView
-            android:id="@+id/author"
-            android:layout_width="wrap_content"
-            android:layout_height="match_parent"
-            android:layout_weight="1"
-            android:ellipsize="end"
-            android:gravity="center_vertical"
-            android:singleLine="true"
-            android:text="{Author}"
-            android:textColor="?headlineSelectedExcerptTextColor"
-            android:textSize="12sp" />
-
-        <ImageView
-            android:id="@+id/marked"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_weight="0"
-            android:clickable="true"
-            android:paddingRight="6dp"
-            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>
\ No newline at end of file
diff --git a/res/layout-sw600dp/headlines_row_unread.xml b/res/layout-sw600dp/headlines_row_unread.xml
deleted file mode 100644
index 4187af8f..00000000
--- a/res/layout-sw600dp/headlines_row_unread.xml
+++ /dev/null
@@ -1,126 +0,0 @@
-<?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="?headlineUnreadBackground"
-    android:orientation="vertical"
-    android:padding="6dp" >
-
-    <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="0dp"
-            android:paddingRight="0dp" />
-
-        <TextView
-            android:id="@+id/title"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_weight="1"
-            android:ellipsize="end"
-            android:gravity="center_vertical"
-            android:singleLine="false"
-            android:text="{Title...}"
-            android:textColor="?headlineUnreadTextColor"
-            android:textSize="16sp"
-            android:textStyle="bold" />
-
-    </LinearLayout>
-
-    <LinearLayout
-        android:id="@+id/linearLayout1"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_weight="1"
-        android:gravity="center_vertical"
-        android:orientation="horizontal"
-        android:paddingLeft="6dp"
-        android:paddingTop="6dp" >
-
-        <TextView
-            android:id="@+id/feed_title"
-            android:layout_width="wrap_content"
-            android:layout_height="match_parent"
-            android:layout_weight="0.25"
-            android:ellipsize="end"
-            android:gravity="center_vertical"
-            android:singleLine="true"
-            android:text="{Feed title...}"
-            android:textColor="?headlineExcerptTextColor"
-            android:textSize="12sp"
-            android:textStyle="italic" />
-
-        <TextView
-            android:id="@+id/date"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_weight="0.5"
-            android:gravity="right|center_vertical"
-            android:text="Jan 01"
-            android:textColor="?headlineExcerptTextColor"
-            android:textSize="12sp"
-            android:textStyle="italic" />
-
-    </LinearLayout>
-
-    <TextView
-        android:id="@+id/excerpt"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:paddingLeft="6dp"
-        android:paddingRight="0dp"
-        android:paddingTop="6dp"
-        android:text="{Content excerpt...}"
-        android:textColor="?headlineExcerptTextColor"
-        android:textSize="13sp" />
-
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:gravity="center_vertical"
-        android:paddingLeft="6dp"
-        android:paddingRight="0dp"
-        android:paddingTop="0dp" >
-
-        <TextView
-            android:id="@+id/author"
-            android:layout_width="wrap_content"
-            android:layout_height="match_parent"
-            android:layout_weight="1"
-            android:ellipsize="end"
-            android:gravity="center_vertical"
-            android:singleLine="true"
-            android:text="{Author}"
-            android:textColor="?headlineExcerptTextColor"
-            android:textSize="12sp" />
-
-        <ImageView
-            android:id="@+id/marked"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_weight="0"
-            android:clickable="true"
-            android:paddingRight="6dp"
-            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>
\ No newline at end of file
-- 
cgit v1.2.3