From fb311db402d87341c74b900d16676a94e6cc1ae6 Mon Sep 17 00:00:00 2001 From: Hillel Coren Date: Wed, 30 Sep 2020 23:48:23 +0300 Subject: [PATCH] Show variable help --- lib/ui/app/variables.dart | 11 ++++++++--- lib/ui/design/edit/design_edit.dart | 6 ++++-- 2 files changed, 12 insertions(+), 5 deletions(-) diff --git a/lib/ui/app/variables.dart b/lib/ui/app/variables.dart index 4ce9add33..a016f2b73 100644 --- a/lib/ui/app/variables.dart +++ b/lib/ui/app/variables.dart @@ -8,6 +8,10 @@ import 'package:invoiceninja_flutter/ui/app/form_card.dart'; import 'package:invoiceninja_flutter/utils/localization.dart'; class VariablesHelp extends StatefulWidget { + const VariablesHelp({this.showEmailVariables = false}); + + final bool showEmailVariables; + @override _VariablesHelpState createState() => _VariablesHelpState(); } @@ -19,7 +23,8 @@ class _VariablesHelpState extends State @override void initState() { super.initState(); - _controller = TabController(vsync: this, length: 5); + _controller = + TabController(vsync: this, length: widget.showEmailVariables ? 5 : 4); } @override @@ -41,7 +46,7 @@ class _VariablesHelpState extends State controller: _controller, isScrollable: true, tabs: [ - Tab(child: Text(localization.email)), + if (widget.showEmailVariables) Tab(child: Text(localization.email)), Tab(child: Text(localization.invoice)), Tab(child: Text(localization.client)), Tab(child: Text(localization.contact)), @@ -53,7 +58,7 @@ class _VariablesHelpState extends State child: TabBarView( controller: _controller, children: [ - SizedBox(), + if (widget.showEmailVariables) SizedBox(), _VariableGrid( fields: [ InvoiceFields.amount, diff --git a/lib/ui/design/edit/design_edit.dart b/lib/ui/design/edit/design_edit.dart index b5c59aecf..316171961 100644 --- a/lib/ui/design/edit/design_edit.dart +++ b/lib/ui/design/edit/design_edit.dart @@ -12,6 +12,7 @@ import 'package:invoiceninja_flutter/ui/app/forms/app_form.dart'; import 'package:invoiceninja_flutter/ui/app/forms/app_tab_bar.dart'; import 'package:invoiceninja_flutter/ui/app/forms/decorated_form_field.dart'; import 'package:invoiceninja_flutter/ui/app/forms/design_picker.dart'; +import 'package:invoiceninja_flutter/ui/app/variables.dart'; import 'package:invoiceninja_flutter/ui/design/edit/design_edit_vm.dart'; import 'package:invoiceninja_flutter/utils/designs.dart'; import 'package:invoiceninja_flutter/utils/localization.dart'; @@ -331,8 +332,8 @@ class DesignSettings extends StatelessWidget { Widget build(BuildContext context) { final localization = AppLocalization.of(context); - return Column( - mainAxisSize: MainAxisSize.min, + return ListView( + shrinkWrap: true, children: [ FormCard( children: [ @@ -346,6 +347,7 @@ class DesignSettings extends StatelessWidget { ), ], ), + VariablesHelp(), ], ); }