Avoid duplicated code & dark navbar for DarkTheme

This commit is contained in:
Marco vR 2019-10-15 14:23:55 +02:00
parent 06af26f1f2
commit 7e78197b37
2 changed files with 15 additions and 10 deletions

View File

@ -1,13 +1,14 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<style name="BlackTheme" parent="DarkTheme">
<item name="android:windowBackground">@color/black_background_color</item>
<item name="windowBackground">@color/black_background_color</item>
<item name="android:navigationBarColor">@android:color/black</item>
<style name="Base.V21.DarkTheme" parent="Base.V7.DarkTheme">
<item name="android:navigationBarColor">@color/dark_background_color</item>
<item name="android:windowLightNavigationBar">false</item>
<item name="separator_color">@color/black_separator_color</item>
<item name="contrast_background_color">@color/black_contrast_background_color</item>
</style>
</resources>
<style name="Base.DarkTheme" parent="Base.V21.DarkTheme" />
<style name="Base.V21.BlackTheme" parent="Base.V7.BlackTheme">
<item name="android:navigationBarColor">@android:color/black</item>
</style>
<style name="Base.BlackTheme" parent="Base.V21.BlackTheme" />
</resources>

View File

@ -77,7 +77,9 @@
<item name="android:windowAnimationStyle">@style/SwitchAnimation</item>
</style>
<style name="DarkTheme" parent="Theme.AppCompat.NoActionBar">
<style name="Base.V7.DarkTheme" parent="Theme.AppCompat.NoActionBar" />
<style name="Base.DarkTheme" parent="Base.V7.DarkTheme" />
<style name="DarkTheme" parent="Base.DarkTheme">
<item name="colorPrimary">@color/dark_youtube_primary_color</item>
<item name="colorPrimaryDark">@color/dark_youtube_dark_color</item>
<item name="colorAccent">@color/dark_youtube_accent_color</item>
@ -144,7 +146,9 @@
<item name="android:windowAnimationStyle">@style/SwitchAnimation</item>
</style>
<style name="BlackTheme" parent="DarkTheme">
<style name="Base.V7.BlackTheme" parent="DarkTheme"/>
<style name="Base.BlackTheme" parent="Base.V7.BlackTheme"/>
<style name="BlackTheme" parent="Base.BlackTheme">
<item name="android:windowBackground">@color/black_background_color</item>
<item name="windowBackground">@color/black_background_color</item>