From 5d88391d147d9c5d24c9f52e02e744f2e660fd09 Mon Sep 17 00:00:00 2001 From: Hillel Coren Date: Tue, 29 Oct 2019 22:28:32 +0200 Subject: [PATCH] Settings --- lib/ui/settings/workflow_settings.dart | 76 +++++++++++++++----------- 1 file changed, 43 insertions(+), 33 deletions(-) diff --git a/lib/ui/settings/workflow_settings.dart b/lib/ui/settings/workflow_settings.dart index eae054535..18b9ac468 100644 --- a/lib/ui/settings/workflow_settings.dart +++ b/lib/ui/settings/workflow_settings.dart @@ -1,6 +1,7 @@ import 'package:flutter/foundation.dart'; import 'package:flutter/material.dart'; import 'package:font_awesome_flutter/font_awesome_flutter.dart'; +import 'package:invoiceninja_flutter/ui/app/form_card.dart'; import 'package:invoiceninja_flutter/ui/app/forms/app_form.dart'; import 'package:invoiceninja_flutter/ui/app/forms/bool_dropdown_button.dart'; import 'package:invoiceninja_flutter/ui/settings/settings_scaffold.dart'; @@ -68,46 +69,55 @@ class _WorkflowSettingsState extends State focusNode: _focusNode, children: [ ListView( - padding: const EdgeInsets.all(10), children: [ - BoolDropdownButton( - label: localization.autoEmailInvoice, - helpLabel: localization.autoEmailInvoiceHelp, - value: settings.autoEmailInvoice ?? false, - onChanged: (value) => viewModel.onSettingsChanged( - settings.rebuild((b) => b..autoEmailInvoice = value)), - iconData: FontAwesomeIcons.solidEnvelope, - showBlank: state.settingsUIState.isFiltered, - ), - BoolDropdownButton( - label: localization.autoArchiveInvoice, - helpLabel: localization.autoArchiveInvoiceHelp, - value: settings.autoArchiveInvoice ?? false, - onChanged: (value) => viewModel.onSettingsChanged( - settings.rebuild((b) => b..autoArchiveInvoice = value)), - iconData: FontAwesomeIcons.archive, - showBlank: state.settingsUIState.isFiltered, + FormCard( + children: [ + BoolDropdownButton( + label: localization.autoEmailInvoice, + helpLabel: localization.autoEmailInvoiceHelp, + value: settings.autoEmailInvoice ?? false, + onChanged: (value) => viewModel.onSettingsChanged( + settings.rebuild((b) => b..autoEmailInvoice = value)), + iconData: FontAwesomeIcons.solidEnvelope, + showBlank: state.settingsUIState.isFiltered, + ), + BoolDropdownButton( + label: localization.autoArchiveInvoice, + helpLabel: localization.autoArchiveInvoiceHelp, + value: settings.autoArchiveInvoice ?? false, + onChanged: (value) => viewModel.onSettingsChanged(settings + .rebuild((b) => b..autoArchiveInvoice = value)), + iconData: FontAwesomeIcons.archive, + showBlank: state.settingsUIState.isFiltered, + ), + ], ), ], ), ListView( padding: const EdgeInsets.all(10), children: [ - BoolDropdownButton( - label: localization.autoConvertQuote, - helpLabel: localization.autoConvertQuoteHelp, - value: settings.autoConvertQuote ?? false, - onChanged: (value) => viewModel.onSettingsChanged( - settings.rebuild((b) => b..autoConvertQuote = value)), - showBlank: state.settingsUIState.isFiltered, - ), - BoolDropdownButton( - label: localization.autoArchiveQuote, - helpLabel: localization.autoArchiveQuoteHelp, - value: settings.autoArchiveQuote ?? false, - onChanged: (value) => viewModel.onSettingsChanged( - settings.rebuild((b) => b..autoArchiveQuote = value)), - showBlank: state.settingsUIState.isFiltered, + FormCard( + children: [ + BoolDropdownButton( + label: localization.autoConvertQuote, + helpLabel: localization.autoConvertQuoteHelp, + value: settings.autoConvertQuote ?? false, + onChanged: (value) => viewModel.onSettingsChanged( + settings.rebuild((b) => b..autoConvertQuote = value)), + iconData: FontAwesomeIcons.fileInvoice, + showBlank: state.settingsUIState.isFiltered, + ), + BoolDropdownButton( + label: localization.autoArchiveQuote, + helpLabel: localization.autoArchiveQuoteHelp, + value: settings.autoArchiveQuote ?? false, + onChanged: (value) => viewModel.onSettingsChanged( + settings.rebuild((b) => b..autoArchiveQuote = value)), + iconData: FontAwesomeIcons.archive, + showBlank: state.settingsUIState.isFiltered, + ), + ], ), ], ),