antebudimir/tempus
1
0
Fork 0
mirror of https://github.com/antebudimir/tempus.git synced 2025-12-31 17:43:32 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Finally fixed the music queue and swap logic

Browse source
This commit is contained in:
CappielloAntonio 2021-12-30 18:13:50 +01:00
parent fc271e8b44
commit 60b741bc11
10 changed files with 134 additions and 140 deletions
Download patch file Download diff file Expand all files Collapse all files

18
app/src/main/java/com/cappielloantonio/play/viewmodel/PlayerBottomSheetViewModel.java
View file

@ -15,10 +15,8 @@ import com.cappielloantonio.play.model.Song;
import com.cappielloantonio.play.repository.ArtistRepository;
import com.cappielloantonio.play.repository.QueueRepository;
import com.cappielloantonio.play.repository.SongRepository;
import com.cappielloantonio.play.util.DownloadUtil;
import com.cappielloantonio.play.util.PreferenceUtil;
import java.util.Collections;
import java.util.List;
public class PlayerBottomSheetViewModel extends AndroidViewModel {
@ -31,20 +29,16 @@ public class PlayerBottomSheetViewModel extends AndroidViewModel {
private final MutableLiveData<String> lyricsLiveData = new MutableLiveData<>(null);
private final MutableLiveData<Song> songLiveData = new MutableLiveData<>(null);
private final LiveData<List<Queue>> queueSong;
public PlayerBottomSheetViewModel(@NonNull Application application) {
super(application);
songRepository = new SongRepository(application);
artistRepository = new ArtistRepository(application);
queueRepository = new QueueRepository(application);
queueSong = queueRepository.getLiveQueue();
}
public LiveData<List<Queue>> getQueueSong() {
return queueSong;
return queueRepository.getLiveQueue();
}
public Song getCurrentSong() {
@ -63,21 +57,13 @@ public class PlayerBottomSheetViewModel extends AndroidViewModel {
songRepository.star(song.getId());
song.setFavorite(true);
if(PreferenceUtil.getInstance(context).isStarredSyncEnabled()) {
if (PreferenceUtil.getInstance(context).isStarredSyncEnabled()) {
// DownloadUtil.getDownloadTracker(context).download(Collections.singletonList(song), null, null);
}
}
}
}
public void orderSongAfterSwap(List<Song> songs) {
queueRepository.insertAllAndStartNew(songs);
}
public void removeSong(int position) {
queueRepository.deleteByPosition(position);
}
public LiveData<Artist> getArtist() {
Song song = getCurrentSong();
return artistRepository.getArtist(song.getArtistId());