From e29f8a49d5978a5ba039840df2beac68d2f26118 Mon Sep 17 00:00:00 2001
From: BreadFish64 <mohror64@gmail.com>
Date: Tue, 5 May 2020 12:57:21 -0500
Subject: [PATCH] android: fix toolbar theme

---
 .../app/src/main/res/layout/activity_main.xml      |  6 ++----
 src/android/app/src/main/res/values/styles.xml     | 14 ++------------
 2 files changed, 4 insertions(+), 16 deletions(-)

diff --git a/src/android/app/src/main/res/layout/activity_main.xml b/src/android/app/src/main/res/layout/activity_main.xml
index 5e64dc6a9..cea0922a7 100644
--- a/src/android/app/src/main/res/layout/activity_main.xml
+++ b/src/android/app/src/main/res/layout/activity_main.xml
@@ -14,15 +14,13 @@
     <com.google.android.material.appbar.AppBarLayout
         android:id="@+id/appbar"
         android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:theme="@style/ThemeOverlay.AppCompat.Dark.ActionBar">
+        android:layout_height="wrap_content">
 
         <androidx.appcompat.widget.Toolbar
             android:id="@+id/toolbar_main"
             android:layout_width="match_parent"
             android:layout_height="?attr/actionBarSize"
-            android:background="?colorPrimary"
-            app:popupTheme="@style/ThemeOverlay.AppCompat.DayNight" />
+            android:background="?colorPrimary"/>
 
     </com.google.android.material.appbar.AppBarLayout>
 
diff --git a/src/android/app/src/main/res/values/styles.xml b/src/android/app/src/main/res/values/styles.xml
index 51d9e2106..653963530 100644
--- a/src/android/app/src/main/res/values/styles.xml
+++ b/src/android/app/src/main/res/values/styles.xml
@@ -16,21 +16,17 @@
         <item name="android:windowAllowReturnTransitionOverlap">true</item>
 
         <item name="android:colorControlHighlight">?attr/colorAccent</item>
-
-        <item name="toolbarStyle">@style/CustomToolBarStyle</item>
     </style>
 
     <!-- Same as above, but use default action bar, and mandate margins. -->
-    <style name="CitraSettingsBase" parent="Theme.AppCompat.DayNight.DarkActionBar">
+    <style name="CitraSettingsBase" parent="Theme.AppCompat.DayNight">
         <item name="colorPrimary">@color/citra_orange</item>
         <item name="colorPrimaryDark">@color/citra_orange_dark</item>
         <item name="colorAccent">@color/citra_accent</item>
-
-        <item name="toolbarStyle">@style/CustomToolBarStyle</item>
     </style>
 
     <!-- Inherit from the Base Citra Dialog Theme -->
-    <style name="CitraEmulationBase" parent="Theme.AppCompat.DayNight.DarkActionBar">
+    <style name="CitraEmulationBase" parent="Theme.AppCompat.DayNight">
         <item name="colorPrimary">@color/citra_orange</item>
         <item name="colorPrimaryDark">@color/citra_orange_dark</item>
         <item name="colorAccent">@color/citra_accent</item>
@@ -42,8 +38,6 @@
         <item name="android:windowContentTransitions">true</item>
         <item name="android:windowAllowEnterTransitionOverlap">true</item>
         <item name="android:windowAllowReturnTransitionOverlap">true</item>
-
-        <item name="toolbarStyle">@style/CustomToolBarStyle</item>
     </style>
 
     <!-- Inherit from a base file picker theme that handles day/night -->
@@ -69,8 +63,4 @@
         <item name="colorAccent">@color/citra_accent</item>
     </style>
 
-    <style name="CustomToolBarStyle" parent="@style/Widget.AppCompat.Toolbar">
-        <item name="titleTextColor">@color/header_text</item>
-    </style>
-
 </resources>