From eddba4481905382a547d8155becb27517fbef9b1 Mon Sep 17 00:00:00 2001 From: Alexander Capehart Date: Sun, 19 Mar 2023 14:55:24 -0600 Subject: [PATCH] ui: fix failing tests Forgot to correct the overrides. --- CHANGELOG.md | 1 + .../oxycblt/auxio/detail/SongDetailDialog.kt | 2 -- .../main/java/org/oxycblt/auxio/music/Music.kt | 2 +- .../auxio/playback/queue/QueueAdapter.kt | 1 - .../java/org/oxycblt/auxio/music/FakeMusic.kt | 17 ++++++++--------- 5 files changed, 10 insertions(+), 13 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 55ce844fb..fc55cf4cc 100644 --- a/CHANGELOG.md +++ b/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 diff --git a/app/src/main/java/org/oxycblt/auxio/detail/SongDetailDialog.kt b/app/src/main/java/org/oxycblt/auxio/detail/SongDetailDialog.kt index a766b6afd..337759103 100644 --- a/app/src/main/java/org/oxycblt/auxio/detail/SongDetailDialog.kt +++ b/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() { 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)) } diff --git a/app/src/main/java/org/oxycblt/auxio/music/Music.kt b/app/src/main/java/org/oxycblt/auxio/music/Music.kt index e9c917c54..0495e556e 100644 --- a/app/src/main/java/org/oxycblt/auxio/music/Music.kt +++ b/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 { diff --git a/app/src/main/java/org/oxycblt/auxio/playback/queue/QueueAdapter.kt b/app/src/main/java/org/oxycblt/auxio/playback/queue/QueueAdapter.kt index 11137b7ed..2230fe7a2 100644 --- a/app/src/main/java/org/oxycblt/auxio/playback/queue/QueueAdapter.kt +++ b/app/src/main/java/org/oxycblt/auxio/playback/queue/QueueAdapter.kt @@ -59,7 +59,6 @@ class QueueAdapter(private val listener: EditableListListener) : position: Int, payload: List ) { - logD("$position ${getItem(position).rawName}") if (payload.isEmpty()) { viewHolder.bind(getItem(position), listener) } diff --git a/app/src/test/java/org/oxycblt/auxio/music/FakeMusic.kt b/app/src/test/java/org/oxycblt/auxio/music/FakeMusic.kt index b53be4dd3..c4992eca0 100644 --- a/app/src/test/java/org/oxycblt/auxio/music/FakeMusic.kt +++ b/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 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 get() = throw NotImplementedError() - override val collationKey: CollationKey? - get() = throw NotImplementedError() override val durationMs: Long get() = throw NotImplementedError() override val songs: List @@ -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 get() = throw NotImplementedError() override val genres: List 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 @@ -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 get() = throw NotImplementedError() override val artists: List get() = throw NotImplementedError() - override val collationKey: CollationKey? - get() = throw NotImplementedError() override val durationMs: Long get() = throw NotImplementedError() override val songs: List