Skip to content

Commit 3270fac

Browse files
author
WooSignal
committed
v2.0.4 Added Flexible widget for checkout details
1 parent 9d57663 commit 3270fac

File tree

5 files changed

+99
-87
lines changed

5 files changed

+99
-87
lines changed

‎LabelStoreMax/CHANGELOG.md‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,8 @@
1+
## [2.0.4] - 2020-05-13
2+
3+
* Added Flexible widget for checkout details
4+
* Bug fixes
5+
16
## [2.0.3] - 2020-05-12
27

38
* New state options for taxes/shipping

‎LabelStoreMax/lib/labelconfig.dart‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ import 'dart:ui';
1616
Developer Notes
1717
1818
SUPPORT EMAIL - [email protected]
19-
VERSION - 2.0.3
19+
VERSION - 2.0.4
2020
https://woosignal.com
2121
*/
2222

‎LabelStoreMax/lib/pages/checkout_details.dart‎

Lines changed: 92 additions & 84 deletions
Original file line numberDiff line numberDiff line change
@@ -183,99 +183,107 @@ class _CheckoutDetailsPageState extends State<CheckoutDetailsPage> {
183183
crossAxisAlignment: CrossAxisAlignment.start,
184184
mainAxisAlignment: MainAxisAlignment.spaceAround,
185185
children: <Widget>[
186-
Row(
187-
children: <Widget>[
188-
Flexible(
189-
child: wsTextEditingRow(
190-
context,
191-
heading: trans(context, "First Name"),
192-
controller: _txtShippingFirstName,
193-
shouldAutoFocus: true,
186+
Flexible(
187+
child: Row(
188+
children: <Widget>[
189+
Flexible(
190+
child: wsTextEditingRow(
191+
context,
192+
heading: trans(context, "First Name"),
193+
controller: _txtShippingFirstName,
194+
shouldAutoFocus: true,
195+
),
194196
),
195-
),
196-
Flexible(
197-
child: wsTextEditingRow(
198-
context,
199-
heading: trans(context, "Last Name"),
200-
controller: _txtShippingLastName,
197+
Flexible(
198+
child: wsTextEditingRow(
199+
context,
200+
heading: trans(context, "Last Name"),
201+
controller: _txtShippingLastName,
202+
),
201203
),
202-
),
203-
],
204-
crossAxisAlignment: CrossAxisAlignment.center,
205-
mainAxisAlignment: MainAxisAlignment.spaceEvenly,
204+
],
205+
crossAxisAlignment: CrossAxisAlignment.center,
206+
mainAxisAlignment: MainAxisAlignment.spaceEvenly,
207+
),
206208
),
207-
Row(
208-
children: <Widget>[
209-
Flexible(
210-
child: wsTextEditingRow(
211-
context,
212-
heading: trans(context, "Address Line"),
213-
controller: _txtShippingAddressLine,
209+
Flexible(
210+
child: Row(
211+
children: <Widget>[
212+
Flexible(
213+
child: wsTextEditingRow(
214+
context,
215+
heading: trans(context, "Address Line"),
216+
controller: _txtShippingAddressLine,
217+
),
214218
),
215-
),
216-
Flexible(
217-
child: wsTextEditingRow(
218-
context,
219-
heading: trans(context, "City"),
220-
controller: _txtShippingCity,
219+
Flexible(
220+
child: wsTextEditingRow(
221+
context,
222+
heading: trans(context, "City"),
223+
controller: _txtShippingCity,
224+
),
221225
),
222-
),
223-
],
226+
],
227+
),
224228
),
225-
Row(
226-
children: <Widget>[
227-
Flexible(
228-
child: wsTextEditingRow(
229-
context,
230-
heading: trans(context, "Postal code"),
231-
controller: _txtShippingPostalCode,
229+
Flexible(
230+
child: Row(
231+
children: <Widget>[
232+
Flexible(
233+
child: wsTextEditingRow(
234+
context,
235+
heading: trans(context, "Postal code"),
236+
controller: _txtShippingPostalCode,
237+
),
232238
),
233-
),
234-
Flexible(
235-
child: wsTextEditingRow(context,
236-
heading: trans(context, "Email address"),
237-
keyboardType: TextInputType.emailAddress,
238-
controller: _txtShippingEmailAddress),
239-
),
240-
],
239+
Flexible(
240+
child: wsTextEditingRow(context,
241+
heading: trans(context, "Email address"),
242+
keyboardType: TextInputType.emailAddress,
243+
controller: _txtShippingEmailAddress),
244+
),
245+
],
246+
),
241247
),
242-
Row(
243-
children: <Widget>[
244-
(_strBillingCountry == "United States"
245-
? Flexible(
246-
child: Padding(
247-
child: wsSecondaryButton(
248-
context,
249-
title: (_strBillingState != null &&
250-
_strBillingState.isNotEmpty
251-
? trans(context, "Selected") +
252-
"\n" +
253-
_strBillingState
254-
: trans(context, "Select state")),
255-
action: _showSelectStateModal,
248+
Flexible(
249+
child: Row(
250+
children: <Widget>[
251+
(_strBillingCountry == "United States"
252+
? Flexible(
253+
child: Padding(
254+
child: wsSecondaryButton(
255+
context,
256+
title: (_strBillingState != null &&
257+
_strBillingState.isNotEmpty
258+
? trans(context, "Selected") +
259+
"\n" +
260+
_strBillingState
261+
: trans(context, "Select state")),
262+
action: _showSelectStateModal,
263+
),
264+
padding: EdgeInsets.all(8),
256265
),
257-
padding: EdgeInsets.all(8),
258-
),
259-
)
260-
: null),
261-
Flexible(
262-
child: Padding(
263-
child: wsSecondaryButton(
264-
context,
265-
title: (_strBillingCountry != null &&
266-
_strBillingCountry.isNotEmpty
267-
? trans(context, "Selected") +
268-
"\n" +
269-
_strBillingCountry
270-
: trans(context, "Select country")),
271-
action: _showSelectCountryModal,
266+
)
267+
: null),
268+
Flexible(
269+
child: Padding(
270+
child: wsSecondaryButton(
271+
context,
272+
title: (_strBillingCountry != null &&
273+
_strBillingCountry.isNotEmpty
274+
? trans(context, "Selected") +
275+
"\n" +
276+
_strBillingCountry
277+
: trans(context, "Select country")),
278+
action: _showSelectCountryModal,
279+
),
280+
padding: EdgeInsets.all(8),
272281
),
273-
padding: EdgeInsets.all(8),
274-
),
275-
)
276-
].where((element) => element != null).toList(),
277-
crossAxisAlignment: CrossAxisAlignment.center,
278-
mainAxisAlignment: MainAxisAlignment.spaceEvenly,
282+
)
283+
].where((element) => element != null).toList(),
284+
crossAxisAlignment: CrossAxisAlignment.center,
285+
mainAxisAlignment: MainAxisAlignment.spaceEvenly,
286+
),
279287
)
280288
],
281289
),
@@ -286,7 +294,7 @@ class _CheckoutDetailsPageState extends State<CheckoutDetailsPage> {
286294
),
287295
padding: EdgeInsets.all(8),
288296
),
289-
height: (constraints.maxHeight - constraints.minHeight) * 0.5,
297+
height: (constraints.maxHeight - constraints.minHeight) * 0.6,
290298
),
291299
Column(
292300
children: <Widget>[

‎LabelStoreMax/lib/widgets/buttons.dart‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,6 @@ Widget wsSecondaryButton(BuildContext context,
3737
height: 60,
3838
margin: EdgeInsets.only(top: 10),
3939
child: RaisedButton(
40-
padding: EdgeInsets.all(10),
4140
child: Text(
4241
title,
4342
style: Theme.of(context).primaryTextTheme.bodyText1.copyWith(

‎LabelStoreMax/pubspec.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# Label StoreMax
2-
# Version 2.0.3
2+
# Version 2.0.4
33
#authors: - "Anthony Gordon"
44
#documentation: https://woosignal.com/docs/app/ios/label-storemax
55
#homepage: https://woosignal.com/

0 commit comments

Comments
 (0)