From 0d8337b5524aa9be88b34237df63535ff37768c9 Mon Sep 17 00:00:00 2001
From: NBonaparte <98007b33@opayq.com>
Date: Wed, 21 Dec 2016 19:35:15 -0800
Subject: [PATCH 1/2] Change Holo dialogs to Material

---
 .../github/mobile/ui/LightAlertDialog.java    | 19 +++++++++++++++----
 .../github/mobile/ui/LightProgressDialog.java |  7 +++++--
 2 files changed, 20 insertions(+), 6 deletions(-)

diff --git a/app/src/main/java/com/github/mobile/ui/LightAlertDialog.java b/app/src/main/java/com/github/mobile/ui/LightAlertDialog.java
index 6d5f929c0..f43912832 100644
--- a/app/src/main/java/com/github/mobile/ui/LightAlertDialog.java
+++ b/app/src/main/java/com/github/mobile/ui/LightAlertDialog.java
@@ -17,9 +17,14 @@
 
 import android.app.AlertDialog;
 import android.content.Context;
+import android.os.Build;
+
+import static android.R.style.Theme;
+import static android.R.style.Theme_Holo_Light_Dialog;
+import static android.R.style.Theme_Material_Light_Dialog_Alert;
 
 /**
- * Alert dialog using the Holo Light theme
+ * Alert dialog using the Material Light theme
  */
 public class LightAlertDialog extends AlertDialog {
 
@@ -30,7 +35,10 @@ public class LightAlertDialog extends AlertDialog {
      * @return dialog
      */
     public static AlertDialog create(final Context context) {
-        return new LightAlertDialog(context, THEME_HOLO_LIGHT);
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP)
+            return new LightAlertDialog(context, Theme_Material_Light_Dialog_Alert);
+        else
+            return new LightAlertDialog(context, Theme_Holo_Light_Dialog);
     }
 
     private LightAlertDialog(final Context context, final int theme) {
@@ -42,7 +50,7 @@ private LightAlertDialog(final Context context) {
     }
 
     /**
-     * Alert dialog builder using the Holo Light theme
+     * Alert dialog builder using the Material Light theme
      */
     public static class Builder extends AlertDialog.Builder {
 
@@ -53,7 +61,10 @@ public static class Builder extends AlertDialog.Builder {
          * @return dialog builder
          */
         public static LightAlertDialog.Builder create(final Context context) {
-            return new LightAlertDialog.Builder(context, THEME_HOLO_LIGHT);
+            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP)
+                return new LightAlertDialog(context, Theme_Material_Light_Dialog_Alert);
+            else
+                return new LightAlertDialog(context, Theme_Holo_Light_Dialog);
         }
 
         private Builder(Context context) {
diff --git a/app/src/main/java/com/github/mobile/ui/LightProgressDialog.java b/app/src/main/java/com/github/mobile/ui/LightProgressDialog.java
index 799338087..bc021635e 100644
--- a/app/src/main/java/com/github/mobile/ui/LightProgressDialog.java
+++ b/app/src/main/java/com/github/mobile/ui/LightProgressDialog.java
@@ -18,12 +18,15 @@
 import android.app.AlertDialog;
 import android.app.ProgressDialog;
 import android.content.Context;
+import android.os.Build;
 
 import com.github.mobile.R;
 
+import static android.R.style.Theme_Holo_Light_Dialog;
+import static android.R.style.Theme_Material_Light_Dialog_Alert;
 
 /**
- * Progress dialog in Holo Light theme
+ * Progress dialog in Material Light theme
  */
 public class LightProgressDialog extends ProgressDialog {
 
@@ -55,6 +58,6 @@ public static AlertDialog create(Context context, CharSequence message) {
     }
 
     private LightProgressDialog(Context context, CharSequence message) {
-        super(context, THEME_HOLO_LIGHT);
+        super(context, Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP ? Theme_Material_Light_Dialog_Alert : Theme_Holo_Light_Dialog);
     }
 }

From 6e7226a18b11087077a43785db9fab21c10e651e Mon Sep 17 00:00:00 2001
From: NBonaparte <98007b33@opayq.com>
Date: Mon, 21 Aug 2017 09:46:03 -0700
Subject: [PATCH 2/2] Incorporate fixes

---
 .../main/java/com/github/mobile/ui/LightAlertDialog.java    | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/app/src/main/java/com/github/mobile/ui/LightAlertDialog.java b/app/src/main/java/com/github/mobile/ui/LightAlertDialog.java
index f43912832..4e86a1f50 100644
--- a/app/src/main/java/com/github/mobile/ui/LightAlertDialog.java
+++ b/app/src/main/java/com/github/mobile/ui/LightAlertDialog.java
@@ -17,9 +17,7 @@
 
 import android.app.AlertDialog;
 import android.content.Context;
-import android.os.Build;
 
-import static android.R.style.Theme;
 import static android.R.style.Theme_Holo_Light_Dialog;
 import static android.R.style.Theme_Material_Light_Dialog_Alert;
 
@@ -62,9 +60,9 @@ public static class Builder extends AlertDialog.Builder {
          */
         public static LightAlertDialog.Builder create(final Context context) {
             if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP)
-                return new LightAlertDialog(context, Theme_Material_Light_Dialog_Alert);
+                return new LightAlertDialog.Builder(context, Theme_Material_Light_Dialog_Alert);
             else
-                return new LightAlertDialog(context, Theme_Holo_Light_Dialog);
+                return new LightAlertDialog.Builder(context, Theme_Holo_Light_Dialog);
         }
 
         private Builder(Context context) {