Added lots of parameter notations. Release 0.6.1.3 which includes the previous pull request.

library/build.gradle

@@ -9,7 +9,7 @@ android {
         minSdkVersion 8
         targetSdkVersion 21
         versionCode 1
-        versionName "0.6.1.2"
+        versionName "0.6.1.3"
     }
     lintOptions {
         abortOnError false
@@ -27,9 +27,9 @@ publish {
     userOrg = 'drummer-aidan'
     groupId = 'com.afollestad'
     artifactId = 'material-dialogs'
-    version = '0.6.1.2'
+    version = '0.6.1.3'
     description = 'A library for implementing Material design styled dialogs across all versions of Android.'
     website = 'https://github.com/afollestad/material-dialogs'
     issueTracker = "${website}/issues"
     repository = "${website}.git"
-}
+}

library/src/main/java/com/afollestad/materialdialogs/MaterialDialog.java

@@ -617,9 +617,9 @@ public class MaterialDialog extends DialogBase implements View.OnClickListener {
         isStacked = false;
         int buttonsWidth = 0;
 
-        positiveButton.measure(View.MeasureSpec.UNSPECIFIED,View.MeasureSpec.UNSPECIFIED);
-        neutralButton.measure(View.MeasureSpec.UNSPECIFIED,View.MeasureSpec.UNSPECIFIED);
-        negativeButton.measure(View.MeasureSpec.UNSPECIFIED,View.MeasureSpec.UNSPECIFIED);
+        positiveButton.measure(View.MeasureSpec.UNSPECIFIED, View.MeasureSpec.UNSPECIFIED);
+        neutralButton.measure(View.MeasureSpec.UNSPECIFIED, View.MeasureSpec.UNSPECIFIED);
+        negativeButton.measure(View.MeasureSpec.UNSPECIFIED, View.MeasureSpec.UNSPECIFIED);
 
         if (mBuilder.positiveText != null) buttonsWidth += positiveButton.getMeasuredWidth();
         if (mBuilder.neutralText != null) buttonsWidth += neutralButton.getMeasuredWidth();
@@ -962,12 +962,12 @@ public class MaterialDialog extends DialogBase implements View.OnClickListener {
             return this;
         }
 
-        public Builder title(CharSequence title) {
+        public Builder title(@NonNull CharSequence title) {
             this.title = title;
             return this;
         }
 
-        public Builder titleGravity(GravityEnum gravity) {
+        public Builder titleGravity(@NonNull GravityEnum gravity) {
             this.titleGravity = gravity;
             return this;
         }
@@ -994,13 +994,13 @@ public class MaterialDialog extends DialogBase implements View.OnClickListener {
          * @param regular The font used everywhere else, like on the content and list items. Null uses the default.
          * @return The Builder instance so you can chain calls to it.
          */
-        public Builder typeface(Typeface medium, Typeface regular) {
+        public Builder typeface(@NonNull Typeface medium, @NonNull Typeface regular) {
             this.mediumFont = medium;
             this.regularFont = regular;
             return this;
         }
 
-        public Builder icon(Drawable icon) {
+        public Builder icon(@NonNull Drawable icon) {
             this.icon = icon;
             return this;
         }
@@ -1045,7 +1045,7 @@ public class MaterialDialog extends DialogBase implements View.OnClickListener {
             return this;
         }
 
-        public Builder contentGravity(GravityEnum gravity) {
+        public Builder contentGravity(@NonNull GravityEnum gravity) {
             this.contentGravity = gravity;
             return this;
         }
@@ -1060,12 +1060,12 @@ public class MaterialDialog extends DialogBase implements View.OnClickListener {
             return this;
         }
 
-        public Builder items(CharSequence[] items) {
+        public Builder items(@NonNull CharSequence[] items) {
             this.items = items;
             return this;
         }
 
-        public Builder itemsCallback(ListCallback callback) {
+        public Builder itemsCallback(@NonNull ListCallback callback) {
             this.listCallback = callback;
             this.listCallbackSingle = null;
             this.listCallbackMulti = null;
@@ -1080,7 +1080,7 @@ public class MaterialDialog extends DialogBase implements View.OnClickListener {
          * @param callback      The callback that will be called when the presses the positive button.
          * @return The Builder instance so you can chain calls to it.
          */
-        public Builder itemsCallbackSingleChoice(int selectedIndex, ListCallback callback) {
+        public Builder itemsCallbackSingleChoice(int selectedIndex, @NonNull ListCallback callback) {
             this.selectedIndex = selectedIndex;
             this.listCallback = null;
             this.listCallbackSingle = callback;
@@ -1108,7 +1108,7 @@ public class MaterialDialog extends DialogBase implements View.OnClickListener {
          * @param callback        The callback that will be called when the presses the positive button.
          * @return The Builder instance so you can chain calls to it.
          */
-        public Builder itemsCallbackMultiChoice(Integer[] selectedIndices, ListCallbackMulti callback) {
+        public Builder itemsCallbackMultiChoice(@NonNull Integer[] selectedIndices, @NonNull ListCallbackMulti callback) {
             this.selectedIndices = selectedIndices;
             this.listCallback = null;
             this.listCallbackSingle = null;
@@ -1133,7 +1133,7 @@ public class MaterialDialog extends DialogBase implements View.OnClickListener {
             return this;
         }
 
-        public Builder positiveText(CharSequence message) {
+        public Builder positiveText(@NonNull CharSequence message) {
             this.positiveText = message;
             return this;
         }
@@ -1142,7 +1142,7 @@ public class MaterialDialog extends DialogBase implements View.OnClickListener {
             return neutralText(this.context.getString(neutralRes));
         }
 
-        public Builder neutralText(CharSequence message) {
+        public Builder neutralText(@NonNull CharSequence message) {
             this.neutralText = message;
             return this;
         }
@@ -1151,7 +1151,7 @@ public class MaterialDialog extends DialogBase implements View.OnClickListener {
             return negativeText(this.context.getString(negativeRes));
         }
 
-        public Builder negativeText(CharSequence message) {
+        public Builder negativeText(@NonNull CharSequence message) {
             this.negativeText = message;
             return this;
         }
@@ -1173,7 +1173,7 @@ public class MaterialDialog extends DialogBase implements View.OnClickListener {
             return this;
         }
 
-        public Builder btnSelector(@DrawableRes int selectorRes, DialogAction which) {
+        public Builder btnSelector(@DrawableRes int selectorRes, @NonNull DialogAction which) {
             switch (which) {
                 default:
                     this.btnSelectorPositive = selectorRes;
@@ -1205,11 +1205,11 @@ public class MaterialDialog extends DialogBase implements View.OnClickListener {
          * Use {@link #customView(android.view.View, boolean)} instead.
          */
         @Deprecated
-        public Builder customView(View view) {
+        public Builder customView(@NonNull View view) {
             return customView(view, true);
         }
 
-        public Builder customView(View view, boolean wrapInScrollView) {
+        public Builder customView(@NonNull View view, boolean wrapInScrollView) {
             this.customView = view;
             this.wrapCustomViewInScroll = wrapInScrollView;
             return this;
@@ -1297,12 +1297,12 @@ public class MaterialDialog extends DialogBase implements View.OnClickListener {
             return itemColor(DialogUtils.resolveColor(this.context, colorAttr));
         }
 
-        public Builder callback(ButtonCallback callback) {
+        public Builder callback(@NonNull ButtonCallback callback) {
             this.callback = callback;
             return this;
         }
 
-        public Builder theme(Theme theme) {
+        public Builder theme(@NonNull Theme theme) {
             this.theme = theme;
             return this;
         }
@@ -1330,27 +1330,27 @@ public class MaterialDialog extends DialogBase implements View.OnClickListener {
          *
          * @return This Builder object to allow for chaining of calls to set methods
          */
-        public Builder adapter(ListAdapter adapter) {
+        public Builder adapter(@NonNull ListAdapter adapter) {
             this.adapter = adapter;
             return this;
         }
 
-        public Builder showListener(OnShowListener listener) {
+        public Builder showListener(@NonNull OnShowListener listener) {
             this.showListener = listener;
             return this;
         }
 
-        public Builder dismissListener(OnDismissListener listener) {
+        public Builder dismissListener(@NonNull OnDismissListener listener) {
             this.dismissListener = listener;
             return this;
         }
 
-        public Builder cancelListener(OnCancelListener listener) {
+        public Builder cancelListener(@NonNull OnCancelListener listener) {
             this.cancelListener = listener;
             return this;
         }
 
-        public Builder keyListener(OnKeyListener listener) {
+        public Builder keyListener(@NonNull OnKeyListener listener) {
             this.keyListener = listener;
             return this;
         }
@@ -1400,7 +1400,7 @@ public class MaterialDialog extends DialogBase implements View.OnClickListener {
      * @param which The action button of which to get the view for.
      * @return The view from the dialog's layout representing this action button.
      */
-    public final View getActionButton(DialogAction which) {
+    public final View getActionButton(@NonNull DialogAction which) {
         if (isStacked) {
             switch (which) {
                 default:
@@ -1463,7 +1463,7 @@ public class MaterialDialog extends DialogBase implements View.OnClickListener {
      * @param which The action button to update.
      * @param title The new title of the action button.
      */
-    public final void setActionButton(DialogAction which, CharSequence title) {
+    public final void setActionButton(@NonNull DialogAction which, CharSequence title) {
         switch (which) {
             default:
                 mBuilder.positiveText = title;
@@ -1513,24 +1513,24 @@ public class MaterialDialog extends DialogBase implements View.OnClickListener {
     /**
      * Updates the dialog's title.
      */
-    public final void setTitle(CharSequence title) {
+    public final void setTitle(@NonNull CharSequence title) {
         this.title.setText(title);
     }
 
     @Override
-    public void setIcon(int resId) {
+    public void setIcon(@DrawableRes int resId) {
         icon.setImageResource(resId);
         icon.setVisibility(resId != 0 ? View.VISIBLE : View.GONE);
     }
 
     @Override
-    public void setIcon(Drawable d) {
+    public void setIcon(@NonNull Drawable d) {
         icon.setImageDrawable(d);
         icon.setVisibility(d != null ? View.VISIBLE : View.GONE);
     }
 
     @Override
-    public void setIconAttribute(int attrId) {
+    public void setIconAttribute(@AttrRes int attrId) {
         Drawable d = DialogUtils.resolveDrawable(mBuilder.context, attrId);
         icon.setImageDrawable(d);
         icon.setVisibility(d != null ? View.VISIBLE : View.GONE);
@@ -1615,7 +1615,7 @@ public class MaterialDialog extends DialogBase implements View.OnClickListener {
      *
      * @param indices The indices of the list items to check.
      */
-    public void setSelectedIndices(Integer[] indices) {
+    public void setSelectedIndices(@NonNull Integer[] indices) {
         mBuilder.selectedIndices = indices;
         selectedIndicesList = new ArrayList<>(Arrays.asList(indices));
         if (mBuilder.adapter != null && mBuilder.adapter instanceof MaterialDialogAdapter) {

library/src/main/java/com/afollestad/materialdialogs/MaterialDialogCompat.java

@@ -80,7 +80,7 @@ public class MaterialDialogCompat {
             return this;
         }
 
-        public Builder setNegativeButton(CharSequence text,
+        public Builder setNegativeButton(@NonNull CharSequence text,
                                          DialogInterface.OnClickListener listener) {
             builder.negativeText(text);
             negativeDialogListener = listener;
@@ -94,7 +94,7 @@ public class MaterialDialogCompat {
             return this;
         }
 
-        public Builder setPositiveButton(CharSequence text,
+        public Builder setPositiveButton(@NonNull CharSequence text,
                                          DialogInterface.OnClickListener listener) {
             builder.positiveText(text);
             positiveDialogListener = listener;
@@ -108,7 +108,7 @@ public class MaterialDialogCompat {
             return this;
         }
 
-        public Builder setNeutralButton(CharSequence text,
+        public Builder setNeutralButton(@NonNull CharSequence text,
                                         DialogInterface.OnClickListener listener) {
             builder.neutralText(text);
             neutralDialogListener = listener;
@@ -120,13 +120,13 @@ public class MaterialDialogCompat {
             return this;
         }
 
-        public Builder setItems(int itemsId, final DialogInterface.OnClickListener listener) {
+        public Builder setItems(@ArrayRes int itemsId, final DialogInterface.OnClickListener listener) {
             builder.items(itemsId);
             onClickListener = listener;
             return this;
         }
 
-        public Builder setItems(CharSequence[] items, DialogInterface.OnClickListener listener) {
+        public Builder setItems(@NonNull CharSequence[] items, DialogInterface.OnClickListener listener) {
             builder.items(items);
             onClickListener = listener;
             return this;
@@ -187,7 +187,7 @@ public class MaterialDialogCompat {
             }
         }
 
-        public Builder setView(View view) {
+        public Builder setView(@NonNull View view) {
             builder.customView(view, false);
             return this;
         }
@@ -214,7 +214,7 @@ public class MaterialDialogCompat {
          * @param listener     notified when an item on the list is clicked. The dialog will not be dismissed when an item is clicked. It will only be dismissed if clicked on a button, if no buttons are supplied it's up to the user to dismiss the dialog.		 * @return
          * @return This
          */
-        public Builder setMultiChoiceItems(String[] items, @Nullable final boolean[] checkedItems, final DialogInterface.OnMultiChoiceClickListener listener) {
+        public Builder setMultiChoiceItems(@NonNull String[] items, @Nullable final boolean[] checkedItems, final DialogInterface.OnMultiChoiceClickListener listener) {
             builder.items(items);
             setUpMultiChoiceCallback(checkedItems, listener);
             return this;
@@ -262,7 +262,7 @@ public class MaterialDialogCompat {
          * @param listener    notified when an item on the list is clicked. The dialog will not be dismissed when an item is clicked. It will only be dismissed if clicked on a button, if no buttons are supplied it's up to the user to dismiss the dialog.
          * @return This
          */
-        public Builder setSingleChoiceItems(String[] items, int checkedItem, final DialogInterface.OnClickListener listener) {
+        public Builder setSingleChoiceItems(@NonNull String[] items, int checkedItem, final DialogInterface.OnClickListener listener) {
             builder.items(items);
             builder.itemsCallbackSingleChoice(checkedItem, new MaterialDialog.ListCallback() {
                 @Override
@@ -292,22 +292,22 @@ public class MaterialDialogCompat {
             return this;
         }
 
-        public Builder setOnCancelListener(DialogInterface.OnCancelListener listener) {
+        public Builder setOnCancelListener(@NonNull DialogInterface.OnCancelListener listener) {
             builder.cancelListener(listener);
             return this;
         }
 
-        public Builder setOnDismissListener(DialogInterface.OnDismissListener listener) {
+        public Builder setOnDismissListener(@NonNull DialogInterface.OnDismissListener listener) {
             builder.dismissListener(listener);
             return this;
         }
 
-        public Builder setOnShowListener(DialogInterface.OnShowListener listener) {
+        public Builder setOnShowListener(@NonNull DialogInterface.OnShowListener listener) {
             builder.showListener(listener);
             return this;
         }
 
-        public Builder setOnKeyListener(DialogInterface.OnKeyListener listener) {
+        public Builder setOnKeyListener(@NonNull DialogInterface.OnKeyListener listener) {
             builder.keyListener(listener);
             return this;
         }

sample/build.gradle

@@ -8,8 +8,8 @@ android {
         applicationId "com.afollestad.materialdialogssample"
         minSdkVersion 14
         targetSdkVersion 21
-        versionCode 67
-        versionName "0.6.1.2"
+        versionCode 68
+        versionName "0.6.1.3"
     }
     lintOptions {
         abortOnError false
@@ -19,4 +19,4 @@ android {
 dependencies {
     compile fileTree(dir: 'libs', include: ['*.jar'])
     compile project(':library')
-}
+}