Folder/feed text and highlights on the main view

This commit is contained in:
Mark Anderson 2014-05-14 20:50:04 +01:00
parent 6e26bae5c2
commit 905337e2b7
10 changed files with 58 additions and 5 deletions

View file

@ -0,0 +1,17 @@
<?xml version="1.0" encoding="utf-8"?>
<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
<item>
<shape
android:shape="rectangle">
<solid android:color="@color/dark_feed_background_selected_start"/>
</shape>
</item>
<item
android:top="0.5dp"
android:bottom="0.5dp">
<shape xmlns:android="http://schemas.android.com/apk/res/android"
android:shape="rectangle">
<solid android:color="@color/dark_feed_background_selected_end"/>
</shape>
</item>
</layer-list>

View file

@ -0,0 +1,9 @@
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android"
android:shape="rectangle">
<gradient
android:angle="90"
android:type="linear"
android:startColor="@color/dark_folder_background_selected_start"
android:endColor="@color/dark_folder_background_selected_end"/>
</shape>

View file

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android" >
<item android:state_pressed="true" android:drawable="@drawable/feed_background_highlight" />
<item android:state_pressed="true" android:drawable="@drawable/dark_feed_background_highlight" />
<item android:drawable="@drawable/dark_feed_background_default" />
</selector>

View file

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android" >
<item android:state_pressed="true" android:drawable="@drawable/folder_background_highlight" />
<item android:state_pressed="true" android:drawable="@drawable/dark_folder_background_highlight" />
<item android:drawable="@drawable/dark_folder_background_default" />
</selector>

View file

@ -68,7 +68,7 @@
android:layout_toRightOf="@id/row_feedfavicon"
android:ellipsize="end"
android:singleLine="true"
android:textColor="@color/folder_text"
style="?selectorRowFeedName"
android:textSize="14sp"
android:textStyle="bold" />

View file

@ -78,12 +78,11 @@
android:layout_centerVertical="true"
android:layout_toRightOf="@id/row_folder_icon"
android:layout_toLeftOf="@+id/row_foldersums"
android:textColor="@color/folder_text"
style="?selectorRowFolderName"
android:paddingBottom="8dp"
android:paddingTop="8dp"
android:textSize="13sp"
android:textStyle="bold"
android:shadowColor="@color/white"
android:shadowDy="1"
android:shadowRadius="1"
android:maxLines="1"

View file

@ -4,6 +4,8 @@
<attr name="defaultImageSize" format="integer" />
<attr name="selectorFolderBackground" format="string" />
<attr name="selectorFeedBackground" format="string" />
<attr name="selectorRowFolderName" format="string" />
<attr name="selectorRowFeedName" format="string" />
<declare-styleable name="FlowLayout">
<attr name="flow" />

View file

@ -13,7 +13,10 @@
<color name="dark_folder_background_start">#7000</color>
<color name="folder_background_selected_end">#D9DBD4</color>
<color name="folder_background_selected_start">#CDD0C7</color>
<color name="dark_folder_background_selected_end">#4C4C4C</color>
<color name="dark_folder_background_selected_start">#1A1A1A</color>
<color name="folder_text">#4C4C4C</color>
<color name="dark_folder_text">#FDFDFD</color>
<color name="folder_border_top">#FDFDFD</color>
<color name="folder_border_bottom">#B7BBAA</color>
<color name="feed_background">#F7F8F5</color>
@ -22,6 +25,8 @@
<color name="feed_background_start">#505050</color>
<color name="feed_background_selected_end">#FFFFD2</color>
<color name="feed_background_selected_start">#E3D0AE</color>
<color name="dark_feed_background_selected_end">#4C4C4C</color>
<color name="dark_feed_background_selected_start">#1A1A1A</color>
<color name="story_background">#F7F8F5</color>
<color name="story_background_end">#FFFDEF</color>
<color name="story_background_start">#DFDDCF</color>

View file

@ -40,4 +40,21 @@
<item name="android:background">@drawable/dark_selector_feed_background</item>
</style>
<style name="selectorRowFolderName">
<item name="android:textColor">@color/folder_text</item>
<item name="android:shadowColor">@color/white</item>
</style>
<style name="selectorRowFolderName.dark">
<item name="android:textColor">@color/dark_folder_text</item>
<item name="android:shadowColor">@color/white</item>
</style>
<style name="selectorRowFeedName">
<item name="android:textColor">@color/folder_text</item>
</style>
<style name="selectorRowFeedName.dark">
<item name="android:textColor">@color/dark_folder_text</item>
</style>
</resources>

View file

@ -5,6 +5,8 @@
<item name="android:expandableListViewStyle">@style/expandableListView</item>
<item name="selectorFolderBackground">@style/selectorFolderBackground</item>
<item name="selectorFeedBackground">@style/selectorFeedBackground</item>
<item name="selectorRowFolderName">@style/selectorRowFolderName</item>
<item name="selectorRowFeedName">@style/selectorRowFeedName</item>
</style>
<style name="NewsBlurDarkTheme" parent="@android:style/Theme.Holo" >
@ -12,5 +14,7 @@
<item name="android:expandableListViewStyle">@style/expandableListView.dark</item>
<item name="selectorFolderBackground">@style/selectorFolderBackground.dark</item>
<item name="selectorFeedBackground">@style/selectorFeedBackground.dark</item>
<item name="selectorRowFolderName">@style/selectorRowFolderName.dark</item>
<item name="selectorRowFeedName">@style/selectorRowFeedName.dark</item>
</style>
</resources>