1
0
Эх сурвалжийг харах

Use @ParametersAreNonnullByDefault in all packages

Aidan Follestad 7 жил өмнө
parent
commit
679009f6c8
27 өөрчлөгдсөн 142 нэмэгдсэн , 141 устгасан
  1. 8 8
      README.md
  2. 1 0
      commons/build.gradle
  3. 10 10
      commons/src/main/java/com/afollestad/materialdialogs/color/ColorChooserDialog.java
  4. 2 0
      commons/src/main/java/com/afollestad/materialdialogs/color/package-info.java
  5. 5 5
      commons/src/main/java/com/afollestad/materialdialogs/folderselector/FileChooserDialog.java
  6. 8 8
      commons/src/main/java/com/afollestad/materialdialogs/folderselector/FolderChooserDialog.java
  7. 2 0
      commons/src/main/java/com/afollestad/materialdialogs/folderselector/package-info.java
  8. 2 3
      commons/src/main/java/com/afollestad/materialdialogs/prefs/MaterialDialogPreference.java
  9. 4 5
      commons/src/main/java/com/afollestad/materialdialogs/prefs/MaterialEditTextPreference.java
  10. 2 3
      commons/src/main/java/com/afollestad/materialdialogs/prefs/MaterialListPreference.java
  11. 2 3
      commons/src/main/java/com/afollestad/materialdialogs/prefs/MaterialMultiSelectListPreference.java
  12. 3 6
      commons/src/main/java/com/afollestad/materialdialogs/prefs/PrefUtil.java
  13. 2 0
      commons/src/main/java/com/afollestad/materialdialogs/prefs/package-info.java
  14. 2 0
      commons/src/main/java/com/afollestad/materialdialogs/simplelist/package-info.java
  15. 1 0
      core/build.gradle
  16. 2 4
      core/src/main/java/com/afollestad/materialdialogs/DialogBase.java
  17. 1 2
      core/src/main/java/com/afollestad/materialdialogs/DialogInit.java
  18. 49 55
      core/src/main/java/com/afollestad/materialdialogs/MaterialDialog.java
  19. 10 12
      core/src/main/java/com/afollestad/materialdialogs/internal/MDTintHelper.java
  20. 2 0
      core/src/main/java/com/afollestad/materialdialogs/internal/package-info.java
  21. 2 0
      core/src/main/java/com/afollestad/materialdialogs/package-info.java
  22. 4 7
      core/src/main/java/com/afollestad/materialdialogs/util/DialogUtils.java
  23. 2 0
      core/src/main/java/com/afollestad/materialdialogs/util/package-info.java
  24. 1 0
      dependencies.gradle
  25. 1 0
      sample/build.gradle
  26. 12 10
      sample/src/main/java/com/afollestad/materialdialogssample/MainActivity.java
  27. 2 0
      sample/src/main/java/com/afollestad/materialdialogssample/package-info.java

+ 8 - 8
README.md

@@ -274,25 +274,25 @@ To know when the user selects an action button, you set callbacks:
 new MaterialDialog.Builder(this)
     .onPositive(new MaterialDialog.SingleButtonCallback() {
         @Override
-        public void onClick(@NonNull MaterialDialog dialog, @NonNull DialogAction which) {
+        public void onClick(MaterialDialog dialog, DialogAction which) {
             // TODO
         }
     })
     .onNeutral(new MaterialDialog.SingleButtonCallback() {
         @Override
-        public void onClick(@NonNull MaterialDialog dialog, @NonNull DialogAction which) {
+        public void onClick(MaterialDialog dialog, DialogAction which) {
             // TODO
         }
     })
     .onNegative(new MaterialDialog.SingleButtonCallback() {
         @Override
-        public void onClick(@NonNull MaterialDialog dialog, @NonNull DialogAction which) {
+        public void onClick(MaterialDialog dialog, DialogAction which) {
             // TODO
         }
     })
     .onAny(new MaterialDialog.SingleButtonCallback() {
         @Override
-        public void onClick(@NonNull MaterialDialog dialog, @NonNull DialogAction which) {
+        public void onClick(MaterialDialog dialog, DialogAction which) {
             // TODO
         }
     });
@@ -320,7 +320,7 @@ new MaterialDialog.Builder(this)
     .negativeText(R.string.deny)
     .onAny(new MaterialDialog.SingleButtonCallback() {
         @Override
-        public void onClick(@NonNull MaterialDialog dialog, @NonNull DialogAction which) {
+        public void onClick(MaterialDialog dialog, DialogAction which) {
             showToast("Prompt checked? " + dialog.isPromptCheckBoxChecked());
         }
     })
@@ -1141,7 +1141,7 @@ public class MyActivity implements ColorChooserDialog.ColorCallback {
     // ...
 
     @Override
-    public void onColorSelection(@NonNull ColorChooserDialog dialog, @ColorInt int color) {
+    public void onColorSelection(ColorChooserDialog dialog, @ColorInt int color) {
         // TODO
     }
 }
@@ -1247,7 +1247,7 @@ public class MyActivity implements FileChooserDialog.FileCallback {
     // ...
 
     @Override
-    public void onFileSelection(@NonNull FileChooserDialog dialog, @NonNull File file) {
+    public void onFileSelection(FileChooserDialog dialog, File file) {
         // TODO
         final String tag = dialog.getTag(); // gets tag set from Builder, if you use multiple dialogs
     }
@@ -1278,7 +1278,7 @@ public class MyActivity implements FolderChooserDialog.FolderCallback {
     // ...
 
     @Override
-    public void onFolderSelection(@NonNull FolderChooserDialog dialog, @NonNull File folder) {
+    public void onFolderSelection(FolderChooserDialog dialog, File folder) {
         // TODO
         final String tag = dialog.getTag(); // gets tag set from Builder, if you use multiple dialogs
     }

+ 1 - 0
commons/build.gradle

@@ -30,6 +30,7 @@ android {
 }
 
 dependencies {
+    implementation 'com.google.code.findbugs:jsr305:' + versions.findBugs
     implementation 'com.android.support:appcompat-v7:' + versions.supportLib
     implementation 'com.android.support:support-annotations:' + versions.supportLib
     implementation 'com.android.support:recyclerview-v7:' + versions.supportLib

+ 10 - 10
commons/src/main/java/com/afollestad/materialdialogs/color/ColorChooserDialog.java

@@ -71,7 +71,7 @@ public class ColorChooserDialog extends DialogFragment
 
   @Nullable
   public static ColorChooserDialog findVisible(
-      @NonNull FragmentManager fragmentManager, @ColorChooserTag String tag) {
+      FragmentManager fragmentManager, @ColorChooserTag String tag) {
     Fragment frag = fragmentManager.findFragmentByTag(tag);
     if (frag != null && frag instanceof ColorChooserDialog) {
       return (ColorChooserDialog) frag;
@@ -357,7 +357,7 @@ public class ColorChooserDialog extends DialogFragment
             .onPositive(
                 new MaterialDialog.SingleButtonCallback() {
                   @Override
-                  public void onClick(@NonNull MaterialDialog dialog, @NonNull DialogAction which) {
+                  public void onClick(MaterialDialog dialog, DialogAction which) {
                     callback.onColorSelection(ColorChooserDialog.this, getSelectedColor());
                     dismiss();
                   }
@@ -365,7 +365,7 @@ public class ColorChooserDialog extends DialogFragment
             .onNegative(
                 new MaterialDialog.SingleButtonCallback() {
                   @Override
-                  public void onClick(@NonNull MaterialDialog dialog, @NonNull DialogAction which) {
+                  public void onClick(MaterialDialog dialog, DialogAction which) {
                     if (isInSub()) {
                       dialog.setActionButton(DialogAction.NEGATIVE, getBuilder().cancelBtn);
                       isInSub(false);
@@ -379,7 +379,7 @@ public class ColorChooserDialog extends DialogFragment
             .onNeutral(
                 new MaterialDialog.SingleButtonCallback() {
                   @Override
-                  public void onClick(@NonNull MaterialDialog dialog, @NonNull DialogAction which) {
+                  public void onClick(MaterialDialog dialog, DialogAction which) {
                     toggleCustom(dialog);
                   }
                 })
@@ -608,14 +608,14 @@ public class ColorChooserDialog extends DialogFragment
 
   public interface ColorCallback {
 
-    void onColorSelection(@NonNull ColorChooserDialog dialog, @ColorInt int selectedColor);
+    void onColorSelection(ColorChooserDialog dialog, @ColorInt int selectedColor);
 
-    void onColorChooserDismissed(@NonNull ColorChooserDialog dialog);
+    void onColorChooserDismissed(ColorChooserDialog dialog);
   }
 
   public static class Builder implements Serializable {
 
-    @NonNull final transient Context context;
+    final transient Context context;
     @Nullable String mediumFont;
     @Nullable String regularFont;
     @StringRes final int title;
@@ -637,7 +637,7 @@ public class ColorChooserDialog extends DialogFragment
     boolean allowUserCustomAlpha = true;
     boolean setPreselectionColor = false;
 
-    public Builder(@NonNull Context context, @StringRes int title) {
+    public Builder(Context context, @StringRes int title) {
       this.context = context;
       this.title = title;
     }
@@ -662,7 +662,7 @@ public class ColorChooserDialog extends DialogFragment
     }
 
     @NonNull
-    public Builder theme(@NonNull Theme theme) {
+    public Builder theme(Theme theme) {
       this.theme = theme;
       return this;
     }
@@ -717,7 +717,7 @@ public class ColorChooserDialog extends DialogFragment
     }
 
     @NonNull
-    public Builder customColors(@NonNull int[] topLevel, @Nullable int[][] subLevel) {
+    public Builder customColors(int[] topLevel, @Nullable int[][] subLevel) {
       colorsTop = topLevel;
       colorsSub = subLevel;
       return this;

+ 2 - 0
commons/src/main/java/com/afollestad/materialdialogs/color/package-info.java

@@ -0,0 +1,2 @@
+@javax.annotation.ParametersAreNonnullByDefault
+package com.afollestad.materialdialogs.color;

+ 5 - 5
commons/src/main/java/com/afollestad/materialdialogs/folderselector/FileChooserDialog.java

@@ -165,7 +165,7 @@ public class FileChooserDialog extends DialogFragment implements MaterialDialog.
         .onNegative(
             new MaterialDialog.SingleButtonCallback() {
               @Override
-              public void onClick(@NonNull MaterialDialog dialog, @NonNull DialogAction which) {
+              public void onClick(MaterialDialog dialog, DialogAction which) {
                 dialog.dismiss();
               }
             })
@@ -257,14 +257,14 @@ public class FileChooserDialog extends DialogFragment implements MaterialDialog.
 
   public interface FileCallback {
 
-    void onFileSelection(@NonNull FileChooserDialog dialog, @NonNull File file);
+    void onFileSelection(FileChooserDialog dialog, File file);
 
-    void onFileChooserDismissed(@NonNull FileChooserDialog dialog);
+    void onFileChooserDismissed(FileChooserDialog dialog);
   }
 
   public static class Builder implements Serializable {
 
-    @NonNull final transient Context context;
+    final transient Context context;
     @StringRes int cancelButton;
     String initialPath;
     String mimeType;
@@ -274,7 +274,7 @@ public class FileChooserDialog extends DialogFragment implements MaterialDialog.
     @Nullable String mediumFont;
     @Nullable String regularFont;
 
-    public Builder(@NonNull Context context) {
+    public Builder(Context context) {
       this.context = context;
       cancelButton = android.R.string.cancel;
       initialPath = Environment.getExternalStorageDirectory().getAbsolutePath();

+ 8 - 8
commons/src/main/java/com/afollestad/materialdialogs/folderselector/FolderChooserDialog.java

@@ -104,7 +104,7 @@ public class FolderChooserDialog extends DialogFragment implements MaterialDialo
             .onPositive(
                 new MaterialDialog.SingleButtonCallback() {
                   @Override
-                  public void onClick(@NonNull MaterialDialog dialog, @NonNull DialogAction which) {
+                  public void onClick(MaterialDialog dialog, DialogAction which) {
                     dialog.dismiss();
                     callback.onFolderSelection(FolderChooserDialog.this, parentFolder);
                   }
@@ -112,7 +112,7 @@ public class FolderChooserDialog extends DialogFragment implements MaterialDialo
             .onNegative(
                 new MaterialDialog.SingleButtonCallback() {
                   @Override
-                  public void onClick(@NonNull MaterialDialog dialog, @NonNull DialogAction which) {
+                  public void onClick(MaterialDialog dialog, DialogAction which) {
                     dialog.dismiss();
                   }
                 })
@@ -124,7 +124,7 @@ public class FolderChooserDialog extends DialogFragment implements MaterialDialo
       builder.onNeutral(
           new MaterialDialog.SingleButtonCallback() {
             @Override
-            public void onClick(@NonNull MaterialDialog dialog, @NonNull DialogAction which) {
+            public void onClick(MaterialDialog dialog, DialogAction which) {
               createNewFolder();
             }
           });
@@ -152,7 +152,7 @@ public class FolderChooserDialog extends DialogFragment implements MaterialDialo
             false,
             new MaterialDialog.InputCallback() {
               @Override
-              public void onInput(@NonNull MaterialDialog dialog, CharSequence input) {
+              public void onInput(MaterialDialog dialog, CharSequence input) {
                 //noinspection ResultOfMethodCallIgnored
                 final File newFi = new File(parentFolder, input.toString());
                 if (!newFi.mkdir()) {
@@ -238,14 +238,14 @@ public class FolderChooserDialog extends DialogFragment implements MaterialDialo
 
   public interface FolderCallback {
 
-    void onFolderSelection(@NonNull FolderChooserDialog dialog, @NonNull File folder);
+    void onFolderSelection(FolderChooserDialog dialog, File folder);
 
-    void onFolderChooserDismissed(@NonNull FolderChooserDialog dialog);
+    void onFolderChooserDismissed(FolderChooserDialog dialog);
   }
 
   public static class Builder implements Serializable {
 
-    @NonNull final transient Context context;
+    final transient Context context;
     @StringRes int chooseButton;
     @StringRes int cancelButton;
     String initialPath;
@@ -256,7 +256,7 @@ public class FolderChooserDialog extends DialogFragment implements MaterialDialo
     @Nullable String mediumFont;
     @Nullable String regularFont;
 
-    public Builder(@NonNull Context context) {
+    public Builder(Context context) {
       this.context = context;
       chooseButton = R.string.md_choose_label;
       cancelButton = android.R.string.cancel;

+ 2 - 0
commons/src/main/java/com/afollestad/materialdialogs/folderselector/package-info.java

@@ -0,0 +1,2 @@
+@javax.annotation.ParametersAreNonnullByDefault
+package com.afollestad.materialdialogs.folderselector;

+ 2 - 3
commons/src/main/java/com/afollestad/materialdialogs/prefs/MaterialDialogPreference.java

@@ -9,7 +9,6 @@ import android.os.Bundle;
 import android.os.Parcel;
 import android.os.Parcelable;
 import android.preference.DialogPreference;
-import android.support.annotation.NonNull;
 import android.util.AttributeSet;
 import android.view.View;
 import com.afollestad.materialdialogs.DialogAction;
@@ -64,7 +63,7 @@ public class MaterialDialogPreference extends DialogPreference {
             .onAny(
                 new MaterialDialog.SingleButtonCallback() {
                   @Override
-                  public void onClick(@NonNull MaterialDialog dialog, @NonNull DialogAction which) {
+                  public void onClick(MaterialDialog dialog, DialogAction which) {
                     switch (which) {
                       default:
                         MaterialDialogPreference.this.onClick(
@@ -172,7 +171,7 @@ public class MaterialDialogPreference extends DialogPreference {
     }
 
     @Override
-    public void writeToParcel(@NonNull Parcel dest, int flags) {
+    public void writeToParcel(Parcel dest, int flags) {
       super.writeToParcel(dest, flags);
       dest.writeInt(isDialogShowing ? 1 : 0);
       dest.writeBundle(dialogBundle);

+ 4 - 5
commons/src/main/java/com/afollestad/materialdialogs/prefs/MaterialEditTextPreference.java

@@ -10,7 +10,6 @@ import android.os.Bundle;
 import android.os.Parcel;
 import android.os.Parcelable;
 import android.preference.EditTextPreference;
-import android.support.annotation.NonNull;
 import android.support.v7.widget.AppCompatEditText;
 import android.util.AttributeSet;
 import android.view.LayoutInflater;
@@ -77,7 +76,7 @@ public class MaterialEditTextPreference extends EditTextPreference {
   }
 
   @Override
-  protected void onAddEditTextToDialogView(@NonNull View dialogView, @NonNull EditText editText) {
+  protected void onAddEditTextToDialogView(View dialogView, EditText editText) {
     ((ViewGroup) dialogView)
         .addView(
             editText,
@@ -87,7 +86,7 @@ public class MaterialEditTextPreference extends EditTextPreference {
 
   @SuppressLint("MissingSuperCall")
   @Override
-  protected void onBindDialogView(@NonNull View view) {
+  protected void onBindDialogView(View view) {
     EditText editText = this.editText;
     editText.setText(getText());
     // Initialize cursor to end of text
@@ -135,7 +134,7 @@ public class MaterialEditTextPreference extends EditTextPreference {
             .onAny(
                 new MaterialDialog.SingleButtonCallback() {
                   @Override
-                  public void onClick(@NonNull MaterialDialog dialog, @NonNull DialogAction which) {
+                  public void onClick(MaterialDialog dialog, DialogAction which) {
                     switch (which) {
                       default:
                         MaterialEditTextPreference.this.onClick(
@@ -259,7 +258,7 @@ public class MaterialEditTextPreference extends EditTextPreference {
     }
 
     @Override
-    public void writeToParcel(@NonNull Parcel dest, int flags) {
+    public void writeToParcel(Parcel dest, int flags) {
       super.writeToParcel(dest, flags);
       dest.writeInt(isDialogShowing ? 1 : 0);
       dest.writeBundle(dialogBundle);

+ 2 - 3
commons/src/main/java/com/afollestad/materialdialogs/prefs/MaterialListPreference.java

@@ -9,7 +9,6 @@ import android.os.Bundle;
 import android.os.Parcel;
 import android.os.Parcelable;
 import android.preference.ListPreference;
-import android.support.annotation.NonNull;
 import android.support.v7.widget.RecyclerView;
 import android.util.AttributeSet;
 import android.view.View;
@@ -90,7 +89,7 @@ public class MaterialListPreference extends ListPreference {
             .onAny(
                 new MaterialDialog.SingleButtonCallback() {
                   @Override
-                  public void onClick(@NonNull MaterialDialog dialog, @NonNull DialogAction which) {
+                  public void onClick(MaterialDialog dialog, DialogAction which) {
                     switch (which) {
                       default:
                         MaterialListPreference.this.onClick(
@@ -218,7 +217,7 @@ public class MaterialListPreference extends ListPreference {
     }
 
     @Override
-    public void writeToParcel(@NonNull Parcel dest, int flags) {
+    public void writeToParcel(Parcel dest, int flags) {
       super.writeToParcel(dest, flags);
       dest.writeInt(isDialogShowing ? 1 : 0);
       dest.writeBundle(dialogBundle);

+ 2 - 3
commons/src/main/java/com/afollestad/materialdialogs/prefs/MaterialMultiSelectListPreference.java

@@ -9,7 +9,6 @@ import android.os.Bundle;
 import android.os.Parcel;
 import android.os.Parcelable;
 import android.preference.MultiSelectListPreference;
-import android.support.annotation.NonNull;
 import android.util.AttributeSet;
 import android.view.View;
 import com.afollestad.materialdialogs.DialogAction;
@@ -92,7 +91,7 @@ public class MaterialMultiSelectListPreference extends MultiSelectListPreference
             .onAny(
                 new MaterialDialog.SingleButtonCallback() {
                   @Override
-                  public void onClick(@NonNull MaterialDialog dialog, @NonNull DialogAction which) {
+                  public void onClick(MaterialDialog dialog, DialogAction which) {
                     switch (which) {
                       default:
                         MaterialMultiSelectListPreference.this.onClick(
@@ -217,7 +216,7 @@ public class MaterialMultiSelectListPreference extends MultiSelectListPreference
     }
 
     @Override
-    public void writeToParcel(@NonNull Parcel dest, int flags) {
+    public void writeToParcel(Parcel dest, int flags) {
       super.writeToParcel(dest, flags);
       dest.writeInt(isDialogShowing ? 1 : 0);
       dest.writeBundle(dialogBundle);

+ 3 - 6
commons/src/main/java/com/afollestad/materialdialogs/prefs/PrefUtil.java

@@ -5,7 +5,6 @@ import android.content.res.TypedArray;
 import android.content.res.XmlResourceParser;
 import android.preference.Preference;
 import android.preference.PreferenceManager;
-import android.support.annotation.NonNull;
 import android.support.annotation.Nullable;
 import android.util.AttributeSet;
 import com.afollestad.materialdialogs.commons.R;
@@ -17,7 +16,7 @@ class PrefUtil {
   private PrefUtil() {}
 
   static void setLayoutResource(
-      @NonNull Context context, @NonNull Preference preference, @Nullable AttributeSet attrs) {
+      Context context, Preference preference, @Nullable AttributeSet attrs) {
     boolean foundLayout = false;
     if (attrs != null) {
       for (int i = 0; i < attrs.getAttributeCount(); i++) {
@@ -46,8 +45,7 @@ class PrefUtil {
   }
 
   static void registerOnActivityDestroyListener(
-      @NonNull Preference preference,
-      @NonNull PreferenceManager.OnActivityDestroyListener listener) {
+      Preference preference, PreferenceManager.OnActivityDestroyListener listener) {
     try {
       PreferenceManager pm = preference.getPreferenceManager();
       Method method =
@@ -62,8 +60,7 @@ class PrefUtil {
   }
 
   static void unregisterOnActivityDestroyListener(
-      @NonNull Preference preference,
-      @NonNull PreferenceManager.OnActivityDestroyListener listener) {
+      Preference preference, PreferenceManager.OnActivityDestroyListener listener) {
     try {
       PreferenceManager pm = preference.getPreferenceManager();
       Method method =

+ 2 - 0
commons/src/main/java/com/afollestad/materialdialogs/prefs/package-info.java

@@ -0,0 +1,2 @@
+@javax.annotation.ParametersAreNonnullByDefault
+package com.afollestad.materialdialogs.prefs;

+ 2 - 0
commons/src/main/java/com/afollestad/materialdialogs/simplelist/package-info.java

@@ -0,0 +1,2 @@
+@javax.annotation.ParametersAreNonnullByDefault
+package com.afollestad.materialdialogs.simplelist;

+ 1 - 0
core/build.gradle

@@ -31,6 +31,7 @@ android {
 }
 
 dependencies {
+    implementation 'com.google.code.findbugs:jsr305:' + versions.findBugs
     implementation 'com.android.support:support-annotations:' + versions.supportLib
     implementation 'com.android.support:appcompat-v7:' + versions.supportLib
     implementation 'com.android.support:recyclerview-v7:' + versions.supportLib

+ 2 - 4
core/src/main/java/com/afollestad/materialdialogs/DialogBase.java

@@ -3,7 +3,6 @@ package com.afollestad.materialdialogs;
 import android.app.Dialog;
 import android.content.Context;
 import android.content.DialogInterface;
-import android.support.annotation.NonNull;
 import android.view.View;
 import android.view.ViewGroup;
 import com.afollestad.materialdialogs.internal.MDRootLayout;
@@ -52,15 +51,14 @@ class DialogBase extends Dialog implements DialogInterface.OnShowListener {
 
   @Override
   @Deprecated
-  public void setContentView(@NonNull View view) throws IllegalAccessError {
+  public void setContentView(View view) throws IllegalAccessError {
     throw new IllegalAccessError(
         "setContentView() is not supported in MaterialDialog. Specify a custom view in the Builder instead.");
   }
 
   @Override
   @Deprecated
-  public void setContentView(@NonNull View view, ViewGroup.LayoutParams params)
-      throws IllegalAccessError {
+  public void setContentView(View view, ViewGroup.LayoutParams params) throws IllegalAccessError {
     throw new IllegalAccessError(
         "setContentView() is not supported in MaterialDialog. Specify a custom view in the Builder instead.");
   }

+ 1 - 2
core/src/main/java/com/afollestad/materialdialogs/DialogInit.java

@@ -6,7 +6,6 @@ import android.graphics.drawable.Drawable;
 import android.graphics.drawable.GradientDrawable;
 import android.os.Build;
 import android.support.annotation.LayoutRes;
-import android.support.annotation.NonNull;
 import android.support.annotation.StyleRes;
 import android.support.annotation.UiThread;
 import android.text.InputType;
@@ -40,7 +39,7 @@ import me.zhanghai.android.materialprogressbar.IndeterminateHorizontalProgressDr
 class DialogInit {
 
   @StyleRes
-  static int getTheme(@NonNull MaterialDialog.Builder builder) {
+  static int getTheme(MaterialDialog.Builder builder) {
     boolean darkTheme =
         DialogUtils.resolveBoolean(
             builder.context, R.attr.md_dark_theme, builder.theme == Theme.DARK);

+ 49 - 55
core/src/main/java/com/afollestad/materialdialogs/MaterialDialog.java

@@ -17,7 +17,6 @@ import android.support.annotation.DimenRes;
 import android.support.annotation.DrawableRes;
 import android.support.annotation.IntRange;
 import android.support.annotation.LayoutRes;
-import android.support.annotation.NonNull;
 import android.support.annotation.Nullable;
 import android.support.annotation.StringRes;
 import android.support.annotation.UiThread;
@@ -477,7 +476,7 @@ public class MaterialDialog extends DialogBase
    * @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 MDButton getActionButton(@NonNull DialogAction which) {
+  public final MDButton getActionButton(DialogAction which) {
     switch (which) {
       default:
         return positiveButton;
@@ -542,7 +541,7 @@ public class MaterialDialog extends DialogBase
    */
   @SuppressWarnings("WeakerAccess")
   @UiThread
-  public final void setActionButton(@NonNull final DialogAction which, final CharSequence title) {
+  public final void setActionButton(final DialogAction which, final CharSequence title) {
     switch (which) {
       default:
         builder.positiveText = title;
@@ -846,7 +845,7 @@ public class MaterialDialog extends DialogBase
    */
   @UiThread
   @SuppressWarnings("unused")
-  public void setSelectedIndices(@NonNull Integer[] indices) {
+  public void setSelectedIndices(Integer[] indices) {
     selectedIndicesList = new ArrayList<>(Arrays.asList(indices));
     if (builder.adapter != null && builder.adapter instanceof DefaultRvAdapter) {
       builder.adapter.notifyDataSetChanged();
@@ -1058,12 +1057,12 @@ public class MaterialDialog extends DialogBase
   /** An alternate way to define a single callback. */
   public interface SingleButtonCallback {
 
-    void onClick(@NonNull MaterialDialog dialog, @NonNull DialogAction which);
+    void onClick(MaterialDialog dialog, DialogAction which);
   }
 
   public interface InputCallback {
 
-    void onInput(@NonNull MaterialDialog dialog, CharSequence input);
+    void onInput(MaterialDialog dialog, CharSequence input);
   }
 
   private static class DialogException extends WindowManager.BadTokenException {
@@ -1176,7 +1175,7 @@ public class MaterialDialog extends DialogBase
 
     protected Object tag;
 
-    public Builder(@NonNull Context context) {
+    public Builder(Context context) {
       this.context = context;
       final int materialBlue = DialogUtils.getColor(context, R.color.md_material_blue_600);
 
@@ -1339,12 +1338,12 @@ public class MaterialDialog extends DialogBase
       return this;
     }
 
-    public Builder title(@NonNull CharSequence title) {
+    public Builder title(CharSequence title) {
       this.title = title;
       return this;
     }
 
-    public Builder titleGravity(@NonNull GravityEnum gravity) {
+    public Builder titleGravity(GravityEnum gravity) {
       this.titleGravity = gravity;
       return this;
     }
@@ -1417,7 +1416,7 @@ public class MaterialDialog extends DialogBase
       return this;
     }
 
-    public Builder icon(@NonNull Drawable icon) {
+    public Builder icon(Drawable icon) {
       this.icon = icon;
       return this;
     }
@@ -1444,7 +1443,7 @@ public class MaterialDialog extends DialogBase
       return content(text);
     }
 
-    public Builder content(@NonNull CharSequence content) {
+    public Builder content(CharSequence content) {
       if (this.customView != null) {
         throw new IllegalStateException(
             "You cannot set content() " + "when you're using a custom view.");
@@ -1476,7 +1475,7 @@ public class MaterialDialog extends DialogBase
       return this;
     }
 
-    public Builder contentGravity(@NonNull GravityEnum gravity) {
+    public Builder contentGravity(GravityEnum gravity) {
       this.contentGravity = gravity;
       return this;
     }
@@ -1486,7 +1485,7 @@ public class MaterialDialog extends DialogBase
       return this;
     }
 
-    public Builder items(@NonNull Collection collection) {
+    public Builder items(Collection collection) {
       if (collection.size() > 0) {
         final CharSequence[] array = new CharSequence[collection.size()];
         int i = 0;
@@ -1506,7 +1505,7 @@ public class MaterialDialog extends DialogBase
       return this;
     }
 
-    public Builder items(@NonNull CharSequence... items) {
+    public Builder items(CharSequence... items) {
       if (this.customView != null) {
         throw new IllegalStateException(
             "You cannot set items()" + " when you're using a custom view.");
@@ -1516,14 +1515,14 @@ public class MaterialDialog extends DialogBase
       return this;
     }
 
-    public Builder itemsCallback(@NonNull ListCallback callback) {
+    public Builder itemsCallback(ListCallback callback) {
       this.listCallback = callback;
       this.listCallbackSingleChoice = null;
       this.listCallbackMultiChoice = null;
       return this;
     }
 
-    public Builder itemsLongCallback(@NonNull ListLongCallback callback) {
+    public Builder itemsLongCallback(ListLongCallback callback) {
       this.listLongCallback = callback;
       this.listCallbackSingleChoice = null;
       this.listCallbackMultiChoice = null;
@@ -1544,12 +1543,12 @@ public class MaterialDialog extends DialogBase
       return itemsColor(DialogUtils.resolveColor(this.context, colorAttr));
     }
 
-    public Builder itemsGravity(@NonNull GravityEnum gravity) {
+    public Builder itemsGravity(GravityEnum gravity) {
       this.itemsGravity = gravity;
       return this;
     }
 
-    public Builder itemsIds(@NonNull int[] idsArray) {
+    public Builder itemsIds(int[] idsArray) {
       this.itemIds = idsArray;
       return this;
     }
@@ -1558,7 +1557,7 @@ public class MaterialDialog extends DialogBase
       return itemsIds(context.getResources().getIntArray(idsArrayRes));
     }
 
-    public Builder buttonsGravity(@NonNull GravityEnum gravity) {
+    public Builder buttonsGravity(GravityEnum gravity) {
       this.buttonsGravity = gravity;
       return this;
     }
@@ -1571,8 +1570,7 @@ public class MaterialDialog extends DialogBase
      * @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, @NonNull ListCallbackSingleChoice callback) {
+    public Builder itemsCallbackSingleChoice(int selectedIndex, ListCallbackSingleChoice callback) {
       this.selectedIndex = selectedIndex;
       this.listCallback = null;
       this.listCallbackSingleChoice = callback;
@@ -1601,7 +1599,7 @@ public class MaterialDialog extends DialogBase
      * @return The Builder instance so you can chain calls to it.
      */
     public Builder itemsCallbackMultiChoice(
-        @Nullable Integer[] selectedIndices, @NonNull ListCallbackMultiChoice callback) {
+        @Nullable Integer[] selectedIndices, ListCallbackMultiChoice callback) {
       this.selectedIndices = selectedIndices;
       this.listCallback = null;
       this.listCallbackSingleChoice = null;
@@ -1641,7 +1639,7 @@ public class MaterialDialog extends DialogBase
       return this;
     }
 
-    public Builder positiveText(@NonNull CharSequence message) {
+    public Builder positiveText(CharSequence message) {
       this.positiveText = message;
       return this;
     }
@@ -1659,7 +1657,7 @@ public class MaterialDialog extends DialogBase
           DialogUtils.resolveActionTextColorStateList(this.context, colorAttr, null));
     }
 
-    public Builder positiveColor(@NonNull ColorStateList colorStateList) {
+    public Builder positiveColor(ColorStateList colorStateList) {
       this.positiveColor = colorStateList;
       this.positiveColorSet = true;
       return this;
@@ -1677,7 +1675,7 @@ public class MaterialDialog extends DialogBase
       return neutralText(this.context.getText(neutralRes));
     }
 
-    public Builder neutralText(@NonNull CharSequence message) {
+    public Builder neutralText(CharSequence message) {
       this.neutralText = message;
       return this;
     }
@@ -1695,7 +1693,7 @@ public class MaterialDialog extends DialogBase
           DialogUtils.resolveActionTextColorStateList(this.context, colorAttr, null));
     }
 
-    public Builder negativeColor(@NonNull ColorStateList colorStateList) {
+    public Builder negativeColor(ColorStateList colorStateList) {
       this.negativeColor = colorStateList;
       this.negativeColorSet = true;
       return this;
@@ -1708,7 +1706,7 @@ public class MaterialDialog extends DialogBase
       return negativeText(this.context.getText(negativeRes));
     }
 
-    public Builder negativeText(@NonNull CharSequence message) {
+    public Builder negativeText(CharSequence message) {
       this.negativeText = message;
       return this;
     }
@@ -1731,7 +1729,7 @@ public class MaterialDialog extends DialogBase
           DialogUtils.resolveActionTextColorStateList(this.context, colorAttr, null));
     }
 
-    public Builder neutralColor(@NonNull ColorStateList colorStateList) {
+    public Builder neutralColor(ColorStateList colorStateList) {
       this.neutralColor = colorStateList;
       this.neutralColorSet = true;
       return this;
@@ -1754,7 +1752,7 @@ public class MaterialDialog extends DialogBase
       return linkColor(DialogUtils.resolveActionTextColorStateList(this.context, colorAttr, null));
     }
 
-    public Builder linkColor(@NonNull ColorStateList colorStateList) {
+    public Builder linkColor(ColorStateList colorStateList) {
       this.linkColor = colorStateList;
       return this;
     }
@@ -1776,7 +1774,7 @@ public class MaterialDialog extends DialogBase
       return this;
     }
 
-    public Builder btnSelector(@DrawableRes int selectorRes, @NonNull DialogAction which) {
+    public Builder btnSelector(@DrawableRes int selectorRes, DialogAction which) {
       switch (which) {
         default:
           this.btnSelectorPositive = selectorRes;
@@ -1798,13 +1796,13 @@ public class MaterialDialog extends DialogBase
      * @param gravity The gravity to use.
      * @return The Builder instance so calls can be chained.
      */
-    public Builder btnStackedGravity(@NonNull GravityEnum gravity) {
+    public Builder btnStackedGravity(GravityEnum gravity) {
       this.btnStackedGravity = gravity;
       return this;
     }
 
     public Builder checkBoxPrompt(
-        @NonNull CharSequence prompt,
+        CharSequence prompt,
         boolean initiallyChecked,
         @Nullable CheckBox.OnCheckedChangeListener checkListener) {
       this.checkBoxPrompt = prompt;
@@ -1826,7 +1824,7 @@ public class MaterialDialog extends DialogBase
       return customView(li.inflate(layoutRes, null), wrapInScrollView);
     }
 
-    public Builder customView(@NonNull View view, boolean wrapInScrollView) {
+    public Builder customView(View view, boolean wrapInScrollView) {
       if (this.content != null) {
         throw new IllegalStateException("You cannot use customView() when you have content set.");
       } else if (this.items != null) {
@@ -1888,7 +1886,7 @@ public class MaterialDialog extends DialogBase
      * hange the format of the small text showing current and maximum units of progress. The default
      * is "%1d/%2d".
      */
-    public Builder progressNumberFormat(@NonNull String format) {
+    public Builder progressNumberFormat(String format) {
       this.progressNumberFormat = format;
       return this;
     }
@@ -1897,7 +1895,7 @@ public class MaterialDialog extends DialogBase
      * Change the format of the small text showing the percentage of progress. The default is
      * NumberFormat.getPercentageInstance().
      */
-    public Builder progressPercentFormat(@NonNull NumberFormat format) {
+    public Builder progressPercentFormat(NumberFormat format) {
       this.progressPercentFormat = format;
       return this;
     }
@@ -1957,32 +1955,32 @@ public class MaterialDialog extends DialogBase
       return backgroundColor(DialogUtils.resolveColor(this.context, colorAttr));
     }
 
-    public Builder callback(@NonNull ButtonCallback callback) {
+    public Builder callback(ButtonCallback callback) {
       this.callback = callback;
       return this;
     }
 
-    public Builder onPositive(@NonNull SingleButtonCallback callback) {
+    public Builder onPositive(SingleButtonCallback callback) {
       this.onPositiveCallback = callback;
       return this;
     }
 
-    public Builder onNegative(@NonNull SingleButtonCallback callback) {
+    public Builder onNegative(SingleButtonCallback callback) {
       this.onNegativeCallback = callback;
       return this;
     }
 
-    public Builder onNeutral(@NonNull SingleButtonCallback callback) {
+    public Builder onNeutral(SingleButtonCallback callback) {
       this.onNeutralCallback = callback;
       return this;
     }
 
-    public Builder onAny(@NonNull SingleButtonCallback callback) {
+    public Builder onAny(SingleButtonCallback callback) {
       this.onAnyCallback = callback;
       return this;
     }
 
-    public Builder theme(@NonNull Theme theme) {
+    public Builder theme(Theme theme) {
       this.theme = theme;
       return this;
     }
@@ -2021,8 +2019,7 @@ public class MaterialDialog extends DialogBase
      */
     @SuppressWarnings("ConstantConditions")
     public Builder adapter(
-        @NonNull RecyclerView.Adapter<?> adapter,
-        @Nullable RecyclerView.LayoutManager layoutManager) {
+        RecyclerView.Adapter<?> adapter, @Nullable RecyclerView.LayoutManager layoutManager) {
       if (this.customView != null) {
         throw new IllegalStateException(
             "You cannot set adapter() when " + "you're using a custom view.");
@@ -2054,22 +2051,22 @@ public class MaterialDialog extends DialogBase
       return maxIconSize((int) this.context.getResources().getDimension(maxIconSizeRes));
     }
 
-    public Builder showListener(@NonNull OnShowListener listener) {
+    public Builder showListener(OnShowListener listener) {
       this.showListener = listener;
       return this;
     }
 
-    public Builder dismissListener(@NonNull OnDismissListener listener) {
+    public Builder dismissListener(OnDismissListener listener) {
       this.dismissListener = listener;
       return this;
     }
 
-    public Builder cancelListener(@NonNull OnCancelListener listener) {
+    public Builder cancelListener(OnCancelListener listener) {
       this.cancelListener = listener;
       return this;
     }
 
-    public Builder keyListener(@NonNull OnKeyListener listener) {
+    public Builder keyListener(OnKeyListener listener) {
       this.keyListener = listener;
       return this;
     }
@@ -2080,7 +2077,7 @@ public class MaterialDialog extends DialogBase
      * @param behavior The behavior of the action button stacking logic.
      * @return The Builder instance so you can chain calls to it.
      */
-    public Builder stackingBehavior(@NonNull StackingBehavior behavior) {
+    public Builder stackingBehavior(StackingBehavior behavior) {
       this.stackingBehavior = behavior;
       return this;
     }
@@ -2089,7 +2086,7 @@ public class MaterialDialog extends DialogBase
         @Nullable CharSequence hint,
         @Nullable CharSequence prefill,
         boolean allowEmptyInput,
-        @NonNull InputCallback callback) {
+        InputCallback callback) {
       if (this.customView != null) {
         throw new IllegalStateException(
             "You cannot set content() when " + "you're using a custom view.");
@@ -2102,9 +2099,7 @@ public class MaterialDialog extends DialogBase
     }
 
     public Builder input(
-        @Nullable CharSequence hint,
-        @Nullable CharSequence prefill,
-        @NonNull InputCallback callback) {
+        @Nullable CharSequence hint, @Nullable CharSequence prefill, InputCallback callback) {
       return input(hint, prefill, true, callback);
     }
 
@@ -2112,7 +2107,7 @@ public class MaterialDialog extends DialogBase
         @StringRes int hint,
         @StringRes int prefill,
         boolean allowEmptyInput,
-        @NonNull InputCallback callback) {
+        InputCallback callback) {
       return input(
           hint == 0 ? null : context.getText(hint),
           prefill == 0 ? null : context.getText(prefill),
@@ -2120,8 +2115,7 @@ public class MaterialDialog extends DialogBase
           callback);
     }
 
-    public Builder input(
-        @StringRes int hint, @StringRes int prefill, @NonNull InputCallback callback) {
+    public Builder input(@StringRes int hint, @StringRes int prefill, InputCallback callback) {
       return input(hint, prefill, true, callback);
     }
 

+ 10 - 12
core/src/main/java/com/afollestad/materialdialogs/internal/MDTintHelper.java

@@ -7,7 +7,6 @@ import android.graphics.PorterDuff;
 import android.graphics.drawable.Drawable;
 import android.os.Build;
 import android.support.annotation.ColorInt;
-import android.support.annotation.NonNull;
 import android.support.v4.content.ContextCompat;
 import android.support.v4.graphics.drawable.DrawableCompat;
 import android.support.v7.widget.AppCompatEditText;
@@ -26,7 +25,7 @@ import java.lang.reflect.Field;
 @SuppressLint("PrivateResource")
 public class MDTintHelper {
 
-  public static void setTint(@NonNull RadioButton radioButton, @NonNull ColorStateList colors) {
+  public static void setTint(RadioButton radioButton, ColorStateList colors) {
     if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP_MR1) {
       radioButton.setButtonTintList(colors);
     } else {
@@ -38,7 +37,7 @@ public class MDTintHelper {
     }
   }
 
-  public static void setTint(@NonNull RadioButton radioButton, @ColorInt int color) {
+  public static void setTint(RadioButton radioButton, @ColorInt int color) {
     final int disabledColor = DialogUtils.getDisabledColor(radioButton.getContext());
     ColorStateList sl =
         new ColorStateList(
@@ -57,7 +56,7 @@ public class MDTintHelper {
     setTint(radioButton, sl);
   }
 
-  public static void setTint(@NonNull CheckBox box, @NonNull ColorStateList colors) {
+  public static void setTint(CheckBox box, ColorStateList colors) {
     if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP_MR1) {
       box.setButtonTintList(colors);
     } else {
@@ -69,7 +68,7 @@ public class MDTintHelper {
     }
   }
 
-  public static void setTint(@NonNull CheckBox box, @ColorInt int color) {
+  public static void setTint(CheckBox box, @ColorInt int color) {
     final int disabledColor = DialogUtils.getDisabledColor(box.getContext());
     ColorStateList sl =
         new ColorStateList(
@@ -88,7 +87,7 @@ public class MDTintHelper {
     setTint(box, sl);
   }
 
-  public static void setTint(@NonNull SeekBar seekBar, @ColorInt int color) {
+  public static void setTint(SeekBar seekBar, @ColorInt int color) {
     ColorStateList s1 = ColorStateList.valueOf(color);
     if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
       seekBar.setThumbTintList(s1);
@@ -116,12 +115,12 @@ public class MDTintHelper {
     }
   }
 
-  public static void setTint(@NonNull ProgressBar progressBar, @ColorInt int color) {
+  public static void setTint(ProgressBar progressBar, @ColorInt int color) {
     setTint(progressBar, color, false);
   }
 
   private static void setTint(
-      @NonNull ProgressBar progressBar, @ColorInt int color, boolean skipIndeterminate) {
+      ProgressBar progressBar, @ColorInt int color, boolean skipIndeterminate) {
     ColorStateList sl = ColorStateList.valueOf(color);
     if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
       progressBar.setProgressTintList(sl);
@@ -143,8 +142,7 @@ public class MDTintHelper {
     }
   }
 
-  private static ColorStateList createEditTextColorStateList(
-      @NonNull Context context, @ColorInt int color) {
+  private static ColorStateList createEditTextColorStateList(Context context, @ColorInt int color) {
     int[][] states = new int[3][];
     int[] colors = new int[3];
     int i = 0;
@@ -159,7 +157,7 @@ public class MDTintHelper {
     return new ColorStateList(states, colors);
   }
 
-  public static void setTint(@NonNull EditText editText, @ColorInt int color) {
+  public static void setTint(EditText editText, @ColorInt int color) {
     ColorStateList editTextColorStateList =
         createEditTextColorStateList(editText.getContext(), color);
     if (editText instanceof AppCompatEditText) {
@@ -171,7 +169,7 @@ public class MDTintHelper {
     setCursorTint(editText, color);
   }
 
-  private static void setCursorTint(@NonNull EditText editText, @ColorInt int color) {
+  private static void setCursorTint(EditText editText, @ColorInt int color) {
     try {
       Field fCursorDrawableRes = TextView.class.getDeclaredField("mCursorDrawableRes");
       fCursorDrawableRes.setAccessible(true);

+ 2 - 0
core/src/main/java/com/afollestad/materialdialogs/internal/package-info.java

@@ -0,0 +1,2 @@
+@javax.annotation.ParametersAreNonnullByDefault
+package com.afollestad.materialdialogs.internal;

+ 2 - 0
core/src/main/java/com/afollestad/materialdialogs/package-info.java

@@ -0,0 +1,2 @@
+@javax.annotation.ParametersAreNonnullByDefault
+package com.afollestad.materialdialogs;

+ 4 - 7
core/src/main/java/com/afollestad/materialdialogs/util/DialogUtils.java

@@ -12,7 +12,6 @@ import android.support.annotation.ArrayRes;
 import android.support.annotation.AttrRes;
 import android.support.annotation.ColorInt;
 import android.support.annotation.ColorRes;
-import android.support.annotation.NonNull;
 import android.support.annotation.Nullable;
 import android.support.v4.content.ContextCompat;
 import android.util.TypedValue;
@@ -222,8 +221,7 @@ public class DialogUtils {
     }
   }
 
-  public static void showKeyboard(
-      @NonNull final DialogInterface di, @NonNull final MaterialDialog.Builder builder) {
+  public static void showKeyboard(final DialogInterface di, final MaterialDialog.Builder builder) {
     final MaterialDialog dialog = (MaterialDialog) di;
     if (dialog.getInputEditText() == null) {
       return;
@@ -245,8 +243,7 @@ public class DialogUtils {
             });
   }
 
-  public static void hideKeyboard(
-      @NonNull final DialogInterface di, @NonNull final MaterialDialog.Builder builder) {
+  public static void hideKeyboard(final DialogInterface di, final MaterialDialog.Builder builder) {
     final MaterialDialog dialog = (MaterialDialog) di;
     if (dialog.getInputEditText() == null) {
       return;
@@ -282,7 +279,7 @@ public class DialogUtils {
     return new ColorStateList(states, colors);
   }
 
-  public static int[] getColorArray(@NonNull Context context, @ArrayRes int array) {
+  public static int[] getColorArray(Context context, @ArrayRes int array) {
     if (array == 0) {
       return null;
     }
@@ -295,7 +292,7 @@ public class DialogUtils {
     return colors;
   }
 
-  public static <T> boolean isIn(@NonNull T find, @Nullable T[] ary) {
+  public static <T> boolean isIn(T find, @Nullable T[] ary) {
     if (ary == null || ary.length == 0) {
       return false;
     }

+ 2 - 0
core/src/main/java/com/afollestad/materialdialogs/util/package-info.java

@@ -0,0 +1,2 @@
+@javax.annotation.ParametersAreNonnullByDefault
+package com.afollestad.materialdialogs.util;

+ 1 - 0
dependencies.gradle

@@ -6,6 +6,7 @@ ext.versions = [
         publishVersionCode: 179,
         gradlePlugin      : '3.0.1',
         spotlessPlugin    : '3.6.0',
+        findBugs          : '3.0.2',
 
         supportLib        : '27.0.1',
         mdProgressBar     : '1.4.2',

+ 1 - 0
sample/build.gradle

@@ -37,6 +37,7 @@ android {
 dependencies {
     implementation project(':core')
     implementation project(':commons')
+    implementation 'com.google.code.findbugs:jsr305:' + versions.findBugs
 
     implementation 'com.android.support:gridlayout-v7:' + versions.supportLib
     implementation 'com.android.support:appcompat-v7:' + versions.supportLib

+ 12 - 10
sample/src/main/java/com/afollestad/materialdialogssample/MainActivity.java

@@ -10,7 +10,6 @@ import android.os.Build;
 import android.os.Bundle;
 import android.os.Handler;
 import android.support.annotation.ColorInt;
-import android.support.annotation.NonNull;
 import android.support.annotation.StringRes;
 import android.support.v4.app.ActivityCompat;
 import android.support.v4.content.ContextCompat;
@@ -26,8 +25,7 @@ import android.view.View;
 import android.widget.CheckBox;
 import android.widget.EditText;
 import android.widget.Toast;
-import butterknife.ButterKnife;
-import butterknife.OnClick;
+
 import com.afollestad.materialdialogs.DialogAction;
 import com.afollestad.materialdialogs.GravityEnum;
 import com.afollestad.materialdialogs.MaterialDialog;
@@ -42,8 +40,12 @@ import com.afollestad.materialdialogs.internal.ThemeSingleton;
 import com.afollestad.materialdialogs.simplelist.MaterialSimpleListAdapter;
 import com.afollestad.materialdialogs.simplelist.MaterialSimpleListItem;
 import com.afollestad.materialdialogs.util.DialogUtils;
+
 import java.io.File;
 
+import butterknife.ButterKnife;
+import butterknife.OnClick;
+
 /** @author Aidan Follestad (afollestad) */
 public class MainActivity extends AppCompatActivity
     implements FolderChooserDialog.FolderCallback,
@@ -597,7 +599,7 @@ public class MainActivity extends AppCompatActivity
 
   // Receives callback from color chooser dialog
   @Override
-  public void onColorSelection(@NonNull ColorChooserDialog dialog, @ColorInt int color) {
+  public void onColorSelection(ColorChooserDialog dialog, @ColorInt int color) {
     if (dialog.isAccentMode()) {
       accentPreselect = color;
       ThemeSingleton.get().positiveColor = DialogUtils.getActionTextStateList(this, color);
@@ -617,7 +619,7 @@ public class MainActivity extends AppCompatActivity
   }
 
   @Override
-  public void onColorChooserDismissed(@NonNull ColorChooserDialog dialog) {
+  public void onColorChooserDismissed(ColorChooserDialog dialog) {
     showToast("Color chooser dismissed!");
   }
 
@@ -673,12 +675,12 @@ public class MainActivity extends AppCompatActivity
   }
 
   @Override
-  public void onFileSelection(@NonNull FileChooserDialog dialog, @NonNull File file) {
+  public void onFileSelection(FileChooserDialog dialog, File file) {
     showToast(file.getAbsolutePath());
   }
 
   @Override
-  public void onFileChooserDismissed(@NonNull FileChooserDialog dialog) {
+  public void onFileChooserDismissed(FileChooserDialog dialog) {
     showToast("File chooser dismissed!");
   }
 
@@ -702,12 +704,12 @@ public class MainActivity extends AppCompatActivity
   }
 
   @Override
-  public void onFolderSelection(@NonNull FolderChooserDialog dialog, @NonNull File folder) {
+  public void onFolderSelection(FolderChooserDialog dialog, File folder) {
     showToast(folder.getAbsolutePath());
   }
 
   @Override
-  public void onFolderChooserDismissed(@NonNull FolderChooserDialog dialog) {
+  public void onFolderChooserDismissed(FolderChooserDialog dialog) {
     showToast("Folder chooser dismissed!");
   }
 
@@ -858,7 +860,7 @@ public class MainActivity extends AppCompatActivity
 
   @Override
   public void onRequestPermissionsResult(
-      int requestCode, @NonNull String[] permissions, @NonNull int[] grantResults) {
+      int requestCode, String[] permissions, int[] grantResults) {
     super.onRequestPermissionsResult(requestCode, permissions, grantResults);
     if (requestCode == STORAGE_PERMISSION_RC) {
       if (grantResults[0] == PackageManager.PERMISSION_GRANTED) {

+ 2 - 0
sample/src/main/java/com/afollestad/materialdialogssample/package-info.java

@@ -0,0 +1,2 @@
+@javax.annotation.ParametersAreNonnullByDefault
+package com.afollestad.materialdialogssample;