fix showflagdialog and main to override the showflag property

This commit is contained in:
Salvatore Giordano
2020-05-09 12:25:30 +02:00
parent ed136d0a03
commit c46aa1c40e
2 changed files with 9 additions and 7 deletions

View File

@@ -132,7 +132,9 @@ class CountryCodePickerState extends State<CountryCodePicker> {
direction: Axis.horizontal,
mainAxisSize: MainAxisSize.min,
children: <Widget>[
if (widget.showFlag || (widget.showFlagMain == true))
if (widget.showFlagMain != null
? widget.showFlagMain
: widget.showFlag)
Flexible(
flex: widget.alignLeft ? 0 : 1,
fit: widget.alignLeft ? FlexFit.tight : FlexFit.loose,
@@ -231,7 +233,9 @@ class CountryCodePickerState extends State<CountryCodePicker> {
searchDecoration: widget.searchDecoration,
searchStyle: widget.searchStyle,
textStyle: widget.dialogTextStyle,
showFlag: widget.showFlag || (widget.showFlagDialog == true),
showFlag: widget.showFlagDialog != null
? widget.showFlagDialog
: widget.showFlag,
flagWidth: widget.flagWidth,
size: widget.dialogSize,
hideSearch: widget.hideSearch,