Merge branch 'develop' into lock-queue

9 files changed, 16 insertions, 18 deletions

diff --git a/app/src/main/res/layout/downloaded_episodeslist_item.xml b/app/src/main/res/layout/downloaded_episodeslist_item.xml
index 65a08251f..3f8065466 100644
--- a/app/src/main/res/layout/downloaded_episodeslist_item.xml
+++ b/app/src/main/res/layout/downloaded_episodeslist_item.xml
@@ -17,7 +17,7 @@
         android:layout_marginTop="@dimen/listitem_threeline_verticalpadding"
         android:contentDescription="@string/cover_label"
         android:scaleType="centerCrop"
-        tools:src="@drawable/ic_stat_antenna_default"
+        tools:src="@drawable/ic_antenna"
         tools:background="@android:color/holo_green_dark"/>
 
 
diff --git a/app/src/main/res/layout/feeditem_fragment.xml b/app/src/main/res/layout/feeditem_fragment.xml
index 78c0b3b16..b047b3da0 100644
--- a/app/src/main/res/layout/feeditem_fragment.xml
+++ b/app/src/main/res/layout/feeditem_fragment.xml
@@ -36,7 +36,8 @@
                 android:layout_marginBottom="16dp"
                 android:contentDescription="@string/cover_label"
                 android:gravity="center_vertical"
-                tools:src="@drawable/ic_stat_antenna_default"
+                android:foreground="?attr/selectableItemBackground"
+                tools:src="@drawable/ic_antenna"
                 tools:background="@android:color/holo_green_dark" />
 
             <TextView
@@ -47,6 +48,7 @@
                 android:layout_alignTop="@id/imgvCover"
                 android:layout_toRightOf="@id/imgvCover"
                 android:layout_toEndOf="@id/imgvCover"
+                android:foreground="?attr/selectableItemBackground"
                 tools:text="Podcast title"
                 tools:background="@android:color/holo_green_dark" />
 
diff --git a/app/src/main/res/layout/feeditemlist_header.xml b/app/src/main/res/layout/feeditemlist_header.xml
index ba39307b0..596135d88 100644
--- a/app/src/main/res/layout/feeditemlist_header.xml
+++ b/app/src/main/res/layout/feeditemlist_header.xml
@@ -27,7 +27,7 @@
         android:layout_marginStart="16dp"
         android:layout_marginTop="16dp"
         android:contentDescription="@string/cover_label"
-        tools:src="@drawable/ic_stat_antenna_default"
+        tools:src="@drawable/ic_antenna"
         tools:background="@android:color/holo_green_dark"/>
 
     <ImageButton
@@ -37,11 +37,9 @@
         android:layout_alignParentRight="true"
         android:layout_alignParentEnd="true"
         android:layout_alignParentTop="true"
-        android:layout_marginLeft="8dp"
-        android:layout_marginStart="8dp"
-        android:layout_marginTop="16dp"
-        android:layout_marginRight="16dp"
-        android:layout_marginEnd="16dp"
+        android:layout_marginLeft="16dp"
+        android:layout_marginStart="16dp"
+        android:layout_marginTop="8dp"
         android:background="?attr/selectableItemBackground"
         android:contentDescription="@string/show_info_label"
         android:src="@drawable/ic_info_white_24dp"
@@ -57,8 +55,6 @@
         tools:background="@android:color/holo_green_dark"
         android:layout_below="@+id/butShowInfo"
         android:layout_marginBottom="16dp"
-        android:layout_marginRight="16dp"
-        android:layout_marginEnd="16dp"
         android:layout_alignParentRight="true"
         android:layout_alignParentEnd="true"/>
 
@@ -92,8 +88,8 @@
         android:layout_marginBottom="16dp"
         android:layout_marginLeft="16dp"
         android:layout_marginStart="16dp"
-        android:layout_marginRight="8dp"
-        android:layout_marginEnd="8dp"
+        android:layout_marginRight="16dp"
+        android:layout_marginEnd="16dp"
         android:layout_toLeftOf="@id/butShowSettings"
         android:layout_toStartOf="@id/butShowSettings"
         android:layout_toRightOf="@id/imgvCover"
diff --git a/app/src/main/res/layout/gpodnet_podcast_listitem.xml b/app/src/main/res/layout/gpodnet_podcast_listitem.xml
index 27a8bbdca..6e02fa090 100644
--- a/app/src/main/res/layout/gpodnet_podcast_listitem.xml
+++ b/app/src/main/res/layout/gpodnet_podcast_listitem.xml
@@ -23,7 +23,7 @@
         android:contentDescription="@string/cover_label"
         android:cropToPadding="true"
         android:scaleType="fitXY"
-        tools:src="@drawable/ic_stat_antenna_default"
+        tools:src="@drawable/ic_antenna"
         tools:background="@android:color/holo_green_dark" />
 
     <LinearLayout
diff --git a/app/src/main/res/layout/itunes_podcast_listitem.xml b/app/src/main/res/layout/itunes_podcast_listitem.xml
index 4848563b1..b2411c5df 100644
--- a/app/src/main/res/layout/itunes_podcast_listitem.xml
+++ b/app/src/main/res/layout/itunes_podcast_listitem.xml
@@ -25,7 +25,7 @@
         android:cropToPadding="true"
         android:scaleType="fitXY"
         tools:background="@android:color/holo_green_dark"
-        tools:src="@drawable/ic_stat_antenna_default" />
+        tools:src="@drawable/ic_antenna" />
 
     <LinearLayout
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/nav_feedlistitem.xml b/app/src/main/res/layout/nav_feedlistitem.xml
index 816870d1c..52833b3cd 100644
--- a/app/src/main/res/layout/nav_feedlistitem.xml
+++ b/app/src/main/res/layout/nav_feedlistitem.xml
@@ -25,7 +25,7 @@
         android:scaleType="centerCrop"
         android:layout_marginTop="4dp"
         android:layout_marginBottom="4dp"
-        tools:src="@drawable/ic_stat_antenna_default"
+        tools:src="@drawable/ic_antenna"
         tools:background="@android:color/holo_green_dark"/>
 
     <TextView
diff --git a/app/src/main/res/layout/queue_listitem.xml b/app/src/main/res/layout/queue_listitem.xml
index 6b41b68d5..1dcc34bce 100644
--- a/app/src/main/res/layout/queue_listitem.xml
+++ b/app/src/main/res/layout/queue_listitem.xml
@@ -51,7 +51,7 @@
             android:layout_height="@dimen/thumbnail_length_queue_item"
             android:layout_centerVertical="true"
             android:contentDescription="@string/cover_label"
-            tools:src="@drawable/ic_stat_antenna_default"
+            tools:src="@drawable/ic_antenna"
             tools:background="@android:color/holo_green_dark"/>
     </RelativeLayout>
 
diff --git a/app/src/main/res/layout/searchlist_item.xml b/app/src/main/res/layout/searchlist_item.xml
index 50374c737..4a055fea9 100644
--- a/app/src/main/res/layout/searchlist_item.xml
+++ b/app/src/main/res/layout/searchlist_item.xml
@@ -18,7 +18,7 @@
         android:layout_marginStart="@dimen/listitem_threeline_horizontalpadding"
         android:contentDescription="@string/cover_label"
         android:scaleType="centerCrop"
-        tools:src="@drawable/ic_stat_antenna_default"
+        tools:src="@drawable/ic_antenna"
         tools:background="@android:color/holo_green_dark"/>
 
     <LinearLayout
diff --git a/app/src/main/res/layout/statistics_listitem.xml b/app/src/main/res/layout/statistics_listitem.xml
index b186add9e..f52aa73e0 100644
--- a/app/src/main/res/layout/statistics_listitem.xml
+++ b/app/src/main/res/layout/statistics_listitem.xml
@@ -23,7 +23,7 @@
         android:scaleType="centerCrop"
         android:layout_marginTop="4dp"
         android:layout_marginBottom="4dp"
-        tools:src="@drawable/ic_stat_antenna_default"
+        tools:src="@drawable/ic_antenna"
         tools:background="@android:color/holo_green_dark"/>
 
     <TextView