Merge pull request #23 from woosignal/master

v5.5.2 - updates

Author: agordn52

LabelStoreMax/CHANGELOG.md

@@ -1,3 +1,9 @@
+## [5.5.2] - 2021-12-18
+
+* Fix continuous loading on categories screen
+* Add theme color to buttons
+* Code cleanup
+
 ## [5.5.1] - 2021-12-18
 
 * Fix bug if store connection fails

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)

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';

LabelStoreMax/lib/resources/pages/browse_category.dart

@@ -67,6 +67,7 @@ class _BrowseCategoryPageState extends NyState<BrowseCategoryPage> {
 
     if (products.length == 0) {
       _shouldStopRequests = true;
+      _isLoading = false;
       setState(() {});
       return;
     } else {

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,
       );
 }
 

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

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)