Dialog color fix (#1308)

This commit is contained in:
Bram van de Kerkhof 2018-03-14 18:01:30 +01:00 committed by GitHub
parent 81c23bbf9d
commit 2159b72e69
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 10 additions and 9 deletions

View file

@ -27,7 +27,7 @@
<!-- Attributes specific for SDK 21 and up --> <!-- Attributes specific for SDK 21 and up -->
<item name="android:windowDrawsSystemBarBackgrounds">true</item> <item name="android:windowDrawsSystemBarBackgrounds">true</item>
<item name="android:statusBarColor">@android:color/transparent</item> <item name="android:statusBarColor">@android:color/transparent</item>
<item name="android:navigationBarColor">@color/colorAmoled</item> <item name="android:navigationBarColor">@color/colorAmoledPrimary</item>
</style> </style>
<!--==============--> <!--==============-->

View file

@ -1,12 +1,12 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<resources> <resources>
<!-- Application Colors --> <!-- Application Colors -->
<color name="colorPrimary">#54759e</color> <color name="colorPrimary">#54759E</color>
<color name="colorPrimaryDark">#435e7e</color> <color name="colorPrimaryDark">#435E7E</color>
<!-- Dark Application Colors --> <!-- Dark Application Colors -->
<color name="colorDarkPrimary">#212121</color> <color name="colorDarkPrimary">#212121</color>
<color name="colorDarkPrimaryDark">#1c1c1d</color> <color name="colorDarkPrimaryDark">#1C1C1D</color>
<color name="colorAmoled">@color/md_black_1000</color> <color name="colorAmoledPrimary">@color/md_black_1000</color>
<!-- Light Theme --> <!-- Light Theme -->
<color name="colorAccentLight">@color/md_blue_A400</color> <color name="colorAccentLight">@color/md_blue_A400</color>
@ -27,7 +27,7 @@
<color name="iconColorLight">@color/md_black_1000</color> <color name="iconColorLight">@color/md_black_1000</color>
<!-- Dark Theme --> <!-- Dark Theme -->
<color name="colorAccentDark">#3399ff</color> <color name="colorAccentDark">#3399FF</color>
<color name="textColorPrimaryDark">@color/md_white_1000</color> <color name="textColorPrimaryDark">@color/md_white_1000</color>
<color name="textColorSecondaryDark">@color/md_white_1000_70</color> <color name="textColorSecondaryDark">@color/md_white_1000_70</color>
<color name="textColorHintDark">@color/md_white_1000_50</color> <color name="textColorHintDark">@color/md_white_1000_50</color>
@ -36,7 +36,7 @@
<color name="statusBarDark">@color/md_black_1000</color> <color name="statusBarDark">@color/md_black_1000</color>
<color name="appBarDark">@color/md_grey_900</color> <color name="appBarDark">@color/md_grey_900</color>
<color name="backgroundDark">#1c1c1d</color> <color name="backgroundDark">@color/colorDarkPrimaryDark</color>
<color name="dialogDark">@color/colorDarkPrimary</color> <color name="dialogDark">@color/colorDarkPrimary</color>
<color name="dialog_amoled">@color/colorDarkPrimaryDark</color> <color name="dialog_amoled">@color/colorDarkPrimaryDark</color>

View file

@ -66,6 +66,7 @@
<item name="actionBarTheme">@style/ThemeOverlay.AppCompat.Dark.ActionBar</item> <item name="actionBarTheme">@style/ThemeOverlay.AppCompat.Dark.ActionBar</item>
<item name="actionBarPopupTheme">@style/ThemeOverlay.AppCompat</item> <item name="actionBarPopupTheme">@style/ThemeOverlay.AppCompat</item>
<item name="preferenceTheme">@style/PreferenceThemeOverlay.Material</item> <item name="preferenceTheme">@style/PreferenceThemeOverlay.Material</item>
<item name="md_background_color">@color/dialogDark</item>
<item name="alertDialogTheme">@style/Theme.AlertDialog.Dark</item> <item name="alertDialogTheme">@style/Theme.AlertDialog.Dark</item>
@ -86,8 +87,8 @@
<!-- Amoled Theme --> <!-- Amoled Theme -->
<!--==============--> <!--==============-->
<style name="Theme.Base.Amoled" parent="Theme.Base.Dark"> <style name="Theme.Base.Amoled" parent="Theme.Base.Dark">
<item name="colorPrimary">@color/colorAmoled</item> <item name="colorPrimary">@color/colorAmoledPrimary</item>
<item name="colorPrimaryDark">@color/colorAmoled</item> <item name="colorPrimaryDark">@color/colorAmoledPrimary</item>
<item name="android:colorBackground">@color/md_black_1000</item> <item name="android:colorBackground">@color/md_black_1000</item>
<!-- Custom Attributes--> <!-- Custom Attributes-->