Siklos/Metro
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Working towards single activity design

Browse source
This commit is contained in:
Hemanth S 2020-08-11 23:59:44 +05:30
parent 31534769a8
commit 3ebf777d7b
87 changed files with 1908 additions and 2423 deletions
Download patch file Download diff file Expand all files Collapse all files

6
app/src/main/java/code/name/monkey/retromusic/model/CategoryInfo.java
View file

@ -59,9 +59,9 @@ public class CategoryInfo implements Parcelable {
}
public enum Category {
Home(R.id.action_home, R.string.home, R.drawable.asld_home),
Songs(R.id.action_song, R.string.songs, R.drawable.asld_music_note),
Albums(R.id.action_album, R.string.albums, R.drawable.asld_album),
Home(R.id.action_home, R.string.for_you, R.drawable.ic_baseline),
Songs(R.id.action_song, R.string.songs, R.drawable.ic_audiotrack),
Albums(R.id.action_album, R.string.albums, R.drawable.ic_album),
Artists(R.id.action_artist, R.string.artists, R.drawable.ic_artist),
Playlists(R.id.action_playlist, R.string.playlists, R.drawable.ic_playlist_play),
Genres(R.id.action_genre, R.string.genres, R.drawable.ic_guitar),

6
app/src/main/java/code/name/monkey/retromusic/model/PlaylistSong.java
View file

@ -41,9 +41,9 @@ public class PlaylistSong extends Song {
@NotNull String artistName,
int playlistId,
int idInPlayList,
@NotNull String composer) {
super(id, title, trackNumber, year, duration, data, dateModified, albumId, albumName, artistId, artistName,
composer);
@NotNull String composer,
String albumArtist) {
super(id, title, trackNumber, year, duration, data, dateModified, albumId, albumName, artistId, artistName, composer, albumArtist);
this.playlistId = playlistId;
this.idInPlayList = idInPlayList;
}

4
app/src/main/java/code/name/monkey/retromusic/model/Song.kt
View file

@ -29,7 +29,8 @@ open class Song(
val albumName: String,
val artistId: Int,
val artistName: String,
val composer: String?
val composer: String?,
val albumArtist: String?
) : Parcelable {
@ -48,6 +49,7 @@ open class Song(
"",
-1,
"",
"",
""
)
}