detail: eliminate dead code

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

@@ -19,29 +19,24 @@
 package org.oxycblt.auxio.detail
 
 import android.os.Bundle
-import android.view.LayoutInflater
-import androidx.fragment.app.activityViewModels
 import androidx.navigation.fragment.findNavController
 import androidx.navigation.fragment.navArgs
 import androidx.recyclerview.widget.LinearSmoothScroller
 import dagger.hilt.android.AndroidEntryPoint
 import org.oxycblt.auxio.R
-import org.oxycblt.auxio.databinding.FragmentDetail2Binding
+import org.oxycblt.auxio.databinding.FragmentDetailBinding
 import org.oxycblt.auxio.detail.list.AlbumDetailListAdapter
 import org.oxycblt.auxio.list.Item
 import org.oxycblt.auxio.list.ListFragment
-import org.oxycblt.auxio.list.ListViewModel
 import org.oxycblt.auxio.list.menu.Menu
 import org.oxycblt.auxio.music.Album
 import org.oxycblt.auxio.music.Music
 import org.oxycblt.auxio.music.MusicParent
-import org.oxycblt.auxio.music.MusicViewModel
 import org.oxycblt.auxio.music.PlaylistDecision
 import org.oxycblt.auxio.music.PlaylistMessage
 import org.oxycblt.auxio.music.Song
 import org.oxycblt.auxio.music.resolveNames
 import org.oxycblt.auxio.playback.PlaybackDecision
-import org.oxycblt.auxio.playback.PlaybackViewModel
 import org.oxycblt.auxio.playback.formatDurationMs
 import org.oxycblt.auxio.util.collect
 import org.oxycblt.auxio.util.collectImmediately
@@ -58,25 +53,14 @@ import org.oxycblt.auxio.util.unlikelyToBeNull
  */
 @AndroidEntryPoint
 class AlbumDetailFragment : DetailFragment<Album, Song>() {
-    private val detailModel: DetailViewModel by activityViewModels()
-    override val listModel: ListViewModel by activityViewModels()
-    override val musicModel: MusicViewModel by activityViewModels()
-    override val playbackModel: PlaybackViewModel by activityViewModels()
-
     // Information about what album to display is initially within the navigation arguments
     // as a UID, as that is the only safe way to parcel an album.
     private val args: AlbumDetailFragmentArgs by navArgs()
     private val albumListAdapter = AlbumDetailListAdapter(this)
 
-    override fun onCreateBinding(inflater: LayoutInflater) =
-        FragmentDetail2Binding.inflate(inflater)
-
     override fun getDetailListAdapter() = albumListAdapter
 
-    override fun getSelectionToolbar(binding: FragmentDetail2Binding) =
+    override fun onBindingCreated(binding: FragmentDetailBinding, savedInstanceState: Bundle?) {
-        binding.detailSelectionToolbar
-
-    override fun onBindingCreated(binding: FragmentDetail2Binding, savedInstanceState: Bundle?) {
         super.onBindingCreated(binding, savedInstanceState)
 
         // -- VIEWMODEL SETUP ---
@@ -94,7 +78,7 @@ class AlbumDetailFragment : DetailFragment<Album, Song>() {
         collect(playbackModel.playbackDecision.flow, ::handlePlaybackDecision)
     }
 
-    override fun onDestroyBinding(binding: FragmentDetail2Binding) {
+    override fun onDestroyBinding(binding: FragmentDetailBinding) {
         super.onDestroyBinding(binding)
         // Avoid possible race conditions that could cause a bad replace instruction to be consumed
         // during list initialization and crash the app. Could happen if the user is fast enough.

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

@@ -19,31 +19,25 @@
 package org.oxycblt.auxio.detail
 
 import android.os.Bundle
-import android.view.LayoutInflater
 import androidx.core.view.isVisible
-import androidx.fragment.app.activityViewModels
 import androidx.navigation.fragment.findNavController
 import androidx.navigation.fragment.navArgs
-import com.google.android.material.transition.MaterialSharedAxis
 import dagger.hilt.android.AndroidEntryPoint
 import org.oxycblt.auxio.R
-import org.oxycblt.auxio.databinding.FragmentDetail2Binding
+import org.oxycblt.auxio.databinding.FragmentDetailBinding
 import org.oxycblt.auxio.detail.list.ArtistDetailListAdapter
 import org.oxycblt.auxio.list.Item
 import org.oxycblt.auxio.list.ListFragment
-import org.oxycblt.auxio.list.ListViewModel
 import org.oxycblt.auxio.list.menu.Menu
 import org.oxycblt.auxio.music.Album
 import org.oxycblt.auxio.music.Artist
 import org.oxycblt.auxio.music.Music
 import org.oxycblt.auxio.music.MusicParent
-import org.oxycblt.auxio.music.MusicViewModel
 import org.oxycblt.auxio.music.PlaylistDecision
 import org.oxycblt.auxio.music.PlaylistMessage
 import org.oxycblt.auxio.music.Song
 import org.oxycblt.auxio.music.resolveNames
 import org.oxycblt.auxio.playback.PlaybackDecision
-import org.oxycblt.auxio.playback.PlaybackViewModel
 import org.oxycblt.auxio.util.collect
 import org.oxycblt.auxio.util.collectImmediately
 import org.oxycblt.auxio.util.context
@@ -60,35 +54,14 @@ import org.oxycblt.auxio.util.unlikelyToBeNull
  */
 @AndroidEntryPoint
 class ArtistDetailFragment : DetailFragment<Artist, Music>() {
-    private val detailModel: DetailViewModel by activityViewModels()
-    override val listModel: ListViewModel by activityViewModels()
-    override val musicModel: MusicViewModel by activityViewModels()
-    override val playbackModel: PlaybackViewModel by activityViewModels()
-
     // Information about what artist to display is initially within the navigation arguments
     // as a UID, as that is the only safe way to parcel an artist.
     private val args: ArtistDetailFragmentArgs by navArgs()
     private val artistListAdapter = ArtistDetailListAdapter(this)
 
-    override fun onCreate(savedInstanceState: Bundle?) {
-        super.onCreate(savedInstanceState)
-        // Detail transitions are always on the X axis. Shared element transitions are more
-        // semantically correct, but are also too buggy to be sensible.
-        enterTransition = MaterialSharedAxis(MaterialSharedAxis.Z, true)
-        returnTransition = MaterialSharedAxis(MaterialSharedAxis.Z, false)
-        exitTransition = MaterialSharedAxis(MaterialSharedAxis.Z, true)
-        reenterTransition = MaterialSharedAxis(MaterialSharedAxis.Z, false)
-    }
-
-    override fun onCreateBinding(inflater: LayoutInflater) =
-        FragmentDetail2Binding.inflate(inflater)
-
-    override fun getSelectionToolbar(binding: FragmentDetail2Binding) =
-        binding.detailSelectionToolbar
-
     override fun getDetailListAdapter() = artistListAdapter
 
-    override fun onBindingCreated(binding: FragmentDetail2Binding, savedInstanceState: Bundle?) {
+    override fun onBindingCreated(binding: FragmentDetailBinding, savedInstanceState: Bundle?) {
         super.onBindingCreated(binding, savedInstanceState)
 
         // --- VIEWMODEL SETUP ---
@@ -106,7 +79,7 @@ class ArtistDetailFragment : DetailFragment<Artist, Music>() {
         collect(playbackModel.playbackDecision.flow, ::handlePlaybackDecision)
     }
 
-    override fun onDestroyBinding(binding: FragmentDetail2Binding) {
+    override fun onDestroyBinding(binding: FragmentDetailBinding) {
         super.onDestroyBinding(binding)
         // Avoid possible race conditions that could cause a bad replace instruction to be consumed
         // during list initialization and crash the app. Could happen if the user is fast enough.

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

@@ -22,7 +22,6 @@ import android.os.Bundle
 import android.view.LayoutInflater
 import androidx.fragment.app.activityViewModels
 import androidx.navigation.findNavController
-import androidx.navigation.fragment.findNavController
 import androidx.recyclerview.widget.GridLayoutManager
 import com.google.android.material.appbar.AppBarLayout
 import com.google.android.material.transition.MaterialSharedAxis
@@ -30,7 +29,7 @@ import kotlin.math.abs
 import kotlin.math.max
 import kotlin.math.min
 import org.oxycblt.auxio.R
-import org.oxycblt.auxio.databinding.FragmentDetail2Binding
+import org.oxycblt.auxio.databinding.FragmentDetailBinding
 import org.oxycblt.auxio.detail.list.DetailListAdapter
 import org.oxycblt.auxio.list.Divider
 import org.oxycblt.auxio.list.Header
@@ -45,10 +44,10 @@ import org.oxycblt.auxio.util.overrideOnOverflowMenuClick
 import org.oxycblt.auxio.util.setFullWidthLookup
 
 abstract class DetailFragment<P : MusicParent, C : Music> :
-    ListFragment<C, FragmentDetail2Binding>(),
+    ListFragment<C, FragmentDetailBinding>(),
     DetailListAdapter.Listener<C>,
     AppBarLayout.OnOffsetChangedListener {
-    private val detailModel: DetailViewModel by activityViewModels()
+    protected val detailModel: DetailViewModel by activityViewModels()
     override val listModel: ListViewModel by activityViewModels()
     override val musicModel: MusicViewModel by activityViewModels()
     override val playbackModel: PlaybackViewModel by activityViewModels()
@@ -65,15 +64,14 @@ abstract class DetailFragment<P : MusicParent, C : Music> :
         reenterTransition = MaterialSharedAxis(MaterialSharedAxis.Z, false)
     }
 
-    override fun onCreateBinding(inflater: LayoutInflater) =
+    override fun onCreateBinding(inflater: LayoutInflater) = FragmentDetailBinding.inflate(inflater)
-        FragmentDetail2Binding.inflate(inflater)
 
     abstract fun getDetailListAdapter(): DetailListAdapter
 
-    override fun getSelectionToolbar(binding: FragmentDetail2Binding) =
+    override fun getSelectionToolbar(binding: FragmentDetailBinding) =
         binding.detailSelectionToolbar
 
-    override fun onBindingCreated(binding: FragmentDetail2Binding, savedInstanceState: Bundle?) {
+    override fun onBindingCreated(binding: FragmentDetailBinding, savedInstanceState: Bundle?) {
         super.onBindingCreated(binding, savedInstanceState)
 
         // --- UI SETUP ---
@@ -103,7 +101,7 @@ abstract class DetailFragment<P : MusicParent, C : Music> :
         spacingSmall = requireContext().getDimenPixels(R.dimen.spacing_small)
     }
 
-    override fun onDestroyBinding(binding: FragmentDetail2Binding) {
+    override fun onDestroyBinding(binding: FragmentDetailBinding) {
         super.onDestroyBinding(binding)
         binding.detailAppbar.removeOnOffsetChangedListener(this)
         binding.detailNormalToolbar.setOnMenuItemClickListener(null)

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

@@ -20,28 +20,23 @@ package org.oxycblt.auxio.detail
 
 import android.os.Bundle
 import androidx.core.view.isVisible
-import androidx.fragment.app.activityViewModels
 import androidx.navigation.fragment.findNavController
 import androidx.navigation.fragment.navArgs
-import com.google.android.material.transition.MaterialSharedAxis
 import dagger.hilt.android.AndroidEntryPoint
 import org.oxycblt.auxio.R
-import org.oxycblt.auxio.databinding.FragmentDetail2Binding
+import org.oxycblt.auxio.databinding.FragmentDetailBinding
 import org.oxycblt.auxio.detail.list.GenreDetailListAdapter
 import org.oxycblt.auxio.list.Item
 import org.oxycblt.auxio.list.ListFragment
-import org.oxycblt.auxio.list.ListViewModel
 import org.oxycblt.auxio.list.menu.Menu
 import org.oxycblt.auxio.music.Artist
 import org.oxycblt.auxio.music.Genre
 import org.oxycblt.auxio.music.Music
 import org.oxycblt.auxio.music.MusicParent
-import org.oxycblt.auxio.music.MusicViewModel
 import org.oxycblt.auxio.music.PlaylistDecision
 import org.oxycblt.auxio.music.PlaylistMessage
 import org.oxycblt.auxio.music.Song
 import org.oxycblt.auxio.playback.PlaybackDecision
-import org.oxycblt.auxio.playback.PlaybackViewModel
 import org.oxycblt.auxio.util.collect
 import org.oxycblt.auxio.util.collectImmediately
 import org.oxycblt.auxio.util.getPlural
@@ -57,27 +52,14 @@ import org.oxycblt.auxio.util.unlikelyToBeNull
  */
 @AndroidEntryPoint
 class GenreDetailFragment : DetailFragment<Genre, Music>() {
-    private val detailModel: DetailViewModel by activityViewModels()
-    override val listModel: ListViewModel by activityViewModels()
-    override val musicModel: MusicViewModel by activityViewModels()
-    override val playbackModel: PlaybackViewModel by activityViewModels()
-
     // Information about what genre to display is initially within the navigation arguments
     // as a UID, as that is the only safe way to parcel an genre.
     private val args: GenreDetailFragmentArgs by navArgs()
     private val genreListAdapter = GenreDetailListAdapter(this)
 
-    override fun onCreate(savedInstanceState: Bundle?) {
-        super.onCreate(savedInstanceState)
-        enterTransition = MaterialSharedAxis(MaterialSharedAxis.Z, true)
-        returnTransition = MaterialSharedAxis(MaterialSharedAxis.Z, false)
-        exitTransition = MaterialSharedAxis(MaterialSharedAxis.Z, true)
-        reenterTransition = MaterialSharedAxis(MaterialSharedAxis.Z, false)
-    }
-
     override fun getDetailListAdapter() = genreListAdapter
 
-    override fun onBindingCreated(binding: FragmentDetail2Binding, savedInstanceState: Bundle?) {
+    override fun onBindingCreated(binding: FragmentDetailBinding, savedInstanceState: Bundle?) {
         super.onBindingCreated(binding, savedInstanceState)
 
         // --- VIEWMODEL SETUP ---
@@ -95,7 +77,7 @@ class GenreDetailFragment : DetailFragment<Genre, Music>() {
         collect(playbackModel.playbackDecision.flow, ::handlePlaybackDecision)
     }
 
-    override fun onDestroyBinding(binding: FragmentDetail2Binding) {
+    override fun onDestroyBinding(binding: FragmentDetailBinding) {
         super.onDestroyBinding(binding)
         // Avoid possible race conditions that could cause a bad replace instruction to be consumed
         // during list initialization and crash the app. Could happen if the user is fast enough.

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

@@ -23,31 +23,26 @@ import android.view.MenuItem
 import androidx.activity.result.ActivityResultLauncher
 import androidx.activity.result.contract.ActivityResultContracts
 import androidx.core.view.isVisible
-import androidx.fragment.app.activityViewModels
 import androidx.navigation.fragment.findNavController
 import androidx.navigation.fragment.navArgs
 import androidx.recyclerview.widget.ItemTouchHelper
 import androidx.recyclerview.widget.RecyclerView
-import com.google.android.material.transition.MaterialSharedAxis
 import dagger.hilt.android.AndroidEntryPoint
 import org.oxycblt.auxio.R
-import org.oxycblt.auxio.databinding.FragmentDetail2Binding
+import org.oxycblt.auxio.databinding.FragmentDetailBinding
 import org.oxycblt.auxio.detail.list.PlaylistDetailListAdapter
 import org.oxycblt.auxio.detail.list.PlaylistDragCallback
 import org.oxycblt.auxio.list.Item
 import org.oxycblt.auxio.list.ListFragment
-import org.oxycblt.auxio.list.ListViewModel
 import org.oxycblt.auxio.list.menu.Menu
 import org.oxycblt.auxio.music.Music
 import org.oxycblt.auxio.music.MusicParent
-import org.oxycblt.auxio.music.MusicViewModel
 import org.oxycblt.auxio.music.Playlist
 import org.oxycblt.auxio.music.PlaylistDecision
 import org.oxycblt.auxio.music.PlaylistMessage
 import org.oxycblt.auxio.music.Song
 import org.oxycblt.auxio.music.external.M3U
 import org.oxycblt.auxio.playback.PlaybackDecision
-import org.oxycblt.auxio.playback.PlaybackViewModel
 import org.oxycblt.auxio.playback.formatDurationMs
 import org.oxycblt.auxio.ui.DialogAwareNavigationListener
 import org.oxycblt.auxio.util.collect
@@ -68,10 +63,6 @@ import org.oxycblt.auxio.util.unlikelyToBeNull
 @AndroidEntryPoint
 class PlaylistDetailFragment :
     DetailFragment<Playlist, Song>(), PlaylistDetailListAdapter.Listener {
-    private val detailModel: DetailViewModel by activityViewModels()
-    override val listModel: ListViewModel by activityViewModels()
-    override val musicModel: MusicViewModel by activityViewModels()
-    override val playbackModel: PlaybackViewModel by activityViewModels()
     // Information about what playlist to display is initially within the navigation arguments
     // as a UID, as that is the only safe way to parcel an playlist.
     private val args: PlaylistDetailFragmentArgs by navArgs()
@@ -81,17 +72,9 @@ class PlaylistDetailFragment :
     private var getContentLauncher: ActivityResultLauncher<String>? = null
     private var pendingImportTarget: Playlist? = null
 
-    override fun onCreate(savedInstanceState: Bundle?) {
-        super.onCreate(savedInstanceState)
-        enterTransition = MaterialSharedAxis(MaterialSharedAxis.Z, true)
-        returnTransition = MaterialSharedAxis(MaterialSharedAxis.Z, false)
-        exitTransition = MaterialSharedAxis(MaterialSharedAxis.Z, true)
-        reenterTransition = MaterialSharedAxis(MaterialSharedAxis.Z, false)
-    }
-
     override fun getDetailListAdapter() = playlistListAdapter
 
-    override fun onBindingCreated(binding: FragmentDetail2Binding, savedInstanceState: Bundle?) {
+    override fun onBindingCreated(binding: FragmentDetailBinding, savedInstanceState: Bundle?) {
         super.onBindingCreated(binding, savedInstanceState)
 
         editNavigationListener = DialogAwareNavigationListener(detailModel::dropPlaylistEdit)
@@ -114,12 +97,9 @@ class PlaylistDetailFragment :
             setOnMenuItemClickListener(this@PlaylistDetailFragment)
         }
 
-        binding.detailRecycler.apply {
-            adapter = playlistListAdapter
         touchHelper =
             ItemTouchHelper(PlaylistDragCallback(detailModel)).also {
-                    it.attachToRecyclerView(this)
+                it.attachToRecyclerView(binding.detailRecycler)
-                }
             }
 
         // --- VIEWMODEL SETUP ---
@@ -166,7 +146,7 @@ class PlaylistDetailFragment :
             .release(findNavController())
     }
 
-    override fun onDestroyBinding(binding: FragmentDetail2Binding) {
+    override fun onDestroyBinding(binding: FragmentDetailBinding) {
         super.onDestroyBinding(binding)
         binding.detailNormalToolbar.setOnMenuItemClickListener(null)
         touchHelper = null

app/src/main/res/layout-h600dp/item_detail_header.xml

@@ -1,88 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:paddingStart="@dimen/spacing_medium"
-    android:paddingTop="@dimen/spacing_medium"
-    android:paddingEnd="@dimen/spacing_medium"
-    android:paddingBottom="@dimen/spacing_mid_medium">
-
-    <org.oxycblt.auxio.image.CoverView
-        android:id="@+id/detail_cover"
-        style="@style/Widget.Auxio.Image.Huge"
-        app:enablePlaybackIndicator="false"
-        app:enableSelectionBadge="false"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent"
-        tools:ignore="ContentDescription" />
-
-    <TextView
-        android:id="@+id/detail_type"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="@dimen/spacing_medium"
-        android:textAppearance="@style/TextAppearance.Auxio.LabelMedium"
-        android:textColor="?attr/colorSecondary"
-        app:layout_constraintBottom_toTopOf="@+id/detail_name"
-        app:layout_constraintTop_toBottomOf="@+id/detail_cover"
-        tools:layout_editor_absoluteX="16dp"
-        tools:text="Type" />
-
-    <TextView
-        android:id="@+id/detail_name"
-        style="@style/Widget.Auxio.TextView.Detail"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintHorizontal_bias="0.5"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/detail_type"
-        tools:text="Name" />
-
-    <TextView
-        android:id="@+id/detail_subhead"
-        style="@style/Widget.Auxio.TextView.Secondary.Ellipsize"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:textColor="?android:attr/textColorSecondary"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/detail_name"
-        tools:text="Info A" />
-
-    <TextView
-        android:id="@+id/detail_info"
-        style="@style/Widget.Auxio.TextView.Secondary.Ellipsize"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:textColor="?android:attr/textColorSecondary"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/detail_subhead"
-        tools:text="Info B" />
-
-    <org.oxycblt.auxio.ui.RippleFixMaterialButton
-        android:id="@+id/detail_play_button"
-        style="@style/Widget.Auxio.Button.Secondary"
-        android:layout_width="0dp"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="@dimen/spacing_mid_medium"
-        android:layout_marginEnd="@dimen/spacing_small"
-        android:text="@string/lbl_play"
-        app:layout_constraintEnd_toStartOf="@+id/detail_shuffle_button"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/detail_info" />
-
-    <org.oxycblt.auxio.ui.RippleFixMaterialButton
-        android:id="@+id/detail_shuffle_button"
-        style="@style/Widget.Auxio.Button.Primary"
-        android:layout_width="0dp"
-        android:layout_height="wrap_content"
-        android:layout_marginStart="@dimen/spacing_small"
-        android:text="@string/lbl_shuffle"
-        app:layout_constraintBottom_toBottomOf="@+id/detail_play_button"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toEndOf="@+id/detail_play_button"
-        app:layout_constraintTop_toTopOf="@+id/detail_play_button" />
-</androidx.constraintlayout.widget.ConstraintLayout>

app/src/main/res/layout-land/item_detail_header.xml

@@ -1,103 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:paddingStart="@dimen/spacing_medium"
-    android:paddingTop="@dimen/spacing_medium"
-    android:paddingEnd="@dimen/spacing_medium"
-    android:paddingBottom="@dimen/spacing_mid_medium">
-
-    <org.oxycblt.auxio.image.CoverView
-        android:id="@+id/detail_cover"
-        style="@style/Widget.Auxio.Image.Large"
-        app:enablePlaybackIndicator="false"
-        app:enableSelectionBadge="false"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent"
-        tools:ignore="ContentDescription" />
-
-    <TextView
-        android:id="@+id/detail_type"
-        android:layout_width="0dp"
-        android:layout_height="wrap_content"
-        android:layout_marginStart="@dimen/spacing_medium"
-        android:textAppearance="@style/TextAppearance.Auxio.LabelMedium"
-        android:textColor="?attr/colorSecondary"
-        app:layout_constraintBottom_toTopOf="@+id/detail_name"
-        app:layout_constraintStart_toEndOf="@+id/detail_cover"
-        app:layout_constraintTop_toTopOf="@+id/detail_cover"
-        app:layout_constraintVertical_chainStyle="packed"
-        tools:text="Type" />
-
-    <TextView
-        android:id="@+id/detail_name"
-        style="@style/Widget.Auxio.TextView.Detail"
-        android:layout_width="0dp"
-        android:layout_height="wrap_content"
-        android:layout_marginStart="@dimen/spacing_medium"
-        android:ellipsize="end"
-        android:maxLines="1"
-        app:layout_constraintBottom_toTopOf="@+id/detail_subhead"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintHorizontal_bias="0.5"
-        app:layout_constraintStart_toEndOf="@+id/detail_cover"
-        app:layout_constraintTop_toBottomOf="@+id/detail_type"
-        app:layout_constraintVertical_chainStyle="packed"
-        tools:text="Name" />
-
-    <TextView
-        android:id="@+id/detail_subhead"
-        style="@style/Widget.Auxio.TextView.Secondary.Ellipsize"
-        android:layout_width="0dp"
-        android:layout_height="wrap_content"
-        android:layout_marginStart="@dimen/spacing_medium"
-        android:clickable="true"
-        android:focusable="true"
-        android:textColor="?android:attr/textColorSecondary"
-        app:layout_constraintBottom_toTopOf="@+id/detail_info"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toEndOf="@+id/detail_cover"
-        app:layout_constraintTop_toBottomOf="@+id/detail_name"
-        tools:text="Info A" />
-
-    <TextView
-        android:id="@+id/detail_info"
-        style="@style/Widget.Auxio.TextView.Secondary.Ellipsize"
-        android:layout_width="0dp"
-        android:layout_height="wrap_content"
-        android:layout_marginStart="@dimen/spacing_medium"
-        android:textColor="?android:attr/textColorSecondary"
-        app:layout_constraintBottom_toBottomOf="@+id/detail_cover"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toEndOf="@+id/detail_cover"
-        app:layout_constraintTop_toBottomOf="@+id/detail_subhead"
-        tools:text="Info B" />
-
-    <org.oxycblt.auxio.ui.RippleFixMaterialButton
-        android:id="@+id/detail_play_button"
-        style="@style/Widget.Auxio.Button.Secondary"
-        android:layout_width="0dp"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="@dimen/spacing_mid_medium"
-        android:layout_marginEnd="@dimen/spacing_small"
-        android:text="@string/lbl_play"
-        app:layout_constraintEnd_toStartOf="@+id/detail_shuffle_button"
-        app:layout_constraintHorizontal_bias="0.5"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/detail_cover" />
-
-    <org.oxycblt.auxio.ui.RippleFixMaterialButton
-        android:id="@+id/detail_shuffle_button"
-        style="@style/Widget.Auxio.Button.Primary"
-        android:layout_width="0dp"
-        android:layout_height="wrap_content"
-        android:layout_marginStart="@dimen/spacing_small"
-        android:text="@string/lbl_shuffle"
-        app:layout_constraintBottom_toBottomOf="@+id/detail_play_button"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toEndOf="@+id/detail_play_button"
-        app:layout_constraintTop_toTopOf="@+id/detail_play_button" />
-
-</androidx.constraintlayout.widget.ConstraintLayout>

app/src/main/res/layout-sw600dp/fragment_detail.xml

@@ -0,0 +1,203 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:id="@+id/detail_coordinator"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:background="?attr/colorSurface"
+    android:transitionGroup="true">
+
+    <org.oxycblt.auxio.ui.CoordinatorAppBarLayout
+        android:id="@+id/detail_appbar"
+        style="@style/Widget.Auxio.AppBarLayout"
+        app:liftOnScroll="true"
+        app:liftOnScrollTargetViewId="@id/detail_recycler">
+
+        <com.google.android.material.appbar.CollapsingToolbarLayout
+            android:id="@+id/detail_collapsing_toolbar"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            app:layout_scrollFlags="scroll|exitUntilCollapsed|snap"
+            app:titleEnabled="false"
+            app:toolbarId="@+id/detail_toolbar">
+
+            <androidx.constraintlayout.widget.ConstraintLayout
+                android:id="@+id/detail_header"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:layout_gravity="bottom"
+                android:paddingStart="@dimen/spacing_medium"
+                android:paddingTop="86dp"
+                android:paddingEnd="@dimen/spacing_medium"
+                android:paddingBottom="@dimen/spacing_mid_medium"
+                app:layout_collapseMode="parallax"
+                app:layout_collapseParallaxMultiplier="0.85">
+
+                <org.oxycblt.auxio.image.CoverView
+                    android:id="@+id/detail_cover"
+                    style="@style/Widget.Auxio.Image.MidHuge"
+                    app:enablePlaybackIndicator="false"
+                    app:enableSelectionBadge="false"
+                    app:layout_constraintBottom_toBottomOf="parent"
+                    app:layout_constraintStart_toStartOf="parent"
+                    app:layout_constraintTop_toTopOf="parent"
+                    app:layout_constraintVertical_chainStyle="packed"
+                    tools:ignore="ContentDescription" />
+
+                <TextView
+                    android:id="@+id/detail_type"
+                    android:layout_width="0dp"
+                    android:layout_height="wrap_content"
+                    android:layout_marginStart="@dimen/spacing_medium"
+                    android:textAppearance="@style/TextAppearance.Auxio.LabelMedium"
+                    android:textColor="?attr/colorSecondary"
+                    app:layout_constraintBottom_toTopOf="@+id/detail_name"
+                    app:layout_constraintStart_toEndOf="@+id/detail_cover"
+                    app:layout_constraintTop_toTopOf="@+id/detail_cover"
+                    app:layout_constraintVertical_chainStyle="packed"
+                    tools:text="Type" />
+
+                <TextView
+                    android:id="@+id/detail_name"
+                    style="@style/Widget.Auxio.TextView.Detail"
+                    android:layout_width="0dp"
+                    android:layout_height="wrap_content"
+                    android:layout_marginStart="@dimen/spacing_medium"
+                    android:ellipsize="end"
+                    android:maxLines="1"
+                    app:layout_constraintBottom_toTopOf="@+id/detail_subhead"
+                    app:layout_constraintEnd_toEndOf="parent"
+                    app:layout_constraintHorizontal_bias="0.5"
+                    app:layout_constraintStart_toEndOf="@+id/detail_cover"
+                    app:layout_constraintTop_toBottomOf="@+id/detail_type"
+                    tools:text="Name" />
+
+                <TextView
+                    android:id="@+id/detail_subhead"
+                    style="@style/Widget.Auxio.TextView.Secondary.Ellipsize"
+                    android:layout_width="0dp"
+                    android:layout_height="wrap_content"
+                    android:layout_marginStart="@dimen/spacing_medium"
+                    android:clickable="true"
+                    android:focusable="true"
+                    android:textColor="?android:attr/textColorSecondary"
+                    app:layout_constraintBottom_toTopOf="@+id/detail_info"
+                    app:layout_constraintEnd_toEndOf="parent"
+                    app:layout_constraintStart_toEndOf="@+id/detail_cover"
+                    app:layout_constraintTop_toBottomOf="@+id/detail_name"
+                    tools:text="Info A" />
+
+                <TextView
+                    android:id="@+id/detail_info"
+                    style="@style/Widget.Auxio.TextView.Secondary.Base"
+                    android:layout_width="0dp"
+                    android:layout_height="wrap_content"
+                    android:layout_marginStart="@dimen/spacing_medium"
+                    android:textColor="?android:attr/textColorSecondary"
+                    app:layout_constraintBottom_toTopOf="@+id/detail_play_button"
+                    app:layout_constraintEnd_toEndOf="parent"
+                    app:layout_constraintStart_toEndOf="@+id/detail_cover"
+                    app:layout_constraintTop_toBottomOf="@+id/detail_subhead"
+                    tools:text="Info B" />
+
+                <org.oxycblt.auxio.ui.RippleFixMaterialButton
+                    android:id="@+id/detail_play_button"
+                    style="@style/Widget.Auxio.Button.Secondary"
+                    android:layout_width="0dp"
+                    android:layout_height="wrap_content"
+                    android:layout_marginStart="@dimen/spacing_medium"
+                    android:layout_marginEnd="@dimen/spacing_small"
+                    android:text="@string/lbl_play"
+                    app:layout_constraintBottom_toBottomOf="@+id/detail_cover"
+                    app:layout_constraintEnd_toStartOf="@+id/detail_shuffle_button"
+                    app:layout_constraintHorizontal_bias="0.5"
+                    app:layout_constraintStart_toEndOf="@+id/detail_cover"
+                    app:layout_constraintTop_toBottomOf="@+id/detail_info" />
+
+                <org.oxycblt.auxio.ui.RippleFixMaterialButton
+                    android:id="@+id/detail_shuffle_button"
+                    style="@style/Widget.Auxio.Button.Primary"
+                    android:layout_width="0dp"
+                    android:layout_height="wrap_content"
+                    android:layout_marginStart="@dimen/spacing_small"
+                    android:text="@string/lbl_shuffle"
+                    app:layout_constraintBottom_toBottomOf="@+id/detail_play_button"
+                    app:layout_constraintEnd_toEndOf="parent"
+                    app:layout_constraintStart_toEndOf="@+id/detail_play_button"
+                    app:layout_constraintTop_toTopOf="@+id/detail_play_button" />
+            </androidx.constraintlayout.widget.ConstraintLayout>
+
+            <com.google.android.material.divider.MaterialDivider
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_gravity="bottom"
+                app:layout_collapseMode="pin" />
+
+            <org.oxycblt.auxio.ui.MultiToolbar
+                android:id="@+id/detail_toolbar"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                app:layout_collapseMode="pin">
+
+                <com.google.android.material.appbar.MaterialToolbar
+                    android:id="@+id/detail_normal_toolbar"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:clickable="true"
+                    android:focusable="true"
+                    app:menu="@menu/toolbar_detail"
+                    app:navigationIcon="@drawable/ic_back_24">
+
+
+                    <LinearLayout
+                        android:id="@+id/detail_toolbar_content"
+                        android:layout_width="match_parent"
+                        android:layout_height="match_parent">
+
+                        <TextView
+                            android:id="@+id/detail_toolbar_title"
+                            android:layout_width="match_parent"
+                            android:layout_height="wrap_content"
+                            android:layout_marginStart="@dimen/spacing_tiny"
+                            android:textAppearance="@style/TextAppearance.Auxio.TitleLarge"
+                            android:textColor="?attr/colorOnSurface"
+                            tools:text="Name" />
+
+                    </LinearLayout>
+
+                </com.google.android.material.appbar.MaterialToolbar>
+
+                <com.google.android.material.appbar.MaterialToolbar
+                    android:id="@+id/detail_selection_toolbar"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:clickable="true"
+                    android:focusable="true"
+                    app:menu="@menu/toolbar_selection"
+                    app:navigationIcon="@drawable/ic_close_24" />
+
+                <com.google.android.material.appbar.MaterialToolbar
+                    android:id="@+id/detail_edit_toolbar"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:clickable="true"
+                    android:focusable="true"
+                    app:menu="@menu/toolbar_edit"
+                    app:navigationIcon="@drawable/ic_close_24" />
+
+            </org.oxycblt.auxio.ui.MultiToolbar>
+
+        </com.google.android.material.appbar.CollapsingToolbarLayout>
+
+    </org.oxycblt.auxio.ui.CoordinatorAppBarLayout>
+
+    <org.oxycblt.auxio.list.recycler.AuxioRecyclerView
+        android:id="@+id/detail_recycler"
+        style="@style/Widget.Auxio.RecyclerView.Grid"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        app:layout_behavior="com.google.android.material.appbar.AppBarLayout$ScrollingViewBehavior"
+        tools:listitem="@layout/item_song" />
+
+</androidx.coordinatorlayout.widget.CoordinatorLayout>

app/src/main/res/layout-sw600dp/item_detail_header.xml

@@ -1,105 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:padding="@dimen/spacing_medium">
-
-    <org.oxycblt.auxio.image.CoverView
-        android:id="@+id/detail_cover"
-        style="@style/Widget.Auxio.Image.MidHuge"
-        app:enablePlaybackIndicator="false"
-        app:enableSelectionBadge="false"
-        app:layout_constraintDimensionRatio="1"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent"
-        tools:ignore="ContentDescription" />
-
-    <TextView
-        android:id="@+id/detail_type"
-        android:layout_width="0dp"
-        android:layout_height="wrap_content"
-        android:layout_marginStart="@dimen/spacing_medium"
-        android:textAppearance="@style/TextAppearance.Auxio.LabelMedium"
-        android:textColor="?attr/colorSecondary"
-        app:layout_constraintBottom_toTopOf="@+id/detail_name"
-        app:layout_constraintStart_toEndOf="@+id/detail_cover"
-        app:layout_constraintTop_toTopOf="@+id/detail_cover"
-        app:layout_constraintVertical_chainStyle="packed"
-        tools:text="Type" />
-
-    <TextView
-        android:id="@+id/detail_name"
-        style="@style/Widget.Auxio.TextView.Detail"
-        android:layout_width="0dp"
-        android:layout_height="wrap_content"
-        android:layout_marginStart="@dimen/spacing_medium"
-        android:ellipsize="end"
-        android:maxLines="1"
-        app:layout_constraintBottom_toTopOf="@+id/detail_subhead"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintHorizontal_bias="0.5"
-        app:layout_constraintStart_toEndOf="@+id/detail_cover"
-        app:layout_constraintTop_toBottomOf="@+id/detail_type"
-        app:layout_constraintVertical_chainStyle="packed"
-        tools:text="Name" />
-
-    <TextView
-        android:id="@+id/detail_subhead"
-        style="@style/Widget.Auxio.TextView.Secondary.Ellipsize"
-        android:layout_width="0dp"
-        android:layout_height="wrap_content"
-        android:layout_marginStart="@dimen/spacing_medium"
-        android:clickable="true"
-        android:focusable="true"
-        app:layout_constraintBottom_toTopOf="@+id/detail_info"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintHorizontal_bias="0.0"
-        app:layout_constraintStart_toEndOf="@+id/detail_cover"
-        app:layout_constraintTop_toBottomOf="@+id/detail_name"
-        tools:text="Info A" />
-
-    <TextView
-        android:id="@+id/detail_info"
-        style="@style/Widget.Auxio.TextView.Secondary.Ellipsize"
-        android:layout_width="0dp"
-        android:layout_height="wrap_content"
-        android:layout_marginStart="@dimen/spacing_medium"
-        app:layout_constraintBottom_toTopOf="@+id/detail_play_button"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toEndOf="@+id/detail_cover"
-        app:layout_constraintTop_toBottomOf="@+id/detail_subhead"
-        tools:text="Info B" />
-
-
-    <org.oxycblt.auxio.ui.RippleFixMaterialButton
-        android:id="@+id/detail_play_button"
-        style="@style/Widget.Auxio.Button.Secondary"
-        android:layout_width="0dp"
-        android:layout_height="wrap_content"
-        android:layout_marginStart="@dimen/spacing_medium"
-        android:layout_marginTop="@dimen/spacing_mid_medium"
-        android:layout_marginEnd="@dimen/spacing_small"
-        android:text="@string/lbl_play"
-        app:layout_constraintBottom_toBottomOf="@+id/detail_cover"
-        app:layout_constraintEnd_toStartOf="@+id/detail_shuffle_button"
-        app:layout_constraintHorizontal_bias="0.5"
-        app:layout_constraintStart_toEndOf="@+id/detail_cover"
-        app:layout_constraintTop_toBottomOf="@+id/detail_info" />
-
-    <org.oxycblt.auxio.ui.RippleFixMaterialButton
-        android:id="@+id/detail_shuffle_button"
-        style="@style/Widget.Auxio.Button.Primary"
-        android:layout_width="0dp"
-        android:layout_height="wrap_content"
-        android:layout_marginStart="@dimen/spacing_small"
-        android:text="@string/lbl_shuffle"
-        app:layout_constraintBottom_toBottomOf="@+id/detail_play_button"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toEndOf="@+id/detail_play_button"
-        app:layout_constraintTop_toTopOf="@+id/detail_play_button" />
-
-
-</androidx.constraintlayout.widget.ConstraintLayout>

app/src/main/res/layout-sw840dp/item_detail_header.xml

@@ -1,100 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:padding="@dimen/spacing_medium">
-
-    <org.oxycblt.auxio.image.CoverView
-        android:id="@+id/detail_cover"
-        style="@style/Widget.Auxio.Image.Huge"
-        app:enablePlaybackIndicator="false"
-        app:enableSelectionBadge="false"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent"
-        tools:ignore="ContentDescription" />
-
-    <TextView
-        android:id="@+id/detail_type"
-        android:layout_width="0dp"
-        android:layout_height="wrap_content"
-        android:layout_marginStart="@dimen/spacing_medium"
-        android:textAppearance="@style/TextAppearance.Auxio.LabelMedium"
-        android:textColor="?attr/colorSecondary"
-        app:layout_constraintBottom_toTopOf="@+id/detail_name"
-        app:layout_constraintStart_toEndOf="@+id/detail_cover"
-        app:layout_constraintTop_toTopOf="@+id/detail_cover"
-        app:layout_constraintVertical_chainStyle="packed"
-        tools:text="Type" />
-
-    <TextView
-        android:id="@+id/detail_name"
-        style="@style/Widget.Auxio.TextView.Detail"
-        android:layout_width="0dp"
-        android:layout_height="wrap_content"
-        android:layout_marginStart="@dimen/spacing_medium"
-        android:ellipsize="end"
-        android:maxLines="1"
-        app:layout_constraintBottom_toTopOf="@+id/detail_subhead"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintHorizontal_bias="0.5"
-        app:layout_constraintStart_toEndOf="@+id/detail_cover"
-        app:layout_constraintTop_toBottomOf="@+id/detail_type"
-        app:layout_constraintVertical_chainStyle="packed"
-        tools:text="Name" />
-
-    <TextView
-        android:id="@+id/detail_subhead"
-        style="@style/Widget.Auxio.TextView.Secondary.Ellipsize"
-        android:layout_width="0dp"
-        android:layout_height="wrap_content"
-        android:layout_marginStart="@dimen/spacing_medium"
-        android:clickable="true"
-        android:focusable="true"
-        app:layout_constraintBottom_toTopOf="@+id/detail_info"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toEndOf="@+id/detail_cover"
-        app:layout_constraintTop_toBottomOf="@+id/detail_name"
-        tools:text="Info A" />
-
-    <TextView
-        android:id="@+id/detail_info"
-        style="@style/Widget.Auxio.TextView.Secondary.Ellipsize"
-        android:layout_width="0dp"
-        android:layout_height="wrap_content"
-        android:layout_marginStart="@dimen/spacing_medium"
-        app:layout_constraintBottom_toTopOf="@+id/detail_play_button"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toEndOf="@+id/detail_cover"
-        app:layout_constraintTop_toBottomOf="@+id/detail_subhead"
-        tools:text="Info B" />
-
-    <org.oxycblt.auxio.ui.RippleFixMaterialButton
-        android:id="@+id/detail_play_button"
-        style="@style/Widget.Auxio.Button.Secondary"
-        android:layout_width="0dp"
-        android:layout_height="wrap_content"
-        android:layout_marginStart="@dimen/spacing_medium"
-        android:layout_marginTop="@dimen/spacing_mid_medium"
-        android:layout_marginEnd="@dimen/spacing_small"
-        android:text="@string/lbl_play"
-        app:layout_constraintBottom_toBottomOf="@+id/detail_cover"
-        app:layout_constraintEnd_toStartOf="@+id/detail_shuffle_button"
-        app:layout_constraintHorizontal_bias="0.5"
-        app:layout_constraintStart_toEndOf="@+id/detail_cover"
-        app:layout_constraintTop_toBottomOf="@+id/detail_info" />
-
-    <org.oxycblt.auxio.ui.RippleFixMaterialButton
-        android:id="@+id/detail_shuffle_button"
-        style="@style/Widget.Auxio.Button.Primary"
-        android:layout_width="0dp"
-        android:layout_height="wrap_content"
-        android:layout_marginStart="@dimen/spacing_small"
-        android:text="@string/lbl_shuffle"
-        app:layout_constraintBottom_toBottomOf="@+id/detail_play_button"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toEndOf="@+id/detail_play_button"
-        app:layout_constraintTop_toTopOf="@+id/detail_play_button" />
-
-</androidx.constraintlayout.widget.ConstraintLayout>

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

@@ -2,21 +2,127 @@
 <androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
+    android:id="@+id/detail_coordinator"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:background="?attr/colorSurface"
     android:transitionGroup="true">
 
-    <org.oxycblt.auxio.detail.DetailAppBarLayout
+    <org.oxycblt.auxio.ui.CoordinatorAppBarLayout
         android:id="@+id/detail_appbar"
         style="@style/Widget.Auxio.AppBarLayout"
         app:liftOnScroll="true"
         app:liftOnScrollTargetViewId="@id/detail_recycler">
 
+        <com.google.android.material.appbar.CollapsingToolbarLayout
+            android:id="@+id/detail_collapsing_toolbar"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            app:layout_scrollFlags="scroll|exitUntilCollapsed|snap"
+            app:titleEnabled="false"
+            app:toolbarId="@+id/detail_toolbar">
+
+            <androidx.constraintlayout.widget.ConstraintLayout
+                android:id="@+id/detail_header"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:paddingStart="@dimen/spacing_medium"
+                android:paddingTop="86dp"
+                android:paddingEnd="@dimen/spacing_medium"
+                android:paddingBottom="@dimen/spacing_mid_medium"
+                app:layout_collapseMode="parallax"
+                android:layout_gravity="bottom"
+                app:layout_collapseParallaxMultiplier="0.85">
+
+                <org.oxycblt.auxio.image.CoverView
+                    android:id="@+id/detail_cover"
+                    style="@style/Widget.Auxio.Image.MidHuge"
+                    app:enablePlaybackIndicator="false"
+                    app:enableSelectionBadge="false"
+                    app:layout_constraintEnd_toEndOf="parent"
+                    app:layout_constraintStart_toStartOf="parent"
+                    app:layout_constraintTop_toTopOf="parent"
+                    tools:ignore="ContentDescription" />
+
+                <TextView
+                    android:id="@+id/detail_type"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_marginTop="@dimen/spacing_medium"
+                    android:textAppearance="@style/TextAppearance.Auxio.LabelMedium"
+                    android:textColor="?attr/colorSecondary"
+                    app:layout_constraintBottom_toTopOf="@+id/detail_name"
+                    app:layout_constraintTop_toBottomOf="@+id/detail_cover"
+                    tools:layout_editor_absoluteX="16dp"
+                    tools:text="Type" />
+
+                <TextView
+                    android:id="@+id/detail_name"
+                    style="@style/Widget.Auxio.TextView.Detail"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    app:layout_constraintEnd_toEndOf="parent"
+                    app:layout_constraintHorizontal_bias="0.5"
+                    app:layout_constraintStart_toStartOf="parent"
+                    app:layout_constraintTop_toBottomOf="@+id/detail_type"
+                    tools:text="Name" />
+
+                <TextView
+                    android:id="@+id/detail_subhead"
+                    style="@style/Widget.Auxio.TextView.Secondary.Ellipsize"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:textColor="?android:attr/textColorSecondary"
+                    app:layout_constraintStart_toStartOf="parent"
+                    app:layout_constraintTop_toBottomOf="@+id/detail_name"
+                    tools:text="Info A" />
+
+                <TextView
+                    android:id="@+id/detail_info"
+                    style="@style/Widget.Auxio.TextView.Secondary.Ellipsize"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:textColor="?android:attr/textColorSecondary"
+                    app:layout_constraintStart_toStartOf="parent"
+                    app:layout_constraintTop_toBottomOf="@+id/detail_subhead"
+                    tools:text="Info B" />
+
+                <org.oxycblt.auxio.ui.RippleFixMaterialButton
+                    android:id="@+id/detail_play_button"
+                    style="@style/Widget.Auxio.Button.Secondary"
+                    android:layout_width="0dp"
+                    android:layout_height="wrap_content"
+                    android:layout_marginTop="@dimen/spacing_mid_medium"
+                    android:layout_marginEnd="@dimen/spacing_small"
+                    android:text="@string/lbl_play"
+                    app:layout_constraintEnd_toStartOf="@+id/detail_shuffle_button"
+                    app:layout_constraintStart_toStartOf="parent"
+                    app:layout_constraintTop_toBottomOf="@+id/detail_info" />
+
+                <org.oxycblt.auxio.ui.RippleFixMaterialButton
+                    android:id="@+id/detail_shuffle_button"
+                    style="@style/Widget.Auxio.Button.Primary"
+                    android:layout_width="0dp"
+                    android:layout_height="wrap_content"
+                    android:layout_marginStart="@dimen/spacing_small"
+                    android:text="@string/lbl_shuffle"
+                    app:layout_constraintBottom_toBottomOf="@+id/detail_play_button"
+                    app:layout_constraintEnd_toEndOf="parent"
+                    app:layout_constraintStart_toEndOf="@+id/detail_play_button"
+                    app:layout_constraintTop_toTopOf="@+id/detail_play_button" />
+            </androidx.constraintlayout.widget.ConstraintLayout>
+
+            <com.google.android.material.divider.MaterialDivider
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_gravity="bottom"
+                app:layout_collapseMode="pin" />
+
             <org.oxycblt.auxio.ui.MultiToolbar
                 android:id="@+id/detail_toolbar"
                 android:layout_width="match_parent"
-            android:layout_height="wrap_content">
+                android:layout_height="wrap_content"
+                app:layout_collapseMode="pin" >
 
                 <com.google.android.material.appbar.MaterialToolbar
                     android:id="@+id/detail_normal_toolbar"
@@ -25,7 +131,26 @@
                     android:clickable="true"
                     android:focusable="true"
                     app:menu="@menu/toolbar_detail"
-                app:navigationIcon="@drawable/ic_back_24" />
+                    app:navigationIcon="@drawable/ic_back_24">
+
+
+                    <LinearLayout
+                        android:id="@+id/detail_toolbar_content"
+                        android:layout_width="match_parent"
+                        android:layout_height="match_parent">
+
+                        <TextView
+                            android:id="@+id/detail_toolbar_title"
+                            android:layout_width="match_parent"
+                            android:layout_height="wrap_content"
+                            android:layout_marginStart="@dimen/spacing_tiny"
+                            android:textAppearance="@style/TextAppearance.Auxio.TitleLarge"
+                            android:textColor="?attr/colorOnSurface"
+                            tools:text="Name" />
+
+                    </LinearLayout>
+
+                </com.google.android.material.appbar.MaterialToolbar>
 
                 <com.google.android.material.appbar.MaterialToolbar
                     android:id="@+id/detail_selection_toolbar"
@@ -47,7 +172,9 @@
 
             </org.oxycblt.auxio.ui.MultiToolbar>
 
-    </org.oxycblt.auxio.detail.DetailAppBarLayout>
+        </com.google.android.material.appbar.CollapsingToolbarLayout>
+
+    </org.oxycblt.auxio.ui.CoordinatorAppBarLayout>
 
     <org.oxycblt.auxio.list.recycler.AuxioRecyclerView
         android:id="@+id/detail_recycler"
@@ -55,6 +182,6 @@
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         app:layout_behavior="com.google.android.material.appbar.AppBarLayout$ScrollingViewBehavior"
-        tools:listitem="@layout/item_detail_header" />
+        tools:listitem="@layout/item_song" />
 
 </androidx.coordinatorlayout.widget.CoordinatorLayout>

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

@@ -1,90 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:paddingStart="@dimen/spacing_medium"
-    android:paddingTop="@dimen/spacing_medium"
-    android:paddingEnd="@dimen/spacing_medium"
-    android:paddingBottom="@dimen/spacing_mid_medium">
-
-    <org.oxycblt.auxio.image.CoverView
-        android:id="@+id/detail_cover"
-        style="@style/Widget.Auxio.Image.MidHuge"
-        app:enablePlaybackIndicator="false"
-        app:enableSelectionBadge="false"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent"
-        tools:ignore="ContentDescription" />
-
-    <TextView
-        android:id="@+id/detail_type"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="@dimen/spacing_medium"
-        android:textAppearance="@style/TextAppearance.Auxio.LabelMedium"
-        android:textColor="?attr/colorSecondary"
-        app:layout_constraintBottom_toTopOf="@+id/detail_name"
-        app:layout_constraintTop_toBottomOf="@+id/detail_cover"
-        tools:layout_editor_absoluteX="16dp"
-        tools:text="Type" />
-
-    <TextView
-        android:id="@+id/detail_name"
-        style="@style/Widget.Auxio.TextView.Detail"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintHorizontal_bias="0.5"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/detail_type"
-        tools:text="Name" />
-
-    <TextView
-        android:id="@+id/detail_subhead"
-        style="@style/Widget.Auxio.TextView.Secondary.Ellipsize"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:textColor="?android:attr/textColorSecondary"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/detail_name"
-        tools:text="Info A" />
-
-    <TextView
-        android:id="@+id/detail_info"
-        style="@style/Widget.Auxio.TextView.Secondary.Ellipsize"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:textColor="?android:attr/textColorSecondary"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/detail_subhead"
-        tools:text="Info B" />
-
-
-    <org.oxycblt.auxio.ui.RippleFixMaterialButton
-        android:id="@+id/detail_play_button"
-        style="@style/Widget.Auxio.Button.Secondary"
-        android:layout_width="0dp"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="@dimen/spacing_mid_medium"
-        android:layout_marginEnd="@dimen/spacing_small"
-        android:text="@string/lbl_play"
-        app:layout_constraintEnd_toStartOf="@+id/detail_shuffle_button"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/detail_info" />
-
-    <org.oxycblt.auxio.ui.RippleFixMaterialButton
-        android:id="@+id/detail_shuffle_button"
-        style="@style/Widget.Auxio.Button.Primary"
-        android:layout_width="0dp"
-        android:layout_height="wrap_content"
-        android:layout_marginStart="@dimen/spacing_small"
-        android:text="@string/lbl_shuffle"
-        app:layout_constraintBottom_toBottomOf="@+id/detail_play_button"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toEndOf="@+id/detail_play_button"
-        app:layout_constraintTop_toTopOf="@+id/detail_play_button" />
-</androidx.constraintlayout.widget.ConstraintLayout>