From 3d19794d63b46a82ca1ba423af1fa6063b36bf22 Mon Sep 17 00:00:00 2001
From: OxygenCobalt <oxycblt@abstractr.net>
Date: Fri, 17 Jun 2022 09:30:20 -0600
Subject: [PATCH] ui: remove medium button style

Remove the temporary 28dp hack that was applied to the playback bar.

This finally puts the playback bar in line with all other icon
components. The playback panel is still weird, but that's okay since
it's a full screen view and the buttons can take up more space.

Since I absolutely hate change, I had to effectively frog-boil myself
in order to do this, first downsizing the icon from 32dp to 28dp, and
then from 28dp down to 24dp. I can't believe I care about this so much.
---
 app/src/main/res/layout-sw640dp/fragment_playback_bar.xml | 6 +++---
 app/src/main/res/layout/fragment_playback_bar.xml         | 6 +++---
 app/src/main/res/values/styles_ui.xml                     | 8 --------
 3 files changed, 6 insertions(+), 14 deletions(-)

diff --git a/app/src/main/res/layout-sw640dp/fragment_playback_bar.xml b/app/src/main/res/layout-sw640dp/fragment_playback_bar.xml
index a92954be1..c583a37d7 100644
--- a/app/src/main/res/layout-sw640dp/fragment_playback_bar.xml
+++ b/app/src/main/res/layout-sw640dp/fragment_playback_bar.xml
@@ -13,7 +13,7 @@
         app:layout_constraintBottom_toTopOf="@+id/playback_progress_bar"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent"
-        tools:src="@drawable/ic_album" />
+        tools:staticIcon="@drawable/ic_album" />
 
     <TextView
         android:id="@+id/playback_song"
@@ -47,7 +47,7 @@
 
     <Button
         android:id="@+id/playback_play_pause"
-        style="@style/Widget.Auxio.Button.Icon.Medium"
+        style="@style/Widget.Auxio.Button.Icon.Small"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:contentDescription="@string/desc_play_pause"
@@ -58,7 +58,7 @@
 
     <Button
         android:id="@+id/playback_skip_next"
-        style="@style/Widget.Auxio.Button.Icon.Medium"
+        style="@style/Widget.Auxio.Button.Icon.Small"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginEnd="@dimen/spacing_tiny"
diff --git a/app/src/main/res/layout/fragment_playback_bar.xml b/app/src/main/res/layout/fragment_playback_bar.xml
index c1ab5a575..7a16a987c 100644
--- a/app/src/main/res/layout/fragment_playback_bar.xml
+++ b/app/src/main/res/layout/fragment_playback_bar.xml
@@ -13,7 +13,7 @@
         app:layout_constraintBottom_toTopOf="@+id/playback_progress_bar"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent"
-        tools:src="@drawable/ic_album" />
+        tools:staticIcon="@drawable/ic_album" />
 
     <TextView
         android:id="@+id/playback_song"
@@ -45,7 +45,7 @@
 
     <Button
         android:id="@+id/playback_play_pause"
-        style="@style/Widget.Auxio.Button.Icon.Medium"
+        style="@style/Widget.Auxio.Button.Icon.Small"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:contentDescription="@string/desc_play_pause"
@@ -56,7 +56,7 @@
 
     <Button
         android:id="@+id/playback_skip_next"
-        style="@style/Widget.Auxio.Button.Icon.Medium"
+        style="@style/Widget.Auxio.Button.Icon.Small"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginEnd="@dimen/spacing_tiny"
diff --git a/app/src/main/res/values/styles_ui.xml b/app/src/main/res/values/styles_ui.xml
index deb3e936f..754365c2b 100644
--- a/app/src/main/res/values/styles_ui.xml
+++ b/app/src/main/res/values/styles_ui.xml
@@ -76,14 +76,6 @@
         <item name="android:paddingBottom">@dimen/spacing_small</item>
     </style>
 
-    <style name="Widget.Auxio.Button.Icon.Medium" parent="Widget.Auxio.Button.Icon.Small">
-        <item name="iconSize">@dimen/size_icon_medium</item>
-        <item name="android:paddingStart">@dimen/spacing_medium_icon</item>
-        <item name="android:paddingEnd">@dimen/spacing_medium_icon</item>
-        <item name="android:paddingTop">@dimen/spacing_medium_icon</item>
-        <item name="android:paddingBottom">@dimen/spacing_medium_icon</item>
-    </style>
-
     <style name="Widget.Auxio.Button.Icon.Large" parent="Widget.Auxio.Button.Icon.Base">
         <item name="iconSize">@dimen/size_icon_large</item>
         <item name="android:insetTop">0dp</item>