diff options
author | Andrew Dolgov <[email protected]> | 2015-02-12 14:28:03 +0300 |
---|---|---|
committer | Andrew Dolgov <[email protected]> | 2015-02-12 14:28:03 +0300 |
commit | 9ac66287a29cb5dd68d4adc49c74535e7b70ea67 (patch) | |
tree | 6100917e62438f6ccbfb87b4afa062bf5339047b /org.fox.ttrss/src | |
parent | 876408abd0847a90c255cdcc8d49d470c13246a6 (diff) |
article layout tweaks
Diffstat (limited to 'org.fox.ttrss/src')
-rwxr-xr-x[-rw-r--r--] | org.fox.ttrss/src/main/res/layout/article_fragment.xml | 28 | ||||
-rwxr-xr-x | org.fox.ttrss/src/main/res/layout/drawer_header.xml | 6 | ||||
-rwxr-xr-x[-rw-r--r--] | org.fox.ttrss/src/main/res/values/attrs.xml | 1 | ||||
-rwxr-xr-x | org.fox.ttrss/src/main/res/values/style.xml | 10 |
4 files changed, 27 insertions, 18 deletions
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 a250f100..51dd918c 100644..100755 --- 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" > <LinearLayout - android:padding="8dp" - android:elevation="6dp" + android:padding="16dp" android:id="@+id/article_header" android:background="?articleHeader" android:layout_width="match_parent" android:layout_height="wrap_content" android:orientation="vertical" - android:paddingBottom="6dp" > + android:paddingBottom="6dp"> <TextView android:id="@+id/title" @@ -48,7 +47,7 @@ android:layout_height="wrap_content" android:layout_weight="1" android:fontFamily="sans-serif-light" - android:paddingTop="4dp" + android:paddingTop="8dp" android:text="24 comments" android:textColor="?articleHeaderTextColor" android:textSize="12sp" /> @@ -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"> <TextView android:id="@+id/tags" @@ -89,20 +87,28 @@ </LinearLayout> + <View + android:layout_gravity="top|center_horizontal" + android:layout_width="match_parent" + android:layout_height="1dp" + android:background="?articleHeaderSeparator"/> + <TextView - android:elevation="2dp" android:id="@+id/note" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_weight="1" android:background="?articleNoteBackground" android:textColor="?articleNoteTextColor" - android:textSize="13sp" - android:padding="8dp" - android:text="[Article note]" /> + android:textSize="12sp" + android:text="[Article note]" + android:paddingLeft="16dp" + android:paddingTop="8dp" + android:paddingRight="16dp" + android:paddingBottom="8dp" /> <org.fox.ttrss.util.LessBrokenWebView - android:layout_margin="8dp" + android:layout_margin="16dp" android:id="@+id/article_content" android:layout_width="match_parent" android:layout_height="wrap_content" /> 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" /> <LinearLayout @@ -29,7 +29,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginLeft="16dp" - android:textColor="?articleHeaderTextColor" + android:textColor="@android:color/primary_text_dark" android:text="test" android:textSize="14sp" android:textStyle="bold" @@ -40,7 +40,7 @@ android:id="@+id/drawer_header_server" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:textColor="?articleHeaderTextColor" + android:textColor="@android:color/primary_text_dark" android:layout_marginLeft="16dp" android:layout_marginTop="5dp" android:text="example.org" diff --git a/org.fox.ttrss/src/main/res/values/attrs.xml b/org.fox.ttrss/src/main/res/values/attrs.xml index 8fc10555..cac9f9b7 100644..100755 --- a/org.fox.ttrss/src/main/res/values/attrs.xml +++ b/org.fox.ttrss/src/main/res/values/attrs.xml @@ -29,4 +29,5 @@ <attr name="articleHeaderTextColor" format="reference|color" /> <attr name="articleTextColor" format="reference|color" /> <attr name="headlineFooterColor" format="reference|color" /> + <attr name="articleHeaderSeparator" format="reference|color" /> </resources>
\ 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 @@ <item name="articleNoteTextColor">#9a8c59</item> <item name="articleNoteBackground">#fff7d5</item> <item name="parentBtnBackground">#dddddd</item> - <item name="articleHeader">?colorPrimaryDark</item> - <item name="articleHeaderTextColor">@android:color/white</item> + <item name="articleHeader">@android:color/transparent</item> + <item name="articleHeaderTextColor">@android:color/primary_text_light</item> <item name="articleTextColor">@android:color/black</item> <item name="floatingActionButtonStyle">@style/FabTheme</item> <item name="headlineFooterColor">?colorPrimary</item> + <item name="articleHeaderSeparator">#cccccc</item> <item name="colorPrimary">#6482af</item> <item name="colorPrimaryDark">#526A8E</item> @@ -107,11 +108,12 @@ <item name="articleBackground">#1c1d1e</item> <item name="feedsSelectedBackground">#1c1c1c</item> <item name="feedlistSelectedTextColor">?feedlistTextColor</item> - <item name="articleHeader">?colorPrimaryDark</item> - <item name="articleHeaderTextColor">@android:color/white</item> + <item name="articleHeader">@android:color/transparent</item> + <item name="articleHeaderTextColor">@android:color/primary_text_dark</item> <item name="floatingActionButtonStyle">@style/FabTheme</item> <item name="articleTextColor">#e0e0e0</item> <item name="headlineFooterColor">?colorPrimary</item> + <item name="articleHeaderSeparator">@android:color/black</item> <item name="colorPrimary">#51698E</item> <item name="colorPrimaryDark">#445877</item> |