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

Massiv design optimizations and settings

Browse source
This commit is contained in:
Karim Abou Zeid 2015-03-29 17:41:47 +02:00
commit b302abc2e1
117 changed files with 1104 additions and 962 deletions
Download patch file Download diff file Expand all files Collapse all files

2
app/src/main/java/com/kabouzeid/gramophone/loader/AlbumLoader.java
View file

@ -58,7 +58,7 @@ public class AlbumLoader {
MediaStore.Audio.AlbumColumns.NUMBER_OF_SONGS,
/* 5 */
MediaStore.Audio.AlbumColumns.FIRST_YEAR
}, selection, values, PreferenceUtils.getInstace(context).getAlbumSortOrder());
}, selection, values, PreferenceUtils.getInstance(context).getAlbumSortOrder());
}
public static Album getAlbum(Context context, int albumId) {

2
app/src/main/java/com/kabouzeid/gramophone/loader/AlbumSongLoader.java
View file

@ -69,6 +69,6 @@ public class AlbumSongLoader {
MediaStore.Audio.AudioColumns.TRACK,
/* 6 */
MediaStore.Audio.AudioColumns.ARTIST_ID
}, selection.toString(), null, PreferenceUtils.getInstace(context).getAlbumSongSortOrder());
}, selection.toString(), null, PreferenceUtils.getInstance(context).getAlbumSongSortOrder());
}
}

2
app/src/main/java/com/kabouzeid/gramophone/loader/ArtistAlbumLoader.java
View file

@ -51,6 +51,6 @@ public class ArtistAlbumLoader {
MediaStore.Audio.AlbumColumns.NUMBER_OF_SONGS,
/* 4 */
MediaStore.Audio.AlbumColumns.FIRST_YEAR
}, null, null, PreferenceUtils.getInstace(context).getArtistAlbumSortOrder());
}, null, null, PreferenceUtils.getInstance(context).getArtistAlbumSortOrder());
}
}

2
app/src/main/java/com/kabouzeid/gramophone/loader/ArtistLoader.java
View file

@ -52,7 +52,7 @@ public class ArtistLoader {
MediaStore.Audio.ArtistColumns.NUMBER_OF_ALBUMS,
/* 3 */
MediaStore.Audio.ArtistColumns.NUMBER_OF_TRACKS
}, selection, values, PreferenceUtils.getInstace(context).getArtistSortOrder());
}, selection, values, PreferenceUtils.getInstance(context).getArtistSortOrder());
}
public static Artist getArtist(Context context, int artistId) {

2
app/src/main/java/com/kabouzeid/gramophone/loader/ArtistSongLoader.java
View file

@ -60,6 +60,6 @@ public class ArtistSongLoader {
MediaStore.Audio.AudioColumns.TRACK,
/* 6 */
MediaStore.Audio.AudioColumns.ALBUM_ID
}, selection.toString(), null, PreferenceUtils.getInstace(context).getArtistSongSortOrder());
}, selection.toString(), null, PreferenceUtils.getInstance(context).getArtistSongSortOrder());
}
}

13
app/src/main/java/com/kabouzeid/gramophone/loader/SongLoader.java
View file

@ -15,6 +15,8 @@ import java.util.List;
* Created by karim on 29.12.14.
*/
public class SongLoader {
private static final String BASE_SELECTION = MediaStore.Audio.AudioColumns.IS_MUSIC + "=1" + " AND " + MediaStore.Audio.AudioColumns.TITLE + " != ''";
public static List<Song> getAllSongs(Context context) {
Cursor cursor = makeSongCursor(context);
List<Song> songs = new ArrayList<>();
@ -40,11 +42,16 @@ public class SongLoader {
return songs;
}
public static final Cursor makeSongCursor(final Context context) {
public static Cursor makeSongCursor(final Context context) {
return makeSongCursor(context, MediaStore.Audio.AudioColumns.IS_MUSIC + "=?", new String[]{"1"});
}
public static final Cursor makeSongCursor(final Context context, final String selection, final String[] values) {
public static Cursor makeSongCursor(final Context context, final String selection, final String[] values) {
String finalSelection = BASE_SELECTION;
if(selection != null){
finalSelection += " AND " + selection;
}
return context.getContentResolver().query(MediaStore.Audio.Media.EXTERNAL_CONTENT_URI,
new String[]{
/* 0 */
@ -63,7 +70,7 @@ public class SongLoader {
MediaStore.Audio.AudioColumns.ARTIST_ID,
/* 7 */
MediaStore.Audio.AudioColumns.ALBUM_ID
}, selection, values, PreferenceUtils.getInstace(context).getSongSortOrder());
}, finalSelection, values, PreferenceUtils.getInstance(context).getSongSortOrder());
}
public static List<Song> getSongs(final Context context, final String query) {