tenkuma/jamfish
tenkuma/jamfish
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Ignore (WIP)

Browse source
This commit is contained in:
Karim Abou Zeid 2015-12-11 18:35:16 +01:00
commit 978a36c443
4 changed files with 44 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

4
app/src/main/java/com/kabouzeid/gramophone/adapter/PlayingQueueAdapter.java → app/src/main/java/com/kabouzeid/gramophone/adapter/PlayingQueueAdapterDeprecated.java
View file

@ -23,12 +23,12 @@ import java.util.ArrayList;
/**
* @author Karim Abou Zeid (kabouzeid)
*/
public class PlayingQueueAdapter extends ArrayAdapter<Song> {
public class PlayingQueueAdapterDeprecated extends ArrayAdapter<Song> {
@NonNull
private final AppCompatActivity activity;
public PlayingQueueAdapter(@NonNull AppCompatActivity activity, @NonNull ArrayList<Song> playList) {
public PlayingQueueAdapterDeprecated(@NonNull AppCompatActivity activity, @NonNull ArrayList<Song> playList) {
super(activity, R.layout.item_list_single_row, playList);
this.activity = activity;
}

34
app/src/main/java/com/kabouzeid/gramophone/adapter/song/PlayingQueueAdapter.java Normal file
View file

@ -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<Song> 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;
}
}
}

12
app/src/main/java/com/kabouzeid/gramophone/dialogs/PlayingQueueDialog.java
View file

@ -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<Song> playingQueue = (ArrayList<Song>) 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() {

4
app/src/main/java/com/kabouzeid/gramophone/ui/fragments/player/PlayerFragment.java
View file

@ -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,