Skip to content

Feat add diameter ration for simple picker #154

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
koukibadr merged 2 commits into from
Jul 26, 2025
Merged

Feat add diameter ration for simple picker #154

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d5dd6e4
feat: add simple picker diameter ratio parameter
koukibadr Jul 26, 2025
4bfdf3a
feat: add simple picker diameter ratio parameter
koukibadr Jul 26, 2025
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
1 change: 1 addition & 0 deletions example/lib/main.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -246,6 +246,7 @@ class ExampleApp extends StatelessWidget {
BottomPicker(
items: items,
selectedItemIndex: 1,
diameterRatio: 200,
headerBuilder: (context) {
return Container(
child: Row(
Expand Down
116 changes: 66 additions & 50 deletions lib/bottom_picker.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ class BottomPicker extends StatefulWidget {
@Deprecated('should use headerBuilder instead') this.closeWidget,
this.closeOnSubmit = true,
this.headerBuilder,
this.calendarDays = CupertinoDatePickerWidget.fullWeek,
this.diameterRatio = 1.1,
}) {
dateOrder = null;
onRangeDateSubmitPressed = null;
Expand Down Expand Up @@ -132,6 +132,7 @@ class BottomPicker extends StatefulWidget {
this.closeOnSubmit = true,
this.headerBuilder,
this.calendarDays = CupertinoDatePickerWidget.fullWeek,
this.diameterRatio = 1.1,
}) {
datePickerMode = CupertinoDatePickerMode.date;
bottomPickerType = BottomPickerType.dateTime;
Expand Down Expand Up @@ -163,6 +164,7 @@ class BottomPicker extends StatefulWidget {
this.buttonContent,
this.buttonStyle,
this.itemExtent = 35.0,
this.diameterRatio = 1.1,
this.headerBuilder,
}) {
datePickerMode = CupertinoDatePickerMode.date;
Expand Down Expand Up @@ -216,6 +218,7 @@ class BottomPicker extends StatefulWidget {
this.closeOnSubmit = true,
this.headerBuilder,
this.calendarDays = CupertinoDatePickerWidget.fullWeek,
this.diameterRatio = 1.1,
}) {
datePickerMode = CupertinoDatePickerMode.monthYear;
bottomPickerType = BottomPickerType.dateTime;
Expand Down Expand Up @@ -272,6 +275,7 @@ class BottomPicker extends StatefulWidget {
this.closeOnSubmit = true,
this.headerBuilder,
this.calendarDays = CupertinoDatePickerWidget.fullWeek,
this.diameterRatio = 1.1,
}) {
datePickerMode = CupertinoDatePickerMode.dateAndTime;
bottomPickerType = BottomPickerType.dateTime;
Expand Down Expand Up @@ -325,6 +329,7 @@ class BottomPicker extends StatefulWidget {
this.closeOnSubmit = true,
this.headerBuilder,
this.calendarDays = CupertinoDatePickerWidget.fullWeek,
this.diameterRatio = 1.1,
}) {
datePickerMode = CupertinoDatePickerMode.time;
bottomPickerType = BottomPickerType.time;
Expand Down Expand Up @@ -378,6 +383,7 @@ class BottomPicker extends StatefulWidget {
this.closeOnSubmit = true,
this.headerBuilder,
this.calendarDays = CupertinoDatePickerWidget.fullWeek,
this.diameterRatio = 1.1,
}) {
dateOrder = null;
onRangeDateSubmitPressed = null;
Expand Down Expand Up @@ -432,6 +438,7 @@ class BottomPicker extends StatefulWidget {
this.closeOnSubmit = true,
this.headerBuilder,
this.calendarDays = CupertinoDatePickerWidget.fullWeek,
this.diameterRatio = 1.1,
}) {
datePickerMode = CupertinoDatePickerMode.date;
bottomPickerType = BottomPickerType.rangeDate;
Expand Down Expand Up @@ -502,6 +509,7 @@ class BottomPicker extends StatefulWidget {
this.closeOnSubmit = true,
this.headerBuilder,
this.calendarDays = CupertinoDatePickerWidget.fullWeek,
this.diameterRatio = 1.1,
}) {
datePickerMode = CupertinoDatePickerMode.time;
bottomPickerType = BottomPickerType.rangeTime;
Expand Down Expand Up @@ -799,6 +807,9 @@ class BottomPicker extends StatefulWidget {
/// The datepicker calendar type
List<int> calendarDays = CupertinoDatePickerWidget.fullWeek;

/// The bottom picker selector diameter ratio.
final double diameterRatio;

///display the bottom picker popup
///[context] the app context to display the popup
void show(BuildContext context) {
Expand Down Expand Up @@ -957,6 +968,7 @@ class BottomPickerState extends State<BottomPicker> {
itemExtent: widget.itemExtent,
selectionOverlay: widget.selectionOverlay,
pickerThemeData: widget.pickerThemeData,
diameterRatio: widget.diameterRatio,
)
: widget.bottomPickerType == BottomPickerType.timer
? TimePicker(
Expand Down Expand Up @@ -1022,55 +1034,59 @@ class BottomPickerState extends State<BottomPicker> {
)
: widget.bottomPickerType ==
BottomPickerType.rangeTime
? RangePicker(
mode: CupertinoDatePickerMode.time,
use24hFormat: widget.use24hFormat,
initialFirstDateTime:
widget.initialFirstTime,
initialSecondDateTime:
widget.initialSecondTime,
maxFirstDate: widget.maxFirstTime,
minFirstDateTime: widget.minFirstTime,
maxSecondDate: widget.maxSecondTime,
minSecondDateTime: widget.minSecondTime,
onFirstDateChanged: (DateTime date) {
selectedFirstDateTime = date;
},
onSecondDateChanged: (DateTime date) {
selectedSecondDateTime = date;
},
dateOrder: widget.dateOrder,
textStyle: widget.pickerTextStyle,
minuteInterval: widget.minuteInterval,
itemExtent: widget.itemExtent,
showTimeSeperator:
widget.showTimeSeparator,
pickerThemeData: widget.pickerThemeData,
)
: RangePicker(
mode: CupertinoDatePickerMode.date,
use24hFormat: widget.use24hFormat,
initialFirstDateTime:
widget.initialFirstDate,
initialSecondDateTime:
widget.initialSecondDate,
maxFirstDate: widget.maxFirstDate,
minFirstDateTime: widget.minFirstDate,
maxSecondDate: widget.maxSecondDate,
minSecondDateTime: widget.minSecondDate,
onFirstDateChanged: (DateTime date) {
selectedFirstDateTime = date;
},
onSecondDateChanged: (DateTime date) {
selectedSecondDateTime = date;
},
dateOrder: widget.dateOrder,
textStyle: widget.pickerTextStyle,
itemExtent: widget.itemExtent,
showTimeSeperator:
widget.showTimeSeparator,
pickerThemeData: widget.pickerThemeData,
),
? RangePicker(
mode: CupertinoDatePickerMode.time,
use24hFormat: widget.use24hFormat,
initialFirstDateTime:
widget.initialFirstTime,
initialSecondDateTime:
widget.initialSecondTime,
maxFirstDate: widget.maxFirstTime,
minFirstDateTime: widget.minFirstTime,
maxSecondDate: widget.maxSecondTime,
minSecondDateTime:
widget.minSecondTime,
onFirstDateChanged: (DateTime date) {
selectedFirstDateTime = date;
},
onSecondDateChanged: (DateTime date) {
selectedSecondDateTime = date;
},
dateOrder: widget.dateOrder,
textStyle: widget.pickerTextStyle,
minuteInterval: widget.minuteInterval,
itemExtent: widget.itemExtent,
showTimeSeperator:
widget.showTimeSeparator,
pickerThemeData:
widget.pickerThemeData,
)
: RangePicker(
mode: CupertinoDatePickerMode.date,
use24hFormat: widget.use24hFormat,
initialFirstDateTime:
widget.initialFirstDate,
initialSecondDateTime:
widget.initialSecondDate,
maxFirstDate: widget.maxFirstDate,
minFirstDateTime: widget.minFirstDate,
maxSecondDate: widget.maxSecondDate,
minSecondDateTime:
widget.minSecondDate,
onFirstDateChanged: (DateTime date) {
selectedFirstDateTime = date;
},
onSecondDateChanged: (DateTime date) {
selectedSecondDateTime = date;
},
dateOrder: widget.dateOrder,
textStyle: widget.pickerTextStyle,
itemExtent: widget.itemExtent,
showTimeSeperator:
widget.showTimeSeparator,
pickerThemeData:
widget.pickerThemeData,
),
),
if (widget.displaySubmitButton)
Padding(
Expand Down
3 changes: 3 additions & 0 deletions lib/widgets/simple_picker.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ class SimplePicker extends StatelessWidget {
final double itemExtent;
final Widget? selectionOverlay;
final CupertinoTextThemeData? pickerThemeData;
final double diameterRatio;

const SimplePicker({
super.key,
Expand All @@ -21,6 +22,7 @@ class SimplePicker extends StatelessWidget {
required this.itemExtent,
this.selectionOverlay,
this.pickerThemeData,
required this.diameterRatio,
});

@override
Expand All @@ -35,6 +37,7 @@ class SimplePicker extends StatelessWidget {
),
child: CupertinoPicker(
offAxisFraction: 2.0,
diameterRatio: diameterRatio,
itemExtent: itemExtent,
selectionOverlay: selectionOverlay ??
const CupertinoPickerDefaultSelectionOverlay(),
Expand Down
1 change: 1 addition & 0 deletions lib/widgets/year_picker.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,6 +71,7 @@ class _BottomYearDatePicker extends State<BottomYearDatePicker> {
selectedItemIndex: 0,
itemExtent: widget.itemExtent ?? 0,
pickerThemeData: widget.pickerThemeData,
diameterRatio: 1.1,
);
}
}
Loading