Merge branch 'queue_update' into develop

2 files changed, 23 insertions, 50 deletions

diff --git a/res/layout/external_itemlist_item.xml b/res/layout/external_itemlist_item.xml
index fe1c29a19..6f2405abc 100644
--- a/res/layout/external_itemlist_item.xml
+++ b/res/layout/external_itemlist_item.xml
@@ -32,8 +32,8 @@
         android:layout_height="wrap_content"
         android:layout_alignParentTop="true"
         android:layout_marginLeft="8dp"
-        android:layout_marginTop="8dp"
         android:layout_marginRight="4dp"
+        android:layout_marginTop="8dp"
         android:layout_toLeftOf="@id/butAction"
         android:layout_toRightOf="@id/imgvFeedimage"
         android:ellipsize="end"
@@ -81,21 +81,15 @@
         android:layout_marginTop="4dp"
         android:layout_toLeftOf="@id/butAction" />
 
-    <TextView
-        android:id="@+id/statusUnread"
-        android:layout_width="wrap_content"
-        android:layout_height="18dp"
-        android:layout_alignParentRight="true"
-        android:layout_alignParentTop="true"
-        android:layout_margin="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" />
+    <ProgressBar
+        android:id="@+id/pbar_episode_progress"
+        style="?android:attr/progressBarStyleHorizontal"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:layout_below="@id/txtvFeedname"
+        android:layout_marginTop="4dp"
+        android:layout_toLeftOf="@id/imgvDownloadStatus"
+        android:layout_toRightOf="@id/txtvLenSize" />
 
     <ImageView
         android:id="@+id/statusPlaying"
@@ -109,21 +103,4 @@
         android:padding="2dp"
         android:src="@drawable/av_play_dark" />
 
-    <TextView
-        android:id="@+id/statusInProgress"
-        android:layout_width="wrap_content"
-        android:layout_height="18dp"
-        android:layout_alignParentRight="true"
-        android:layout_alignParentTop="true"
-        android:layout_margin="8dp"
-        android:background="@color/status_progress"
-        android:gravity="center"
-        android:minWidth="@dimen/status_indicator_width"
-        android:paddingLeft="2dp"
-        android:paddingRight="2dp"
-        android:textAlignment="center"
-        android:textColor="@color/white"
-        android:textSize="@dimen/text_size_micro"
-        android:textStyle="bold" />
-
 </RelativeLayout>
\ No newline at end of file
diff --git a/res/layout/feeditemlist_item.xml b/res/layout/feeditemlist_item.xml
index 2cc7ee703..4fbddbbac 100644
--- a/res/layout/feeditemlist_item.xml
+++ b/res/layout/feeditemlist_item.xml
@@ -87,6 +87,19 @@
         android:textColor="?android:attr/textColorTertiary"
         android:textSize="@dimen/text_size_micro" />
 
+    <ProgressBar
+        android:id="@+id/pbar_episode_progress"
+        style="?android:attr/progressBarStyleHorizontal"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:layout_below="@id/txtvPublished"
+        android:layout_marginBottom="4dp"
+        android:layout_marginLeft="4dp"
+        android:layout_marginRight="4dp"
+        android:layout_marginTop="2dp"
+        android:layout_toLeftOf="@id/imgvType"
+        android:layout_toRightOf="@id/txtvLenSize" />
+
     <ImageButton
         android:id="@id/butAction"
         android:layout_width="48dp"
@@ -131,21 +144,4 @@
         android:padding="2dp"
         android:src="@drawable/av_play_dark" />
 
-    <TextView
-        android:id="@+id/statusInProgress"
-        android:layout_width="wrap_content"
-        android:layout_height="18dp"
-        android:layout_alignParentRight="true"
-        android:layout_alignParentTop="true"
-        android:layout_margin="8dp"
-        android:background="@color/status_progress"
-        android:gravity="center"
-        android:minWidth="@dimen/status_indicator_width"
-        android:paddingLeft="2dp"
-        android:paddingRight="2dp"
-        android:textAlignment="center"
-        android:textColor="@color/white"
-        android:textSize="@dimen/text_size_micro"
-        android:textStyle="bold" />
-
 </RelativeLayout>
\ No newline at end of file