From 5788fb873297db9f70eff3638cd80a46812016fc Mon Sep 17 00:00:00 2001
From: OxygenCobalt <oxycblt@abstractr.net>
Date: Mon, 16 Aug 2021 19:31:00 -0600
Subject: [PATCH] style: tweak dimens

Tweak some dimens so that they line up with the 8dp grid. This doesn't
apply to all of them since some of them are fined-tuned [such as the
fast-scroller]. The latter would likely be migrated in the later UI
overhaul.
---
 .../playback/state/PlaybackStateDatabase.kt   |  2 +-
 .../java/org/oxycblt/auxio/ui/AndroidUtils.kt |  1 -
 .../main/res/layout-land/fragment_main.xml    |  2 +-
 .../res/layout-land/item_album_header.xml     |  4 ++--
 .../res/layout-land/item_artist_header.xml    |  4 ++--
 .../res/layout-land/item_genre_header.xml     |  4 ++--
 .../res/layout-large/item_album_header.xml    |  4 ++--
 .../res/layout-large/item_artist_header.xml   |  4 ++--
 .../res/layout-large/item_genre_header.xml    |  4 ++--
 app/src/main/res/layout/fragment_loading.xml  | 10 +---------
 app/src/main/res/layout/fragment_main.xml     |  5 +++--
 app/src/main/res/layout/item_album_header.xml |  4 ++--
 .../main/res/layout/item_artist_header.xml    |  4 ++--
 app/src/main/res/layout/item_genre_header.xml |  5 +++--
 .../main/res/values-v31/styles_component.xml  |  2 --
 app/src/main/res/values/dimens.xml            | 19 +++++++++++--------
 app/src/main/res/values/styles_component.xml  |  7 +------
 app/src/main/res/values/styles_ui.xml         |  4 ++--
 18 files changed, 39 insertions(+), 50 deletions(-)

diff --git a/app/src/main/java/org/oxycblt/auxio/playback/state/PlaybackStateDatabase.kt b/app/src/main/java/org/oxycblt/auxio/playback/state/PlaybackStateDatabase.kt
index 42685da38..d81780b1e 100644
--- a/app/src/main/java/org/oxycblt/auxio/playback/state/PlaybackStateDatabase.kt
+++ b/app/src/main/java/org/oxycblt/auxio/playback/state/PlaybackStateDatabase.kt
@@ -23,9 +23,9 @@ import android.content.Context
 import android.database.sqlite.SQLiteDatabase
 import android.database.sqlite.SQLiteOpenHelper
 import androidx.core.database.sqlite.transaction
-import org.oxycblt.auxio.ui.queryAll
 import org.oxycblt.auxio.logD
 import org.oxycblt.auxio.ui.assertBackgroundThread
+import org.oxycblt.auxio.ui.queryAll
 
 /**
  * A SQLite database for managing the persistent playback state and queue.
diff --git a/app/src/main/java/org/oxycblt/auxio/ui/AndroidUtils.kt b/app/src/main/java/org/oxycblt/auxio/ui/AndroidUtils.kt
index 08791de8e..abdca58b8 100644
--- a/app/src/main/java/org/oxycblt/auxio/ui/AndroidUtils.kt
+++ b/app/src/main/java/org/oxycblt/auxio/ui/AndroidUtils.kt
@@ -207,7 +207,6 @@ fun Context.newMainIntent(): PendingIntent {
 fun <R> SQLiteDatabase.queryAll(tableName: String, block: (Cursor) -> R) =
     query(tableName, null, null, null, null, null, null)?.use(block)
 
-
 /**
  * Assert that we are on a background thread.
  */
diff --git a/app/src/main/res/layout-land/fragment_main.xml b/app/src/main/res/layout-land/fragment_main.xml
index 735ce6141..355ddc8a4 100644
--- a/app/src/main/res/layout-land/fragment_main.xml
+++ b/app/src/main/res/layout-land/fragment_main.xml
@@ -30,7 +30,7 @@
             android:animateLayoutChanges="true"
             android:background="?android:attr/colorBackground"
             android:baselineAligned="false"
-            android:elevation="@dimen/elevation_normal"
+            android:elevation="8dp"
             android:orientation="horizontal"
             app:layout_constraintBottom_toBottomOf="parent">
 
diff --git a/app/src/main/res/layout-land/item_album_header.xml b/app/src/main/res/layout-land/item_album_header.xml
index ecec3145a..9317ad359 100644
--- a/app/src/main/res/layout-land/item_album_header.xml
+++ b/app/src/main/res/layout-land/item_album_header.xml
@@ -26,8 +26,8 @@
         <ImageView
             android:id="@+id/album_cover"
             style="@style/Widget.ImageView.Full"
-            android:layout_width="@dimen/size_cover_detail_land"
-            android:layout_height="@dimen/size_cover_detail_land"
+            android:layout_width="@dimen/size_cover_huge_land"
+            android:layout_height="@dimen/size_cover_huge_land"
             android:layout_marginStart="@dimen/spacing_medium"
             android:layout_marginTop="@dimen/spacing_medium"
             android:contentDescription="@{@string/desc_album_cover(album.name)}"
diff --git a/app/src/main/res/layout-land/item_artist_header.xml b/app/src/main/res/layout-land/item_artist_header.xml
index 010776d92..a35893b69 100644
--- a/app/src/main/res/layout-land/item_artist_header.xml
+++ b/app/src/main/res/layout-land/item_artist_header.xml
@@ -21,8 +21,8 @@
 
         <ImageView
             android:id="@+id/artist_image"
-            android:layout_width="@dimen/size_cover_detail_land"
-            android:layout_height="@dimen/size_cover_detail_land"
+            android:layout_width="@dimen/size_cover_huge_land"
+            android:layout_height="@dimen/size_cover_huge_land"
             android:layout_margin="@dimen/spacing_medium"
             android:contentDescription="@{@string/desc_artist_image(artist.name)}"
             style="@style/Widget.ImageView.Full"
diff --git a/app/src/main/res/layout-land/item_genre_header.xml b/app/src/main/res/layout-land/item_genre_header.xml
index e0a4b4eef..6a14ed49b 100644
--- a/app/src/main/res/layout-land/item_genre_header.xml
+++ b/app/src/main/res/layout-land/item_genre_header.xml
@@ -25,8 +25,8 @@
 
         <ImageView
             android:id="@+id/genre_image"
-            android:layout_width="@dimen/size_cover_detail_land"
-            android:layout_height="@dimen/size_cover_detail_land"
+            android:layout_width="@dimen/size_cover_huge_land"
+            android:layout_height="@dimen/size_cover_huge_land"
             android:layout_margin="@dimen/spacing_medium"
             android:contentDescription="@{@string/desc_genre_image(genre.name)}"
             style="@style/Widget.ImageView.Full"
diff --git a/app/src/main/res/layout-large/item_album_header.xml b/app/src/main/res/layout-large/item_album_header.xml
index 5a5da3378..964ebbc4c 100644
--- a/app/src/main/res/layout-large/item_album_header.xml
+++ b/app/src/main/res/layout-large/item_album_header.xml
@@ -25,8 +25,8 @@
 
         <ImageView
             android:id="@+id/album_cover"
-            android:layout_width="@dimen/size_cover_detail"
-            android:layout_height="@dimen/size_cover_detail"
+            android:layout_width="@dimen/size_cover_huge"
+            android:layout_height="@dimen/size_cover_huge"
             android:layout_marginStart="@dimen/spacing_medium"
             android:layout_marginTop="@dimen/spacing_medium"
             android:contentDescription="@{@string/desc_album_cover(album.name)}"
diff --git a/app/src/main/res/layout-large/item_artist_header.xml b/app/src/main/res/layout-large/item_artist_header.xml
index f48d65c61..141ef7022 100644
--- a/app/src/main/res/layout-large/item_artist_header.xml
+++ b/app/src/main/res/layout-large/item_artist_header.xml
@@ -21,8 +21,8 @@
 
         <ImageView
             android:id="@+id/artist_image"
-            android:layout_width="@dimen/size_cover_detail"
-            android:layout_height="@dimen/size_cover_detail"
+            android:layout_width="@dimen/size_cover_huge"
+            android:layout_height="@dimen/size_cover_huge"
             android:layout_margin="@dimen/spacing_medium"
             android:contentDescription="@{@string/desc_artist_image(artist.name)}"
             style="@style/Widget.ImageView.Full"
diff --git a/app/src/main/res/layout-large/item_genre_header.xml b/app/src/main/res/layout-large/item_genre_header.xml
index 8839b7c10..9e10c4786 100644
--- a/app/src/main/res/layout-large/item_genre_header.xml
+++ b/app/src/main/res/layout-large/item_genre_header.xml
@@ -25,8 +25,8 @@
 
         <ImageView
             android:id="@+id/genre_image"
-            android:layout_width="@dimen/size_cover_detail"
-            android:layout_height="@dimen/size_cover_detail"
+            android:layout_width="@dimen/size_cover_huge"
+            android:layout_height="@dimen/size_cover_huge"
             android:layout_margin="@dimen/spacing_medium"
             android:contentDescription="@{@string/desc_genre_image(genre.name)}"
             style="@style/Widget.ImageView.Full"
diff --git a/app/src/main/res/layout/fragment_loading.xml b/app/src/main/res/layout/fragment_loading.xml
index 6b68cb42c..f9a366e64 100644
--- a/app/src/main/res/layout/fragment_loading.xml
+++ b/app/src/main/res/layout/fragment_loading.xml
@@ -16,21 +16,13 @@
         android:gravity="center"
         android:orientation="vertical">
 
-        <ImageView
-            android:id="@+id/loading_splash"
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:src="@drawable/ic_launcher_foreground"
-            android:contentDescription="@string/desc_auxio_icon"
-            android:padding="@dimen/spacing_huge" />
-
         <androidx.constraintlayout.widget.ConstraintLayout
             android:id="@+id/loading_panel"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_margin="@dimen/spacing_large"
             android:animateLayoutChanges="true"
-            android:layout_gravity="bottom"
+            android:layout_gravity="center"
             android:gravity="center"
             android:orientation="vertical">
 
diff --git a/app/src/main/res/layout/fragment_main.xml b/app/src/main/res/layout/fragment_main.xml
index 95a87bd4d..9028f7458 100644
--- a/app/src/main/res/layout/fragment_main.xml
+++ b/app/src/main/res/layout/fragment_main.xml
@@ -26,7 +26,9 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:animateLayoutChanges="true"
-            android:elevation="@dimen/elevation_normal"
+            android:background="?android:attr/colorBackground"
+            android:baselineAligned="false"
+            android:elevation="8dp"
             android:orientation="vertical"
             app:layout_constraintBottom_toBottomOf="parent">
 
@@ -43,7 +45,6 @@
                 android:layout_height="wrap_content"
                 android:layout_gravity="bottom"
                 android:background="?attr/colorSurface"
-                android:elevation="0dp"
                 app:elevation="0dp"
                 app:menu="@menu/menu_nav" />
 
diff --git a/app/src/main/res/layout/item_album_header.xml b/app/src/main/res/layout/item_album_header.xml
index 7308c9dea..283e36e8b 100644
--- a/app/src/main/res/layout/item_album_header.xml
+++ b/app/src/main/res/layout/item_album_header.xml
@@ -26,8 +26,8 @@
         <ImageView
             android:id="@+id/album_cover"
             style="@style/Widget.ImageView.Full"
-            android:layout_width="@dimen/size_cover_detail"
-            android:layout_height="@dimen/size_cover_detail"
+            android:layout_width="@dimen/size_cover_huge"
+            android:layout_height="@dimen/size_cover_huge"
             android:layout_marginTop="@dimen/spacing_medium"
             android:contentDescription="@{@string/desc_album_cover(album.name)}"
             app:albumArt="@{album}"
diff --git a/app/src/main/res/layout/item_artist_header.xml b/app/src/main/res/layout/item_artist_header.xml
index 3924c961d..582e2e613 100644
--- a/app/src/main/res/layout/item_artist_header.xml
+++ b/app/src/main/res/layout/item_artist_header.xml
@@ -22,8 +22,8 @@
         <ImageView
             android:id="@+id/artist_image"
             style="@style/Widget.ImageView.Full"
-            android:layout_width="@dimen/size_cover_detail"
-            android:layout_height="@dimen/size_cover_detail"
+            android:layout_width="@dimen/size_cover_huge"
+            android:layout_height="@dimen/size_cover_huge"
             android:layout_marginTop="@dimen/spacing_medium"
             android:contentDescription="@{@string/desc_artist_image(artist.name)}"
             app:artistImage="@{artist}"
diff --git a/app/src/main/res/layout/item_genre_header.xml b/app/src/main/res/layout/item_genre_header.xml
index ce32ead61..e60f68153 100644
--- a/app/src/main/res/layout/item_genre_header.xml
+++ b/app/src/main/res/layout/item_genre_header.xml
@@ -27,8 +27,8 @@
         <ImageView
             android:id="@+id/genre_image"
             style="@style/Widget.ImageView.Full"
-            android:layout_width="@dimen/size_cover_detail"
-            android:layout_height="@dimen/size_cover_detail"
+            android:layout_width="@dimen/size_cover_huge"
+            android:layout_height="@dimen/size_cover_huge"
             android:layout_marginTop="@dimen/spacing_medium"
             android:contentDescription="@{@string/desc_genre_image(genre.name)}"
             app:genreImage="@{genre}"
@@ -94,6 +94,7 @@
             android:backgroundTint="?attr/colorAccent"
             android:onClick="@{() -> playbackModel.playGenre(genre, true)}"
             android:text="@string/lbl_shuffle"
+            android:layout_marginEnd="@dimen/spacing_medium"
             app:layout_constraintBottom_toBottomOf="@+id/genre_play_button"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toEndOf="@+id/genre_play_button"
diff --git a/app/src/main/res/values-v31/styles_component.xml b/app/src/main/res/values-v31/styles_component.xml
index efb0ce40a..9c97eb335 100644
--- a/app/src/main/res/values-v31/styles_component.xml
+++ b/app/src/main/res/values-v31/styles_component.xml
@@ -3,6 +3,4 @@
     <style name="Widget.Component.AppWidget.Button" parent="Widget.Component.AppWidget.Button.Base">
         <item name="android:background">@drawable/ui_unbounded_ripple</item>
     </style>
-
-    <style name="Widget.Component.AppWidget.Panel" parent="Widget.Component.AppWidget.Panel.Base" />
 </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 18afbc0e6..5ac8d9bb8 100644
--- a/app/src/main/res/values/dimens.xml
+++ b/app/src/main/res/values/dimens.xml
@@ -1,5 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
+    <!--
+    TODO: Rejig these dimens to line up with the 8dp grid. Dimens like the stroke should
+     be increased.-->
+
     <!-- Spacing Namespace | Dimens for padding/margin attributes -->
     <dimen name="spacing_micro">2dp</dimen>
     <dimen name="spacing_tiny">4dp</dimen>
@@ -12,30 +16,29 @@
     <dimen name="spacing_insane">128dp</dimen>
 
     <!-- Height Namespace | Height for UI elements -->
-    <dimen name="height_compact_progress">2dp</dimen>
     <dimen name="height_widget_button">32dp</dimen>
 
     <!-- Width Namespace | Width for UI elements -->
     <dimen name="width_track_number">32dp</dimen>
-    <dimen name="width_play_stroke">1dp</dimen>
     <dimen name="width_fast_scroll">20dp</dimen>
 
     <!-- Size Namespace | Width & Heights for UI elements -->
     <dimen name="size_small_unb_ripple">18dp</dimen>
     <dimen name="size_unb_ripple">24dp</dimen>
 
-    <dimen name="size_cover_compact">46dp</dimen>
+    <dimen name="size_cover_compact">48dp</dimen>
     <dimen name="size_cover_normal">56dp</dimen>
-    <dimen name="size_cover_large">68dp</dimen>
-    <dimen name="size_cover_detail">260dp</dimen>
-    <dimen name="size_cover_detail_land">130dp</dimen>
+    <dimen name="size_cover_large">64dp</dimen>
+    <dimen name="size_cover_huge">264dp</dimen>
+    <dimen name="size_cover_huge_land">136dp</dimen>
 
-    <dimen name="size_play_pause">70dp</dimen>
+    <dimen name="size_play_pause">72dp</dimen>
     <dimen name="size_play_pause_compact">36dp</dimen>
     <dimen name="size_scroll_thumb">48dp</dimen>
     <dimen name="size_clear">32dp</dimen>
 
-    <dimen name="size_app_icon">50dp</dimen>
+    <dimen name="size_app_icon">48dp</dimen>
+    <dimen name="size_stroke">2dp</dimen>
 
     <!-- Text Size Namespace | Text Sizes -->
     <dimen name="text_size_small">16sp</dimen>
diff --git a/app/src/main/res/values/styles_component.xml b/app/src/main/res/values/styles_component.xml
index 37be39e0f..7735dcee1 100644
--- a/app/src/main/res/values/styles_component.xml
+++ b/app/src/main/res/values/styles_component.xml
@@ -64,16 +64,11 @@
         <item name="android:background">?android:attr/selectableItemBackgroundBorderless</item>
     </style>
 
-    <style name="Widget.Component.AppWidget.Panel.Base">
+    <style name="Widget.Component.AppWidget.Panel" parent="">
         <item name="android:layout_height">wrap_content</item>
         <item name="android:layout_width">match_parent</item>
         <item name="android:padding">@dimen/spacing_medium</item>
         <item name="android:orientation">vertical</item>
         <item name="android:background">?attr/colorSurface</item>
     </style>
-
-    <style name="Widget.Component.AppWidget.Panel" parent="Widget.Component.AppWidget.Panel.Base">
-        <item name="android:elevation">@dimen/elevation_normal</item>
-    </style>
-
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/styles_ui.xml b/app/src/main/res/values/styles_ui.xml
index cfeca317e..cec08613d 100644
--- a/app/src/main/res/values/styles_ui.xml
+++ b/app/src/main/res/values/styles_ui.xml
@@ -27,7 +27,7 @@
 
     <style name="Widget.ProgressBar.Compact" parent="@style/Widget.AppCompat.ProgressBar.Horizontal">
         <item name="android:layout_width">match_parent</item>
-        <item name="android:layout_height">@dimen/height_compact_progress</item>
+        <item name="android:layout_height">@dimen/size_stroke</item>
         <item name="android:progressBackgroundTint">?attr/colorControlNormal</item>
         <item name="android:progressTint">?attr/colorAccent</item>
     </style>
@@ -216,6 +216,6 @@
 
     <style name="Widget.Button.Vibrant.Secondary" parent="@style/Widget.Button.Vibrant.Base">
         <item name="strokeColor">@color/divider</item>
-        <item name="strokeWidth">@dimen/width_play_stroke</item>
+        <item name="strokeWidth">@dimen/size_stroke</item>
     </style>
 </resources>
\ No newline at end of file