aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorChristian Schneppe <christian@pix-art.de>2018-04-13 22:10:56 +0200
committerChristian Schneppe <christian@pix-art.de>2018-04-13 22:10:56 +0200
commit7b49f8fef76c446fffe0b794e4d82d13eafc04e7 (patch)
treec1dd6af7b2112d53858992a599a3eabcadb3fe11 /src
parentf7999d2cadb875ad2b2f04260ff1ff9f0abc95ef (diff)
fixed popup menu in dark theme
Diffstat (limited to 'src')
-rw-r--r--src/main/res/layout/toolbar.xml10
-rw-r--r--src/main/res/values/attrs.xml2
-rw-r--r--src/main/res/values/themes.xml3
3 files changed, 9 insertions, 6 deletions
diff --git a/src/main/res/layout/toolbar.xml b/src/main/res/layout/toolbar.xml
index 932252873..5cb8b021a 100644
--- a/src/main/res/layout/toolbar.xml
+++ b/src/main/res/layout/toolbar.xml
@@ -1,11 +1,11 @@
<?xml version="1.0" encoding="utf-8"?>
-<android.support.v7.widget.Toolbar xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:app="http://schemas.android.com/apk/res-auto"
- android:id="@+id/toolbar"
+<android.support.v7.widget.Toolbar android:id="@+id/toolbar"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="?attr/colorPrimary"
- android:elevation="6dp"
android:minHeight="?attr/actionBarSize"
+ android:elevation="4dp"
android:theme="@style/ThemeOverlay.AppCompat.Dark.ActionBar"
- app:popupTheme="@style/ThemeOverlay.AppCompat.Light" /> \ No newline at end of file
+ app:popupTheme="?popupOverlayStyle"
+ xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:app="http://schemas.android.com/apk/res-auto" /> \ No newline at end of file
diff --git a/src/main/res/values/attrs.xml b/src/main/res/values/attrs.xml
index 0843cb888..faaa662ec 100644
--- a/src/main/res/values/attrs.xml
+++ b/src/main/res/values/attrs.xml
@@ -69,5 +69,7 @@
<attr name="ic_file_calendar" format="reference" />
<attr name="icon_alpha" format="float"/>
+
+ <attr name="popupOverlayStyle" format="reference"/>
</resources> \ No newline at end of file
diff --git a/src/main/res/values/themes.xml b/src/main/res/values/themes.xml
index 180ba0eeb..0fed4d2b3 100644
--- a/src/main/res/values/themes.xml
+++ b/src/main/res/values/themes.xml
@@ -5,6 +5,7 @@
<item name="colorPrimary">@color/primary</item>
<item name="colorPrimaryDark">@color/primary_dark</item>
<item name="colorAccent">@color/accent</item>
+ <item name="popupOverlayStyle">@style/ThemeOverlay.AppCompat.Light</item>
<item name="color_background_primary">@color/grey50</item>
<item name="color_background_secondary">@color/grey200</item>
@@ -76,7 +77,7 @@
<item name="colorPrimary">@color/primary</item>
<item name="colorPrimaryDark">@color/primary_dark</item>
<item name="colorAccent">@color/accent</item>
-
+ <item name="popupOverlayStyle">@style/ThemeOverlay.AppCompat.Dark</item>
<item name="color_background_primary">@color/grey800</item>
<item name="color_background_secondary">@color/grey900</item>