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

move some methods around

Browse source
This commit is contained in:
dkanada 2021-05-16 23:56:30 +09:00
commit 097e72d290
3 changed files with 11 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

2
app/src/main/java/com/dkanada/gramophone/adapter/song/OrderablePlaylistSongAdapter.java
View file

@ -20,11 +20,11 @@ import com.dkanada.gramophone.util.ViewUtil;
import java.util.List; import java.util.List;
public class OrderablePlaylistSongAdapter extends PlaylistSongAdapter implements DraggableItemAdapter<OrderablePlaylistSongAdapter.ViewHolder> { public class OrderablePlaylistSongAdapter extends PlaylistSongAdapter implements DraggableItemAdapter<OrderablePlaylistSongAdapter.ViewHolder> {
private OrderableListener onMoveItemListener; private OrderableListener onMoveItemListener;
public OrderablePlaylistSongAdapter(@NonNull AppCompatActivity activity, @NonNull List<Song> dataSet, @LayoutRes int itemLayoutRes, boolean usePalette, @Nullable CabHolder cabHolder, @Nullable OrderableListener onMoveItemListener) { public OrderablePlaylistSongAdapter(@NonNull AppCompatActivity activity, @NonNull List<Song> dataSet, @LayoutRes int itemLayoutRes, boolean usePalette, @Nullable CabHolder cabHolder, @Nullable OrderableListener onMoveItemListener) {
super(activity, dataSet, itemLayoutRes, usePalette, cabHolder); super(activity, dataSet, itemLayoutRes, usePalette, cabHolder);
this.onMoveItemListener = onMoveItemListener; this.onMoveItemListener = onMoveItemListener;
} }

10
app/src/main/java/com/dkanada/gramophone/adapter/song/PlaylistSongAdapter.java
View file

@ -23,11 +23,6 @@ public class PlaylistSongAdapter extends AbsOffsetSongAdapter {
setMultiSelectMenuRes(R.menu.menu_select_playlist_song); setMultiSelectMenuRes(R.menu.menu_select_playlist_song);
} }
@Override
protected SongAdapter.ViewHolder createViewHolder(View view) {
return new PlaylistSongAdapter.ViewHolder(view);
}
@Override @Override
protected void onMultipleItemAction(@NonNull MenuItem menuItem, @NonNull List<Song> selection) { protected void onMultipleItemAction(@NonNull MenuItem menuItem, @NonNull List<Song> selection) {
if (menuItem.getItemId() == R.id.action_remove_from_playlist) { if (menuItem.getItemId() == R.id.action_remove_from_playlist) {
@ -38,6 +33,11 @@ public class PlaylistSongAdapter extends AbsOffsetSongAdapter {
super.onMultipleItemAction(menuItem, selection); super.onMultipleItemAction(menuItem, selection);
} }
@Override
protected SongAdapter.ViewHolder createViewHolder(View view) {
return new PlaylistSongAdapter.ViewHolder(view);
}
@Override @Override
public void onBindViewHolder(@NonNull final SongAdapter.ViewHolder holder, int position) { public void onBindViewHolder(@NonNull final SongAdapter.ViewHolder holder, int position) {
if (holder.getItemViewType() == OFFSET_ITEM) { if (holder.getItemViewType() == OFFSET_ITEM) {

10
app/src/main/java/com/dkanada/gramophone/service/DownloadService.java
View file

@ -53,6 +53,11 @@ public class DownloadService extends Service {
return super.onStartCommand(intent, flags, startId); return super.onStartCommand(intent, flags, startId);
} }
@Override
public IBinder onBind(Intent intent) {
return null;
}
public void download(Song song) { public void download(Song song) {
executor.execute(() -> { executor.execute(() -> {
try { try {
@ -103,9 +108,4 @@ public class DownloadService extends Service {
} }
}); });
} }
@Override
public IBinder onBind(Intent intent) {
return null;
}
} }