diff options
author | H. Lehmann <ByteHamster@users.noreply.github.com> | 2019-01-15 10:44:05 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-01-15 10:44:05 +0100 |
commit | 7265fc55bac3132a073ac7746ad8ae54378f2bf4 (patch) | |
tree | b27f7261245fb791e2cc9bcb81bbc31ce92b3397 | |
parent | 3bd5679010eebab5662dc09928ce074b43cc6fbe (diff) | |
parent | 6c9f15e0bc5ec4583dffde16ae9cfa13a1f28656 (diff) | |
download | AntennaPod-7265fc55bac3132a073ac7746ad8ae54378f2bf4.zip |
Merge pull request #2969 from ByteHamster/colorDark
Expanding toolbar
-rw-r--r-- | core/src/main/res/values-v23/styles.xml | 13 | ||||
-rw-r--r-- | core/src/main/res/values/colors.xml | 1 | ||||
-rw-r--r-- | core/src/main/res/values/styles.xml | 6 |
3 files changed, 20 insertions, 0 deletions
diff --git a/core/src/main/res/values-v23/styles.xml b/core/src/main/res/values-v23/styles.xml new file mode 100644 index 000000000..5cd274e68 --- /dev/null +++ b/core/src/main/res/values-v23/styles.xml @@ -0,0 +1,13 @@ +<?xml version="1.0" encoding="utf-8"?> +<resources> + + <style name="Theme.AntennaPod.Light.NoTitle" parent="Theme.Base.AntennaPod.Light.NoTitle"> + <item name="android:windowLightStatusBar">true</item> + <item name="colorPrimaryDark">@color/primary_light</item> + </style> + + <style name="Theme.AntennaPod.Light" parent="Theme.Base.AntennaPod.Light"> + <item name="android:windowLightStatusBar">true</item> + <item name="colorPrimaryDark">@color/primary_light</item> + </style> +</resources> diff --git a/core/src/main/res/values/colors.xml b/core/src/main/res/values/colors.xml index f172b0f6d..eec4f76ce 100644 --- a/core/src/main/res/values/colors.xml +++ b/core/src/main/res/values/colors.xml @@ -28,6 +28,7 @@ <!-- Theme colors --> <color name="primary_light">#FFFFFF</color> + <color name="primary_darktheme">#212121</color> <color name="highlight_light">#DDDDDD</color> <color name="highlight_dark">#414141</color> diff --git a/core/src/main/res/values/styles.xml b/core/src/main/res/values/styles.xml index 60296c64f..79773619f 100644 --- a/core/src/main/res/values/styles.xml +++ b/core/src/main/res/values/styles.xml @@ -88,6 +88,8 @@ <style name="Theme.Base.AntennaPod.Dark" parent="Theme.AppCompat"> <item name="colorAccent">@color/holo_blue_dark</item> + <item name="colorPrimary">@color/primary_darktheme</item> + <item name="colorPrimaryDark">@color/primary_darktheme</item> <item name="colorControlNormal">@color/white</item> <item name="buttonStyle">@style/Widget.AntennaPod.Button</item> <item name="progressBarTheme">@style/ProgressBarDark</item> @@ -272,6 +274,8 @@ <item name="windowActionModeOverlay">true</item> <item name="progressBarTheme">@style/ProgressBarDark</item> <item name="colorAccent">@color/holo_blue_dark</item> + <item name="colorPrimary">@color/primary_darktheme</item> + <item name="colorPrimaryDark">@color/primary_darktheme</item> <item name="colorControlNormal">@color/white</item> <item name="buttonStyle">@style/Widget.AntennaPod.Button</item> <item name="alertDialogTheme">@style/AntennaPod.Dialog.Dark</item> @@ -368,6 +372,8 @@ <style name="Theme.AntennaPod.Dark.Splash" parent="Theme.AppCompat.NoActionBar"> <item name="android:windowBackground">@drawable/bg_splash</item> + <item name="colorPrimary">@color/ic_launcher_background</item> + <item name="colorPrimaryDark">@color/ic_launcher_background</item> </style> <style name="Theme.AntennaPod.VideoPlayer" parent="@style/Theme.AntennaPod.Dark"> |