Skip to content
This repository was archived by the owner on Feb 25, 2025. It is now read-only.

Commit 2ffb119

Browse files
committed
fix(#268) : Add setter for changing ok and cancel button label of CalendarDatePicker
1 parent 6910e2c commit 2ffb119

File tree

4 files changed

+26
-0
lines changed

4 files changed

+26
-0
lines changed

CHANGE_LOG.md

+1
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ Changelog
33
=========
44
**2.5.next**
55
* Add setter for changing cancel button label of RadialDatePicker (#266)
6+
* Add setter for changing ok and cancel button label of CalendarDatePicker (#268)
67

78
**2.5.2**
89
* Fix Chinese translations (#256)

README.md

+4
Original file line numberDiff line numberDiff line change
@@ -61,6 +61,8 @@ button.setOnClickListener(new View.OnClickListener() {
6161
.setFirstDayOfWeek(Calendar.SUNDAY)
6262
.setPreselectedDate(towDaysAgo.getYear(), towDaysAgo.getMonthOfYear() - 1, towDaysAgo.getDayOfMonth())
6363
.setDateRange(minDate, null)
64+
.setDoneText("Yay")
65+
.setCancelText("Nop")
6466
.setThemeDark(true);
6567
cdp.show(getSupportFragmentManager(), FRAG_TAG_DATE_PICKER);
6668
}
@@ -76,6 +78,8 @@ button.setOnClickListener(new View.OnClickListener() {
7678
RadialTimePickerDialogFragment rtpd = new RadialTimePickerDialogFragment()
7779
.setOnTimeSetListener(SampleRadialTimeBasicUsage.this)
7880
.setStartTime(10, 10)
81+
.setDoneText("Yay")
82+
.setCancelText("Nop")
7983
.setThemeDark(true);
8084
rtpd.show(getSupportFragmentManager(), FRAG_TAG_TIME_PICKER);
8185
}

library/src/main/java/com/codetroopers/betterpickers/calendardatepicker/CalendarDatePickerDialogFragment.java

+19
Original file line numberDiff line numberDiff line change
@@ -103,6 +103,8 @@ public class CalendarDatePickerDialogFragment extends DialogFragment implements
103103
private int mWeekStart = mCalendar.getFirstDayOfWeek();
104104
private CalendarDay mMinDate = DEFAULT_START_DATE;
105105
private CalendarDay mMaxDate = DEFAULT_END_DATE;
106+
private String mDoneText;
107+
private String mCancelText;
106108

107109
private SparseArray<CalendarDay> mDisabledDays;
108110

@@ -214,6 +216,17 @@ public CalendarDatePickerDialogFragment setPreselectedDate(int year, int monthOf
214216
return this;
215217
}
216218

219+
public CalendarDatePickerDialogFragment setDoneText(String text) {
220+
mDoneText = text;
221+
return this;
222+
}
223+
224+
public CalendarDatePickerDialogFragment setCancelText(String text) {
225+
mCancelText = text;
226+
return this;
227+
}
228+
229+
217230
@Override
218231
public void onCreate(Bundle savedInstanceState) {
219232
super.onCreate(savedInstanceState);
@@ -307,6 +320,9 @@ public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle sa
307320
mAnimator.setOutAnimation(animation2);
308321

309322
Button doneButton = (Button) view.findViewById(R.id.done_button);
323+
if (mDoneText != null) {
324+
doneButton.setText(mDoneText);
325+
}
310326
doneButton.setTextColor(mSelectedColor);
311327
doneButton.setOnClickListener(new OnClickListener() {
312328

@@ -321,6 +337,9 @@ public void onClick(View v) {
321337
}
322338
});
323339
Button cancelButton = (Button) view.findViewById(R.id.cancel_button);
340+
if (mCancelText != null) {
341+
cancelButton.setText(mCancelText);
342+
}
324343
cancelButton.setTextColor(mSelectedColor);
325344
cancelButton.setOnClickListener(new OnClickListener() {
326345

sample/src/main/java/com/codetroopers/betterpickers/sample/activity/calendardatepicker/SampleCalendarDateThemeCustom.java

+2
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,8 @@ public void onCreate(Bundle savedInstanceState) {
3131
@Override
3232
public void onClick(View v) {
3333
CalendarDatePickerDialogFragment cdp = new CalendarDatePickerDialogFragment()
34+
.setDoneText(getString(R.string.button_label_custom_ok))
35+
.setCancelText(getString(R.string.button_label_custom_cancel))
3436
.setThemeCustom(R.style.MyCustomBetterPickersRadialTimePickerDialog);
3537
cdp.show(getSupportFragmentManager(), FRAG_TAG_DATE_PICKER);
3638
}

0 commit comments

Comments
 (0)