From 77897585bda66c6f79ece44e57255a533757ebe2 Mon Sep 17 00:00:00 2001 From: Anna Peake Date: Thu, 21 May 2020 09:51:52 +0100 Subject: [PATCH 1/2] Groups albums into artists regardless of artist name capitalisation in its tags --- .../main/java/com/simplecity/amp_library/utils/Operators.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/src/main/java/com/simplecity/amp_library/utils/Operators.java b/app/src/main/java/com/simplecity/amp_library/utils/Operators.java index d405fa503..4e82e1287 100644 --- a/app/src/main/java/com/simplecity/amp_library/utils/Operators.java +++ b/app/src/main/java/com/simplecity/amp_library/utils/Operators.java @@ -67,7 +67,7 @@ public static List albumsToAlbumArtists(List albums) { AlbumArtist albumArtist = album.getAlbumArtist(); //Check if there's already an equivalent album-artist in our albumArtistMap - AlbumArtist oldAlbumArtist = albumArtistMap.get(albumArtist.name); + AlbumArtist oldAlbumArtist = albumArtistMap.get(albumArtist.name.toLowerCase()); if (oldAlbumArtist != null) { //Add this album to the album artist's albums @@ -75,7 +75,7 @@ public static List albumsToAlbumArtists(List albums) { oldAlbumArtist.albums.add(album); } } else { - albumArtistMap.put(albumArtist.name, albumArtist); + albumArtistMap.put(albumArtist.name.toLowerCase(), albumArtist); } } From 80d7f010443ecab4be78ae48366f9ed98f0ae4bf Mon Sep 17 00:00:00 2001 From: Anna Peake Date: Thu, 21 May 2020 10:17:25 +0100 Subject: [PATCH 2/2] Changed glide version from snapshot --- buildSrc/src/main/kotlin/dependencies/Dependencies.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/buildSrc/src/main/kotlin/dependencies/Dependencies.kt b/buildSrc/src/main/kotlin/dependencies/Dependencies.kt index afb0539d7..0435ee02f 100644 --- a/buildSrc/src/main/kotlin/dependencies/Dependencies.kt +++ b/buildSrc/src/main/kotlin/dependencies/Dependencies.kt @@ -11,7 +11,7 @@ object Dependencies { const val crashlytics = "2.9.9" const val dashClockApi = "2.0.0" const val fastScroll = "1.0.20" - const val glide = "3.8.0-SNAPSHOT" + const val glide = "3.8.0" const val glideOkhttp = "1.4.0@aar" const val materialDialogs = "0.9.6.0" const val permiso = "0.3.0"