Only attempt to use light system bars at appropriate API level

This commit is contained in:
Moez Bhatti
2018-04-03 16:30:47 -04:00
parent 8d0b8500c4
commit f64365f6eb
6 changed files with 107 additions and 48 deletions
@@ -0,0 +1,10 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<!-- On Marshmallow, use the light status bar -->
<style name="AppThemeLight" parent="AppBaseThemeLight">
<item name="android:statusBarColor">@color/statusBarLight</item>
<item name="android:windowLightStatusBar">true</item>
</style>
</resources>
@@ -0,0 +1,12 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<!-- On Oreo, use the light status and navigation bars -->
<style name="AppThemeLight" parent="AppBaseThemeLight">
<item name="android:navigationBarColor">@color/white</item>
<item name="android:statusBarColor">@color/statusBarLight</item>
<item name="android:windowLightNavigationBar">true</item>
<item name="android:windowLightStatusBar">true</item>
</style>
</resources>
@@ -18,51 +18,6 @@
-->
<resources>
<style name="AppThemeLight" parent="Theme.AppCompat.Light.NoActionBar">
<item name="android:windowBackground">@color/backgroundLight</item>
<item name="android:windowContentTransitions">true</item>
<item name="actionBarPopupTheme">@style/PopupThemeLight</item>
<item name="colorPrimary">@color/white</item>
<item name="colorPrimaryDark">@color/statusBarLight</item>
<item name="windowActionBar">false</item>
</style>
<style name="AppThemeLightDialog" parent="Theme.AppCompat.Light.Dialog">
<item name="android:windowBackground">@android:color/transparent</item>
<item name="actionBarPopupTheme">@style/PopupThemeLight</item>
<item name="windowActionBar">false</item>
</style>
<style name="AppThemeDark" parent="Theme.AppCompat.NoActionBar">
<item name="android:windowBackground">@color/backgroundDark</item>
<item name="android:windowContentTransitions">true</item>
<item name="actionBarPopupTheme">@style/PopupThemeDark</item>
<item name="colorPrimary">@color/backgroundDark</item>
<item name="colorPrimaryDark">@color/statusBarDark</item>
<item name="windowActionBar">false</item>
</style>
<style name="AppThemeDarkDialog" parent="Theme.AppCompat.Dialog">
<item name="android:windowBackground">@android:color/transparent</item>
<item name="actionBarPopupTheme">@style/PopupThemeDark</item>
<item name="windowActionBar">false</item>
</style>
<style name="AppThemeBlack" parent="Theme.AppCompat.NoActionBar">
<item name="android:windowBackground">@color/black</item>
<item name="android:windowContentTransitions">true</item>
<item name="actionBarPopupTheme">@style/PopupThemeDark</item>
<item name="colorPrimary">@color/black</item>
<item name="colorPrimaryDark">@color/black</item>
<item name="windowActionBar">false</item>
</style>
<style name="AppThemeBlackDialog" parent="Theme.AppCompat.Dialog">
<item name="android:windowBackground">@android:color/transparent</item>
<item name="actionBarPopupTheme">@style/PopupThemeBlack</item>
<item name="windowActionBar">false</item>
</style>
<style name="TextPrimary">
<item name="android:textSize">16sp</item>
<item name="textColor">primary</item>
@@ -0,0 +1,54 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<style name="AppThemeLight" parent="AppBaseThemeLight" />
<style name="AppBaseThemeLight" parent="Theme.AppCompat.Light.NoActionBar">
<item name="android:statusBarColor">@color/black</item>
<item name="android:windowBackground">@color/backgroundLight</item>
<item name="android:windowContentTransitions">true</item>
<item name="actionBarPopupTheme">@style/PopupThemeLight</item>
<item name="colorPrimary">@color/white</item>
<item name="colorPrimaryDark">@color/statusBarLight</item>
<item name="windowActionBar">false</item>
</style>
<style name="AppThemeLightDialog" parent="Theme.AppCompat.Light.Dialog">
<item name="android:windowBackground">@android:color/transparent</item>
<item name="actionBarPopupTheme">@style/PopupThemeLight</item>
<item name="windowActionBar">false</item>
</style>
<style name="AppThemeDark" parent="Theme.AppCompat.NoActionBar">
<item name="android:navigationBarColor">@color/backgroundDark</item>
<item name="android:statusBarColor">@color/statusBarDark</item>
<item name="android:windowBackground">@color/backgroundDark</item>
<item name="android:windowContentTransitions">true</item>
<item name="actionBarPopupTheme">@style/PopupThemeDark</item>
<item name="colorPrimary">@color/backgroundDark</item>
<item name="colorPrimaryDark">@color/statusBarDark</item>
<item name="windowActionBar">false</item>
</style>
<style name="AppThemeDarkDialog" parent="Theme.AppCompat.Dialog">
<item name="android:windowBackground">@android:color/transparent</item>
<item name="actionBarPopupTheme">@style/PopupThemeDark</item>
<item name="windowActionBar">false</item>
</style>
<style name="AppThemeBlack" parent="Theme.AppCompat.NoActionBar">
<item name="android:windowBackground">@color/black</item>
<item name="android:windowContentTransitions">true</item>
<item name="actionBarPopupTheme">@style/PopupThemeDark</item>
<item name="colorPrimary">@color/black</item>
<item name="colorPrimaryDark">@color/black</item>
<item name="windowActionBar">false</item>
</style>
<style name="AppThemeBlackDialog" parent="Theme.AppCompat.Dialog">
<item name="android:windowBackground">@android:color/transparent</item>
<item name="actionBarPopupTheme">@style/PopupThemeBlack</item>
<item name="windowActionBar">false</item>
</style>
</resources>