Removed use of deprecated ButtonCallback in some commons classes.

commons/src/main/java/com/afollestad/materialdialogs/color/ColorChooserDialog.java

@@ -193,17 +193,16 @@ public class ColorChooserDialog extends DialogFragment implements View.OnClickLi
                 .customView(mGrid, false)
                 .neutralText(builder.mCancelBtn)
                 .positiveText(builder.mDoneBtn)
-                .callback(new MaterialDialog.ButtonCallback() {
+                .onPositive(new MaterialDialog.SingleButtonCallback() {
                     @Override
-                    public void onPositive(MaterialDialog dialog) {
-                        super.onPositive(dialog);
+                    public void onClick(@NonNull MaterialDialog dialog, @NonNull DialogAction which) {
                         mCallback.onColorSelection(ColorChooserDialog.this, getSelectedColor());
                         dismiss();
                     }
-
+                })
+                .onNeutral(new MaterialDialog.SingleButtonCallback() {
                     @Override
-                    public void onNeutral(MaterialDialog dialog) {
-                        super.onNeutral(dialog);
+                    public void onClick(@NonNull MaterialDialog dialog, @NonNull DialogAction which) {
                         if (isInSub()) {
                             dialog.setActionButton(DialogAction.NEUTRAL, getBuilder().mCancelBtn);
                             isInSub(false);

commons/src/main/java/com/afollestad/materialdialogs/folderselector/FolderChooserDialog.java

@@ -15,6 +15,7 @@ import android.support.v4.app.Fragment;
 import android.support.v7.app.AppCompatActivity;
 import android.view.View;
 
+import com.afollestad.materialdialogs.DialogAction;
 import com.afollestad.materialdialogs.MaterialDialog;
 import com.afollestad.materialdialogs.commons.R;
 
@@ -37,19 +38,6 @@ public class FolderChooserDialog extends DialogFragment implements MaterialDialo
     private boolean canGoUp = true;
     private FolderCallback mCallback;
 
-    private final MaterialDialog.ButtonCallback mButtonCallback = new MaterialDialog.ButtonCallback() {
-        @Override
-        public void onPositive(MaterialDialog materialDialog) {
-            materialDialog.dismiss();
-            mCallback.onFolderSelection(parentFolder);
-        }
-
-        @Override
-        public void onNegative(MaterialDialog materialDialog) {
-            materialDialog.dismiss();
-        }
-    };
-
     public interface FolderCallback {
         void onFolderSelection(File folder);
     }
@@ -102,7 +90,19 @@ public class FolderChooserDialog extends DialogFragment implements MaterialDialo
                 .title(parentFolder.getAbsolutePath())
                 .items(getContentsArray())
                 .itemsCallback(this)
-                .callback(mButtonCallback)
+                .onPositive(new MaterialDialog.SingleButtonCallback() {
+                    @Override
+                    public void onClick(@NonNull MaterialDialog dialog, @NonNull DialogAction which) {
+                        dialog.dismiss();
+                        mCallback.onFolderSelection(parentFolder);
+                    }
+                })
+                .onNegative(new MaterialDialog.SingleButtonCallback() {
+                    @Override
+                    public void onClick(@NonNull MaterialDialog dialog, @NonNull DialogAction which) {
+                        dialog.dismiss();
+                    }
+                })
                 .autoDismiss(false)
                 .positiveText(getBuilder().mChooseButton)
                 .negativeText(getBuilder().mCancelButton)

commons/src/main/java/com/afollestad/materialdialogs/prefs/MaterialEditTextPreference.java

@@ -35,7 +35,7 @@ import java.lang.reflect.Method;
 /**
  * @author Aidan Follestad (afollestad)
  */
-public class MaterialEditTextPreference extends EditTextPreference implements MaterialDialog.SingleButtonCallback {
+public class MaterialEditTextPreference extends EditTextPreference {
 
     private int mColor = 0;
     private MaterialDialog mDialog;
@@ -109,7 +109,22 @@ public class MaterialEditTextPreference extends EditTextPreference implements Ma
                 .positiveText(getPositiveButtonText())
                 .negativeText(getNegativeButtonText())
                 .dismissListener(this)
-                .onAny(this)
+                .onAny(new MaterialDialog.SingleButtonCallback() {
+                    @Override
+                    public void onClick(@NonNull MaterialDialog dialog, @NonNull DialogAction which) {
+                        switch (which) {
+                            default:
+                                MaterialEditTextPreference.this.onClick(dialog, DialogInterface.BUTTON_POSITIVE);
+                                break;
+                            case NEUTRAL:
+                                MaterialEditTextPreference.this.onClick(dialog, DialogInterface.BUTTON_NEUTRAL);
+                                break;
+                            case NEGATIVE:
+                                MaterialEditTextPreference.this.onClick(dialog, DialogInterface.BUTTON_NEGATIVE);
+                                break;
+                        }
+                    }
+                })
                 .dismissListener(this);
 
         @SuppressLint("InflateParams")
@@ -203,21 +218,6 @@ public class MaterialEditTextPreference extends EditTextPreference implements Ma
         }
     }
 
-    @Override
-    public void onClick(@NonNull MaterialDialog dialog, @NonNull DialogAction which) {
-        switch (which) {
-            default:
-                onClick(dialog, DialogInterface.BUTTON_POSITIVE);
-                break;
-            case NEUTRAL:
-                onClick(dialog, DialogInterface.BUTTON_NEUTRAL);
-                break;
-            case NEGATIVE:
-                onClick(dialog, DialogInterface.BUTTON_NEGATIVE);
-                break;
-        }
-    }
-
     // From DialogPreference
     private static class SavedState extends BaseSavedState {
         boolean isDialogShowing;

commons/src/main/java/com/afollestad/materialdialogs/prefs/MaterialListPreference.java

@@ -13,6 +13,7 @@ import android.support.annotation.NonNull;
 import android.util.AttributeSet;
 import android.view.View;
 
+import com.afollestad.materialdialogs.DialogAction;
 import com.afollestad.materialdialogs.MaterialDialog;
 
 import java.lang.reflect.Field;
@@ -67,6 +68,22 @@ public class MaterialListPreference extends ListPreference {
                 .content(getDialogMessage())
                 .icon(getDialogIcon())
                 .dismissListener(this)
+                .onAny(new MaterialDialog.SingleButtonCallback() {
+                    @Override
+                    public void onClick(@NonNull MaterialDialog dialog, @NonNull DialogAction which) {
+                        switch (which) {
+                            default:
+                                MaterialListPreference.this.onClick(dialog, DialogInterface.BUTTON_POSITIVE);
+                                break;
+                            case NEUTRAL:
+                                MaterialListPreference.this.onClick(dialog, DialogInterface.BUTTON_NEUTRAL);
+                                break;
+                            case NEGATIVE:
+                                MaterialListPreference.this.onClick(dialog, DialogInterface.BUTTON_NEGATIVE);
+                                break;
+                        }
+                    }
+                })
                 .callback(new MaterialDialog.ButtonCallback() {
                     @Override
                     public void onNeutral(MaterialDialog dialog) {

commons/src/main/java/com/afollestad/materialdialogs/prefs/MaterialMultiSelectListPreference.java

@@ -14,6 +14,7 @@ import android.support.annotation.NonNull;
 import android.util.AttributeSet;
 import android.view.View;
 
+import com.afollestad.materialdialogs.DialogAction;
 import com.afollestad.materialdialogs.MaterialDialog;
 
 import java.lang.reflect.Method;
@@ -74,20 +75,20 @@ public class MaterialMultiSelectListPreference extends MultiSelectListPreference
                 .icon(getDialogIcon())
                 .negativeText(getNegativeButtonText())
                 .positiveText(getPositiveButtonText())
-                .callback(new MaterialDialog.ButtonCallback() {
+                .onAny(new MaterialDialog.SingleButtonCallback() {
                     @Override
-                    public void onNeutral(MaterialDialog dialog) {
-                        onClick(dialog, DialogInterface.BUTTON_NEUTRAL);
-                    }
-
-                    @Override
-                    public void onNegative(MaterialDialog dialog) {
-                        onClick(dialog, DialogInterface.BUTTON_NEGATIVE);
-                    }
-
-                    @Override
-                    public void onPositive(MaterialDialog dialog) {
-                        onClick(dialog, DialogInterface.BUTTON_POSITIVE);
+                    public void onClick(@NonNull MaterialDialog dialog, @NonNull DialogAction which) {
+                        switch (which) {
+                            default:
+                                MaterialMultiSelectListPreference.this.onClick(dialog, DialogInterface.BUTTON_POSITIVE);
+                                break;
+                            case NEUTRAL:
+                                MaterialMultiSelectListPreference.this.onClick(dialog, DialogInterface.BUTTON_NEUTRAL);
+                                break;
+                            case NEGATIVE:
+                                MaterialMultiSelectListPreference.this.onClick(dialog, DialogInterface.BUTTON_NEGATIVE);
+                                break;
+                        }
                     }
                 })
                 .items(getEntries())