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

switch to cardview, remove obsolete drawables

Browse Source
This commit is contained in:
Andrew Dolgov 2014-10-24 13:43:16 +04:00
parent 7783ff3b42
commit c0ef67b468
12 changed files with 34 additions and 150 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
org.fox.ttrss/src/main/res/drawable/headline_row.xml
View File

@ -1,19 +0,0 @@
<?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="#e0e0e0" />
<corners android:radius="2dp"/>
</shape>
</item>
<item
android:bottom="2dp">
<shape android:shape="rectangle" >
<solid android:color="#f5f5f5" />
<corners android:radius="2dp"/>
</shape>
</item>
</layer-list>

19
org.fox.ttrss/src/main/res/drawable/headline_row_selected.xml
View File

@ -1,19 +0,0 @@
<?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="#e0e0e0" />
<corners android:radius="2dp"/>
</shape>
</item>
<item
android:bottom="2dp">
<shape android:shape="rectangle" >
<solid android:color="#88b0f0" />
<corners android:radius="2dp"/>
</shape>
</item>
</layer-list>

19
org.fox.ttrss/src/main/res/drawable/headline_row_selected_sepia.xml
View File

@ -1,19 +0,0 @@
<?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="#d0d0d0" />
<corners android:radius="2dp"/>
</shape>
</item>
<item
android:bottom="2dp">
<shape android:shape="rectangle" >
<solid android:color="#E5B0A0" />
<corners android:radius="2dp"/>
</shape>
</item>
</layer-list>

19
org.fox.ttrss/src/main/res/drawable/headline_row_sepia.xml
View File

@ -1,19 +0,0 @@
<?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="#d0d0d0" />
<corners android:radius="2dp"/>
</shape>
</item>
<item
android:bottom="2dp">
<shape android:shape="rectangle" >
<solid android:color="#f5f5f5" />
<corners android:radius="2dp"/>
</shape>
</item>
</layer-list>

19
org.fox.ttrss/src/main/res/drawable/headline_row_unread.xml
View File

@ -1,19 +0,0 @@
<?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="#e0e0e0" />
<corners android:radius="2dp"/>
</shape>
</item>
<item
android:bottom="2dp">
<shape android:shape="rectangle" >
<solid android:color="#ffffff" />
<corners android:radius="2dp"/>
</shape>
</item>
</layer-list>

19
org.fox.ttrss/src/main/res/drawable/headline_row_unread_sepia.xml
View File

@ -1,19 +0,0 @@
<?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="#d0d0d0" />
<corners android:radius="2dp"/>
</shape>
</item>
<item
android:bottom="2dp">
<shape android:shape="rectangle" >
<solid android:color="#ffffff" />
<corners android:radius="2dp"/>
</shape>
</item>
</layer-list>

2
org.fox.ttrss/src/main/res/layout/headlines_fragment.xml
View File

@ -13,8 +13,6 @@
android:id="@+id/headlines" android:id="@+id/headlines"
android:scrollbars="vertical" android:scrollbars="vertical"
android:layout_width="match_parent" android:layout_width="match_parent"
android:dividerHeight="0dp"
android:divider="@null"
android:paddingTop="3dp" android:paddingTop="3dp"
android:layout_height="match_parent" > android:layout_height="match_parent" >
</android.support.v7.widget.RecyclerView> </android.support.v7.widget.RecyclerView>

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

@ -1,20 +1,19 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android" <android.support.v7.widget.CardView
xmlns:card_view="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools" xmlns:tools="http://schemas.android.com/tools"
xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+id/headlines_row" android:id="@+id/headlines_row"
android:layout_width="fill_parent" android:layout_width="fill_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:paddingBottom="3dp" card_view:cardElevation="2dp"
android:paddingLeft="6dp" card_view:cardBackgroundColor="?headlineNormalBackground"
android:paddingRight="6dp"
android:paddingTop="3dp"
tools:ignore="HardcodedText" > tools:ignore="HardcodedText" >
<LinearLayout <LinearLayout
android:id="@+id/inner_row" android:id="@+id/inner_row"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:background="?headlineNormalBackground"
android:orientation="vertical" android:orientation="vertical"
android:paddingBottom="2dp" android:paddingBottom="2dp"
android:paddingLeft="6dp" android:paddingLeft="6dp"
@ -158,4 +157,4 @@
</LinearLayout> </LinearLayout>
</LinearLayout> </LinearLayout>
</FrameLayout> </android.support.v7.widget.CardView>

15
org.fox.ttrss/src/main/res/layout/headlines_row_selected.xml
View File

@ -1,18 +1,19 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android" <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"
android:id="@+id/headlines_row" android:id="@+id/headlines_row"
android:layout_width="fill_parent" android:layout_width="fill_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:paddingBottom="3dp" card_view:cardElevation="2dp"
android:paddingLeft="6dp" card_view:cardBackgroundColor="?headlineSelectedBackground"
android:paddingRight="6dp" tools:ignore="HardcodedText" >
android:paddingTop="3dp" >
<LinearLayout <LinearLayout
android:id="@+id/inner_row" android:id="@+id/inner_row"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:background="?headlineSelectedBackground"
android:orientation="vertical" android:orientation="vertical"
android:paddingBottom="2dp" android:paddingBottom="2dp"
android:paddingLeft="6dp" android:paddingLeft="6dp"
@ -156,4 +157,4 @@
</LinearLayout> </LinearLayout>
</LinearLayout> </LinearLayout>
</FrameLayout> </android.support.v7.widget.CardView>

15
org.fox.ttrss/src/main/res/layout/headlines_row_selected_unread.xml
View File

@ -1,18 +1,19 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android" <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"
android:id="@+id/headlines_row" android:id="@+id/headlines_row"
android:layout_width="fill_parent" android:layout_width="fill_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:paddingBottom="3dp" card_view:cardElevation="2dp"
android:paddingLeft="6dp" card_view:cardBackgroundColor="?headlineSelectedBackground"
android:paddingRight="6dp" tools:ignore="HardcodedText" >
android:paddingTop="3dp" >
<LinearLayout <LinearLayout
android:id="@+id/inner_row" android:id="@+id/inner_row"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:background="?headlineSelectedBackground"
android:orientation="vertical" android:orientation="vertical"
android:paddingBottom="2dp" android:paddingBottom="2dp"
android:paddingLeft="6dp" android:paddingLeft="6dp"
@ -157,4 +158,4 @@
</LinearLayout> </LinearLayout>
</LinearLayout> </LinearLayout>
</FrameLayout> </android.support.v7.widget.CardView>

15
org.fox.ttrss/src/main/res/layout/headlines_row_unread.xml
View File

@ -1,18 +1,19 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android" <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"
android:id="@+id/headlines_row" android:id="@+id/headlines_row"
android:layout_width="fill_parent" android:layout_width="fill_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:paddingBottom="3dp" card_view:cardElevation="2dp"
android:paddingLeft="6dp" card_view:cardBackgroundColor="?headlineUnreadBackground"
android:paddingRight="6dp" tools:ignore="HardcodedText" >
android:paddingTop="3dp" >
<LinearLayout <LinearLayout
android:id="@+id/inner_row" android:id="@+id/inner_row"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:background="?headlineUnreadBackground"
android:orientation="vertical" android:orientation="vertical"
android:paddingBottom="2dp" android:paddingBottom="2dp"
android:paddingLeft="6dp" android:paddingLeft="6dp"
@ -157,4 +158,4 @@
</LinearLayout> </LinearLayout>
</LinearLayout> </LinearLayout>
</FrameLayout> </android.support.v7.widget.CardView>

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

@ -9,9 +9,9 @@
<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/transparent</item> <item name="articleBackground">@android:color/transparent</item>
<item name="headlineSelectedBackground">@drawable/headline_row_selected</item> <item name="headlineSelectedBackground">#88b0f0</item>
<item name="headlineUnreadBackground">@drawable/headline_row_unread</item> <item name="headlineUnreadBackground">@android:color/white</item>
<item name="headlineNormalBackground">@drawable/headline_row</item> <item name="headlineNormalBackground">#f5f5f5</item>
<item name="feedsSelectedBackground">#88b0f0</item> <item name="feedsSelectedBackground">#88b0f0</item>
<item name="feedlistTextColor">@android:color/primary_text_light</item> <item name="feedlistTextColor">@android:color/primary_text_light</item>
<item name="feedlistSelectedTextColor">#ffffff</item> <item name="feedlistSelectedTextColor">#ffffff</item>
@ -41,9 +41,7 @@
<item name="feedlistBackground">@drawable/shadow_feeds_sepia</item> <item name="feedlistBackground">@drawable/shadow_feeds_sepia</item>
<item name="headlinesBackground">@drawable/shadow_headlines_sepia</item> <item name="headlinesBackground">@drawable/shadow_headlines_sepia</item>
<item name="headlinesBackgroundSolid">@drawable/paper_sepia</item> <item name="headlinesBackgroundSolid">@drawable/paper_sepia</item>
<item name="headlineUnreadBackground">@drawable/headline_row_unread_sepia</item> <!-- #F2EAE8 --> <item name="headlineSelectedBackground">#E5B0A0</item>
<item name="headlineNormalBackground">@drawable/headline_row_sepia</item>
<item name="headlineSelectedBackground">@drawable/headline_row_selected_sepia</item> <!-- #E5B0A0 -->
<item name="feedsSelectedBackground">#E5B0A0</item> <item name="feedsSelectedBackground">#E5B0A0</item>
<item name="articleBackground">@drawable/paper_sepia</item> <item name="articleBackground">@drawable/paper_sepia</item>
<item name="unreadCounterBackground">@drawable/counter_background_sepia</item> <item name="unreadCounterBackground">@drawable/counter_background_sepia</item>