[Theme] Merged styles.xml v21 with the normal configuration

This commit is contained in:
Prathamesh More 2021-11-28 20:01:32 +05:30
parent 0723c34ec4
commit 1e85bcf388
2 changed files with 7 additions and 48 deletions

View file

@ -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>

View file

@ -1,26 +1,22 @@
<resources xmlns:tools="http://schemas.android.com/tools"> <resources xmlns:tools="http://schemas.android.com/tools">
<style name="Theme.RetroMusic" parent="Theme.RetroMusic.Base" /> <style name="Theme.RetroMusic" parent="Theme.RetroMusic.Base">
<item name="android:statusBarColor">@android:color/transparent</item>
<style name="Theme.RetroMusic.Light" parent="Theme.RetroMusic.Base.Light"> <item name="android:windowSharedElementsUseOverlay">false</item>
<item name="android:windowBackground">@color/window_color_light</item> <item name="android:textViewStyle">@style/TextViewStyleIm</item>
<item name="android:scrollbars">none</item> <item name="android:scrollbars">none</item>
<item name="dialogCornerRadius">16dp</item> <item name="dialogCornerRadius">16dp</item>
<item name="android:windowAnimationStyle">@style/WindowAnimationTransition</item> <item name="android:windowAnimationStyle">@style/WindowAnimationTransition</item>
</style> </style>
<style name="Theme.RetroMusic.Light" parent="Theme.RetroMusic.Base.Light" />
<style name="Theme.RetroMusic.Black" parent="Theme.RetroMusic.Base.Black"> <style name="Theme.RetroMusic.Black" parent="Theme.RetroMusic.Base.Black">
<item name="android:windowBackground">@color/window_color_dark</item> <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>
<style name="Theme.RetroMusic.FollowSystem" parent="Theme.RetroMusic.Base.Adaptive"> <style name="Theme.RetroMusic.FollowSystem" parent="Theme.RetroMusic.Base.Adaptive">
<item name="android:windowBackground">@color/window_color</item> <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>
<style name="Theme.RetroMusic.MD3" parent="@style/Theme.Material3.DayNight.NoActionBar"> <style name="Theme.RetroMusic.MD3" parent="@style/Theme.Material3.DayNight.NoActionBar">
@ -46,7 +42,7 @@
</style> </style>
<style name="MusicProgressSlider" parent="MusicProgressSliderParent"> <style name="MusicProgressSlider" parent="MusicProgressSliderParent">
<item name="android:thumbOffset">0dp</item> <item name="android:padding">0dp</item>
</style> </style>
<style name="Toolbar" parent="Widget.Material3.Toolbar"> <style name="Toolbar" parent="Widget.Material3.Toolbar">