Bläddra i källkod

Match max length indicator to guidelines, use the red color specified in guidelines if user passes in 0

plusCubed 10 år sedan
förälder
incheckning
d8a94769b6

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

@@ -1051,11 +1051,19 @@ public class MaterialDialog extends DialogBase implements
             return this;
         }
 
+        /**
+         * @param errorColor the error color.
+         *                   Pass in 0 for the default red error color (as specified in guidelines).
+         */
         public Builder inputMaxLength(int maxLength, int errorColor) {
             if (maxLength < 1)
                 throw new IllegalArgumentException("Max length for input dialogs cannot be less than 1.");
             this.inputMaxLength = maxLength;
-            this.inputMaxLengthErrorColor = errorColor;
+            if (errorColor == 0) {
+                inputMaxLengthErrorColor = context.getResources().getColor(R.color.md_edittext_error);
+            } else {
+                this.inputMaxLengthErrorColor = errorColor;
+            }
             return this;
         }
 

+ 3 - 3
library/src/main/res/layout/md_dialog_input.xml

@@ -42,7 +42,7 @@
                 tools:ignore="TextFields"
                 android:layout_marginLeft="-2dp"
                 android:layout_marginRight="-2dp"
-                android:layout_marginBottom="2dp" />
+                android:layout_marginBottom="1dp" />
 
             <TextView
                 android:id="@+id/minMax"
@@ -50,7 +50,7 @@
                 android:layout_height="wrap_content"
                 android:minWidth="48dp"
                 tools:text="50/100"
-                android:textSize="@dimen/md_content_textsize"
+                android:textSize="12sp"
                 android:gravity="end"
                 android:textAlignment="viewEnd"
                 android:layout_alignRight="@android:id/input"
@@ -58,7 +58,7 @@
                 android:layout_below="@android:id/input"
                 android:paddingRight="4dp"
                 android:paddingEnd="4dp"
-                android:fontFamily="sans-serif-medium"
+                android:fontFamily="sans-serif"
                 tools:ignore="RtlSymmetry,UnusedAttribute" />
 
         </RelativeLayout>

+ 2 - 0
library/src/main/res/values/colors.xml

@@ -17,4 +17,6 @@
     <color name="md_material_blue_600">#1E88E5</color>
     <color name="md_material_blue_800">#1565C0</color>
 
+    <color name="md_edittext_error">#DD2C00</color>
+
 </resources>

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

@@ -599,7 +599,7 @@ public class MainActivity extends AppCompatActivity implements
                 .inputType(InputType.TYPE_CLASS_TEXT |
                         InputType.TYPE_TEXT_VARIATION_PERSON_NAME |
                         InputType.TYPE_TEXT_FLAG_CAP_WORDS)
-                .inputMaxLengthRes(16, R.color.material_indigo_600)
+                .inputMaxLength(16, 0)
                 .positiveText(R.string.submit)
                 .input(R.string.input_hint, R.string.input_hint, false, new MaterialDialog.InputCallback() {
                     @Override