Merge branch 'issue-39' into develop

Conflicts:
	res/values/ids.xml

9 files changed, 205 insertions, 4 deletions

diff --git a/res/drawable/dragview_background.xml b/res/drawable/dragview_background.xml
new file mode 100644
index 000000000..32cfa88b6
--- /dev/null
+++ b/res/drawable/dragview_background.xml
@@ -0,0 +1,54 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android" >
+
+    <item>
+        <shape android:shape="rectangle" >
+            <corners android:radius="3dp" />
+
+            <solid android:color="#D2D2D2" />
+        </shape>
+    </item>
+    <item android:top="10dp">
+        <shape android:shape="rectangle" >
+            <corners android:radius="3dp" />
+
+            <solid android:color="#ECECEC" />
+        </shape>
+    </item>
+    <item android:top="20dp">
+        <shape android:shape="rectangle" >
+            <corners android:radius="3dp" />
+
+            <solid android:color="#D2D2D2" />
+        </shape>
+    </item>
+    <item android:top="30dp">
+        <shape android:shape="rectangle" >
+            <corners android:radius="3dp" />
+
+            <solid android:color="#ECECEC" />
+        </shape>
+    </item>
+    <item android:top="40dp">
+        <shape android:shape="rectangle" >
+            <corners android:radius="3dp" />
+
+            <solid android:color="#D2D2D2" />
+        </shape>
+    </item>
+    <item android:top="50dp">
+        <shape android:shape="rectangle" >
+            <corners android:radius="3dp" />
+
+            <solid android:color="#ECECEC" />
+        </shape>
+    </item>
+    <item android:top="60dp">
+        <shape android:shape="rectangle" >
+            <corners android:radius="3dp" />
+
+            <solid android:color="#D2D2D2" />
+        </shape>
+    </item>
+
+</layer-list>
\ No newline at end of file
diff --git a/res/drawable/dragview_background_dark.xml b/res/drawable/dragview_background_dark.xml
new file mode 100644
index 000000000..577077d9a
--- /dev/null
+++ b/res/drawable/dragview_background_dark.xml
@@ -0,0 +1,54 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android" >
+
+    <item>
+        <shape android:shape="rectangle" >
+            <corners android:radius="3dp" />
+
+            <solid android:color="#BEBEBE" />
+        </shape>
+    </item>
+    <item android:top="10dp">
+        <shape android:shape="rectangle" >
+            <corners android:radius="3dp" />
+
+            <solid android:color="#242A30" />
+        </shape>
+    </item>
+    <item android:top="20dp">
+        <shape android:shape="rectangle" >
+            <corners android:radius="3dp" />
+
+            <solid android:color="#BEBEBE" />
+        </shape>
+    </item>
+    <item android:top="30dp">
+        <shape android:shape="rectangle" >
+            <corners android:radius="3dp" />
+
+            <solid android:color="#242A30" />
+        </shape>
+    </item>
+    <item android:top="40dp">
+        <shape android:shape="rectangle" >
+            <corners android:radius="3dp" />
+
+            <solid android:color="#BEBEBE" />
+        </shape>
+    </item>
+    <item android:top="50dp">
+        <shape android:shape="rectangle" >
+            <corners android:radius="3dp" />
+
+            <solid android:color="#242A30" />
+        </shape>
+    </item>
+    <item android:top="60dp">
+        <shape android:shape="rectangle" >
+            <corners android:radius="3dp" />
+
+            <solid android:color="#BEBEBE" />
+        </shape>
+    </item>
+
+</layer-list>
\ No newline at end of file
diff --git a/res/layout/organize_queue.xml b/res/layout/organize_queue.xml
new file mode 100644
index 000000000..615853f6d
--- /dev/null
+++ b/res/layout/organize_queue.xml
@@ -0,0 +1,34 @@
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:dslv="http://schemas.android.com/apk/res/de.danoeh.antennapod"
+    android:layout_width="fill_parent"
+    android:layout_height="fill_parent"
+    android:orientation="vertical" >
+
+    <com.mobeta.android.dslv.DragSortListView
+        android:id="@android:id/list"
+        android:layout_width="match_parent"
+        android:layout_height="0dp"
+        android:layout_weight="1"
+        dslv:collapsed_height="2dp"
+        dslv:drag_enabled="true"
+        dslv:drag_handle_id="@id/drag_handle"
+        dslv:drag_scroll_start="0.33"
+        dslv:drag_start_mode="onDown"
+        dslv:float_alpha="0.6"
+        dslv:max_drag_scroll_speed="0.5"
+        dslv:remove_enabled="true"
+        dslv:remove_mode="flingRemove"
+        dslv:slide_shuffle_speed="0.3"
+        dslv:sort_enabled="true"
+        dslv:track_drag_sort="false"
+        dslv:use_default_controller="true" />
+
+    <TextView
+        android:id="@id/android:empty"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:layout_gravity="center"
+        android:gravity="center"
+        android:text="@string/no_feeds_label" />
+
+</LinearLayout>
\ No newline at end of file
diff --git a/res/layout/organize_queue_listitem.xml b/res/layout/organize_queue_listitem.xml
new file mode 100644
index 000000000..a109b5784
--- /dev/null
+++ b/res/layout/organize_queue_listitem.xml
@@ -0,0 +1,56 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent" >
+
+    <ImageView
+        android:id="@+id/imgvFeedimage"
+        android:layout_width="@dimen/thumbnail_length"
+        android:layout_height="@dimen/thumbnail_length"
+        android:layout_alignParentLeft="true"
+        android:scaleType="centerCrop" />
+
+    <View
+        android:id="@id/drag_handle"
+        android:layout_width="@dimen/dragview_length"
+        android:layout_height="@dimen/dragview_length"
+        android:layout_alignParentRight="true"
+        android:layout_centerVertical="true"
+        android:layout_marginBottom="8dp"
+        android:layout_marginLeft="4dp"
+        android:layout_marginRight="8dp"
+        android:layout_marginTop="8dp"
+        android:background="?attr/dragview_background"
+        android:clickable="false"
+        android:focusable="false"
+        android:focusableInTouchMode="false" />
+
+    <TextView
+        android:id="@+id/txtvTitle"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:layout_alignParentTop="true"
+        android:layout_marginLeft="8dp"
+        android:layout_marginTop="8dp"
+        android:layout_toLeftOf="@id/drag_handle"
+        android:layout_toRightOf="@id/imgvFeedimage"
+        android:ellipsize="end"
+        android:lines="2"
+        android:textColor="?android:attr/textColorPrimary"
+        android:textSize="@dimen/text_size_small" />
+
+    <TextView
+        android:id="@+id/txtvFeedname"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:layout_below="@id/txtvTitle"
+        android:layout_marginLeft="8dp"
+        android:layout_marginRight="8dp"
+        android:layout_toLeftOf="@id/drag_handle"
+        android:layout_toRightOf="@id/imgvFeedimage"
+        android:ellipsize="end"
+        android:maxLines="1"
+        android:textColor="?android:attr/textColorSecondary"
+        android:textSize="@dimen/text_size_micro" />
+
+</RelativeLayout>
\ No newline at end of file
diff --git a/res/values/attrs.xml b/res/values/attrs.xml
index 940e2c556..4f0ac0067 100644
--- a/res/values/attrs.xml
+++ b/res/values/attrs.xml
@@ -30,6 +30,7 @@
     <attr name="borderless_button" format="reference" />
     <attr name="spinner_button" format="reference" />
     <attr name="overlay_drawable" format="reference" />
+    <attr name="dragview_background" format="reference" />
     <!-- Used in itemdescription -->
     <attr name="non_transparent_background" format="reference" />
     <attr name="overlay_background" format="color" />
diff --git a/res/values/dimens.xml b/res/values/dimens.xml
index 7cb9ebe3f..d5bbe1e6f 100644
--- a/res/values/dimens.xml
+++ b/res/values/dimens.xml
@@ -3,6 +3,7 @@
 
     <dimen name="widget_margin">8dp</dimen>
     <dimen name="thumbnail_length">70dp</dimen>
+    <dimen name="dragview_length">54dp</dimen>
     <dimen name="external_player_height">55dp</dimen>
     <dimen name="enc_icons_size">20dp</dimen>
     <dimen name="text_size_micro">12sp</dimen>
diff --git a/res/values/ids.xml b/res/values/ids.xml
index 14d7b7d24..476969668 100644
--- a/res/values/ids.xml
+++ b/res/values/ids.xml
@@ -12,5 +12,7 @@
     <item name="open_in_browser_item" type="id"/>
     <item name="copy_url_item" type="id"/>
     <item name="share_url_item" type="id"/>
+    <item name="organize_queue_item" type="id"/>
+    <item name="drag_handle" type="id"/>
 
 </resources>
\ No newline at end of file
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 31721a823..83e4c3427 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -118,9 +118,8 @@
     <string name="show_player_label">Show player</string>
 
     <!-- Queue operations -->
-    <string name="move_up_label">Move up</string>
-    <string name="move_down_label">Move down</string>
     <string name="clear_queue_label">Clear queue</string>
+    <string name="organize_queue_label">Organize queue</string>
 
     <!-- Flattr -->
     <string name="flattr_auth_label">Flattr sign-in</string>
diff --git a/res/values/styles.xml b/res/values/styles.xml
index e79979e48..23299020e 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -34,11 +34,10 @@
         <item name="attr/overlay_background">@color/overlay_light</item>
         <item name="attr/spinner_button">@drawable/spinner_button</item>
         <item name="attr/overlay_drawable">@drawable/overlay_drawable</item>
+        <item name="attr/dragview_background">@drawable/dragview_background</item>
     </style>
 
     <style name="AntennaPod.TabPageIndicator" parent="Widget.TabPageIndicator">
-        <item name="android:dividerPadding">10dp</item>
-        <item name="android:showDividers">middle</item>
         <item name="android:paddingTop">16dp</item>
         <item name="android:paddingLeft">8dp</item>
         <item name="android:paddingRight">8dp</item>
@@ -84,6 +83,7 @@
         <item name="attr/overlay_background">@color/overlay_dark</item>
         <item name="attr/spinner_button">@drawable/spinner_button_dark</item>
         <item name="attr/overlay_drawable">@drawable/overlay_drawable_dark</item>
+        <item name="attr/dragview_background">@drawable/dragview_background_dark</item>
     </style>
 
     <style name="AntennaPod.DarkTabPageIndicator" parent="AntennaPod.TabPageIndicator">