Merge branch 'master' of https://github.com/Tapadoo/Alerter

a0224 · Feb 20, 2017 · 9d87edc · 9d87edc
2 parents 1a7a762 + 43f46ff
commit 9d87edc
Show file tree

Hide file tree

Showing 8 changed files with 122 additions and 0 deletions.
diff --git a/README.md b/README.md
@@ -117,6 +117,26 @@ Alerter.create(this)
 
 ![Verbose Alert](./documentation/alert_verbose.gif)
 
+### Visibility Callbacks
+
+```java
+ Alerter.create(ExampleActivity.this)
+        .setTitle("Alert Title")
+        .setOnShownListener(new OnAlertShownListener() {
+            @Override
+            public void onAlertShown() {
+                Toast.makeText(ExampleActivity.this, "OnAlertShown", Toast.LENGTH_LONG).show();
+            }
+        })
+        .setOnHiddenListener(new OnAlertHiddenListener() {
+            @Override
+            public void onAlertHidden() {
+                Toast.makeText(ExampleActivity.this, "OnAlertHidden", Toast.LENGTH_LONG).show();
+            }
+         })
+        .show();
+```
+
 ## Sample
 
 Clone this repo and check out the `app` module.

diff --git a/alerter/src/main/java/com/tapadoo/alerter/Alert.java b/alerter/src/main/java/com/tapadoo/alerter/Alert.java
@@ -50,6 +50,9 @@ public class Alert extends FrameLayout implements View.OnClickListener, Animatio
     private Animation slideInAnimation;
     private Animation slideOutAnimation;
 
+    private OnAlertShownListener onShowListener;
+    private OnAlertHiddenListener onHideListener;
+
     private long duration = DISPLAY_TIME_IN_SECONDS;
 
     private boolean enableIconPulse = true;
@@ -196,6 +199,8 @@ public void onAnimationEnd(final Animation animation) {
             }
         }
 
+        if(onShowListener != null) onShowListener.onAlertShown();
+
         //Start the Handler to clean up the Alert
         postDelayed(new Runnable() {
             @Override
@@ -253,6 +258,7 @@ public void run() {
                     } else {
                         try {
                             ((ViewGroup) getParent()).removeView(Alert.this);
+                            if(onHideListener != null) onHideListener.onAlertHidden();
                         } catch (Exception ex) {
                             Log.e(getClass().getSimpleName(), "Cannot remove from parent layout");
                         }
@@ -371,6 +377,22 @@ public void pulseIcon(final boolean shouldPulse) {
         this.enableIconPulse = shouldPulse;
     }
 
+    /**
+     * Set the alert's listener to be fired on the alert being fully shown
+     * @param listener Listener to be fired
+     */
+    public void setOnShownListener(OnAlertShownListener listener) {
+        this.onShowListener = listener;
+    }
+
+    /**
+     * Set the alert's listener to be fired on the alert being fully hidden
+     * @param listener Listener to be fired
+     */
+    public void setOnHiddenListener(OnAlertHiddenListener listener) {
+        this.onHideListener = listener;
+    }
+
     /**
      * Get the screen height in pixels
      *

diff --git a/alerter/src/main/java/com/tapadoo/alerter/Alerter.java b/alerter/src/main/java/com/tapadoo/alerter/Alerter.java
@@ -235,6 +235,32 @@ public Alerter enableIconPulse(final boolean pulse) {
         return this;
     }
 
+    /**
+     * Sets the Alert Shown Listener
+     *
+     * @param listener OnAlertShownListener of Alert
+     * @return This Alerter
+     */
+    public Alerter setOnShownListener(final OnAlertShownListener listener) {
+        if (getAlert() != null) {
+            getAlert().setOnShownListener(listener);
+        }
+        return this;
+    }
+
+    /**
+     * Sets the Alert Hidden Listener
+     *
+     * @param listener OnAlertHiddenListener of Alert
+     * @return This Alerter
+     */
+    public Alerter setOnHiddenListener(final OnAlertHiddenListener listener) {
+        if (getAlert() != null) {
+            getAlert().setOnHiddenListener(listener);
+        }
+        return this;
+    }
+
     /**
      * Gets the Alert associated with the Alerter
      *

diff --git a/alerter/src/main/java/com/tapadoo/alerter/OnAlertHiddenListener.java b/alerter/src/main/java/com/tapadoo/alerter/OnAlertHiddenListener.java
@@ -0,0 +1,9 @@
+package com.tapadoo.alerter;
+
+/**
+ * Created by edgeorge on 20/02/2017.
+ */
+
+public interface OnAlertHiddenListener {
+    void onAlertHidden();
+}
diff --git a/alerter/src/main/java/com/tapadoo/alerter/OnAlertShownListener.java b/alerter/src/main/java/com/tapadoo/alerter/OnAlertShownListener.java
@@ -0,0 +1,9 @@
+package com.tapadoo.alerter;
+
+/**
+ * Created by edgeorge on 20/02/2017.
+ */
+
+public interface OnAlertShownListener {
+    void onAlertShown();
+}
diff --git a/app/src/main/java/com/tapadoo/example/ExampleActivity.java b/app/src/main/java/com/tapadoo/example/ExampleActivity.java
@@ -7,6 +7,8 @@
 import android.widget.Toast;
 
 import com.tapadoo.alerter.Alerter;
+import com.tapadoo.alerter.OnAlertHiddenListener;
+import com.tapadoo.alerter.OnAlertShownListener;
 
 public class ExampleActivity extends AppCompatActivity implements View.OnClickListener {
 
@@ -24,6 +26,7 @@ protected void onCreate(Bundle savedInstanceState) {
         findViewById(R.id.btnAlertTextOnly).setOnClickListener(this);
         findViewById(R.id.btnAlertOnClick).setOnClickListener(this);
         findViewById(R.id.btnAlertVerbose).setOnClickListener(this);
+        findViewById(R.id.btnAlertCallback).setOnClickListener(this);
     }
 
     @Override
@@ -49,6 +52,10 @@ public void onClick(View view) {
                 showAlertVerbose();
                 break;
             }
+            case R.id.btnAlertCallback: {
+                showAlertCallbacks();
+                break;
+            }
             default: {
                 showAlertDefault();
             }
@@ -105,4 +112,25 @@ private void showAlertVerbose() {
                          "The alert scales to accommodate larger bodies of text.")
                 .show();
     }
+
+    private void showAlertCallbacks(){
+        Alerter.create(ExampleActivity.this)
+                .setTitle("Alert Title")
+                .setText("Alert text...")
+                .setDuration(10000)
+                .setOnShownListener(new OnAlertShownListener() {
+                    @Override
+                    public void onAlertShown() {
+                        Toast.makeText(ExampleActivity.this, "OnAlertShown", Toast.LENGTH_LONG).show();
+                    }
+                })
+                .setOnHiddenListener(new OnAlertHiddenListener() {
+                    @Override
+                    public void onAlertHidden() {
+                        Toast.makeText(ExampleActivity.this, "OnAlertHidden", Toast.LENGTH_LONG).show();
+                    }
+                })
+                .show();
+    }
+
 }
diff --git a/app/src/main/res/layout/content_example.xml b/app/src/main/res/layout/content_example.xml
@@ -58,4 +58,11 @@
         android:layout_height="wrap_content"
         android:text="@string/verbose_alert"/>
 
+    <android.support.v7.widget.AppCompatButton
+        style="@style/ExampleButton"
+        android:id="@+id/btnAlertCallback"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:text="@string/callback_alert"/>
+
 </LinearLayout>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
@@ -7,4 +7,5 @@
     <string name="on_click_alert">On Click Alert</string>
     <string name="verbose_alert">Verbose Alert</string>
     <string name="custom_icon_alert">Custom Icon Alert</string>
+    <string name="callback_alert">Alert Callbacks</string>
 </resources>