From 9ac66287a29cb5dd68d4adc49c74535e7b70ea67 Mon Sep 17 00:00:00 2001 From: Andrew Dolgov Date: Thu, 12 Feb 2015 14:28:03 +0300 Subject: [PATCH] article layout tweaks --- .../src/main/res/layout/article_fragment.xml | 28 +++++++++++-------- .../src/main/res/layout/drawer_header.xml | 6 ++-- org.fox.ttrss/src/main/res/values/attrs.xml | 1 + org.fox.ttrss/src/main/res/values/style.xml | 10 ++++--- 4 files changed, 27 insertions(+), 18 deletions(-) mode change 100644 => 100755 org.fox.ttrss/src/main/res/layout/article_fragment.xml mode change 100644 => 100755 org.fox.ttrss/src/main/res/values/attrs.xml diff --git a/org.fox.ttrss/src/main/res/layout/article_fragment.xml b/org.fox.ttrss/src/main/res/layout/article_fragment.xml old mode 100644 new mode 100755 index a250f100..51dd918c --- a/org.fox.ttrss/src/main/res/layout/article_fragment.xml +++ b/org.fox.ttrss/src/main/res/layout/article_fragment.xml @@ -23,14 +23,13 @@ android:orientation="vertical" > + android:paddingBottom="6dp"> @@ -57,8 +56,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_weight="1" - android:paddingTop="4dp" - android:paddingBottom="4dp" > + android:paddingTop="8dp"> + + + android:textSize="12sp" + android:text="[Article note]" + android:paddingLeft="16dp" + android:paddingTop="8dp" + android:paddingRight="16dp" + android:paddingBottom="8dp" /> diff --git a/org.fox.ttrss/src/main/res/layout/drawer_header.xml b/org.fox.ttrss/src/main/res/layout/drawer_header.xml index 24647974..f87f942b 100755 --- a/org.fox.ttrss/src/main/res/layout/drawer_header.xml +++ b/org.fox.ttrss/src/main/res/layout/drawer_header.xml @@ -13,7 +13,7 @@ android:id="@+id/imageView" android:src="@drawable/drawer_header" android:scaleType="fitXY" - android:tint="?articleHeader" + android:tint="?colorPrimaryDark" android:tintMode="multiply" /> + \ No newline at end of file diff --git a/org.fox.ttrss/src/main/res/values/style.xml b/org.fox.ttrss/src/main/res/values/style.xml index a33ac65c..12b68c97 100755 --- a/org.fox.ttrss/src/main/res/values/style.xml +++ b/org.fox.ttrss/src/main/res/values/style.xml @@ -25,11 +25,12 @@ #9a8c59 #fff7d5 #dddddd - ?colorPrimaryDark - @android:color/white + @android:color/transparent + @android:color/primary_text_light @android:color/black @style/FabTheme ?colorPrimary + #cccccc #6482af #526A8E @@ -107,11 +108,12 @@ #1c1d1e #1c1c1c ?feedlistTextColor - ?colorPrimaryDark - @android:color/white + @android:color/transparent + @android:color/primary_text_dark @style/FabTheme #e0e0e0 ?colorPrimary + @android:color/black #51698E #445877