Touch Outside Cancelable

*Add back cancel dialogue when user touches outside the dialogue feature. This feature was removed in BlurView Creation #1 Part 1 due to setting window fullscreen and floating to false to work with BlurView. *Version Bump to v2.4.1.
rayliverified · Jul 1, 2018 · e00a33d · e00a33d
1 parent f5690db
commit e00a33d
Show file tree

Hide file tree

Showing 10 changed files with 25 additions and 2 deletions.
diff --git a/customalert/build.gradle b/customalert/build.gradle
@@ -2,7 +2,7 @@ apply plugin: 'com.android.library'
 apply plugin: 'com.github.dcendents.android-maven'
 
 group='com.github.searchy2'
-version = '2.4.0'
+version = '2.4.1'
 
 android {
     compileSdkVersion 28

diff --git a/customalert/src/main/java/stream/customalert/CustomAlertDialogue.java b/customalert/src/main/java/stream/customalert/CustomAlertDialogue.java
@@ -34,6 +34,7 @@
 import android.widget.EditText;
 import android.widget.LinearLayout;
 import android.widget.ListView;
+import android.widget.RelativeLayout;
 import android.widget.TextView;
 
 import java.util.ArrayList;
@@ -55,6 +56,7 @@ public static CustomAlertDialogue getInstance() {
         return instance;
     }
 
+    private View layout;
     private TextView title, message;
 
     @Override
@@ -192,6 +194,20 @@ public void onViewCreated(View view, @Nullable Bundle savedInstanceState) {
 
     private void initCommonView(View view) {
         //Common elements
+        layout = view.findViewById(R.id.main_layout);
+        layout.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View view) {
+                if (!builder.getCancelable())
+                {
+
+                }
+                else
+                {
+                    dismiss();
+                }
+            }
+        });
         title = view.findViewById(R.id.title);
         message = view.findViewById(R.id.message);
         if (builder.getTitle() != null) {

diff --git a/customalert/src/main/res/layout-land-v21/alert.xml b/customalert/src/main/res/layout-land-v21/alert.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
               xmlns:app="http://schemas.android.com/apk/res-auto"
+              android:id="@+id/main_layout"
               android:layout_width="match_parent"
               android:layout_height="match_parent"
               android:orientation="vertical">

diff --git a/customalert/src/main/res/layout-land/alert.xml b/customalert/src/main/res/layout-land/alert.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+              android:id="@+id/main_layout"
               android:layout_width="match_parent"
               android:layout_height="match_parent"
               android:background="@color/transparent"

diff --git a/customalert/src/main/res/layout-v21/alert.xml b/customalert/src/main/res/layout-v21/alert.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
               xmlns:app="http://schemas.android.com/apk/res-auto"
+              android:id="@+id/main_layout"
               android:layout_width="match_parent"
               android:layout_height="match_parent"
               android:orientation="vertical">

diff --git a/customalert/src/main/res/layout-v21/alert_actionsheet.xml b/customalert/src/main/res/layout-v21/alert_actionsheet.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
                 xmlns:app="http://schemas.android.com/apk/res-auto"
+                android:id="@+id/main_layout"
                 android:layout_width="match_parent"
                 android:layout_height="match_parent">
 

diff --git a/customalert/src/main/res/layout-v21/alert_input.xml b/customalert/src/main/res/layout-v21/alert_input.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
               xmlns:app="http://schemas.android.com/apk/res-auto"
+              android:id="@+id/main_layout"
               android:layout_width="match_parent"
               android:layout_height="match_parent"
-
               android:background="@color/transparent"
               android:orientation="vertical">
 

diff --git a/customalert/src/main/res/layout/alert.xml b/customalert/src/main/res/layout/alert.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+              android:id="@+id/main_layout"
               android:layout_width="match_parent"
               android:layout_height="match_parent"
               android:background="@color/transparent"

diff --git a/customalert/src/main/res/layout/alert_actionsheet.xml b/customalert/src/main/res/layout/alert_actionsheet.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+                android:id="@+id/main_layout"
                 android:layout_width="match_parent"
                 android:layout_height="match_parent">
 

diff --git a/customalert/src/main/res/layout/alert_input.xml b/customalert/src/main/res/layout/alert_input.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+              android:id="@+id/main_layout"
               android:layout_width="match_parent"
               android:layout_height="match_parent"
               android:background="@color/transparent"