Skip to content
This repository has been archived by the owner on Feb 8, 2022. It is now read-only.

Fixed the issue about Feb. 31 or Apr. 31 (issue #166) #312

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

Fixed the issue about Feb. 31 or Apr. 31 (issue #166) #312

Show file tree
Hide file tree
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
14 changes: 14 additions & 0 deletions ...ava/com/github/florent37/sample/singledateandtimepicker/SingleDatePickerMainActivity.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
import androidx.core.content.res.ResourcesCompat;

import com.github.florent37.singledateandtimepicker.SingleDateAndTimePicker;
import com.github.florent37.singledateandtimepicker.dialog.SingleDateAndTimePickerDialog;

public class SingleDatePickerMainActivity extends AppCompatActivity {

Expand All @@ -32,6 +33,19 @@ protected void onCreate(Bundle savedInstanceState) {
singleDateAndTimePicker.setEnabled(!singleDateAndTimePicker.isEnabled());
singleDateAndTimePicker2.setEnabled(!singleDateAndTimePicker2.isEnabled());
});



new SingleDateAndTimePickerDialog.Builder(this)
.bottomSheet()
.curved()
.displayMinutes(false)
.displayHours(false)
.displayDays(false)
.displayMonth(true)
.displayYears(true)
.displayDaysOfMonth(true)
.display();
}

private void display(String toDisplay) {
Expand Down
61 changes: 46 additions & 15 deletions ...r/src/main/java/com/github/florent37/singledateandtimepicker/SingleDateAndTimePicker.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,6 +85,8 @@ public class SingleDateAndTimePicker extends LinearLayout {
private Date maxDate;
@NonNull
private Date defaultDate;
@NonNull
private Calendar currentDateCalendar;

private boolean displayYears = false;
private boolean displayMonth = false;
Expand All @@ -107,6 +109,9 @@ public SingleDateAndTimePicker(Context context, AttributeSet attrs, int defStyle
super(context, attrs, defStyleAttr);

defaultDate = new Date();
currentDateCalendar = Calendar.getInstance();
currentDateCalendar.setTime(defaultDate);

isAmPm = !(DateFormat.is24HourFormat(context));

inflate(context, R.layout.single_day_and_time_picker, this);
Expand Down Expand Up @@ -493,34 +498,58 @@ public Date getDate() {
}
final int minute = minutesPicker.getCurrentMinute();

final Calendar calendar = Calendar.getInstance();
calendar.setTimeZone(dateHelper.getTimeZone());
currentDateCalendar.setTimeZone(dateHelper.getTimeZone());
if (displayDays) {
final Date dayDate = daysPicker.getCurrentDate();
calendar.setTime(dayDate);
currentDateCalendar.setTime(dayDate);
} else {
if (displayMonth) {
calendar.set(Calendar.MONTH, monthPicker.getCurrentMonth());
if (displayYears && currentDateCalendar.get(Calendar.YEAR) != yearsPicker.getCurrentYear()) {
int currentMonth = currentDateCalendar.get(Calendar.MONTH);
int daysInMonth = currentDateCalendar.getActualMaximum(Calendar.DAY_OF_MONTH);
currentDateCalendar.set(Calendar.YEAR, yearsPicker.getCurrentYear());
int newMonth = currentDateCalendar.get(Calendar.MONTH);
if (newMonth != currentMonth) {
// This is for handling case like changing the year from 2000 to 1999
// And, the selected month and day was Feb, 29, so after changing year to 1999
// We want to set the month to be Feb. and the day of month to be 28.
currentDateCalendar.set(Calendar.MONTH, currentMonth); // keep the month
currentDateCalendar.set(Calendar.DAY_OF_MONTH, daysInMonth); // Move to the last day of month
}
}

if (displayYears) {
calendar.set(Calendar.YEAR, yearsPicker.getCurrentYear());
if (displayMonth && currentDateCalendar.get(Calendar.MONTH) != monthPicker.getCurrentMonth()) {
int selectedDayOfMonth = daysOfMonthPicker.getCurrentDay() + 1;
Calendar tmpCalendar = Calendar.getInstance();
tmpCalendar.setTimeZone(dateHelper.getTimeZone());
tmpCalendar.set(Calendar.DAY_OF_MONTH, 1);
tmpCalendar.set(Calendar.YEAR, currentDateCalendar.get(Calendar.YEAR));
tmpCalendar.set(Calendar.MONTH, monthPicker.getCurrentMonth());

int daysInMonth = tmpCalendar.getActualMaximum(Calendar.DAY_OF_MONTH);
if (daysInMonth >= selectedDayOfMonth) {
// It's OK: e.g.: daysInMonth = 28; selectedDayOfMonth 28 or 27 or smaller
currentDateCalendar.set(Calendar.MONTH, monthPicker.getCurrentMonth());
} else {
// It's not OK: e.g.: daysInMonth = 28; selectedDayOfMonth 29 / 30 / 31
currentDateCalendar.set(Calendar.DAY_OF_MONTH, daysInMonth);
currentDateCalendar.set(Calendar.MONTH, monthPicker.getCurrentMonth());
}
}

if (displayDaysOfMonth) {
int daysInMonth = calendar.getActualMaximum(Calendar.DAY_OF_MONTH);
int daysInMonth = currentDateCalendar.getActualMaximum(Calendar.DAY_OF_MONTH);
if (daysOfMonthPicker.getCurrentDay() >= daysInMonth) {
calendar.set(Calendar.DAY_OF_MONTH, daysInMonth);
currentDateCalendar.set(Calendar.DAY_OF_MONTH, daysInMonth);
} else {
calendar.set(Calendar.DAY_OF_MONTH, daysOfMonthPicker.getCurrentDay() + 1);
currentDateCalendar.set(Calendar.DAY_OF_MONTH, daysOfMonthPicker.getCurrentDay() + 1);
}
}
}
calendar.set(Calendar.HOUR_OF_DAY, hour);
calendar.set(Calendar.MINUTE, minute);
calendar.set(Calendar.SECOND, 0);
calendar.set(Calendar.MILLISECOND, 0);
return calendar.getTime();
currentDateCalendar.set(Calendar.HOUR_OF_DAY, hour);
currentDateCalendar.set(Calendar.MINUTE, minute);
currentDateCalendar.set(Calendar.SECOND, 0);
currentDateCalendar.set(Calendar.MILLISECOND, 0);
return currentDateCalendar.getTime();
}

public void setStepSizeMinutes(int minutesStep) {
Expand All @@ -537,6 +566,8 @@ public void setDefaultDate(Date date) {
calendar.setTimeZone(dateHelper.getTimeZone());
calendar.setTime(date);
this.defaultDate = calendar.getTime();
currentDateCalendar = Calendar.getInstance();
currentDateCalendar.setTime(defaultDate);

updateDaysOfMonth(calendar);

Expand Down