library: remove default sort option

Remove the default [a.k.a SortMode.NONE] option from the library view.
It was effectively useless in every single library mode and was
functionally equivelent to SortMode.ALPHA_DOWN. Other SortModes might
come to take it's place, but likely only for albums.

app/src/main/java/org/oxycblt/auxio/library/LibraryViewModel.kt

@@ -38,6 +38,11 @@ class LibraryViewModel : ViewModel(), SettingsManager.Callback {
         mDisplayMode = settingsManager.libraryDisplayMode
         mSortMode = settingsManager.librarySortMode
 
+        // Handle "NONE" SortMode that was removed in 1.4.1
+        if (mSortMode == SortMode.NONE) {
+            mSortMode = SortMode.ALPHA_DOWN
+        }
+
         updateLibraryData()
     }
 
@@ -46,7 +51,6 @@ class LibraryViewModel : ViewModel(), SettingsManager.Callback {
      */
     fun updateSortMode(@IdRes itemId: Int) {
         val mode = when (itemId) {
-            R.id.option_sort_none -> SortMode.NONE
             R.id.option_sort_alpha_down -> SortMode.ALPHA_DOWN
             R.id.option_sort_alpha_up -> SortMode.ALPHA_UP
 

app/src/main/java/org/oxycblt/auxio/music/MusicLoader.kt

@@ -11,7 +11,6 @@ import androidx.core.database.getStringOrNull
 import org.oxycblt.auxio.R
 import org.oxycblt.auxio.database.BlacklistDatabase
 import org.oxycblt.auxio.logD
-import org.oxycblt.auxio.recycler.SortMode
 
 /**
  * Class that loads/constructs [Genre]s, [Artist]s, [Album]s, and [Song] objects from the filesystem
@@ -228,9 +227,6 @@ class MusicLoader(private val context: Context) {
             )
         }
 
-        // Make the artist view line up with the rest of the lists by sorting it.
-        artists = SortMode.ALPHA_DOWN.getSortedArtistList(artists).toMutableList()
-
         logD("Albums successfully linked into ${artists.size} artists")
     }
 

app/src/main/java/org/oxycblt/auxio/recycler/SortMode.kt

@@ -173,11 +173,10 @@ enum class SortMode(@DrawableRes val iconRes: Int) {
     @IdRes
     fun toMenuId(): Int {
         return when (this) {
-            NONE -> R.id.option_sort_none
             ALPHA_UP -> R.id.option_sort_alpha_up
             ALPHA_DOWN -> R.id.option_sort_alpha_down
 
-            else -> R.id.option_sort_none
+            else -> R.id.option_sort_alpha_up
         }
     }
 

app/src/main/res/menu/menu_library.xml

@@ -9,9 +9,6 @@
         app:showAsAction="always">
         <menu>
             <group android:checkableBehavior="single">
-                <item
-                    android:id="@+id/option_sort_none"
-                    android:title="@string/label_sort_none" />
                 <item
                     android:id="@+id/option_sort_alpha_down"
                     android:title="@string/label_sort_alpha_down" />