From 0cef51fa970a7643eb26d8e8a25fc9e413711919 Mon Sep 17 00:00:00 2001
From: OxygenCobalt <oxycblt@abstractr.net>
Date: Sat, 6 Aug 2022 14:53:06 -0600
Subject: [PATCH] detail: add item type

Add an item type indicator to the top of the detail header.

This is primarily for release type functionality, but also makes it
more clear the item one is looking at.
---
 .../detail/recycler/AlbumDetailAdapter.kt      | 15 ++++-----------
 .../detail/recycler/ArtistDetailAdapter.kt     |  1 +
 .../detail/recycler/GenreDetailAdapter.kt      |  1 +
 app/src/main/res/layout-h600dp/item_detail.xml | 17 ++++++++++++++---
 app/src/main/res/layout-land/item_detail.xml   | 17 +++++++++++++++--
 .../main/res/layout-sw600dp/item_detail.xml    | 17 +++++++++++++++--
 .../main/res/layout-sw840dp/item_detail.xml    | 18 +++++++++++++++---
 app/src/main/res/layout/item_detail.xml        | 18 +++++++++++++++---
 app/src/main/res/layout/view_seek_bar.xml      |  4 ++--
 app/src/main/res/values/strings.xml            |  1 +
 app/src/main/res/values/typography.xml         | 12 ++++++------
 11 files changed, 89 insertions(+), 32 deletions(-)

diff --git a/app/src/main/java/org/oxycblt/auxio/detail/recycler/AlbumDetailAdapter.kt b/app/src/main/java/org/oxycblt/auxio/detail/recycler/AlbumDetailAdapter.kt
index f602aa2aa..b3fd0bf68 100644
--- a/app/src/main/java/org/oxycblt/auxio/detail/recycler/AlbumDetailAdapter.kt
+++ b/app/src/main/java/org/oxycblt/auxio/detail/recycler/AlbumDetailAdapter.kt
@@ -115,6 +115,9 @@ private class AlbumDetailViewHolder private constructor(private val binding: Ite
 
     override fun bind(item: Album, listener: AlbumDetailAdapter.Listener) {
         binding.detailCover.bind(item)
+        binding.detailType?.text =
+            binding.context.getString(item.releaseType?.stringRes ?: R.string.lbl_album)
+
         binding.detailName.text = item.resolveName(binding.context)
 
         binding.detailSubhead.apply {
@@ -131,17 +134,7 @@ private class AlbumDetailViewHolder private constructor(private val binding: Ite
 
             val duration = item.durationSecs.formatDuration(true)
 
-            text =
-                if (item.releaseType != null) {
-                    context.getString(
-                        R.string.fmt_four,
-                        context.getString(item.releaseType.stringRes),
-                        date,
-                        songCount,
-                        duration)
-                } else {
-                    context.getString(R.string.fmt_three, date, songCount, duration)
-                }
+            text = context.getString(R.string.fmt_three, date, songCount, duration)
         }
 
         binding.detailPlayButton.setOnClickListener { listener.onPlayParent() }
diff --git a/app/src/main/java/org/oxycblt/auxio/detail/recycler/ArtistDetailAdapter.kt b/app/src/main/java/org/oxycblt/auxio/detail/recycler/ArtistDetailAdapter.kt
index 903d9b830..b31b645ff 100644
--- a/app/src/main/java/org/oxycblt/auxio/detail/recycler/ArtistDetailAdapter.kt
+++ b/app/src/main/java/org/oxycblt/auxio/detail/recycler/ArtistDetailAdapter.kt
@@ -123,6 +123,7 @@ private class ArtistDetailViewHolder private constructor(private val binding: It
 
     override fun bind(item: Artist, listener: DetailAdapter.Listener) {
         binding.detailCover.bind(item)
+        binding.detailType?.text = binding.context.getString(R.string.lbl_artist)
         binding.detailName.text = item.resolveName(binding.context)
 
         // Get the genre that corresponds to the most songs in this artist, which would be
diff --git a/app/src/main/java/org/oxycblt/auxio/detail/recycler/GenreDetailAdapter.kt b/app/src/main/java/org/oxycblt/auxio/detail/recycler/GenreDetailAdapter.kt
index 9a570e4fa..9db6b8f14 100644
--- a/app/src/main/java/org/oxycblt/auxio/detail/recycler/GenreDetailAdapter.kt
+++ b/app/src/main/java/org/oxycblt/auxio/detail/recycler/GenreDetailAdapter.kt
@@ -104,6 +104,7 @@ private class GenreDetailViewHolder private constructor(private val binding: Ite
     BindingViewHolder<Genre, DetailAdapter.Listener>(binding.root) {
     override fun bind(item: Genre, listener: DetailAdapter.Listener) {
         binding.detailCover.bind(item)
+        binding.detailType?.text = binding.context.getString(R.string.lbl_genre)
         binding.detailName.text = item.resolveName(binding.context)
         binding.detailSubhead.text =
             binding.context.getPlural(R.plurals.fmt_song_count, item.songs.size)
diff --git a/app/src/main/res/layout-h600dp/item_detail.xml b/app/src/main/res/layout-h600dp/item_detail.xml
index 1bfcba6b4..54b914ab0 100644
--- a/app/src/main/res/layout-h600dp/item_detail.xml
+++ b/app/src/main/res/layout-h600dp/item_detail.xml
@@ -13,18 +13,29 @@
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent"
         tools:ignore="ContentDescription"
-        tools:staticIcon="@drawable/ic_song_48" />
+        tools:staticIcon="@drawable/ic_song_24" />
+
+    <TextView
+        android:id="@+id/detail_type"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        tools:text="Type"
+        android:textAppearance="@style/TextAppearance.Auxio.LabelMedium"
+        android:textColor="?attr/colorSecondary"
+        android:layout_marginTop="@dimen/spacing_medium"
+        app:layout_constraintBottom_toTopOf="@+id/detail_name"
+        app:layout_constraintTop_toBottomOf="@+id/detail_cover"
+        tools:layout_editor_absoluteX="16dp" />
 
     <TextView
         android:id="@+id/detail_name"
         style="@style/Widget.Auxio.TextView.Detail"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_marginTop="@dimen/spacing_medium"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintHorizontal_bias="0.5"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/detail_cover"
+        app:layout_constraintTop_toBottomOf="@+id/detail_type"
         tools:text="Name" />
 
     <TextView
diff --git a/app/src/main/res/layout-land/item_detail.xml b/app/src/main/res/layout-land/item_detail.xml
index d9ae55fe0..f8627065e 100644
--- a/app/src/main/res/layout-land/item_detail.xml
+++ b/app/src/main/res/layout-land/item_detail.xml
@@ -12,7 +12,20 @@
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent"
         tools:ignore="ContentDescription"
-        tools:staticIcon="@drawable/ic_song_48" />
+        tools:staticIcon="@drawable/ic_song_24" />
+
+    <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"
@@ -26,7 +39,7 @@
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintHorizontal_bias="0.5"
         app:layout_constraintStart_toEndOf="@+id/detail_cover"
-        app:layout_constraintTop_toTopOf="@+id/detail_cover"
+        app:layout_constraintTop_toBottomOf="@+id/detail_type"
         app:layout_constraintVertical_chainStyle="packed"
         tools:text="Name" />
 
diff --git a/app/src/main/res/layout-sw600dp/item_detail.xml b/app/src/main/res/layout-sw600dp/item_detail.xml
index 71d2d33a8..d13f26f66 100644
--- a/app/src/main/res/layout-sw600dp/item_detail.xml
+++ b/app/src/main/res/layout-sw600dp/item_detail.xml
@@ -14,7 +14,20 @@
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent"
         tools:ignore="ContentDescription"
-        tools:staticIcon="@drawable/ic_song_48" />
+        tools:staticIcon="@drawable/ic_song_24" />
+
+    <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"
@@ -28,7 +41,7 @@
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintHorizontal_bias="0.5"
         app:layout_constraintStart_toEndOf="@+id/detail_cover"
-        app:layout_constraintTop_toTopOf="@+id/detail_cover"
+        app:layout_constraintTop_toBottomOf="@+id/detail_type"
         app:layout_constraintVertical_chainStyle="packed"
         tools:text="Name" />
 
diff --git a/app/src/main/res/layout-sw840dp/item_detail.xml b/app/src/main/res/layout-sw840dp/item_detail.xml
index 32ad3b5f3..c81927e5f 100644
--- a/app/src/main/res/layout-sw840dp/item_detail.xml
+++ b/app/src/main/res/layout-sw840dp/item_detail.xml
@@ -12,7 +12,20 @@
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent"
         tools:ignore="ContentDescription"
-        tools:staticIcon="@drawable/ic_song_48" />
+        tools:staticIcon="@drawable/ic_song_24" />
+
+    <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"
@@ -26,10 +39,9 @@
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintHorizontal_bias="0.5"
         app:layout_constraintStart_toEndOf="@+id/detail_cover"
-        app:layout_constraintTop_toTopOf="@+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"
diff --git a/app/src/main/res/layout/item_detail.xml b/app/src/main/res/layout/item_detail.xml
index 7214c8a88..605b8427d 100644
--- a/app/src/main/res/layout/item_detail.xml
+++ b/app/src/main/res/layout/item_detail.xml
@@ -14,18 +14,29 @@
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent"
         tools:ignore="ContentDescription"
-        tools:staticIcon="@drawable/ic_song_48" />
+        tools:staticIcon="@drawable/ic_song_24" />
+
+    <TextView
+        android:id="@+id/detail_type"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        tools:text="Type"
+        android:textAppearance="@style/TextAppearance.Auxio.LabelMedium"
+        android:textColor="?attr/colorSecondary"
+        android:layout_marginTop="@dimen/spacing_medium"
+        app:layout_constraintBottom_toTopOf="@+id/detail_name"
+        app:layout_constraintTop_toBottomOf="@+id/detail_cover"
+        tools:layout_editor_absoluteX="16dp" />
 
     <TextView
         android:id="@+id/detail_name"
         style="@style/Widget.Auxio.TextView.Detail"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_marginTop="@dimen/spacing_medium"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintHorizontal_bias="0.5"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/detail_cover"
+        app:layout_constraintTop_toBottomOf="@+id/detail_type"
         tools:text="Name" />
 
     <TextView
@@ -48,6 +59,7 @@
         app:layout_constraintTop_toBottomOf="@+id/detail_subhead"
         tools:text="Info B" />
 
+
     <Button
         android:id="@+id/detail_play_button"
         style="@style/Widget.Auxio.Button.Secondary"
diff --git a/app/src/main/res/layout/view_seek_bar.xml b/app/src/main/res/layout/view_seek_bar.xml
index b3d2c6bd4..d00c13a3d 100644
--- a/app/src/main/res/layout/view_seek_bar.xml
+++ b/app/src/main/res/layout/view_seek_bar.xml
@@ -19,7 +19,7 @@
         android:layout_gravity="bottom|start"
         android:layout_marginStart="@dimen/spacing_medium"
         android:layout_marginBottom="@dimen/spacing_tiny"
-        android:textAppearance="@style/TextAppearance.Auxio.LabelMedium"
+        android:textAppearance="@style/TextAppearance.Auxio.BodySmall"
         android:textColor="@color/sel_accented_secondary"
         tools:text="11:38" />
 
@@ -30,7 +30,7 @@
         android:layout_gravity="bottom|end"
         android:layout_marginEnd="@dimen/spacing_medium"
         android:layout_marginBottom="@dimen/spacing_tiny"
-        android:textAppearance="@style/TextAppearance.Auxio.LabelMedium"
+        android:textAppearance="@style/TextAppearance.Auxio.BodySmall"
         android:textColor="?android:attr/textColorSecondary"
         tools:text="16:16" />
 
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 04f016d91..659d7c1b6 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -59,6 +59,7 @@
     <string name="lbl_artist">Artist</string>
     <string name="lbl_artists">Artists</string>
 
+    <string name="lbl_genre">Genre</string>
     <string name="lbl_genres">Genres</string>
 
     <string name="lbl_search">Search</string>
diff --git a/app/src/main/res/values/typography.xml b/app/src/main/res/values/typography.xml
index 2df94e3a8..c15450cd1 100644
--- a/app/src/main/res/values/typography.xml
+++ b/app/src/main/res/values/typography.xml
@@ -101,17 +101,17 @@
     </style>
 
     <style name="TextAppearance.Auxio.LabelMedium" parent="TextAppearance.Material3.LabelMedium">
-        <item name="fontFamily">@font/inter_regular</item>
-        <item name="android:fontFamily">@font/inter_regular</item>
+        <item name="fontFamily">@font/inter_semibold</item>
+        <item name="android:fontFamily">@font/inter_semibold</item>
         <item name="android:textStyle">normal</item>
-        <item name="android:letterSpacing">0.00</item>
+        <item name="android:letterSpacing">0.003</item>
     </style>
 
     <style name="TextAppearance.Auxio.LabelSmall" parent="TextAppearance.Material3.LabelSmall">
-        <item name="fontFamily">@font/inter_regular</item>
-        <item name="android:fontFamily">@font/inter_regular</item>
+        <item name="fontFamily">@font/inter_semibold</item>
+        <item name="android:fontFamily">@font/inter_semibold</item>
         <item name="android:textStyle">normal</item>
-        <item name="android:letterSpacing">0.0045454545</item>
+        <item name="android:letterSpacing">0.0075454545</item>
     </style>
 
     <!--