From 1e85bcf3884774aa1e0b1eada099f758b8edcdaf Mon Sep 17 00:00:00 2001
From: Prathamesh More <prathameshmm02@gmail.com>
Date: Sun, 28 Nov 2021 20:01:32 +0530
Subject: [PATCH] [Theme] Merged styles.xml v21 with the normal configuration

---
 app/src/main/res/values-v21/styles.xml | 37 --------------------------
 app/src/main/res/values/styles.xml     | 18 +++++--------
 2 files changed, 7 insertions(+), 48 deletions(-)
 delete mode 100644 app/src/main/res/values-v21/styles.xml

diff --git a/app/src/main/res/values-v21/styles.xml b/app/src/main/res/values-v21/styles.xml
deleted file mode 100644
index 57d3cb48..00000000
--- a/app/src/main/res/values-v21/styles.xml
+++ /dev/null
@@ -1,37 +0,0 @@
-<resources>
-
-    <style name="Theme.RetroMusic" parent="Theme.RetroMusic.Base">
-        <item name="android:statusBarColor">@android:color/transparent</item>
-        <item name="android:windowSharedElementsUseOverlay">false</item>
-        <item name="android:textViewStyle">@style/TextViewStyleIm</item>
-    </style>
-
-    <style name="Theme.RetroMusic.Light" parent="Theme.RetroMusic.Base.Light">
-        <item name="android:statusBarColor">@android:color/transparent</item>
-        <item name="android:windowSharedElementsUseOverlay">false</item>
-        <item name="android:textViewStyle">@style/TextViewStyleIm</item>
-    </style>
-
-    <style name="Theme.RetroMusic.Black" parent="Theme.RetroMusic.Base.Black">
-        <item name="android:statusBarColor">@android:color/transparent</item>
-        <item name="android:windowSharedElementsUseOverlay">false</item>
-        <item name="android:textViewStyle">@style/TextViewStyleIm</item>
-        <item name="android:windowBackground">@color/window_color_dark</item>
-    </style>
-
-    <style name="Theme.RetroMusic.FollowSystem" parent="Theme.RetroMusic.Base.Adaptive">
-        <item name="android:statusBarColor">@android:color/transparent</item>
-        <item name="android:windowSharedElementsUseOverlay">false</item>
-        <item name="android:textViewStyle">@style/TextViewStyleIm</item>
-        <item name="android:windowBackground">@color/window_color</item>
-    </style>
-
-    <style name="Theme.RetroMusic.Notification" parent="@android:style/TextAppearance.Material.Notification" />
-
-    <style name="Theme.RetroMusic.Notification.Title" parent="@android:style/TextAppearance.Material.Notification.Title" />
-
-    <style name="MusicProgressSlider" parent="MusicProgressSliderParent">
-        <item name="android:padding">0dp</item>
-    </style>
-
-</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 315cdd07..39810478 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -1,26 +1,22 @@
 <resources xmlns:tools="http://schemas.android.com/tools">
 
-    <style name="Theme.RetroMusic" parent="Theme.RetroMusic.Base" />
-
-    <style name="Theme.RetroMusic.Light" parent="Theme.RetroMusic.Base.Light">
-        <item name="android:windowBackground">@color/window_color_light</item>
+    <style name="Theme.RetroMusic" parent="Theme.RetroMusic.Base">
+        <item name="android:statusBarColor">@android:color/transparent</item>
+        <item name="android:windowSharedElementsUseOverlay">false</item>
+        <item name="android:textViewStyle">@style/TextViewStyleIm</item>
         <item name="android:scrollbars">none</item>
         <item name="dialogCornerRadius">16dp</item>
         <item name="android:windowAnimationStyle">@style/WindowAnimationTransition</item>
     </style>
 
+    <style name="Theme.RetroMusic.Light" parent="Theme.RetroMusic.Base.Light" />
+
     <style name="Theme.RetroMusic.Black" parent="Theme.RetroMusic.Base.Black">
         <item name="android:windowBackground">@color/window_color_dark</item>
-        <item name="android:scrollbars">none</item>
-        <item name="dialogCornerRadius">16dp</item>
-        <item name="android:windowAnimationStyle">@style/WindowAnimationTransition</item>
     </style>
 
     <style name="Theme.RetroMusic.FollowSystem" parent="Theme.RetroMusic.Base.Adaptive">
         <item name="android:windowBackground">@color/window_color</item>
-        <item name="android:scrollbars">none</item>
-        <item name="dialogCornerRadius">16dp</item>
-        <item name="android:windowAnimationStyle">@style/WindowAnimationTransition</item>
     </style>
 
     <style name="Theme.RetroMusic.MD3" parent="@style/Theme.Material3.DayNight.NoActionBar">
@@ -46,7 +42,7 @@
     </style>
 
     <style name="MusicProgressSlider" parent="MusicProgressSliderParent">
-        <item name="android:thumbOffset">0dp</item>
+        <item name="android:padding">0dp</item>
     </style>
 
     <style name="Toolbar" parent="Widget.Material3.Toolbar">