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

Changed the sort order of the songs in the playlist and added a download button

Browse source
This commit is contained in:
CappielloAntonio 2021-06-26 15:10:49 +02:00
parent a466574e08
commit 91fd7a5b29
10 changed files with 106 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

2
.idea/compiler.xml generated
View file

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="CompilerConfiguration">
<bytecodeTargetLevel target="1.8" />
<bytecodeTargetLevel target="11" />
</component>
</project>

2
.idea/misc.xml generated
View file

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" default="true" project-jdk-name="1.8" project-jdk-type="JavaSDK">
<component name="ProjectRootManager" version="2" languageLevel="JDK_11" default="true" project-jdk-name="1.8" project-jdk-type="JavaSDK">
<output url="file://$PROJECT_DIR$/build/classes" />
</component>
<component name="ProjectType">

2
app/src/main/java/com/cappielloantonio/play/database/AppDatabase.java
View file

@ -29,7 +29,7 @@ import com.cappielloantonio.play.model.Song;
import com.cappielloantonio.play.model.SongArtistCross;
import com.cappielloantonio.play.model.SongGenreCross;
@Database(entities = {Album.class, Artist.class, Genre.class, Playlist.class, Song.class, RecentSearch.class, SongGenreCross.class, Queue.class, AlbumArtistCross.class, SongArtistCross.class, PlaylistSongCross.class}, version = 13, exportSchema = false)
@Database(entities = {Album.class, Artist.class, Genre.class, Playlist.class, Song.class, RecentSearch.class, SongGenreCross.class, Queue.class, AlbumArtistCross.class, SongArtistCross.class, PlaylistSongCross.class}, version = 14, exportSchema = false)
public abstract class AppDatabase extends RoomDatabase {
private static final String TAG = "AppDatabase";
private final static String DB_NAME = "play_db";

5
app/src/main/java/com/cappielloantonio/play/database/dao/SongDao.java
View file

@ -48,9 +48,12 @@ public interface SongDao {
@Query("SELECT * FROM song WHERE albumId = :albumID ORDER BY trackNumber ASC")
LiveData<List<Song>> getLiveAlbumSong(String albumID);
@Query("SELECT song.* FROM song INNER JOIN playlist_song_cross ON song.id = playlist_song_cross.song_id AND playlist_song_cross.playlist_id = :playlistID")
@Query("SELECT song.* FROM song INNER JOIN playlist_song_cross ON song.id = playlist_song_cross.song_id AND playlist_song_cross.playlist_id = :playlistID ORDER BY playlist_song_cross.item_number")
LiveData<List<Song>> getLivePlaylistSong(String playlistID);
@Query("SELECT song.* FROM song INNER JOIN playlist_song_cross ON song.id = playlist_song_cross.song_id AND playlist_song_cross.playlist_id = :playlistID ORDER BY playlist_song_cross.item_number")
List<Song> getPlaylistSong(String playlistID);
@Query("SELECT * FROM song WHERE albumId = :albumID ORDER BY trackNumber ASC")
List<Song> getAlbumSong(String albumID);

10
app/src/main/java/com/cappielloantonio/play/model/PlaylistSongCross.java
View file

@ -15,9 +15,13 @@ public class PlaylistSongCross {
@ColumnInfo(name = "song_id")
private String songId;
public PlaylistSongCross(String playlistId, String songId) {
@ColumnInfo(name = "item_number")
private int itemNumber;
public PlaylistSongCross(String playlistId, String songId, int itemNumber) {
this.playlistId = playlistId;
this.songId = songId;
this.itemNumber = itemNumber;
}
public String getPlaylistId() {
@ -35,4 +39,8 @@ public class PlaylistSongCross {
public void setSongId(String songId) {
this.songId = songId;
}
public int getItemNumber() { return itemNumber; }
public void setItemNumber(int itemNumber) { this.itemNumber = itemNumber; }
}

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

@ -293,6 +293,23 @@ public class SongRepository {
return sample;
}
public List<Song> getPlaylistSong(String playlistID) {
List<Song> songs = new ArrayList<>();
GetSongsByPlaylistIDThreadSafe playlistThread = new GetSongsByPlaylistIDThreadSafe(songDao, playlistID);
Thread thread = new Thread(playlistThread);
thread.start();
try {
thread.join();
songs = playlistThread.getSongs();
} catch (InterruptedException e) {
e.printStackTrace();
}
return songs;
}
private static class GetRandomSongsByArtistIDThreadSafe implements Runnable {
private SongDao songDao;
private String artistID;
@ -509,4 +526,24 @@ public class SongRepository {
return sample;
}
}
private static class GetSongsByPlaylistIDThreadSafe implements Runnable {
private SongDao songDao;
private String playlistID;
private List<Song> songs = new ArrayList<>();
public GetSongsByPlaylistIDThreadSafe(SongDao songDao, String playlistID) {
this.songDao = songDao;
this.playlistID = playlistID;
}
@Override
public void run() {
songs = songDao.getPlaylistSong(playlistID);
}
public List<Song> getSongs() {
return songs;
}
}
}

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

@ -3,9 +3,13 @@ package com.cappielloantonio.play.ui.fragment;
import android.graphics.PorterDuff;
import android.os.Bundle;
import android.view.LayoutInflater;
import android.view.Menu;
import android.view.MenuInflater;
import android.view.MenuItem;
import android.view.View;
import android.view.ViewGroup;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import androidx.core.view.ViewCompat;
import androidx.fragment.app.Fragment;
@ -20,6 +24,7 @@ import com.cappielloantonio.play.glide.CustomGlideRequest;
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.PreferenceUtil;
import com.cappielloantonio.play.viewmodel.PlaylistPageViewModel;
@ -33,6 +38,18 @@ public class PlaylistPageFragment extends Fragment {
private SongResultSearchAdapter songResultSearchAdapter;
@Override
public void onCreate(@Nullable Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
setHasOptionsMenu(true);
}
@Override
public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) {
super.onCreateOptionsMenu(menu, inflater);
inflater.inflate(R.menu.playlist_page_menu, menu);
}
@Override
public void onActivityCreated(@Nullable Bundle savedInstanceState) {
super.onActivityCreated(savedInstanceState);
@ -68,6 +85,19 @@ public class PlaylistPageFragment extends Fragment {
bind = null;
}
@Override
public boolean onOptionsItemSelected(@NonNull MenuItem item) {
switch (item.getItemId()) {
case R.id.action_download_playlist:
DownloadUtil.getDownloadTracker(requireContext()).toggleDownload(playlistPageViewModel.getPlaylistSongList());
return true;
default:
break;
}
return false;
}
private void init() {
playlistPageViewModel.setPlaylist(getArguments().getParcelable("playlist_object"));
}
@ -91,7 +121,7 @@ public class PlaylistPageFragment extends Fragment {
}
private void initMusicButton() {
playlistPageViewModel.getPlaylistSongList().observe(requireActivity(), songs -> {
playlistPageViewModel.getPlaylistSongLiveList().observe(requireActivity(), songs -> {
if(bind != null) {
bind.playlistPagePlayButton.setOnClickListener(v -> {
QueueRepository queueRepository = new QueueRepository(App.getInstance());
@ -131,7 +161,7 @@ public class PlaylistPageFragment extends Fragment {
songResultSearchAdapter = new SongResultSearchAdapter(activity, requireContext(), getChildFragmentManager());
bind.playlistRecyclerView.setAdapter(songResultSearchAdapter);
playlistPageViewModel.getPlaylistSongList().observe(requireActivity(), songs -> {
playlistPageViewModel.getPlaylistSongLiveList().observe(requireActivity(), songs -> {
songResultSearchAdapter.setItems(songs);
});
}

4
app/src/main/java/com/cappielloantonio/play/util/SyncUtil.java
View file

@ -2,6 +2,7 @@ package com.cappielloantonio.play.util;
import android.content.Context;
import android.os.Bundle;
import android.util.Log;
import com.cappielloantonio.play.App;
import com.cappielloantonio.play.interfaces.MediaCallback;
@ -226,10 +227,11 @@ public class SyncUtil {
App.getApiClientInstance(context).GetPlaylistItems(query, new Response<ItemsResult>() {
@Override
public void onResponse(ItemsResult result) {
int itemNumber = 0;
ArrayList<PlaylistSongCross> crosses = new ArrayList<>();
for (BaseItemDto itemDto : result.getItems()) {
crosses.add(new PlaylistSongCross(playlistId, itemDto.getId()));
crosses.add(new PlaylistSongCross(playlistId, itemDto.getId(), itemNumber++));
}
callback.onLoadMedia(crosses);

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

@ -17,7 +17,7 @@ public class PlaylistPageViewModel extends AndroidViewModel {
private SongRepository songRepository;
private LiveData<List<Song>> songList;
private LiveData<List<Song>> songLiveList;
private Playlist playlist;
@ -27,9 +27,13 @@ public class PlaylistPageViewModel extends AndroidViewModel {
songRepository = new SongRepository(application);
}
public LiveData<List<Song>> getPlaylistSongList() {
songList = songRepository.getPlaylistLiveSong(playlist.getId());
return songList;
public LiveData<List<Song>> getPlaylistSongLiveList() {
songLiveList = songRepository.getPlaylistLiveSong(playlist.getId());
return songLiveList;
}
public List<Song> getPlaylistSongList() {
return songRepository.getPlaylistSong(playlist.getId());
}
public Playlist getPlaylist() {

10
app/src/main/res/menu/playlist_page_menu.xml Normal file
View file

@ -0,0 +1,10 @@
<?xml version="1.0" encoding="utf-8"?>
<menu xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto">
<item
android:id="@+id/action_download_playlist"
android:icon="@drawable/ic_file_download"
android:iconTint="@color/titleTextColor"
android:title="Download"
app:showAsAction="always" />
</menu>