From 21a45163a7bbd04fd13afb7b4bd6cead8e9af8e5 Mon Sep 17 00:00:00 2001
From: Prathamesh More <prathameshmm02@gmail.com>
Date: Thu, 17 Mar 2022 22:11:40 +0530
Subject: [PATCH] Code Cleanup

---
 .../monkey/retromusic/repository/AlbumRepository.kt    | 10 +++++-----
 .../monkey/retromusic/repository/ArtistRepository.kt   |  7 +++----
 .../monkey/retromusic/repository/SongRepository.kt     |  7 +------
 3 files changed, 9 insertions(+), 15 deletions(-)

diff --git a/app/src/main/java/code/name/monkey/retromusic/repository/AlbumRepository.kt b/app/src/main/java/code/name/monkey/retromusic/repository/AlbumRepository.kt
index 52396bcea..52e62db27 100644
--- a/app/src/main/java/code/name/monkey/retromusic/repository/AlbumRepository.kt
+++ b/app/src/main/java/code/name/monkey/retromusic/repository/AlbumRepository.kt
@@ -75,34 +75,34 @@ class RealAlbumRepository(private val songRepository: RealSongRepository) :
         songs: List<Song>
     ): List<Album> {
         val grouped = songs.groupBy { it.albumId }.map { Album(it.key, it.value) }
+        val collator = Collator.getInstance()
         return when (PreferenceUtil.albumSortOrder) {
             SortOrder.AlbumSortOrder.ALBUM_A_Z -> {
-                val collator = Collator.getInstance()
                 grouped.sortedWith { a1, a2 -> collator.compare(a1.title, a2.title) }
             }
             SortOrder.AlbumSortOrder.ALBUM_Z_A -> {
-                val collator = Collator.getInstance()
                 grouped.sortedWith { a1, a2 -> collator.compare(a2.title, a1.title) }
             }
             SortOrder.AlbumSortOrder.ALBUM_ARTIST -> {
-                val collator = Collator.getInstance()
                 grouped.sortedWith { a1, a2 -> collator.compare(a1.albumArtist, a2.albumArtist) }
             }
+            SortOrder.AlbumSortOrder.ALBUM_NUMBER_OF_SONGS -> {
+                grouped.sortedByDescending { it.songCount }
+            }
             else -> grouped
         }
     }
 
     private fun sortAlbumSongs(album: Album): Album {
+        val collator = Collator.getInstance()
         val songs = when (PreferenceUtil.albumDetailSongSortOrder) {
             SortOrder.AlbumSongSortOrder.SONG_TRACK_LIST -> album.songs.sortedWith { o1, o2 ->
                 o1.trackNumber.compareTo(o2.trackNumber)
             }
             SortOrder.AlbumSongSortOrder.SONG_A_Z -> {
-                val collator = Collator.getInstance()
                 album.songs.sortedWith { o1, o2 -> collator.compare(o1.title, o2.title) }
             }
             SortOrder.AlbumSongSortOrder.SONG_Z_A -> {
-                val collator = Collator.getInstance()
                 album.songs.sortedWith { o1, o2 -> collator.compare(o2.title, o1.title) }
             }
             SortOrder.AlbumSongSortOrder.SONG_DURATION -> album.songs.sortedWith { o1, o2 ->
diff --git a/app/src/main/java/code/name/monkey/retromusic/repository/ArtistRepository.kt b/app/src/main/java/code/name/monkey/retromusic/repository/ArtistRepository.kt
index 0456f93cc..8b11976ff 100644
--- a/app/src/main/java/code/name/monkey/retromusic/repository/ArtistRepository.kt
+++ b/app/src/main/java/code/name/monkey/retromusic/repository/ArtistRepository.kt
@@ -172,14 +172,13 @@ class RealArtistRepository(
     }
 
     private fun sortArtists(artists: List<Artist>): List<Artist> {
+        val collator = Collator.getInstance()
         return when (PreferenceUtil.artistSortOrder) {
             SortOrder.ArtistSortOrder.ARTIST_A_Z -> {
-                val collator = Collator.getInstance()
-                artists.sortedWith{ a1, a2 -> collator.compare(a1.name, a2.name) }
+                artists.sortedWith { a1, a2 -> collator.compare(a1.name, a2.name) }
             }
             SortOrder.ArtistSortOrder.ARTIST_Z_A -> {
-                val collator = Collator.getInstance()
-                artists.sortedWith{ a1, a2 -> collator.compare(a2.name, a1.name) }
+                artists.sortedWith { a1, a2 -> collator.compare(a2.name, a1.name) }
             }
             else -> artists
         }
diff --git a/app/src/main/java/code/name/monkey/retromusic/repository/SongRepository.kt b/app/src/main/java/code/name/monkey/retromusic/repository/SongRepository.kt
index 7bf064e5c..540cb51fd 100644
--- a/app/src/main/java/code/name/monkey/retromusic/repository/SongRepository.kt
+++ b/app/src/main/java/code/name/monkey/retromusic/repository/SongRepository.kt
@@ -68,29 +68,24 @@ class RealSongRepository(private val context: Context) : SongRepository {
             } while (cursor.moveToNext())
         }
         cursor?.close()
+        val collator = Collator.getInstance()
         return when (PreferenceUtil.songSortOrder) {
             SortOrder.SongSortOrder.SONG_A_Z -> {
-                val collator = Collator.getInstance()
                 songs.sortedWith{ s1, s2 -> collator.compare(s1.title, s2.title) }
             }
             SortOrder.SongSortOrder.SONG_Z_A -> {
-                val collator = Collator.getInstance()
                 songs.sortedWith{ s1, s2 -> collator.compare(s2.title, s1.title) }
             }
             SortOrder.SongSortOrder.SONG_ALBUM -> {
-                val collator = Collator.getInstance()
                 songs.sortedWith{ s1, s2 -> collator.compare(s1.albumName, s2.albumName) }
             }
             SortOrder.SongSortOrder.SONG_ALBUM_ARTIST -> {
-                val collator = Collator.getInstance()
                 songs.sortedWith{ s1, s2 -> collator.compare(s1.albumArtist, s2.albumArtist) }
             }
             SortOrder.SongSortOrder.SONG_ARTIST -> {
-                val collator = Collator.getInstance()
                 songs.sortedWith{ s1, s2 -> collator.compare(s1.artistName, s2.artistName) }
             }
             SortOrder.SongSortOrder.COMPOSER -> {
-                val collator = Collator.getInstance()
                 songs.sortedWith{ s1, s2 -> collator.compare(s1.composer, s2.composer) }
             }
             else -> songs