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

Removed unused context parameters

Browse source
This commit is contained in:
antonio 2023-03-10 19:02:25 +01:00
parent ff1a1350f9
commit 20052ff054
18 changed files with 51 additions and 51 deletions
Download patch file Download diff file Expand all files Collapse all files

2
app/src/main/java/com/cappielloantonio/play/repository/SongRepository.java
View file

@ -22,7 +22,7 @@ public class SongRepository {
private static final String TAG = "SongRepository"; private static final String TAG = "SongRepository";
public MutableLiveData<List<Child>> getStarredSongs(boolean random, int size) { public MutableLiveData<List<Child>> getStarredSongs(boolean random, int size) {
MutableLiveData<List<Child>> starredSongs = new MutableLiveData<>(Collections.EMPTY_LIST); MutableLiveData<List<Child>> starredSongs = new MutableLiveData<>(Collections.emptyList());
App.getSubsonicClientInstance(false) App.getSubsonicClientInstance(false)
.getAlbumSongListClient() .getAlbumSongListClient()

14
app/src/main/java/com/cappielloantonio/play/service/MediaManager.java
View file

@ -57,7 +57,7 @@ public class MediaManager {
} }
} }
public static void check(ListenableFuture<MediaBrowser> mediaBrowserListenableFuture, Context context) { public static void check(ListenableFuture<MediaBrowser> mediaBrowserListenableFuture) {
if (mediaBrowserListenableFuture != null) { if (mediaBrowserListenableFuture != null) {
mediaBrowserListenableFuture.addListener(() -> { mediaBrowserListenableFuture.addListener(() -> {
try { try {
@ -65,7 +65,7 @@ public class MediaManager {
if (mediaBrowserListenableFuture.get().getMediaItemCount() < 1) { if (mediaBrowserListenableFuture.get().getMediaItemCount() < 1) {
List<Child> media = getQueueRepository().getMedia(); List<Child> media = getQueueRepository().getMedia();
if (media != null && media.size() >= 1) { if (media != null && media.size() >= 1) {
init(mediaBrowserListenableFuture, context, media); init(mediaBrowserListenableFuture, media);
} }
} }
} }
@ -76,7 +76,7 @@ public class MediaManager {
} }
} }
public static void init(ListenableFuture<MediaBrowser> mediaBrowserListenableFuture, Context context, List<Child> media) { public static void init(ListenableFuture<MediaBrowser> mediaBrowserListenableFuture, List<Child> media) {
if (mediaBrowserListenableFuture != null) { if (mediaBrowserListenableFuture != null) {
mediaBrowserListenableFuture.addListener(() -> { mediaBrowserListenableFuture.addListener(() -> {
try { try {
@ -163,7 +163,7 @@ public class MediaManager {
} }
} }
public static void startQueue(ListenableFuture<MediaBrowser> mediaBrowserListenableFuture, Context context, List<Child> media, int startIndex) { public static void startQueue(ListenableFuture<MediaBrowser> mediaBrowserListenableFuture, List<Child> media, int startIndex) {
if (mediaBrowserListenableFuture != null) { if (mediaBrowserListenableFuture != null) {
mediaBrowserListenableFuture.addListener(() -> { mediaBrowserListenableFuture.addListener(() -> {
try { try {
@ -182,7 +182,7 @@ public class MediaManager {
} }
} }
public static void startQueue(ListenableFuture<MediaBrowser> mediaBrowserListenableFuture, Context context, Child media) { public static void startQueue(ListenableFuture<MediaBrowser> mediaBrowserListenableFuture, Child media) {
if (mediaBrowserListenableFuture != null) { if (mediaBrowserListenableFuture != null) {
mediaBrowserListenableFuture.addListener(() -> { mediaBrowserListenableFuture.addListener(() -> {
try { try {
@ -200,7 +200,7 @@ public class MediaManager {
} }
} }
public static void enqueue(ListenableFuture<MediaBrowser> mediaBrowserListenableFuture, Context context, List<Child> media, boolean playImmediatelyAfter) { public static void enqueue(ListenableFuture<MediaBrowser> mediaBrowserListenableFuture, List<Child> media, boolean playImmediatelyAfter) {
if (mediaBrowserListenableFuture != null) { if (mediaBrowserListenableFuture != null) {
mediaBrowserListenableFuture.addListener(() -> { mediaBrowserListenableFuture.addListener(() -> {
try { try {
@ -220,7 +220,7 @@ public class MediaManager {
} }
} }
public static void enqueue(ListenableFuture<MediaBrowser> mediaBrowserListenableFuture, Context context, Child media, boolean playImmediatelyAfter) { public static void enqueue(ListenableFuture<MediaBrowser> mediaBrowserListenableFuture, Child media, boolean playImmediatelyAfter) {
if (mediaBrowserListenableFuture != null) { if (mediaBrowserListenableFuture != null) {
mediaBrowserListenableFuture.addListener(() -> { mediaBrowserListenableFuture.addListener(() -> {
try { try {

2
app/src/main/java/com/cappielloantonio/play/ui/activity/MainActivity.java
View file

@ -205,7 +205,7 @@ public class MainActivity extends BaseActivity {
} }
private void initService() { private void initService() {
MediaManager.check(getMediaBrowserListenableFuture(), this); MediaManager.check(getMediaBrowserListenableFuture());
getMediaBrowserListenableFuture().addListener(() -> { getMediaBrowserListenableFuture().addListener(() -> {
try { try {

6
app/src/main/java/com/cappielloantonio/play/ui/fragment/AlbumPageFragment.java
View file

@ -154,13 +154,13 @@ public class AlbumPageFragment extends Fragment implements ClickCallback {
albumPageViewModel.getAlbumSongLiveList().observe(getViewLifecycleOwner(), songs -> { albumPageViewModel.getAlbumSongLiveList().observe(getViewLifecycleOwner(), songs -> {
if (bind != null && !songs.isEmpty()) { if (bind != null && !songs.isEmpty()) {
bind.albumPagePlayButton.setOnClickListener(v -> { bind.albumPagePlayButton.setOnClickListener(v -> {
MediaManager.startQueue(mediaBrowserListenableFuture, requireContext(), songs, 0); MediaManager.startQueue(mediaBrowserListenableFuture, songs, 0);
activity.setBottomSheetInPeek(true); activity.setBottomSheetInPeek(true);
}); });
bind.albumPageShuffleButton.setOnClickListener(v -> { bind.albumPageShuffleButton.setOnClickListener(v -> {
Collections.shuffle(songs); Collections.shuffle(songs);
MediaManager.startQueue(mediaBrowserListenableFuture, requireContext(), songs, 0); MediaManager.startQueue(mediaBrowserListenableFuture, songs, 0);
activity.setBottomSheetInPeek(true); activity.setBottomSheetInPeek(true);
}); });
} }
@ -200,7 +200,7 @@ public class AlbumPageFragment extends Fragment implements ClickCallback {
@Override @Override
public void onMediaClick(Bundle bundle) { public void onMediaClick(Bundle bundle) {
MediaManager.startQueue(mediaBrowserListenableFuture, requireContext(), bundle.getParcelableArrayList(Constants.TRACKS_OBJECT), bundle.getInt(Constants.ITEM_POSITION)); MediaManager.startQueue(mediaBrowserListenableFuture, bundle.getParcelableArrayList(Constants.TRACKS_OBJECT), bundle.getInt(Constants.ITEM_POSITION));
activity.setBottomSheetInPeek(true); activity.setBottomSheetInPeek(true);
} }

6
app/src/main/java/com/cappielloantonio/play/ui/fragment/ArtistPageFragment.java
View file

@ -138,7 +138,7 @@ public class ArtistPageFragment extends Fragment implements ClickCallback {
bind.artistPageShuffleButton.setOnClickListener(v -> { bind.artistPageShuffleButton.setOnClickListener(v -> {
artistPageViewModel.getArtistShuffleList().observe(getViewLifecycleOwner(), songs -> { artistPageViewModel.getArtistShuffleList().observe(getViewLifecycleOwner(), songs -> {
if (songs.size() > 0) { if (songs.size() > 0) {
MediaManager.startQueue(mediaBrowserListenableFuture, requireContext(), songs, 0); MediaManager.startQueue(mediaBrowserListenableFuture, songs, 0);
activity.setBottomSheetInPeek(true); activity.setBottomSheetInPeek(true);
} else { } else {
Toast.makeText(requireContext(), getString(R.string.artist_error_retrieving_tracks), Toast.LENGTH_SHORT).show(); Toast.makeText(requireContext(), getString(R.string.artist_error_retrieving_tracks), Toast.LENGTH_SHORT).show();
@ -149,7 +149,7 @@ public class ArtistPageFragment extends Fragment implements ClickCallback {
bind.artistPageRadioButton.setOnClickListener(v -> { bind.artistPageRadioButton.setOnClickListener(v -> {
artistPageViewModel.getArtistInstantMix().observe(getViewLifecycleOwner(), songs -> { artistPageViewModel.getArtistInstantMix().observe(getViewLifecycleOwner(), songs -> {
if (songs.size() > 0) { if (songs.size() > 0) {
MediaManager.startQueue(mediaBrowserListenableFuture, requireContext(), songs, 0); MediaManager.startQueue(mediaBrowserListenableFuture, songs, 0);
activity.setBottomSheetInPeek(true); activity.setBottomSheetInPeek(true);
} else { } else {
Toast.makeText(requireContext(), getString(R.string.artist_error_retrieving_radio), Toast.LENGTH_SHORT).show(); Toast.makeText(requireContext(), getString(R.string.artist_error_retrieving_radio), Toast.LENGTH_SHORT).show();
@ -211,7 +211,7 @@ public class ArtistPageFragment extends Fragment implements ClickCallback {
@Override @Override
public void onMediaClick(Bundle bundle) { public void onMediaClick(Bundle bundle) {
MediaManager.startQueue(mediaBrowserListenableFuture, requireContext(), bundle.getParcelableArrayList(Constants.TRACKS_OBJECT), bundle.getInt(Constants.ITEM_POSITION)); MediaManager.startQueue(mediaBrowserListenableFuture, bundle.getParcelableArrayList(Constants.TRACKS_OBJECT), bundle.getInt(Constants.ITEM_POSITION));
activity.setBottomSheetInPeek(true); activity.setBottomSheetInPeek(true);
} }

2
app/src/main/java/com/cappielloantonio/play/ui/fragment/DownloadFragment.java
View file

@ -154,7 +154,7 @@ public class DownloadFragment extends Fragment implements ClickCallback {
@Override @Override
public void onMediaClick(Bundle bundle) { public void onMediaClick(Bundle bundle) {
MediaManager.startQueue(mediaBrowserListenableFuture, requireContext(), bundle.getParcelableArrayList(Constants.TRACKS_OBJECT), bundle.getInt(Constants.ITEM_POSITION)); MediaManager.startQueue(mediaBrowserListenableFuture, bundle.getParcelableArrayList(Constants.TRACKS_OBJECT), bundle.getInt(Constants.ITEM_POSITION));
activity.setBottomSheetInPeek(true); activity.setBottomSheetInPeek(true);
} }

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

@ -680,22 +680,22 @@ public class HomeFragment extends Fragment implements ClickCallback {
@Override @Override
public void onMediaClick(Bundle bundle) { public void onMediaClick(Bundle bundle) {
if (bundle.containsKey(Constants.MEDIA_MIX)) { if (bundle.containsKey(Constants.MEDIA_MIX)) {
MediaManager.startQueue(mediaBrowserListenableFuture, requireContext(), bundle.getParcelable(Constants.TRACK_OBJECT)); MediaManager.startQueue(mediaBrowserListenableFuture, bundle.getParcelable(Constants.TRACK_OBJECT));
activity.setBottomSheetInPeek(true); activity.setBottomSheetInPeek(true);
if (mediaBrowserListenableFuture != null) { if (mediaBrowserListenableFuture != null) {
homeViewModel.getMediaInstantMix(getViewLifecycleOwner(), bundle.getParcelable(Constants.TRACK_OBJECT)).observe(getViewLifecycleOwner(), songs -> { homeViewModel.getMediaInstantMix(getViewLifecycleOwner(), bundle.getParcelable(Constants.TRACK_OBJECT)).observe(getViewLifecycleOwner(), songs -> {
if (songs.size() > 0) { if (songs != null && songs.size() > 0) {
MediaManager.enqueue(mediaBrowserListenableFuture, requireContext(), songs, true); MediaManager.enqueue(mediaBrowserListenableFuture, songs, true);
} }
}); });
} }
} else if (bundle.containsKey(Constants.MEDIA_CHRONOLOGY)) { } else if (bundle.containsKey(Constants.MEDIA_CHRONOLOGY)) {
List<Child> media = bundle.getParcelableArrayList(Constants.TRACKS_OBJECT); List<Child> media = bundle.getParcelableArrayList(Constants.TRACKS_OBJECT);
MediaManager.startQueue(mediaBrowserListenableFuture, requireContext(), media, bundle.getInt(Constants.ITEM_POSITION)); MediaManager.startQueue(mediaBrowserListenableFuture, media, bundle.getInt(Constants.ITEM_POSITION));
activity.setBottomSheetInPeek(true); activity.setBottomSheetInPeek(true);
} else { } else {
MediaManager.startQueue(mediaBrowserListenableFuture, requireContext(), bundle.getParcelableArrayList(Constants.TRACKS_OBJECT), bundle.getInt(Constants.ITEM_POSITION)); MediaManager.startQueue(mediaBrowserListenableFuture, bundle.getParcelableArrayList(Constants.TRACKS_OBJECT), bundle.getInt(Constants.ITEM_POSITION));
activity.setBottomSheetInPeek(true); activity.setBottomSheetInPeek(true);
} }
} }
@ -725,7 +725,7 @@ public class HomeFragment extends Fragment implements ClickCallback {
if (mediaBrowserListenableFuture != null) { if (mediaBrowserListenableFuture != null) {
homeViewModel.getArtistInstantMix(getViewLifecycleOwner(), bundle.getParcelable(Constants.ARTIST_OBJECT)).observe(getViewLifecycleOwner(), songs -> { homeViewModel.getArtistInstantMix(getViewLifecycleOwner(), bundle.getParcelable(Constants.ARTIST_OBJECT)).observe(getViewLifecycleOwner(), songs -> {
if (songs.size() > 0) { if (songs.size() > 0) {
MediaManager.startQueue(mediaBrowserListenableFuture, requireContext(), songs, 0); MediaManager.startQueue(mediaBrowserListenableFuture, songs, 0);
activity.setBottomSheetInPeek(true); activity.setBottomSheetInPeek(true);
} }
}); });
@ -734,7 +734,7 @@ public class HomeFragment extends Fragment implements ClickCallback {
if (mediaBrowserListenableFuture != null) { if (mediaBrowserListenableFuture != null) {
homeViewModel.getArtistBestOf(getViewLifecycleOwner(), bundle.getParcelable(Constants.ARTIST_OBJECT)).observe(getViewLifecycleOwner(), songs -> { homeViewModel.getArtistBestOf(getViewLifecycleOwner(), bundle.getParcelable(Constants.ARTIST_OBJECT)).observe(getViewLifecycleOwner(), songs -> {
if (songs.size() > 0) { if (songs.size() > 0) {
MediaManager.startQueue(mediaBrowserListenableFuture, requireContext(), songs, 0); MediaManager.startQueue(mediaBrowserListenableFuture, songs, 0);
activity.setBottomSheetInPeek(true); activity.setBottomSheetInPeek(true);
} }
}); });
@ -756,7 +756,7 @@ public class HomeFragment extends Fragment implements ClickCallback {
@Override @Override
public void onPodcastClick(Bundle bundle) { public void onPodcastClick(Bundle bundle) {
MediaManager.startQueue(mediaBrowserListenableFuture, requireContext(), bundle.getParcelable(Constants.PODCAST_OBJECT)); MediaManager.startQueue(mediaBrowserListenableFuture, bundle.getParcelable(Constants.PODCAST_OBJECT));
activity.setBottomSheetInPeek(true); activity.setBottomSheetInPeek(true);
} }

2
app/src/main/java/com/cappielloantonio/play/ui/fragment/PlayerCoverFragment.java
View file

@ -108,7 +108,7 @@ public class PlayerCoverFragment extends Fragment {
bind.innerButtonBottomLeft.setOnClickListener(view -> { bind.innerButtonBottomLeft.setOnClickListener(view -> {
playerBottomSheetViewModel.getMediaInstantMix(getViewLifecycleOwner(), song).observe(getViewLifecycleOwner(), media -> { playerBottomSheetViewModel.getMediaInstantMix(getViewLifecycleOwner(), song).observe(getViewLifecycleOwner(), media -> {
MediaManager.enqueue(mediaBrowserListenableFuture, requireContext(), media, true); MediaManager.enqueue(mediaBrowserListenableFuture, media, true);
}); });
}); });

2
app/src/main/java/com/cappielloantonio/play/ui/fragment/PlayerQueueFragment.java
View file

@ -152,6 +152,6 @@ public class PlayerQueueFragment extends Fragment implements ClickCallback {
@Override @Override
public void onMediaClick(Bundle bundle) { public void onMediaClick(Bundle bundle) {
MediaManager.startQueue(mediaBrowserListenableFuture, requireContext(), bundle.getParcelableArrayList(Constants.TRACKS_OBJECT), bundle.getInt(Constants.ITEM_POSITION)); MediaManager.startQueue(mediaBrowserListenableFuture, bundle.getParcelableArrayList(Constants.TRACKS_OBJECT), bundle.getInt(Constants.ITEM_POSITION));
} }
} }

6
app/src/main/java/com/cappielloantonio/play/ui/fragment/PlaylistPageFragment.java
View file

@ -148,13 +148,13 @@ public class PlaylistPageFragment extends Fragment implements ClickCallback {
playlistPageViewModel.getPlaylistSongLiveList().observe(getViewLifecycleOwner(), songs -> { playlistPageViewModel.getPlaylistSongLiveList().observe(getViewLifecycleOwner(), songs -> {
if (bind != null) { if (bind != null) {
bind.playlistPagePlayButton.setOnClickListener(v -> { bind.playlistPagePlayButton.setOnClickListener(v -> {
MediaManager.startQueue(mediaBrowserListenableFuture, requireContext(), songs, 0); MediaManager.startQueue(mediaBrowserListenableFuture, songs, 0);
activity.setBottomSheetInPeek(true); activity.setBottomSheetInPeek(true);
}); });
bind.playlistPageShuffleButton.setOnClickListener(v -> { bind.playlistPageShuffleButton.setOnClickListener(v -> {
Collections.shuffle(songs); Collections.shuffle(songs);
MediaManager.startQueue(mediaBrowserListenableFuture, requireContext(), songs, 0); MediaManager.startQueue(mediaBrowserListenableFuture, songs, 0);
activity.setBottomSheetInPeek(true); activity.setBottomSheetInPeek(true);
}); });
} }
@ -189,7 +189,7 @@ public class PlaylistPageFragment extends Fragment implements ClickCallback {
@Override @Override
public void onMediaClick(Bundle bundle) { public void onMediaClick(Bundle bundle) {
MediaManager.startQueue(mediaBrowserListenableFuture, requireContext(), bundle.getParcelableArrayList(Constants.TRACKS_OBJECT), bundle.getInt(Constants.ITEM_POSITION)); MediaManager.startQueue(mediaBrowserListenableFuture, bundle.getParcelableArrayList(Constants.TRACKS_OBJECT), bundle.getInt(Constants.ITEM_POSITION));
activity.setBottomSheetInPeek(true); activity.setBottomSheetInPeek(true);
} }

2
app/src/main/java/com/cappielloantonio/play/ui/fragment/SearchFragment.java
View file

@ -229,7 +229,7 @@ public class SearchFragment extends Fragment implements ClickCallback {
@Override @Override
public void onMediaClick(Bundle bundle) { public void onMediaClick(Bundle bundle) {
MediaManager.startQueue(mediaBrowserListenableFuture, requireContext(), bundle.getParcelableArrayList(Constants.TRACKS_OBJECT), bundle.getInt(Constants.ITEM_POSITION)); MediaManager.startQueue(mediaBrowserListenableFuture, bundle.getParcelableArrayList(Constants.TRACKS_OBJECT), bundle.getInt(Constants.ITEM_POSITION));
activity.setBottomSheetInPeek(true); activity.setBottomSheetInPeek(true);
} }

4
app/src/main/java/com/cappielloantonio/play/ui/fragment/SongListPageFragment.java
View file

@ -150,7 +150,7 @@ public class SongListPageFragment extends Fragment implements ClickCallback {
if (bind != null) { if (bind != null) {
bind.songListShuffleImageView.setOnClickListener(v -> { bind.songListShuffleImageView.setOnClickListener(v -> {
Collections.shuffle(songs); Collections.shuffle(songs);
MediaManager.startQueue(mediaBrowserListenableFuture, requireContext(), songs.subList(0, Math.min(25, songs.size())), 0); MediaManager.startQueue(mediaBrowserListenableFuture, songs.subList(0, Math.min(25, songs.size())), 0);
activity.setBottomSheetInPeek(true); activity.setBottomSheetInPeek(true);
}); });
} }
@ -176,7 +176,7 @@ public class SongListPageFragment extends Fragment implements ClickCallback {
@Override @Override
public void onMediaClick(Bundle bundle) { public void onMediaClick(Bundle bundle) {
MediaManager.startQueue(mediaBrowserListenableFuture, requireContext(), bundle.getParcelableArrayList(Constants.TRACKS_OBJECT), bundle.getInt(Constants.ITEM_POSITION)); MediaManager.startQueue(mediaBrowserListenableFuture, bundle.getParcelableArrayList(Constants.TRACKS_OBJECT), bundle.getInt(Constants.ITEM_POSITION));
activity.setBottomSheetInPeek(true); activity.setBottomSheetInPeek(true);
} }

8
app/src/main/java/com/cappielloantonio/play/ui/fragment/bottomsheetdialog/AlbumBottomSheetDialog.java
View file

@ -112,7 +112,7 @@ public class AlbumBottomSheetDialog extends BottomSheetDialogFragment implements
@Override @Override
public void onLoadMedia(List<?> media) { public void onLoadMedia(List<?> media) {
if (media.size() > 0) { if (media.size() > 0) {
MediaManager.startQueue(mediaBrowserListenableFuture, requireContext(), (ArrayList<Child>) media, 0); MediaManager.startQueue(mediaBrowserListenableFuture, (ArrayList<Child>) media, 0);
((MainActivity) requireActivity()).setBottomSheetInPeek(true); ((MainActivity) requireActivity()).setBottomSheetInPeek(true);
} }
@ -127,7 +127,7 @@ public class AlbumBottomSheetDialog extends BottomSheetDialogFragment implements
albumRepository.getAlbumTracks(album.getId()).observe(getViewLifecycleOwner(), songs -> { albumRepository.getAlbumTracks(album.getId()).observe(getViewLifecycleOwner(), songs -> {
Collections.shuffle(songs); Collections.shuffle(songs);
MediaManager.startQueue(mediaBrowserListenableFuture, requireContext(), songs, 0); MediaManager.startQueue(mediaBrowserListenableFuture, songs, 0);
((MainActivity) requireActivity()).setBottomSheetInPeek(true); ((MainActivity) requireActivity()).setBottomSheetInPeek(true);
dismissBottomSheet(); dismissBottomSheet();
@ -136,7 +136,7 @@ public class AlbumBottomSheetDialog extends BottomSheetDialogFragment implements
TextView playNext = view.findViewById(R.id.play_next_text_view); TextView playNext = view.findViewById(R.id.play_next_text_view);
playNext.setOnClickListener(v -> albumBottomSheetViewModel.getAlbumTracks().observe(getViewLifecycleOwner(), songs -> { playNext.setOnClickListener(v -> albumBottomSheetViewModel.getAlbumTracks().observe(getViewLifecycleOwner(), songs -> {
MediaManager.enqueue(mediaBrowserListenableFuture, requireContext(), songs, true); MediaManager.enqueue(mediaBrowserListenableFuture, songs, true);
((MainActivity) requireActivity()).setBottomSheetInPeek(true); ((MainActivity) requireActivity()).setBottomSheetInPeek(true);
dismissBottomSheet(); dismissBottomSheet();
@ -144,7 +144,7 @@ public class AlbumBottomSheetDialog extends BottomSheetDialogFragment implements
TextView addToQueue = view.findViewById(R.id.add_to_queue_text_view); TextView addToQueue = view.findViewById(R.id.add_to_queue_text_view);
addToQueue.setOnClickListener(v -> albumBottomSheetViewModel.getAlbumTracks().observe(getViewLifecycleOwner(), songs -> { addToQueue.setOnClickListener(v -> albumBottomSheetViewModel.getAlbumTracks().observe(getViewLifecycleOwner(), songs -> {
MediaManager.enqueue(mediaBrowserListenableFuture, requireContext(), songs, false); MediaManager.enqueue(mediaBrowserListenableFuture, songs, false);
((MainActivity) requireActivity()).setBottomSheetInPeek(true); ((MainActivity) requireActivity()).setBottomSheetInPeek(true);
dismissBottomSheet(); dismissBottomSheet();

4
app/src/main/java/com/cappielloantonio/play/ui/fragment/bottomsheetdialog/ArtistBottomSheetDialog.java
View file

@ -94,7 +94,7 @@ public class ArtistBottomSheetDialog extends BottomSheetDialogFragment implement
artistRepository.getInstantMix(artist, 20).observe(getViewLifecycleOwner(), songs -> { artistRepository.getInstantMix(artist, 20).observe(getViewLifecycleOwner(), songs -> {
if (songs.size() > 0) { if (songs.size() > 0) {
MediaManager.startQueue(mediaBrowserListenableFuture, requireContext(), songs, 0); MediaManager.startQueue(mediaBrowserListenableFuture, songs, 0);
((MainActivity) requireActivity()).setBottomSheetInPeek(true); ((MainActivity) requireActivity()).setBottomSheetInPeek(true);
} }
@ -107,7 +107,7 @@ public class ArtistBottomSheetDialog extends BottomSheetDialogFragment implement
ArtistRepository artistRepository = new ArtistRepository(); ArtistRepository artistRepository = new ArtistRepository();
artistRepository.getRandomSong(artist, 50).observe(getViewLifecycleOwner(), songs -> { artistRepository.getRandomSong(artist, 50).observe(getViewLifecycleOwner(), songs -> {
if (songs.size() > 0) { if (songs.size() > 0) {
MediaManager.startQueue(mediaBrowserListenableFuture, requireContext(), songs, 0); MediaManager.startQueue(mediaBrowserListenableFuture, songs, 0);
((MainActivity) requireActivity()).setBottomSheetInPeek(true); ((MainActivity) requireActivity()).setBottomSheetInPeek(true);
dismissBottomSheet(); dismissBottomSheet();

4
app/src/main/java/com/cappielloantonio/play/ui/fragment/bottomsheetdialog/PodcastBottomSheetDialog.java
View file

@ -83,7 +83,7 @@ public class PodcastBottomSheetDialog extends BottomSheetDialogFragment implemen
TextView playNext = view.findViewById(R.id.play_next_text_view); TextView playNext = view.findViewById(R.id.play_next_text_view);
playNext.setOnClickListener(v -> { playNext.setOnClickListener(v -> {
// TODO // TODO
// MediaManager.enqueue(mediaBrowserListenableFuture, requireContext(), podcast, true); // MediaManager.enqueue(mediaBrowserListenableFuture, podcast, true);
((MainActivity) requireActivity()).setBottomSheetInPeek(true); ((MainActivity) requireActivity()).setBottomSheetInPeek(true);
dismissBottomSheet(); dismissBottomSheet();
}); });
@ -91,7 +91,7 @@ public class PodcastBottomSheetDialog extends BottomSheetDialogFragment implemen
TextView addToQueue = view.findViewById(R.id.add_to_queue_text_view); TextView addToQueue = view.findViewById(R.id.add_to_queue_text_view);
addToQueue.setOnClickListener(v -> { addToQueue.setOnClickListener(v -> {
// TODO // TODO
// MediaManager.enqueue(mediaBrowserListenableFuture, requireContext(), podcast, false); // MediaManager.enqueue(mediaBrowserListenableFuture, podcast, false);
((MainActivity) requireActivity()).setBottomSheetInPeek(true); ((MainActivity) requireActivity()).setBottomSheetInPeek(true);
dismissBottomSheet(); dismissBottomSheet();
}); });

8
app/src/main/java/com/cappielloantonio/play/ui/fragment/bottomsheetdialog/SongBottomSheetDialog.java
View file

@ -109,7 +109,7 @@ public class SongBottomSheetDialog extends BottomSheetDialogFragment implements
TextView playRadio = view.findViewById(R.id.play_radio_text_view); TextView playRadio = view.findViewById(R.id.play_radio_text_view);
playRadio.setOnClickListener(v -> { playRadio.setOnClickListener(v -> {
MediaManager.startQueue(mediaBrowserListenableFuture, requireContext(), song); MediaManager.startQueue(mediaBrowserListenableFuture, song);
((MainActivity) requireActivity()).setBottomSheetInPeek(true); ((MainActivity) requireActivity()).setBottomSheetInPeek(true);
songBottomSheetViewModel.getInstantMix(getViewLifecycleOwner(), song).observe(getViewLifecycleOwner(), songs -> { songBottomSheetViewModel.getInstantMix(getViewLifecycleOwner(), song).observe(getViewLifecycleOwner(), songs -> {
@ -119,7 +119,7 @@ public class SongBottomSheetDialog extends BottomSheetDialogFragment implements
} }
if (songs.size() > 0) { if (songs.size() > 0) {
MediaManager.enqueue(mediaBrowserListenableFuture, requireContext(), songs, true); MediaManager.enqueue(mediaBrowserListenableFuture, songs, true);
dismissBottomSheet(); dismissBottomSheet();
} }
}); });
@ -127,14 +127,14 @@ public class SongBottomSheetDialog extends BottomSheetDialogFragment implements
TextView playNext = view.findViewById(R.id.play_next_text_view); TextView playNext = view.findViewById(R.id.play_next_text_view);
playNext.setOnClickListener(v -> { playNext.setOnClickListener(v -> {
MediaManager.enqueue(mediaBrowserListenableFuture, requireContext(), song, true); MediaManager.enqueue(mediaBrowserListenableFuture, song, true);
((MainActivity) requireActivity()).setBottomSheetInPeek(true); ((MainActivity) requireActivity()).setBottomSheetInPeek(true);
dismissBottomSheet(); dismissBottomSheet();
}); });
TextView addToQueue = view.findViewById(R.id.add_to_queue_text_view); TextView addToQueue = view.findViewById(R.id.add_to_queue_text_view);
addToQueue.setOnClickListener(v -> { addToQueue.setOnClickListener(v -> {
MediaManager.enqueue(mediaBrowserListenableFuture, requireContext(), song, false); MediaManager.enqueue(mediaBrowserListenableFuture, song, false);
((MainActivity) requireActivity()).setBottomSheetInPeek(true); ((MainActivity) requireActivity()).setBottomSheetInPeek(true);
dismissBottomSheet(); dismissBottomSheet();
}); });

2
app/src/main/java/com/cappielloantonio/play/util/MusicUtil.java
View file

@ -55,7 +55,7 @@ public class MusicUtil {
StringBuilder uri = new StringBuilder(); StringBuilder uri = new StringBuilder();
uri.append(App.getSubsonicClientInstance(false).getUrl()); uri.append(App.getSubsonicClientInstance(false).getUrl());
uri.append("download"); uri.append("stream");
if (params.containsKey("u") && params.get("u") != null) if (params.containsKey("u") && params.get("u") != null)
uri.append("?u=").append(params.get("u")); uri.append("?u=").append(params.get("u"));

12
app/src/main/java/com/cappielloantonio/play/viewmodel/HomeViewModel.java
View file

@ -197,17 +197,17 @@ public class HomeViewModel extends AndroidViewModel {
} }
public LiveData<List<Child>> getArtistInstantMix(LifecycleOwner owner, ArtistID3 artist) { public LiveData<List<Child>> getArtistInstantMix(LifecycleOwner owner, ArtistID3 artist) {
if (artistInstantMix.getValue() == null) { artistInstantMix.setValue(Collections.emptyList());
artistRepository.getTopSongs(artist.getName(), 10).observe(owner, artistInstantMix::postValue);
} artistRepository.getTopSongs(artist.getName(), 10).observe(owner, artistInstantMix::postValue);
return artistInstantMix; return artistInstantMix;
} }
public LiveData<List<Child>> getArtistBestOf(LifecycleOwner owner, ArtistID3 artist) { public LiveData<List<Child>> getArtistBestOf(LifecycleOwner owner, ArtistID3 artist) {
if (bestOfArtists.getValue() == null) { artistBestOf.setValue(Collections.emptyList());
artistRepository.getTopSongs(artist.getName(), 10).observe(owner, artistBestOf::postValue);
} artistRepository.getTopSongs(artist.getName(), 10).observe(owner, artistBestOf::postValue);
return artistBestOf; return artistBestOf;
} }