aboutsummaryrefslogtreecommitdiff
path: root/app/src/main/res
diff options
context:
space:
mode:
authorScott Jackson <daneren2005@gmail.com>2015-06-08 17:55:06 -0700
committerScott Jackson <daneren2005@gmail.com>2015-06-08 17:55:06 -0700
commitf47da3c25f2ee0d4f74392a0a7e4a570cc121516 (patch)
treeb6087d0230dacff6d46e38d79019c81c30cf157a /app/src/main/res
parent6f218cf51b27e24012335a27e806e3a24cc52c75 (diff)
downloaddsub-f47da3c25f2ee0d4f74392a0a7e4a570cc121516.tar.gz
dsub-f47da3c25f2ee0d4f74392a0a7e4a570cc121516.tar.bz2
dsub-f47da3c25f2ee0d4f74392a0a7e4a570cc121516.zip
#232 Switch NowPlayingFragment to RecyclerView, add swipe to remove and better drag + drop support
Diffstat (limited to 'app/src/main/res')
-rw-r--r--app/src/main/res/layout/download_playlist.xml33
-rw-r--r--app/src/main/res/values/styles.xml17
2 files changed, 15 insertions, 35 deletions
diff --git a/app/src/main/res/layout/download_playlist.xml b/app/src/main/res/layout/download_playlist.xml
index 8a73ef3b..afb46081 100644
--- a/app/src/main/res/layout/download_playlist.xml
+++ b/app/src/main/res/layout/download_playlist.xml
@@ -1,31 +1,28 @@
<?xml version="1.0" encoding="utf-8"?>
-
<LinearLayout
- xmlns:android="http://schemas.android.com/apk/res/android"
- android:orientation="vertical"
- android:layout_width="fill_parent"
- android:layout_height="fill_parent"
- android:layout_weight="1">
+ xmlns:android="http://schemas.android.com/apk/res/android"
+ android:orientation="vertical"
+ android:layout_width="fill_parent"
+ android:layout_height="fill_parent"
+ android:layout_weight="1">
<View
- android:layout_width="fill_parent"
- android:layout_height="1px"
- android:background="@color/dividerColor"/>
+ android:layout_width="fill_parent"
+ android:layout_height="1px"
+ android:background="@color/dividerColor"/>
<TextView
- android:id="@+id/download_empty"
- android:text="@string/download.empty"
- android:layout_width="fill_parent"
- android:layout_height="wrap_content"
- android:padding="10dip"/>
+ android:id="@+id/download_empty"
+ android:text="@string/download.empty"
+ android:layout_width="fill_parent"
+ android:layout_height="wrap_content"
+ android:padding="10dip"/>
- <com.mobeta.android.dslv.DragSortListView
- style="@style/DragDropListView"
+ <android.support.v7.widget.RecyclerView
android:id="@+id/download_list"
android:layout_width="fill_parent"
android:layout_height="fill_parent"
android:layout_weight="1"
- android:cacheColorHint="#00000000"
- android:fastScrollEnabled="true"/>
+ android:scrollbars="vertical"/>
</LinearLayout> \ No newline at end of file
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index c4a53b99..cfe446f3 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -59,23 +59,6 @@
<item name="android:paddingLeft">16dip</item>
</style>
- <style name="DragDropListView">
- <item name="drag_enabled">true</item>
- <item name="collapsed_height">1dp</item>
- <item name="drag_scroll_start">1.0</item>
- <item name="max_drag_scroll_speed">2.0</item>
- <item name="float_alpha">0.6</item>
- <item name="slide_shuffle_speed">0.3</item>
- <item name="track_drag_sort">false</item>
- <item name="use_default_controller">true</item>
- <item name="drag_handle_id">@id/drag_handle</item>
- <item name="sort_enabled">true</item>
- <item name="remove_enabled">false</item>
- <item name="remove_mode">flingRemove</item>
- <item name="drag_start_mode">onLongPress</item>
- <item name="float_background_color">@android:color/transparent</item>
- </style>
-
<style name="MainAlbumButton">
<item name="android:drawablePadding">6dip</item>
<item name="android:layout_width">fill_parent</item>