Skip to content

[DatePicker] Fix date input masks #3662

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

[DatePicker] Fix date input masks #3662

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 14 additions & 14 deletions lib/java/com/google/android/material/datepicker/DateFormatTextWatcher.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,15 +27,15 @@
import com.google.android.material.textfield.TextInputLayout;
import java.text.DateFormat;
import java.text.ParseException;
import java.text.SimpleDateFormat;
import java.util.Date;
import java.util.Locale;

abstract class DateFormatTextWatcher extends TextWatcherAdapter {

@NonNull private final TextInputLayout textInputLayout;

private final String formatHint;
private final DateFormat dateFormat;
private final SimpleDateFormat dateFormat;
private final String datePattern;
private final CalendarConstraints constraints;
private final String outOfRange;
private final Runnable setErrorCallback;
Expand All @@ -45,12 +45,12 @@ abstract class DateFormatTextWatcher extends TextWatcherAdapter {

DateFormatTextWatcher(
final String formatHint,
DateFormat dateFormat,
SimpleDateFormat dateFormat,
@NonNull TextInputLayout textInputLayout,
CalendarConstraints constraints) {

this.formatHint = formatHint;
this.dateFormat = dateFormat;
this.datePattern = dateFormat.toPattern();
this.textInputLayout = textInputLayout;
this.constraints = constraints;
this.outOfRange = textInputLayout.getContext().getString(R.string.mtrl_picker_out_of_range);
Expand Down Expand Up @@ -85,7 +85,7 @@ public void onTextChanged(@NonNull CharSequence s, int start, int before, int co
textInputLayout.setError(null);
onValidDate(null);

if (TextUtils.isEmpty(s) || s.length() < formatHint.length()) {
if (TextUtils.isEmpty(s) || s.length() < datePattern.length()) {
return;
}

Expand Down Expand Up @@ -113,19 +113,19 @@ public void beforeTextChanged(@NonNull CharSequence s, int start, int count, int

@Override
public void afterTextChanged(@NonNull Editable s) {
// Exclude some languages from automatically adding delimiters.
if (Locale.getDefault().getLanguage().equals(Locale.KOREAN.getLanguage())) {
if (s.length() == 0 || s.length() >= datePattern.length() || s.length() < lastLength) {
return;
}

if (s.length() == 0 || s.length() >= formatHint.length() || s.length() < lastLength) {
return;
char nextPatternChar = datePattern.charAt(s.length());
if (isDelimiter(nextPatternChar)) {
s.append(nextPatternChar);
}
}

char nextCharHint = formatHint.charAt(s.length());
if (!Character.isLetterOrDigit(nextCharHint)) {
s.append(nextCharHint);
}
private boolean isDelimiter(char ch) {
return !(ch >= 'A' && ch <= 'Z')
&& !(ch >= 'a' && ch <= 'z');
}

private Runnable createRangeErrorCallback(final long milliseconds) {
Expand Down