From d5c0ccfce0131e7f96e59960b408b60901030b59 Mon Sep 17 00:00:00 2001
From: OxygenCobalt <oxycblt@abstractr.net>
Date: Thu, 23 Jun 2022 11:15:41 -0600
Subject: [PATCH] ui: remove titlemidlarge style

Remove the TitleMidLarge style, replacing it with more Material3
attributes.

This finally removes all of the non-standard text styles. There is
still the two TitleMedium styles, but this is considered okay.

In the playback view, TitleMidLarge has become TitleLarge, which
honestly works quite well, as the same text styles are used in the
detail views.
---
 .../org/oxycblt/auxio/image/BaseFetcher.kt    |  2 +-
 .../layout-sw600dp/view_playback_controls.xml | 80 -------------------
 .../res/layout/view_playback_controls.xml     | 79 ------------------
 app/src/main/res/values/styles_android.xml    |  5 +-
 app/src/main/res/values/styles_ui.xml         |  2 +-
 app/src/main/res/values/typography.xml        | 31 +++----
 6 files changed, 14 insertions(+), 185 deletions(-)
 delete mode 100644 app/src/main/res/layout-sw600dp/view_playback_controls.xml
 delete mode 100644 app/src/main/res/layout/view_playback_controls.xml

diff --git a/app/src/main/java/org/oxycblt/auxio/image/BaseFetcher.kt b/app/src/main/java/org/oxycblt/auxio/image/BaseFetcher.kt
index 0eb2896f0..30490afdc 100644
--- a/app/src/main/java/org/oxycblt/auxio/image/BaseFetcher.kt
+++ b/app/src/main/java/org/oxycblt/auxio/image/BaseFetcher.kt
@@ -62,7 +62,7 @@ abstract class BaseFetcher : Fetcher {
      */
     protected suspend fun fetchArt(context: Context, album: Album): InputStream? {
         val settings = Settings(context)
-        
+
         if (!settings.showCovers) {
             return null
         }
diff --git a/app/src/main/res/layout-sw600dp/view_playback_controls.xml b/app/src/main/res/layout-sw600dp/view_playback_controls.xml
deleted file mode 100644
index a3d219694..000000000
--- a/app/src/main/res/layout-sw600dp/view_playback_controls.xml
+++ /dev/null
@@ -1,80 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<merge 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"
-    tools:parentTag="android.widget.FrameLayout">
-
-    <androidx.constraintlayout.widget.ConstraintLayout
-        android:layout_width="match_parent"
-        android:layout_height="match_parent">
-
-        <org.oxycblt.auxio.playback.IndicatorMaterialButton
-            android:id="@+id/playback_repeat"
-            style="@style/Widget.Auxio.Button.Icon.Large"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginEnd="@dimen/spacing_large"
-            android:contentDescription="@string/desc_change_repeat"
-            app:icon="@drawable/ic_repeat"
-            app:iconTint="@color/sel_accented"
-            app:layout_constraintBottom_toBottomOf="@+id/playback_skip_prev"
-            app:layout_constraintEnd_toStartOf="@+id/playback_skip_prev"
-            app:layout_constraintHorizontal_chainStyle="packed"
-            app:layout_constraintTop_toTopOf="@+id/playback_skip_prev" />
-
-        <Button
-            android:id="@+id/playback_skip_prev"
-            style="@style/Widget.Auxio.Button.Icon.Large"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginEnd="@dimen/spacing_large"
-            android:contentDescription="@string/desc_skip_prev"
-            app:icon="@drawable/ic_skip_prev"
-            app:layout_constraintBottom_toBottomOf="@+id/playback_play_pause"
-            app:layout_constraintEnd_toStartOf="@+id/playback_play_pause"
-            app:layout_constraintTop_toTopOf="@+id/playback_play_pause" />
-
-        <com.google.android.material.floatingactionbutton.FloatingActionButton
-            android:id="@+id/playback_play_pause"
-            style="@style/Widget.Auxio.FloatingActionButton.PlayPause"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:contentDescription="@string/desc_play_pause"
-            android:src="@drawable/sel_playing_state"
-            app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toTopOf="parent"
-            tools:src="@drawable/ic_pause" />
-
-        <Button
-            android:id="@+id/playback_skip_next"
-            style="@style/Widget.Auxio.Button.Icon.Large"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginStart="@dimen/spacing_large"
-            android:contentDescription="@string/desc_skip_next"
-            app:icon="@drawable/ic_skip_next"
-            app:layout_constraintBottom_toBottomOf="@+id/playback_play_pause"
-            app:layout_constraintStart_toEndOf="@+id/playback_play_pause"
-            app:layout_constraintTop_toTopOf="@+id/playback_play_pause" />
-
-        <org.oxycblt.auxio.playback.IndicatorMaterialButton
-            android:id="@+id/playback_shuffle"
-            style="@style/Widget.Auxio.Button.Icon.Large"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginStart="@dimen/spacing_large"
-            android:contentDescription="@string/desc_shuffle"
-            app:icon="@drawable/ic_shuffle"
-            app:iconTint="@color/sel_accented"
-            app:layout_constraintBottom_toBottomOf="@+id/playback_skip_next"
-            app:layout_constraintStart_toEndOf="@+id/playback_skip_next"
-            app:layout_constraintTop_toTopOf="@+id/playback_skip_next"
-            app:tint="@color/sel_accented" />
-
-    </androidx.constraintlayout.widget.ConstraintLayout>
-
-</merge>
\ No newline at end of file
diff --git a/app/src/main/res/layout/view_playback_controls.xml b/app/src/main/res/layout/view_playback_controls.xml
deleted file mode 100644
index bdb684c50..000000000
--- a/app/src/main/res/layout/view_playback_controls.xml
+++ /dev/null
@@ -1,79 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<merge 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"
-    tools:parentTag="android.widget.FrameLayout">
-
-    <androidx.constraintlayout.widget.ConstraintLayout
-        android:layout_width="match_parent"
-        android:layout_height="match_parent">
-
-        <org.oxycblt.auxio.playback.IndicatorMaterialButton
-            android:id="@+id/playback_repeat"
-            style="@style/Widget.Auxio.Button.Icon.Large"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginStart="@dimen/spacing_medium"
-            android:contentDescription="@string/desc_change_repeat"
-            app:icon="@drawable/ic_repeat"
-            app:iconTint="@color/sel_accented"
-            app:layout_constraintBottom_toBottomOf="@+id/playback_skip_prev"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toTopOf="@+id/playback_skip_prev" />
-
-        <Button
-            android:id="@+id/playback_skip_prev"
-            style="@style/Widget.Auxio.Button.Icon.Large"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:contentDescription="@string/desc_skip_prev"
-            app:icon="@drawable/ic_skip_prev"
-            app:layout_constraintBottom_toBottomOf="@+id/playback_play_pause"
-            app:layout_constraintEnd_toStartOf="@+id/playback_play_pause"
-            app:layout_constraintStart_toEndOf="@+id/playback_repeat"
-            app:layout_constraintTop_toTopOf="@+id/playback_play_pause" />
-
-        <com.google.android.material.floatingactionbutton.FloatingActionButton
-            android:id="@+id/playback_play_pause"
-            style="@style/Widget.Auxio.FloatingActionButton.PlayPause"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:contentDescription="@string/desc_play_pause"
-            android:src="@drawable/sel_playing_state"
-            app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toTopOf="parent"
-            tools:src="@drawable/ic_play" />
-
-        <Button
-            android:id="@+id/playback_skip_next"
-            style="@style/Widget.Auxio.Button.Icon.Large"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:contentDescription="@string/desc_skip_next"
-            app:icon="@drawable/ic_skip_next"
-            app:layout_constraintBottom_toBottomOf="@+id/playback_play_pause"
-            app:layout_constraintEnd_toStartOf="@+id/playback_shuffle"
-            app:layout_constraintStart_toEndOf="@+id/playback_play_pause"
-            app:layout_constraintTop_toTopOf="@+id/playback_play_pause" />
-
-        <org.oxycblt.auxio.playback.IndicatorMaterialButton
-            android:id="@+id/playback_shuffle"
-            style="@style/Widget.Auxio.Button.Icon.Large"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginEnd="@dimen/spacing_medium"
-            android:contentDescription="@string/desc_shuffle"
-            app:icon="@drawable/ic_shuffle"
-            app:iconTint="@color/sel_accented"
-            app:layout_constraintBottom_toBottomOf="@+id/playback_skip_next"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintTop_toTopOf="@+id/playback_skip_next"
-            app:tint="@color/sel_accented" />
-
-    </androidx.constraintlayout.widget.ConstraintLayout>
-
-</merge>
\ No newline at end of file
diff --git a/app/src/main/res/values/styles_android.xml b/app/src/main/res/values/styles_android.xml
index 90dd320f6..ff5a1c2bb 100644
--- a/app/src/main/res/values/styles_android.xml
+++ b/app/src/main/res/values/styles_android.xml
@@ -39,16 +39,13 @@
 
     <!-- Widget TextView that mimics the main Auxio Primary TextView -->
     <style name="Widget.Auxio.TextView.Primary.AppWidget" parent="Widget.Auxio.TextView.AppWidget">
-        <item name="android:textStyle">normal</item>
-        <item name="android:textSize">@dimen/text_size_ext_title_mid_large</item>
-        <item name="android:letterSpacing">0</item>
         <item name="android:textAppearance">@style/TextAppearance.Material3.TitleMedium</item>
     </style>
 
     <!-- Widget TextView that mimics the main Auxio Secondary TextView -->
     <style name="Widget.Auxio.TextView.Secondary.AppWidget" parent="Widget.Auxio.TextView.AppWidget">
         <item name="android:textColor">?android:attr/textColorSecondary</item>
-        <item name="android:textAppearance">@style/TextAppearance.Material3.BodyLarge</item>
+        <item name="android:textAppearance">@style/TextAppearance.Material3.BodyMedium</item>
     </style>
 
     <!-- Hack to make sure that ripples work the best that they can on all Android Versions -->
diff --git a/app/src/main/res/values/styles_ui.xml b/app/src/main/res/values/styles_ui.xml
index 8ec67bf9c..339c4ce48 100644
--- a/app/src/main/res/values/styles_ui.xml
+++ b/app/src/main/res/values/styles_ui.xml
@@ -162,7 +162,7 @@
         <item name="android:ellipsize">marquee</item>
         <item name="android:singleLine">true</item>
         <item name="android:marqueeRepeatLimit">marquee_forever</item>
-        <item name="android:textAppearance">@style/TextAppearance.Auxio.TitleMidLarge</item>
+        <item name="android:textAppearance">@style/TextAppearance.Auxio.TitleLarge</item>
     </style>
 
     <style name="Widget.Auxio.TextView.Secondary" parent="Widget.Auxio.TextView.Base">
diff --git a/app/src/main/res/values/typography.xml b/app/src/main/res/values/typography.xml
index 0e3d625c8..0d7fdda8f 100644
--- a/app/src/main/res/values/typography.xml
+++ b/app/src/main/res/values/typography.xml
@@ -64,6 +64,10 @@
         <item name="android:letterSpacing">-0.01518181818</item>
     </style>
 
+    <!--
+    List items are better off with a non-bold TitleMedium, while header items would prefer a
+    bold TitleMedium. Have options for both.
+    -->
     <style name="TextAppearance.Auxio.TitleMedium" parent="TextAppearance.Material3.TitleMedium">
         <item name="fontFamily">@font/inter_regular</item>
         <item name="android:fontFamily">@font/inter_regular</item>
@@ -71,6 +75,13 @@
         <item name="android:letterSpacing">-0.01125</item>
     </style>
 
+    <style name="TextAppearance.Auxio.TitleMediumEmphasis" 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:letterSpacing">-0.00825</item>
+    </style>
+
     <style name="TextAppearance.Auxio.TitleSmall" parent="TextAppearance.Material3.TitleSmall">
         <item name="fontFamily">@font/inter_regular</item>
         <item name="android:fontFamily">@font/inter_regular</item>
@@ -124,24 +135,4 @@
         <item name="android:letterSpacing">0.0008333333</item>
     </style>
 
-    <!--
-    Non-standard styles to work around typography system limitations.
-    A major issue with the typography system is how much it limits you into either
-    unusably tiny text or unusably large text, so these styles fill in the gap where
-    other elements fall short.
-    -->
-    <style name="TextAppearance.Auxio.TitleMediumEmphasis" 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:letterSpacing">-0.00825</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>
-        <item name="android:letterSpacing">-0.0114444444</item>
-    </style>
 </resources>
\ No newline at end of file