Skip to content

Commit

Permalink
EditEventView: Migrate to material date picker
Browse files Browse the repository at this point in the history 
Signed-off-by: Aayush Gupta <[email protected]>
  • Loading branch information
@theimpulson
theimpulson committed Apr 4, 2024
1 parent 79145d2 commit 2e99b7e
Showing 1 changed file with 85 additions and 98 deletions.
183 changes: 85 additions & 98 deletions app/src/main/java/com/android/calendar/event/EditEventView.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,6 @@
import android.widget.AutoCompleteTextView;
import android.widget.Button;
import android.widget.CompoundButton;
import android.widget.DatePicker;
import android.widget.LinearLayout;
import android.widget.MultiAutoCompleteTextView;
import android.widget.RadioButton;
Expand Down Expand Up @@ -92,13 +91,18 @@
import com.android.timezonepicker.TimeZonePickerDialog;
import com.android.timezonepicker.TimeZonePickerUtils;

import com.google.android.material.datepicker.CalendarConstraints;
import com.google.android.material.datepicker.MaterialDatePicker;
import com.google.android.material.datepicker.MaterialPickerOnPositiveButtonClickListener;
import com.google.android.material.dialog.MaterialAlertDialogBuilder;
import com.google.android.material.textfield.TextInputEditText;
import com.google.android.material.timepicker.MaterialTimePicker;
import com.google.android.material.timepicker.TimeFormat;

import java.util.ArrayList;
import java.util.Arrays;
import java.util.Calendar;
import java.util.Date;
import java.util.Formatter;
import java.util.HashMap;
import java.util.Locale;
Expand Down Expand Up @@ -407,8 +411,8 @@ private void populateWhen() {
setTime(mStartTimeButton, startMillis);
setTime(mEndTimeButton, endMillis);

mStartDateButton.setOnClickListener(new DateClickListener(mStartTime));
mEndDateButton.setOnClickListener(new DateClickListener(mEndTime));
mStartDateButton.setOnClickListener(this::showDatePickerDialog);
mEndDateButton.setOnClickListener(this::showDatePickerDialog);

mStartTimeButton.setOnClickListener(this::showTimerPickerDialog);
mEndTimeButton.setOnClickListener(this::showTimerPickerDialog);
Expand Down Expand Up @@ -1721,6 +1725,84 @@ public void onTimeSet(View view, int hourOfDay, int minute) {
updateHomeTime();
}

private void showDatePickerDialog(View view) {
MaterialPickerOnPositiveButtonClickListener<Long> materialPickerOnPositiveButtonClickListener = timePicked -> {
Calendar calendar = Calendar.getInstance();
calendar.setTime(new Date(timePicked));
onDateSet(view, calendar.get(Calendar.YEAR), calendar.get(Calendar.MONTH), calendar.get(Calendar.DAY_OF_MONTH));
};

CalendarConstraints calendarConstraints = new CalendarConstraints.Builder()
.setFirstDayOfWeek(Utils.getFirstDayOfWeekAsCalendar(mActivity))
.build();

MaterialDatePicker<Long> datePickerDialog = MaterialDatePicker.Builder.datePicker()
.setSelection(Calendar.getInstance().getTimeInMillis())
.setCalendarConstraints(calendarConstraints)
.setTitleText(R.string.goto_date)
.build();

datePickerDialog.addOnPositiveButtonClickListener(materialPickerOnPositiveButtonClickListener);
datePickerDialog.show(mActivity.getSupportFragmentManager(), "DatePicker");
}

public void onDateSet(View view, int year, int month, int monthDay) {
Log.d(TAG, "onDateSet: " + year + " " + month + " " + monthDay);
// Cache the member variables locally to avoid inner class overhead.
Time startTime = mStartTime;
Time endTime = mEndTime;

// Cache the start and end millis so that we limit the number
// of calls to normalize() and toMillis(), which are fairly
// expensive.
long startMillis;
long endMillis;
if (view == mStartDateButton) {
// The start date was changed.
int yearDuration = endTime.getYear() - startTime.getYear();
int monthDuration = endTime.getMonth() - startTime.getMonth();
int monthDayDuration = endTime.getDay() - startTime.getDay();

startTime.setYear(year);
startTime.setMonth(month);
startTime.setDay(monthDay);
startMillis = startTime.normalize();

// Also update the end date to keep the duration constant.
endTime.setYear(year + yearDuration);
endTime.setMonth(month + monthDuration);
endTime.setDay(monthDay + monthDayDuration);
endMillis = endTime.normalize();

// If the start date has changed then update the repeats.
populateRepeats();

// Update tz in case the start time switched from/to DLS
populateTimezone(startMillis);
} else {
// The end date was changed.
startMillis = startTime.toMillis();
endTime.setYear(year);
endTime.setMonth(month);
endTime.setDay(monthDay);
endMillis = endTime.normalize();

// Do not allow an event to have an end time before the start
// time.
if (endTime.compareTo(startTime) < 0) {
endTime.set(startTime);
endMillis = startMillis;
}
// Call populateTimezone if we support end time zone as well
}

setDate(mStartDateButton, startMillis);
setDate(mEndDateButton, endMillis);
setTime(mEndTimeButton, endMillis); // In case end time had to be
// reset
updateHomeTime();
}

public static class CalendarsAdapter extends ResourceCursorAdapter {
public CalendarsAdapter(Context context, int resourceId, Cursor c) {
super(context, resourceId, c);
Expand Down Expand Up @@ -1751,99 +1833,4 @@ public void bindView(View view, Context context, Cursor cursor) {
}
}
}

private class DateListener implements DatePickerDialog.OnDateSetListener {
View mView;

public DateListener(View view) {
mView = view;
}

@Override
public void onDateSet(DatePicker view, int year, int month, int monthDay) {
Log.d(TAG, "onDateSet: " + year + " " + month + " " + monthDay);
// Cache the member variables locally to avoid inner class overhead.
Time startTime = mStartTime;
Time endTime = mEndTime;

// Cache the start and end millis so that we limit the number
// of calls to normalize() and toMillis(), which are fairly
// expensive.
long startMillis;
long endMillis;
if (mView == mStartDateButton) {
// The start date was changed.
int yearDuration = endTime.getYear() - startTime.getYear();
int monthDuration = endTime.getMonth() - startTime.getMonth();
int monthDayDuration = endTime.getDay() - startTime.getDay();

startTime.setYear(year);
startTime.setMonth(month);
startTime.setDay(monthDay);
startMillis = startTime.normalize();

// Also update the end date to keep the duration constant.
endTime.setYear(year + yearDuration);
endTime.setMonth(month + monthDuration);
endTime.setDay(monthDay + monthDayDuration);
endMillis = endTime.normalize();

// If the start date has changed then update the repeats.
populateRepeats();

// Update tz in case the start time switched from/to DLS
populateTimezone(startMillis);
} else {
// The end date was changed.
startMillis = startTime.toMillis();
endTime.setYear(year);
endTime.setMonth(month);
endTime.setDay(monthDay);
endMillis = endTime.normalize();

// Do not allow an event to have an end time before the start
// time.
if (endTime.compareTo(startTime) < 0) {
endTime.set(startTime);
endMillis = startMillis;
}
// Call populateTimezone if we support end time zone as well
}

setDate(mStartDateButton, startMillis);
setDate(mEndDateButton, endMillis);
setTime(mEndTimeButton, endMillis); // In case end time had to be
// reset
updateHomeTime();
}
}

private class DateClickListener implements View.OnClickListener {
private Time mTime;

public DateClickListener(Time time) {
mTime = time;
}

@Override
public void onClick(View v) {
if (!mView.hasWindowFocus()) {
// Don't do anything if the activity if paused. Since Activity doesn't
// have a built in way to do this, we would have to implement one ourselves and
// either cast our Activity to a specialized activity base class or implement some
// generic interface that tells us if an activity is paused. hasWindowFocus() is
// close enough if not quite perfect.
return;
}

final DateListener listener = new DateListener(v);
if (mDatePickerDialog != null) {
mDatePickerDialog.dismiss();
}
mDatePickerDialog = new DatePickerDialog(mActivity, listener, mTime.getYear(),
mTime.getMonth(), mTime.getDay());
mDatePickerDialog.getDatePicker().setFirstDayOfWeek(Utils.getFirstDayOfWeekAsCalendar(mActivity));
mDatePickerDialog.show();
}
}
}

0 comments on commit 2e99b7e

Please sign in to comment.