Skip to content

Commit

Permalink
[DatePicker] Added builder methods for customizing the positive and n…
Browse files Browse the repository at this point in the history 
…egative button content descriptions

Resolves #3595

PiperOrigin-RevId: 572929926
  • Loading branch information
@hunterstich @drchen
hunterstich authored and drchen committed Oct 12, 2023
1 parent bfee8a7 commit a00ee50
Show file tree
Hide file tree
Showing 3 changed files with 119 additions and 4 deletions.
4 changes: 4 additions & 0 deletions catalog/java/io/material/catalog/datepicker/DatePickerMainDemoFragment.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -147,10 +147,14 @@ public View onCreateDemoView(

if (positiveButtonChoice == R.id.cat_picker_positive_button_custom) {
builder.setPositiveButtonText(R.string.cat_picker_positive_button_text);
builder.setPositiveButtonContentDescription(
R.string.cat_picker_positive_button_content_description);
}

if (negativeButtonChoice == R.id.cat_picker_negative_button_custom) {
builder.setNegativeButtonText(R.string.cat_picker_negative_button_text);
builder.setNegativeButtonContentDescription(
R.string.cat_picker_negative_button_content_description);
}

setupDayViewDecorator(builder, dayViewDecoratorChoice);
Expand Down
2 changes: 2 additions & 0 deletions catalog/java/io/material/catalog/datepicker/res/values/strings.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -137,8 +137,10 @@

<!-- The custom positive button text -->
<string name="cat_picker_positive_button_text">DONE</string>
<string name="cat_picker_positive_button_content_description">Finished</string>
<!-- The custom negative button text -->
<string name="cat_picker_negative_button_text">Negative</string>
<string name="cat_picker_negative_button_content_description">Negative</string>

<!-- The custom dots day view decorator's content description [CHAR LIMIT=120] -->
<string name="cat_picker_day_view_decorator_dots_content_description">%s Dotted</string>
Expand Down
117 changes: 113 additions & 4 deletions lib/java/com/google/android/material/datepicker/MaterialDatePicker.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -84,8 +84,16 @@ public final class MaterialDatePicker<S> extends DialogFragment {
private static final String TITLE_TEXT_KEY = "TITLE_TEXT_KEY";
private static final String POSITIVE_BUTTON_TEXT_RES_ID_KEY = "POSITIVE_BUTTON_TEXT_RES_ID_KEY";
private static final String POSITIVE_BUTTON_TEXT_KEY = "POSITIVE_BUTTON_TEXT_KEY";
private static final String POSITIVE_BUTTON_CONTENT_DESCRIPTION_RES_ID_KEY =
"POSITIVE_BUTTON_CONTENT_DESCRIPTION_RES_ID_KEY";
private static final String POSITIVE_BUTTON_CONTENT_DESCRIPTION_KEY =
"POSITIVE_BUTTON_CONTENT_DESCRIPTION_KEY";
private static final String NEGATIVE_BUTTON_TEXT_RES_ID_KEY = "NEGATIVE_BUTTON_TEXT_RES_ID_KEY";
private static final String NEGATIVE_BUTTON_TEXT_KEY = "NEGATIVE_BUTTON_TEXT_KEY";
private static final String NEGATIVE_BUTTON_CONTENT_DESCRIPTION_RES_ID_KEY =
"NEGATIVE_BUTTON_CONTENT_DESCRIPTION_RES_ID_KEY";
private static final String NEGATIVE_BUTTON_CONTENT_DESCRIPTION_KEY =
"NEGATIVE_BUTTON_CONTENT_DESCRIPTION_KEY";
private static final String INPUT_MODE_KEY = "INPUT_MODE_KEY";

static final Object CONFIRM_BUTTON_TAG = "CONFIRM_BUTTON_TAG";
Expand Down Expand Up @@ -146,9 +154,12 @@ public String getHeaderText() {
@InputMode private int inputMode;
@StringRes private int positiveButtonTextResId;
private CharSequence positiveButtonText;
@StringRes private int positiveButtonContentDescriptionResId;
private CharSequence positiveButtonContentDescription;
@StringRes private int negativeButtonTextResId;
private CharSequence negativeButtonText;

@StringRes private int negativeButtonContentDescriptionResId;
private CharSequence negativeButtonContentDescription;
private TextView headerTitleTextView;
private TextView headerSelectionText;
private CheckableImageButton headerToggleButton;
Expand All @@ -172,8 +183,18 @@ static <S> MaterialDatePicker<S> newInstance(@NonNull Builder<S> options) {
args.putInt(INPUT_MODE_KEY, options.inputMode);
args.putInt(POSITIVE_BUTTON_TEXT_RES_ID_KEY, options.positiveButtonTextResId);
args.putCharSequence(POSITIVE_BUTTON_TEXT_KEY, options.positiveButtonText);
args.putInt(
POSITIVE_BUTTON_CONTENT_DESCRIPTION_RES_ID_KEY,
options.positiveButtonContentDescriptionResId);
args.putCharSequence(
POSITIVE_BUTTON_CONTENT_DESCRIPTION_KEY, options.positiveButtonContentDescription);
args.putInt(NEGATIVE_BUTTON_TEXT_RES_ID_KEY, options.negativeButtonTextResId);
args.putCharSequence(NEGATIVE_BUTTON_TEXT_KEY, options.negativeButtonText);
args.putInt(
NEGATIVE_BUTTON_CONTENT_DESCRIPTION_RES_ID_KEY,
options.negativeButtonContentDescriptionResId);
args.putCharSequence(
NEGATIVE_BUTTON_CONTENT_DESCRIPTION_KEY, options.negativeButtonContentDescription);
materialDatePickerDialogFragment.setArguments(args);
return materialDatePickerDialogFragment;
}
Expand All @@ -197,8 +218,16 @@ public final void onSaveInstanceState(@NonNull Bundle bundle) {
bundle.putInt(INPUT_MODE_KEY, inputMode);
bundle.putInt(POSITIVE_BUTTON_TEXT_RES_ID_KEY, positiveButtonTextResId);
bundle.putCharSequence(POSITIVE_BUTTON_TEXT_KEY, positiveButtonText);
bundle.putInt(
POSITIVE_BUTTON_CONTENT_DESCRIPTION_RES_ID_KEY, positiveButtonContentDescriptionResId);
bundle.putCharSequence(
POSITIVE_BUTTON_CONTENT_DESCRIPTION_KEY, positiveButtonContentDescription);
bundle.putInt(NEGATIVE_BUTTON_TEXT_RES_ID_KEY, negativeButtonTextResId);
bundle.putCharSequence(NEGATIVE_BUTTON_TEXT_KEY, negativeButtonText);
bundle.putInt(
NEGATIVE_BUTTON_CONTENT_DESCRIPTION_RES_ID_KEY, negativeButtonContentDescriptionResId);
bundle.putCharSequence(
NEGATIVE_BUTTON_CONTENT_DESCRIPTION_KEY, negativeButtonContentDescription);
}

@Override
Expand All @@ -214,8 +243,16 @@ public final void onCreate(@Nullable Bundle bundle) {
inputMode = activeBundle.getInt(INPUT_MODE_KEY);
positiveButtonTextResId = activeBundle.getInt(POSITIVE_BUTTON_TEXT_RES_ID_KEY);
positiveButtonText = activeBundle.getCharSequence(POSITIVE_BUTTON_TEXT_KEY);
positiveButtonContentDescriptionResId =
activeBundle.getInt(POSITIVE_BUTTON_CONTENT_DESCRIPTION_RES_ID_KEY);
positiveButtonContentDescription =
activeBundle.getCharSequence(POSITIVE_BUTTON_CONTENT_DESCRIPTION_KEY);
negativeButtonTextResId = activeBundle.getInt(NEGATIVE_BUTTON_TEXT_RES_ID_KEY);
negativeButtonText = activeBundle.getCharSequence(NEGATIVE_BUTTON_TEXT_KEY);
negativeButtonContentDescriptionResId =
activeBundle.getInt(NEGATIVE_BUTTON_CONTENT_DESCRIPTION_RES_ID_KEY);
negativeButtonContentDescription =
activeBundle.getCharSequence(NEGATIVE_BUTTON_CONTENT_DESCRIPTION_KEY);

fullTitleText =
titleText != null ? titleText : requireContext().getResources().getText(titleTextResId);
Expand Down Expand Up @@ -302,6 +339,12 @@ public final View onCreateView(
} else if (positiveButtonTextResId != 0) {
confirmButton.setText(positiveButtonTextResId);
}
if (positiveButtonContentDescription != null) {
confirmButton.setContentDescription(positiveButtonContentDescription);
} else if (positiveButtonContentDescriptionResId != 0) {
confirmButton.setContentDescription(
getContext().getResources().getText(positiveButtonContentDescriptionResId));
}
confirmButton.setOnClickListener(
new View.OnClickListener() {
@Override
Expand All @@ -321,6 +364,12 @@ public void onClick(View v) {
} else if (negativeButtonTextResId != 0) {
cancelButton.setText(negativeButtonTextResId);
}
if (negativeButtonContentDescription != null) {
cancelButton.setContentDescription(negativeButtonContentDescription);
} else if (negativeButtonContentDescriptionResId != 0) {
cancelButton.setContentDescription(
getContext().getResources().getText(negativeButtonContentDescriptionResId));
}
cancelButton.setOnClickListener(
new View.OnClickListener() {
@Override
Expand Down Expand Up @@ -403,8 +452,7 @@ private void enableEdgeToEdgeIfNeeded(Window window) {
return;
}
final View headerLayout = requireView().findViewById(R.id.fullscreen_header);
EdgeToEdgeUtils.applyEdgeToEdge(
window, true, ViewUtils.getBackgroundColor(headerLayout), null);
EdgeToEdgeUtils.applyEdgeToEdge(window, true, ViewUtils.getBackgroundColor(headerLayout), null);
final int originalPaddingTop = headerLayout.getPaddingTop();
final int originalHeaderHeight = headerLayout.getLayoutParams().height;
ViewCompat.setOnApplyWindowInsetsListener(
Expand Down Expand Up @@ -662,8 +710,12 @@ public static final class Builder<S> {
CharSequence titleText = null;
int positiveButtonTextResId = 0;
CharSequence positiveButtonText = null;
int positiveButtonContentDescriptionResId = 0;
CharSequence positiveButtonContentDescription = null;
int negativeButtonTextResId = 0;
CharSequence negativeButtonText = null;
int negativeButtonContentDescriptionResId = 0;
CharSequence negativeButtonContentDescription = null;
@Nullable S selection = null;
@InputMode int inputMode = INPUT_MODE_CALENDAR;

Expand Down Expand Up @@ -797,6 +849,34 @@ public Builder<S> setPositiveButtonText(@Nullable CharSequence text) {
return this;
}

/**
* Sets the content description used in the positive button
*
* @param contentDescriptionId resource id to be used as content description in the positive
* button
*/
@NonNull
@CanIgnoreReturnValue
public Builder<S> setPositiveButtonContentDescription(@StringRes int contentDescriptionId) {
this.positiveButtonContentDescriptionResId = contentDescriptionId;
this.positiveButtonContentDescription = null;
return this;
}

/**
* Sets the content description used in the positive button
*
* @param contentDescription content description used in the positive button
*/
@NonNull
@CanIgnoreReturnValue
public Builder<S> setPositiveButtonContentDescription(
@Nullable CharSequence contentDescription) {
this.positiveButtonContentDescription = contentDescription;
this.positiveButtonContentDescriptionResId = 0;
return this;
}

/**
* Sets the text used in the negative button
*
Expand All @@ -823,6 +903,34 @@ public Builder<S> setNegativeButtonText(@Nullable CharSequence text) {
return this;
}

/**
* Sets the content description used in the negative button
*
* @param contentDescriptionId resource id to be used as content description in the negative
* button
*/
@NonNull
@CanIgnoreReturnValue
public Builder<S> setNegativeButtonContentDescription(@StringRes int contentDescriptionId) {
this.negativeButtonContentDescriptionResId = contentDescriptionId;
this.negativeButtonContentDescription = null;
return this;
}

/**
* Sets the content description used in the negative button
*
* @param contentDescription content description used in the negative button
*/
@NonNull
@CanIgnoreReturnValue
public Builder<S> setNegativeButtonContentDescription(
@Nullable CharSequence contentDescription) {
this.negativeButtonContentDescription = contentDescription;
this.negativeButtonContentDescriptionResId = 0;
return this;
}

/** Sets the input mode to start with. */
@NonNull
@CanIgnoreReturnValue
Expand Down Expand Up @@ -864,7 +972,8 @@ private Month createDefaultOpenAt() {

Month thisMonth = Month.current();
return monthInValidRange(thisMonth, calendarConstraints)
? thisMonth : calendarConstraints.getStart();
? thisMonth
: calendarConstraints.getStart();
}

private static boolean monthInValidRange(Month month, CalendarConstraints constraints) {
Expand Down

0 comments on commit a00ee50

Please sign in to comment.