From f4217a337a2ee05151ef047776d8f892dd04612d Mon Sep 17 00:00:00 2001
From: OxygenCobalt <oxycblt@abstractr.net>
Date: Tue, 8 Feb 2022 06:23:43 -0700
Subject: [PATCH] style: tweak body typography

Apply body typography in new places in the app.

For awhile, Body and Title typography were used interchangeably, as
they occupy the same text size range. This commit defines the Body
text as to be used for one-line widgets or tertiary widgets, while
the Title text is defined to be used for multi-line or heading widgets.
---
 app/src/main/res/layout/fragment_search.xml   |  3 +-
 app/src/main/res/layout/item_album_song.xml   |  2 +-
 app/src/main/res/layout/item_artist_song.xml  |  2 +-
 app/src/main/res/layout/item_excluded_dir.xml |  1 +
 app/src/main/res/layout/item_genre_song.xml   |  2 +-
 app/src/main/res/values/styles_ui.xml         |  5 ++
 app/src/main/res/values/typography.xml        | 53 +++++++++++++------
 7 files changed, 47 insertions(+), 21 deletions(-)

diff --git a/app/src/main/res/layout/fragment_search.xml b/app/src/main/res/layout/fragment_search.xml
index 716fe376d..4cf5d42cc 100644
--- a/app/src/main/res/layout/fragment_search.xml
+++ b/app/src/main/res/layout/fragment_search.xml
@@ -40,8 +40,7 @@
                         android:imeOptions="actionSearch|flagNoExtractUi"
                         android:inputType="textFilter"
                         android:paddingStart="0dp"
-                        android:paddingEnd="0dp"
-                        android:textAppearance="@style/TextAppearance.Auxio.TitleMedium" />
+                        android:paddingEnd="0dp" />
 
                 </com.google.android.material.textfield.TextInputLayout>
 
diff --git a/app/src/main/res/layout/item_album_song.xml b/app/src/main/res/layout/item_album_song.xml
index 5be733658..7dd52f238 100644
--- a/app/src/main/res/layout/item_album_song.xml
+++ b/app/src/main/res/layout/item_album_song.xml
@@ -38,7 +38,7 @@
             android:minWidth="@dimen/size_track_number"
             android:text="@{@string/fmt_track(song.track)}"
             android:textAlignment="center"
-            android:textAppearance="@style/TextAppearance.Auxio.TitleMedium"
+            android:textAppearance="@style/TextAppearance.Auxio.BodyLarge"
             android:textColor="@color/sel_accented_secondary"
             android:textSize="@dimen/text_size_ext_title_mid_larger"
             app:layout_constraintBottom_toBottomOf="parent"
diff --git a/app/src/main/res/layout/item_artist_song.xml b/app/src/main/res/layout/item_artist_song.xml
index ec7a92ed6..a014af1bd 100644
--- a/app/src/main/res/layout/item_artist_song.xml
+++ b/app/src/main/res/layout/item_artist_song.xml
@@ -53,7 +53,7 @@
 
         <TextView
             android:id="@+id/song_duration"
-            style="@style/Widget.Auxio.TextView.Item.Secondary"
+            style="@style/Widget.Auxio.TextView.Item.Tertiary"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:ellipsize="none"
diff --git a/app/src/main/res/layout/item_excluded_dir.xml b/app/src/main/res/layout/item_excluded_dir.xml
index 900908ed5..46ea3a6e3 100644
--- a/app/src/main/res/layout/item_excluded_dir.xml
+++ b/app/src/main/res/layout/item_excluded_dir.xml
@@ -15,6 +15,7 @@
             android:id="@+id/excluded_path"
             style="@style/Widget.Auxio.TextView.Item.Primary"
             android:layout_width="0dp"
+            android:textAppearance="@style/TextAppearance.Auxio.BodyLarge"
             android:layout_height="wrap_content"
             android:layout_margin="@dimen/spacing_medium"
             android:gravity="center"
diff --git a/app/src/main/res/layout/item_genre_song.xml b/app/src/main/res/layout/item_genre_song.xml
index ed8ce62b2..7d6278c9d 100644
--- a/app/src/main/res/layout/item_genre_song.xml
+++ b/app/src/main/res/layout/item_genre_song.xml
@@ -53,7 +53,7 @@
 
         <TextView
             android:id="@+id/song_duration"
-            style="@style/Widget.Auxio.TextView.Item.Secondary"
+            style="@style/Widget.Auxio.TextView.Item.Tertiary"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:ellipsize="none"
diff --git a/app/src/main/res/values/styles_ui.xml b/app/src/main/res/values/styles_ui.xml
index c2cd41c8c..7194f18c1 100644
--- a/app/src/main/res/values/styles_ui.xml
+++ b/app/src/main/res/values/styles_ui.xml
@@ -84,6 +84,11 @@
         <item name="android:textColor">?android:attr/textColorSecondary</item>
     </style>
 
+    <style name="Widget.Auxio.TextView.Item.Tertiary" parent="Widget.Auxio.TextView.Item.Base">
+        <item name="android:textAppearance">@style/TextAppearance.Auxio.BodyMedium</item>
+        <item name="android:textColor">?android:attr/textColorSecondary</item>
+    </style>
+
     <style name="Widget.Auxio.TextView.Primary" parent="Widget.Auxio.TextView.Base">
         <item name="android:ellipsize">marquee</item>
         <item name="android:singleLine">true</item>
diff --git a/app/src/main/res/values/typography.xml b/app/src/main/res/values/typography.xml
index 88447d7fa..53ebd4f24 100644
--- a/app/src/main/res/values/typography.xml
+++ b/app/src/main/res/values/typography.xml
@@ -1,6 +1,14 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <!-- Basic Material3 typography -->
+    <!--
+    Auxio leverages the Material3 Text Appearances in a strange way, mostly driven by
+    the author's perception of what looks "right." Guides for usage are placed next to
+    each set of styles.
+    -->
+
+    <!--
+    Display styles are not used in Auxio.
+    -->
     <style name="TextAppearance.Auxio.DisplayLarge" parent="TextAppearance.Material3.DisplayLarge">
         <item name="fontFamily">@font/inter_semibold</item>
         <item name="android:fontFamily">@font/inter_semibold</item>
@@ -19,6 +27,9 @@
         <item name="android:textStyle">normal</item>
     </style>
 
+    <!--
+    Headline styles are similar to title styles, but are used on tablets.
+    -->
     <style name="TextAppearance.Auxio.HeadlineLarge" parent="TextAppearance.Material3.HeadlineLarge">
         <item name="fontFamily">@font/inter_semibold</item>
         <item name="android:fontFamily">@font/inter_semibold</item>
@@ -37,12 +48,23 @@
         <item name="android:textStyle">normal</item>
     </style>
 
+    <!--
+    Title styles are often used for headings, list items, or non-interactive elements.
+    Basically, any UI element with two lines of text or more.
+    -->
     <style name="TextAppearance.Auxio.TitleLarge" parent="TextAppearance.Material3.TitleLarge">
         <item name="fontFamily">@font/inter_semibold</item>
         <item name="android:fontFamily">@font/inter_semibold</item>
         <item name="android:textStyle">bold</item>
     </style>
 
+    <style name="TextAppearance.Auxio.TitleMidLarge" parent="TextAppearance.Material3.TitleMedium">
+        <item name="fontFamily">@font/inter_semibold</item>
+        <item name="android:fontFamily">@font/inter_semibold</item>
+        <item name="android:textStyle">bold</item>
+        <item name="android:textSize">@dimen/text_size_ext_title_mid_large</item>
+    </style>
+
     <style name="TextAppearance.Auxio.TitleMedium" parent="TextAppearance.Material3.TitleMedium">
         <item name="fontFamily">@font/inter</item>
         <item name="android:fontFamily">@font/inter</item>
@@ -55,6 +77,13 @@
         <item name="android:textStyle">normal</item>
     </style>
 
+    <!--
+    The label styles are used for important interactive elements.
+    -->
+    <style name="TextAppearance.Auxio.LabelLarger" parent="TextAppearance.Auxio.LabelLarge">
+        <item name="android:textSize">@dimen/text_size_ext_label_larger</item>
+    </style>
+
     <style name="TextAppearance.Auxio.LabelLarge" parent="TextAppearance.Material3.LabelLarge">
         <item name="fontFamily">@font/inter_semibold</item>
         <item name="android:fontFamily">@font/inter_semibold</item>
@@ -75,36 +104,28 @@
         <item name="android:textStyle">bold</item>
         <item name="android:letterSpacing">0.01</item>
     </style>
-    
+
+    <!--
+    The body typeface is used for UI elements with only one line of text or tertiary UI elements.
+    -->
     <style name="TextAppearance.Auxio.BodyLarge" parent="TextAppearance.Material3.BodyLarge">
         <item name="fontFamily">@font/inter</item>
         <item name="android:fontFamily">@font/inter</item>
         <item name="android:textStyle">normal</item>
-        <item name="android:letterSpacing">0.03</item>
+        <item name="android:letterSpacing">0.025</item>
     </style>
     
     <style name="TextAppearance.Auxio.BodyMedium" parent="TextAppearance.Material3.BodyMedium">
         <item name="fontFamily">@font/inter</item>
         <item name="android:fontFamily">@font/inter</item>
         <item name="android:textStyle">normal</item>
-        <item name="android:letterSpacing">0.03</item>
+        <item name="android:letterSpacing">0.020</item>
     </style>
     
     <style name="TextAppearance.Auxio.BodySmall" parent="TextAppearance.Material3.BodySmall">
         <item name="fontFamily">@font/inter</item>
         <item name="android:fontFamily">@font/inter</item>
         <item name="android:textStyle">normal</item>
-        <item name="android:letterSpacing">0.03</item>
-    </style>
-
-    <style name="TextAppearance.Auxio.TitleMidLarge" parent="TextAppearance.Material3.TitleMedium">
-        <item name="fontFamily">@font/inter_semibold</item>
-        <item name="android:fontFamily">@font/inter_semibold</item>
-        <item name="android:textStyle">bold</item>
-        <item name="android:textSize">@dimen/text_size_ext_title_mid_large</item>
-    </style>
-
-    <style name="TextAppearance.Auxio.LabelLarger" parent="TextAppearance.Auxio.LabelLarge">
-        <item name="android:textSize">@dimen/text_size_ext_label_larger</item>
+        <item name="android:letterSpacing">0.015</item>
     </style>
 </resources>
\ No newline at end of file