Skip to content

Commit e1dfbb3

Browse files
author
WooSignal
committed
v1.12.13+hotfix.9 stable build for 2.0.0
1 parent 5622795 commit e1dfbb3

24 files changed

+178
-134
lines changed

‎LabelStoreMax/.flutter-plugins-dependencies‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
{"info":"This is a generated file; do not edit or check into version control.","plugins":{"ios":[{"name":"device_info","path":"/Users/anthony/Documents/config/flutter/.pub-cache/hosted/pub.dartlang.org/device_info-0.4.2+1/","dependencies":[]},{"name":"flutter_money_formatter","path":"/Users/anthony/Documents/config/flutter/.pub-cache/hosted/pub.dartlang.org/flutter_money_formatter-0.8.3/","dependencies":[]},{"name":"flutter_web_browser","path":"/Users/anthony/Documents/config/flutter/.pub-cache/hosted/pub.dartlang.org/flutter_web_browser-0.11.0/","dependencies":[]},{"name":"package_info","path":"/Users/anthony/Documents/config/flutter/.pub-cache/hosted/pub.dartlang.org/package_info-0.4.0+16/","dependencies":[]},{"name":"path_provider","path":"/Users/anthony/Documents/config/flutter/.pub-cache/hosted/pub.dartlang.org/path_provider-1.3.0/","dependencies":[]},{"name":"shared_preferences","path":"/Users/anthony/Documents/config/flutter/.pub-cache/hosted/pub.dartlang.org/shared_preferences-0.5.6+3/","dependencies":[]},{"name":"sqflite","path":"/Users/anthony/Documents/config/flutter/.pub-cache/hosted/pub.dartlang.org/sqflite-1.1.6+5/","dependencies":[]},{"name":"woosignal_stripe","path":"/Users/anthony/Documents/config/flutter/.pub-cache/hosted/pub.dartlang.org/woosignal_stripe-0.0.4/","dependencies":[]}],"android":[{"name":"device_info","path":"/Users/anthony/Documents/config/flutter/.pub-cache/hosted/pub.dartlang.org/device_info-0.4.2+1/","dependencies":[]},{"name":"flutter_money_formatter","path":"/Users/anthony/Documents/config/flutter/.pub-cache/hosted/pub.dartlang.org/flutter_money_formatter-0.8.3/","dependencies":[]},{"name":"flutter_web_browser","path":"/Users/anthony/Documents/config/flutter/.pub-cache/hosted/pub.dartlang.org/flutter_web_browser-0.11.0/","dependencies":[]},{"name":"package_info","path":"/Users/anthony/Documents/config/flutter/.pub-cache/hosted/pub.dartlang.org/package_info-0.4.0+16/","dependencies":[]},{"name":"path_provider","path":"/Users/anthony/Documents/config/flutter/.pub-cache/hosted/pub.dartlang.org/path_provider-1.3.0/","dependencies":[]},{"name":"shared_preferences","path":"/Users/anthony/Documents/config/flutter/.pub-cache/hosted/pub.dartlang.org/shared_preferences-0.5.6+3/","dependencies":[]},{"name":"sqflite","path":"/Users/anthony/Documents/config/flutter/.pub-cache/hosted/pub.dartlang.org/sqflite-1.1.6+5/","dependencies":[]},{"name":"woosignal_stripe","path":"/Users/anthony/Documents/config/flutter/.pub-cache/hosted/pub.dartlang.org/woosignal_stripe-0.0.4/","dependencies":[]}],"macos":[{"name":"shared_preferences_macos","path":"/Users/anthony/Documents/config/flutter/.pub-cache/hosted/pub.dartlang.org/shared_preferences_macos-0.0.1+6/","dependencies":[]}],"linux":[],"windows":[],"web":[{"name":"shared_preferences_web","path":"/Users/anthony/Documents/config/flutter/.pub-cache/hosted/pub.dartlang.org/shared_preferences_web-0.1.2+4/","dependencies":[]}]},"dependencyGraph":[{"name":"device_info","dependencies":[]},{"name":"flutter_money_formatter","dependencies":[]},{"name":"flutter_web_browser","dependencies":[]},{"name":"package_info","dependencies":[]},{"name":"path_provider","dependencies":[]},{"name":"shared_preferences","dependencies":["shared_preferences_macos","shared_preferences_web"]},{"name":"shared_preferences_macos","dependencies":[]},{"name":"shared_preferences_web","dependencies":[]},{"name":"sqflite","dependencies":[]},{"name":"woosignal_stripe","dependencies":[]}],"date_created":"2020-04-09 03:26:04.771408","version":"1.18.0-5.0.pre.38"}
1+
{"_info":"// This is a generated file; do not edit or check into version control.","dependencyGraph":[{"name":"device_info","dependencies":[]},{"name":"flutter_money_formatter","dependencies":[]},{"name":"flutter_web_browser","dependencies":[]},{"name":"package_info","dependencies":[]},{"name":"path_provider","dependencies":[]},{"name":"shared_preferences","dependencies":["shared_preferences_macos","shared_preferences_web"]},{"name":"shared_preferences_macos","dependencies":[]},{"name":"shared_preferences_web","dependencies":[]},{"name":"sqflite","dependencies":[]},{"name":"woosignal_stripe","dependencies":[]}]}

‎LabelStoreMax/lib/helpers/app_themes.dart‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ TextTheme textThemeAccent() {
4040
color: Colors.black,
4141
fontFamily: appFontFamily,
4242
fontWeight: FontWeight.w800),
43-
bodyText1: new TextStyle(
43+
body2: new TextStyle(
4444
color: HexColor("#606060"),
4545
fontFamily: appFontFamily,
4646
fontWeight: FontWeight.w700),
@@ -89,7 +89,7 @@ TextTheme textThemePrimary() {
8989
color: Colors.black,
9090
fontFamily: appFontFamily,
9191
fontWeight: FontWeight.w800),
92-
bodyText1: new TextStyle(
92+
body2: new TextStyle(
9393
color: HexColor("#606060"),
9494
fontFamily: appFontFamily,
9595
fontWeight: FontWeight.w700),
@@ -122,7 +122,7 @@ TextTheme textThemeMain() {
122122
headline: new TextStyle(color: Colors.black, fontFamily: appFontFamily),
123123
title: new TextStyle(color: Colors.black, fontFamily: appFontFamily),
124124
subhead: new TextStyle(color: Colors.black, fontFamily: appFontFamily),
125-
bodyText1: new TextStyle(color: Colors.black, fontFamily: appFontFamily),
125+
body2: new TextStyle(color: Colors.black, fontFamily: appFontFamily),
126126
body1: new TextStyle(color: Colors.black, fontFamily: appFontFamily),
127127
caption: new TextStyle(
128128
color: Colors.redAccent, fontSize: 16, fontFamily: appFontFamily),
@@ -142,7 +142,7 @@ TextTheme textThemeAppBar() {
142142
fontFamily: appFontFamily,
143143
fontWeight: FontWeight.w900),
144144
subhead: new TextStyle(color: Colors.black, fontFamily: appFontFamily),
145-
bodyText1: new TextStyle(color: Colors.black, fontFamily: appFontFamily),
145+
body2: new TextStyle(color: Colors.black, fontFamily: appFontFamily),
146146
body1: new TextStyle(color: Colors.black, fontFamily: appFontFamily),
147147
caption: new TextStyle(color: Colors.black, fontFamily: appFontFamily),
148148
button: new TextStyle(color: Colors.black, fontFamily: appFontFamily),

‎LabelStoreMax/lib/helpers/lifecycle_event_handler.dart‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,4 +37,4 @@ class LifecycleEventHandler extends WidgetsBindingObserver {
3737
break;
3838
}
3939
}
40-
}
40+
}

‎LabelStoreMax/lib/helpers/tools.dart‎

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -198,7 +198,11 @@ double strCal({@required String sum}) {
198198
Future<double> workoutShippingCostWC({@required String sum}) async {
199199
List<CartLineItem> cartLineItem = await Cart.getInstance.getCart();
200200
sum = sum.replaceAllMapped(defaultRegex(r'\[qty\]', strict: true), (replace) {
201-
return cartLineItem.map((f) => f.quantity).toList().reduce((i,d) => i+d).toString();
201+
return cartLineItem
202+
.map((f) => f.quantity)
203+
.toList()
204+
.reduce((i, d) => i + d)
205+
.toString();
202206
});
203207

204208
String orderTotal = await Cart.getInstance.getSubtotal();
@@ -264,7 +268,11 @@ Future<double> workoutShippingCostWC({@required String sum}) async {
264268
Future<double> workoutShippingClassCostWC(
265269
{@required String sum, List<CartLineItem> cartLineItem}) async {
266270
sum = sum.replaceAllMapped(defaultRegex(r'\[qty\]', strict: true), (replace) {
267-
return cartLineItem.map((f) => f.quantity).toList().reduce((i,d) => i+d).toString();
271+
return cartLineItem
272+
.map((f) => f.quantity)
273+
.toList()
274+
.reduce((i, d) => i + d)
275+
.toString();
268276
});
269277

270278
String orderTotal = await Cart.getInstance.getSubtotal();

‎LabelStoreMax/lib/labelconfig.dart‎

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,8 @@
2323
const app_name = "MyApp";
2424

2525
const app_key = "Your App Key";
26+
// Your App key from WooSignal
27+
// link: https://woosignal.com/dashboard/apps
2628

2729
const app_logo_url = "https://woosignal.com/images/120x120_woosignal.png";
2830

@@ -31,9 +33,15 @@ const app_privacy_url = "https://yourdomain.com/privacy";
3133

3234
/*<! ------ STRIPE (OPTIONAL) ------!>*/
3335

34-
const app_stripe_account = "Your Stripe Account"; // Your StripeAccount key from WooSignal
36+
const app_stripe_account = "Your Stripe Key";
37+
// Your StripeAccount key from WooSignal
38+
// link: https://woosignal.com/dashboard
3539

36-
const app_stripe_live_mode = false; // SET true for live payments
40+
const app_stripe_live_mode = false;
41+
// For Live Payments follow the below steps
42+
// #1 SET the above to true for live payments
43+
// #2 Next visit https://woosignal.com/dashboard
44+
// #3 Then change "Environment for Stripe" to Live mode
3745

3846
/*<! ------ APP CURRENCY ------!>*/
3947

‎LabelStoreMax/lib/pages/about.dart‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ class _AboutPageState extends State<AboutPage> {
4242
},
4343
),
4444
title: Text(trans(context, "About"),
45-
style: Theme.of(context).primaryTextTheme.subtitle1),
45+
style: Theme.of(context).primaryTextTheme.subhead),
4646
centerTitle: true,
4747
),
4848
body: SafeArea(
@@ -86,7 +86,7 @@ class _AboutPageState extends State<AboutPage> {
8686
": " +
8787
snapshot.data.version,
8888
style:
89-
Theme.of(context).primaryTextTheme.bodyText1),
89+
Theme.of(context).primaryTextTheme.body2),
9090
padding: EdgeInsets.only(top: 15, bottom: 15),
9191
);
9292
}

‎LabelStoreMax/lib/pages/browse_category.dart‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -109,7 +109,7 @@ class _BrowseCategoryPageState extends State<BrowseCategoryPage> {
109109
mainAxisAlignment: MainAxisAlignment.center,
110110
children: <Widget>[
111111
Text(trans(context, "Browse"),
112-
style: Theme.of(context).primaryTextTheme.subtitle1),
112+
style: Theme.of(context).primaryTextTheme.subhead),
113113
Text(_selectedCategory.name,
114114
style: Theme.of(context).primaryTextTheme.title)
115115
],

‎LabelStoreMax/lib/pages/browse_search.dart‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,7 @@ class _BrowseSearchState extends State<BrowseSearchPage> {
9494
mainAxisAlignment: MainAxisAlignment.center,
9595
children: <Widget>[
9696
Text(trans(context, "Search results for"),
97-
style: Theme.of(context).primaryTextTheme.subtitle1),
97+
style: Theme.of(context).primaryTextTheme.subhead),
9898
Text("\"" + _search + "\"",
9999
style: Theme.of(context).primaryTextTheme.title)
100100
],

‎LabelStoreMax/lib/pages/cart.dart‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -161,7 +161,7 @@ class _CartPageState extends State<CartPage> {
161161
child: Align(
162162
child: Padding(
163163
child: Text(trans(context, "Clear Cart"),
164-
style: Theme.of(context).primaryTextTheme.bodyText1),
164+
style: Theme.of(context).primaryTextTheme.body2),
165165
padding: EdgeInsets.only(right: 8),
166166
),
167167
alignment: Alignment.centerLeft,
@@ -190,7 +190,7 @@ class _CartPageState extends State<CartPage> {
190190
alignment: Alignment.center),
191191
Padding(
192192
child: Text(trans(context, "Empty Basket"),
193-
style: Theme.of(context).primaryTextTheme.bodyText2),
193+
style: Theme.of(context).primaryTextTheme.body1),
194194
padding: EdgeInsets.only(top: 10),
195195
)
196196
],

‎LabelStoreMax/lib/pages/checkout_confirmation.dart‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -131,7 +131,7 @@ class CheckoutConfirmationPageState extends State<CheckoutConfirmationPage> {
131131
children: <Widget>[
132132
Center(
133133
child: Text(trans(context, "Checkout"),
134-
style: Theme.of(context).primaryTextTheme.subtitle1),
134+
style: Theme.of(context).primaryTextTheme.subhead),
135135
),
136136
Expanded(
137137
child: Container(
@@ -251,7 +251,7 @@ class CheckoutConfirmationPageState extends State<CheckoutConfirmationPage> {
251251
padding: const EdgeInsets.only(top: 15),
252252
child: Text(
253253
trans(context, "One moment") + "...",
254-
style: Theme.of(context).primaryTextTheme.subtitle1,
254+
style: Theme.of(context).primaryTextTheme.subhead,
255255
),
256256
)
257257
],

0 commit comments

Comments
 (0)