From 44fa178c34d4612a8a20c4f7e925b0f0e8cdfb57 Mon Sep 17 00:00:00 2001
From: OxygenCobalt <oxycblt@abstractr.net>
Date: Mon, 18 Jan 2021 14:35:00 -0700
Subject: [PATCH] Clean up dimens

Move some stray dimens into their proper locations.
---
 app/src/main/res/layout/fragment_about.xml    | 2 +-
 app/src/main/res/layout/fragment_playback.xml | 2 +-
 app/src/main/res/values-large/dimens.xml      | 1 -
 app/src/main/res/values-large/styles.xml      | 2 +-
 app/src/main/res/values-v23/dimens.xml        | 4 ----
 app/src/main/res/values/dimens.xml            | 3 +++
 app/src/main/res/values/styles.xml            | 6 +++---
 7 files changed, 9 insertions(+), 11 deletions(-)
 delete mode 100644 app/src/main/res/values-v23/dimens.xml

diff --git a/app/src/main/res/layout/fragment_about.xml b/app/src/main/res/layout/fragment_about.xml
index 92d554174..c23b53aa8 100644
--- a/app/src/main/res/layout/fragment_about.xml
+++ b/app/src/main/res/layout/fragment_about.xml
@@ -93,7 +93,7 @@
                     android:id="@+id/about_version"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:layout_marginStart="16dp"
+                    android:layout_marginStart="@dimen/margin_medium"
                     android:textAppearance="@style/TextAppearance.AppCompat.Caption"
                     app:layout_constraintBottom_toBottomOf="@+id/about_version_icon"
                     app:layout_constraintStart_toEndOf="@+id/about_version_icon"
diff --git a/app/src/main/res/layout/fragment_playback.xml b/app/src/main/res/layout/fragment_playback.xml
index 5df4bd1e1..baf19afcc 100644
--- a/app/src/main/res/layout/fragment_playback.xml
+++ b/app/src/main/res/layout/fragment_playback.xml
@@ -95,7 +95,7 @@
             android:layout_height="wrap_content"
             android:layout_marginStart="@dimen/margin_mid_large"
             android:layout_marginEnd="@dimen/margin_mid_large"
-            android:layout_marginBottom="16dp"
+            android:layout_marginBottom="@dimen/margin_medium"
             android:ellipsize="end"
             android:onClick="@{() -> detailModel.navToItem(playbackModel.song.album)}"
             android:singleLine="true"
diff --git a/app/src/main/res/values-large/dimens.xml b/app/src/main/res/values-large/dimens.xml
index 3a81d6841..b389fbfc3 100644
--- a/app/src/main/res/values-large/dimens.xml
+++ b/app/src/main/res/values-large/dimens.xml
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
     <dimen name="size_cover_mid_huge">200dp</dimen>
-    <dimen name="size_cover_huge">200dp</dimen>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-large/styles.xml b/app/src/main/res/values-large/styles.xml
index 541ce895c..ae778ff35 100644
--- a/app/src/main/res/values-large/styles.xml
+++ b/app/src/main/res/values-large/styles.xml
@@ -13,7 +13,7 @@
         <item name="android:textSize">@dimen/text_size_play_button_large</item>
         <item name="android:theme">@style/Theme.MaterialComponents</item>
         <item name="strokeColor">@color/divider_color</item>
-        <item name="strokeWidth">1dp</item>
+        <item name="strokeWidth">@dimen/width_play_stroke</item>
         <item name="rippleColor">@color/selection_color</item>
         <item name="fontFamily">@font/inter_semibold</item>
         <item name="textAllCaps">false</item>
diff --git a/app/src/main/res/values-v23/dimens.xml b/app/src/main/res/values-v23/dimens.xml
deleted file mode 100644
index 5c624e676..000000000
--- a/app/src/main/res/values-v23/dimens.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <dimen name="height_compact_progress">2dp</dimen>
-</resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/dimens.xml b/app/src/main/res/values/dimens.xml
index 3eb0c6710..f4654dc2f 100644
--- a/app/src/main/res/values/dimens.xml
+++ b/app/src/main/res/values/dimens.xml
@@ -5,6 +5,7 @@
     <dimen name="padding_tiny">4dp</dimen>
     <dimen name="padding_small">8dp</dimen>
     <dimen name="padding_medium">16dp</dimen>
+    <dimen name="padding_play_pause">17dp</dimen>
 
     <!-- Margin namespace | Dimens for margin attributes -->
     <dimen name="margin_small">8dp</dimen>
@@ -20,6 +21,7 @@
     <!-- Width Namespace | Width for UI elements -->
     <dimen name="width_track_number">32dp</dimen>
     <dimen name="width_thumb_view">50dp</dimen>
+    <dimen name="width_play_stroke">1dp</dimen>
 
     <!-- Size Namespace | Width & Heights for UI elements -->
     <dimen name="size_error_icon">48dp</dimen>
@@ -46,6 +48,7 @@
     <dimen name="text_size_thumb">18sp</dimen>
     <dimen name="text_size_header">19sp</dimen>
     <dimen name="text_size_play_button_large">16sp</dimen>
+    <dimen name="text_size_toolbar_header">20sp</dimen>
 
     <!-- Misc -->
     <dimen name="elevation_normal">4dp</dimen>
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index f6ce04a7e..421f0276e 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -52,7 +52,7 @@
     <style name="TextAppearance.Toolbar.Header" parent="TextAppearance.Widget.AppCompat.Toolbar.Title">
         <item name="android:fontFamily">@font/inter_black</item>
         <item name="android:textColor">?attr/colorPrimary</item>
-        <item name="android:textSize">20sp</item>
+        <item name="android:textSize">@dimen/text_size_toolbar_header</item>
     </style>
 
     <!-- Title theme for Detail Fragments -->
@@ -192,7 +192,7 @@
         <item name="android:focusable">true</item>
         <item name="android:theme">@style/Theme.MaterialComponents</item>
         <item name="strokeColor">@color/divider_color</item>
-        <item name="strokeWidth">1dp</item>
+        <item name="strokeWidth">@dimen/width_play_stroke</item>
         <item name="rippleColor">@color/selection_color</item>
         <item name="fontFamily">@font/inter_semibold</item>
         <item name="textAllCaps">false</item>
@@ -235,6 +235,6 @@
         <item name="android:layout_marginTop">@dimen/margin_medium</item>
         <item name="android:layout_marginEnd">@dimen/margin_large</item>
         <item name="android:scaleType">fitCenter</item>
-        <item name="android:padding">18dp</item>
+        <item name="android:padding">@dimen/padding_play_pause</item>
     </style>
 </resources>
\ No newline at end of file