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

3
app/src/main/java/com/kabouzeid/gramophone/adapter/GenreAdapter.java
View file

@ -59,6 +59,9 @@ public class GenreAdapter extends RecyclerView.Adapter<GenreAdapter.ViewHolder>
if (holder.title != null) {
holder.title.setText(genre.name);
}
if (holder.text != null) {
holder.text.setText(MusicUtil.getGenreInfoString(activity, genre));
}
}
@Override

25
app/src/main/java/com/kabouzeid/gramophone/loader/GenreLoader.java
View file

@ -8,7 +8,6 @@ import android.provider.MediaStore.Audio.Genres;
import android.support.annotation.NonNull;
import android.support.annotation.Nullable;
import com.kabouzeid.gramophone.R;
import com.kabouzeid.gramophone.model.Genre;
import com.kabouzeid.gramophone.model.Song;
import com.kabouzeid.gramophone.util.PreferenceUtil;
@ -24,27 +23,16 @@ public class GenreLoader {
@NonNull
public static ArrayList<Song> getSongs(@NonNull final Context context, final int genreId) {
// The genres table only stores songs that have a genre specified,
// so we need to get songs without a genre a different way.
if (genreId == -1) {
return getSongsWithNoGenre(context);
}
return SongLoader.getSongs(makeGenreSongCursor(context, genreId));
}
@NonNull
private static ArrayList<Genre> getGenresFromCursor(@NonNull final Context context, @Nullable final Cursor cursor) {
final ArrayList<Genre> genres = new ArrayList<>();
if (hasSongsWithNoGenre(context)) {
genres.add(new Genre(context.getResources().getString(R.string.unknown_genre)));
}
if (cursor != null) {
if (cursor.moveToFirst()) {
do {
genres.add(getGenreFromCursor(cursor));
genres.add(getGenreFromCursor(context, cursor));
} while (cursor.moveToNext());
}
cursor.close();
@ -53,10 +41,11 @@ public class GenreLoader {
}
@NonNull
private static Genre getGenreFromCursor(@NonNull final Cursor cursor) {
private static Genre getGenreFromCursor(@NonNull final Context context, @NonNull final Cursor cursor) {
final int id = cursor.getInt(0);
final String name = cursor.getString(1);
return new Genre(id, name);
final int songs = getSongs(context, id).size();
return new Genre(id, name, songs);
}
@NonNull
@ -108,15 +97,11 @@ public class GenreLoader {
Genres._ID,
Genres.NAME
};
// Genres that actually have songs
final String selection = Genres._ID + " IN" +
" (SELECT " + Genres.Members.GENRE_ID + " FROM audio_genres_map WHERE " + Genres.Members.AUDIO_ID + " IN" +
" (SELECT " + Genres._ID + " FROM audio_meta WHERE " + SongLoader.BASE_SELECTION + "))";
try {
return context.getContentResolver().query(
Genres.EXTERNAL_CONTENT_URI,
projection, selection, null, PreferenceUtil.getInstance(context).getGenreSortOrder());
projection, null, null, PreferenceUtil.getInstance(context).getGenreSortOrder());
} catch (SecurityException e) {
return null;
}

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>() {

8
app/src/main/java/com/kabouzeid/gramophone/util/MusicUtil.java
View file

@ -23,6 +23,7 @@ import com.kabouzeid.gramophone.helper.MusicPlayerRemote;
import com.kabouzeid.gramophone.loader.PlaylistLoader;
import com.kabouzeid.gramophone.loader.SongLoader;
import com.kabouzeid.gramophone.model.Artist;
import com.kabouzeid.gramophone.model.Genre;
import com.kabouzeid.gramophone.model.Playlist;
import com.kabouzeid.gramophone.model.Song;
import com.kabouzeid.gramophone.model.lyrics.AbsSynchronizedLyrics;
@ -114,6 +115,13 @@ public class MusicUtil {
return albumCount + " " + albumString + " • " + songCount + " " + songString;
}
@NonNull
public static String getGenreInfoString(@NonNull final Context context, @NonNull final Genre genre) {
int songCount = genre.songCount;
String songString = songCount == 1 ? context.getResources().getString(R.string.song) : context.getResources().getString(R.string.songs);
return songCount + " " + songString;
}
@NonNull
public static String getPlaylistInfoString(@NonNull final Context context, @NonNull List<Song> songs) {
final int songCount = songs.size();

28
app/src/main/res/layout/item_list_simple.xml
View file

@ -6,19 +6,35 @@
android:foreground="?attr/rectSelector"
tools:ignore="UnusedAttribute">
<TextView
android:id="@+id/title"
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_centerVertical="true"
android:layout_marginEnd="16dp"
android:layout_marginLeft="16dp"
android:layout_marginRight="16dp"
android:layout_marginStart="16dp"
android:paddingEnd="16dp"
android:paddingLeft="16dp"
android:paddingRight="16dp"
android:paddingStart="16dp"
android:orientation="vertical">
<TextView
android:id="@+id/title"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:fontFamily="sans-serif"
android:singleLine="true"
android:textAppearance="@style/TextAppearance.AppCompat.Subhead" />
<TextView
android:id="@+id/text"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:fontFamily="sans-serif"
android:singleLine="true"
android:textAppearance="@style/TextAppearance.AppCompat.Body1"
android:textColor="?android:textColorSecondary" />
</LinearLayout>
<View
android:id="@+id/separator"
android:layout_width="match_parent"

1
app/src/main/res/values/strings.xml
View file

@ -42,7 +42,6 @@
<string name="album">Album</string>
<string name="artist">Artist</string>
<string name="genre">Genre</string>
<string name="unknown_genre">Unknown genre</string>
<string name="album_artist">Album artist</string>
<string name="year">Year</string>
<string name="track_hint">"Track (2 for track 2 or 3004 for CD3 track 4)"</string>