music: handle compilation flag tags

Handle COMPILATION and ITUNESCOMPILATION flags, if present.

Just map these to Various Artists and a compilation release type.

Resolves #373.

CHANGELOG.md

@@ -6,6 +6,7 @@
 - Accept `REPLAYGAIN_*` adjustment information on OPUS files alongside
 `R128_*` adjustments.
 - List updates are now consistent across the app
+- Fixed jarring header update in detail view
 - Search view now trims search queries
 - Audio effect (equalizer) session is now broadcast when playing/pausing
 rather than on start/stop.

app/src/main/java/org/oxycblt/auxio/detail/header/AlbumDetailHeaderAdapter.kt

@@ -32,6 +32,7 @@ import org.oxycblt.auxio.util.inflater
 
 /**
  * A [DetailHeaderAdapter] that shows [Album] information.
+ *
  * @author Alexander Capehart (OxygenCobalt)
  */
 class AlbumDetailHeaderAdapter(private val listener: Listener) :

app/src/main/java/org/oxycblt/auxio/detail/header/ArtistDetailHeaderAdapter.kt

@@ -32,6 +32,7 @@ import org.oxycblt.auxio.util.inflater
 
 /**
  * A [DetailHeaderAdapter] that shows [Artist] information.
+ *
  * @author Alexander Capehart (OxygenCobalt)
  */
 class ArtistDetailHeaderAdapter(private val listener: Listener) :

app/src/main/java/org/oxycblt/auxio/detail/header/DetailHeaderAdapter.kt

@@ -35,6 +35,7 @@ abstract class DetailHeaderAdapter<T : MusicParent, VH : RecyclerView.ViewHolder
 
     /**
      * Bind the created header [RecyclerView.ViewHolder] with the current [parent].
+     *
      * @param holder The [RecyclerView.ViewHolder] to bind.
      * @param parent The current [MusicParent] to bind.
      */
@@ -42,6 +43,7 @@ abstract class DetailHeaderAdapter<T : MusicParent, VH : RecyclerView.ViewHolder
 
     /**
      * Update the [MusicParent] shown in the header.
+     *
      * @param parent The new [MusicParent] to show.
      */
     fun setParent(parent: T) {

app/src/main/java/org/oxycblt/auxio/detail/header/GenreDetailHeaderAdapter.kt

@@ -32,6 +32,7 @@ import org.oxycblt.auxio.util.inflater
 
 /**
  * A [DetailHeaderAdapter] that shows [Genre] information.
+ *
  * @author Alexander Capehart (OxygenCobalt)
  */
 class GenreDetailHeaderAdapter(private val listener: Listener) :

app/src/main/java/org/oxycblt/auxio/list/adapter/FlexibleListAdapter.kt

@@ -24,7 +24,6 @@ import androidx.recyclerview.widget.*
 import androidx.recyclerview.widget.DiffUtil
 import androidx.recyclerview.widget.RecyclerView
 import java.util.concurrent.Executor
-import org.oxycblt.auxio.util.logD
 
 /**
  * A variant of ListDiffer with more flexible updates.
@@ -35,8 +34,7 @@ import org.oxycblt.auxio.util.logD
 abstract class FlexibleListAdapter<T, VH : RecyclerView.ViewHolder>(
     diffCallback: DiffUtil.ItemCallback<T>
 ) : RecyclerView.Adapter<VH>() {
-    @Suppress("LeakingThis")
+    @Suppress("LeakingThis") private val differ = FlexibleListDiffer(this, diffCallback)
-    private val differ = FlexibleListDiffer(this, diffCallback)
     final override fun getItemCount() = differ.currentList.size
     /** The current list stored by the adapter's differ instance. */
     val currentList: List<T>
@@ -55,8 +53,7 @@ abstract class FlexibleListAdapter<T, VH : RecyclerView.ViewHolder>(
         newData: List<T>,
         instructions: UpdateInstructions?,
         callback: (() -> Unit)? = null
-    ) =
+    ) = differ.update(newData, instructions, callback)
-        differ.update(newData, instructions, callback)
 }
 
 /**

app/src/main/java/org/oxycblt/auxio/music/metadata/TagWorker.kt

@@ -157,6 +157,12 @@ private constructor(private val rawSong: RawSong, private val future: Future<Tra
 
         // Genre
         textFrames["TCON"]?.let { rawSong.genreNames = it }
+
+        // Compilation Flag
+        (textFrames["TXXX:compilation"] ?: textFrames["TXXX:itunescompilation"])?.let {
+            rawSong.albumArtistNames = rawSong.albumArtistNames.ifEmpty { COMPILATION_ALBUM_ARTISTS }
+            rawSong.releaseTypes = rawSong.releaseTypes.ifEmpty { COMPILATION_RELEASE_TYPES }
+        }
     }
 
     /**
@@ -257,6 +263,12 @@ private constructor(private val rawSong: RawSong, private val future: Future<Tra
 
         // Genre
         comments["genre"]?.let { rawSong.genreNames = it }
+
+        // Compilation Flag
+        (comments["compilation"] ?: comments["itunescompilation"])?.let {
+            rawSong.albumArtistNames = rawSong.albumArtistNames.ifEmpty { COMPILATION_ALBUM_ARTISTS }
+            rawSong.releaseTypes = rawSong.releaseTypes.ifEmpty { COMPILATION_RELEASE_TYPES }
+        }
     }
 
     class Factory @Inject constructor(private val mediaSourceFactory: MediaSource.Factory) :
@@ -273,4 +285,9 @@ private constructor(private val rawSong: RawSong, private val future: Future<Tra
                         requireNotNull(rawSong.mediaStoreId) { "Invalid raw: No id" }
                             .toAudioUri())))
     }
+
+    private companion object {
+        val COMPILATION_ALBUM_ARTISTS = listOf("Various Artists")
+        val COMPILATION_RELEASE_TYPES = listOf("compilation")
+    }
 }

app/src/main/res/layout/dialog_pre_amp.xml

@@ -17,7 +17,7 @@
             android:layout_marginStart="@dimen/spacing_large"
             android:layout_marginTop="@dimen/spacing_medium"
             android:text="@string/set_pre_amp_with"
-            android:textAppearance="@style/TextAppearance.Auxio.TitleMediumLowEmphasis"
+            android:textAppearance="@style/TextAppearance.Auxio.TitleMedium"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toTopOf="parent" />
 
@@ -54,7 +54,7 @@
             android:layout_marginStart="@dimen/spacing_large"
             android:layout_marginTop="@dimen/spacing_medium"
             android:text="@string/set_pre_amp_without"
-            android:textAppearance="@style/TextAppearance.Auxio.TitleMediumLowEmphasis"
+            android:textAppearance="@style/TextAppearance.Auxio.TitleMedium"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@+id/with_tags_slider" />
 

app/src/main/res/layout/item_header.xml

@@ -5,4 +5,5 @@
         style="@style/Widget.Auxio.TextView.Header"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
+    android:background="?attr/colorSurface"
         tools:text="Songs" />

app/src/main/res/layout/item_sort_header.xml

@@ -4,6 +4,7 @@
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
+    android:background="?attr/colorSurface"
     android:orientation="horizontal"
     android:layout_height="wrap_content">
 

app/src/main/res/values/styles_ui.xml

@@ -113,7 +113,7 @@
     </style>
 
     <style name="Widget.Auxio.TextView.Item.Primary" parent="Widget.Auxio.TextView.Item.Base">
-        <item name="android:textAppearance">@style/TextAppearance.Auxio.TitleMediumLowEmphasis
+        <item name="android:textAppearance">@style/TextAppearance.Auxio.TitleMedium
         </item>
         <item name="android:textColor">?android:attr/textColorPrimary</item>
     </style>