From 839ff9987877c70bc86e8d7f231f64dd388fcfa5 Mon Sep 17 00:00:00 2001 From: Anthony Date: Sat, 18 Dec 2021 15:11:09 +0000 Subject: [PATCH 1/3] v5.5.2 - updates --- LabelStoreMax/CHANGELOG.md | 6 ++++++ LabelStoreMax/README.md | 2 +- LabelStoreMax/lib/bootstrap/boot.dart | 1 - LabelStoreMax/lib/resources/pages/browse_category.dart | 1 + LabelStoreMax/lib/resources/widgets/buttons.dart | 5 +++-- LabelStoreMax/pubspec.yaml | 2 +- README.md | 2 +- 7 files changed, 13 insertions(+), 6 deletions(-) diff --git a/LabelStoreMax/CHANGELOG.md b/LabelStoreMax/CHANGELOG.md index 3810aad..57f359a 100644 --- a/LabelStoreMax/CHANGELOG.md +++ b/LabelStoreMax/CHANGELOG.md @@ -1,3 +1,9 @@ +## [5.5.2] - 2021-12-18 + +* Fix continuous loading on categories screen +* Add theme color to buttons +* Add theme color to buttons + ## [5.5.1] - 2021-12-18 * Fix bug if store connection fails diff --git a/LabelStoreMax/README.md b/LabelStoreMax/README.md index ad864ef..fa032d8 100644 --- a/LabelStoreMax/README.md +++ b/LabelStoreMax/README.md @@ -4,7 +4,7 @@ # WooCommerce App: Label StoreMax -### Label StoreMax - v5.5.1 +### Label StoreMax - v5.5.2 [Official WooSignal WooCommerce App](https://woosignal.com) diff --git a/LabelStoreMax/lib/bootstrap/boot.dart b/LabelStoreMax/lib/bootstrap/boot.dart index 193b3bd..f6250e8 100644 --- a/LabelStoreMax/lib/bootstrap/boot.dart +++ b/LabelStoreMax/lib/bootstrap/boot.dart @@ -1,6 +1,5 @@ // import 'package:firebase_core/firebase_core.dart'; // import 'package:firebase_messaging/firebase_messaging.dart'; -// import 'package:flutter_app/firebase_options.dart'; import 'package:flutter/material.dart'; import 'package:flutter/services.dart'; import 'package:flutter_app/bootstrap/app_helper.dart'; diff --git a/LabelStoreMax/lib/resources/pages/browse_category.dart b/LabelStoreMax/lib/resources/pages/browse_category.dart index bbfc3c1..9afb936 100644 --- a/LabelStoreMax/lib/resources/pages/browse_category.dart +++ b/LabelStoreMax/lib/resources/pages/browse_category.dart @@ -67,6 +67,7 @@ class _BrowseCategoryPageState extends NyState { if (products.length == 0) { _shouldStopRequests = true; + _isLoading = false; setState(() {}); return; } else { diff --git a/LabelStoreMax/lib/resources/widgets/buttons.dart b/LabelStoreMax/lib/resources/widgets/buttons.dart index 2895a6e..bde64db 100644 --- a/LabelStoreMax/lib/resources/widgets/buttons.dart +++ b/LabelStoreMax/lib/resources/widgets/buttons.dart @@ -9,6 +9,7 @@ // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. import 'package:flutter/material.dart'; +import 'package:flutter_app/bootstrap/helpers.dart'; import 'package:hexcolor/hexcolor.dart'; class PrimaryButton extends StatelessWidget { @@ -29,8 +30,8 @@ class PrimaryButton extends StatelessWidget { textStyle: Theme.of(context) .textTheme .button - .copyWith(fontSize: 16, fontWeight: FontWeight.bold, color: Colors.white), - bgColor: HexColor("#529cda"), + .copyWith(fontSize: 16, fontWeight: FontWeight.bold, color: ThemeColor.get(context).buttonPrimaryContent), + bgColor: ThemeColor.get(context).buttonBackground, ); } diff --git a/LabelStoreMax/pubspec.yaml b/LabelStoreMax/pubspec.yaml index d4ba479..6f6675a 100644 --- a/LabelStoreMax/pubspec.yaml +++ b/LabelStoreMax/pubspec.yaml @@ -1,7 +1,7 @@ # Official WooSignal App Template for WooCommerce # Label StoreMax -# Version: 5.5.1 +# Version: 5.5.2 # Author: Anthony Gordon # Homepage: https://woosignal.com # Documentation: https://woosignal.com/docs/app/label-storemax diff --git a/README.md b/README.md index e90668c..ae1a072 100644 --- a/README.md +++ b/README.md @@ -4,7 +4,7 @@ # WooCommerce App: Label StoreMax -### Label StoreMax - v5.5.1 +### Label StoreMax - v5.5.2 [Official WooSignal WooCommerce App](https://woosignal.com) From 79404b938e2ed53e67a4d1009a449786c9df115b Mon Sep 17 00:00:00 2001 From: Anthony Date: Sat, 18 Dec 2021 15:18:17 +0000 Subject: [PATCH 2/3] Update CHANGELOG --- LabelStoreMax/CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/LabelStoreMax/CHANGELOG.md b/LabelStoreMax/CHANGELOG.md index 57f359a..6afbab4 100644 --- a/LabelStoreMax/CHANGELOG.md +++ b/LabelStoreMax/CHANGELOG.md @@ -2,7 +2,7 @@ * Fix continuous loading on categories screen * Add theme color to buttons -* Add theme color to buttons +* Code tidy ## [5.5.1] - 2021-12-18 From d7a38cb95eb5cdbbb8e4bf3f18acf678595a5ca0 Mon Sep 17 00:00:00 2001 From: Anthony Date: Sat, 18 Dec 2021 15:19:03 +0000 Subject: [PATCH 3/3] Update CHANGELOG --- LabelStoreMax/CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/LabelStoreMax/CHANGELOG.md b/LabelStoreMax/CHANGELOG.md index 6afbab4..6fa2fc2 100644 --- a/LabelStoreMax/CHANGELOG.md +++ b/LabelStoreMax/CHANGELOG.md @@ -2,7 +2,7 @@ * Fix continuous loading on categories screen * Add theme color to buttons -* Code tidy +* Code cleanup ## [5.5.1] - 2021-12-18