ui: fix failing tests

Forgot to correct the overrides.

CHANGELOG.md

@@ -14,6 +14,7 @@
 - Audio effect (equalizer) session is now broadcast when playing/pausing
 rather than on start/stop
 - Searching now ignores punctuation
+- Numeric names are now logically sorted (i.e 7 before 15)
 
 #### What's Fixed
 - Fixed MP4-AAC files not playing due to an accidental audio extractor

app/src/main/java/org/oxycblt/auxio/detail/SongDetailDialog.kt

@@ -40,7 +40,6 @@ import org.oxycblt.auxio.playback.formatDurationMs
 import org.oxycblt.auxio.ui.ViewBindingDialogFragment
 import org.oxycblt.auxio.util.collectImmediately
 import org.oxycblt.auxio.util.concatLocalized
-import org.oxycblt.auxio.util.logD
 
 /**
  * A [ViewBindingDialogFragment] that shows information about a Song.
@@ -104,7 +103,6 @@ class SongDetailDialog : ViewBindingDialogFragment<DialogSongDetailBinding>() {
                     add(
                         SongProperty(
                             R.string.lbl_relative_path, song.path.parent.resolveName(context)))
-                    logD(info.resolvedMimeType.resolveName(context))
                     info.resolvedMimeType.resolveName(context)?.let {
                         add(SongProperty(R.string.lbl_format, it))
                     }

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

@@ -35,7 +35,6 @@ import org.oxycblt.auxio.music.metadata.ReleaseType
 import org.oxycblt.auxio.music.storage.MimeType
 import org.oxycblt.auxio.music.storage.Path
 import org.oxycblt.auxio.util.concatLocalized
-import org.oxycblt.auxio.util.logD
 import org.oxycblt.auxio.util.toUuidOrNull
 
 /**
@@ -360,6 +359,7 @@ interface Genre : MusicParent {
 /**
  * A black-box datatype for a variation of music names that is suitable for music-oriented sorting.
  * It will automatically handle articles like "The" and numeric components like "An".
+ *
  * @author Alexander Capehart (OxygenCobalt)
  */
 class SortName(name: String, musicSettings: MusicSettings) : Comparable<SortName> {

app/src/main/java/org/oxycblt/auxio/playback/queue/QueueAdapter.kt

@@ -59,7 +59,6 @@ class QueueAdapter(private val listener: EditableListListener<Song>) :
         position: Int,
         payload: List<Any>
     ) {
-        logD("$position ${getItem(position).rawName}")
         if (payload.isEmpty()) {
             viewHolder.bind(getItem(position), listener)
         }

app/src/test/java/org/oxycblt/auxio/music/FakeMusic.kt

@@ -20,7 +20,6 @@ package org.oxycblt.auxio.music
 
 import android.content.Context
 import android.net.Uri
-import java.text.CollationKey
 import org.oxycblt.auxio.music.*
 import org.oxycblt.auxio.music.metadata.Date
 import org.oxycblt.auxio.music.metadata.Disc
@@ -33,6 +32,8 @@ open class FakeSong : Song {
         get() = throw NotImplementedError()
     override val rawSortName: String?
         get() = throw NotImplementedError()
+    override val sortName: SortName?
+        get() = throw NotImplementedError()
     override val date: Date?
         get() = throw NotImplementedError()
     override val dateAdded: Long
@@ -55,8 +56,6 @@ open class FakeSong : Song {
         get() = throw NotImplementedError()
     override val artists: List<Artist>
         get() = throw NotImplementedError()
-    override val collationKey: CollationKey?
-        get() = throw NotImplementedError()
     override val durationMs: Long
         get() = throw NotImplementedError()
     override val uid: Music.UID
@@ -72,6 +71,8 @@ open class FakeAlbum : Album {
         get() = throw NotImplementedError()
     override val rawSortName: String?
         get() = throw NotImplementedError()
+    override val sortName: SortName?
+        get() = throw NotImplementedError()
     override val coverUri: Uri
         get() = throw NotImplementedError()
     override val dateAdded: Long
@@ -82,8 +83,6 @@ open class FakeAlbum : Album {
         get() = throw NotImplementedError()
     override val artists: List<Artist>
         get() = throw NotImplementedError()
-    override val collationKey: CollationKey?
-        get() = throw NotImplementedError()
     override val durationMs: Long
         get() = throw NotImplementedError()
     override val songs: List<Song>
@@ -101,14 +100,14 @@ open class FakeArtist : Artist {
         get() = throw NotImplementedError()
     override val rawSortName: String?
         get() = throw NotImplementedError()
+    override val sortName: SortName?
+        get() = throw NotImplementedError()
     override val albums: List<Album>
         get() = throw NotImplementedError()
     override val genres: List<Genre>
         get() = throw NotImplementedError()
     override val isCollaborator: Boolean
         get() = throw NotImplementedError()
-    override val collationKey: CollationKey?
-        get() = throw NotImplementedError()
     override val durationMs: Long
         get() = throw NotImplementedError()
     override val songs: List<Song>
@@ -126,12 +125,12 @@ open class FakeGenre : Genre {
         get() = throw NotImplementedError()
     override val rawSortName: String?
         get() = throw NotImplementedError()
+    override val sortName: SortName?
+        get() = throw NotImplementedError()
     override val albums: List<Album>
         get() = throw NotImplementedError()
     override val artists: List<Artist>
         get() = throw NotImplementedError()
-    override val collationKey: CollationKey?
-        get() = throw NotImplementedError()
     override val durationMs: Long
         get() = throw NotImplementedError()
     override val songs: List<Song>