Fabio/Auxio
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

musikr: decouple disc from auxio

Browse source
This commit is contained in:
Alexander Capehart 2024-12-14 15:50:14 -05:00
parent e3146647d3
commit cb84b2db17
No known key found for this signature in database
GPG key ID: 37DBE3621FE9AD47
4 changed files with 8 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
app/src/main/java/org/oxycblt/auxio/detail/list/AlbumDetailListAdapter.kt
View file

@ -43,7 +43,6 @@ import org.oxycblt.auxio.util.inflater
import org.oxycblt.musikr.Album import org.oxycblt.musikr.Album
import org.oxycblt.musikr.Song import org.oxycblt.musikr.Song
import org.oxycblt.musikr.tag.Disc import org.oxycblt.musikr.tag.Disc
import org.oxycblt.musikr.tag.resolveNumber
/** /**
* An [DetailListAdapter] implementing the header and sub-items for the [Album] detail view. * An [DetailListAdapter] implementing the header and sub-items for the [Album] detail view.
@ -122,7 +121,7 @@ private class DiscHeaderViewHolder(private val binding: ItemDiscHeaderBinding) :
*/ */
fun bind(discHeader: DiscHeader) { fun bind(discHeader: DiscHeader) {
val disc = discHeader.inner val disc = discHeader.inner
binding.discNumber.text = disc.resolveNumber(binding.context) binding.discNumber.text = disc.resolve(binding.context)
binding.discName.apply { binding.discName.apply {
text = disc?.name text = disc?.name
isGone = disc?.name == null isGone = disc?.name == null

5
app/src/main/java/org/oxycblt/auxio/music/MusicUtil.kt
View file

@ -26,6 +26,7 @@ import org.oxycblt.auxio.R
import org.oxycblt.auxio.util.concatLocalized import org.oxycblt.auxio.util.concatLocalized
import org.oxycblt.musikr.Music import org.oxycblt.musikr.Music
import org.oxycblt.musikr.tag.Date import org.oxycblt.musikr.tag.Date
import org.oxycblt.musikr.tag.Disc
import org.oxycblt.musikr.tag.Name import org.oxycblt.musikr.tag.Name
import org.oxycblt.musikr.tag.Placeholder import org.oxycblt.musikr.tag.Placeholder
import timber.log.Timber import timber.log.Timber
@ -98,3 +99,7 @@ private fun Date.resolveFineGrained(): String? {
format.applyPattern("MMM yyyy") format.applyPattern("MMM yyyy")
return format.format(date) return format.format(date)
} }
fun Disc?.resolve(context: Context) =
this?.run { context.getString(R.string.fmt_disc_no, number) }
?: context.getString(R.string.def_disc)

4
app/src/main/java/org/oxycblt/auxio/music/service/MusicBrowser.kt
View file

@ -29,6 +29,7 @@ import org.oxycblt.auxio.home.HomeGenerator
import org.oxycblt.auxio.list.adapter.UpdateInstructions import org.oxycblt.auxio.list.adapter.UpdateInstructions
import org.oxycblt.auxio.music.MusicRepository import org.oxycblt.auxio.music.MusicRepository
import org.oxycblt.auxio.music.MusicType import org.oxycblt.auxio.music.MusicType
import org.oxycblt.auxio.music.resolve
import org.oxycblt.auxio.search.SearchEngine import org.oxycblt.auxio.search.SearchEngine
import org.oxycblt.musikr.Album import org.oxycblt.musikr.Album
import org.oxycblt.musikr.Artist import org.oxycblt.musikr.Artist
@ -36,7 +37,6 @@ import org.oxycblt.musikr.Genre
import org.oxycblt.musikr.Music import org.oxycblt.musikr.Music
import org.oxycblt.musikr.Playlist import org.oxycblt.musikr.Playlist
import org.oxycblt.musikr.Song import org.oxycblt.musikr.Song
import org.oxycblt.musikr.tag.resolveNumber
class MusicBrowser class MusicBrowser
private constructor( private constructor(
@ -219,7 +219,7 @@ private constructor(
section.items.map { it.toMediaItem(context, header(section.stringRes)) } section.items.map { it.toMediaItem(context, header(section.stringRes)) }
is DetailSection.Discs -> is DetailSection.Discs ->
section.discs.flatMap { (disc, songs) -> section.discs.flatMap { (disc, songs) ->
val discString = disc.resolveNumber(context) val discString = disc.resolve(context)
songs.map { it.toMediaItem(context, header(discString)) } songs.map { it.toMediaItem(context, header(discString)) }
} }
else -> error("Unknown section type: $section") else -> error("Unknown section type: $section")

7
app/src/main/java/org/oxycblt/musikr/tag/Disc.kt
View file

@ -18,9 +18,6 @@
package org.oxycblt.musikr.tag package org.oxycblt.musikr.tag
import android.content.Context
import org.oxycblt.auxio.R
/** /**
* A disc identifier for a song. * A disc identifier for a song.
* *
@ -35,7 +32,3 @@ class Disc(val number: Int, val name: String?) : Comparable<Disc> {
override fun compareTo(other: Disc) = number.compareTo(other.number) override fun compareTo(other: Disc) = number.compareTo(other.number)
} }
fun Disc?.resolveNumber(context: Context) =
this?.run { context.getString(R.string.fmt_disc_no, number) }
?: context.getString(R.string.def_disc)