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

TEST - MediaBrowserListenableFuture passed from activity to fragment to adapter

Browse source
This commit is contained in:
CappielloAntonio 2021-12-29 19:10:55 +01:00
parent 279272a3af
commit 1926c7a696
4 changed files with 68 additions and 55 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -10,6 +10,7 @@ import android.widget.ImageView;
import android.widget.TextView;
import androidx.annotation.NonNull;
import androidx.media3.session.MediaBrowser;
import androidx.recyclerview.widget.RecyclerView;
import com.cappielloantonio.play.App;
@ -19,8 +20,10 @@ 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.MediaManager;
import com.cappielloantonio.play.ui.activity.MainActivity;
import com.cappielloantonio.play.util.MusicUtil;
import com.google.common.util.concurrent.ListenableFuture;
import java.util.ArrayList;
import java.util.List;
@ -31,6 +34,7 @@ public class DiscoverSongAdapter extends RecyclerView.Adapter<DiscoverSongAdapte
private final LayoutInflater inflater;
private final Context context;
private final MainActivity activity;
private ListenableFuture<MediaBrowser> mediaBrowserListenableFuture;
private List<Song> songs;
@ -77,6 +81,10 @@ public class DiscoverSongAdapter extends RecyclerView.Adapter<DiscoverSongAdapte
notifyDataSetChanged();
}
public void setMediaBrowserListenableFuture(ListenableFuture<MediaBrowser> mediaBrowserListenableFuture) {
this.mediaBrowserListenableFuture = mediaBrowserListenableFuture;
}
public class ViewHolder extends RecyclerView.ViewHolder implements View.OnClickListener {
TextView textTitle;
TextView textAlbum;
@ -94,15 +102,7 @@ public class DiscoverSongAdapter extends RecyclerView.Adapter<DiscoverSongAdapte
@Override
public void onClick(View view) {
List<Song> opener = new ArrayList<>();
opener.add(songs.get(getBindingAdapterPosition()));
// MusicPlayerRemote.openQueue(opener, 0, true);
QueueRepository queueRepository = new QueueRepository(App.getInstance());
queueRepository.insertAllAndStartNew(opener);
activity.setBottomSheetInPeek(true);
// activity.setBottomSheetMusicInfo(songs.get(getBindingAdapterPosition()));
MediaManager.startQueue(mediaBrowserListenableFuture, context, songs.get(getBindingAdapterPosition()));
SongRepository songRepository = new SongRepository(App.getInstance());
songRepository.getInstantMix(songs.get(getBindingAdapterPosition()), 20, new MediaCallback() {
@ -113,7 +113,7 @@ public class DiscoverSongAdapter extends RecyclerView.Adapter<DiscoverSongAdapte
@Override
public void onLoadMedia(List<?> media) {
//MusicPlayerRemote.enqueue((List<Song>) media);
MediaManager.enqueue(mediaBrowserListenableFuture, context, (List<Song>) media, songs.size());
}
});
}

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

@ -1,6 +1,5 @@
package com.cappielloantonio.play.adapter;
import android.annotation.SuppressLint;
import android.content.Context;
import android.os.Bundle;
import android.util.Log;
@ -11,18 +10,20 @@ import android.widget.ImageView;
import android.widget.TextView;
import androidx.annotation.NonNull;
import androidx.media3.session.MediaController;
import androidx.media3.session.MediaBrowser;
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.ui.activity.MainActivity;
import com.cappielloantonio.play.util.MappingUtil;
import com.cappielloantonio.play.repository.SongRepository;
import com.cappielloantonio.play.service.MediaManager;
import com.cappielloantonio.play.util.MusicUtil;
import com.google.common.util.concurrent.MoreExecutors;
import com.google.common.util.concurrent.ListenableFuture;
import java.util.ArrayList;
import java.util.List;
@ -30,14 +31,13 @@ import java.util.List;
public class SimilarTrackAdapter extends RecyclerView.Adapter<SimilarTrackAdapter.ViewHolder> {
private static final String TAG = "SimilarTrackAdapter";
private final MainActivity mainActivity;
private final Context context;
private final LayoutInflater mInflater;
private ListenableFuture<MediaBrowser> mediaBrowserListenableFuture;
private List<Song> songs;
public SimilarTrackAdapter(MainActivity mainActivity, Context context) {
this.mainActivity = mainActivity;
public SimilarTrackAdapter(Context context) {
this.context = context;
this.mInflater = LayoutInflater.from(context);
this.songs = new ArrayList<>();
@ -68,12 +68,19 @@ public class SimilarTrackAdapter extends RecyclerView.Adapter<SimilarTrackAdapte
return songs.size();
}
public Song getItem(int position) {
return songs.get(position);
}
public void setItems(List<Song> songs) {
this.songs = songs;
notifyDataSetChanged();
}
@SuppressLint("UnsafeOptInUsageError")
public void setMediaBrowserListenableFuture(ListenableFuture<MediaBrowser> mediaBrowserListenableFuture) {
this.mediaBrowserListenableFuture = mediaBrowserListenableFuture;
}
public class ViewHolder extends RecyclerView.ViewHolder implements View.OnClickListener, View.OnLongClickListener {
TextView textTitle;
ImageView cover;
@ -90,31 +97,9 @@ 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);
MediaManager.startQueue(mediaBrowserListenableFuture, context, songs.get(getBindingAdapterPosition()));
// 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()));
/*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) {
@ -123,10 +108,9 @@ public class SimilarTrackAdapter extends RecyclerView.Adapter<SimilarTrackAdapte
@Override
public void onLoadMedia(List<?> media) {
// MusicPlayerRemote.enqueue((List<Song>) media);
MediaManager.enqueue(mainActivity.getMediaControllerInstance(), MappingUtil.mapMediaItem(context, (List<Song>) media), (List<Song>) media);
MediaManager.enqueue(mediaBrowserListenableFuture, context, (List<Song>) media, songs.size());
}
});*/
});
}
@Override

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

@ -9,6 +9,7 @@ import android.widget.ImageView;
import android.widget.TextView;
import androidx.annotation.NonNull;
import androidx.media3.session.MediaBrowser;
import androidx.navigation.Navigation;
import androidx.recyclerview.widget.RecyclerView;
@ -18,9 +19,11 @@ 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.MediaManager;
import com.cappielloantonio.play.ui.activity.MainActivity;
import com.cappielloantonio.play.util.DownloadUtil;
import com.cappielloantonio.play.util.MusicUtil;
import com.google.common.util.concurrent.ListenableFuture;
import java.util.ArrayList;
import java.util.List;
@ -33,6 +36,7 @@ public class SongHorizontalAdapter extends RecyclerView.Adapter<SongHorizontalAd
private final LayoutInflater mInflater;
private final boolean isCoverVisible;
private ListenableFuture<MediaBrowser> mediaBrowserListenableFuture;
private List<Song> songs;
public SongHorizontalAdapter(MainActivity mainActivity, Context context, boolean isCoverVisible) {
@ -85,6 +89,10 @@ public class SongHorizontalAdapter extends RecyclerView.Adapter<SongHorizontalAd
notifyDataSetChanged();
}
public void setMediaBrowserListenableFuture(ListenableFuture<MediaBrowser> mediaBrowserListenableFuture) {
this.mediaBrowserListenableFuture = mediaBrowserListenableFuture;
}
public Song getItem(int id) {
return songs.get(id);
}
@ -120,13 +128,7 @@ public class SongHorizontalAdapter extends RecyclerView.Adapter<SongHorizontalAd
@Override
public void onClick(View view) {
QueueRepository queueRepository = new QueueRepository(App.getInstance());
queueRepository.insertAllAndStartNew(songs);
mainActivity.setBottomSheetInPeek(true);
// mainActivity.setBottomSheetMusicInfo(songs.get(getBindingAdapterPosition()));
// MusicPlayerRemote.openQueue(songs, getBindingAdapterPosition(), true);
MediaManager.startQueue(mediaBrowserListenableFuture, context, songs, getBindingAdapterPosition());
}
@Override

31
app/src/main/java/com/cappielloantonio/play/ui/fragment/HomeFragment.java
View file

@ -1,6 +1,7 @@
package com.cappielloantonio.play.ui.fragment;
import android.os.Bundle;
import android.util.Log;
import android.view.LayoutInflater;
import android.view.Menu;
import android.view.MenuInflater;
@ -44,7 +45,7 @@ import com.cappielloantonio.play.viewmodel.HomeViewModel;
import java.util.Objects;
public class HomeFragment extends Fragment {
private static final String TAG = "CategoriesFragment";
private static final String TAG = "HomeFragment";
private FragmentHomeBinding bind;
private MainActivity activity;
@ -106,10 +107,23 @@ public class HomeFragment extends Fragment {
@Override
public void onStart() {
super.onStart();
activity.setBottomNavigationBarVisibility(true);
activity.setBottomSheetVisibility(true);
}
@Override
public void onResume() {
super.onResume();
setMediaBrowserListenableFuture();
}
@Override
public void onPause() {
super.onPause();
}
@Override
public void onDestroyView() {
super.onDestroyView();
@ -212,6 +226,12 @@ public class HomeFragment extends Fragment {
Objects.requireNonNull(bind.toolbar.getOverflowIcon()).setTint(requireContext().getResources().getColor(R.color.titleTextColor, null));
}
private void setMediaBrowserListenableFuture() {
discoverSongAdapter.setMediaBrowserListenableFuture(activity.getMediaBrowserListenableFuture());
similarMusicAdapter.setMediaBrowserListenableFuture(activity.getMediaBrowserListenableFuture());
starredSongAdapter.setMediaBrowserListenableFuture(activity.getMediaBrowserListenableFuture());
}
private void initDiscoverSongSlideView() {
bind.discoverSongViewPager.setOrientation(ViewPager2.ORIENTATION_HORIZONTAL);
@ -230,6 +250,13 @@ public class HomeFragment extends Fragment {
}
});
bind.discoverSongViewPager.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View view) {
Log.d(TAG, "onClick: " + view.toString());
}
});
setDiscoverSongSlideViewOffset(20, 16);
}
@ -237,7 +264,7 @@ public class HomeFragment extends Fragment {
bind.similarTracksRecyclerView.setLayoutManager(new LinearLayoutManager(requireContext(), LinearLayoutManager.HORIZONTAL, false));
bind.similarTracksRecyclerView.setHasFixedSize(true);
similarMusicAdapter = new SimilarTrackAdapter(activity, requireContext());
similarMusicAdapter = new SimilarTrackAdapter(requireContext());
bind.similarTracksRecyclerView.setAdapter(similarMusicAdapter);
homeViewModel.getStarredTracksSample().observe(requireActivity(), songs -> {
if (songs == null) {