Merge remote-tracking branch 'origin/master'
This commit is contained in:
Aidan Follestad
commit
f532c103cb
13 changed files with 1 additions and 116 deletions
|
|
@ -1,15 +0,0 @@
|
|||
package com.kabouzeid.gramophone.comparator;
|
||||
|
||||
import com.kabouzeid.gramophone.model.Album;
|
||||
|
||||
import java.util.Comparator;
|
||||
|
||||
/**
|
||||
* @author Karim Abou Zeid (kabouzeid)
|
||||
*/
|
||||
public class AlbumAlphabeticComparator implements Comparator<Album> {
|
||||
@Override
|
||||
public int compare(Album lhs, Album rhs) {
|
||||
return lhs.title.trim().compareToIgnoreCase(rhs.title.trim());
|
||||
}
|
||||
}
|
||||
|
|
@ -1,15 +0,0 @@
|
|||
package com.kabouzeid.gramophone.comparator;
|
||||
|
||||
import com.kabouzeid.gramophone.model.Artist;
|
||||
|
||||
import java.util.Comparator;
|
||||
|
||||
/**
|
||||
* @author Karim Abou Zeid (kabouzeid)
|
||||
*/
|
||||
public class ArtistAlphabeticComparator implements Comparator<Artist> {
|
||||
@Override
|
||||
public int compare(Artist lhs, Artist rhs) {
|
||||
return lhs.name.trim().compareToIgnoreCase(rhs.name.trim());
|
||||
}
|
||||
}
|
||||
|
|
@ -1,15 +0,0 @@
|
|||
package com.kabouzeid.gramophone.comparator;
|
||||
|
||||
import com.kabouzeid.gramophone.model.Playlist;
|
||||
|
||||
import java.util.Comparator;
|
||||
|
||||
/**
|
||||
* @author Karim Abou Zeid (kabouzeid)
|
||||
*/
|
||||
public class PlaylistAlphabeticComparator implements Comparator<Playlist> {
|
||||
@Override
|
||||
public int compare(Playlist lhs, Playlist rhs) {
|
||||
return lhs.name.trim().compareToIgnoreCase(rhs.name.trim());
|
||||
}
|
||||
}
|
||||
|
|
@ -1,15 +0,0 @@
|
|||
package com.kabouzeid.gramophone.comparator;
|
||||
|
||||
import com.kabouzeid.gramophone.model.Song;
|
||||
|
||||
import java.util.Comparator;
|
||||
|
||||
/**
|
||||
* @author Karim Abou Zeid (kabouzeid)
|
||||
*/
|
||||
public class SongAlphabeticComparator implements Comparator<Song> {
|
||||
@Override
|
||||
public int compare(Song lhs, Song rhs) {
|
||||
return lhs.title.trim().compareToIgnoreCase(rhs.title.trim());
|
||||
}
|
||||
}
|
||||
|
|
@ -1,24 +0,0 @@
|
|||
package com.kabouzeid.gramophone.comparator;
|
||||
|
||||
import com.kabouzeid.gramophone.model.Song;
|
||||
|
||||
import java.util.Comparator;
|
||||
|
||||
/**
|
||||
* @author Karim Abou Zeid (kabouzeid)
|
||||
*/
|
||||
public class SongTrackNumberComparator implements Comparator<Song> {
|
||||
@Override
|
||||
public int compare(Song lhs, Song rhs) {
|
||||
// 0 gleich
|
||||
// -1 steht über dem anderen
|
||||
// 1 steht unter dem anderen
|
||||
if (lhs.trackNumber == rhs.trackNumber) {
|
||||
return 0;
|
||||
}
|
||||
if (lhs.trackNumber > rhs.trackNumber) {
|
||||
return 1;
|
||||
}
|
||||
return -1;
|
||||
}
|
||||
}
|
||||
|
|
@ -5,12 +5,10 @@ import android.database.Cursor;
|
|||
import android.provider.BaseColumns;
|
||||
import android.provider.MediaStore;
|
||||
|
||||
import com.kabouzeid.gramophone.comparator.AlbumAlphabeticComparator;
|
||||
import com.kabouzeid.gramophone.model.Album;
|
||||
import com.kabouzeid.gramophone.util.PreferenceUtils;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.Collections;
|
||||
import java.util.List;
|
||||
|
||||
/**
|
||||
|
|
@ -37,7 +35,6 @@ public class AlbumLoader {
|
|||
if (cursor != null) {
|
||||
cursor.close();
|
||||
}
|
||||
Collections.sort(albums, new AlbumAlphabeticComparator());
|
||||
return albums;
|
||||
}
|
||||
|
||||
|
|
@ -102,7 +99,6 @@ public class AlbumLoader {
|
|||
if (cursor != null) {
|
||||
cursor.close();
|
||||
}
|
||||
Collections.sort(albums, new AlbumAlphabeticComparator());
|
||||
return albums;
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -5,13 +5,10 @@ import android.database.Cursor;
|
|||
import android.provider.BaseColumns;
|
||||
import android.provider.MediaStore;
|
||||
|
||||
import com.kabouzeid.gramophone.comparator.SongAlphabeticComparator;
|
||||
import com.kabouzeid.gramophone.model.Song;
|
||||
import com.kabouzeid.gramophone.util.PreferenceUtils;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.Collections;
|
||||
import java.util.Comparator;
|
||||
|
||||
/**
|
||||
* @author Karim Abou Zeid (kabouzeid)
|
||||
|
|
@ -19,10 +16,6 @@ import java.util.Comparator;
|
|||
public class AlbumSongLoader {
|
||||
|
||||
public static ArrayList<Song> getAlbumSongList(final Context context, final int albumId) {
|
||||
return getAlbumSongList(context, albumId, null);
|
||||
}
|
||||
|
||||
public static ArrayList<Song> getAlbumSongList(final Context context, final int albumId, Comparator<Song> comparator) {
|
||||
Cursor cursor = makeAlbumSongCursor(context, albumId);
|
||||
ArrayList<Song> songs = new ArrayList<>();
|
||||
if (cursor != null && cursor.moveToFirst()) {
|
||||
|
|
@ -41,9 +34,6 @@ public class AlbumSongLoader {
|
|||
}
|
||||
if (cursor != null)
|
||||
cursor.close();
|
||||
if (comparator == null)
|
||||
comparator = new SongAlphabeticComparator();
|
||||
Collections.sort(songs, comparator);
|
||||
return songs;
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -5,12 +5,10 @@ import android.database.Cursor;
|
|||
import android.provider.BaseColumns;
|
||||
import android.provider.MediaStore;
|
||||
|
||||
import com.kabouzeid.gramophone.comparator.AlbumAlphabeticComparator;
|
||||
import com.kabouzeid.gramophone.model.Album;
|
||||
import com.kabouzeid.gramophone.util.PreferenceUtils;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.Collections;
|
||||
import java.util.List;
|
||||
|
||||
/**
|
||||
|
|
@ -35,7 +33,6 @@ public class ArtistAlbumLoader {
|
|||
}
|
||||
if (cursor != null)
|
||||
cursor.close();
|
||||
Collections.sort(albums, new AlbumAlphabeticComparator());
|
||||
return albums;
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -5,12 +5,10 @@ import android.database.Cursor;
|
|||
import android.provider.BaseColumns;
|
||||
import android.provider.MediaStore;
|
||||
|
||||
import com.kabouzeid.gramophone.comparator.ArtistAlphabeticComparator;
|
||||
import com.kabouzeid.gramophone.model.Artist;
|
||||
import com.kabouzeid.gramophone.util.PreferenceUtils;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.Collections;
|
||||
import java.util.List;
|
||||
|
||||
/**
|
||||
|
|
@ -34,7 +32,6 @@ public class ArtistLoader {
|
|||
}
|
||||
if (cursor != null)
|
||||
cursor.close();
|
||||
Collections.sort(artists, new ArtistAlphabeticComparator());
|
||||
return artists;
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -5,12 +5,10 @@ import android.database.Cursor;
|
|||
import android.provider.BaseColumns;
|
||||
import android.provider.MediaStore;
|
||||
|
||||
import com.kabouzeid.gramophone.comparator.SongAlphabeticComparator;
|
||||
import com.kabouzeid.gramophone.model.Song;
|
||||
import com.kabouzeid.gramophone.util.PreferenceUtils;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.Collections;
|
||||
|
||||
/**
|
||||
* @author Karim Abou Zeid (kabouzeid)
|
||||
|
|
@ -36,7 +34,6 @@ public class ArtistSongLoader {
|
|||
}
|
||||
if (cursor != null)
|
||||
cursor.close();
|
||||
Collections.sort(songs, new SongAlphabeticComparator());
|
||||
return songs;
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -6,11 +6,9 @@ import android.provider.BaseColumns;
|
|||
import android.provider.MediaStore;
|
||||
import android.provider.MediaStore.Audio.PlaylistsColumns;
|
||||
|
||||
import com.kabouzeid.gramophone.comparator.PlaylistAlphabeticComparator;
|
||||
import com.kabouzeid.gramophone.model.Playlist;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.Collections;
|
||||
import java.util.List;
|
||||
|
||||
public class PlaylistLoader {
|
||||
|
|
@ -43,7 +41,6 @@ public class PlaylistLoader {
|
|||
}
|
||||
if (cursor != null)
|
||||
cursor.close();
|
||||
Collections.sort(playlists, new PlaylistAlphabeticComparator());
|
||||
return playlists;
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -5,12 +5,10 @@ import android.database.Cursor;
|
|||
import android.provider.BaseColumns;
|
||||
import android.provider.MediaStore;
|
||||
|
||||
import com.kabouzeid.gramophone.comparator.SongAlphabeticComparator;
|
||||
import com.kabouzeid.gramophone.model.Song;
|
||||
import com.kabouzeid.gramophone.util.PreferenceUtils;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.Collections;
|
||||
import java.util.List;
|
||||
|
||||
/**
|
||||
|
|
@ -39,7 +37,6 @@ public class SongLoader {
|
|||
}
|
||||
if (cursor != null)
|
||||
cursor.close();
|
||||
Collections.sort(songs, new SongAlphabeticComparator());
|
||||
return songs;
|
||||
}
|
||||
|
||||
|
|
@ -95,7 +92,6 @@ public class SongLoader {
|
|||
|
||||
if (cursor != null)
|
||||
cursor.close();
|
||||
Collections.sort(songs, new SongAlphabeticComparator());
|
||||
return songs;
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -21,7 +21,6 @@ import com.github.ksoichiro.android.observablescrollview.ObservableRecyclerView;
|
|||
import com.kabouzeid.gramophone.App;
|
||||
import com.kabouzeid.gramophone.R;
|
||||
import com.kabouzeid.gramophone.adapter.songadapter.AlbumSongAdapter;
|
||||
import com.kabouzeid.gramophone.comparator.SongTrackNumberComparator;
|
||||
import com.kabouzeid.gramophone.helper.MusicPlayerRemote;
|
||||
import com.kabouzeid.gramophone.interfaces.PaletteColorHolder;
|
||||
import com.kabouzeid.gramophone.loader.AlbumLoader;
|
||||
|
|
@ -250,7 +249,7 @@ public class AlbumDetailActivity extends AbsFabActivity implements PaletteColorH
|
|||
}
|
||||
|
||||
private void setUpSongsAdapter() {
|
||||
final ArrayList<Song> songs = AlbumSongLoader.getAlbumSongList(this, album.id, new SongTrackNumberComparator());
|
||||
final ArrayList<Song> songs = AlbumSongLoader.getAlbumSongList(this, album.id);
|
||||
final AlbumSongAdapter albumSongAdapter = new AlbumSongAdapter(this, songs);
|
||||
recyclerView.setLayoutManager(new GridLayoutManager(this, 1));
|
||||
recyclerView.setAdapter(albumSongAdapter);
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue