antebudimir/tempus
1
0
Fork 0
mirror of https://github.com/antebudimir/tempus.git synced 2026-01-01 18:03:33 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Deleted all references from the adapters and dialogs to the old queue management system

Browse source
This commit is contained in:
CappielloAntonio 2021-12-29 10:22:10 +01:00
parent 4e968a8c4b
commit a32c39867f
18 changed files with 286 additions and 292 deletions
Download patch file Download diff file Expand all files Collapse all files

7
app/src/main/java/com/cappielloantonio/play/adapter/DiscoverSongAdapter.java
View file

@ -19,7 +19,6 @@ import com.cappielloantonio.play.interfaces.MediaCallback;
import com.cappielloantonio.play.model.Song;
import com.cappielloantonio.play.repository.QueueRepository;
import com.cappielloantonio.play.repository.SongRepository;
import com.cappielloantonio.play.service.MusicPlayerRemote;
import com.cappielloantonio.play.ui.activity.MainActivity;
import com.cappielloantonio.play.util.MusicUtil;
@ -97,13 +96,13 @@ public class DiscoverSongAdapter extends RecyclerView.Adapter<DiscoverSongAdapte
public void onClick(View view) {
List<Song> opener = new ArrayList<>();
opener.add(songs.get(getBindingAdapterPosition()));
MusicPlayerRemote.openQueue(opener, 0, true);
// MusicPlayerRemote.openQueue(opener, 0, true);
QueueRepository queueRepository = new QueueRepository(App.getInstance());
queueRepository.insertAllAndStartNew(opener);
activity.setBottomSheetInPeek(true);
activity.setBottomSheetMusicInfo(songs.get(getBindingAdapterPosition()));
// activity.setBottomSheetMusicInfo(songs.get(getBindingAdapterPosition()));
SongRepository songRepository = new SongRepository(App.getInstance());
songRepository.getInstantMix(songs.get(getBindingAdapterPosition()), 20, new MediaCallback() {
@ -114,7 +113,7 @@ public class DiscoverSongAdapter extends RecyclerView.Adapter<DiscoverSongAdapte
@Override
public void onLoadMedia(List<?> media) {
MusicPlayerRemote.enqueue((List<Song>) media);
//MusicPlayerRemote.enqueue((List<Song>) media);
}
});
}

14
app/src/main/java/com/cappielloantonio/play/adapter/PlayerSongQueueAdapter.java
View file

@ -8,18 +8,22 @@ import android.widget.ImageView;
import android.widget.TextView;
import androidx.annotation.NonNull;
import androidx.media3.session.MediaBrowser;
import androidx.recyclerview.widget.RecyclerView;
import com.bumptech.glide.load.resource.bitmap.RoundedCorners;
import com.cappielloantonio.play.R;
import com.cappielloantonio.play.glide.CustomGlideRequest;
import com.cappielloantonio.play.model.Song;
import com.cappielloantonio.play.service.MusicPlayerRemote;
import com.cappielloantonio.play.ui.fragment.PlayerBottomSheetFragment;
import com.cappielloantonio.play.util.MappingUtil;
import com.cappielloantonio.play.util.MusicUtil;
import com.google.common.util.concurrent.ListenableFuture;
import com.google.common.util.concurrent.MoreExecutors;
import java.util.ArrayList;
import java.util.List;
import java.util.concurrent.ExecutionException;
public class PlayerSongQueueAdapter extends RecyclerView.Adapter<PlayerSongQueueAdapter.ViewHolder> {
private static final String TAG = "SongResultSearchAdapter";
@ -57,10 +61,10 @@ public class PlayerSongQueueAdapter extends RecyclerView.Adapter<PlayerSongQueue
.transform(new RoundedCorners(CustomGlideRequest.CORNER_RADIUS))
.into(holder.cover);
if (position < MusicPlayerRemote.getPosition()) {
/* if (position < MusicPlayerRemote.getPosition()) {
holder.songTitle.setTextColor(context.getResources().getColor(R.color.songToPlayTextColor, null));
holder.songSubtitle.setTextColor(context.getResources().getColor(R.color.songToPlayTextColor, null));
}
} */
}
@Override
@ -101,8 +105,8 @@ public class PlayerSongQueueAdapter extends RecyclerView.Adapter<PlayerSongQueue
@Override
public void onClick(View view) {
playerBottomSheetFragment.setSongInfo(songs.get(getBindingAdapterPosition()));
MusicPlayerRemote.openQueue(songs, getBindingAdapterPosition(), true);
// playerBottomSheetFragment.setSongInfo(songs.get(getBindingAdapterPosition()));
// MusicPlayerRemote.openQueue(songs, getBindingAdapterPosition(), true);
}
}
}

43
app/src/main/java/com/cappielloantonio/play/adapter/SimilarTrackAdapter.java
View file

@ -1,5 +1,6 @@
package com.cappielloantonio.play.adapter;
import android.annotation.SuppressLint;
import android.content.Context;
import android.os.Bundle;
import android.util.Log;
@ -10,20 +11,18 @@ import android.widget.ImageView;
import android.widget.TextView;
import androidx.annotation.NonNull;
import androidx.media3.session.MediaController;
import androidx.navigation.Navigation;
import androidx.recyclerview.widget.RecyclerView;
import com.bumptech.glide.load.resource.bitmap.RoundedCorners;
import com.cappielloantonio.play.App;
import com.cappielloantonio.play.R;
import com.cappielloantonio.play.glide.CustomGlideRequest;
import com.cappielloantonio.play.interfaces.MediaCallback;
import com.cappielloantonio.play.model.Song;
import com.cappielloantonio.play.repository.QueueRepository;
import com.cappielloantonio.play.repository.SongRepository;
import com.cappielloantonio.play.service.MusicPlayerRemote;
import com.cappielloantonio.play.ui.activity.MainActivity;
import com.cappielloantonio.play.util.MappingUtil;
import com.cappielloantonio.play.util.MusicUtil;
import com.google.common.util.concurrent.MoreExecutors;
import java.util.ArrayList;
import java.util.List;
@ -74,6 +73,7 @@ public class SimilarTrackAdapter extends RecyclerView.Adapter<SimilarTrackAdapte
notifyDataSetChanged();
}
@SuppressLint("UnsafeOptInUsageError")
public class ViewHolder extends RecyclerView.ViewHolder implements View.OnClickListener, View.OnLongClickListener {
TextView textTitle;
ImageView cover;
@ -90,17 +90,31 @@ public class SimilarTrackAdapter extends RecyclerView.Adapter<SimilarTrackAdapte
@Override
public void onClick(View view) {
List<Song> opener = new ArrayList<>();
opener.add(songs.get(getBindingAdapterPosition()));
MusicPlayerRemote.openQueue(opener, 0, true);
// List<Song> opener = new ArrayList<>();
// opener.add(songs.get(getBindingAdapterPosition()));
// MusicPlayerRemote.openQueue(opener, 0, true);
QueueRepository queueRepository = new QueueRepository(App.getInstance());
queueRepository.insertAllAndStartNew(opener);
// MediaManager.startQueue(mainActivity.getMediaControllerInstance(), MappingUtil.mapMediaItem(context, opener), opener);
mainActivity.mediaControllerListenableFuture.addListener(() -> {
try {
if (mainActivity.mediaControllerListenableFuture.isDone()) {
MediaController mediaController = mainActivity.mediaControllerListenableFuture.get();
mediaController.setMediaItem(MappingUtil.mapMediaItem(context, songs.get(getBindingAdapterPosition())));
}
} catch (Exception e) {
Log.e(TAG, e.getMessage());
}
}, MoreExecutors.directExecutor());
// QueueRepository queueRepository = new QueueRepository(App.getInstance());
// queueRepository.insertAllAndStartNew(opener);
mainActivity.setBottomSheetInPeek(true);
mainActivity.setBottomSheetMusicInfo(songs.get(getBindingAdapterPosition()));
// mainActivity.setBottomSheetMusicInfo(songs.get(getBindingAdapterPosition()));
SongRepository songRepository = new SongRepository(App.getInstance());
/*SongRepository songRepository = new SongRepository(App.getInstance());
songRepository.getInstantMix(songs.get(getBindingAdapterPosition()), 20, new MediaCallback() {
@Override
public void onError(Exception exception) {
@ -109,9 +123,10 @@ public class SimilarTrackAdapter extends RecyclerView.Adapter<SimilarTrackAdapte
@Override
public void onLoadMedia(List<?> media) {
MusicPlayerRemote.enqueue((List<Song>) media);
// MusicPlayerRemote.enqueue((List<Song>) media);
MediaManager.enqueue(mainActivity.getMediaControllerInstance(), MappingUtil.mapMediaItem(context, (List<Song>) media), (List<Song>) media);
}
});
});*/
}
@Override

9
app/src/main/java/com/cappielloantonio/play/adapter/SongHorizontalAdapter.java
View file

@ -18,7 +18,6 @@ import com.cappielloantonio.play.R;
import com.cappielloantonio.play.glide.CustomGlideRequest;
import com.cappielloantonio.play.model.Song;
import com.cappielloantonio.play.repository.QueueRepository;
import com.cappielloantonio.play.service.MusicPlayerRemote;
import com.cappielloantonio.play.ui.activity.MainActivity;
import com.cappielloantonio.play.util.DownloadUtil;
import com.cappielloantonio.play.util.MusicUtil;
@ -59,11 +58,11 @@ public class SongHorizontalAdapter extends RecyclerView.Adapter<SongHorizontalAd
holder.songSubtitle.setText(context.getString(R.string.song_subtitle_formatter, MusicUtil.getReadableString(song.getArtistName()), MusicUtil.getReadableDurationString(song.getDuration(), false)));
holder.trackNumber.setText(String.valueOf(song.getTrackNumber()));
if (DownloadUtil.getDownloadTracker(context).isDownloaded(song)) {
/*if (DownloadUtil.getDownloadTracker(context).isDownloaded(song)) {
holder.downloadIndicator.setVisibility(View.VISIBLE);
} else {
holder.downloadIndicator.setVisibility(View.GONE);
}
}*/
if (isCoverVisible) CustomGlideRequest.Builder
.from(context, song.getPrimary(), CustomGlideRequest.SONG_PIC, null)
@ -125,9 +124,9 @@ public class SongHorizontalAdapter extends RecyclerView.Adapter<SongHorizontalAd
queueRepository.insertAllAndStartNew(songs);
mainActivity.setBottomSheetInPeek(true);
mainActivity.setBottomSheetMusicInfo(songs.get(getBindingAdapterPosition()));
// mainActivity.setBottomSheetMusicInfo(songs.get(getBindingAdapterPosition()));
MusicPlayerRemote.openQueue(songs, getBindingAdapterPosition(), true);
// MusicPlayerRemote.openQueue(songs, getBindingAdapterPosition(), true);
}
@Override

5
app/src/main/java/com/cappielloantonio/play/adapter/TrackAdapter.java
View file

@ -18,7 +18,6 @@ import com.cappielloantonio.play.R;
import com.cappielloantonio.play.glide.CustomGlideRequest;
import com.cappielloantonio.play.model.Song;
import com.cappielloantonio.play.repository.QueueRepository;
import com.cappielloantonio.play.service.MusicPlayerRemote;
import com.cappielloantonio.play.ui.activity.MainActivity;
import com.cappielloantonio.play.util.MusicUtil;
@ -97,9 +96,9 @@ public class TrackAdapter extends RecyclerView.Adapter<TrackAdapter.ViewHolder>
queueRepository.insertAllAndStartNew(songs);
mainActivity.setBottomSheetInPeek(true);
mainActivity.setBottomSheetMusicInfo(songs.get(getBindingAdapterPosition()));
// mainActivity.setBottomSheetMusicInfo(songs.get(getBindingAdapterPosition()));
MusicPlayerRemote.openQueue(songs, getBindingAdapterPosition(), true);
// MusicPlayerRemote.openQueue(songs, getBindingAdapterPosition(), true);
}