Correct gmail setting when cliet/group filtered

This commit is contained in:
Hillel Coren 2021-06-18 17:52:59 +03:00
parent 2b61e7ea4b
commit b100cd2bc3
1 changed files with 13 additions and 7 deletions

View File

@ -123,6 +123,7 @@ class _EmailSettingsState extends State<EmailSettings> {
Widget build(BuildContext context) { Widget build(BuildContext context) {
final localization = AppLocalization.of(context); final localization = AppLocalization.of(context);
final viewModel = widget.viewModel; final viewModel = widget.viewModel;
final state = viewModel.state;
final settings = viewModel.settings; final settings = viewModel.settings;
final gmailUserIds = memoizedGmailUserList(viewModel.state.userState.map); final gmailUserIds = memoizedGmailUserList(viewModel.state.userState.map);
@ -142,15 +143,20 @@ class _EmailSettingsState extends State<EmailSettings> {
if (viewModel.state.authState.isHosted) ...[ if (viewModel.state.authState.isHosted) ...[
FormCard(children: <Widget>[ FormCard(children: <Widget>[
BoolDropdownButton( BoolDropdownButton(
showBlank: state.uiState.settingsUIState.isFiltered,
label: localization.sendFromGmail, label: localization.sendFromGmail,
value: settings.emailSendingMethod == value: settings.emailSendingMethod == null
SettingsEntity.EMAIL_SENDING_METHOD_GMAIL, ? null
: settings.emailSendingMethod ==
SettingsEntity.EMAIL_SENDING_METHOD_GMAIL,
iconData: MdiIcons.gmail, iconData: MdiIcons.gmail,
onChanged: (value) => viewModel.onSettingsChanged( onChanged: (value) =>
settings.rebuild((b) => b viewModel.onSettingsChanged(settings.rebuild((b) => b
..emailSendingMethod = (value == true ..emailSendingMethod = (value == null
? SettingsEntity.EMAIL_SENDING_METHOD_GMAIL ? null
: SettingsEntity.EMAIL_SENDING_METHOD_DEFAULT))), : value == true
? SettingsEntity.EMAIL_SENDING_METHOD_GMAIL
: SettingsEntity.EMAIL_SENDING_METHOD_DEFAULT))),
), ),
if (settings.emailSendingMethod == if (settings.emailSendingMethod ==
SettingsEntity.EMAIL_SENDING_METHOD_GMAIL) SettingsEntity.EMAIL_SENDING_METHOD_GMAIL)