article layout tweaks

This commit is contained in:
Andrew Dolgov 2015-02-12 14:28:03 +03:00
parent 876408abd0
commit 9ac66287a2
4 changed files with 27 additions and 18 deletions

26
org.fox.ttrss/src/main/res/layout/article_fragment.xml Normal file → Executable file
View File

@ -23,8 +23,7 @@
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"
@ -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" />

View File

@ -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"

1
org.fox.ttrss/src/main/res/values/attrs.xml Normal file → Executable file
View File

@ -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>

View File

@ -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>