Fabio/Auxio
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

style: add popupmenu black theme support

Browse source 
Tack on some more themes to make popupmenu styles follow the new black
theme introduced in 68bdd0.
This commit is contained in:
OxygenCobalt 2021-06-11 13:17:41 -06:00
parent 68bdd0d929
commit 381c0f0944
No known key found for this signature in database
GPG key ID: 37DBE3621FE9AD47
8 changed files with 37 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/src/main/java/org/oxycblt/auxio/settings/accent/AccentAdapter.kt
View file

@ -66,7 +66,7 @@ class AccentAdapter(
selectedViewHolder?.setSelected(false)
selectedViewHolder = this
R.color.background.toStateList(context)
R.color.surface_color.toStateList(context)
} else {
android.R.color.transparent.toStateList(context)
}

2
app/src/main/java/org/oxycblt/auxio/settings/ui/LifecycleDialog.kt
View file

@ -20,7 +20,7 @@ abstract class LifecycleDialog : AppCompatDialogFragment() {
// Setting the background in XML will also apply it to the tooltip for some inane reason
// so we have to do it programmatically instead.
builder.background = R.color.background.toDrawable(requireContext())
builder.background = R.color.surface_color.toDrawable(requireContext())
onConfigDialog(builder)

2
app/src/main/res/values-night/colors.xml
View file

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<color name="background">#151515</color>
<color name="surface_color">#151515</color>
<color name="divider_color">#323232</color>
<color name="selection_color">#484848</color>
<color name="inactive_color">#404040</color>

6
app/src/main/res/values/colors.xml
View file

@ -1,14 +1,14 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<color name="background">#fafafa</color>
<color name="surface_color">#fafafa</color>
<color name="divider_color">#cbcbcb</color>
<color name="selection_color">#cbcbcb</color>
<color name="inactive_color">#c4c4c4</color>
<color name="control_color">#202020</color>
<color name="nav_color">#01fafafa</color>
<color name="background_black">#000000</color>
<color name="selection_color_black">#343434</color>
<color name="surface_color_black">#000000</color>
<color name="selection_color_black">#363636</color>
<!--
Base color set derived from Music Player GO.

19
app/src/main/res/values/styles_android.xml
View file

@ -4,18 +4,29 @@
<!-- Custom popup menu theme -->
<style name="Widget.CustomPopup" parent="Widget.AppCompat.PopupMenu">
<item name="android:popupBackground">@color/background</item>
<item name="colorControlHighlight">@color/selection_color</item>
<item name="android:popupBackground">?attr/colorSurface</item>
<item name="colorControlHighlight">?attr/colorControlHighlight</item>
<item name="cornerRadius">0dp</item>
</style>
<!-- Toolbar popup menu -->
<style name="ThemeOverlay.ToolbarPopup" parent="ThemeOverlay.AppCompat.DayNight">
<item name="android:colorBackground">?attr/colorSurface</item>
<item name="colorControlHighlight">@color/selection_color</item>
</style>
<!-- Toolbar popup menu [Black] -->
<style name="ThemeOverlay.ToolbarPopup.Black" parent="ThemeOverlay.ToolbarPopup">
<item name="colorControlHighlight">@color/selection_color_black</item>
</style>
<!-- Custom Dialog EntryNames -->
<style name="Theme.CustomDialog" parent="ThemeOverlay.MaterialComponents.MaterialAlertDialog">
<item name="android:colorControlHighlight">@color/selection_color</item>
<item name="android:checkedTextViewStyle">@style/Widget.CheckedTextView.Dialog</item>
<item name="materialAlertDialogTitleTextStyle">@style/Widget.TextView.Dialog.Title</item>
<item name="colorBackgroundFloating">@color/background</item>
<item name="colorBackgroundFloating">@color/surface_color</item>
<item name="alertDialogStyle">@style/MaterialAlertDialog.App</item>
<item name="buttonBarPositiveButtonStyle">@style/Widget.Button.Dialog</item>
@ -61,4 +72,6 @@
<style name="Widget.Button.Dialog.Neutral" parent="Widget.Button.Dialog">
<item name="android:layout_marginStart">0dp</item>
</style>
</resources>

8
app/src/main/res/values/styles_component.xml
View file

@ -47,6 +47,12 @@
<item name="android:background">@drawable/ui_ripple</item>
</style>
<!-- Toolbar Title EntryNames -->
<style name="TextAppearance.Toolbar.Header" parent="TextAppearance.Widget.AppCompat.Toolbar.Title">
<item name="android:fontFamily">@font/inter_bold</item>
<item name="android:textSize">@dimen/text_size_toolbar_header</item>
</style>
<!-- Style for the play/pause circle button -->
<style name="PlayPause">
<item name="android:layout_height">@dimen/size_play_pause</item>
@ -168,6 +174,6 @@
<item name="rippleColor">?attr/colorControlHighlight</item>
<item name="fontFamily">@font/inter_semibold</item>
<item name="textAllCaps">false</item>
<item name="android:textColor">@color/background</item>
<item name="android:textColor">@color/surface_color</item>
</style>
</resources>

9
app/src/main/res/values/styles_core.xml
View file

@ -5,6 +5,9 @@
<!-- Template theme that handles edge-to-edge on other styles variants -->
<style name="Theme.Template" parent="Theme.Master" />
<!-- Redirects to the correct toolbar popup theme [Normal or Black] -->
<attr name="toolbarPopupTheme" format="reference" />
<!-- Base theme -->
<style name="Theme.Base" parent="Theme.Template">
<item name="android:windowBackground">?attr/colorSurface</item>
@ -24,7 +27,8 @@
<item name="colorControlActivated">?attr/colorPrimary</item>
<item name="cornerRadius">0dp</item>
<item name="colorSurface">@color/background</item>
<item name="colorSurface">@color/surface_color</item>
<item name="toolbarPopupTheme">@style/ThemeOverlay.ToolbarPopup</item>
<!--
These exact flags, in this exact order, in this exact formatting somehow make
@ -38,7 +42,8 @@
</style>
<style name="Theme.Base.Black" parent="Theme.Base">
<item name="colorSurface">@color/background_black</item>
<item name="colorSurface">@color/surface_color_black</item>
<item name="colorControlHighlight">@color/selection_color_black</item>
<item name="toolbarPopupTheme">@style/ThemeOverlay.ToolbarPopup.Black</item>
</style>
</resources>

14
app/src/main/res/values/styles_ui.xml
View file

@ -8,7 +8,7 @@
<item name="android:layout_height">?android:attr/actionBarSize</item>
<item name="android:background">?attr/colorSurface</item>
<item name="android:elevation">@dimen/elevation_normal</item>
<item name="popupTheme">@style/AppThemeOverlay.ToolbarPopup</item>
<item name="popupTheme">?attr/toolbarPopupTheme</item>
<item name="titleTextAppearance">@style/TextAppearance.Toolbar.Header</item>
<item name="titleTextColor">?attr/colorPrimary</item>
@ -25,18 +25,6 @@
<item name="navigationIcon">@drawable/ic_down</item>
</style>
<!-- Toolbar popup menu -->
<style name="AppThemeOverlay.ToolbarPopup" parent="ThemeOverlay.AppCompat.DayNight">
<item name="android:colorBackground">@color/background</item>
<item name="colorControlHighlight">@color/selection_color</item>
</style>
<!-- Toolbar Title EntryNames -->
<style name="TextAppearance.Toolbar.Header" parent="TextAppearance.Widget.AppCompat.Toolbar.Title">
<item name="android:fontFamily">@font/inter_bold</item>
<item name="android:textSize">@dimen/text_size_toolbar_header</item>
</style>
<!-- Style for the general item background -->
<style name="ItemSurroundings">
<item name="android:layout_width">match_parent</item>