From 29f91b6969f3c273fbb57b6c41e52934d9ce61c5 Mon Sep 17 00:00:00 2001 From: Karim Abou Zeid Date: Sat, 12 Sep 2015 12:21:45 +0200 Subject: [PATCH] Added a drag view to playlist songs for easier rearrangement --- app/src/main/assets/changelog.html | 3 ++- .../adapter/base/MediaEntryViewHolder.java | 4 ++++ .../adapter/song/PlaylistSongAdapter.java | 3 +++ .../ui/activities/PlaylistDetailActivity.java | 2 +- .../res/drawable-hdpi/ic_equal_white_24dp.png | Bin 0 -> 172 bytes .../res/drawable-mdpi/ic_equal_white_24dp.png | Bin 0 -> 162 bytes .../res/drawable-xhdpi/ic_equal_white_24dp.png | Bin 0 -> 176 bytes .../res/drawable-xxhdpi/ic_equal_white_24dp.png | Bin 0 -> 206 bytes .../res/drawable-xxxhdpi/ic_equal_white_24dp.png | Bin 0 -> 231 bytes app/src/main/res/layout/item_list.xml | 12 ++++++++++++ app/src/main/res/layout/item_list_single_row.xml | 12 ++++++++++++ 11 files changed, 34 insertions(+), 2 deletions(-) create mode 100644 app/src/main/res/drawable-hdpi/ic_equal_white_24dp.png create mode 100644 app/src/main/res/drawable-mdpi/ic_equal_white_24dp.png create mode 100644 app/src/main/res/drawable-xhdpi/ic_equal_white_24dp.png create mode 100644 app/src/main/res/drawable-xxhdpi/ic_equal_white_24dp.png create mode 100644 app/src/main/res/drawable-xxxhdpi/ic_equal_white_24dp.png diff --git a/app/src/main/assets/changelog.html b/app/src/main/assets/changelog.html index ba979cd0..e5bdcb9b 100644 --- a/app/src/main/assets/changelog.html +++ b/app/src/main/assets/changelog.html @@ -28,7 +28,8 @@

Version 0.9.46 beta 2

    -
  1. FIX: Cab (contextual action bar) content not visible with light primary colors
    2. +
  2. NEW: Added a drag view to playlist songs for easier rearrangement.
    3. +
  3. FIX: Cab (contextual action bar) content not visible with light primary colors.

Version 0.9.46 beta 1

diff --git a/app/src/main/java/com/kabouzeid/gramophone/adapter/base/MediaEntryViewHolder.java b/app/src/main/java/com/kabouzeid/gramophone/adapter/base/MediaEntryViewHolder.java index cfc36320..578dd13b 100644 --- a/app/src/main/java/com/kabouzeid/gramophone/adapter/base/MediaEntryViewHolder.java +++ b/app/src/main/java/com/kabouzeid/gramophone/adapter/base/MediaEntryViewHolder.java @@ -49,6 +49,10 @@ public abstract class MediaEntryViewHolder extends RecyclerView.ViewHolder imple @Bind(R.id.selected_indicator) public View selectedIndicator; + @Nullable + @Bind(R.id.drag_view) + public View dragView; + @Nullable @Bind(R.id.palette_color_container) public View paletteColorContainer; diff --git a/app/src/main/java/com/kabouzeid/gramophone/adapter/song/PlaylistSongAdapter.java b/app/src/main/java/com/kabouzeid/gramophone/adapter/song/PlaylistSongAdapter.java index 5c0209c8..34c6243e 100644 --- a/app/src/main/java/com/kabouzeid/gramophone/adapter/song/PlaylistSongAdapter.java +++ b/app/src/main/java/com/kabouzeid/gramophone/adapter/song/PlaylistSongAdapter.java @@ -48,6 +48,9 @@ public class PlaylistSongAdapter extends SongAdapter { public ViewHolder(@NonNull View itemView) { super(itemView); + if (dragView != null) { + dragView.setVisibility(View.VISIBLE); + } } @Override diff --git a/app/src/main/java/com/kabouzeid/gramophone/ui/activities/PlaylistDetailActivity.java b/app/src/main/java/com/kabouzeid/gramophone/ui/activities/PlaylistDetailActivity.java index f209861a..e4fe0962 100644 --- a/app/src/main/java/com/kabouzeid/gramophone/ui/activities/PlaylistDetailActivity.java +++ b/app/src/main/java/com/kabouzeid/gramophone/ui/activities/PlaylistDetailActivity.java @@ -87,7 +87,7 @@ public class PlaylistDetailActivity extends AbsSlidingMusicPanelActivity impleme adapter = new PlaylistSongAdapter(this, loadPlaylistDataSet(), R.layout.item_list, false, this); DragSortRecycler dragSortRecycler = new DragSortRecycler(); - dragSortRecycler.setViewHandleId(R.id.image); + dragSortRecycler.setViewHandleId(R.id.drag_view); dragSortRecycler.setOnItemMovedListener(new DragSortRecycler.OnItemMovedListener() { @Override public void onItemMoved(int from, int to) { diff --git a/app/src/main/res/drawable-hdpi/ic_equal_white_24dp.png b/app/src/main/res/drawable-hdpi/ic_equal_white_24dp.png new file mode 100644 index 0000000000000000000000000000000000000000..01b51e8afed82a390fcebadba58f980fa7fb4a15 GIT binary patch literal 172 zcmeAS@N?(olHy`uVBq!ia0y~yU{C>J4mJh`hKCF@W-u@?uqAoByD)&kPv_nB3=9mM z1s;*b3=9k&VC;4>+YTgHR^XTp(hJ5F?9%-V3=HO;E{-7)hu>at_8opQXzf7#MUtT^vI^jwdHbur5vzF-Q{r^Z)<< x`b|8^DMt+YGZ)laaAokj1z*&VU_H#pz;JU82mASbFK>YC@^tlcS?83{1OVM#Dfa*X literal 0 HcmV?d00001 diff --git a/app/src/main/res/drawable-xhdpi/ic_equal_white_24dp.png b/app/src/main/res/drawable-xhdpi/ic_equal_white_24dp.png new file mode 100644 index 0000000000000000000000000000000000000000..e4aa625395db27ec37a382f2a5ba4d8144b3c8cc GIT binary patch literal 176 zcmeAS@N?(olHy`uVBq!ia0y~yU@!n-4mJh`hH$2z?F%? z1J;W!%I{FVdQ&MBb@00g}}OaK4? literal 0 HcmV?d00001 diff --git a/app/src/main/res/drawable-xxxhdpi/ic_equal_white_24dp.png b/app/src/main/res/drawable-xxxhdpi/ic_equal_white_24dp.png new file mode 100644 index 0000000000000000000000000000000000000000..b7372f4091c5ac1eaa5727fb87eb4df9f48b18ec GIT binary patch literal 231 zcmeAS@N?(olHy`uVBq!ia0y~yU`POA4mJh`hDS5XEf^RW*pj^6T^PXNr}OT51_lPs z0*}aI1_lNXFm^kcZ3hx8D{xE)=>_A8+c&>3FfbH(x;TbZ+FVdQ&MBb@0CVO&vH$=8 literal 0 HcmV?d00001 diff --git a/app/src/main/res/layout/item_list.xml b/app/src/main/res/layout/item_list.xml index 76f805d8..7a35de56 100644 --- a/app/src/main/res/layout/item_list.xml +++ b/app/src/main/res/layout/item_list.xml @@ -6,6 +6,18 @@ android:foreground="?rect_selector" tools:ignore="UnusedAttribute"> + + + +