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

Refactor

Browse source
This commit is contained in:
h4h13 2019-01-28 16:13:44 +05:30
parent d573be0a39
commit 63c417cd61
26 changed files with 235 additions and 268 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -2,14 +2,14 @@ package code.name.monkey.retromusic.model;
import android.content.Context;
import android.os.Parcel;
import androidx.annotation.NonNull;
import java.util.ArrayList;
import androidx.annotation.NonNull;
import code.name.monkey.models.Song;
import io.reactivex.Observable;
public abstract class AbsCustomPlaylist extends Playlist {
public AbsCustomPlaylist(int id, String name) {
super(id, name);

10
app/src/main/java/code/name/monkey/retromusic/model/Album.kt
View file

@ -1,10 +1,10 @@
package code.name.monkey.retromusic.model
package code.name.monkey.models
import java.util.*
class Album {
val songs: ArrayList<Song>?
val songs: ArrayList<code.name.monkey.models.Song>?
val id: Int
get() = safeGetFirstSong().albumId
@ -27,7 +27,7 @@ class Album {
val songCount: Int
get() = songs!!.size
constructor(songs: ArrayList<Song>) {
constructor(songs: ArrayList<code.name.monkey.models.Song>) {
this.songs = songs
}
@ -35,7 +35,7 @@ class Album {
this.songs = ArrayList()
}
fun safeGetFirstSong(): Song {
return if (songs!!.isEmpty()) Song.EMPTY_SONG else songs[0]
fun safeGetFirstSong(): code.name.monkey.models.Song {
return if (songs!!.isEmpty()) code.name.monkey.models.Song.EMPTY_SONG else songs[0]
}
}

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

@ -30,9 +30,9 @@ class Artist {
val albumCount: Int
get() = albums!!.size
val songs: ArrayList<Song>
val songs: ArrayList<code.name.monkey.models.Song>
get() {
val songs = ArrayList<Song>()
val songs = ArrayList<code.name.monkey.models.Song>()
for (album in albums!!) {
songs.addAll(album.songs!!)
}

2
app/src/main/java/code/name/monkey/retromusic/model/Playlist.java
View file

@ -1,4 +1,4 @@
package code.name.monkey.retromusic.model;
package code.name.monkey.models;
import android.os.Parcel;
import android.os.Parcelable;

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

@ -2,6 +2,8 @@ package code.name.monkey.retromusic.model;
import android.os.Parcel;
import code.name.monkey.models.Song;
public class PlaylistSong extends Song {
public static PlaylistSong EMPTY_PLAYLIST_SONG = new PlaylistSong(-1, "", -1, -1, -1, "", -1, -1, "", -1, "", -1, -1);

4
app/src/main/java/code/name/monkey/retromusic/model/lyrics/Lyrics.java
View file

@ -1,7 +1,7 @@
package code.name.monkey.retromusic.model.lyrics;
package code.name.monkey.models.lyrics;
import code.name.monkey.retromusic.model.Song;
import code.name.monkey.models.Song;
import java.util.ArrayList;

2
app/src/main/java/code/name/monkey/retromusic/model/smartplaylist/AbsSmartPlaylist.java
View file

@ -1,4 +1,4 @@
package code.name.monkey.retromusic.model.smartplaylist;
package code.name.monkey.models.smartplaylist;
import android.content.Context;
import android.os.Parcel;

3
app/src/main/java/code/name/monkey/retromusic/model/smartplaylist/HistoryPlaylist.java
View file

@ -7,9 +7,10 @@ import androidx.annotation.NonNull;
import java.util.ArrayList;
import code.name.monkey.models.Song;
import code.name.monkey.retromusic.R;
import code.name.monkey.retromusic.loaders.TopAndRecentlyPlayedTracksLoader;
import code.name.monkey.retromusic.model.Song;
import code.name.monkey.retromusic.providers.HistoryStore;
import io.reactivex.Observable;

2
app/src/main/java/code/name/monkey/retromusic/model/smartplaylist/LastAddedPlaylist.java
View file

@ -8,7 +8,7 @@ import androidx.annotation.NonNull;
import code.name.monkey.retromusic.R;
import code.name.monkey.retromusic.loaders.LastAddedSongsLoader;
import code.name.monkey.retromusic.model.Song;
import code.name.monkey.models.Song;
import java.util.ArrayList;

2
app/src/main/java/code/name/monkey/retromusic/model/smartplaylist/MyTopTracksPlaylist.java
View file

@ -8,7 +8,7 @@ import androidx.annotation.NonNull;
import code.name.monkey.retromusic.R;
import code.name.monkey.retromusic.loaders.TopAndRecentlyPlayedTracksLoader;
import code.name.monkey.retromusic.model.Song;
import code.name.monkey.models.Song;
import code.name.monkey.retromusic.providers.SongPlayCountStore;
import java.util.ArrayList;

2
app/src/main/java/code/name/monkey/retromusic/model/smartplaylist/ShuffleAllPlaylist.java
View file

@ -8,7 +8,7 @@ import androidx.annotation.NonNull;
import code.name.monkey.retromusic.R;
import code.name.monkey.retromusic.loaders.SongLoader;
import code.name.monkey.retromusic.model.Song;
import code.name.monkey.models.Song;
import java.util.ArrayList;