From fd639d6348caf97283cd1ccff3f3cacc0c726167 Mon Sep 17 00:00:00 2001
From: Prathamesh More <prathameshmm02@gmail.com>
Date: Wed, 1 Dec 2021 18:05:16 +0530
Subject: [PATCH] Fixed Album artist sort order in Albums tab

---
 .../name/monkey/retromusic/adapter/album/AlbumAdapter.kt  | 2 +-
 .../monkey/retromusic/fragments/albums/AlbumsFragment.kt  | 2 +-
 .../java/code/name/monkey/retromusic/helper/SortOrder.kt  | 8 ++++----
 .../java/code/name/monkey/retromusic/util/MusicUtil.kt    | 2 +-
 app/src/main/res/values/strings.xml                       | 1 +
 5 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/app/src/main/java/code/name/monkey/retromusic/adapter/album/AlbumAdapter.kt b/app/src/main/java/code/name/monkey/retromusic/adapter/album/AlbumAdapter.kt
index 25e24ff7..75fbd1a1 100644
--- a/app/src/main/java/code/name/monkey/retromusic/adapter/album/AlbumAdapter.kt
+++ b/app/src/main/java/code/name/monkey/retromusic/adapter/album/AlbumAdapter.kt
@@ -163,7 +163,7 @@ open class AlbumAdapter(
         when (PreferenceUtil.albumSortOrder) {
             SortOrder.AlbumSortOrder.ALBUM_A_Z, SortOrder.AlbumSortOrder.ALBUM_Z_A -> sectionName =
                 dataSet[position].title
-            SortOrder.AlbumSortOrder.ALBUM_ARTIST -> sectionName = dataSet[position].artistName
+            SortOrder.AlbumSortOrder.ALBUM_ARTIST -> sectionName = dataSet[position].albumArtist
             SortOrder.AlbumSortOrder.ALBUM_YEAR -> return MusicUtil.getYearString(
                 dataSet[position].year
             )
diff --git a/app/src/main/java/code/name/monkey/retromusic/fragments/albums/AlbumsFragment.kt b/app/src/main/java/code/name/monkey/retromusic/fragments/albums/AlbumsFragment.kt
index e7d713b5..320632de 100644
--- a/app/src/main/java/code/name/monkey/retromusic/fragments/albums/AlbumsFragment.kt
+++ b/app/src/main/java/code/name/monkey/retromusic/fragments/albums/AlbumsFragment.kt
@@ -196,7 +196,7 @@ class AlbumsFragment : AbsRecyclerViewCustomGridSizeFragment<AlbumAdapter, GridL
             0,
             R.id.action_album_sort_order_artist,
             2,
-            R.string.sort_order_artist
+            R.string.sort_order_album_artist
         ).isChecked =
             currentSortOrder.equals(AlbumSortOrder.ALBUM_ARTIST)
         sortOrderMenu.add(
diff --git a/app/src/main/java/code/name/monkey/retromusic/helper/SortOrder.kt b/app/src/main/java/code/name/monkey/retromusic/helper/SortOrder.kt
index 6c5b8a69..0771b293 100644
--- a/app/src/main/java/code/name/monkey/retromusic/helper/SortOrder.kt
+++ b/app/src/main/java/code/name/monkey/retromusic/helper/SortOrder.kt
@@ -54,11 +54,11 @@ class SortOrder {
             const val ALBUM_Z_A = "$ALBUM_A_Z DESC"
 
             /* Album sort order songs */
-            const val ALBUM_NUMBER_OF_SONGS = MediaStore.Audio.AlbumColumns.NUMBER_OF_SONGS + " DESC"
+            const val ALBUM_NUMBER_OF_SONGS =
+                MediaStore.Audio.AlbumColumns.NUMBER_OF_SONGS + " DESC"
 
-            /* Album sort order artist */
-            const val ALBUM_ARTIST = (MediaStore.Audio.Artists.DEFAULT_SORT_ORDER +
-                    ", " + MediaStore.Audio.Albums.DEFAULT_SORT_ORDER)
+            /* Album Artist sort order artist */
+            const val ALBUM_ARTIST = "case when lower(album_artist) is null then 1 else 0 end, lower(album_artist)"
 
             /* Album sort order year */
             const val ALBUM_YEAR = MediaStore.Audio.Media.YEAR + " DESC"
diff --git a/app/src/main/java/code/name/monkey/retromusic/util/MusicUtil.kt b/app/src/main/java/code/name/monkey/retromusic/util/MusicUtil.kt
index feef2e06..7bd0bbe0 100644
--- a/app/src/main/java/code/name/monkey/retromusic/util/MusicUtil.kt
+++ b/app/src/main/java/code/name/monkey/retromusic/util/MusicUtil.kt
@@ -241,7 +241,7 @@ object MusicUtil : KoinComponent {
         var musicMediaTitle = mediaTitle
         return try {
             if (TextUtils.isEmpty(musicMediaTitle)) {
-                return ""
+                return "-"
             }
             musicMediaTitle = musicMediaTitle!!.trim { it <= ' ' }.lowercase()
             if (musicMediaTitle.startsWith("the ")) {
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index b4aa0bba..44901dcd 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -454,6 +454,7 @@
     <string name="sort_order_a_z">Ascending</string>
     <string name="sort_order_album">Album</string>
     <string name="sort_order_artist">Artist</string>
+    <string name="sort_order_album_artist">@string/album_artist</string>
     <string name="sort_order_composer">Composer</string>
     <string name="sort_order_date">Date added</string>
     <string name="sort_order_date_modified">Date modified</string>