From ac41e04fd327e929ad8342d09b305ea19d22053c Mon Sep 17 00:00:00 2001 From: Karim Abou Zeid Date: Sat, 18 Apr 2015 17:14:47 +0200 Subject: [PATCH] Removed redundant comparators and sorting operations --- .../comparator/AlbumAlphabeticComparator.java | 15 ------------ .../ArtistAlphabeticComparator.java | 15 ------------ .../PlaylistAlphabeticComparator.java | 15 ------------ .../comparator/SongAlphabeticComparator.java | 15 ------------ .../comparator/SongTrackNumberComparator.java | 24 ------------------- .../gramophone/loader/AlbumLoader.java | 4 ---- .../gramophone/loader/AlbumSongLoader.java | 10 -------- .../gramophone/loader/ArtistAlbumLoader.java | 3 --- .../gramophone/loader/ArtistLoader.java | 3 --- .../gramophone/loader/ArtistSongLoader.java | 3 --- .../gramophone/loader/PlaylistLoader.java | 3 --- .../gramophone/loader/SongLoader.java | 4 ---- .../ui/activities/AlbumDetailActivity.java | 3 +-- 13 files changed, 1 insertion(+), 116 deletions(-) delete mode 100644 app/src/main/java/com/kabouzeid/gramophone/comparator/AlbumAlphabeticComparator.java delete mode 100644 app/src/main/java/com/kabouzeid/gramophone/comparator/ArtistAlphabeticComparator.java delete mode 100644 app/src/main/java/com/kabouzeid/gramophone/comparator/PlaylistAlphabeticComparator.java delete mode 100644 app/src/main/java/com/kabouzeid/gramophone/comparator/SongAlphabeticComparator.java delete mode 100644 app/src/main/java/com/kabouzeid/gramophone/comparator/SongTrackNumberComparator.java diff --git a/app/src/main/java/com/kabouzeid/gramophone/comparator/AlbumAlphabeticComparator.java b/app/src/main/java/com/kabouzeid/gramophone/comparator/AlbumAlphabeticComparator.java deleted file mode 100644 index 882d4351..00000000 --- a/app/src/main/java/com/kabouzeid/gramophone/comparator/AlbumAlphabeticComparator.java +++ /dev/null @@ -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 { - @Override - public int compare(Album lhs, Album rhs) { - return lhs.title.trim().compareToIgnoreCase(rhs.title.trim()); - } -} \ No newline at end of file diff --git a/app/src/main/java/com/kabouzeid/gramophone/comparator/ArtistAlphabeticComparator.java b/app/src/main/java/com/kabouzeid/gramophone/comparator/ArtistAlphabeticComparator.java deleted file mode 100644 index 9cd5d389..00000000 --- a/app/src/main/java/com/kabouzeid/gramophone/comparator/ArtistAlphabeticComparator.java +++ /dev/null @@ -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 { - @Override - public int compare(Artist lhs, Artist rhs) { - return lhs.name.trim().compareToIgnoreCase(rhs.name.trim()); - } -} diff --git a/app/src/main/java/com/kabouzeid/gramophone/comparator/PlaylistAlphabeticComparator.java b/app/src/main/java/com/kabouzeid/gramophone/comparator/PlaylistAlphabeticComparator.java deleted file mode 100644 index 38249fb9..00000000 --- a/app/src/main/java/com/kabouzeid/gramophone/comparator/PlaylistAlphabeticComparator.java +++ /dev/null @@ -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 { - @Override - public int compare(Playlist lhs, Playlist rhs) { - return lhs.name.trim().compareToIgnoreCase(rhs.name.trim()); - } -} diff --git a/app/src/main/java/com/kabouzeid/gramophone/comparator/SongAlphabeticComparator.java b/app/src/main/java/com/kabouzeid/gramophone/comparator/SongAlphabeticComparator.java deleted file mode 100644 index abf8aa3c..00000000 --- a/app/src/main/java/com/kabouzeid/gramophone/comparator/SongAlphabeticComparator.java +++ /dev/null @@ -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 { - @Override - public int compare(Song lhs, Song rhs) { - return lhs.title.trim().compareToIgnoreCase(rhs.title.trim()); - } -} diff --git a/app/src/main/java/com/kabouzeid/gramophone/comparator/SongTrackNumberComparator.java b/app/src/main/java/com/kabouzeid/gramophone/comparator/SongTrackNumberComparator.java deleted file mode 100644 index 65b4ede5..00000000 --- a/app/src/main/java/com/kabouzeid/gramophone/comparator/SongTrackNumberComparator.java +++ /dev/null @@ -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 { - @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; - } -} diff --git a/app/src/main/java/com/kabouzeid/gramophone/loader/AlbumLoader.java b/app/src/main/java/com/kabouzeid/gramophone/loader/AlbumLoader.java index d7126451..4c08e183 100644 --- a/app/src/main/java/com/kabouzeid/gramophone/loader/AlbumLoader.java +++ b/app/src/main/java/com/kabouzeid/gramophone/loader/AlbumLoader.java @@ -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; } } diff --git a/app/src/main/java/com/kabouzeid/gramophone/loader/AlbumSongLoader.java b/app/src/main/java/com/kabouzeid/gramophone/loader/AlbumSongLoader.java index d91cf961..df5d1d11 100644 --- a/app/src/main/java/com/kabouzeid/gramophone/loader/AlbumSongLoader.java +++ b/app/src/main/java/com/kabouzeid/gramophone/loader/AlbumSongLoader.java @@ -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 getAlbumSongList(final Context context, final int albumId) { - return getAlbumSongList(context, albumId, null); - } - - public static ArrayList getAlbumSongList(final Context context, final int albumId, Comparator comparator) { Cursor cursor = makeAlbumSongCursor(context, albumId); ArrayList 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; } diff --git a/app/src/main/java/com/kabouzeid/gramophone/loader/ArtistAlbumLoader.java b/app/src/main/java/com/kabouzeid/gramophone/loader/ArtistAlbumLoader.java index 52e88c6c..9756bcca 100644 --- a/app/src/main/java/com/kabouzeid/gramophone/loader/ArtistAlbumLoader.java +++ b/app/src/main/java/com/kabouzeid/gramophone/loader/ArtistAlbumLoader.java @@ -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; } diff --git a/app/src/main/java/com/kabouzeid/gramophone/loader/ArtistLoader.java b/app/src/main/java/com/kabouzeid/gramophone/loader/ArtistLoader.java index d88985ba..645de99c 100644 --- a/app/src/main/java/com/kabouzeid/gramophone/loader/ArtistLoader.java +++ b/app/src/main/java/com/kabouzeid/gramophone/loader/ArtistLoader.java @@ -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; } diff --git a/app/src/main/java/com/kabouzeid/gramophone/loader/ArtistSongLoader.java b/app/src/main/java/com/kabouzeid/gramophone/loader/ArtistSongLoader.java index 67f0f616..2a68191c 100644 --- a/app/src/main/java/com/kabouzeid/gramophone/loader/ArtistSongLoader.java +++ b/app/src/main/java/com/kabouzeid/gramophone/loader/ArtistSongLoader.java @@ -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; } diff --git a/app/src/main/java/com/kabouzeid/gramophone/loader/PlaylistLoader.java b/app/src/main/java/com/kabouzeid/gramophone/loader/PlaylistLoader.java index 1065e64b..7795f1de 100644 --- a/app/src/main/java/com/kabouzeid/gramophone/loader/PlaylistLoader.java +++ b/app/src/main/java/com/kabouzeid/gramophone/loader/PlaylistLoader.java @@ -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; } diff --git a/app/src/main/java/com/kabouzeid/gramophone/loader/SongLoader.java b/app/src/main/java/com/kabouzeid/gramophone/loader/SongLoader.java index 13f1b1d1..0bc8607c 100644 --- a/app/src/main/java/com/kabouzeid/gramophone/loader/SongLoader.java +++ b/app/src/main/java/com/kabouzeid/gramophone/loader/SongLoader.java @@ -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; } diff --git a/app/src/main/java/com/kabouzeid/gramophone/ui/activities/AlbumDetailActivity.java b/app/src/main/java/com/kabouzeid/gramophone/ui/activities/AlbumDetailActivity.java index 22b89c00..06a9bbc5 100644 --- a/app/src/main/java/com/kabouzeid/gramophone/ui/activities/AlbumDetailActivity.java +++ b/app/src/main/java/com/kabouzeid/gramophone/ui/activities/AlbumDetailActivity.java @@ -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 songs = AlbumSongLoader.getAlbumSongList(this, album.id, new SongTrackNumberComparator()); + final ArrayList songs = AlbumSongLoader.getAlbumSongList(this, album.id); final AlbumSongAdapter albumSongAdapter = new AlbumSongAdapter(this, songs); recyclerView.setLayoutManager(new GridLayoutManager(this, 1)); recyclerView.setAdapter(albumSongAdapter);