Skip to content
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

Jump to bottom

Enhance widget customization #165

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Enhance widget customization #165

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
3586d8a
feat: add property to show/hide flag icon from
IguJl15 Jul 18, 2024
71d47a1
feat: allow nullable value callback to deactivate dropdown
IguJl15 Jul 18, 2024
40dc631
feat: add missing style properties
IguJl15 Jul 18, 2024
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
61 changes: 41 additions & 20 deletions lib/widgets/country_dropdown.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,10 @@ class CountryDropdown extends StatefulWidget {
final CountryItemBuilder? selectedItemBuilder;
final CountryItemBuilder? listItemBuilder;
final bool printCountryName;
final bool showCountryFlag;
final PhoneCountryData? initialCountryData;
final List<PhoneCountryData>? filter;
final ValueChanged<PhoneCountryData> onCountrySelected;
final ValueChanged<PhoneCountryData>? onCountrySelected;

final int elevation;
final TextStyle? style;
Expand All @@ -31,6 +32,10 @@ class CountryDropdown extends StatefulWidget {
final bool? enableFeedback;
final AlignmentGeometry alignment;
final bool triggerOnCountrySelectedInitially;
final EdgeInsetsGeometry? padding;
final Widget? disabledHint;
final BorderRadius? borderRadius;
final Widget? hint;

/// [filter] if you need a predefined list of countries only,
/// pass it here
Expand All @@ -50,6 +55,7 @@ class CountryDropdown extends StatefulWidget {
this.selectedItemBuilder,
this.listItemBuilder,
this.printCountryName = false,
this.showCountryFlag = true,
this.initialCountryData,
this.triggerOnCountrySelectedInitially = true,
this.filter,
Expand All @@ -70,6 +76,10 @@ class CountryDropdown extends StatefulWidget {
this.autovalidateMode,
this.menuMaxHeight,
this.enableFeedback,
this.hint,
this.padding,
this.disabledHint,
this.borderRadius,
this.alignment = AlignmentDirectional.centerStart,
}) : super(key: key);

Expand All @@ -85,14 +95,15 @@ class _CountryDropdownState extends State<CountryDropdown> {
void initState() {
_countryItems = widget.filter ?? PhoneCodes.getAllCountryDatas();
if (widget.initialCountryData != null) {
_initialValue = _countryItems
.firstWhereOrNull((c) => c == widget.initialCountryData) ??
_initialValue = _countryItems.firstWhereOrNull((c) => c == widget.initialCountryData) ??
_countryItems.first;
}
if (widget.triggerOnCountrySelectedInitially && _initialValue != null) {
if (widget.triggerOnCountrySelectedInitially &&
_initialValue != null &&
widget.onCountrySelected != null) {
_widgetsBinding.addPostFrameCallback((timeStamp) {
if (_initialValue != null) {
widget.onCountrySelected(_initialValue!);
widget.onCountrySelected!(_initialValue!);
}
});
}
Expand All @@ -111,12 +122,13 @@ class _CountryDropdownState extends State<CountryDropdown> {
}
return Row(
children: [
Padding(
padding: const EdgeInsets.only(right: 8.0),
child: CountryFlag(
countryId: phoneCountryData.countryCode!,
if (widget.showCountryFlag)
Padding(
padding: const EdgeInsets.only(right: 8.0),
child: CountryFlag(
countryId: phoneCountryData.countryCode!,
),
),
),
Flexible(
child: Text(
'+${phoneCountryData.phoneCode}',
Expand All @@ -139,12 +151,13 @@ class _CountryDropdownState extends State<CountryDropdown> {
children: [
Row(
children: [
Padding(
padding: const EdgeInsets.only(right: 8.0),
child: CountryFlag(
countryId: phoneCountryData.countryCode!,
if (widget.showCountryFlag)
Padding(
padding: const EdgeInsets.only(right: 8.0),
child: CountryFlag(
countryId: phoneCountryData.countryCode!,
),
),
),
Text('+${phoneCountryData.phoneCode}'),
],
),
Expand All @@ -168,6 +181,8 @@ class _CountryDropdownState extends State<CountryDropdown> {

@override
Widget build(BuildContext context) {
final enabled = widget.onCountrySelected != null;

return DropdownButtonFormField<PhoneCountryData>(
key: Key('countryDropdown'),
isDense: true,
Expand All @@ -187,6 +202,10 @@ class _CountryDropdownState extends State<CountryDropdown> {
enableFeedback: widget.enableFeedback,
icon: widget.icon,
isExpanded: true,
hint: widget.hint,
padding: widget.padding,
disabledHint: widget.disabledHint,
borderRadius: widget.borderRadius,
elevation: widget.elevation,
itemHeight: widget.itemHeight,
selectedItemBuilder: (c) {
Expand All @@ -207,11 +226,13 @@ class _CountryDropdownState extends State<CountryDropdown> {
),
)
.toList(),
onChanged: (PhoneCountryData? data) {
if (data != null) {
widget.onCountrySelected(data);
}
},
onChanged: enabled
? (PhoneCountryData? data) {
if (data != null) {
widget.onCountrySelected!(data);
}
}
: null,
value: _initialValue,
);
}
Expand Down