mirror of
https://github.com/TeamNewPipe/NewPipe.git
synced 2024-11-22 19:12:45 +01:00
Merge remote-tracking branch 'origin/master'
# Conflicts: # app/src/main/java/org/schabi/newpipe/Themer.java # app/src/main/java/org/schabi/newpipe/download/DownloadActivity.java # app/src/main/java/org/schabi/newpipe/settings/SettingsActivity.java # app/src/main/res/layout-v18/fragment_videoitem_detail.xml # app/src/main/res/layout/fragment_videoitem_detail.xml # app/src/main/res/xml/settings.xml
This commit is contained in:
commit
a4043eab83
@ -37,6 +37,16 @@
|
||||
<item name="android:windowBackground">@color/dark_background_color</item>
|
||||
</style>
|
||||
|
||||
<!-- Dark Theme-->
|
||||
<style name="DarkTheme" parent="Theme.AppCompat">
|
||||
<item name="android:actionBarStyle">@style/NewPipeActionbarTheme</item>
|
||||
<item name="actionBarStyle">@style/NewPipeActionbarTheme</item>
|
||||
<item name="colorPrimary">@color/dark_youtube_primary_color</item>
|
||||
<item name="colorPrimaryDark">@color/light_youtube_dark_color</item>
|
||||
<item name="colorAccent">@color/dark_youtube_accent_color</item>
|
||||
<item name="android:windowBackground">@color/dark_background_color</item>
|
||||
</style>
|
||||
|
||||
<style name="NewPipeActionbarTheme" parent="Widget.AppCompat.Light.ActionBar.Solid">
|
||||
<item name="android:displayOptions">showHome</item>
|
||||
<item name="displayOptions">showHome</item>
|
||||
|
@ -61,6 +61,16 @@
|
||||
<item name="android:windowBackground">@color/dark_background_color</item>
|
||||
</style>
|
||||
|
||||
<!-- Dark Theme-->
|
||||
<style name="DarkTheme" parent="Theme.AppCompat">
|
||||
<item name="android:actionBarStyle">@style/NewPipeActionbarTheme</item>
|
||||
<item name="actionBarStyle">@style/NewPipeActionbarTheme</item>
|
||||
<item name="colorPrimary">@color/dark_youtube_primary_color</item>
|
||||
<item name="colorPrimaryDark">@color/light_youtube_dark_color</item>
|
||||
<item name="colorAccent">@color/dark_youtube_accent_color</item>
|
||||
<item name="android:windowBackground">@color/dark_background_color</item>
|
||||
</style>
|
||||
|
||||
<style name="NewPipeActionbarTheme" parent="Widget.AppCompat.Light.ActionBar.Solid">
|
||||
<item name="android:displayOptions">showHome</item>
|
||||
<item name="displayOptions">showHome</item>
|
||||
|
Loading…
Reference in New Issue
Block a user