Ver código fonte

Updates to the preference classes, some things weren't done in the best way.

Aidan Follestad 10 anos atrás
pai
commit
bead418bb8

+ 4 - 9
library/src/main/java/com/afollestad/materialdialogs/prefs/MaterialEditTextPreference.java

@@ -9,7 +9,6 @@ import android.os.Bundle;
 import android.preference.EditTextPreference;
 import android.support.annotation.NonNull;
 import android.util.AttributeSet;
-import android.util.TypedValue;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
@@ -22,11 +21,13 @@ import com.afollestad.materialdialogs.MaterialDialog;
 import com.afollestad.materialdialogs.MaterialDialog.Builder;
 import com.afollestad.materialdialogs.MaterialDialog.ButtonCallback;
 import com.afollestad.materialdialogs.R;
+import com.afollestad.materialdialogs.util.DialogUtils;
 
 /**
  * @author Marc Holder Kluver (marchold), Mark Sutherland (msutherland4807)
  */
 public class MaterialEditTextPreference extends EditTextPreference {
+
     private int mColor = 0;
     private EditText mEditText;
 
@@ -37,14 +38,8 @@ public class MaterialEditTextPreference extends EditTextPreference {
 
     public MaterialEditTextPreference(Context context, AttributeSet attrs) {
         super(context, attrs);
-
-        // Find the accent color for the EditText background (underline)
-        if (VERSION.SDK_INT < VERSION_CODES.LOLLIPOP) {
-            TypedValue value = new TypedValue();
-            context.getTheme().resolveAttribute(R.attr.colorAccent, value, true);
-            mColor = value.data;
-        }
-
+        if (VERSION.SDK_INT < VERSION_CODES.LOLLIPOP)
+            mColor = DialogUtils.resolveColor(context, R.attr.colorAccent);
         mEditText = super.getEditText();
     }
 

+ 4 - 6
library/src/main/java/com/afollestad/materialdialogs/prefs/MaterialListPreference.java

@@ -16,7 +16,6 @@ import com.afollestad.materialdialogs.MaterialDialog;
  */
 public class MaterialListPreference extends ListPreference {
 
-    private MaterialDialog.Builder mBuilder;
     private Context context;
 
     public MaterialListPreference(Context context) {
@@ -32,8 +31,7 @@ public class MaterialListPreference extends ListPreference {
     @Override
     protected void showDialog(Bundle state) {
         int preselect = findIndexOfValue(getValue());
-
-        mBuilder = new MaterialDialog.Builder(context)
+        MaterialDialog.Builder builder = new MaterialDialog.Builder(context)
                 .title(getDialogTitle())
                 .icon(getDialogIcon())
                 .negativeText(getNegativeButtonText())
@@ -54,11 +52,11 @@ public class MaterialListPreference extends ListPreference {
         final View contentView = onCreateDialogView();
         if (contentView != null) {
             onBindDialogView(contentView);
-            mBuilder.customView(contentView, false);
+            builder.customView(contentView, false);
         } else {
-            mBuilder.content(getDialogMessage());
+            builder.content(getDialogMessage());
         }
 
-        mBuilder.show();
+        builder.show();
     }
 }