From c396ab425878bb2e7c5195d739b070377cb6aa1e Mon Sep 17 00:00:00 2001 From: Andrew Dolgov 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/headlines_row.xml | 165 ++++++++++++------------ res/layout/headlines_row_selected.xml | 179 +++++++++++++------------- res/layout/headlines_row_selected_unread.xml | 181 ++++++++++++++------------- res/layout/headlines_row_unread.xml | 181 +++++++++++++-------------- 4 files changed, 357 insertions(+), 349 deletions(-) (limited to 'res/layout') diff --git a/res/layout/headlines_row.xml b/res/layout/headlines_row.xml index ccbf4366..cba81d24 100644 --- a/res/layout/headlines_row.xml +++ b/res/layout/headlines_row.xml @@ -4,7 +4,8 @@ android:layout_width="fill_parent" android:layout_height="wrap_content" android:background="?headlineNormalBackground" - android:orientation="vertical" > + android:orientation="vertical" + android:paddingRight="6dp" > - + android:paddingLeft="0dp" + android:paddingRight="0dp" /> - + android:ellipsize="end" + android:gravity="center_vertical" + android:singleLine="false" + android:text="{Title...}" + android:textColor="?headlineTextColor" + android:textSize="16sp" /> - + - + - + - + - + - + - - + - - + - + android:layout_weight="0" + android:clickable="true" + android:paddingRight="6dp" + android:src="@android:drawable/star_off" /> - + - - \ No newline at end of file diff --git a/res/layout/headlines_row_selected.xml b/res/layout/headlines_row_selected.xml index babf3f6b..cf138c47 100644 --- a/res/layout/headlines_row_selected.xml +++ b/res/layout/headlines_row_selected.xml @@ -3,8 +3,9 @@ android:id="@+id/headlines_row" android:layout_width="fill_parent" android:layout_height="wrap_content" - android:background="?headlineSelectedBackgroundSolid" - android:orientation="vertical" > + android:background="?headlineSelectedBackground" + android:orientation="vertical" + android:paddingRight="6dp" > - - + android:paddingLeft="0dp" + android:paddingRight="0dp" /> - - + android:ellipsize="end" + android:gravity="center_vertical" + android:singleLine="false" + android:text="{Title...}" + android:textColor="?headlineSelectedTextColor" + android:textSize="16sp" /> - - - - - - - + - + - + + + - - - + - + - - - + - + + + android:layout_weight="0" + android:clickable="true" + android:paddingRight="6dp" + android:src="@android:drawable/star_off" /> - + - - \ No newline at end of file diff --git a/res/layout/headlines_row_selected_unread.xml b/res/layout/headlines_row_selected_unread.xml index 03c4ffdb..7a9930c3 100644 --- a/res/layout/headlines_row_selected_unread.xml +++ b/res/layout/headlines_row_selected_unread.xml @@ -3,14 +3,14 @@ android:id="@+id/headlines_row" android:layout_width="fill_parent" android:layout_height="wrap_content" - android:background="?headlineSelectedBackgroundSolid" - android:orientation="vertical" > + android:background="?headlineSelectedBackground" + android:orientation="vertical" + android:paddingRight="6dp" > - - + android:paddingLeft="0dp" + android:paddingRight="0dp" /> - - - - - - + android:ellipsize="end" + android:gravity="center_vertical" + android:singleLine="false" + android:text="{Title...}" + android:textColor="?headlineSelectedTextColor" + android:textSize="16sp" + android:textStyle="bold" /> - - - + - + - + + + - - - + - + - - - + - + + + android:layout_weight="0" + android:clickable="true" + android:paddingRight="6dp" + android:src="@android:drawable/star_off" /> - + - - \ No newline at end of file diff --git a/res/layout/headlines_row_unread.xml b/res/layout/headlines_row_unread.xml index 186048e6..f7eea275 100644 --- a/res/layout/headlines_row_unread.xml +++ b/res/layout/headlines_row_unread.xml @@ -4,9 +4,8 @@ android:layout_width="fill_parent" android:layout_height="wrap_content" android:background="?headlineUnreadBackground" - android:orientation="vertical" > - - + android:orientation="vertical" + android:paddingRight="6dp" > - - + android:paddingLeft="0dp" + android:paddingRight="0dp" /> - - + android:ellipsize="end" + android:gravity="center_vertical" + android:singleLine="false" + android:text="{Title...}" + android:textColor="?headlineUnreadTextColor" + android:textSize="16sp" + android:textStyle="bold" /> - - - - - - - + - + - + + + - - - + - + - - - + - + + + android:layout_weight="0" + android:clickable="true" + android:paddingRight="6dp" + android:src="@android:drawable/star_off" /> - + - - \ No newline at end of file -- cgit v1.2.3-54-g00ecf