public-mirrors/NewsBlur
1
0
Fork 0
mirror of https://github.com/samuelclay/NewsBlur.git synced 2025-09-18 21:50:56 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge remote-tracking branch 'upstream/master'

Browse source
This commit is contained in:
Mark Anderson 2014-06-30 20:48:05 +01:00
commit 8b8e854111
5 changed files with 18 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
clients/android/NewsBlur/res/drawable/dark_divider_item_header.xml Normal file
View file

@ -0,0 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android" android:shape="rectangle">
<solid android:color="@color/dark_item_header_border" />
<size android:height="1dp" />
</shape>

2
clients/android/NewsBlur/res/layout/fragment_readingitem.xml
View file

@ -16,7 +16,7 @@
android:layout_width="match_parent"
android:layout_height="1dp"
android:layout_gravity="bottom"
android:background="@drawable/divider_item_header" />
style="?itemHeaderDivider" />
<include layout="@layout/include_reading_share_bar" />

1
clients/android/NewsBlur/res/values/attrs.xml
View file

@ -25,6 +25,7 @@
<attr name="divider" format="string" />
<attr name="profileCount" format="string" />
<attr name="profileActivityList" format="string" />
<attr name="itemHeaderDivider" format="string" />
<declare-styleable name="FlowLayout">
<attr name="flow" />

8
clients/android/NewsBlur/res/values/styles.xml
View file

@ -233,4 +233,12 @@
<item name="android:background">@color/dark_item_background</item>
<item name="android:divider">@drawable/divider_dark</item>
</style>
<style name="itemHeaderDivider">
<item name="android:background">@drawable/divider_item_header</item>
</style>
<style name="itemHeaderDivider.dark">
<item name="android:background">@drawable/dark_divider_item_header</item>
</style>
</resources>

2
clients/android/NewsBlur/res/values/theme.xml
View file

@ -26,6 +26,7 @@
<item name="divider">@style/divider</item>
<item name="profileCount">@style/profileCount</item>
<item name="profileActivityList">@style/profileActivityList</item>
<item name="itemHeaderDivider">@style/itemHeaderDivider</item>
</style>
<style name="NewsBlurDarkTheme" parent="@android:style/Theme.Holo" >
@ -54,5 +55,6 @@
<item name="divider">@style/divider.dark</item>
<item name="profileCount">@style/profileCount.dark</item>
<item name="profileActivityList">@style/profileActivityList.dark</item>
<item name="itemHeaderDivider">@style/itemHeaderDivider.dark</item>
</style>
</resources>