Merge remote-tracking branch 'antennapod/develop' into per_feed_playbackspeed

1 files changed, 44 insertions, 52 deletions

diff --git a/app/src/main/res/layout/statistics_listitem.xml b/app/src/main/res/layout/statistics_listitem.xml
index b186add9e..6bd2a907e 100644
--- a/app/src/main/res/layout/statistics_listitem.xml
+++ b/app/src/main/res/layout/statistics_listitem.xml
@@ -3,63 +3,55 @@
                 xmlns:tools="http://schemas.android.com/tools"
                 android:orientation="vertical"
                 android:layout_width="match_parent"
-                android:layout_height="@dimen/listitem_iconwithtext_height"
-                android:paddingLeft="@dimen/listitem_threeline_verticalpadding"
-                android:paddingStart="@dimen/listitem_threeline_verticalpadding"
-                android:paddingRight="@dimen/listitem_threeline_verticalpadding"
-                android:paddingEnd="@dimen/listitem_threeline_verticalpadding"
-                tools:background="@android:color/darker_gray">
+                android:layout_height="wrap_content"
+                android:paddingLeft="16dp"
+                android:paddingRight="16dp"
+                android:paddingTop="8dp"
+                android:paddingBottom="8dp"
+                android:background="?android:attr/selectableItemBackground">
 
     <ImageView
-        android:id="@+id/imgvCover"
-        android:contentDescription="@string/cover_label"
-        android:layout_width="@dimen/thumbnail_length_navlist"
-        android:layout_height="@dimen/thumbnail_length_navlist"
-        android:layout_alignParentLeft="true"
-        android:layout_alignParentStart="true"
-        android:layout_centerVertical="true"
-        android:adjustViewBounds="true"
-        android:cropToPadding="true"
-        android:scaleType="centerCrop"
-        android:layout_marginTop="4dp"
-        android:layout_marginBottom="4dp"
-        tools:src="@drawable/ic_stat_antenna_default"
-        tools:background="@android:color/holo_green_dark"/>
+            android:id="@+id/imgvCover"
+            android:contentDescription="@string/cover_label"
+            android:layout_width="40dp"
+            android:layout_height="40dp"
+            android:layout_alignParentLeft="true"
+            android:layout_alignParentStart="true"
+            android:layout_centerVertical="true"
+            android:adjustViewBounds="true"
+            android:cropToPadding="true"
+            android:scaleType="centerCrop"
+            tools:src="@drawable/ic_antenna"
+            tools:background="@android:color/holo_green_dark"/>
 
     <TextView
-        android:id="@+id/txtvTime"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginLeft="@dimen/list_vertical_padding"
-        android:layout_marginStart="@dimen/list_vertical_padding"
-        android:lines="1"
-        android:textColor="?android:attr/textColorTertiary"
-        android:textSize="@dimen/text_size_navdrawer"
-        android:layout_alignParentRight="true"
-        android:layout_alignParentEnd="true"
-        android:layout_centerVertical="true"
-        tools:text="23"
-        tools:background="@android:color/holo_green_dark"/>
+            android:id="@+id/txtvTitle"
+            android:lines="1"
+            android:ellipsize="end"
+            android:singleLine="true"
+            android:textColor="?android:attr/textColorPrimary"
+            android:textSize="16sp"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginLeft="16dp"
+            android:layout_marginStart="16dp"
+            android:layout_toRightOf="@id/imgvCover"
+            android:layout_alignTop="@id/imgvCover"
+            android:layout_alignWithParentIfMissing="true"
+            tools:text="Feed title"/>
 
     <TextView
-        android:id="@+id/txtvTitle"
-        android:lines="1"
-        android:ellipsize="end"
-        android:singleLine="true"
-        android:layout_centerVertical="true"
-        android:textColor="?android:attr/textColorPrimary"
-        android:textSize="@dimen/text_size_navdrawer"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginLeft="@dimen/listitem_iconwithtext_textleftpadding"
-        android:layout_marginStart="@dimen/listitem_iconwithtext_textleftpadding"
-        android:layout_toRightOf="@id/imgvCover"
-        android:layout_toEndOf="@id/imgvCover"
-        android:layout_toLeftOf="@id/txtvTime"
-        android:layout_toStartOf="@id/txtvTime"
-        android:layout_alignWithParentIfMissing="true"
-        tools:text="Navigation feed item title"
-        tools:background="@android:color/holo_green_dark"/>
-
+            android:id="@+id/txtvTime"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:lines="1"
+            android:textColor="?android:attr/textColorTertiary"
+            android:textSize="14sp"
+            android:layout_toEndOf="@+id/imgvCover"
+            android:layout_toRightOf="@+id/imgvCover"
+            android:layout_marginLeft="16dp"
+            android:layout_marginStart="16dp"
+            android:layout_below="@+id/txtvTitle"
+            tools:text="23 hours"/>
 
 </RelativeLayout>