From f7455f1d4800d492a7d42ac1bc2e42dff5dab639 Mon Sep 17 00:00:00 2001
From: Tobias Zwick <newton@openclonk.org>
Date: Sun, 15 Sep 2019 23:50:53 +0200
Subject: [PATCH] fix toolbar colors (fix #1562)

---
 app/src/main/res/layout/activity_main.xml |  4 +++-
 app/src/main/res/layout/toolbar.xml       | 13 ++++++++-----
 app/src/main/res/values/themes.xml        |  2 ++
 3 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index 578ac53067..7c68d304ae 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -28,7 +28,9 @@
             android:layout_width="match_parent"
             android:layout_height="?attr/actionBarSize"
             android:background="?attr/colorPrimary"
-            android:elevation="4dp">
+            android:elevation="4dp"
+            app:theme="@style/ThemeOverlay.AppCompat.Dark"
+            app:popupTheme="@style/Theme.Bubble.ToolbarPopup">
 
             <RelativeLayout
                 android:id="@+id/uploadedAnswersContainer"
diff --git a/app/src/main/res/layout/toolbar.xml b/app/src/main/res/layout/toolbar.xml
index 47bb6b7ea0..4f77d0c60a 100644
--- a/app/src/main/res/layout/toolbar.xml
+++ b/app/src/main/res/layout/toolbar.xml
@@ -1,8 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.appcompat.widget.Toolbar xmlns:android="http://schemas.android.com/apk/res/android"
-                                   android:id="@+id/toolbar"
-                                   android:layout_width="match_parent"
-                                   android:layout_height="?attr/actionBarSize"
-                                   android:background="?attr/colorPrimary"
-                                   android:elevation="4dp">
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:id="@+id/toolbar"
+    android:layout_width="match_parent"
+    android:layout_height="?attr/actionBarSize"
+    android:background="?attr/colorPrimary"
+    android:elevation="4dp"
+    app:theme="@style/ThemeOverlay.AppCompat.Dark"
+    app:popupTheme="@style/Theme.Bubble.ToolbarPopup">
 </androidx.appcompat.widget.Toolbar>
diff --git a/app/src/main/res/values/themes.xml b/app/src/main/res/values/themes.xml
index b8ea5ac415..adbdb6df73 100644
--- a/app/src/main/res/values/themes.xml
+++ b/app/src/main/res/values/themes.xml
@@ -23,6 +23,8 @@
         <item name="android:popupMenuStyle">@style/Theme.Bubble.Popup</item>
     </style>
 
+    <style name="Theme.Bubble.ToolbarPopup"  parent="Theme.AppCompat.DayNight.NoActionBar"/>
+
     <style name="Theme.Bubble.Popup" parent="Widget.AppCompat.Light.PopupMenu">
         <item name="android:popupBackground">@drawable/speech_bubble_none</item>
         <item name="android:popupAnimationStyle">@style/Animation.Popup.Bubble</item>