Add landscape support to detail fragments

Add a landscape layout for AlbumDetailFragment, ArtistDetailFragment, and GenreDetailFragment.

app/src/main/java/org/oxycblt/auxio/MainActivity.kt

@@ -18,7 +18,6 @@ import org.oxycblt.auxio.ui.toColor
 
 // FIXME: Fix bug where fast navigation will break the animations and
 //  lead to nothing being displayed [Possibly Un-fixable]
-// TODO: Landscape UI layouts
 // FIXME: Compat issue with Versions 5 that leads to progress bar looking off
 class MainActivity : AppCompatActivity() {
     override fun onCreate(savedInstanceState: Bundle?) {

app/src/main/java/org/oxycblt/auxio/MainFragment.kt

@@ -67,8 +67,6 @@ class MainFragment : Fragment() {
 
         binding.lifecycleOwner = this
 
-        handleCompactPlaybackVisibility(binding, playbackModel.song.value)
-
         binding.navBar.itemIconTintList = navTints
         binding.navBar.itemTextColor = navTints
 
@@ -81,9 +79,13 @@ class MainFragment : Fragment() {
         // --- VIEWMODEL SETUP ---
 
         // Change CompactPlaybackFragment's visibility here so that an animation occurs.
+        if (!isLandscape(resources)) {
+            handleCompactPlaybackVisibility(binding, playbackModel.song.value)
+
             playbackModel.song.observe(viewLifecycleOwner) {
                 handleCompactPlaybackVisibility(binding, it)
             }
+        }
 
         playbackModel.navToItem.observe(viewLifecycleOwner) {
             if (it != null) {
@@ -156,11 +158,7 @@ class MainFragment : Fragment() {
         if (song == null) {
             logD("Hiding CompactPlaybackFragment since no song is being played.")
 
-            // Dont hide if the mode is landscape.
-            if (!isLandscape(resources)) {
             binding.compactPlayback.visibility = View.GONE
-            }
-
             playbackModel.disableAnimation()
         } else {
             binding.compactPlayback.visibility = View.VISIBLE

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

@@ -8,6 +8,7 @@ import androidx.appcompat.widget.PopupMenu
 import androidx.fragment.app.activityViewModels
 import androidx.navigation.fragment.findNavController
 import androidx.navigation.fragment.navArgs
+import androidx.recyclerview.widget.GridLayoutManager
 import org.oxycblt.auxio.R
 import org.oxycblt.auxio.databinding.FragmentAlbumDetailBinding
 import org.oxycblt.auxio.detail.adapters.AlbumSongAdapter
@@ -19,6 +20,7 @@ import org.oxycblt.auxio.playback.PlaybackViewModel
 import org.oxycblt.auxio.playback.state.PlaybackMode
 import org.oxycblt.auxio.ui.createToast
 import org.oxycblt.auxio.ui.disable
+import org.oxycblt.auxio.ui.isLandscape
 import org.oxycblt.auxio.ui.setupAlbumSongActions
 
 /**

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

@@ -8,6 +8,7 @@ import androidx.appcompat.widget.PopupMenu
 import androidx.fragment.app.activityViewModels
 import androidx.navigation.fragment.findNavController
 import androidx.navigation.fragment.navArgs
+import androidx.recyclerview.widget.GridLayoutManager
 import org.oxycblt.auxio.R
 import org.oxycblt.auxio.databinding.FragmentArtistDetailBinding
 import org.oxycblt.auxio.detail.adapters.ArtistAlbumAdapter
@@ -16,6 +17,7 @@ import org.oxycblt.auxio.music.Artist
 import org.oxycblt.auxio.music.MusicStore
 import org.oxycblt.auxio.playback.PlaybackViewModel
 import org.oxycblt.auxio.ui.disable
+import org.oxycblt.auxio.ui.isLandscape
 import org.oxycblt.auxio.ui.setupAlbumActions
 
 /**

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

@@ -8,6 +8,7 @@ import androidx.appcompat.widget.PopupMenu
 import androidx.fragment.app.activityViewModels
 import androidx.navigation.fragment.findNavController
 import androidx.navigation.fragment.navArgs
+import androidx.recyclerview.widget.GridLayoutManager
 import org.oxycblt.auxio.R
 import org.oxycblt.auxio.databinding.FragmentGenreDetailBinding
 import org.oxycblt.auxio.detail.adapters.GenreArtistAdapter
@@ -15,6 +16,7 @@ import org.oxycblt.auxio.logD
 import org.oxycblt.auxio.music.MusicStore
 import org.oxycblt.auxio.playback.PlaybackViewModel
 import org.oxycblt.auxio.ui.disable
+import org.oxycblt.auxio.ui.isLandscape
 import org.oxycblt.auxio.ui.setupArtistActions
 
 /**

app/src/main/java/org/oxycblt/auxio/playback/CompactPlaybackFragment.kt

@@ -15,6 +15,7 @@ import org.oxycblt.auxio.R
 import org.oxycblt.auxio.databinding.FragmentCompactPlaybackBinding
 import org.oxycblt.auxio.logD
 import org.oxycblt.auxio.music.MusicStore
+import org.oxycblt.auxio.ui.isLandscape
 
 /**
  * A [Fragment] that displays the currently played song at a glance, with some basic controls.
@@ -33,6 +34,8 @@ class CompactPlaybackFragment : Fragment() {
     ): View {
         val binding = FragmentCompactPlaybackBinding.inflate(inflater)
 
+        val isLandscape = isLandscape(resources)
+
         // --- UI SETUP ---
 
         binding.lifecycleOwner = viewLifecycleOwner
@@ -41,7 +44,7 @@ class CompactPlaybackFragment : Fragment() {
         binding.song = MusicStore.getInstance().songs[0]
         binding.playbackModel = playbackModel
 
-        if (playbackModel.song.value == null) {
+        if (playbackModel.song.value == null && isLandscape) {
             hideAll(binding)
         }
 
@@ -64,11 +67,13 @@ class CompactPlaybackFragment : Fragment() {
             if (it != null) {
                 logD("Updating song display to ${it.name}")
 
-                showAll(binding)
-
                 binding.song = it
                 binding.playbackProgress.max = it.seconds.toInt()
-            } else {
+
+                if (isLandscape) {
+                    showAll(binding)
+                }
+            } else if (isLandscape) {
                 hideAll(binding)
             }
         }

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

@@ -0,0 +1,139 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layout 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"
+    tools:context=".detail.AlbumDetailFragment">
+
+    <data>
+
+        <variable
+            name="detailModel"
+            type="org.oxycblt.auxio.detail.DetailViewModel" />
+
+        <variable
+            name="playbackModel"
+            type="org.oxycblt.auxio.playback.PlaybackViewModel" />
+
+        <variable
+            name="album"
+            type="org.oxycblt.auxio.music.Album" />
+    </data>
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:orientation="vertical">
+
+        <androidx.appcompat.widget.Toolbar
+            android:id="@+id/album_toolbar"
+            style="@style/Toolbar.Style.Icon"
+            android:background="?android:attr/windowBackground"
+            android:elevation="@dimen/elevation_normal"
+            app:menu="@menu/menu_album_actions"
+            app:title="@string/label_library" />
+
+        <androidx.core.widget.NestedScrollView
+            android:id="@+id/nested_scroll"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent">
+
+            <androidx.constraintlayout.widget.ConstraintLayout
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:animateLayoutChanges="true">
+
+                <ImageView
+                    android:id="@+id/album_cover"
+                    android:layout_width="@dimen/size_cover_mid_huge"
+                    android:layout_height="@dimen/size_cover_mid_huge"
+                    android:layout_marginStart="@dimen/margin_medium"
+                    android:layout_marginTop="@dimen/margin_medium"
+                    android:contentDescription="@{@string/description_album_cover(album.name)}"
+                    app:coverArt="@{album}"
+                    app:layout_constraintStart_toStartOf="parent"
+                    app:layout_constraintTop_toTopOf="parent"
+                    tools:src="@drawable/ic_album" />
+
+                <androidx.appcompat.widget.AppCompatTextView
+                    android:id="@+id/album_name"
+                    style="@style/DetailTitleText"
+                    android:layout_width="0dp"
+                    android:layout_height="wrap_content"
+                    android:layout_marginStart="@dimen/margin_medium"
+                    android:layout_marginEnd="@dimen/margin_medium"
+                    android:text="@{album.name}"
+                    app:layout_constraintBottom_toTopOf="@+id/album_artist"
+                    app:layout_constraintEnd_toEndOf="parent"
+                    app:layout_constraintHorizontal_bias="0.5"
+                    app:layout_constraintStart_toEndOf="@+id/album_cover"
+                    app:layout_constraintTop_toTopOf="parent"
+                    app:layout_constraintVertical_chainStyle="packed"
+                    tools:text="Album Name" />
+
+                <TextView
+                    android:id="@+id/album_artist"
+                    android:layout_width="0dp"
+                    android:layout_height="wrap_content"
+                    android:layout_marginStart="@dimen/margin_medium"
+                    android:background="@drawable/ui_ripple"
+                    android:clickable="true"
+                    android:focusable="true"
+                    android:onClick="@{() -> detailModel.doNavToParent()}"
+                    android:text="@{album.artist.name}"
+                    android:textAppearance="?android:attr/textAppearanceListItem"
+                    android:textColor="?android:attr/textColorSecondary"
+                    app:layout_constraintBottom_toTopOf="@+id/album_details"
+                    app:layout_constraintStart_toEndOf="@+id/album_cover"
+                    app:layout_constraintTop_toBottomOf="@+id/album_name"
+                    tools:text="Artist Name" />
+
+                <TextView
+                    android:id="@+id/album_details"
+                    android:layout_width="0dp"
+                    android:layout_height="wrap_content"
+                    android:layout_marginStart="@dimen/margin_medium"
+                    android:textAppearance="?android:attr/textAppearanceListItem"
+                    android:textColor="?android:attr/textColorSecondary"
+                    app:albumDetails="@{album}"
+                    app:layout_constraintBottom_toTopOf="@+id/album_song_header"
+                    app:layout_constraintStart_toEndOf="@+id/album_cover"
+                    app:layout_constraintTop_toBottomOf="@+id/album_artist"
+                    tools:text="2020 / 10 Songs / 16:16" />
+
+                <TextView
+                    android:id="@+id/album_song_header"
+                    style="@style/HeaderText"
+                    android:layout_marginTop="@dimen/margin_medium"
+                    android:text="@string/label_songs"
+                    app:layout_constraintStart_toStartOf="parent"
+                    app:layout_constraintTop_toBottomOf="@+id/album_cover" />
+
+                <ImageButton
+                    android:id="@+id/album_sort_button"
+                    style="@style/HeaderAction"
+                    android:contentDescription="@string/description_sort_button"
+                    android:onClick="@{() -> detailModel.incrementAlbumSortMode()}"
+                    app:layout_constraintBottom_toBottomOf="@+id/album_song_header"
+                    app:layout_constraintEnd_toEndOf="parent"
+                    app:layout_constraintTop_toTopOf="@+id/album_song_header"
+                    tools:src="@drawable/ic_sort_numeric_down" />
+
+                <androidx.recyclerview.widget.RecyclerView
+                    android:id="@+id/album_song_recycler"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_weight="1"
+                    android:nestedScrollingEnabled="false"
+                    android:overScrollMode="never"
+                    app:layoutManager="androidx.recyclerview.widget.GridLayoutManager"
+                    app:spanCount="2"
+                    app:layout_constraintBottom_toBottomOf="parent"
+                    app:layout_constraintStart_toStartOf="parent"
+                    app:layout_constraintTop_toBottomOf="@+id/album_song_header"
+                    tools:itemCount="4"
+                    tools:listitem="@layout/item_album_song" />
+
+            </androidx.constraintlayout.widget.ConstraintLayout>
+        </androidx.core.widget.NestedScrollView>
+    </LinearLayout>
+</layout>

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

@@ -0,0 +1,133 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layout 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"
+    tools:context=".detail.ArtistDetailFragment">
+
+    <data>
+
+        <variable
+            name="artist"
+            type="org.oxycblt.auxio.music.Artist" />
+
+        <variable
+            name="detailModel"
+            type="org.oxycblt.auxio.detail.DetailViewModel" />
+
+        <variable
+            name="playbackModel"
+            type="org.oxycblt.auxio.playback.PlaybackViewModel" />
+    </data>
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:orientation="vertical">
+
+        <androidx.appcompat.widget.Toolbar
+            android:id="@+id/artist_toolbar"
+            style="@style/Toolbar.Style.Icon"
+            android:background="?android:attr/windowBackground"
+            android:elevation="@dimen/elevation_normal"
+            app:menu="@menu/menu_detail"
+            app:title="@string/label_library" />
+
+        <androidx.core.widget.NestedScrollView
+            android:layout_width="match_parent"
+            android:layout_height="match_parent">
+
+            <androidx.constraintlayout.widget.ConstraintLayout
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:animateLayoutChanges="true">
+
+                <ImageView
+                    android:id="@+id/artist_image"
+                    android:layout_width="@dimen/size_cover_mid_huge"
+                    android:layout_height="@dimen/size_cover_mid_huge"
+                    android:layout_margin="@dimen/margin_medium"
+                    android:contentDescription="@{@string/description_artist_image(artist.name)}"
+                    app:artistImage="@{artist}"
+                    app:layout_constraintStart_toStartOf="parent"
+                    app:layout_constraintTop_toTopOf="parent"
+                    tools:src="@drawable/ic_artist" />
+
+                <androidx.appcompat.widget.AppCompatTextView
+                    android:id="@+id/artist_name"
+                    style="@style/DetailTitleText"
+                    android:layout_width="0dp"
+                    android:layout_height="wrap_content"
+                    android:layout_marginStart="@dimen/margin_medium"
+                    android:layout_marginEnd="@dimen/margin_medium"
+                    android:text="@{artist.name}"
+                    app:layout_constraintBottom_toTopOf="@+id/artist_genre"
+                    app:layout_constraintEnd_toEndOf="parent"
+                    app:layout_constraintHorizontal_bias="0.5"
+                    app:layout_constraintStart_toEndOf="@+id/artist_image"
+                    app:layout_constraintTop_toTopOf="parent"
+                    app:layout_constraintVertical_chainStyle="packed"
+                    tools:text="Artist Name" />
+
+                <TextView
+                    android:id="@+id/artist_genre"
+                    android:layout_width="0dp"
+                    android:layout_height="wrap_content"
+                    android:layout_marginStart="@dimen/margin_medium"
+                    android:textAppearance="?android:attr/textAppearanceListItem"
+                    android:textColor="?android:attr/textColorSecondary"
+                    app:artistGenre="@{artist}"
+                    app:layout_constraintBottom_toTopOf="@+id/artist_counts"
+                    app:layout_constraintStart_toEndOf="@+id/artist_image"
+                    app:layout_constraintTop_toBottomOf="@+id/artist_name"
+                    tools:text="Genre Name" />
+
+                <TextView
+                    android:id="@+id/artist_counts"
+                    android:layout_width="0dp"
+                    android:layout_height="wrap_content"
+                    android:layout_marginStart="@dimen/margin_medium"
+                    android:textAppearance="?android:attr/textAppearanceListItem"
+                    android:textColor="?android:attr/textColorSecondary"
+                    app:artistCounts="@{artist}"
+                    app:layout_constraintBottom_toTopOf="@+id/artist_album_header"
+                    app:layout_constraintStart_toEndOf="@+id/artist_image"
+                    app:layout_constraintTop_toBottomOf="@+id/artist_genre"
+                    tools:text="2 Albums, 20 Songs" />
+
+                <TextView
+                    android:id="@+id/artist_album_header"
+                    style="@style/HeaderText"
+                    android:layout_marginTop="@dimen/margin_medium"
+                    android:text="@string/label_albums"
+                    app:layout_constraintStart_toStartOf="parent"
+                    app:layout_constraintTop_toBottomOf="@+id/artist_image" />
+
+                <ImageButton
+                    android:id="@+id/artist_sort_button"
+                    style="@style/HeaderAction"
+                    android:contentDescription="@string/description_sort_button"
+                    android:onClick="@{() -> detailModel.incrementArtistSortMode()}"
+                    app:layout_constraintBottom_toBottomOf="@+id/artist_album_header"
+                    app:layout_constraintEnd_toEndOf="parent"
+                    app:layout_constraintTop_toTopOf="@+id/artist_album_header"
+                    tools:src="@drawable/ic_sort_numeric_down" />
+
+                <androidx.recyclerview.widget.RecyclerView
+                    android:id="@+id/artist_album_recycler"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_weight="1"
+                    android:nestedScrollingEnabled="false"
+                    android:overScrollMode="never"
+                    app:layoutManager="androidx.recyclerview.widget.GridLayoutManager"
+                    app:spanCount="2"
+                    app:layout_constraintBottom_toBottomOf="parent"
+                    app:layout_constraintStart_toStartOf="parent"
+                    app:layout_constraintTop_toBottomOf="@+id/artist_album_header"
+                    tools:itemCount="4"
+                    tools:listitem="@layout/item_album" />
+
+            </androidx.constraintlayout.widget.ConstraintLayout>
+        </androidx.core.widget.NestedScrollView>
+    </LinearLayout>
+</layout>

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

@@ -25,15 +25,17 @@
 
         <ImageView
             android:id="@+id/playback_cover"
-            android:layout_width="0dp"
+            android:layout_width="@dimen/size_cover_compact"
-            android:layout_height="0dp"
+            android:layout_height="@dimen/size_cover_compact"
             android:layout_marginStart="@dimen/margin_small"
+            android:layout_marginTop="@dimen/margin_small"
+            android:layout_marginBottom="@dimen/margin_small"
             android:contentDescription="@{@string/description_album_cover(song.name)}"
             app:coverArt="@{song}"
-            app:layout_constraintBottom_toBottomOf="@+id/playback_info"
+            app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintDimensionRatio="1:1"
             app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toTopOf="@+id/playback_song"
+            app:layout_constraintTop_toTopOf="parent"
             tools:src="@drawable/ic_song" />
 
         <TextView
@@ -41,7 +43,6 @@
             android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:layout_marginStart="@dimen/margin_mid_small"
-            android:layout_marginTop="8dp"
             android:layout_marginEnd="@dimen/margin_mid_small"
             android:ellipsize="marquee"
             android:fontFamily="@font/inter_semibold"
@@ -52,7 +53,7 @@
             app:layout_constraintBottom_toTopOf="@+id/playback_info"
             app:layout_constraintEnd_toStartOf="@+id/playback_controls"
             app:layout_constraintStart_toEndOf="@+id/playback_cover"
-            app:layout_constraintTop_toTopOf="parent"
+            app:layout_constraintTop_toTopOf="@+id/playback_cover"
             app:layout_constraintVertical_chainStyle="packed"
             tools:text="Song Name" />
 
@@ -62,13 +63,12 @@
             android:layout_height="wrap_content"
             android:layout_marginStart="@dimen/margin_mid_small"
             android:layout_marginEnd="@dimen/margin_mid_small"
-            android:layout_marginBottom="@dimen/margin_small"
             android:ellipsize="marquee"
             android:marqueeRepeatLimit="marquee_forever"
             android:singleLine="true"
             android:text="@{@string/format_info(song.album.artist.name, song.album.name)}"
             android:textAppearance="@style/TextAppearance.MaterialComponents.Caption"
-            app:layout_constraintBottom_toTopOf="@+id/playback_progress"
+            app:layout_constraintBottom_toBottomOf="@+id/playback_cover"
             app:layout_constraintEnd_toStartOf="@+id/playback_controls"
             app:layout_constraintStart_toEndOf="@+id/playback_cover"
             app:layout_constraintTop_toBottomOf="@+id/playback_song"

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

@@ -0,0 +1,135 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layout 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"
+    tools:context=".detail.GenreDetailFragment">
+
+    <data>
+
+        <variable
+            name="genre"
+            type="org.oxycblt.auxio.music.Genre" />
+
+        <variable
+            name="detailModel"
+            type="org.oxycblt.auxio.detail.DetailViewModel" />
+
+        <variable
+            name="playbackModel"
+            type="org.oxycblt.auxio.playback.PlaybackViewModel" />
+    </data>
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:orientation="vertical">
+
+        <androidx.appcompat.widget.Toolbar
+            android:id="@+id/genre_toolbar"
+            style="@style/Toolbar.Style.Icon"
+            android:background="?android:attr/windowBackground"
+            android:elevation="@dimen/elevation_normal"
+            app:menu="@menu/menu_detail"
+            app:title="@string/label_library" />
+
+        <androidx.core.widget.NestedScrollView
+            android:layout_width="match_parent"
+            android:layout_height="match_parent">
+
+            <androidx.constraintlayout.widget.ConstraintLayout
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:animateLayoutChanges="true"
+                android:orientation="vertical">
+
+                <ImageView
+                    android:id="@+id/genre_image"
+                    android:layout_width="@dimen/size_cover_mid_huge"
+                    android:layout_height="@dimen/size_cover_mid_huge"
+                    android:layout_margin="@dimen/margin_medium"
+                    android:contentDescription="@{@string/description_genre_image(genre.name)}"
+                    app:genreImage="@{genre}"
+                    app:layout_constraintStart_toStartOf="parent"
+                    app:layout_constraintTop_toTopOf="parent"
+                    tools:src="@drawable/ic_genre" />
+
+                <androidx.appcompat.widget.AppCompatTextView
+                    android:id="@+id/genre_name"
+                    style="@style/DetailTitleText"
+                    android:layout_width="0dp"
+                    android:layout_height="wrap_content"
+                    android:layout_marginStart="@dimen/margin_medium"
+                    android:layout_marginEnd="@dimen/margin_medium"
+                    android:text="@{genre.name}"
+                    app:layout_constraintBottom_toTopOf="@+id/genre_counts"
+                    app:layout_constraintEnd_toEndOf="parent"
+                    app:layout_constraintHorizontal_bias="0.5"
+                    app:layout_constraintStart_toEndOf="@+id/genre_image"
+                    app:layout_constraintTop_toTopOf="parent"
+                    app:layout_constraintVertical_chainStyle="packed"
+                    tools:text="Genre Name" />
+
+                <TextView
+                    android:id="@+id/genre_counts"
+                    android:layout_width="0dp"
+                    android:layout_height="wrap_content"
+                    android:layout_marginStart="@dimen/margin_medium"
+                    android:textAppearance="?android:attr/textAppearanceListItem"
+                    android:textColor="?android:attr/textColorSecondary"
+                    app:genreCounts="@{genre}"
+                    app:layout_constraintBottom_toTopOf="@+id/genre_song_count"
+                    app:layout_constraintStart_toEndOf="@+id/genre_image"
+                    app:layout_constraintTop_toBottomOf="@+id/genre_name"
+                    tools:text="2 Artists, 4 Albums" />
+
+                <TextView
+                    android:id="@+id/genre_song_count"
+                    android:layout_width="0dp"
+                    android:layout_height="wrap_content"
+                    android:layout_marginStart="@dimen/margin_medium"
+                    android:text="@{@plurals/format_song_count(genre.songs.size, genre.songs.size)}"
+                    android:textAppearance="?android:attr/textAppearanceListItem"
+                    android:textColor="?android:attr/textColorSecondary"
+                    app:layout_constraintBottom_toTopOf="@+id/genre_artist_header"
+                    app:layout_constraintStart_toEndOf="@+id/genre_image"
+                    app:layout_constraintTop_toBottomOf="@+id/genre_counts"
+                    tools:text="80 Songs" />
+
+                <TextView
+                    android:id="@+id/genre_artist_header"
+                    style="@style/HeaderText"
+                    android:layout_marginTop="@dimen/margin_medium"
+                    android:text="@string/label_artists"
+                    app:layout_constraintStart_toStartOf="parent"
+                    app:layout_constraintTop_toBottomOf="@+id/genre_image" />
+
+                <ImageButton
+                    android:id="@+id/genre_sort_button"
+                    style="@style/HeaderAction"
+                    android:contentDescription="@string/description_sort_button"
+                    android:onClick="@{() -> detailModel.incrementGenreSortMode()}"
+                    app:layout_constraintBottom_toBottomOf="@+id/genre_artist_header"
+                    app:layout_constraintEnd_toEndOf="parent"
+                    app:layout_constraintTop_toTopOf="@+id/genre_artist_header"
+                    tools:src="@drawable/ic_sort_alpha_down" />
+
+                <androidx.recyclerview.widget.RecyclerView
+                    android:id="@+id/genre_artist_recycler"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_weight="1"
+                    android:nestedScrollingEnabled="false"
+                    android:overScrollMode="never"
+                    app:layoutManager="androidx.recyclerview.widget.GridLayoutManager"
+                    app:spanCount="2"
+                    app:layout_constraintBottom_toBottomOf="parent"
+                    app:layout_constraintStart_toStartOf="parent"
+                    app:layout_constraintTop_toBottomOf="@+id/genre_artist_header"
+                    tools:itemCount="4"
+                    tools:listitem="@layout/item_artist" />
+
+            </androidx.constraintlayout.widget.ConstraintLayout>
+        </androidx.core.widget.NestedScrollView>
+    </LinearLayout>
+
+</layout>

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

@@ -26,24 +26,24 @@
             android:id="@+id/compact_playback"
             android:name="org.oxycblt.auxio.playback.CompactPlaybackFragment"
             android:layout_width="0dp"
-            android:layout_height="0dp"
+            android:layout_height="wrap_content"
             android:background="?android:attr/windowBackground"
             android:elevation="@dimen/elevation_high"
             android:outlineProvider="bounds"
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toEndOf="@+id/nav_bar"
-            app:layout_constraintTop_toTopOf="@+id/nav_bar"
             tools:layout="@layout/fragment_compact_playback" />
 
         <com.google.android.material.bottomnavigation.BottomNavigationView
             android:id="@+id/nav_bar"
-            android:layout_width="0dp"
+            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
+            android:layout_height="0dp"
             android:background="@color/background"
             app:labelVisibilityMode="selected"
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toTopOf="@+id/compact_playback"
             app:menu="@menu/menu_nav" />
 
     </androidx.constraintlayout.widget.ConstraintLayout>

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

@@ -62,13 +62,7 @@
                     android:layout_marginStart="@dimen/margin_medium"
                     android:layout_marginTop="@dimen/margin_medium"
                     android:layout_marginEnd="@dimen/margin_medium"
-                    android:ellipsize="end"
-                    android:maxLines="1"
                     android:text="@{album.name}"
-                    app:autoSizeMaxTextSize="@dimen/text_size_detail_header_max"
-                    app:autoSizeMinTextSize="@dimen/text_size_min"
-                    app:autoSizeStepGranularity="@dimen/text_size_increment"
-                    app:autoSizeTextType="uniform"
                     app:layout_constraintEnd_toEndOf="parent"
                     app:layout_constraintHorizontal_bias="0.5"
                     app:layout_constraintStart_toStartOf="parent"

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

@@ -62,10 +62,6 @@
                     android:layout_marginTop="@dimen/margin_medium"
                     android:layout_marginEnd="@dimen/margin_medium"
                     android:text="@{artist.name}"
-                    app:autoSizeMaxTextSize="@dimen/text_size_detail_header_max"
-                    app:autoSizeMinTextSize="@dimen/text_size_min"
-                    app:autoSizeStepGranularity="@dimen/text_size_increment"
-                    app:autoSizeTextType="uniform"
                     app:layout_constraintEnd_toEndOf="parent"
                     app:layout_constraintHorizontal_bias="0.5"
                     app:layout_constraintStart_toStartOf="parent"

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

@@ -63,10 +63,6 @@
                     android:layout_marginTop="@dimen/margin_medium"
                     android:layout_marginEnd="@dimen/margin_medium"
                     android:text="@{genre.name}"
-                    app:autoSizeMaxTextSize="@dimen/text_size_detail_header_max"
-                    app:autoSizeMinTextSize="@dimen/text_size_min"
-                    app:autoSizeStepGranularity="@dimen/text_size_increment"
-                    app:autoSizeTextType="uniform"
                     app:layout_constraintEnd_toEndOf="parent"
                     app:layout_constraintHorizontal_bias="0.5"
                     app:layout_constraintStart_toStartOf="parent"

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

@@ -21,12 +21,16 @@
 
     <!-- Size Namespace | Width & Heights for UI elements -->
     <dimen name="size_error_icon">48dp</dimen>
+
     <dimen name="size_small_unb_ripple">18dp</dimen>
     <dimen name="size_unb_ripple">24dp</dimen>
+
     <dimen name="size_cover_compact">44dp</dimen>
     <dimen name="size_cover_normal">56dp</dimen>
     <dimen name="size_cover_large">68dp</dimen>
+    <dimen name="size_cover_mid_huge">120dp</dimen>
     <dimen name="size_cover_huge">260dp</dimen>
+
     <dimen name="size_play_pause">70dp</dimen>
     <dimen name="size_play_pause_compact">36dp</dimen>
 

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

@@ -60,6 +60,13 @@
         <item name="android:textColor">?attr/colorPrimary</item>
         <item name="android:fontFamily">@font/inter_black</item>
         <item name="android:textSize">@dimen/text_size_detail_header_max</item>
+        <item name="android:maxLines">1</item>
+        <item name="android:ellipsize">end</item>
+
+        <item name="autoSizeMaxTextSize">@dimen/text_size_detail_header_max</item>
+        <item name="autoSizeMinTextSize">@dimen/text_size_min</item>
+        <item name="autoSizeStepGranularity">@dimen/text_size_increment</item>
+        <item name="autoSizeTextType">uniform</item>
     </style>
 
     <!-- Smaller Title theme that is used for headers -->