diff options
| author | Andrew Dolgov <[email protected]> | 2014-10-27 14:39:37 +0400 |
|---|---|---|
| committer | Andrew Dolgov <[email protected]> | 2014-10-27 14:39:37 +0400 |
| commit | d7734987adc2dffa116dd9b8f7ac1f171e067446 (patch) | |
| tree | c8d2cd70af4b0f542a833cbc10177733698d0701 /org.fox.ttrss/src/main | |
| parent | 30c23fd040e592dd31b34177c461080a9b4c55c9 (diff) | |
Revert "use cardview for article fragment"
This reverts commit de998a1e927f93344bee8f881b8876f27f629eca.
Diffstat (limited to 'org.fox.ttrss/src/main')
| -rw-r--r-- | org.fox.ttrss/src/main/res/layout/article_fragment.xml | 13 | ||||
| -rw-r--r-- | org.fox.ttrss/src/main/res/values/style.xml | 4 |
2 files changed, 6 insertions, 11 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 14c84804..56d42d89 100644 --- a/org.fox.ttrss/src/main/res/layout/article_fragment.xml +++ b/org.fox.ttrss/src/main/res/layout/article_fragment.xml @@ -1,13 +1,8 @@ -<android.support.v7.widget.CardView - 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" +<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" android:id="@+id/article_fragment" android:layout_width="fill_parent" - android:layout_height="wrap_content" - card_view:cardElevation="2dp" - card_view:cardBackgroundColor="?articleBackground" - tools:ignore="HardcodedText" > + android:layout_height="match_parent" + android:background="?articleBackground"> <org.fox.ttrss.util.NoChildFocusScrollView android:id="@+id/article_scrollview" @@ -105,4 +100,4 @@ </org.fox.ttrss.util.NoChildFocusScrollView> -</android.support.v7.widget.CardView>
\ No newline at end of file +</RelativeLayout>
\ 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 9e1118e0..ab7f9b8f 100644 --- a/org.fox.ttrss/src/main/res/values/style.xml +++ b/org.fox.ttrss/src/main/res/values/style.xml @@ -8,7 +8,7 @@ <item name="unreadCounterColor">#ffffff</item> <item name="headlinesBackground"><!-- #f0f0f0 -->@drawable/shadow_headlines</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="headlineUnreadBackground">@android:color/white</item> <item name="headlineNormalBackground">#f5f5f5</item> @@ -43,7 +43,7 @@ <item name="headlinesBackgroundSolid">@drawable/paper_sepia</item> <item name="headlineSelectedBackground">#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="unreadSelectedCounterBackground">@drawable/counter_background_sepia</item> <item name="feedlistTextColor">#35281C</item> |