Przeglądaj źródła

Update MaterialDialog.java

Phascinate 10 lat temu
rodzic
commit
ca4c1660ae

+ 1 - 18
library/src/main/java/com/afollestad/materialdialogs/MaterialDialog.java

@@ -134,6 +134,7 @@ public class MaterialDialog extends DialogBase implements View.OnClickListener,
         content.setText(builder.content);
         content.setMovementMethod(new LinkMovementMethod());
         setTypeface(content, regularFont);
+        content.setTextColor(DialogUtils.resolveColor(getContext(), android.R.attr.textColorSecondary));
         content.setLineSpacing(0f, builder.contentLineSpacingMultiplier);
         if (this.positiveColor == 0) {
             content.setLinkTextColor(DialogUtils.resolveColor(getContext(), android.R.attr.textColorPrimary));
@@ -215,13 +216,6 @@ public class MaterialDialog extends DialogBase implements View.OnClickListener,
                 title.setGravity(Gravity.RIGHT);
             }
         }
-        
-        //Content color is set here.
-        if (builder.contentColor != -1) {
-                content.setTextColor(builder.contentColor);
-            } else {
-                content.setTextColor(DialogUtils.resolveColor(getContext(), android.R.attr.textColorPrimary));
-            }
 
         invalidateActions();
         setOnShowListenerInternal();
@@ -604,7 +598,6 @@ public class MaterialDialog extends DialogBase implements View.OnClickListener,
         protected Alignment titleAlignment = Alignment.LEFT;
         protected Alignment contentAlignment = Alignment.LEFT;
         protected int titleColor = -1;
-        protected int contentColor = -1;
         protected CharSequence content;
         protected CharSequence[] items;
         protected CharSequence positiveText;
@@ -714,16 +707,6 @@ public class MaterialDialog extends DialogBase implements View.OnClickListener,
             return this;
         }
 
-        public Builder contentColor(int color) {
-            this.contentColor = color;
-            return this;
-        }
-
-        public Builder contentColorRes(@ColorRes int colorRes) {
-            contentColor(this.context.getResources().getColor(colorRes));
-            return this;
-        }
-
         public Builder content(@StringRes int contentRes) {
             content(this.context.getString(contentRes));
             return this;