Skip to content

Support of spinnerMode property to allow spinner datepicker on Android #10339

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

Closed
SilVdB wants to merge 6 commits into from
Closed

Support of spinnerMode property to allow spinner datepicker on Android #10339

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
5afdbf7
If property spinnerMode is passed to Android datepicker as true, the …
Oct 11, 2016
9cd4e78
Merge branch 'master' into android-datepicker-mode
SilVdB Oct 11, 2016
5b4e3a9
Merge branch 'master' into android-datepicker-mode
SilVdB Oct 12, 2016
80b7392
Merge branch 'master' into android-datepicker-mode
SilVdB Oct 13, 2016
c4cbb91
Update DatePickerDialogFragment.java
SilVdB Oct 14, 2016
55c72eb
Merge branch 'master' into android-datepicker-mode
SilVdB Oct 14, 2016
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
9 changes: 7 additions & 2 deletions ...Android/src/main/java/com/facebook/react/modules/datepicker/DatePickerDialogFragment.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,8 +53,13 @@ public Dialog onCreateDialog(Bundle savedInstanceState) {
final int month = c.get(Calendar.MONTH);
final int day = c.get(Calendar.DAY_OF_MONTH);

final DatePickerDialog dialog =
new DismissableDatePickerDialog(activityContext, onDateSetListener, year, month, day);
DatePickerDialog dialog;
if (args != null && args.getBoolean(DatePickerDialogModule.ARG_SPINNERMODE)) {
// The style added to the DismissableDatePickerDialog constructor will make sure the datepicker is shown as a spinner.
dialog = new DismissableDatePickerDialog(activityContext, android.R.style.Theme_Holo_Dialog_MinWidth, onDateSetListener, year, month, day);
} else {
dialog = new DismissableDatePickerDialog(activityContext, onDateSetListener, year, month, day);
}
final DatePicker datePicker = dialog.getDatePicker();

if (args != null && args.containsKey(DatePickerDialogModule.ARG_MINDATE)) {
Expand Down
4 changes: 4 additions & 0 deletions ReactAndroid/src/main/java/com/facebook/react/modules/datepicker/DatePickerDialogModule.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,7 @@ public class DatePickerDialogModule extends ReactContextBaseJavaModule {
/* package */ static final String ARG_DATE = "date";
/* package */ static final String ARG_MINDATE = "minDate";
/* package */ static final String ARG_MAXDATE = "maxDate";
/* package */ static final String ARG_SPINNERMODE = "spinnerMode";

/* package */ static final String ACTION_DATE_SET = "dateSetAction";
/* package */ static final String ACTION_DISMISSED = "dismissedAction";
Expand Down Expand Up @@ -173,6 +174,9 @@ private Bundle createFragmentArguments(ReadableMap options) {
if (options.hasKey(ARG_MAXDATE) && !options.isNull(ARG_MAXDATE)) {
args.putLong(ARG_MAXDATE, (long) options.getDouble(ARG_MAXDATE));
}
if (options.hasKey(ARG_SPINNERMODE) && !options.isNull(ARG_SPINNERMODE)) {
args.putBoolean(ARG_SPINNERMODE, (Boolean) options.getBoolean(ARG_SPINNERMODE));
}
return args;
}
}