iamthefij/tt-rss-android
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Revert "use cardview for article fragment"

Browse Source 
This reverts commit de998a1e92.
This commit is contained in:
Andrew Dolgov 2014-10-27 14:39:37 +04:00
parent 30c23fd040
commit d7734987ad
2 changed files with 6 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
org.fox.ttrss/src/main/res/layout/article_fragment.xml
View File

@ -1,13 +1,8 @@
<android.support.v7.widget.CardView <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:card_view="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+id/article_fragment" android:id="@+id/article_fragment"
android:layout_width="fill_parent" android:layout_width="fill_parent"
android:layout_height="wrap_content" android:layout_height="match_parent"
card_view:cardElevation="2dp" android:background="?articleBackground">
card_view:cardBackgroundColor="?articleBackground"
tools:ignore="HardcodedText" >
<org.fox.ttrss.util.NoChildFocusScrollView <org.fox.ttrss.util.NoChildFocusScrollView
android:id="@+id/article_scrollview" android:id="@+id/article_scrollview"
@ -105,4 +100,4 @@
</org.fox.ttrss.util.NoChildFocusScrollView> </org.fox.ttrss.util.NoChildFocusScrollView>
</android.support.v7.widget.CardView> </RelativeLayout>

4
org.fox.ttrss/src/main/res/values/style.xml
View File

@ -8,7 +8,7 @@
<item name="unreadCounterColor">#ffffff</item> <item name="unreadCounterColor">#ffffff</item>
<item name="headlinesBackground"><!-- #f0f0f0 -->@drawable/shadow_headlines</item> <item name="headlinesBackground"><!-- #f0f0f0 -->@drawable/shadow_headlines</item>
<item name="headlinesBackgroundSolid">#f0f0f0</item> <item name="headlinesBackgroundSolid">#f0f0f0</item>
<item name="articleBackground">@android:color/white</item> <item name="articleBackground">@android:color/transparent</item>
<item name="headlineSelectedBackground">#88b0f0</item> <item name="headlineSelectedBackground">#88b0f0</item>
<item name="headlineUnreadBackground">@android:color/white</item> <item name="headlineUnreadBackground">@android:color/white</item>
<item name="headlineNormalBackground">#f5f5f5</item> <item name="headlineNormalBackground">#f5f5f5</item>
@ -43,7 +43,7 @@
<item name="headlinesBackgroundSolid">@drawable/paper_sepia</item> <item name="headlinesBackgroundSolid">@drawable/paper_sepia</item>
<item name="headlineSelectedBackground">#E5B0A0</item> <item name="headlineSelectedBackground">#E5B0A0</item>
<item name="feedsSelectedBackground">#E5B0A0</item> <item name="feedsSelectedBackground">#E5B0A0</item>
<item name="articleBackground">@android:color/white</item> <item name="articleBackground">@drawable/paper_sepia</item>
<item name="unreadCounterBackground">@drawable/counter_background_sepia</item> <item name="unreadCounterBackground">@drawable/counter_background_sepia</item>
<item name="unreadSelectedCounterBackground">@drawable/counter_background_sepia</item> <item name="unreadSelectedCounterBackground">@drawable/counter_background_sepia</item>
<item name="feedlistTextColor">#35281C</item> <item name="feedlistTextColor">#35281C</item>