From d1b747362bcbd9ef0a2a51d2b9d8e1aa951eb4e4 Mon Sep 17 00:00:00 2001
From: Ray Li <ray.li.verified@gmail.com>
Date: Wed, 26 Sep 2018 22:57:22 -0500
Subject: [PATCH] Update v3.2.0

*Update support dependencies to v3.2.0.
*Version bump to v2.5.1.
---
 app/build.gradle                              |  8 +++----
 build.gradle                                  |  2 +-
 customalert/build.gradle                      |  5 ++---
 .../customalert/CustomAlertDialogue.java      | 21 +++++++------------
 gradle/wrapper/gradle-wrapper.properties      |  2 +-
 5 files changed, 16 insertions(+), 22 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index b7deb98..07f34fe 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -25,9 +25,9 @@ dependencies {
     }
     implementation fileTree(include: ['*.jar'], dir: 'libs')
     implementation project(':customalert')
-    implementation 'com.github.searchy2:CustomButton:1.8.0'
+    implementation 'com.github.searchy2:CustomButton:1.8.2'
 
-    implementation 'androidx.appcompat:appcompat:1.0.0-rc01'
-    implementation 'com.google.android.material:material:1.0.0-rc01'
-    implementation 'androidx.cardview:cardview:1.0.0-rc01'
+    implementation 'androidx.appcompat:appcompat:1.0.0'
+    implementation 'com.google.android.material:material:1.0.0'
+    implementation 'androidx.cardview:cardview:1.0.0'
 }
\ No newline at end of file
diff --git a/build.gradle b/build.gradle
index 22c5a31..90a865c 100644
--- a/build.gradle
+++ b/build.gradle
@@ -5,7 +5,7 @@ buildscript {
         google()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.2.0-beta05'
+        classpath 'com.android.tools.build:gradle:3.2.0'
         classpath 'com.github.dcendents:android-maven-gradle-plugin:2.0'
     }
 }
diff --git a/customalert/build.gradle b/customalert/build.gradle
index 2eaec39..1ac62ca 100644
--- a/customalert/build.gradle
+++ b/customalert/build.gradle
@@ -2,11 +2,10 @@ apply plugin: 'com.android.library'
 apply plugin: 'com.github.dcendents.android-maven'
 
 group='com.github.searchy2'
-version = '2.5.0'
+version = '2.5.1'
 
 android {
     compileSdkVersion 28
-    buildToolsVersion "27.0.3"
 
     defaultConfig {
         minSdkVersion 15
@@ -26,7 +25,7 @@ dependencies {
         maven { url "https://maven.google.com" }
     }
     implementation fileTree(include: ['*.jar'], dir: 'libs')
-    implementation 'com.google.android.material:material:1.0.0-rc01'
+    implementation 'com.google.android.material:material:1.0.0'
     implementation 'com.github.Dimezis.BlurView:blurview:version-1.4.0'
 }
 
diff --git a/customalert/src/main/java/stream/customalert/CustomAlertDialogue.java b/customalert/src/main/java/stream/customalert/CustomAlertDialogue.java
index c727a9e..3c22482 100644
--- a/customalert/src/main/java/stream/customalert/CustomAlertDialogue.java
+++ b/customalert/src/main/java/stream/customalert/CustomAlertDialogue.java
@@ -60,27 +60,14 @@ public static CustomAlertDialogue getInstance() {
 
     @Override
     public void onCreate(@Nullable Bundle savedInstanceState) {
-        Log.d("Builder", "Restore");
 
         if (savedInstanceState != null) {
             if (builder == null) {
                 builder = savedInstanceState.getParcelable(Builder.class.getSimpleName());
-                Log.d("Builder", "Restore Not Null");
             }
         }
         setStyle(DialogFragment.STYLE_NO_TITLE, R.style.CustomDialog);
         setRetainInstance(true);
-        if (builder != null)
-        {
-            if (!builder.getCancelable())
-            {
-                this.setCancelable(false);
-            }
-            else
-            {
-                this.setCancelable(true);
-            }
-        }
         super.onCreate(savedInstanceState);
     }
 
@@ -145,6 +132,14 @@ public Dialog onCreateDialog(Bundle savedInstanceState) {
 
         window.setAttributes(wlp);
 
+        if (builder != null) {
+            if (!builder.getCancelable()) {
+                setCancelable(false);
+            } else {
+                setCancelable(true);
+            }
+        }
+
         return dialog;
     }
 
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 73a6c6c..75ddad8 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.9-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.10-all.zip