Skip to content

fix: issue happening on 31st #56

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

Merged
merged 1 commit into from
Nov 1, 2019
Merged

fix: issue happening on 31st #56

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
16 changes: 16 additions & 0 deletions src/datetimepicker.android.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -155,6 +155,11 @@ export class DateTimePicker extends DateTimePickerBase {
const context = options.context;
let dateTime: Date;
if (value) {
if (nativePicker instanceof android.widget.DatePicker) {
const minDate = (<DatePickerOptions>options).minDate;
const maxDate = (<DatePickerOptions>options).maxDate;
value = DateTimePicker._trimDate(value, minDate, maxDate);
}
dateTime = new Date(value.getTime());
} else {
dateTime = (nativePicker instanceof android.widget.DatePicker) ? getDateToday() : getDateNow();
Expand Down Expand Up @@ -188,6 +193,17 @@ export class DateTimePicker extends DateTimePickerBase {
}
}

private static _trimDate(originalDate: Date, minDate: Date, maxDate: Date) {
let finalDate = originalDate;
if (minDate !== undefined && minDate > finalDate) {
finalDate = minDate;
}
if (maxDate !== undefined && maxDate < finalDate) {
finalDate = maxDate;
}
return finalDate;
}

private static _applyDialogColors(nativeDialog: android.app.AlertDialog, color: Color, backgroundColor: Color) {
if (backgroundColor) {
nativeDialog.getWindow().setBackgroundDrawable(new android.graphics.drawable.ColorDrawable(backgroundColor.android));
Expand Down