From 25e411528b3228389fe788821cbed910cbae0957 Mon Sep 17 00:00:00 2001
From: Alex Baker <alex@tasks.org>
Date: Thu, 27 Feb 2020 11:31:31 -0600
Subject: [PATCH] Remove getThemedDialog and getAlertDialogStyle

---
 .../java/com/todoroo/astrid/ui/TimeDurationControlSet.java   | 2 +-
 app/src/main/java/org/tasks/dialogs/AlertDialogBuilder.java  | 5 +----
 app/src/main/java/org/tasks/dialogs/DialogBuilder.java       | 2 +-
 app/src/main/java/org/tasks/themes/Theme.java                | 4 ----
 app/src/main/java/org/tasks/themes/ThemeBase.java            | 4 ----
 5 files changed, 3 insertions(+), 14 deletions(-)

diff --git a/app/src/main/java/com/todoroo/astrid/ui/TimeDurationControlSet.java b/app/src/main/java/com/todoroo/astrid/ui/TimeDurationControlSet.java
index cdd2bc3b3..2bd7f4abd 100644
--- a/app/src/main/java/com/todoroo/astrid/ui/TimeDurationControlSet.java
+++ b/app/src/main/java/com/todoroo/astrid/ui/TimeDurationControlSet.java
@@ -67,7 +67,7 @@ public class TimeDurationControlSet implements OnNNumberPickedListener, View.OnC
     if (dialog == null) {
       dialog =
           new NNumberPickerDialog(
-              theme.getThemedDialog(context),
+              context,
               this,
               context.getResources().getString(R.string.DLG_hour_minutes),
               new int[] {0, 0},
diff --git a/app/src/main/java/org/tasks/dialogs/AlertDialogBuilder.java b/app/src/main/java/org/tasks/dialogs/AlertDialogBuilder.java
index d131be05d..7365195d0 100644
--- a/app/src/main/java/org/tasks/dialogs/AlertDialogBuilder.java
+++ b/app/src/main/java/org/tasks/dialogs/AlertDialogBuilder.java
@@ -4,7 +4,6 @@ import static com.todoroo.andlib.utility.AndroidUtilities.atLeastJellybeanMR1;
 
 import android.content.Context;
 import android.content.DialogInterface;
-import android.view.ContextThemeWrapper;
 import android.view.View;
 import android.widget.ListAdapter;
 import androidx.appcompat.app.AlertDialog;
@@ -24,9 +23,7 @@ public class AlertDialogBuilder {
     this.context = context;
     this.theme = theme;
     this.locale = locale;
-    ContextThemeWrapper wrapper = theme.getThemedDialog(context);
-    theme.applyToContext(wrapper);
-    builder = new MaterialAlertDialogBuilder(wrapper);
+    builder = new MaterialAlertDialogBuilder(context);
   }
 
   public AlertDialogBuilder setMessage(int message, Object... formatArgs) {
diff --git a/app/src/main/java/org/tasks/dialogs/DialogBuilder.java b/app/src/main/java/org/tasks/dialogs/DialogBuilder.java
index ad8bb2dcc..c6ce10163 100644
--- a/app/src/main/java/org/tasks/dialogs/DialogBuilder.java
+++ b/app/src/main/java/org/tasks/dialogs/DialogBuilder.java
@@ -39,7 +39,7 @@ public class DialogBuilder {
 
   ProgressDialog newProgressDialog() {
     ProgressDialog progressDialog =
-        new ProgressDialog(activity, theme.getThemeBase().getAlertDialogStyle());
+        new ProgressDialog(activity);
     theme.applyToContext(progressDialog.getContext());
     if (AndroidUtilities.preLollipop()) {
       ColorDrawable background =
diff --git a/app/src/main/java/org/tasks/themes/Theme.java b/app/src/main/java/org/tasks/themes/Theme.java
index e365804b2..ed1e0e33a 100644
--- a/app/src/main/java/org/tasks/themes/Theme.java
+++ b/app/src/main/java/org/tasks/themes/Theme.java
@@ -42,10 +42,6 @@ public class Theme {
     return (LayoutInflater) wrap(context).getSystemService(Context.LAYOUT_INFLATER_SERVICE);
   }
 
-  public ContextThemeWrapper getThemedDialog(Context context) {
-    return new ContextThemeWrapper(context, themeBase.getAlertDialogStyle());
-  }
-
   public void applyThemeAndStatusBarColor(Activity activity) {
     applyTheme(activity);
     themeColor.applyToSystemBars(activity);
diff --git a/app/src/main/java/org/tasks/themes/ThemeBase.java b/app/src/main/java/org/tasks/themes/ThemeBase.java
index abd7cdfc0..57cab99cc 100644
--- a/app/src/main/java/org/tasks/themes/ThemeBase.java
+++ b/app/src/main/java/org/tasks/themes/ThemeBase.java
@@ -50,10 +50,6 @@ public class ThemeBase implements ColorPickerDialog.Pickable {
     dayNightMode = source.readInt();
   }
 
-  public int getAlertDialogStyle() {
-    return R.style.TasksDialogAlert;
-  }
-
   @Override
   public String getName() {
     return name;