Skip to content

Commit

Permalink
[DatePicker] Make picker not final and expose onPositiveButtonClick a…
Browse files Browse the repository at this point in the history
…nd onNegativeButtonClick

Resolves #1688

PiperOrigin-RevId: 651106986
  • Loading branch information
paulfthomas committed Jul 10, 2024
1 parent fa5224e commit 6617342
Showing 1 changed file with 28 additions and 22 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@
* developer guidance</a> and <a href="https://material.io/components/date-pickers/overview">design
* guidelines</a>.
*/
public final class MaterialDatePicker<S> extends DialogFragment {
public class MaterialDatePicker<S> extends DialogFragment {

private static final String OVERRIDE_THEME_RES_ID = "OVERRIDE_THEME_RES_ID";
private static final String DATE_SELECTOR_KEY = "DATE_SELECTOR_KEY";
Expand Down Expand Up @@ -344,17 +344,7 @@ public final View onCreateView(
confirmButton.setContentDescription(
getContext().getResources().getText(positiveButtonContentDescriptionResId));
}
confirmButton.setOnClickListener(
new View.OnClickListener() {
@Override
public void onClick(View v) {
for (MaterialPickerOnPositiveButtonClickListener<? super S> listener :
onPositiveButtonClickListeners) {
listener.onPositiveButtonClick(getSelection());
}
dismiss();
}
});
confirmButton.setOnClickListener(this::onPositiveButtonClick);

Button cancelButton = root.findViewById(R.id.cancel_button);
cancelButton.setTag(CANCEL_BUTTON_TAG);
Expand All @@ -369,19 +359,35 @@ public void onClick(View v) {
cancelButton.setContentDescription(
getContext().getResources().getText(negativeButtonContentDescriptionResId));
}
cancelButton.setOnClickListener(
new View.OnClickListener() {
@Override
public void onClick(View v) {
for (View.OnClickListener listener : onNegativeButtonClickListeners) {
listener.onClick(v);
}
dismiss();
}
});
cancelButton.setOnClickListener(this::onNegativeButtonClick);
return root;
}

/**
* Called when the positive button on the picker has been clicked.
*
* @param view The view that was clicked.
*/
public void onPositiveButtonClick(@NonNull View view) {
for (MaterialPickerOnPositiveButtonClickListener<? super S> listener :
onPositiveButtonClickListeners) {
listener.onPositiveButtonClick(getSelection());
}
dismiss();
}

/**
* Called when the negative button on the picker has been clicked.
*
* @param view The view that was clicked.
*/
public void onNegativeButtonClick(@NonNull View view) {
for (View.OnClickListener listener : onNegativeButtonClickListeners) {
listener.onClick(view);
}
dismiss();
}

@Override
public void onStart() {
super.onStart();
Expand Down

0 comments on commit 6617342

Please sign in to comment.