From ad2c6eb9993134ac74f7a41da9de7708cf13e267 Mon Sep 17 00:00:00 2001 From: Andrew Dolgov Date: Thu, 12 Feb 2015 15:17:11 +0300 Subject: more headline display margin adjustments remove condensed font option --- org.fox.ttrss/src/main/res/layout/article_fragment.xml | 6 +++--- org.fox.ttrss/src/main/res/layout/headlines_row.xml | 2 +- org.fox.ttrss/src/main/res/layout/headlines_row_compact.xml | 7 ++++--- org.fox.ttrss/src/main/res/layout/headlines_row_loadmore.xml | 2 +- .../src/main/res/layout/headlines_row_selected_compact.xml | 7 ++++--- .../src/main/res/layout/headlines_row_selected_unread_compact.xml | 7 ++++--- org.fox.ttrss/src/main/res/layout/headlines_row_unread.xml | 4 ++-- org.fox.ttrss/src/main/res/layout/headlines_row_unread_compact.xml | 7 ++++--- org.fox.ttrss/src/main/res/xml/preferences.xml | 4 ++-- 9 files changed, 25 insertions(+), 21 deletions(-) mode change 100644 => 100755 org.fox.ttrss/src/main/res/layout/headlines_row_compact.xml mode change 100644 => 100755 org.fox.ttrss/src/main/res/layout/headlines_row_loadmore.xml mode change 100644 => 100755 org.fox.ttrss/src/main/res/layout/headlines_row_selected_compact.xml mode change 100644 => 100755 org.fox.ttrss/src/main/res/layout/headlines_row_selected_unread_compact.xml mode change 100644 => 100755 org.fox.ttrss/src/main/res/layout/headlines_row_unread_compact.xml (limited to 'org.fox.ttrss/src/main/res') diff --git a/org.fox.ttrss/src/main/res/layout/article_fragment.xml b/org.fox.ttrss/src/main/res/layout/article_fragment.xml index 51dd918c..64563ab4 100755 --- a/org.fox.ttrss/src/main/res/layout/article_fragment.xml +++ b/org.fox.ttrss/src/main/res/layout/article_fragment.xml @@ -49,7 +49,7 @@ android:fontFamily="sans-serif-light" android:paddingTop="8dp" android:text="24 comments" - android:textColor="?articleHeaderTextColor" + android:textColor="?headlineSecondaryTextColor" android:textSize="12sp" /> diff --git a/org.fox.ttrss/src/main/res/layout/headlines_row.xml b/org.fox.ttrss/src/main/res/layout/headlines_row.xml index 8edd35b3..ce9861aa 100755 --- a/org.fox.ttrss/src/main/res/layout/headlines_row.xml +++ b/org.fox.ttrss/src/main/res/layout/headlines_row.xml @@ -14,7 +14,7 @@ diff --git a/org.fox.ttrss/src/main/res/layout/headlines_row_compact.xml b/org.fox.ttrss/src/main/res/layout/headlines_row_compact.xml old mode 100644 new mode 100755 index c0240fda..9d927733 --- a/org.fox.ttrss/src/main/res/layout/headlines_row_compact.xml +++ b/org.fox.ttrss/src/main/res/layout/headlines_row_compact.xml @@ -58,10 +58,10 @@ 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" - android:layout_span="2" /> + android:layout_span="2" + android:paddingTop="8dp" /> @@ -77,7 +77,8 @@ android:text="Example Feed AAA AAA AAAAAA AAAA AAAAA AA A A AA AA" android:textColor="?headlineSecondaryTextColor" android:textSize="12sp" - android:layout_weight="0.5" /> + android:layout_weight="0.5" + android:paddingTop="8dp" /> diff --git a/org.fox.ttrss/src/main/res/layout/headlines_row_loadmore.xml b/org.fox.ttrss/src/main/res/layout/headlines_row_loadmore.xml old mode 100644 new mode 100755 index 314ffd00..7ea41aae --- a/org.fox.ttrss/src/main/res/layout/headlines_row_loadmore.xml +++ b/org.fox.ttrss/src/main/res/layout/headlines_row_loadmore.xml @@ -5,7 +5,7 @@ android:layout_height="wrap_content" android:background="?headlineNormalBackground" android:gravity="center" - android:padding="5dp" + android:padding="16dp" android:orientation="horizontal" > diff --git a/org.fox.ttrss/src/main/res/layout/headlines_row_selected_compact.xml b/org.fox.ttrss/src/main/res/layout/headlines_row_selected_compact.xml old mode 100644 new mode 100755 index 25a46b46..e05b4bf9 --- a/org.fox.ttrss/src/main/res/layout/headlines_row_selected_compact.xml +++ b/org.fox.ttrss/src/main/res/layout/headlines_row_selected_compact.xml @@ -58,10 +58,10 @@ 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" - android:layout_span="2" /> + android:layout_span="2" + android:paddingTop="8dp" /> @@ -77,7 +77,8 @@ android:text="Example Feed AAA AAA AAAAAA AAAA AAAAA AA A A AA AA" android:textColor="?headlineSelectedSecondaryTextColor" android:textSize="12sp" - android:layout_weight="0.5" /> + android:layout_weight="0.5" + android:paddingTop="8dp" /> diff --git a/org.fox.ttrss/src/main/res/layout/headlines_row_selected_unread_compact.xml b/org.fox.ttrss/src/main/res/layout/headlines_row_selected_unread_compact.xml old mode 100644 new mode 100755 index 7b2a8983..27bfe9be --- a/org.fox.ttrss/src/main/res/layout/headlines_row_selected_unread_compact.xml +++ b/org.fox.ttrss/src/main/res/layout/headlines_row_selected_unread_compact.xml @@ -59,10 +59,10 @@ 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" - android:layout_span="2" /> + android:layout_span="2" + android:paddingTop="8dp" /> @@ -78,7 +78,8 @@ android:text="Example Feed AAA AAA AAAAAA AAAA AAAAA AA A A AA AA" android:textColor="?headlineSelectedSecondaryTextColor" android:textSize="12sp" - android:layout_weight="0.5" /> + android:layout_weight="0.5" + android:paddingTop="8dp" /> diff --git a/org.fox.ttrss/src/main/res/layout/headlines_row_unread.xml b/org.fox.ttrss/src/main/res/layout/headlines_row_unread.xml index 80eec604..a54043a1 100755 --- a/org.fox.ttrss/src/main/res/layout/headlines_row_unread.xml +++ b/org.fox.ttrss/src/main/res/layout/headlines_row_unread.xml @@ -14,7 +14,7 @@ @@ -33,7 +33,7 @@ android:text="Sample entry title" android:textColor="?headlineUnreadTextColor" android:textSize="18sp" - android:fontFamily="sans-serif-medium" + android:textStyle="bold" android:paddingBottom="8dp" android:layout_span="2" /> diff --git a/org.fox.ttrss/src/main/res/layout/headlines_row_unread_compact.xml b/org.fox.ttrss/src/main/res/layout/headlines_row_unread_compact.xml old mode 100644 new mode 100755 index 0a29e48e..5a07f81a --- a/org.fox.ttrss/src/main/res/layout/headlines_row_unread_compact.xml +++ b/org.fox.ttrss/src/main/res/layout/headlines_row_unread_compact.xml @@ -59,10 +59,10 @@ 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" - android:layout_span="2" /> + android:layout_span="2" + android:paddingTop="8dp" /> @@ -78,7 +78,8 @@ android:text="Example Feed AAA AAA AAAAAA AAAA AAAAA AA A A AA AA" android:textColor="?headlineSecondaryTextColor" android:textSize="12sp" - android:layout_weight="0.5" /> + android:layout_weight="0.5" + android:paddingTop="8dp" /> diff --git a/org.fox.ttrss/src/main/res/xml/preferences.xml b/org.fox.ttrss/src/main/res/xml/preferences.xml index a97c2566..8909ee58 100755 --- a/org.fox.ttrss/src/main/res/xml/preferences.xml +++ b/org.fox.ttrss/src/main/res/xml/preferences.xml @@ -102,11 +102,11 @@ android:summary="@string/pref_headlines_mark_read_scroll_long" android:title="@string/pref_headlines_mark_read_scroll" /> - + android:title="@string/pref_headlines_use_condensed_fonts" /> -->