Dialog content has changed follow font
This commit is contained in:
parent
038e872e7a
commit
c6c89e9b9e
36 changed files with 161 additions and 87 deletions
|
@ -41,6 +41,9 @@ class Album {
|
|||
val songCount: Int
|
||||
get() = songs!!.size
|
||||
|
||||
val albumArtist: String?
|
||||
get() = safeGetFirstSong().albumArtist
|
||||
|
||||
constructor(songs: ArrayList<Song>) {
|
||||
this.songs = songs
|
||||
}
|
||||
|
|
|
@ -25,10 +25,10 @@ class Artist {
|
|||
|
||||
val name: String
|
||||
get() {
|
||||
val name = safeGetFirstAlbum().artistName
|
||||
val name = safeGetFirstAlbum().safeGetFirstSong().albumArtist
|
||||
return if (MusicUtil.isArtistNameUnknown(name)) {
|
||||
UNKNOWN_ARTIST_DISPLAY_NAME
|
||||
} else name!!
|
||||
} else safeGetFirstAlbum().safeGetFirstSong().artistName
|
||||
}
|
||||
|
||||
val songCount: Int
|
||||
|
|
|
@ -1,14 +1,18 @@
|
|||
package code.name.monkey.retromusic.model.smartplaylist
|
||||
|
||||
import android.content.Context
|
||||
import code.name.monkey.retromusic.App
|
||||
import code.name.monkey.retromusic.R
|
||||
import code.name.monkey.retromusic.model.Song
|
||||
import kotlinx.android.parcel.Parcelize
|
||||
import org.koin.core.KoinComponent
|
||||
|
||||
class HistoryPlaylist(
|
||||
context: Context
|
||||
) : AbsSmartPlaylist(context.getString(R.string.history), R.drawable.ic_history), KoinComponent {
|
||||
|
||||
@Parcelize
|
||||
class HistoryPlaylist :
|
||||
AbsSmartPlaylist(
|
||||
App.getContext().getString(R.string.history),
|
||||
R.drawable.ic_history
|
||||
),
|
||||
KoinComponent {
|
||||
override fun songs(): List<Song> {
|
||||
return topPlayedRepository.recentlyPlayedTracks()
|
||||
}
|
||||
|
|
|
@ -1,11 +1,13 @@
|
|||
package code.name.monkey.retromusic.model.smartplaylist
|
||||
|
||||
import android.content.Context
|
||||
import code.name.monkey.retromusic.App
|
||||
import code.name.monkey.retromusic.R
|
||||
import code.name.monkey.retromusic.model.Song
|
||||
import kotlinx.android.parcel.Parcelize
|
||||
|
||||
class LastAddedPlaylist(context: Context) :
|
||||
AbsSmartPlaylist(context.getString(R.string.last_added), R.drawable.ic_library_add) {
|
||||
@Parcelize
|
||||
class LastAddedPlaylist :
|
||||
AbsSmartPlaylist(App.getContext().getString(R.string.last_added), R.drawable.ic_library_add) {
|
||||
override fun songs(): List<Song> {
|
||||
return lastAddedRepository.recentSongs()
|
||||
}
|
||||
|
|
|
@ -1,12 +1,15 @@
|
|||
package code.name.monkey.retromusic.model.smartplaylist
|
||||
|
||||
import android.content.Context
|
||||
import code.name.monkey.retromusic.App
|
||||
import code.name.monkey.retromusic.R
|
||||
import code.name.monkey.retromusic.model.Song
|
||||
import kotlinx.android.parcel.Parcelize
|
||||
|
||||
class NotPlayedPlaylist(
|
||||
context: Context
|
||||
) : AbsSmartPlaylist(context.getString(R.string.not_recently_played), R.drawable.ic_watch_later) {
|
||||
@Parcelize
|
||||
class NotPlayedPlaylist : AbsSmartPlaylist(
|
||||
App.getContext().getString(R.string.not_recently_played),
|
||||
R.drawable.ic_watch_later
|
||||
) {
|
||||
override fun songs(): List<Song> {
|
||||
return topPlayedRepository.notRecentlyPlayedTracks()
|
||||
}
|
||||
|
|
|
@ -1,12 +1,15 @@
|
|||
package code.name.monkey.retromusic.model.smartplaylist
|
||||
|
||||
import android.content.Context
|
||||
import code.name.monkey.retromusic.App
|
||||
import code.name.monkey.retromusic.R
|
||||
import code.name.monkey.retromusic.model.Song
|
||||
import kotlinx.android.parcel.Parcelize
|
||||
|
||||
class ShuffleAllPlaylist(
|
||||
context: Context
|
||||
) : AbsSmartPlaylist(context.getString(R.string.action_shuffle_all), R.drawable.ic_shuffle) {
|
||||
@Parcelize
|
||||
class ShuffleAllPlaylist : AbsSmartPlaylist(
|
||||
App.getContext().getString(R.string.action_shuffle_all),
|
||||
R.drawable.ic_shuffle
|
||||
) {
|
||||
override fun songs(): List<Song> {
|
||||
return songRepository.songs()
|
||||
}
|
||||
|
|
|
@ -1,13 +1,13 @@
|
|||
package code.name.monkey.retromusic.model.smartplaylist
|
||||
|
||||
import android.content.Context
|
||||
import code.name.monkey.retromusic.App
|
||||
import code.name.monkey.retromusic.R
|
||||
import code.name.monkey.retromusic.model.Song
|
||||
import kotlinx.android.parcel.Parcelize
|
||||
|
||||
class TopTracksPlaylist(
|
||||
context: Context
|
||||
) : AbsSmartPlaylist(
|
||||
context.getString(R.string.my_top_tracks),
|
||||
@Parcelize
|
||||
class TopTracksPlaylist : AbsSmartPlaylist(
|
||||
App.getContext().getString(R.string.my_top_tracks),
|
||||
R.drawable.ic_trending_up
|
||||
) {
|
||||
override fun songs(): List<Song> {
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue