Преглед на файлове

Remove uses of @NonNull

Aidan Follestad преди 7 години
родител
ревизия
bf7e6b5630

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

@@ -9,7 +9,6 @@ import android.os.Build;
 import android.os.Bundle;
 import android.support.annotation.ArrayRes;
 import android.support.annotation.ColorInt;
-import android.support.annotation.NonNull;
 import android.support.annotation.Nullable;
 import android.support.annotation.StringDef;
 import android.support.annotation.StringRes;
@@ -289,7 +288,6 @@ public class ColorChooserDialog extends DialogFragment
     }
   }
 
-  @NonNull
   @Override
   public Dialog onCreateDialog(Bundle savedInstanceState) {
     if (getArguments() == null || !getArguments().containsKey("builder")) {
@@ -582,7 +580,6 @@ public class ColorChooserDialog extends DialogFragment
     }
   }
 
-  @NonNull
   public ColorChooserDialog show() {
     String tag;
     Builder builder = getBuilder();
@@ -656,88 +653,74 @@ public class ColorChooserDialog extends DialogFragment
       this.title = title;
     }
 
-    @NonNull
     public Builder typeface(@Nullable String medium, @Nullable String regular) {
       this.mediumFont = medium;
       this.regularFont = regular;
       return this;
     }
 
-    @NonNull
     public Builder titleSub(@StringRes int titleSub) {
       this.titleSub = titleSub;
       return this;
     }
 
-    @NonNull
     public Builder tag(@Nullable String tag) {
       this.tag = tag;
       return this;
     }
 
-    @NonNull
     public Builder theme(Theme theme) {
       this.theme = theme;
       return this;
     }
 
-    @NonNull
     public Builder preselect(@ColorInt int preselect) {
       preselectColor = preselect;
       setPreselectionColor = true;
       return this;
     }
 
-    @NonNull
     public Builder accentMode(boolean accentMode) {
       this.accentMode = accentMode;
       return this;
     }
 
-    @NonNull
     public Builder doneButton(@StringRes int text) {
       doneBtn = text;
       return this;
     }
 
-    @NonNull
     public Builder backButton(@StringRes int text) {
       backBtn = text;
       return this;
     }
 
-    @NonNull
     public Builder cancelButton(@StringRes int text) {
       cancelBtn = text;
       return this;
     }
 
-    @NonNull
     public Builder customButton(@StringRes int text) {
       customBtn = text;
       return this;
     }
 
-    @NonNull
     public Builder presetsButton(@StringRes int text) {
       presetsBtn = text;
       return this;
     }
 
-    @NonNull
     public Builder dynamicButtonColor(boolean enabled) {
       dynamicButtonColor = enabled;
       return this;
     }
 
-    @NonNull
     public Builder customColors(int[] topLevel, @Nullable int[][] subLevel) {
       colorsTop = topLevel;
       colorsSub = subLevel;
       return this;
     }
 
-    @NonNull
     public Builder customColors(@ArrayRes int topLevel, @Nullable int[][] subLevel) {
       final Context context = fragment != null ? fragment.getContext() : activity;
       colorsTop = DialogUtils.getColorArray(context, topLevel);
@@ -745,19 +728,16 @@ public class ColorChooserDialog extends DialogFragment
       return this;
     }
 
-    @NonNull
     public Builder allowUserColorInput(boolean allow) {
       allowUserCustom = allow;
       return this;
     }
 
-    @NonNull
     public Builder allowUserColorInputAlpha(boolean allow) {
       allowUserCustomAlpha = allow;
       return this;
     }
 
-    @NonNull
     public ColorChooserDialog build() {
       ColorChooserDialog dialog = new ColorChooserDialog();
       Bundle args = new Bundle();
@@ -766,7 +746,6 @@ public class ColorChooserDialog extends DialogFragment
       return dialog;
     }
 
-    @NonNull
     public ColorChooserDialog show() {
       ColorChooserDialog dialog = build();
       dialog.show();

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

@@ -8,7 +8,6 @@ import android.content.pm.PackageManager;
 import android.os.Build;
 import android.os.Bundle;
 import android.os.Environment;
-import android.support.annotation.NonNull;
 import android.support.annotation.Nullable;
 import android.support.annotation.StringRes;
 import android.support.v4.app.DialogFragment;
@@ -134,7 +133,6 @@ public class FileChooserDialog extends DialogFragment implements MaterialDialog.
   }
 
   @SuppressWarnings("ConstantConditions")
-  @NonNull
   @Override
   public Dialog onCreateDialog(Bundle savedInstanceState) {
     if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M
@@ -249,13 +247,11 @@ public class FileChooserDialog extends DialogFragment implements MaterialDialog.
     show(fragmentManager, tag);
   }
 
-  @NonNull
   public String getInitialPath() {
     return getBuilder().initialPath;
   }
 
   @SuppressWarnings("ConstantConditions")
-  @NonNull
   private Builder getBuilder() {
     return (Builder) getArguments().getSerializable("builder");
   }
@@ -298,20 +294,17 @@ public class FileChooserDialog extends DialogFragment implements MaterialDialog.
       this.fragment = fragment;
     }
 
-    @NonNull
     public Builder typeface(@Nullable String medium, @Nullable String regular) {
       this.mediumFont = medium;
       this.regularFont = regular;
       return this;
     }
 
-    @NonNull
     public Builder cancelButton(@StringRes int text) {
       cancelButton = text;
       return this;
     }
 
-    @NonNull
     public Builder initialPath(@Nullable String initialPath) {
       if (initialPath == null) {
         initialPath = File.separator;
@@ -320,19 +313,16 @@ public class FileChooserDialog extends DialogFragment implements MaterialDialog.
       return this;
     }
 
-    @NonNull
     public Builder mimeType(@Nullable String type) {
       mimeType = type;
       return this;
     }
 
-    @NonNull
     public Builder extensionsFilter(@Nullable String... extensions) {
       this.extensions = extensions;
       return this;
     }
 
-    @NonNull
     public Builder tag(@Nullable String tag) {
       if (tag == null) {
         tag = DEFAULT_TAG;
@@ -341,13 +331,11 @@ public class FileChooserDialog extends DialogFragment implements MaterialDialog.
       return this;
     }
 
-    @NonNull
     public Builder goUpLabel(String text) {
       goUpLabel = text;
       return this;
     }
 
-    @NonNull
     public FileChooserDialog build() {
       FileChooserDialog dialog = new FileChooserDialog();
       Bundle args = new Bundle();
@@ -356,7 +344,6 @@ public class FileChooserDialog extends DialogFragment implements MaterialDialog.
       return dialog;
     }
 
-    @NonNull
     public FileChooserDialog show() {
       FileChooserDialog dialog = build();
       dialog.show();

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

@@ -8,7 +8,6 @@ import android.content.pm.PackageManager;
 import android.os.Build;
 import android.os.Bundle;
 import android.os.Environment;
-import android.support.annotation.NonNull;
 import android.support.annotation.Nullable;
 import android.support.annotation.StringRes;
 import android.support.v4.app.ActivityCompat;
@@ -235,7 +234,6 @@ public class FolderChooserDialog extends DialogFragment implements MaterialDialo
   }
 
   @SuppressWarnings("ConstantConditions")
-  @NonNull
   private Builder getBuilder() {
     return (Builder) getArguments().getSerializable("builder");
   }
@@ -279,32 +277,27 @@ public class FolderChooserDialog extends DialogFragment implements MaterialDialo
       this.fragment = fragment;
     }
 
-    @NonNull
     public Builder typeface(@Nullable String medium, @Nullable String regular) {
       this.mediumFont = medium;
       this.regularFont = regular;
       return this;
     }
 
-    @NonNull
     public Builder chooseButton(@StringRes int text) {
       chooseButton = text;
       return this;
     }
 
-    @NonNull
     public Builder cancelButton(@StringRes int text) {
       cancelButton = text;
       return this;
     }
 
-    @NonNull
     public Builder goUpLabel(String text) {
       goUpLabel = text;
       return this;
     }
 
-    @NonNull
     public Builder allowNewFolder(boolean allow, @StringRes int buttonLabel) {
       allowNewFolder = allow;
       if (buttonLabel == 0) {
@@ -314,7 +307,6 @@ public class FolderChooserDialog extends DialogFragment implements MaterialDialo
       return this;
     }
 
-    @NonNull
     public Builder initialPath(@Nullable String initialPath) {
       if (initialPath == null) {
         initialPath = File.separator;
@@ -323,7 +315,6 @@ public class FolderChooserDialog extends DialogFragment implements MaterialDialo
       return this;
     }
 
-    @NonNull
     public Builder tag(@Nullable String tag) {
       if (tag == null) {
         tag = DEFAULT_TAG;
@@ -332,7 +323,6 @@ public class FolderChooserDialog extends DialogFragment implements MaterialDialo
       return this;
     }
 
-    @NonNull
     public FolderChooserDialog build() {
       FolderChooserDialog dialog = new FolderChooserDialog();
       Bundle args = new Bundle();
@@ -341,7 +331,6 @@ public class FolderChooserDialog extends DialogFragment implements MaterialDialo
       return dialog;
     }
 
-    @NonNull
     public FolderChooserDialog show() {
       FolderChooserDialog dialog = build();
       dialog.show();

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

@@ -2,7 +2,6 @@ package com.afollestad.materialdialogssample;
 
 import android.app.Dialog;
 import android.os.Bundle;
-import android.support.annotation.NonNull;
 import android.support.v4.app.DialogFragment;
 import android.support.v7.app.AppCompatActivity;
 import com.afollestad.materialdialogs.MaterialDialog;
@@ -15,7 +14,6 @@ public class AboutDialog extends DialogFragment {
     dialog.show(context.getSupportFragmentManager(), "[ABOUT_DIALOG]");
   }
 
-  @NonNull
   @Override
   public Dialog onCreateDialog(Bundle savedInstanceState) {
     return new MaterialDialog.Builder(getActivity())

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

@@ -4,7 +4,6 @@ import android.annotation.SuppressLint;
 import android.app.Dialog;
 import android.graphics.Color;
 import android.os.Bundle;
-import android.support.annotation.NonNull;
 import android.support.v4.app.DialogFragment;
 import android.view.InflateException;
 import android.view.LayoutInflater;
@@ -29,7 +28,6 @@ public class ChangelogDialog extends DialogFragment {
   }
 
   @SuppressLint("InflateParams")
-  @NonNull
   @Override
   public Dialog onCreateDialog(Bundle savedInstanceState) {
     final View customView;