From 70935d5e3f11f40e0255fa63a4d3f7065f51edea Mon Sep 17 00:00:00 2001 From: tomerf Date: Fri, 23 Jun 2017 19:29:31 +0300 Subject: [PATCH] Changed sort of names and titles to be case insensitive (#411) --- .../org/xbmc/kore/ui/sections/audio/AlbumListFragment.java | 6 +++--- .../org/xbmc/kore/ui/sections/audio/ArtistListFragment.java | 2 +- .../kore/ui/sections/audio/AudioGenresListFragment.java | 2 +- .../xbmc/kore/ui/sections/audio/MusicVideoListFragment.java | 2 +- .../org/xbmc/kore/ui/sections/audio/SongsListFragment.java | 2 +- .../org/xbmc/kore/ui/sections/video/MovieListFragment.java | 4 ++-- .../org/xbmc/kore/ui/sections/video/TVShowListFragment.java | 4 ++-- 7 files changed, 11 insertions(+), 11 deletions(-) diff --git a/app/src/main/java/org/xbmc/kore/ui/sections/audio/AlbumListFragment.java b/app/src/main/java/org/xbmc/kore/ui/sections/audio/AlbumListFragment.java index 63824df..dc660f8 100644 --- a/app/src/main/java/org/xbmc/kore/ui/sections/audio/AlbumListFragment.java +++ b/app/src/main/java/org/xbmc/kore/ui/sections/audio/AlbumListFragment.java @@ -248,10 +248,10 @@ public class AlbumListFragment extends AbstractCursorListFragment { MediaContract.Albums.RATING, }; - String SORT_BY_ALBUM = MediaDatabase.sortCommonTokens(MediaContract.Albums.TITLE) + " ASC"; - String SORT_BY_ARTIST = MediaDatabase.sortCommonTokens(MediaContract.Albums.DISPLAYARTIST) + " ASC"; + String SORT_BY_ALBUM = MediaDatabase.sortCommonTokens(MediaContract.Albums.TITLE) + " COLLATE NOCASE ASC"; + String SORT_BY_ARTIST = MediaDatabase.sortCommonTokens(MediaContract.Albums.DISPLAYARTIST) + " COLLATE NOCASE ASC"; String SORT_BY_ARTIST_YEAR = MediaDatabase.sortCommonTokens(MediaContract.Albums.DISPLAYARTIST) - + " ASC, " + MediaContract.Albums.YEAR + " ASC"; + + " COLLATE NOCASE ASC, " + MediaContract.Albums.YEAR + " ASC"; int ID = 0; int ALBUMID = 1; diff --git a/app/src/main/java/org/xbmc/kore/ui/sections/audio/ArtistListFragment.java b/app/src/main/java/org/xbmc/kore/ui/sections/audio/ArtistListFragment.java index e2914b7..5a8f393 100644 --- a/app/src/main/java/org/xbmc/kore/ui/sections/audio/ArtistListFragment.java +++ b/app/src/main/java/org/xbmc/kore/ui/sections/audio/ArtistListFragment.java @@ -124,7 +124,7 @@ public class ArtistListFragment extends AbstractCursorListFragment { MediaContract.Artists.FANART }; - String SORT = MediaDatabase.sortCommonTokens(MediaContract.Artists.ARTIST) + " ASC"; + String SORT = MediaDatabase.sortCommonTokens(MediaContract.Artists.ARTIST) + " COLLATE NOCASE ASC"; int ID = 0; int ARTISTID = 1; diff --git a/app/src/main/java/org/xbmc/kore/ui/sections/audio/AudioGenresListFragment.java b/app/src/main/java/org/xbmc/kore/ui/sections/audio/AudioGenresListFragment.java index f7d2f57..d528e96 100644 --- a/app/src/main/java/org/xbmc/kore/ui/sections/audio/AudioGenresListFragment.java +++ b/app/src/main/java/org/xbmc/kore/ui/sections/audio/AudioGenresListFragment.java @@ -117,7 +117,7 @@ public class AudioGenresListFragment extends AbstractCursorListFragment { MediaContract.AudioGenres.THUMBNAIL, }; - String SORT = MediaContract.AudioGenres.TITLE + " ASC"; + String SORT = MediaContract.AudioGenres.TITLE + " COLLATE NOCASE ASC"; final int ID = 0; final int GENREID = 1; diff --git a/app/src/main/java/org/xbmc/kore/ui/sections/audio/MusicVideoListFragment.java b/app/src/main/java/org/xbmc/kore/ui/sections/audio/MusicVideoListFragment.java index 15a65e1..40e5caa 100644 --- a/app/src/main/java/org/xbmc/kore/ui/sections/audio/MusicVideoListFragment.java +++ b/app/src/main/java/org/xbmc/kore/ui/sections/audio/MusicVideoListFragment.java @@ -123,7 +123,7 @@ public class MusicVideoListFragment extends AbstractCursorListFragment { MediaContract.MusicVideos.PLOT, }; - String SORT = MediaDatabase.sortCommonTokens(MediaContract.MusicVideos.TITLE) + " ASC"; + String SORT = MediaDatabase.sortCommonTokens(MediaContract.MusicVideos.TITLE) + " COLLATE NOCASE ASC"; int ID = 0; int MUSICVIDEOID = 1; diff --git a/app/src/main/java/org/xbmc/kore/ui/sections/audio/SongsListFragment.java b/app/src/main/java/org/xbmc/kore/ui/sections/audio/SongsListFragment.java index 0fcecaa..387ce94 100644 --- a/app/src/main/java/org/xbmc/kore/ui/sections/audio/SongsListFragment.java +++ b/app/src/main/java/org/xbmc/kore/ui/sections/audio/SongsListFragment.java @@ -192,7 +192,7 @@ public class SongsListFragment extends AbstractCursorListFragment { MediaProvider.Qualified.ALBUMS_THUMBNAIL }; - String SORT = MediaDatabase.sortCommonTokens(MediaProvider.Qualified.SONGS_TITLE) + " ASC"; + String SORT = MediaDatabase.sortCommonTokens(MediaProvider.Qualified.SONGS_TITLE) + " COLLATE NOCASE ASC"; int ID = 0; int TITLE = 1; diff --git a/app/src/main/java/org/xbmc/kore/ui/sections/video/MovieListFragment.java b/app/src/main/java/org/xbmc/kore/ui/sections/video/MovieListFragment.java index bdfc3e9..4a132e7 100644 --- a/app/src/main/java/org/xbmc/kore/ui/sections/video/MovieListFragment.java +++ b/app/src/main/java/org/xbmc/kore/ui/sections/video/MovieListFragment.java @@ -275,13 +275,13 @@ public class MovieListFragment extends AbstractCursorListFragment { }; - String SORT_BY_NAME = MediaContract.Movies.TITLE + " ASC"; + String SORT_BY_NAME = MediaContract.Movies.TITLE + " COLLATE NOCASE ASC"; String SORT_BY_YEAR = MediaContract.Movies.YEAR + " ASC"; String SORT_BY_RATING = MediaContract.Movies.RATING + " DESC"; String SORT_BY_DATE_ADDED = MediaContract.Movies.DATEADDED + " DESC"; String SORT_BY_LAST_PLAYED = MediaContract.Movies.LASTPLAYED + " DESC"; String SORT_BY_LENGTH = MediaContract.Movies.RUNTIME + " DESC"; - String SORT_BY_NAME_IGNORE_ARTICLES = MediaDatabase.sortCommonTokens(MediaContract.Movies.TITLE) + " ASC"; + String SORT_BY_NAME_IGNORE_ARTICLES = MediaDatabase.sortCommonTokens(MediaContract.Movies.TITLE) + " COLLATE NOCASE ASC"; final int ID = 0; final int MOVIEID = 1; diff --git a/app/src/main/java/org/xbmc/kore/ui/sections/video/TVShowListFragment.java b/app/src/main/java/org/xbmc/kore/ui/sections/video/TVShowListFragment.java index 6ea165e..f5c0bff 100644 --- a/app/src/main/java/org/xbmc/kore/ui/sections/video/TVShowListFragment.java +++ b/app/src/main/java/org/xbmc/kore/ui/sections/video/TVShowListFragment.java @@ -269,12 +269,12 @@ public class TVShowListFragment extends AbstractCursorListFragment { MediaContract.TVShows.GENRES, }; - String SORT_BY_NAME = MediaContract.TVShows.TITLE + " ASC"; + String SORT_BY_NAME = MediaContract.TVShows.TITLE + " COLLATE NOCASE ASC"; String SORT_BY_YEAR = MediaContract.TVShows.PREMIERED + " ASC"; String SORT_BY_RATING = MediaContract.TVShows.RATING + " DESC"; String SORT_BY_DATE_ADDED = MediaContract.TVShows.DATEADDED + " DESC"; String SORT_BY_LAST_PLAYED = MediaContract.TVShows.LASTPLAYED + " DESC"; - String SORT_BY_NAME_IGNORE_ARTICLES = MediaDatabase.sortCommonTokens(MediaContract.TVShows.TITLE) + " ASC"; + String SORT_BY_NAME_IGNORE_ARTICLES = MediaDatabase.sortCommonTokens(MediaContract.TVShows.TITLE) + " COLLATE NOCASE ASC"; final int ID = 0; final int TVSHOWID = 1;