tenkuma/jamfish
tenkuma/jamfish
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

merged everything together correctly

Browse source
This commit is contained in:
Karim Abou Zeid 2015-04-17 01:39:41 +02:00
commit 70f33b4829
263 changed files with 2932 additions and 2411 deletions
Download patch file Download diff file Expand all files Collapse all files

12
app/src/main/java/com/kabouzeid/gramophone/model/Album.java
View file

@ -8,16 +8,16 @@ import com.kabouzeid.gramophone.util.MusicUtil;
import com.koushikdutta.ion.Ion;
/**
* Created by karim on 22.11.14.
* @author Karim Abou Zeid (kabouzeid)
*/
public class Album implements SearchEntry {
public int id;
public final int id;
public int artistId;
public String title;
public String artistName;
public int songCount;
public int year;
public final String title;
public final String artistName;
public final int songCount;
public final int year;
public Album(final int id, final String title, final String artistName, final int artistId,
final int songNumber, final int albumYear) {

10
app/src/main/java/com/kabouzeid/gramophone/model/Artist.java
View file

@ -8,13 +8,13 @@ import com.kabouzeid.gramophone.lastfm.artist.LastFMArtistThumbnailUrlLoader;
import com.koushikdutta.ion.Ion;
/**
* Created by karim on 29.12.14.
* @author Karim Abou Zeid (kabouzeid)
*/
public class Artist implements SearchEntry {
public int id;
public String name;
public int albumCount;
public int songCount;
public final int id;
public final String name;
public final int albumCount;
public final int songCount;
public Artist(final int id, final String name, final int albumCount, final int songCount) {
this.id = id;

4
app/src/main/java/com/kabouzeid/gramophone/model/DataBaseChangedEvent.java
View file

@ -1,7 +1,7 @@
package com.kabouzeid.gramophone.model;
/**
* Created by karim on 17.03.15.
* @author Karim Abou Zeid (kabouzeid)
*/
public class DataBaseChangedEvent {
public static final int PLAYLISTS_CHANGED = 0;
@ -10,7 +10,7 @@ public class DataBaseChangedEvent {
public static final int SONGS_CHANGED = 3;
public static final int DATABASE_CHANGED = 4;
private int action;
private final int action;
public DataBaseChangedEvent(int action) {
this.action = action;

4
app/src/main/java/com/kabouzeid/gramophone/model/MusicRemoteEvent.java
View file

@ -1,7 +1,7 @@
package com.kabouzeid.gramophone.model;
/**
* Created by karim on 19.12.14.
* @author Karim Abou Zeid (kabouzeid)
*/
public class MusicRemoteEvent {
public static final int PLAY = 0;
@ -24,7 +24,7 @@ public class MusicRemoteEvent {
public static final int SHUFFLE_MODE_CHANGED = 13;
public static final int REPEAT_MODE_CHANGED = 14;
private int action;
private final int action;
public MusicRemoteEvent(int action) {
this.action = action;

7
app/src/main/java/com/kabouzeid/gramophone/model/NavigationDrawerItem.java
View file

@ -1,11 +1,12 @@
package com.kabouzeid.gramophone.model;
/**
* Created by karim on 23.11.14.
* @author Karim Abou Zeid (kabouzeid)
*/
public class NavigationDrawerItem {
public String title;
public int imageRes;
public final String title;
public final int imageRes;
public NavigationDrawerItem(String title, int imageRes) {
this.title = title;

4
app/src/main/java/com/kabouzeid/gramophone/model/Playlist.java
View file

@ -1,8 +1,8 @@
package com.kabouzeid.gramophone.model;
public class Playlist {
public int id;
public String name;
public final int id;
public final String name;
public Playlist(final int id, final String name) {
this.id = id;

2
app/src/main/java/com/kabouzeid/gramophone/model/PlaylistSong.java
View file

@ -1,7 +1,7 @@
package com.kabouzeid.gramophone.model;
public class PlaylistSong extends Song {
public int playlistId;
public final int playlistId;
public int idInPlayList;
public PlaylistSong(final int id, final int albumId, final int artistId, final String title, final String artistName,

8
app/src/main/java/com/kabouzeid/gramophone/model/SearchEntry.java
View file

@ -4,12 +4,12 @@ import android.content.Context;
import android.widget.ImageView;
/**
* Created by karim on 27.02.15.
* @author Karim Abou Zeid (kabouzeid)
*/
public interface SearchEntry {
public String getTitle();
String getTitle();
public String getSubTitle();
String getSubTitle();
public void loadImage(Context context, ImageView imageView);
void loadImage(Context context, ImageView imageView);
}

16
app/src/main/java/com/kabouzeid/gramophone/model/Song.java
View file

@ -6,18 +6,18 @@ import android.widget.ImageView;
import java.io.Serializable;
/**
* Created by karim on 23.11.14.
* @author Karim Abou Zeid (kabouzeid)
*/
public class Song implements Serializable, SearchEntry {
public int id;
public int albumId;
public int artistId;
public String title;
public String artistName;
public String albumName;
public long duration;
public int trackNumber;
public final int albumId;
public final int artistId;
public final String title;
public final String artistName;
public final String albumName;
public final long duration;
public final int trackNumber;
public Song(final int id, final int albumId, final int artistId, final String title, final String artistName,
final String albumName, final long duration, final int trackNumber) {

10
app/src/main/java/com/kabouzeid/gramophone/model/UiPreferenceChangedEvent.java
View file

@ -1,9 +1,9 @@
package com.kabouzeid.gramophone.model;
/**
* Created by karim on 28.03.15.
* @author Karim Abou Zeid (kabouzeid)
*/
public class UiPreferenceChangedEvent {
public class UIPreferenceChangedEvent {
public static final int THEME_CHANGED = 0;
public static final int ALBUM_OVERVIEW_PALETTE_CHANGED = 1;
public static final int COLORED_NAVIGATION_BAR_ARTIST_CHANGED = 2;
@ -11,10 +11,10 @@ public class UiPreferenceChangedEvent {
public static final int PLAYBACK_CONTROLLER_CARD_CHANGED = 4;
public static final int TOOLBAR_TRANSPARENT_CHANGED = 5;
private int action;
private Object value;
private final int action;
private final Object value;
public UiPreferenceChangedEvent(int action, Object value) {
public UIPreferenceChangedEvent(int action, Object value) {
this.action = action;
this.value = value;
}