Merge remote-tracking branch 'origin/release' into release

# Conflicts:
#	build.gradle
#	demo/src/test/java/me/angrybyte/sillyandroid/extras/ColoringTest.java
#	sillyandroid/src/main/java/me/angrybyte/sillyandroid/components/EasyActivity.java

Author: milosmns

sillyandroid/src/main/java/me/angrybyte/sillyandroid/SillyAndroid.java

@@ -43,6 +43,7 @@
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 import java.util.List;
+import java.util.Objects;
 
 import static android.content.ContentValues.TAG;
 
@@ -513,6 +514,23 @@ public static Bitmap drawableToBitmap(@NonNull final Drawable drawable, @Px fina
         return result;
     }
 
+    /**
+     * Compares the two {@code null}able objects. For {@link Build.VERSION_CODES#KITKAT} and newer APIs this gets the result from
+     * {@link Objects#equals(Object, Object)}; for older APIs this does the same comparison as {@link Objects#equals(Object, Object)}.
+     *
+     * @param first  The first object to compare, can be {@code null}
+     * @param second The second object to compare, can be {@code null}
+     * @return {@code True} if objects are equal using {@link Object#equals(Object)}, {@code false} otherwise
+     */
+    @SuppressWarnings("unused")
+    public static boolean equal(@Nullable final Object first, @Nullable final Object second) {
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.KITKAT) {
+            return Objects.equals(first, second);
+        } else {
+            return (first == second) || (first != null && first.equals(second));
+        }
+    }
+
     /**
      * Similarly to {@link java.util.Objects#equals(Object, Object)}, this compares two {@link Drawable}s' constant states.
      *

sillyandroid/src/main/java/me/angrybyte/sillyandroid/components/EasyDialog.java

@@ -35,6 +35,8 @@
 @SuppressWarnings({ "unused", "WeakerAccess" })
 public class EasyDialog extends Dialog implements LayoutWrapper {
 
+    // <editor-fold desc="Constructors">
+
     /**
      * Creates a dialog window that uses the default dialog theme.
      * <p>
@@ -69,145 +71,159 @@ public EasyDialog(@NonNull final Context context, @StyleRes final int themeResId
     /**
      * {@inheritDoc}
      */
-    protected EasyDialog(@NonNull final Context context, final boolean cancelable, @Nullable final OnCancelListener cancelListener) {
+    public EasyDialog(@NonNull final Context context, final boolean cancelable, @Nullable final OnCancelListener cancelListener) {
         super(context, cancelable, cancelListener);
     }
+    // </editor-fold>
+
+    // <editor-fold desc="Internal methods">
+
+    /**
+     * Returns the result from {@link SillyAndroid#equal(Object, Object)}.
+     */
+    protected final boolean equal(@Nullable final Object first, @Nullable final Object second) {
+        return SillyAndroid.equal(first, second);
+    }
 
     /**
      * Returns the result from {@link SillyAndroid#countIntentHandlers(Context, Intent)}.
      */
     @IntRange(from = 0)
-    public int countIntentHandlers(@Nullable final Intent intent) {
+    protected final int countIntentHandlers(@Nullable final Intent intent) {
         return SillyAndroid.countIntentHandlers(getContext(), intent);
     }
 
     /**
      * Returns the result from {@link SillyAndroid#canHandleIntent(Context, Intent)}.
      */
-    public boolean canHandleIntent(@Nullable final Intent intent) {
+    protected final boolean canHandleIntent(@Nullable final Intent intent) {
         return SillyAndroid.canHandleIntent(getContext(), intent);
     }
 
     /**
      * Returns the result from {@link SillyAndroid#getContentView(android.app.Activity)}.
      */
-    public <ViewType extends View> ViewType getContentView() {
+    protected final <ViewType extends View> ViewType getContentView() {
         return SillyAndroid.getContentView(this);
     }
 
     /**
      * Returns the result from {@link SillyAndroid#findViewById(android.support.v4.app.Fragment, int)}.
      */
-    public <ViewType extends View> ViewType findView(@IdRes final int viewId) {
+    public final <ViewType extends View> ViewType findView(@IdRes final int viewId) {
         return SillyAndroid.findViewById(this, viewId);
     }
 
     /**
      * Returns the result from {@link SillyAndroid#isEmpty(String)}.
      */
-    public boolean isEmpty(@Nullable final String text) {
+    protected final boolean isEmpty(@Nullable final String text) {
         return SillyAndroid.isEmpty(text);
     }
 
     /**
      * Returns the result from {@link SillyAndroid#dismiss(PopupMenu)}.
      */
-    public boolean dismiss(@Nullable final PopupMenu menu) {
+    protected final boolean dismiss(@Nullable final PopupMenu menu) {
         return SillyAndroid.dismiss(menu);
     }
 
     /**
      * Returns the result from {@link SillyAndroid#dismiss(android.app.Dialog)}.
      */
-    public boolean dismiss(@Nullable final EasyDialog dialog) {
+    protected final boolean dismiss(@Nullable final Dialog dialog) {
         return SillyAndroid.dismiss(dialog);
     }
 
     /**
      * Returns the result from {@link SillyAndroid#close(Closeable)}.
      */
-    public boolean close(@Nullable final Closeable closeable) {
+    protected final boolean close(@Nullable final Closeable closeable) {
         return SillyAndroid.close(closeable);
     }
 
     /**
      * Returns the result from {@link SillyAndroid#close(Cursor)}.
      */
     @TargetApi(Build.VERSION_CODES.ICE_CREAM_SANDWICH)
-    public boolean close(@Nullable final Cursor cursor) {
+    protected final boolean close(@Nullable final Cursor cursor) {
         return SillyAndroid.close(cursor);
     }
 
     /**
      * Returns the result from {@link ContextCompat#getDrawable(Context, int)}.
      */
     @Nullable
-    public Drawable getDrawableCompat(@DrawableRes final int drawableId) {
+    protected final Drawable getDrawableCompat(@DrawableRes final int drawableId) {
         return ContextCompat.getDrawable(getContext(), drawableId);
     }
 
     /**
      * Invokes {@link ViewCompat#setBackground(View, Drawable)} with the same arguments.
      */
-    public void setBackgroundCompat(@NonNull final EasyView view, @Nullable final Drawable drawable) {
+    protected final void setBackgroundCompat(@NonNull final View view, @Nullable final Drawable drawable) {
         ViewCompat.setBackground(view, drawable);
     }
 
     /**
      * Invokes {@link SillyAndroid#setPadding(View, int, int, int, int)} with the same arguments.
      */
-    public void setPadding(@NonNull final EasyView view, @Px final int start, @Px final int top, @Px final int end, @Px final int bottom) {
+    protected final void setPadding(@NonNull final View view, @Px final int start, @Px final int top, @Px final int end, @Px final int bottom) {
         SillyAndroid.setPadding(view, start, top, end, bottom);
     }
 
     /**
      * Invokes {@link SillyAndroid#setPadding(View, int)} with the same arguments.
      */
-    public void setPadding(@NonNull final EasyView view, @Px final int padding) {
+    protected final void setPadding(@NonNull final View view, @Px final int padding) {
         SillyAndroid.setPadding(view, padding);
     }
 
     /**
      * Returns the result from {@link SillyAndroid#isNetworkConnected(Context)}.
      */
     @RequiresPermission(allOf = { Manifest.permission.ACCESS_WIFI_STATE, Manifest.permission.ACCESS_NETWORK_STATE })
-    public boolean isNetworkConnected() {
+    protected final boolean isNetworkConnected() {
         return SillyAndroid.isNetworkConnected(getContext());
     }
 
     /**
      * Returns the result from {@link SillyAndroid#isVoiceInputAvailable(Context)}.
      */
-    public boolean isVoiceInputAvailable() {
+    protected final boolean isVoiceInputAvailable() {
         return SillyAndroid.isVoiceInputAvailable(getContext());
     }
+    // </editor-fold>
+
+    // <editor-fold desc="Toasts">
 
     /**
      * Invokes {@link SillyAndroid#toastShort(Context, int)}.
      */
-    public void toastShort(@StringRes final int stringId) {
+    protected final void toastShort(@StringRes final int stringId) {
         SillyAndroid.toastShort(getContext(), stringId);
     }
 
     /**
      * Invokes {@link SillyAndroid#toastShort(Context, String)}.
      */
-    public void toastShort(@NonNull final String string) {
+    protected final void toastShort(@NonNull final String string) {
         SillyAndroid.toastShort(getContext(), string);
     }
 
     /**
      * Invokes {@link SillyAndroid#toastLong(Context, int)}.
      */
-    public void toastLong(@StringRes final int stringId) {
+    protected final void toastLong(@StringRes final int stringId) {
         SillyAndroid.toastLong(getContext(), stringId);
     }
 
     /**
      * Invokes {@link SillyAndroid#toastLong(Context, String)}.
      */
-    public void toastLong(@NonNull final String string) {
+    protected final void toastLong(@NonNull final String string) {
         SillyAndroid.toastLong(getContext(), string);
     }
+    // </editor-fold>
 
 }