pastk/organicmaps
1
Fork 0
forked from organicmaps/organicmaps
Code Pull requests Activity

Fix background dialog

Browse source 
Signed-off-by: Jean-Baptiste CHARRON <jeanbaptiste.charron@outlook.fr>
This commit is contained in:
Jean-Baptiste 2023-02-22 17:02:35 +01:00 • committed by Viktor Govako
parent ec48e05ada
commit a6a9af3363
3 changed files with 12 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
android/res/values/themes-attrs.xml
View file

@ -2,6 +2,8 @@
<resources>
<declare-styleable name="ThemeAttrs">
<attr name="fullscreenDialogTheme" format="reference" />
<attr name="titleDialogTheme" format="reference" />
<attr name="textDialogTheme" format="reference" />
<attr name="windowBackgroundForced" format="reference|color" />
<attr name="cardBackground" format="reference" />
<attr name="clickableBackground" format="reference" />

4
android/res/values/themes-base.xml
View file

@ -23,6 +23,8 @@
<item name="alertDialogTheme">@style/MwmTheme.AlertDialog</item>
<item name="windowBackgroundForced">@color/bg_window</item>
<item name="cardBackground">@color/bg_cards</item>
<item name="titleDialogTheme">@color/black_primary</item>
<item name="textDialogTheme">@color/black_secondary</item>
<item name="fullscreenDialogTheme">@style/MwmTheme.DialogFragment.Fullscreen</item>
<item name="colorPrimary">@color/bg_primary</item>
<item name="colorControlNormal">?secondary</item>
@ -155,6 +157,8 @@
<item name="alertDialogTheme">@style/MwmTheme.Night.AlertDialog</item>
<item name="windowBackgroundForced">@color/bg_window_night</item>
<item name="cardBackground">@color/bg_cards_night</item>
<item name="titleDialogTheme">@color/white_primary</item>
<item name="textDialogTheme">@color/white_secondary</item>
<item name="fullscreenDialogTheme">@style/MwmTheme.DialogFragment.Fullscreen.Night</item>
<item name="colorPrimary">@color/bg_primary_night</item>
<item name="colorControlNormal">?secondary</item>

10
android/res/values/themes.xml
View file

@ -53,7 +53,8 @@
<style name="MwmTheme.AlertDialog" parent="Theme.AppCompat.Light.Dialog.Alert">
<item name="colorAccent">@color/base_accent</item>
<item name="android:textColorPrimary">@color/black_secondary</item>
<item name="android:background">?cardBackground</item>
<item name="android:textColorPrimary">?textDialogTheme</item>
<item name="android:textSize">@dimen/text_size_body_1</item>
<item name="android:windowTitleStyle">@style/MwmTheme.DialogTitleStyle.Light</item>
</style>
@ -64,20 +65,21 @@
</style>
<style name="MwmTheme.DialogTitleStyle.Light" parent="MwmTheme.DialogTitleBase">
<item name="android:textColor">@color/black_primary</item>
<item name="android:textColor">?titleDialogTheme</item>
</style>
<style name="MwmTheme.Night.AlertDialog" parent="Theme.AppCompat.Dialog.Alert">
<item name="colorAccent">@color/base_accent_night</item>
<item name="android:background">?cardBackground</item>
<!-- Used for the message in the dialog -->
<item name="android:textColorPrimary">@color/white_secondary</item>
<item name="android:textColorPrimary">?textDialogTheme</item>
<item name="android:textSize">@dimen/text_size_body_1</item>
<!-- Used for the title in the dialog -->
<item name="android:windowTitleStyle">@style/MwmTheme.DialogTitleStyle.Night</item>
</style>
<style name="MwmTheme.DialogTitleStyle.Night" parent="MwmTheme.DialogTitleBase">
<item name="android:textColor">@color/white_primary</item>
<item name="android:textColor">?titleDialogTheme</item>
</style>
<style name="MwmTheme.DialogFragment.TitleStyle" parent="Base.DialogWindowTitle.AppCompat">