From 5bec6afc59beae392e8dfeb4fec710c4af6f300e Mon Sep 17 00:00:00 2001
From: Andreas Schildbach <andreas@schildbach.de>
Date: Fri, 29 Jan 2021 20:48:42 +0100
Subject: [PATCH] Fix dialog themes.

---
 oeffi/res/values-night/styles.xml                             | 4 ----
 oeffi/res/values/styles.xml                                   | 4 ----
 .../de/schildbach/oeffi/directions/DirectionsActivity.java    | 4 ++--
 oeffi/src/de/schildbach/oeffi/util/DialogBuilder.java         | 2 +-
 4 files changed, 3 insertions(+), 11 deletions(-)

diff --git a/oeffi/res/values-night/styles.xml b/oeffi/res/values-night/styles.xml
index bd90f01..f75b547 100644
--- a/oeffi/res/values-night/styles.xml
+++ b/oeffi/res/values-night/styles.xml
@@ -20,10 +20,6 @@
         <item name="android:actionBarStyle">@style/My.Widget.ActionBar</item>
     </style>
 
-    <style name="My.Theme.Dialog" parent="@android:style/Theme.Material.Dialog.Alert">
-        <item name="android:background">@color/bg_level1</item>
-    </style>
-
     <style name="My.Widget.AutoCompleteTextView" parent="@android:style/Widget.Material.AutoCompleteTextView">
         <item name="android:textColor">@color/fg_significant</item>
         <item name="android:background">@null</item>
diff --git a/oeffi/res/values/styles.xml b/oeffi/res/values/styles.xml
index 152b125..aa122f9 100644
--- a/oeffi/res/values/styles.xml
+++ b/oeffi/res/values/styles.xml
@@ -27,10 +27,6 @@
         <item name="android:actionBarStyle">@style/My.Widget.ActionBar</item>
     </style>
 
-    <style name="My.Theme.Dialog" parent="@android:style/Theme.Material.Light.Dialog.Alert">
-        <item name="android:background">@color/bg_level1</item>
-    </style>
-
     <style name="My.Theme.Translucent" parent="@style/My.Theme">
         <item name="android:windowIsTranslucent">true</item>
         <item name="android:windowIsFloating">true</item>
diff --git a/oeffi/src/de/schildbach/oeffi/directions/DirectionsActivity.java b/oeffi/src/de/schildbach/oeffi/directions/DirectionsActivity.java
index f2d264f..b942a43 100644
--- a/oeffi/src/de/schildbach/oeffi/directions/DirectionsActivity.java
+++ b/oeffi/src/de/schildbach/oeffi/directions/DirectionsActivity.java
@@ -714,7 +714,7 @@ public class DirectionsActivity extends OeffiMainActivity implements ActivityCom
         final int month = calendar.get(Calendar.MONTH);
         final int day = calendar.get(Calendar.DAY_OF_MONTH);
 
-        new DatePickerDialog(DirectionsActivity.this, R.style.My_Theme_Dialog, (view, year1, month1, day1) -> {
+        new DatePickerDialog(DirectionsActivity.this, 0, (view, year1, month1, day1) -> {
             calendar.set(Calendar.YEAR, year1);
             calendar.set(Calendar.MONTH, month1);
             calendar.set(Calendar.DAY_OF_MONTH, day1);
@@ -729,7 +729,7 @@ public class DirectionsActivity extends OeffiMainActivity implements ActivityCom
         final int hour = calendar.get(Calendar.HOUR_OF_DAY);
         final int minute = calendar.get(Calendar.MINUTE);
 
-        new TimePickerDialog(DirectionsActivity.this, R.style.My_Theme_Dialog, (view, hour1, minute1) -> {
+        new TimePickerDialog(DirectionsActivity.this, 0, (view, hour1, minute1) -> {
             calendar.set(Calendar.HOUR_OF_DAY, hour1);
             calendar.set(Calendar.MINUTE, minute1);
             time = new TimeSpec.Absolute(time.depArr, calendar.getTimeInMillis());
diff --git a/oeffi/src/de/schildbach/oeffi/util/DialogBuilder.java b/oeffi/src/de/schildbach/oeffi/util/DialogBuilder.java
index 95a0292..34dee7d 100644
--- a/oeffi/src/de/schildbach/oeffi/util/DialogBuilder.java
+++ b/oeffi/src/de/schildbach/oeffi/util/DialogBuilder.java
@@ -23,7 +23,7 @@ import de.schildbach.oeffi.R;
 
 public class DialogBuilder extends AlertDialog.Builder {
     public static DialogBuilder get(final Context context) {
-        return new DialogBuilder(context, R.style.My_Theme_Dialog);
+        return new DialogBuilder(context, 0);
     }
 
     public static DialogBuilder warn(final Context context, final int titleResId) {