From 097e72d290d1e1e7dea4876d2b1a74c92261488e Mon Sep 17 00:00:00 2001 From: dkanada Date: Sun, 16 May 2021 23:56:30 +0900 Subject: [PATCH] move some methods around --- .../adapter/song/OrderablePlaylistSongAdapter.java | 2 +- .../gramophone/adapter/song/PlaylistSongAdapter.java | 10 +++++----- .../dkanada/gramophone/service/DownloadService.java | 10 +++++----- 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/app/src/main/java/com/dkanada/gramophone/adapter/song/OrderablePlaylistSongAdapter.java b/app/src/main/java/com/dkanada/gramophone/adapter/song/OrderablePlaylistSongAdapter.java index 639f5fdf..3a95324c 100644 --- a/app/src/main/java/com/dkanada/gramophone/adapter/song/OrderablePlaylistSongAdapter.java +++ b/app/src/main/java/com/dkanada/gramophone/adapter/song/OrderablePlaylistSongAdapter.java @@ -20,11 +20,11 @@ import com.dkanada.gramophone.util.ViewUtil; import java.util.List; public class OrderablePlaylistSongAdapter extends PlaylistSongAdapter implements DraggableItemAdapter { - private OrderableListener onMoveItemListener; public OrderablePlaylistSongAdapter(@NonNull AppCompatActivity activity, @NonNull List dataSet, @LayoutRes int itemLayoutRes, boolean usePalette, @Nullable CabHolder cabHolder, @Nullable OrderableListener onMoveItemListener) { super(activity, dataSet, itemLayoutRes, usePalette, cabHolder); + this.onMoveItemListener = onMoveItemListener; } diff --git a/app/src/main/java/com/dkanada/gramophone/adapter/song/PlaylistSongAdapter.java b/app/src/main/java/com/dkanada/gramophone/adapter/song/PlaylistSongAdapter.java index caaf622f..517e8f88 100644 --- a/app/src/main/java/com/dkanada/gramophone/adapter/song/PlaylistSongAdapter.java +++ b/app/src/main/java/com/dkanada/gramophone/adapter/song/PlaylistSongAdapter.java @@ -23,11 +23,6 @@ public class PlaylistSongAdapter extends AbsOffsetSongAdapter { setMultiSelectMenuRes(R.menu.menu_select_playlist_song); } - @Override - protected SongAdapter.ViewHolder createViewHolder(View view) { - return new PlaylistSongAdapter.ViewHolder(view); - } - @Override protected void onMultipleItemAction(@NonNull MenuItem menuItem, @NonNull List selection) { if (menuItem.getItemId() == R.id.action_remove_from_playlist) { @@ -38,6 +33,11 @@ public class PlaylistSongAdapter extends AbsOffsetSongAdapter { super.onMultipleItemAction(menuItem, selection); } + @Override + protected SongAdapter.ViewHolder createViewHolder(View view) { + return new PlaylistSongAdapter.ViewHolder(view); + } + @Override public void onBindViewHolder(@NonNull final SongAdapter.ViewHolder holder, int position) { if (holder.getItemViewType() == OFFSET_ITEM) { diff --git a/app/src/main/java/com/dkanada/gramophone/service/DownloadService.java b/app/src/main/java/com/dkanada/gramophone/service/DownloadService.java index ccf286d3..06817676 100644 --- a/app/src/main/java/com/dkanada/gramophone/service/DownloadService.java +++ b/app/src/main/java/com/dkanada/gramophone/service/DownloadService.java @@ -53,6 +53,11 @@ public class DownloadService extends Service { return super.onStartCommand(intent, flags, startId); } + @Override + public IBinder onBind(Intent intent) { + return null; + } + public void download(Song song) { executor.execute(() -> { try { @@ -103,9 +108,4 @@ public class DownloadService extends Service { } }); } - - @Override - public IBinder onBind(Intent intent) { - return null; - } }