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

Merge branch 'genre-tweaks' of git://github.com/arkon/Phonograph into arkon-genre-tweaks

Browse source
This commit is contained in:
Karim Abou Zeid 2017-12-18 19:58:46 +01:00
commit 1939e76288
6 changed files with 52 additions and 40 deletions
Download patch file Download diff file Expand all files Collapse all files

19
app/src/main/java/com/kabouzeid/gramophone/model/Genre.java
View file

@ -6,16 +6,12 @@ import android.os.Parcelable;
public class Genre implements Parcelable {
public final int id;
public final String name;
public final int songCount;
public Genre(final int id, final String name) {
public Genre(final int id, final String name, final int songCount) {
this.id = id;
this.name = name;
}
// For unknown genre
public Genre(final String name) {
this.id = -1;
this.name = name;
this.songCount = songCount;
}
@Override
@ -26,13 +22,15 @@ public class Genre implements Parcelable {
Genre genre = (Genre) o;
if (id != genre.id) return false;
return name != null ? name.equals(genre.name) : genre.name == null;
if (!name.equals(genre.name)) return false;
return songCount == genre.songCount;
}
@Override
public int hashCode() {
int result = id;
result = 31 * result + (name != null ? name.hashCode() : 0);
result = 31 * result + name.hashCode();
result = 31 * result + songCount;
return result;
}
@ -41,6 +39,7 @@ public class Genre implements Parcelable {
return "Genre{" +
"id=" + id +
", name='" + name + '\'' +
", songCount=" + songCount + '\'' +
'}';
}
@ -53,11 +52,13 @@ public class Genre implements Parcelable {
public void writeToParcel(Parcel dest, int flags) {
dest.writeInt(this.id);
dest.writeString(this.name);
dest.writeInt(this.songCount);
}
protected Genre(Parcel in) {
this.id = in.readInt();
this.name = in.readString();
this.songCount = in.readInt();
}
public static final Creator<Genre> CREATOR = new Creator<Genre>() {