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. +
  3. NEW: Added a drag view to playlist songs for easier rearrangement.
  4. +
  5. 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 00000000..01b51e8a Binary files /dev/null and b/app/src/main/res/drawable-hdpi/ic_equal_white_24dp.png differ diff --git a/app/src/main/res/drawable-mdpi/ic_equal_white_24dp.png b/app/src/main/res/drawable-mdpi/ic_equal_white_24dp.png new file mode 100644 index 00000000..45fcedae Binary files /dev/null and b/app/src/main/res/drawable-mdpi/ic_equal_white_24dp.png differ 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 00000000..e4aa6253 Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/ic_equal_white_24dp.png differ diff --git a/app/src/main/res/drawable-xxhdpi/ic_equal_white_24dp.png b/app/src/main/res/drawable-xxhdpi/ic_equal_white_24dp.png new file mode 100644 index 00000000..5856ea3e Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/ic_equal_white_24dp.png differ 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 00000000..b7372f40 Binary files /dev/null and b/app/src/main/res/drawable-xxxhdpi/ic_equal_white_24dp.png differ 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"> + + + +