From 978a36c443b6822c55af72cef4341c7a3e444780 Mon Sep 17 00:00:00 2001 From: Karim Abou Zeid Date: Fri, 11 Dec 2015 18:35:16 +0100 Subject: [PATCH] Ignore (WIP) --- ...ava => PlayingQueueAdapterDeprecated.java} | 4 +-- .../adapter/song/PlayingQueueAdapter.java | 34 +++++++++++++++++++ .../dialogs/PlayingQueueDialog.java | 12 +++---- .../ui/fragments/player/PlayerFragment.java | 4 +-- 4 files changed, 44 insertions(+), 10 deletions(-) rename app/src/main/java/com/kabouzeid/gramophone/adapter/{PlayingQueueAdapter.java => PlayingQueueAdapterDeprecated.java} (94%) create mode 100644 app/src/main/java/com/kabouzeid/gramophone/adapter/song/PlayingQueueAdapter.java diff --git a/app/src/main/java/com/kabouzeid/gramophone/adapter/PlayingQueueAdapter.java b/app/src/main/java/com/kabouzeid/gramophone/adapter/PlayingQueueAdapterDeprecated.java similarity index 94% rename from app/src/main/java/com/kabouzeid/gramophone/adapter/PlayingQueueAdapter.java rename to app/src/main/java/com/kabouzeid/gramophone/adapter/PlayingQueueAdapterDeprecated.java index 10df1f7b..bb2427f0 100644 --- a/app/src/main/java/com/kabouzeid/gramophone/adapter/PlayingQueueAdapter.java +++ b/app/src/main/java/com/kabouzeid/gramophone/adapter/PlayingQueueAdapterDeprecated.java @@ -23,12 +23,12 @@ import java.util.ArrayList; /** * @author Karim Abou Zeid (kabouzeid) */ -public class PlayingQueueAdapter extends ArrayAdapter { +public class PlayingQueueAdapterDeprecated extends ArrayAdapter { @NonNull private final AppCompatActivity activity; - public PlayingQueueAdapter(@NonNull AppCompatActivity activity, @NonNull ArrayList playList) { + public PlayingQueueAdapterDeprecated(@NonNull AppCompatActivity activity, @NonNull ArrayList playList) { super(activity, R.layout.item_list_single_row, playList); this.activity = activity; } diff --git a/app/src/main/java/com/kabouzeid/gramophone/adapter/song/PlayingQueueAdapter.java b/app/src/main/java/com/kabouzeid/gramophone/adapter/song/PlayingQueueAdapter.java new file mode 100644 index 00000000..2315aeaf --- /dev/null +++ b/app/src/main/java/com/kabouzeid/gramophone/adapter/song/PlayingQueueAdapter.java @@ -0,0 +1,34 @@ +package com.kabouzeid.gramophone.adapter.song; + +import android.support.annotation.LayoutRes; +import android.support.annotation.NonNull; +import android.support.annotation.Nullable; +import android.support.v7.app.AppCompatActivity; +import android.view.View; + +import com.kabouzeid.gramophone.interfaces.CabHolder; +import com.kabouzeid.gramophone.model.Song; + +import java.util.ArrayList; + +/** + * @author Karim Abou Zeid (kabouzeid) + */ +public class PlayingQueueAdapter extends SongAdapter { + public PlayingQueueAdapter(AppCompatActivity activity, ArrayList dataSet, @LayoutRes int itemLayoutRes, boolean usePalette, @Nullable CabHolder cabHolder) { + super(activity, dataSet, itemLayoutRes, usePalette, cabHolder); + } + + @Override + protected SongAdapter.ViewHolder createViewHolder(View view) { + return new ViewHolder(view); + } + + public class ViewHolder extends SongAdapter.ViewHolder { + + public ViewHolder(@NonNull View itemView) { + super(itemView); + image = null; + } + } +} diff --git a/app/src/main/java/com/kabouzeid/gramophone/dialogs/PlayingQueueDialog.java b/app/src/main/java/com/kabouzeid/gramophone/dialogs/PlayingQueueDialog.java index ee8acff2..87b9ad32 100644 --- a/app/src/main/java/com/kabouzeid/gramophone/dialogs/PlayingQueueDialog.java +++ b/app/src/main/java/com/kabouzeid/gramophone/dialogs/PlayingQueueDialog.java @@ -9,7 +9,7 @@ import android.widget.AdapterView; import com.afollestad.materialdialogs.MaterialDialog; import com.kabouzeid.gramophone.R; -import com.kabouzeid.gramophone.adapter.PlayingQueueAdapter; +import com.kabouzeid.gramophone.adapter.PlayingQueueAdapterDeprecated; import com.kabouzeid.gramophone.helper.MusicPlayerRemote; import com.kabouzeid.gramophone.model.Song; import com.mobeta.android.dslv.DragSortListView; @@ -53,21 +53,21 @@ public class PlayingQueueDialog extends LeakDetectDialogFragment { //noinspection unchecked final ArrayList playingQueue = (ArrayList) getArguments().getSerializable("queue"); final DragSortListView dragSortListView = (DragSortListView) dialog.getCustomView().findViewById(R.id.dragSortListView); - final PlayingQueueAdapter playingQueueAdapter = - new PlayingQueueAdapter((AppCompatActivity) getActivity(), playingQueue); - dragSortListView.setAdapter(playingQueueAdapter); + final PlayingQueueAdapterDeprecated playingQueueAdapterDeprecated = + new PlayingQueueAdapterDeprecated((AppCompatActivity) getActivity(), playingQueue); + dragSortListView.setAdapter(playingQueueAdapterDeprecated); dragSortListView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override public void onItemClick(AdapterView parent, View view, int position, long id) { MusicPlayerRemote.playSongAt(position); - playingQueueAdapter.notifyDataSetChanged(); + playingQueueAdapterDeprecated.notifyDataSetChanged(); } }); dragSortListView.setDropListener(new DragSortListView.DropListener() { @Override public void drop(int from, int to) { MusicPlayerRemote.moveSong(from, to); - playingQueueAdapter.notifyDataSetChanged(); + playingQueueAdapterDeprecated.notifyDataSetChanged(); } }); dragSortListView.post(new Runnable() { diff --git a/app/src/main/java/com/kabouzeid/gramophone/ui/fragments/player/PlayerFragment.java b/app/src/main/java/com/kabouzeid/gramophone/ui/fragments/player/PlayerFragment.java index b36c67d4..97b3b897 100644 --- a/app/src/main/java/com/kabouzeid/gramophone/ui/fragments/player/PlayerFragment.java +++ b/app/src/main/java/com/kabouzeid/gramophone/ui/fragments/player/PlayerFragment.java @@ -25,7 +25,7 @@ import android.widget.TextView; import com.kabouzeid.gramophone.R; import com.kabouzeid.gramophone.adapter.base.MediaEntryViewHolder; -import com.kabouzeid.gramophone.adapter.song.SongAdapter; +import com.kabouzeid.gramophone.adapter.song.PlayingQueueAdapter; import com.kabouzeid.gramophone.dialogs.AddToPlaylistDialog; import com.kabouzeid.gramophone.dialogs.PlayingQueueDialog; import com.kabouzeid.gramophone.dialogs.SleepTimerDialog; @@ -126,7 +126,7 @@ public class PlayerFragment extends Fragment implements MusicServiceEventListene setUpPlayerToolbar(); setUpSubFragments(); - recyclerView.setAdapter(new SongAdapter( + recyclerView.setAdapter(new PlayingQueueAdapter( ((AppCompatActivity) getActivity()), SongLoader.getAllSongs(getActivity()), R.layout.item_list,