Merge pull request #1619 from mfietz/issue/1222-completed-downloads-gears

Completed Downloads: Gears Dialog

4 files changed, 82 insertions, 57 deletions

diff --git a/app/src/main/res/layout/downloaded_episodeslist_item.xml b/app/src/main/res/layout/downloaded_episodeslist_item.xml
index 6b5f7369a..760b6b9db 100644
--- a/app/src/main/res/layout/downloaded_episodeslist_item.xml
+++ b/app/src/main/res/layout/downloaded_episodeslist_item.xml
@@ -22,7 +22,7 @@
 
     <RelativeLayout
         android:layout_width="0dp"
-        android:layout_height="match_parent"
+        android:layout_height="@dimen/thumbnail_length_downloaded_item"
         android:layout_marginLeft="@dimen/listitem_threeline_textleftpadding"
         android:layout_marginRight="@dimen/listitem_threeline_textrightpadding"
         android:layout_marginTop="@dimen/listitem_threeline_verticalpadding"
@@ -48,7 +48,7 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_alignParentLeft="true"
-            android:layout_below="@id/txtvTitle"
+            android:layout_alignParentBottom="true"
             tools:text="23 MB"
             tools:background="@android:color/holo_green_dark" />
 
@@ -58,10 +58,23 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_alignParentRight="true"
-            android:layout_below="@id/txtvTitle"
+            android:layout_alignParentBottom="true"
+            android:layout_marginLeft="8dp"
             tools:text="Jan 23"
             tools:background="@android:color/holo_green_dark" />
 
+        <ImageView
+            android:id="@+id/imgvInPlaylist"
+            android:layout_width="@dimen/enc_icons_size"
+            android:layout_height="@dimen/enc_icons_size"
+            android:layout_toLeftOf="@id/txtvPublished"
+            android:layout_alignParentBottom="true"
+            android:contentDescription="@string/in_queue_label"
+            android:src="?attr/stat_playlist"
+            android:visibility="visible"
+            tools:src="@drawable/ic_list_white_24dp"
+            tools:background="@android:color/holo_red_light" />
+
     </RelativeLayout>
 
     <include layout="@layout/vertical_list_divider"/>
diff --git a/app/src/main/res/layout/episodes_apply_action_fragment.xml b/app/src/main/res/layout/episodes_apply_action_fragment.xml
index d63088662..e9a2e2e23 100644
--- a/app/src/main/res/layout/episodes_apply_action_fragment.xml
+++ b/app/src/main/res/layout/episodes_apply_action_fragment.xml
@@ -1,16 +1,16 @@
-<RelativeLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
+<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">
 
 
     <LinearLayout
         android:id="@+id/bottomBar"
-        android:layout_width="wrap_content"
+        android:layout_width="match_parent"
         android:layout_height="68dp"
         android:layout_alignParentBottom="true"
-        android:orientation="horizontal"
         android:gravity="center_vertical"
+        android:orientation="horizontal"
         android:padding="4dp">
 
         <Button
@@ -18,103 +18,98 @@
             android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:layout_weight="1"
+            android:background="@android:color/transparent"
             android:drawableTop="?attr/content_new"
             android:text="@string/add_to_queue_label"
-            android:textSize="10sp"
-            android:background="@android:color/transparent"/>
+            android:textSize="10sp" />
 
-        <View xmlns:android="http://schemas.android.com/apk/res/android"
-              xmlns:tools="http://schemas.android.com/tools"
-              android:layout_width="1dp"
-              android:layout_height="match_parent"
-              android:layout_margin="4dp"
-              android:background="?android:attr/listDivider"
-              tools:background="@android:color/holo_red_dark" />
+        <View
+            android:id="@+id/divider1"
+            android:layout_width="1dp"
+            android:layout_height="match_parent"
+            android:layout_margin="4dp"
+            android:background="?android:attr/listDivider"
+            tools:background="@android:color/holo_red_dark" />
 
         <Button
             android:id="@+id/btnMarkAsPlayed"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:layout_weight="1"
+            android:background="@android:color/transparent"
             android:drawableTop="?attr/navigation_accept"
             android:text="@string/mark_read_label"
-            android:textSize="10sp"
-            android:background="@android:color/transparent"/>
+            android:textSize="10sp" />
 
-        <View xmlns:android="http://schemas.android.com/apk/res/android"
-              xmlns:tools="http://schemas.android.com/tools"
-              android:layout_width="1dp"
-              android:layout_height="match_parent"
-              android:layout_margin="4dp"
-              android:background="?android:attr/listDivider"
-              tools:background="@android:color/holo_red_dark" />
+        <View
+            android:id="@+id/divider2"
+            android:layout_width="1dp"
+            android:layout_height="match_parent"
+            android:layout_margin="4dp"
+            android:background="?android:attr/listDivider"
+            tools:background="@android:color/holo_red_dark" />
 
         <Button
             android:id="@+id/btnMarkAsUnplayed"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:layout_weight="1"
+            android:background="@android:color/transparent"
             android:drawableTop="?attr/navigation_cancel"
             android:text="@string/mark_unread_label"
-            android:textSize="10sp"
-            android:background="@android:color/transparent"/>
+            android:textSize="10sp" />
 
-        <View xmlns:android="http://schemas.android.com/apk/res/android"
-              xmlns:tools="http://schemas.android.com/tools"
-              android:layout_width="1dp"
-              android:layout_height="match_parent"
-              android:layout_margin="4dp"
-              android:background="?android:attr/listDivider"
-              tools:background="@android:color/holo_red_dark" />
+        <View
+            android:id="@+id/divider3"
+            android:layout_width="1dp"
+            android:layout_height="match_parent"
+            android:layout_margin="4dp"
+            android:background="?android:attr/listDivider"
+            tools:background="@android:color/holo_red_dark" />
 
         <Button
             android:id="@+id/btnDownload"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:layout_weight="1"
+            android:background="@android:color/transparent"
             android:drawableTop="?attr/av_download"
             android:text="@string/download_label"
-            android:textSize="10sp"
-            android:background="@android:color/transparent"/>
+            android:textSize="10sp" />
 
-        <View xmlns:android="http://schemas.android.com/apk/res/android"
-              xmlns:tools="http://schemas.android.com/tools"
-              android:layout_width="1dp"
-              android:layout_height="match_parent"
-              android:layout_margin="4dp"
-              android:background="?android:attr/listDivider"
-              tools:background="@android:color/holo_red_dark" />
+        <View
+            android:id="@+id/divider4"
+            android:layout_width="1dp"
+            android:layout_height="match_parent"
+            android:layout_margin="4dp"
+            android:background="?android:attr/listDivider"
+            tools:background="@android:color/holo_red_dark" />
 
         <Button
             android:id="@+id/btnDelete"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:layout_weight="1"
+            android:background="@android:color/transparent"
             android:drawableTop="?attr/content_discard"
             android:text="@string/remove_episode_lable"
-            android:textSize="10sp"
-            android:background="@android:color/transparent"/>
+            android:textSize="10sp" />
 
     </LinearLayout>
 
     <View
-        xmlns:android="http://schemas.android.com/apk/res/android"
-        xmlns:tools="http://schemas.android.com/tools"
         android:id="@+id/divider"
-          android:layout_width="match_parent"
-          android:layout_height="1dp"
-          android:background="?android:attr/listDivider"
-          android:paddingBottom="4dp"
-          android:layout_above="@id/bottomBar"
-          tools:background="@android:color/holo_red_dark" />
+        android:layout_width="match_parent"
+        android:layout_height="1dp"
+        android:layout_above="@id/bottomBar"
+        android:background="?android:attr/listDivider"
+        android:paddingBottom="4dp"
+        tools:background="@android:color/holo_red_dark" />
 
     <ListView
         android:id="@android:id/list"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_above="@id/divider">
-
-    </ListView>
-
+        android:layout_above="@id/divider"/>
 
 </RelativeLayout>
diff --git a/app/src/main/res/menu/downloads_completed.xml b/app/src/main/res/menu/downloads_completed.xml
new file mode 100644
index 000000000..dc2996893
--- /dev/null
+++ b/app/src/main/res/menu/downloads_completed.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<menu
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:custom="http://schemas.android.com/apk/res-auto">
+
+    <item
+        android:id="@+id/episode_actions"
+        android:menuCategory="container"
+        android:title="@string/episode_actions"
+        custom:showAsAction="always">
+    </item>
+
+</menu>
diff --git a/app/src/main/res/menu/episodes_apply_action_options.xml b/app/src/main/res/menu/episodes_apply_action_options.xml
index 90cba0966..3df88046d 100644
--- a/app/src/main/res/menu/episodes_apply_action_options.xml
+++ b/app/src/main/res/menu/episodes_apply_action_options.xml
@@ -42,6 +42,10 @@
                   android:title="@string/downloaded_label"/>
             <item android:id="@+id/check_not_downloaded"
                   android:title="@string/not_downloaded_label"/>
+            <item android:id="@+id/check_queued"
+                android:title="@string/queued_label"/>
+            <item android:id="@+id/check_not_queued"
+                android:title="@string/not_queued_label"/>
         </menu>
     </item>