Merge branch 'master' into master

anninos · Apr 20, 2017 · f2a6c2d · f2a6c2d
2 parents 78f258d + 255d453
commit f2a6c2d
Show file tree

Hide file tree

Showing 2 changed files with 52 additions and 0 deletions.
diff --git a/alerter/src/main/java/com/tapadoo/alerter/Alert.java b/alerter/src/main/java/com/tapadoo/alerter/Alert.java
@@ -3,6 +3,7 @@
 import android.content.Context;
 import android.graphics.Bitmap;
 import android.graphics.drawable.Drawable;
+import android.os.Build;
 import android.support.annotation.ColorInt;
 import android.support.annotation.DrawableRes;
 import android.support.annotation.NonNull;
@@ -274,6 +275,28 @@ public void setAlertBackgroundColor(@ColorInt final int color) {
         flBackground.setBackgroundColor(color);
     }
 
+    /**
+     * Sets the Alert Background Drawable Resource
+     *
+     * @param resource The qualified drawable integer
+     */
+    public void setAlertBackgroundResource(@DrawableRes final int resource) {
+        flBackground.setBackgroundResource(resource);
+    }
+
+    /**
+     * Sets the Alert Background Drawable
+     *
+     * @param drawable The qualified drawable
+     */
+    public void setAlertBackgroundDrawable(final Drawable drawable) {
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN) {
+            flBackground.setBackground(drawable);
+        } else {
+            flBackground.setBackgroundDrawable(drawable);
+        }
+    }
+
     /**
      * Sets the Title of the Alert
      *

diff --git a/alerter/src/main/java/com/tapadoo/alerter/Alerter.java b/alerter/src/main/java/com/tapadoo/alerter/Alerter.java
@@ -2,6 +2,7 @@
 
 import android.app.Activity;
 import android.graphics.Bitmap;
+import android.graphics.drawable.Drawable;
 import android.support.annotation.ColorRes;
 import android.support.annotation.DrawableRes;
 import android.support.annotation.NonNull;
@@ -182,6 +183,34 @@ public Alerter setBackgroundColor(@ColorRes final int colorResId) {
         return this;
     }
 
+    /**
+     * Set the Alert's Background Drawable
+     *
+     * @param drawable Drawable
+     * @return This Alerter
+     */
+    public Alerter setBackgroundDrawable(final Drawable drawable) {
+        if (getAlert() != null) {
+            getAlert().setAlertBackgroundDrawable(drawable);
+        }
+
+        return this;
+    }
+
+    /**
+     * Set the Alert's Background Drawable Resource
+     *
+     * @param drawableResId Drawable Resource Id
+     * @return This Alerter
+     */
+    public Alerter setBackgroundResource(@DrawableRes final int drawableResId) {
+        if (getAlert() != null) {
+            getAlert().setAlertBackgroundResource(drawableResId);
+        }
+
+        return this;
+    }
+
     /**
      * Set the Alert's Icon
      *