Email signature

lib/ui/settings/email_settings.dart

@@ -23,18 +23,17 @@ class EmailSettings extends StatefulWidget {
   _EmailSettingsState createState() => _EmailSettingsState();
 }
 
-class _EmailSettingsState extends State<EmailSettings>
-    with SingleTickerProviderStateMixin {
+class _EmailSettingsState extends State<EmailSettings> {
   static final GlobalKey<FormState> _formKey =
       GlobalKey<FormState>(debugLabel: '_emailSettings');
 
-  TabController _tabController;
   FocusScopeNode _focusNode;
   bool autoValidate = false;
 
   final _replyToEmailController = TextEditingController();
   final _bccEmailController = TextEditingController();
   final _emailStyleCustomController = TextEditingController();
+  final _emailFooterController = TextEditingController();
 
   List<TextEditingController> _controllers = [];
 
@@ -42,13 +41,11 @@ class _EmailSettingsState extends State<EmailSettings>
   void initState() {
     super.initState();
 
-    _tabController = TabController(vsync: this, length: 2);
     _focusNode = FocusScopeNode();
   }
 
   @override
   void dispose() {
-    _tabController.dispose();
     _focusNode.dispose();
     _controllers.forEach((dynamic controller) {
       controller.removeListener(_onChanged);
@@ -63,17 +60,17 @@ class _EmailSettingsState extends State<EmailSettings>
       _replyToEmailController,
       _bccEmailController,
       _emailStyleCustomController,
+      _emailFooterController,
     ];
 
     _controllers
         .forEach((dynamic controller) => controller.removeListener(_onChanged));
 
     final settings = widget.viewModel.settings;
-    //final signature = settings.emailFooter;
-
     _replyToEmailController.text = settings.replyToEmail;
     _bccEmailController.text = settings.bccEmail;
     _emailStyleCustomController.text = settings.emailStyleCustom;
+    _emailFooterController.text = settings.emailFooter;
 
     _controllers
         .forEach((dynamic controller) => controller.addListener(_onChanged));
@@ -85,7 +82,8 @@ class _EmailSettingsState extends State<EmailSettings>
     final settings = widget.viewModel.settings.rebuild((b) => b
       ..replyToEmail = _replyToEmailController.text.trim()
       ..bccEmail = _bccEmailController.text.trim()
-      ..emailStyleCustom = _emailStyleCustomController.text.trim());
+      ..emailStyleCustom = _emailStyleCustomController.text.trim()
+      ..emailFooter = _emailFooterController.text.trim());
     if (settings != widget.viewModel.settings) {
       widget.viewModel.onSettingsChanged(settings);
     }
@@ -95,30 +93,14 @@ class _EmailSettingsState extends State<EmailSettings>
   Widget build(BuildContext context) {
     final localization = AppLocalization.of(context);
     final viewModel = widget.viewModel;
-    final state = viewModel.state;
     final settings = viewModel.settings;
 
     return EditScaffold(
       title: localization.emailSettings,
       onSavePressed: viewModel.onSavePressed,
-      appBarBottom: TabBar(
-        key: ValueKey(state.settingsUIState.updatedAt),
-        controller: _tabController,
-        tabs: [
-          Tab(
-            text: localization.settings,
-          ),
-          Tab(
-            text: localization.emailSignature,
-          ),
-        ],
-      ),
-      body: AppTabForm(
-        tabController: _tabController,
+      body: AppForm(
         formKey: _formKey,
         focusNode: _focusNode,
-        children: <Widget>[
-          ListView(
         children: <Widget>[
           FormCard(
             children: <Widget>[
@@ -173,13 +155,21 @@ class _EmailSettingsState extends State<EmailSettings>
                 label: localization.enableMarkup,
                 helpLabel: localization.enableMarkupHelp,
                 value: settings.enableEmailMarkup,
-                    iconData:
-                        kIsWeb ? Icons.email : FontAwesomeIcons.solidEnvelope,
+                iconData: kIsWeb ? Icons.email : FontAwesomeIcons.solidEnvelope,
                 onChanged: (value) => viewModel.onSettingsChanged(
                     settings.rebuild((b) => b..enableEmailMarkup = value)),
               ),
             ],
           ),
+          FormCard(
+            children: <Widget>[
+              DecoratedFormField(
+                label: localization.emailSignature,
+                controller: _emailFooterController,
+                maxLines: 6,
+              ),
+            ],
+          ),
           FormCard(
             children: <Widget>[
               BoolDropdownButton(
@@ -207,12 +197,6 @@ class _EmailSettingsState extends State<EmailSettings>
           ),
         ],
       ),
-          Container(
-            color: Colors.grey.shade100,
-            child: SizedBox(),
-          ),
-        ],
-      ),
     );
   }
 }