From 09d4e107e0c315a1cc0ab6d1d57b5d19a3947a61 Mon Sep 17 00:00:00 2001
From: OxygenCobalt <alexyx@tutanota.com>
Date: Mon, 12 Oct 2020 11:56:33 -0600
Subject: [PATCH] Refactor dimens

Refactor the dimen naming/use across the app.
---
 .../java/org/oxycblt/auxio/MainActivity.kt    |  2 +-
 .../auxio/playback/PlaybackFragment.kt        |  2 -
 app/src/main/res/anim/anim_stationary.xml     |  5 +-
 .../main/res/drawable/ui_header_dividers.xml  |  2 +-
 .../main/res/layout/fragment_album_detail.xml | 10 ++--
 .../res/layout/fragment_artist_detail.xml     | 13 +++--
 .../res/layout/fragment_compact_playback.xml  | 22 ++++----
 .../main/res/layout/fragment_genre_detail.xml | 10 ++--
 app/src/main/res/layout/fragment_loading.xml  |  4 +-
 app/src/main/res/layout/fragment_main.xml     |  2 +-
 app/src/main/res/layout/fragment_playback.xml | 33 ++++++------
 app/src/main/res/layout/item_album.xml        |  4 +-
 app/src/main/res/layout/item_album_song.xml   | 10 ++--
 app/src/main/res/layout/item_artist.xml       |  4 +-
 app/src/main/res/layout/item_artist_album.xml |  4 +-
 app/src/main/res/layout/item_genre.xml        |  4 +-
 app/src/main/res/layout/item_genre_artist.xml |  4 +-
 app/src/main/res/layout/item_song.xml         |  4 +-
 app/src/main/res/values/dimens.xml            | 54 ++++++++++---------
 app/src/main/res/values/styles.xml            |  2 +-
 20 files changed, 99 insertions(+), 96 deletions(-)

diff --git a/app/src/main/java/org/oxycblt/auxio/MainActivity.kt b/app/src/main/java/org/oxycblt/auxio/MainActivity.kt
index a2256ae59..39df7aa3b 100644
--- a/app/src/main/java/org/oxycblt/auxio/MainActivity.kt
+++ b/app/src/main/java/org/oxycblt/auxio/MainActivity.kt
@@ -6,7 +6,7 @@ import android.view.View
 import androidx.appcompat.app.AppCompatActivity
 import org.oxycblt.auxio.theme.accent
 
-// FIXME: Fix bug where fast navigation will break the fade animation and
+// FIXME: Fix bug where fast navigation will break the animations and
 //  lead to nothing being displayed [Possibly Un-fixable]
 class MainActivity : AppCompatActivity(R.layout.activity_main) {
 
diff --git a/app/src/main/java/org/oxycblt/auxio/playback/PlaybackFragment.kt b/app/src/main/java/org/oxycblt/auxio/playback/PlaybackFragment.kt
index e997c68df..952d6dc09 100644
--- a/app/src/main/java/org/oxycblt/auxio/playback/PlaybackFragment.kt
+++ b/app/src/main/java/org/oxycblt/auxio/playback/PlaybackFragment.kt
@@ -50,8 +50,6 @@ class PlaybackFragment : Fragment() {
 
         // Make marquee scroll work
         binding.playbackSong.isSelected = true
-        binding.playbackAlbum.isSelected = true
-        binding.playbackArtist.isSelected = true
 
         // --- VIEWMODEL SETUP --
 
diff --git a/app/src/main/res/anim/anim_stationary.xml b/app/src/main/res/anim/anim_stationary.xml
index b1f2b9328..121ba6caf 100644
--- a/app/src/main/res/anim/anim_stationary.xml
+++ b/app/src/main/res/anim/anim_stationary.xml
@@ -1,4 +1,7 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?><!--
+Stationary animation used so that PlaybackFragment can slide w/o MainFragment sliding as well.
+https://stackoverflow.com/a/64314693/14143986
+-->
 <set xmlns:android="http://schemas.android.com/apk/res/android">
     <translate
         android:duration="@android:integer/config_mediumAnimTime"
diff --git a/app/src/main/res/drawable/ui_header_dividers.xml b/app/src/main/res/drawable/ui_header_dividers.xml
index 1add32398..6970a55fd 100644
--- a/app/src/main/res/drawable/ui_header_dividers.xml
+++ b/app/src/main/res/drawable/ui_header_dividers.xml
@@ -16,6 +16,6 @@ https://stackoverflow.com/a/61157571/14143986
     <item>
         <ripple
             android:color="@color/selection_color"
-            android:radius="@dimen/divider_ripple_size"></ripple>
+            android:radius="@dimen/size_divider_ripple"></ripple>
     </item>
 </layer-list>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_album_detail.xml b/app/src/main/res/layout/fragment_album_detail.xml
index 958b4fde8..f934cbcc5 100644
--- a/app/src/main/res/layout/fragment_album_detail.xml
+++ b/app/src/main/res/layout/fragment_album_detail.xml
@@ -41,8 +41,8 @@
 
                 <ImageView
                     android:id="@+id/album_cover"
-                    android:layout_width="@dimen/cover_size_huge"
-                    android:layout_height="@dimen/cover_size_huge"
+                    android:layout_width="@dimen/size_cover_huge"
+                    android:layout_height="@dimen/size_cover_huge"
                     android:layout_marginTop="@dimen/margin_medium"
                     android:contentDescription="@{@string/description_album_cover(album.name)}"
                     app:coverArt="@{album}"
@@ -61,9 +61,9 @@
                     android:layout_marginEnd="@dimen/margin_medium"
                     android:maxLines="1"
                     android:text="@{album.name}"
-                    app:autoSizeMaxTextSize="@dimen/detail_header_size_max"
-                    app:autoSizeMinTextSize="@dimen/generic_size_min"
-                    app:autoSizeStepGranularity="@dimen/generic_size_increment"
+                    app:autoSizeMaxTextSize="@dimen/text_size_header_max"
+                    app:autoSizeMinTextSize="@dimen/text_size_min"
+                    app:autoSizeStepGranularity="@dimen/text_size_increment"
                     app:autoSizeTextType="uniform"
                     app:layout_constraintEnd_toEndOf="parent"
                     app:layout_constraintHorizontal_bias="0.5"
diff --git a/app/src/main/res/layout/fragment_artist_detail.xml b/app/src/main/res/layout/fragment_artist_detail.xml
index 0858039a8..1761fc784 100644
--- a/app/src/main/res/layout/fragment_artist_detail.xml
+++ b/app/src/main/res/layout/fragment_artist_detail.xml
@@ -37,13 +37,12 @@
             <androidx.constraintlayout.widget.ConstraintLayout
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
-                android:animateLayoutChanges="true"
-                android:orientation="vertical">
+                android:animateLayoutChanges="true">
 
                 <ImageView
                     android:id="@+id/artist_image"
-                    android:layout_width="@dimen/cover_size_huge"
-                    android:layout_height="@dimen/cover_size_huge"
+                    android:layout_width="@dimen/size_cover_huge"
+                    android:layout_height="@dimen/size_cover_huge"
                     android:layout_marginTop="@dimen/margin_medium"
                     android:contentDescription="@{@string/description_artist_image(artist.name)}"
                     app:artistImage="@{artist}"
@@ -61,9 +60,9 @@
                     android:layout_marginEnd="@dimen/margin_medium"
                     android:layout_marginStart="@dimen/margin_medium"
                     android:text="@{artist.name}"
-                    app:autoSizeMaxTextSize="@dimen/detail_header_size_max"
-                    app:autoSizeMinTextSize="@dimen/generic_size_min"
-                    app:autoSizeStepGranularity="@dimen/generic_size_increment"
+                    app:autoSizeMaxTextSize="@dimen/text_size_header_max"
+                    app:autoSizeMinTextSize="@dimen/text_size_min"
+                    app:autoSizeStepGranularity="@dimen/text_size_increment"
                     app:autoSizeTextType="uniform"
                     app:layout_constraintEnd_toEndOf="parent"
                     app:layout_constraintHorizontal_bias="0.5"
diff --git a/app/src/main/res/layout/fragment_compact_playback.xml b/app/src/main/res/layout/fragment_compact_playback.xml
index ebc1fd67b..71711b2f9 100644
--- a/app/src/main/res/layout/fragment_compact_playback.xml
+++ b/app/src/main/res/layout/fragment_compact_playback.xml
@@ -27,7 +27,7 @@
             android:id="@+id/playback_progress"
             style="?android:attr/progressBarStyleHorizontal"
             android:layout_width="match_parent"
-            android:layout_height="@dimen/playback_progress_size"
+            android:layout_height="@dimen/height_compact_progress"
             android:clickable="false"
             android:progressBackgroundTint="?android:attr/colorControlNormal"
             android:progressTint="?android:attr/colorPrimary"
@@ -37,10 +37,10 @@
 
         <ImageView
             android:id="@+id/playback_cover"
-            android:layout_width="@dimen/cover_size_compact"
-            android:layout_height="@dimen/cover_size_compact"
+            android:layout_width="@dimen/size_cover_compact"
+            android:layout_height="@dimen/size_cover_compact"
             android:contentDescription="@{@string/description_album_cover(song.name)}"
-            android:layout_margin="@dimen/margin_smallish"
+            android:layout_margin="@dimen/margin_mid_small"
             app:coverArt="@{song}"
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintStart_toStartOf="parent"
@@ -51,8 +51,8 @@
             android:id="@+id/playback_song"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
-            android:layout_marginStart="@dimen/margin_smallish"
-            android:layout_marginEnd="@dimen/margin_smallish"
+            android:layout_marginStart="@dimen/margin_mid_small"
+            android:layout_marginEnd="@dimen/margin_mid_small"
             android:ellipsize="marquee"
             android:fontFamily="@font/inter_semibold"
             android:marqueeRepeatLimit="marquee_forever"
@@ -70,8 +70,8 @@
             android:id="@+id/playback_info"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
-            android:layout_marginStart="@dimen/margin_smallish"
-            android:layout_marginEnd="@dimen/margin_smallish"
+            android:layout_marginStart="@dimen/margin_mid_small"
+            android:layout_marginEnd="@dimen/margin_mid_small"
             android:ellipsize="marquee"
             android:marqueeRepeatLimit="marquee_forever"
             android:singleLine="true"
@@ -86,10 +86,10 @@
         <ImageButton
             android:id="@+id/playback_controls"
             style="@style/Widget.AppCompat.Button.Borderless"
-            android:layout_marginEnd="@dimen/margin_smallish"
+            android:layout_marginEnd="@dimen/margin_mid_small"
             android:contentDescription="@{playbackModel.isPlaying ? @string/description_pause : @string/description_play}"
-            android:layout_width="@dimen/controls_size_compact"
-            android:layout_height="@dimen/controls_size_compact"
+            android:layout_width="@dimen/size_play_pause_compact"
+            android:layout_height="@dimen/size_play_pause_compact"
             android:background="@drawable/ui_unbounded_ripple"
             android:onClick="@{() -> playbackModel.invertPlayingStatus()}"
             app:layout_constraintBottom_toBottomOf="parent"
diff --git a/app/src/main/res/layout/fragment_genre_detail.xml b/app/src/main/res/layout/fragment_genre_detail.xml
index 6dbd749e8..6dafe3d14 100644
--- a/app/src/main/res/layout/fragment_genre_detail.xml
+++ b/app/src/main/res/layout/fragment_genre_detail.xml
@@ -42,8 +42,8 @@
 
                 <ImageView
                     android:id="@+id/genre_image"
-                    android:layout_width="@dimen/cover_size_huge"
-                    android:layout_height="@dimen/cover_size_huge"
+                    android:layout_width="@dimen/size_cover_huge"
+                    android:layout_height="@dimen/size_cover_huge"
                     android:layout_marginTop="@dimen/margin_medium"
                     android:contentDescription="@{@string/description_genre_image(genre.name)}"
                     app:genreImage="@{genre}"
@@ -61,9 +61,9 @@
                     android:layout_marginEnd="@dimen/margin_medium"
                     android:layout_marginStart="@dimen/margin_medium"
                     android:text="@{genre.name}"
-                    app:autoSizeMaxTextSize="@dimen/detail_header_size_max"
-                    app:autoSizeMinTextSize="@dimen/generic_size_min"
-                    app:autoSizeStepGranularity="@dimen/generic_size_increment"
+                    app:autoSizeMaxTextSize="@dimen/text_size_header_max"
+                    app:autoSizeMinTextSize="@dimen/text_size_min"
+                    app:autoSizeStepGranularity="@dimen/text_size_increment"
                     app:autoSizeTextType="uniform"
                     app:layout_constraintEnd_toEndOf="parent"
                     app:layout_constraintHorizontal_bias="0.5"
diff --git a/app/src/main/res/layout/fragment_loading.xml b/app/src/main/res/layout/fragment_loading.xml
index 5ff7bdf4e..2db6c65d7 100644
--- a/app/src/main/res/layout/fragment_loading.xml
+++ b/app/src/main/res/layout/fragment_loading.xml
@@ -32,8 +32,8 @@
 
         <ImageView
             android:id="@+id/loading_error_icon"
-            android:layout_width="@dimen/status_icon_size"
-            android:layout_height="@dimen/status_icon_size"
+            android:layout_width="@dimen/size_error_icon"
+            android:layout_height="@dimen/size_error_icon"
             android:indeterminateTint="?attr/colorPrimary"
             android:indeterminateTintMode="src_in"
             android:src="@drawable/ic_error"
diff --git a/app/src/main/res/layout/fragment_main.xml b/app/src/main/res/layout/fragment_main.xml
index 2f112bb17..0a2def8ed 100644
--- a/app/src/main/res/layout/fragment_main.xml
+++ b/app/src/main/res/layout/fragment_main.xml
@@ -26,7 +26,7 @@
         <com.google.android.material.tabs.TabLayout
             android:id="@+id/main_tabs"
             android:layout_width="match_parent"
-            android:layout_height="@dimen/tab_menu_size"
+            android:layout_height="@dimen/height_tab_menu"
             android:layout_gravity="bottom"
             android:background="?android:attr/windowBackground"
             android:elevation="@dimen/elevation_normal"
diff --git a/app/src/main/res/layout/fragment_playback.xml b/app/src/main/res/layout/fragment_playback.xml
index d06d933c3..e743bd240 100644
--- a/app/src/main/res/layout/fragment_playback.xml
+++ b/app/src/main/res/layout/fragment_playback.xml
@@ -1,7 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <layout 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">
+    xmlns:tools="http://schemas.android.com/tools"
+    tools:context=".playback.PlaybackFragment">
 
     <data>
 
@@ -38,7 +39,7 @@
             android:id="@+id/playback_cover"
             android:layout_width="0dp"
             android:layout_height="0dp"
-            android:layout_margin="@dimen/margin_large"
+            android:layout_margin="@dimen/margin_mid_large"
             android:contentDescription="@{@string/description_album_cover(song.name)}"
             app:layout_constraintDimensionRatio="1:1"
             app:coverArt="@{song}"
@@ -53,12 +54,12 @@
             android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:ellipsize="marquee"
+            android:marqueeRepeatLimit="marquee_forever"
             android:focusable="true"
             android:fontFamily="@font/inter_semibold"
-            android:marqueeRepeatLimit="marquee_forever"
             android:singleLine="true"
-            android:layout_marginStart="@dimen/margin_large"
-            android:layout_marginEnd="@dimen/margin_large"
+            android:layout_marginStart="@dimen/margin_mid_large"
+            android:layout_marginEnd="@dimen/margin_mid_large"
             android:text="@{song.name}"
             android:textAppearance="@style/TextAppearance.MaterialComponents.Headline6"
             app:layout_constraintBottom_toTopOf="@+id/playback_artist"
@@ -71,11 +72,10 @@
             android:id="@+id/playback_artist"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
-            android:ellipsize="marquee"
-            android:marqueeRepeatLimit="marquee_forever"
+            android:ellipsize="end"
             android:singleLine="true"
-            android:layout_marginStart="@dimen/margin_large"
-            android:layout_marginEnd="@dimen/margin_large"
+            android:layout_marginStart="@dimen/margin_mid_large"
+            android:layout_marginEnd="@dimen/margin_mid_large"
             android:text="@{song.album.artist.name}"
             android:textAppearance="@style/TextAppearance.MaterialComponents.Subtitle1"
             android:textColor="?android:attr/textColorSecondary"
@@ -88,10 +88,9 @@
             android:id="@+id/playback_album"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
-            android:ellipsize="marquee"
-            android:layout_marginStart="@dimen/margin_large"
-            android:layout_marginEnd="@dimen/margin_large"
-            android:marqueeRepeatLimit="marquee_forever"
+            android:ellipsize="end"
+            android:layout_marginStart="@dimen/margin_mid_large"
+            android:layout_marginEnd="@dimen/margin_mid_large"
             android:layout_marginBottom="@dimen/margin_medium"
             android:singleLine="true"
             android:text="@{song.album.name}"
@@ -107,8 +106,8 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_marginBottom="@dimen/margin_medium"
-            android:paddingStart="@dimen/margin_large"
-            android:paddingEnd="@dimen/margin_large"
+            android:paddingStart="@dimen/margin_mid_large"
+            android:paddingEnd="@dimen/margin_mid_large"
             android:progressBackgroundTint="?android:attr/colorControlNormal"
             android:progressTint="?android:attr/colorPrimary"
             android:splitTrack="false"
@@ -120,8 +119,8 @@
 
         <ImageButton
             android:id="@+id/playback_play_pause"
-            android:layout_width="@dimen/controls_size"
-            android:layout_height="@dimen/controls_size"
+            android:layout_width="@dimen/size_play_pause"
+            android:layout_height="@dimen/size_play_pause"
             android:layout_marginBottom="40dp"
             android:background="@drawable/ui_circular_button"
             android:backgroundTint="?android:attr/colorPrimary"
diff --git a/app/src/main/res/layout/item_album.xml b/app/src/main/res/layout/item_album.xml
index 41d2fe6dc..09667efd7 100644
--- a/app/src/main/res/layout/item_album.xml
+++ b/app/src/main/res/layout/item_album.xml
@@ -21,8 +21,8 @@
 
         <ImageView
             android:id="@+id/album_cover"
-            android:layout_width="@dimen/cover_size_normal"
-            android:layout_height="@dimen/cover_size_normal"
+            android:layout_width="@dimen/size_cover_normal"
+            android:layout_height="@dimen/size_cover_normal"
             android:contentDescription="@{@string/description_album_cover(album.name)}"
             app:coverArt="@{album}"
             app:layout_constraintBottom_toBottomOf="parent"
diff --git a/app/src/main/res/layout/item_album_song.xml b/app/src/main/res/layout/item_album_song.xml
index af3cd3429..18837fff7 100644
--- a/app/src/main/res/layout/item_album_song.xml
+++ b/app/src/main/res/layout/item_album_song.xml
@@ -21,18 +21,18 @@
 
         <androidx.appcompat.widget.AppCompatTextView
             android:id="@+id/song_track"
-            android:layout_width="@dimen/track_number_width"
+            android:layout_width="@dimen/width_track_number"
             android:layout_height="wrap_content"
             android:text="@{String.valueOf(song.track)}"
             android:textAlignment="center"
             android:textAppearance="?android:attr/textAppearanceListItem"
             android:textColor="?android:attr/textColorTertiary"
-            android:textSize="@dimen/track_number_text_size_max"
+            android:textSize="@dimen/text_size_track_max"
             android:maxLines="1"
             android:contentDescription="@{@string/description_track_number(song.track)}"
-            app:autoSizeMaxTextSize="@dimen/detail_header_size_max"
-            app:autoSizeMinTextSize="@dimen/generic_size_min"
-            app:autoSizeStepGranularity="@dimen/generic_size_increment"
+            app:autoSizeMaxTextSize="@dimen/text_size_header_max"
+            app:autoSizeMinTextSize="@dimen/text_size_min"
+            app:autoSizeStepGranularity="@dimen/text_size_increment"
             android:gravity="center"
             app:autoSizeTextType="uniform"
             app:layout_constraintBottom_toBottomOf="parent"
diff --git a/app/src/main/res/layout/item_artist.xml b/app/src/main/res/layout/item_artist.xml
index a22dcde3c..ac8dd3f88 100644
--- a/app/src/main/res/layout/item_artist.xml
+++ b/app/src/main/res/layout/item_artist.xml
@@ -21,8 +21,8 @@
 
         <ImageView
             android:id="@+id/artist_image"
-            android:layout_width="@dimen/cover_size_normal"
-            android:layout_height="@dimen/cover_size_normal"
+            android:layout_width="@dimen/size_cover_normal"
+            android:layout_height="@dimen/size_cover_normal"
             android:contentDescription="@{@string/description_artist_image(artist.name)}"
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintStart_toStartOf="parent"
diff --git a/app/src/main/res/layout/item_artist_album.xml b/app/src/main/res/layout/item_artist_album.xml
index c6fe20345..c14f7a216 100644
--- a/app/src/main/res/layout/item_artist_album.xml
+++ b/app/src/main/res/layout/item_artist_album.xml
@@ -21,8 +21,8 @@
 
         <ImageView
             android:id="@+id/album_cover"
-            android:layout_width="@dimen/cover_size_large"
-            android:layout_height="@dimen/cover_size_large"
+            android:layout_width="@dimen/size_cover_large"
+            android:layout_height="@dimen/size_cover_large"
             android:contentDescription="@{@string/description_album_cover(album.name)}"
             app:coverArt="@{album}"
             app:layout_constraintBottom_toBottomOf="parent"
diff --git a/app/src/main/res/layout/item_genre.xml b/app/src/main/res/layout/item_genre.xml
index c777b3009..44600f092 100644
--- a/app/src/main/res/layout/item_genre.xml
+++ b/app/src/main/res/layout/item_genre.xml
@@ -21,8 +21,8 @@
 
         <ImageView
             android:id="@+id/genre_image"
-            android:layout_width="@dimen/cover_size_normal"
-            android:layout_height="@dimen/cover_size_normal"
+            android:layout_width="@dimen/size_cover_normal"
+            android:layout_height="@dimen/size_cover_normal"
             app:genreImage="@{genre}"
             android:contentDescription="@{@string/description_genre_image(genre.name)}"
             app:layout_constraintBottom_toBottomOf="parent"
diff --git a/app/src/main/res/layout/item_genre_artist.xml b/app/src/main/res/layout/item_genre_artist.xml
index 373caf885..269b2e4b5 100644
--- a/app/src/main/res/layout/item_genre_artist.xml
+++ b/app/src/main/res/layout/item_genre_artist.xml
@@ -21,8 +21,8 @@
 
         <ImageView
             android:id="@+id/artist_image"
-            android:layout_width="@dimen/cover_size_large"
-            android:layout_height="@dimen/cover_size_large"
+            android:layout_width="@dimen/size_cover_large"
+            android:layout_height="@dimen/size_cover_large"
             android:contentDescription="@{@string/description_artist_image(artist.name)}"
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintStart_toStartOf="parent"
diff --git a/app/src/main/res/layout/item_song.xml b/app/src/main/res/layout/item_song.xml
index 076bec2d6..7ef365502 100644
--- a/app/src/main/res/layout/item_song.xml
+++ b/app/src/main/res/layout/item_song.xml
@@ -21,8 +21,8 @@
 
         <ImageView
             android:id="@+id/album_cover"
-            android:layout_width="@dimen/cover_size_compact"
-            android:layout_height="@dimen/cover_size_compact"
+            android:layout_width="@dimen/size_cover_compact"
+            android:layout_height="@dimen/size_cover_compact"
             android:contentDescription="@{@string/description_album_cover(song.name)}"
             app:coverArt="@{song}"
             app:layout_constraintBottom_toBottomOf="parent"
diff --git a/app/src/main/res/values/dimens.xml b/app/src/main/res/values/dimens.xml
index 568c32467..850b98e76 100644
--- a/app/src/main/res/values/dimens.xml
+++ b/app/src/main/res/values/dimens.xml
@@ -1,40 +1,44 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <!-- TODO: Do dimens refactoring -->
+    <!-- Padding Namespace | Dimens for padding attributes -->
     <dimen name="padding_tiny">4dp</dimen>
     <dimen name="padding_small">8dp</dimen>
     <dimen name="padding_medium">16dp</dimen>
+    <dimen name="padding_mid_large">24dp</dimen>
+    <dimen name="padding_large">32dp</dimen>
+    <dimen name="padding_huge">64dp</dimen>
 
+    <!-- Margin namespace | Dimens for margin attributes -->
     <dimen name="margin_small">8dp</dimen>
-    <dimen name="margin_smallish">10dp</dimen>
+    <dimen name="margin_mid_small">10dp</dimen>
     <dimen name="margin_medium">16dp</dimen>
-    <dimen name="margin_large">24dp</dimen>
+    <dimen name="margin_mid_large">24dp</dimen>
+    <dimen name="margin_large">32dp</dimen>
+    <dimen name="margin_huge">64dp</dimen>
 
-    <dimen name="status_icon_size">48dp</dimen>
+    <!-- Height Namespace | Height for UI elements -->
+    <dimen name="height_tab_menu">40dp</dimen>
+    <dimen name="height_compact_progress">2dp</dimen>
 
-    <dimen name="tab_menu_size">40dp</dimen>
+    <!-- Width Namespace | Width for UI elements -->
+    <dimen name="width_track_number">32dp</dimen>
 
-    <dimen name="cover_size_small">36dp</dimen>
-    <dimen name="cover_size_compact">44dp</dimen>
-    <dimen name="cover_size_normal">56dp</dimen>
-    <dimen name="cover_size_large">68dp</dimen>
-    <dimen name="cover_size_huge">250dp</dimen>
-    <dimen name="cover_size_playback">110dp</dimen>
+    <!-- Size Namespace | Width & Heights for UI elements -->
+    <dimen name="size_error_icon">48dp</dimen>
+    <dimen name="size_divider_ripple">18dp</dimen>
+    <dimen name="size_cover_compact">44dp</dimen>
+    <dimen name="size_cover_normal">56dp</dimen>
+    <dimen name="size_cover_large">68dp</dimen>
+    <dimen name="size_cover_huge">250dp</dimen>
+    <dimen name="size_play_pause">70dp</dimen>
+    <dimen name="size_play_pause_compact">36dp</dimen>
 
-    <dimen name="track_number_width">32dp</dimen>
-    <dimen name="track_number_text_size_max">20sp</dimen>
-
-    <dimen name="detail_header_size_max">26sp</dimen>
-
-    <dimen name="generic_size_min">10sp</dimen>'
-    <dimen name="generic_size_increment">2sp</dimen>
-
-    <dimen name="divider_ripple_size">18dp</dimen>
-
-    <dimen name="playback_progress_size">2dp</dimen>
-
-    <dimen name="controls_size">70dp</dimen>
-    <dimen name="controls_size_compact">36dp</dimen>
+    <!-- Text Size Namespace | Text Sizes -->
+    <dimen name="text_size_min">10sp</dimen>
+    <dimen name="text_size_increment">2sp</dimen>
+    <dimen name="text_size_track_max">20sp</dimen>
+    <dimen name="text_size_header_max">26sp</dimen>
 
+    <!-- Misc -->
     <dimen name="elevation_normal">4dp</dimen>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index 941e70ed7..3240b2562 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -25,7 +25,7 @@
         <item name="android:textAppearance">?android:attr/textAppearanceLarge</item>
         <item name="android:textColor">?android:attr/colorPrimary</item>
         <item name="android:fontFamily">@font/inter_black</item>
-        <item name="android:textSize">@dimen/detail_header_size_max</item>
+        <item name="android:textSize">@dimen/text_size_header_max</item>
     </style>
 
     <style name="TextAppearance.SmallHeader" parent="TextAppearance.MaterialComponents.Body2">