Skip to content

Commit 0aaf3aa

Browse files
hillelcorenhillelcoren
committed
Email templates
1 parent 33cbaac commit 0aaf3aa

File tree

3 files changed

+74
-57
lines changed

3 files changed

+74
-57
lines changed

‎invoiceninja_android.iml

+3-1
Original file line numberDiff line numberDiff line change
@@ -23,5 +23,7 @@
2323
<orderEntry type="jdk" jdkName="Android API 25 Platform" jdkType="Android SDK" />
2424
<orderEntry type="sourceFolder" forTests="false" />
2525
<orderEntry type="library" name="Flutter for Android" level="project" />
26+
<orderEntry type="library" name="Dart SDK" level="project" />
27+
<orderEntry type="library" name="Dart Packages" level="project" />
2628
</component>
27-
</module>
29+
</module>

‎lib/ui/app/invoice/email_invoice_dialog.dart

+62-47
Original file line numberDiff line numberDiff line change
@@ -43,67 +43,82 @@ class _EmailInvoiceViewState extends State<EmailInvoiceView> {
4343
padding: const EdgeInsets.all(16.0),
4444
child: Row(
4545
children: <Widget>[
46-
Expanded(
47-
child: DropdownButtonHideUnderline(
48-
child: DropdownButton<String>(
49-
value: selectedTemplate,
50-
onChanged: (value) {
51-
setState(() {
52-
final localization = AppLocalization.of(context);
53-
final company = widget.viewModel.company;
54-
selectedTemplate = value;
55-
56-
switch (value) {
57-
//case const :
58-
}
59-
selectedTemplate = localization.initialEmail;
60-
emailSubject = company.emailSubjectInvoice;
61-
emailBody = company.emailBodyInvoice;
46+
DropdownButtonHideUnderline(
47+
child: DropdownButton<String>(
48+
value: selectedTemplate,
49+
onChanged: (value) {
50+
setState(() {
51+
final localization = AppLocalization.of(context);
52+
final company = widget.viewModel.company;
53+
selectedTemplate = value;
6254

63-
});
64-
},
65-
items: [
66-
DropdownMenuItem<String>(
67-
child: Text(localization.initialEmail),
68-
value: localization.initialEmail,
69-
),
70-
DropdownMenuItem<String>(
71-
child: Text(localization.firstReminder),
72-
value: localization.firstReminder,
73-
),
74-
DropdownMenuItem<String>(
75-
child: Text(localization.secondReminder),
76-
value: localization.secondReminder,
77-
),
78-
DropdownMenuItem<String>(
79-
child: Text(localization.thirdReminder),
80-
value: localization.thirdReminder,
81-
),
82-
],
83-
),
55+
switch (value) {
56+
//case const :
57+
}
58+
selectedTemplate = localization.initialEmail;
59+
emailSubject = company.emailSubjectInvoice;
60+
emailBody = company.emailBodyInvoice;
61+
});
62+
},
63+
items: [
64+
DropdownMenuItem<String>(
65+
child: Text(localization.initialEmail),
66+
value: localization.initialEmail,
67+
),
68+
DropdownMenuItem<String>(
69+
child: Text(localization.firstReminder),
70+
value: localization.firstReminder,
71+
),
72+
DropdownMenuItem<String>(
73+
child: Text(localization.secondReminder),
74+
value: localization.secondReminder,
75+
),
76+
DropdownMenuItem<String>(
77+
child: Text(localization.thirdReminder),
78+
value: localization.thirdReminder,
79+
),
80+
],
8481
),
8582
),
83+
Expanded(
84+
child: Container(),
85+
),
8686
SizedBox(
8787
width: 10.0,
8888
),
8989
ElevatedButton(
9090
label: localization.send,
9191
color: Colors.orange,
92-
onPressed: () {
93-
94-
},
92+
onPressed: () {},
9593
)
9694
],
9795
),
9896
),
99-
SingleChildScrollView(
100-
child: Container(
101-
color: Colors.white,
102-
child: HtmlView(
103-
//data: widget.viewModel.company.emailBodyInvoice,
104-
data: emailBody,
97+
ListView(
98+
shrinkWrap: true,
99+
children: <Widget>[
100+
Container(
101+
color: Colors.white,
102+
child: Padding(
103+
padding: const EdgeInsets.all(13.0),
104+
child: Text(
105+
emailSubject,
106+
style: TextStyle(
107+
color: Colors.black,
108+
fontWeight: FontWeight.bold,
109+
fontSize: 16.0,
110+
),
111+
),
112+
),
105113
),
106-
),
114+
Container(
115+
color: Colors.white,
116+
child: HtmlView(
117+
//data: widget.viewModel.company.emailBodyInvoice,
118+
data: emailBody,
119+
),
120+
),
121+
],
107122
),
108123
],
109124
);

‎pubspec.lock

+9-9
Original file line numberDiff line numberDiff line change
@@ -112,14 +112,14 @@ packages:
112112
name: cli_util
113113
url: "https://pub.dartlang.org"
114114
source: hosted
115-
version: "0.1.3"
115+
version: "0.1.3+2"
116116
code_builder:
117117
dependency: transitive
118118
description:
119119
name: code_builder
120120
url: "https://pub.dartlang.org"
121121
source: hosted
122-
version: "3.1.1"
122+
version: "3.1.2"
123123
collection:
124124
dependency: transitive
125125
description:
@@ -154,7 +154,7 @@ packages:
154154
name: dart_style
155155
url: "https://pub.dartlang.org"
156156
source: hosted
157-
version: "1.1.1"
157+
version: "1.1.3"
158158
file:
159159
dependency: transitive
160160
description:
@@ -168,7 +168,7 @@ packages:
168168
name: fixnum
169169
url: "https://pub.dartlang.org"
170170
source: hosted
171-
version: "0.10.7"
171+
version: "0.10.8"
172172
flutter:
173173
dependency: "direct main"
174174
description: flutter
@@ -258,7 +258,7 @@ packages:
258258
name: graphs
259259
url: "https://pub.dartlang.org"
260260
source: hosted
261-
version: "0.1.2"
261+
version: "0.1.2+1"
262262
html:
263263
dependency: transitive
264264
description:
@@ -508,7 +508,7 @@ packages:
508508
name: source_gen
509509
url: "https://pub.dartlang.org"
510510
source: hosted
511-
version: "0.8.3"
511+
version: "0.8.3+1"
512512
source_map_stack_trace:
513513
dependency: transitive
514514
description:
@@ -550,7 +550,7 @@ packages:
550550
name: stream_transform
551551
url: "https://pub.dartlang.org"
552552
source: hosted
553-
version: "0.0.14"
553+
version: "0.0.14+1"
554554
string_scanner:
555555
dependency: transitive
556556
description:
@@ -592,7 +592,7 @@ packages:
592592
name: url_launcher
593593
url: "https://pub.dartlang.org"
594594
source: hosted
595-
version: "3.0.2"
595+
version: "3.0.3"
596596
utf:
597597
dependency: transitive
598598
description:
@@ -650,5 +650,5 @@ packages:
650650
source: hosted
651651
version: "2.1.15"
652652
sdks:
653-
dart: ">=2.0.0-dev.62.0 <=2.0.0-dev.69.5.flutter-eab492385c"
653+
dart: ">=2.0.0-dev.65 <=2.0.0-dev.69.5.flutter-eab492385c"
654654
flutter: ">=0.2.5 <2.0.0"

0 commit comments

Comments
 (0)