Merge branch 'develop'0.9.9.1

8 files changed, 61 insertions, 330 deletions

diff --git a/res/layout/feeditemlist_item.xml b/res/layout/feeditemlist_item.xml
index 147157c5a..f3701de2c 100644
--- a/res/layout/feeditemlist_item.xml
+++ b/res/layout/feeditemlist_item.xml
@@ -18,7 +18,6 @@
             android:layout_width="fill_parent"
             android:layout_height="wrap_content"
             android:layout_alignParentTop="true"
-            android:layout_marginBottom="4dp"
             android:textColor="?android:attr/textColorTertiary"
             android:textSize="@dimen/text_size_micro"/>
 
@@ -28,7 +27,6 @@
             android:layout_height="wrap_content"
             android:layout_below="@id/txtvPublished"
             android:layout_marginBottom="8dp"
-            android:layout_marginRight="4dp"
             style="@style/AntennaPod.TextView.ListItemPrimaryTitle"/>
 
 
@@ -59,7 +57,6 @@
             android:layout_alignParentLeft="true"
             android:layout_below="@id/txtvItemname"
             android:maxLines="2"
-            android:layout_marginBottom="2dp"
             android:textColor="?android:attr/textColorTertiary"
             android:textSize="@dimen/text_size_micro"/>
 
@@ -77,22 +74,11 @@
 
         <TextView
             android:id="@+id/statusUnread"
-            android:contentDescription="@string/status_unread_label"
             android:layout_width="wrap_content"
-            android:layout_height="18dp"
+            android:layout_height="wrap_content"
+            style="@style/AntennaPod.TextView.UnreadIndicator"
             android:layout_alignParentRight="true"
-            android:layout_alignParentTop="true"
-            android:layout_marginLeft="8dp"
-            android:layout_marginBottom="8dp"
-            android:background="@color/status_unread"
-            android:gravity="center"
-            android:minWidth="@dimen/status_indicator_width"
-            android:text="@string/new_label"
-            android:textAlignment="center"
-            android:textColor="@color/white"
-            android:textSize="@dimen/text_size_micro"
-            android:textStyle="bold"/>
-
+            android:layout_alignParentTop="true"/>
     </RelativeLayout>
 
     <View
diff --git a/res/layout/feedlist_item.xml b/res/layout/feedlist_item.xml
deleted file mode 100644
index f6c43675d..000000000
--- a/res/layout/feedlist_item.xml
+++ /dev/null
@@ -1,129 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-                xmlns:tools="http://schemas.android.com/tools"
-                android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:paddingRight="8dp" >
-
-    <ImageView
-        android:id="@+id/imgvFeedimage"
-        android:contentDescription="@string/cover_label"
-        android:layout_width="@dimen/thumbnail_length"
-        android:layout_height="@dimen/thumbnail_length"
-        android:layout_alignParentLeft="true"
-        android:layout_centerVertical="true"
-        android:layout_marginRight="4dip"
-        android:adjustViewBounds="true"
-        android:cropToPadding="true"
-        android:scaleType="fitXY" />
-
-    <LinearLayout
-        android:id="@+id/lEpisodeCounts"
-        android:layout_width="wrap_content"
-        android:layout_height="fill_parent"
-        android:layout_alignParentRight="true"
-        android:layout_centerVertical="true"
-        android:orientation="vertical" >
-
-        <RelativeLayout
-            android:id="@+id/lNewStatusLabel"
-            android:contentDescription="@string/new_episodes_count_label"
-            android:layout_width="@dimen/status_indicator_width"
-            android:layout_height="0dip"
-            android:layout_marginBottom="8dp"
-            android:layout_marginTop="4dp"
-            android:layout_weight="1"
-            android:background="@color/status_unread" >
-
-            <ImageView
-                android:layout_width="wrap_content"
-                android:layout_height="match_parent"
-                android:layout_alignParentRight="true"
-                android:layout_centerVertical="true"
-                android:layout_marginRight="4dp"
-                android:src="@drawable/white_circle"
-                tools:ignore="ContentDescription"/>
-
-            <TextView
-                android:id="@+id/txtvNewEps"
-                android:layout_width="wrap_content"
-                android:layout_height="fill_parent"
-                android:layout_alignParentLeft="true"
-                android:layout_centerVertical="true"
-                android:layout_marginLeft="4dp"
-                android:layout_marginRight="8dp"
-                android:maxLines="1"
-                android:minEms="2"
-                android:textColor="@color/white"
-                android:textSize="@dimen/text_size_micro"
-                android:textStyle="bold" />
-        </RelativeLayout>
-
-        <RelativeLayout
-            android:id="@+id/lProgressStatusLabel"
-            android:contentDescription="@string/in_progress_episodes_count_label"
-            android:layout_width="@dimen/status_indicator_width"
-            android:layout_height="0dip"
-            android:layout_marginBottom="8dp"
-            android:layout_weight="1"
-            android:background="@color/ics_gray" >
-
-            <TextView
-                android:id="@+id/txtvProgressEps"
-                android:layout_width="wrap_content"
-                android:layout_height="fill_parent"
-                android:layout_alignParentLeft="true"
-                android:layout_centerVertical="true"
-                android:background="@color/status_progress"
-                android:maxLines="1"
-                android:minEms="2"
-                android:paddingLeft="4dp"
-                android:textColor="@color/white"
-                android:textSize="@dimen/text_size_micro"
-                android:textStyle="bold" />
-
-            <ImageView
-                android:layout_width="10dp"
-                android:layout_height="8dp"
-                android:layout_alignParentRight="true"
-                android:layout_centerVertical="true"
-                android:layout_marginRight="2dp"
-                android:layout_marginLeft="2dp"
-                android:src="@drawable/av_play_dark"
-                tools:ignore="ContentDescription"/>
-        </RelativeLayout>
-    </LinearLayout>
-
-    <LinearLayout
-        android:layout_width="0dp"
-        android:layout_height="match_parent"
-        android:layout_centerVertical="true"
-        android:layout_toLeftOf="@id/lEpisodeCounts"
-        android:layout_toRightOf="@id/imgvFeedimage"
-        android:orientation="vertical" >
-
-        <TextView
-            android:id="@+id/txtvFeedname"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:ellipsize="end"
-            android:maxLines="1"
-            android:textColor="?android:attr/textColorPrimary"
-            android:textSize="@dimen/text_size_small" />
-
-        <TextView
-            android:id="@+id/txtvNumEpisodes"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:textColor="?android:attr/textColorSecondary"
-            android:textSize="@dimen/text_size_micro" />
-
-        <TextView
-            android:id="@+id/txtvLastUpdate"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:textColor="?android:attr/textColorSecondary"
-            android:textSize="@dimen/text_size_micro" />
-    </LinearLayout>
-
-</RelativeLayout>
\ No newline at end of file
diff --git a/res/layout/feedlist_item_grid.xml b/res/layout/feedlist_item_grid.xml
deleted file mode 100644
index 934904374..000000000
--- a/res/layout/feedlist_item_grid.xml
+++ /dev/null
@@ -1,138 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-                xmlns:tools="http://schemas.android.com/tools"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content">
-
-    <ImageView
-        android:id="@+id/imgvFeedimage"
-        android:contentDescription="@string/cover_label"
-        android:layout_width="@dimen/thumbnail_length"
-        android:layout_height="@dimen/thumbnail_length"
-        android:layout_alignParentTop="true"
-        android:layout_centerHorizontal="true"
-        android:layout_margin="8dp"
-        android:adjustViewBounds="true"
-        android:cropToPadding="true"
-        android:scaleType="fitXY"/>
-
-    <LinearLayout
-        android:id="@+id/lEpisodeCounts"
-        android:layout_width="wrap_content"
-        android:layout_height="fill_parent"
-        android:layout_alignRight="@id/imgvFeedimage"
-        android:layout_below="@id/imgvFeedimage"
-        android:layout_centerVertical="true"
-        android:orientation="vertical">
-
-        <RelativeLayout
-            android:id="@+id/lNewStatusLabel"
-            android:contentDescription="@string/new_episodes_count_label"
-            android:layout_width="@dimen/status_indicator_width"
-            android:layout_height="0dip"
-            android:layout_marginBottom="8dp"
-            android:layout_marginTop="4dp"
-            android:layout_weight="1"
-            android:background="@color/status_unread">
-
-            <ImageView
-                android:layout_width="wrap_content"
-                android:layout_height="match_parent"
-                android:layout_alignParentRight="true"
-                android:layout_centerVertical="true"
-                android:layout_marginRight="4dp"
-                android:src="@drawable/white_circle"
-                tools:ignore="ContentDescription"/>
-
-            <TextView
-                android:id="@+id/txtvNewEps"
-                android:layout_width="wrap_content"
-                android:layout_height="fill_parent"
-                android:layout_alignParentLeft="true"
-                android:layout_centerVertical="true"
-                android:layout_marginLeft="4dp"
-                android:layout_marginRight="8dp"
-                android:maxLines="1"
-                android:minEms="2"
-                android:textColor="@color/white"
-                android:textSize="@dimen/text_size_micro"
-                android:textStyle="bold"/>
-        </RelativeLayout>
-
-        <RelativeLayout
-            android:id="@+id/lProgressStatusLabel"
-            android:contentDescription="@string/in_progress_episodes_count_label"
-            android:layout_width="@dimen/status_indicator_width"
-            android:layout_height="0dip"
-            android:layout_marginBottom="8dp"
-            android:layout_weight="1"
-            android:background="@color/ics_gray">
-
-            <TextView
-                android:id="@+id/txtvProgressEps"
-                android:layout_width="wrap_content"
-                android:layout_height="fill_parent"
-                android:layout_alignParentLeft="true"
-                android:layout_centerVertical="true"
-                android:background="@color/status_progress"
-                android:maxLines="1"
-                android:minEms="2"
-                android:paddingLeft="4dp"
-                android:textColor="@color/white"
-                android:textSize="@dimen/text_size_micro"
-                android:textStyle="bold"/>
-
-            <ImageView
-                android:layout_width="10dp"
-                android:layout_height="8dp"
-                android:layout_alignParentRight="true"
-                android:layout_centerVertical="true"
-                android:layout_marginLeft="2dp"
-                android:layout_marginRight="2dp"
-                android:src="@drawable/av_play_dark"
-                tools:ignore="ContentDescription"/>
-        </RelativeLayout>
-    </LinearLayout>
-
-    <LinearLayout
-        android:layout_width="0dp"
-        android:layout_height="wrap_content"
-        android:layout_alignLeft="@id/imgvFeedimage"
-        android:layout_below="@id/imgvFeedimage"
-        android:layout_toLeftOf="@id/lEpisodeCounts"
-        android:orientation="vertical">
-
-        <TextView
-            android:id="@+id/txtvFeedname"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginBottom="8dp"
-            android:layout_marginRight="8dp"
-            android:ellipsize="end"
-            android:lines="1"
-            android:textSize="@dimen/text_size_small"
-            android:textColor="?android:attr/textColorPrimary"
-            android:textStyle="bold"/>
-
-        <TextView
-            android:id="@+id/txtvLastUpdate"
-            android:lines="2"
-            android:ellipsize="end"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:textSize="@dimen/text_size_micro"
-            android:textColor="?android:attr/textColorTertiary"/>
-
-        <TextView
-            android:id="@+id/txtvNumEpisodes"
-            android:lines="1"
-            android:ellipsize="end"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginBottom="8dp"
-            android:layout_marginRight="8dp"
-            android:textSize="@dimen/text_size_micro"
-            android:textColor="?android:attr/textColorTertiary"/>
-    </LinearLayout>
-
-</RelativeLayout>
\ No newline at end of file
diff --git a/res/layout/nav_feedlistitem.xml b/res/layout/nav_feedlistitem.xml
index e01087077..d94c9ada1 100644
--- a/res/layout/nav_feedlistitem.xml
+++ b/res/layout/nav_feedlistitem.xml
@@ -24,6 +24,7 @@
         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"
diff --git a/res/layout/nav_listitem.xml b/res/layout/nav_listitem.xml
index 585ee7528..9d70e7d7c 100644
--- a/res/layout/nav_listitem.xml
+++ b/res/layout/nav_listitem.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-              android:orientation="vertical"
-              android:layout_width="match_parent"
-              android:layout_height="match_parent">
+                android:orientation="vertical"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent">
 
     <ImageView
         android:id="@+id/imgvCover"
@@ -24,6 +24,7 @@
         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"
@@ -35,4 +36,18 @@
         android:layout_marginRight="48dp"
         android:layout_toRightOf="@id/imgvCover"
         />
+
+    <TextView
+        android:id="@+id/txtvCount"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:lines="1"
+        android:textColor="?android:attr/textColorTertiary"
+        android:textSize="@dimen/text_size_navdrawer"
+        android:layout_marginLeft="12dp"
+        android:layout_marginTop="14dp"
+        android:layout_marginBottom="14dp"
+        android:layout_marginRight="16dp"
+        android:layout_alignParentRight="true"
+        android:layout_centerVertical="true"/>
 </RelativeLayout>
\ No newline at end of file
diff --git a/res/layout/new_episodes_fragment.xml b/res/layout/new_episodes_fragment.xml
index b091659fa..63c712f57 100644
--- a/res/layout/new_episodes_fragment.xml
+++ b/res/layout/new_episodes_fragment.xml
@@ -6,11 +6,6 @@
              android:layout_width="match_parent"
              android:layout_height="match_parent">
 
-    <android.support.v4.widget.SwipeRefreshLayout
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:id="@+id/swipeRefreshLayout">
-
         <com.mobeta.android.dslv.DragSortListView
             android:id="@android:id/list"
             android:scrollbarStyle="outsideOverlay"
@@ -29,8 +24,6 @@
             dslv:float_background_color="?attr/dragview_float_background"
             dslv:use_default_controller="true"/>
 
-    </android.support.v4.widget.SwipeRefreshLayout>
-
     <TextView
         android:id="@id/android:empty"
         android:layout_width="match_parent"
diff --git a/res/layout/new_episodes_listitem.xml b/res/layout/new_episodes_listitem.xml
index be9348b78..dcef1f8fc 100644
--- a/res/layout/new_episodes_listitem.xml
+++ b/res/layout/new_episodes_listitem.xml
@@ -6,29 +6,25 @@
               android:orientation="horizontal"
               android:layout_height="match_parent">
 
+    <ImageView
+        android:id="@+id/imgvImage"
+        android:contentDescription="@string/cover_label"
+        android:layout_width="@dimen/thumbnail_length_itemlist"
+        android:layout_height="@dimen/thumbnail_length_itemlist"
+        android:scaleType="centerCrop"/>
+
     <RelativeLayout
         android:layout_width="0dp"
         android:layout_height="match_parent"
         android:layout_weight="1"
-        android:layout_marginRight="8dp">
-
-        <ImageView
-            android:id="@+id/imgvImage"
-            android:contentDescription="@string/cover_label"
-            android:layout_width="@dimen/thumbnail_length_itemlist"
-            android:layout_height="@dimen/thumbnail_length_itemlist"
-            android:layout_alignParentLeft="true"
-            android:scaleType="centerCrop"/>
+        android:layout_margin="4dp">
 
         <TextView
             android:id="@+id/txtvPublished"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
-            android:layout_marginLeft="8dp"
-            android:layout_marginRight="8dp"
-            android:layout_marginTop="4dp"
             android:layout_alignParentTop="true"
-            android:layout_toRightOf="@id/imgvImage"
+            android:layout_alignParentLeft="true"
             android:layout_alignParentRight="true"
             android:ellipsize="end"
             android:maxLines="1"
@@ -40,18 +36,24 @@
             android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:layout_below="@id/txtvPublished"
-            android:layout_marginLeft="8dp"
-            android:layout_marginTop="2dp"
-            android:layout_toRightOf="@id/imgvImage"
+            android:layout_alignParentLeft="true"
             android:layout_alignParentRight="true"
             style="@style/AntennaPod.TextView.ListItemPrimaryTitle"/>
 
+        <TextView
+            android:id="@+id/statusUnread"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_alignParentRight="true"
+            android:layout_alignParentTop="true"
+            style="@style/AntennaPod.TextView.UnreadIndicator"/>
+
         <LinearLayout
             android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:layout_alignParentBottom="true"
             android:layout_alignParentRight="true"
-            android:layout_toRightOf="@id/imgvImage"
+            android:layout_alignParentLeft="true"
             android:orientation="vertical">
 
             <RelativeLayout
@@ -74,7 +76,6 @@
                     android:layout_width="0dp"
                     android:layout_height="wrap_content"
                     android:layout_toLeftOf="@id/imgvInPlaylist"
-                    android:layout_marginLeft="8dp"
                     android:layout_marginRight="8dp"
                     android:layout_alignParentLeft="true"/>
 
@@ -83,8 +84,6 @@
                     android:layout_width="0dp"
                     android:layout_height="wrap_content"
                     android:layout_toLeftOf="@id/imgvInPlaylist"
-                    android:layout_marginLeft="8dp"
-                    android:layout_marginRight="8dp"
                     android:layout_alignParentLeft="true"
                     android:textColor="?android:attr/textColorTertiary"
                     android:textSize="@dimen/text_size_micro"/>
diff --git a/res/layout/queue_listitem.xml b/res/layout/queue_listitem.xml
index a2545097f..4a55cd466 100644
--- a/res/layout/queue_listitem.xml
+++ b/res/layout/queue_listitem.xml
@@ -15,30 +15,27 @@
         android:layout_margin="8dp"
         android:contentDescription="@string/drag_handle_content_description"/>
 
+    <ImageView
+        android:id="@+id/imgvImage"
+        android:contentDescription="@string/cover_label"
+        android:layout_width="@dimen/thumbnail_length_queue_item"
+        android:layout_height="@dimen/thumbnail_length_queue_item"
+        android:scaleType="centerCrop"/>
+
     <RelativeLayout
         android:layout_width="0dp"
         android:layout_height="match_parent"
         android:layout_weight="1"
-        android:layout_marginRight="8dp">
-
-        <ImageView
-            android:id="@+id/imgvImage"
-            android:contentDescription="@string/cover_label"
-            android:layout_width="@dimen/thumbnail_length_queue_item"
-            android:layout_height="@dimen/thumbnail_length_queue_item"
-            android:layout_alignParentLeft="true"
-            android:scaleType="centerCrop"/>
+        android:layout_margin="8dp">
 
         <TextView
             android:id="@+id/txtvTitle"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
-            android:layout_centerVertical="true"
-            android:layout_marginLeft="8dp"
-            android:layout_marginTop="4dp"
             android:layout_marginBottom="4dp"
-            android:layout_toRightOf="@id/imgvImage"
+            android:layout_alignParentTop="true"
             android:layout_alignParentRight="true"
+            android:layout_alignParentLeft="true"
             android:ellipsize="end"
             android:lines="2"
             android:textColor="?android:attr/textColorPrimary"
@@ -49,7 +46,7 @@
             android:layout_height="wrap_content"
             android:layout_alignParentBottom="true"
             android:layout_alignParentRight="true"
-            android:layout_toRightOf="@id/imgvImage"
+            android:layout_alignParentLeft="true"
             android:orientation="vertical">
 
             <RelativeLayout
@@ -57,6 +54,14 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content">
 
+                <TextView
+                    android:id="@+id/txtvPosition"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_alignParentLeft="true"
+                    android:textColor="?android:attr/textColorTertiary"
+                    android:textSize="@dimen/text_size_micro"/>
+
                 <ProgressBar
                     android:id="@+id/pbar_download_progress"
                     style="?android:attr/progressBarStyleHorizontal"
@@ -65,8 +70,7 @@
                     android:layout_height="wrap_content"
                     android:layout_alignParentRight="true"
                     android:layout_marginLeft="8dp"
-                    android:layout_marginRight="8dp"
-                    android:layout_alignParentLeft="true"/>
+                    android:layout_toRightOf="@id/txtvPosition"/>
 
             </RelativeLayout>
         </LinearLayout>