Merge pull request #22 from woosignal/master

v5.5.1 - updates

Author: agordn52

LabelStoreMax/CHANGELOG.md

@@ -1,3 +1,9 @@
+## [5.5.1] - 2021-12-18
+
+* Fix bug if store connection fails
+* Minify default_shipping.json
+* Pubspec.yaml dependency updates
+
 ## [5.5.0] - 2021-12-17
 
 * Change font from WooSignal dashboard

LabelStoreMax/README.md

@@ -4,7 +4,7 @@
 
 # WooCommerce App: Label StoreMax
 
-### Label StoreMax - v5.5.0
+### Label StoreMax - v5.5.1
 
 
 [Official WooSignal WooCommerce App](https://woosignal.com)

LabelStoreMax/lib/bootstrap/app_helper.dart

@@ -13,7 +13,6 @@ import 'package:woosignal/models/response/woosignal_app.dart';
 class AppHelper {
   AppHelper._privateConstructor();
 
-  String themeType;
   static final AppHelper instance = AppHelper._privateConstructor();
 
   WooSignalApp appConfig;

LabelStoreMax/lib/bootstrap/boot.dart

@@ -43,6 +43,27 @@ Future<void> boot() async {
   ///   AppHelper.instance.fcmToken = token;
   /// }
 
+  AppHelper?.instance?.appConfig = WooSignalApp();
+  AppHelper.instance.appConfig.themeFont = "Poppins";
+  AppHelper.instance.appConfig.themeColors = {
+    'light': {
+      'background': '0xFFFFFFFF',
+      'primary_text': '0xFF000000',
+      'button_background': '0xFF529cda',
+      'button_text': '0xFFFFFFFF',
+      'app_bar_background': '0xFFFFFFFF',
+      'app_bar_text': '0xFF3a3d40',
+    },
+    'dark': {
+      'background': '0xFF212121',
+      'primary_text': '0xFFE1E1E1',
+      'button_background': '0xFFFFFFFF',
+      'button_text': '0xFF232c33',
+      'app_bar_background': '0xFF2C2C2C',
+      'app_bar_text': '0xFFFFFFFF',
+    }
+  };
+
   // WooSignal Setup
   WooSignalApp wooSignalApp = await appWooSignal((api) => api.getApp());
   Locale locale = Locale('en');

LabelStoreMax/lib/main.dart

@@ -9,7 +9,7 @@ void main() async {
   WidgetsFlutterBinding.ensureInitialized();
   Nylo nylo = await Nylo.init(router: appRouter(), setup: boot);
 
-  String initialRoute = AppHelper.instance.appConfig != null ? '/home' : '/no-connection';
+  String initialRoute = AppHelper.instance.appConfig.appStatus != null ? '/home' : '/no-connection';
 
   runApp(
     AppBuild(

LabelStoreMax/lib/resources/pages/browse_category.dart

@@ -52,6 +52,9 @@ class _BrowseCategoryPageState extends NyState<BrowseCategoryPage> {
   }
 
   _fetchMoreProducts() async {
+    if (waitForNextRequest || _shouldStopRequests) {
+      return;
+    }
     waitForNextRequest = true;
     List<WS.Product> products = await appWooSignal(
       (api) => api.getProducts(
@@ -61,14 +64,18 @@ class _BrowseCategoryPageState extends NyState<BrowseCategoryPage> {
           status: "publish",
           stockStatus: "instock"),
     );
-    _products.addAll(products);
-    waitForNextRequest = false;
-    _page = _page + 1;
 
-    waitForNextRequest = false;
     if (products.length == 0) {
       _shouldStopRequests = true;
+      setState(() {});
+      return;
+    } else {
+      _products.addAll(products);
     }
+
+    waitForNextRequest = false;
+    _page = _page + 1;
+
     setState(() {
       _isLoading = false;
     });

LabelStoreMax/lib/resources/pages/browse_search.dart

@@ -46,7 +46,11 @@ class _BrowseSearchState extends NyState<BrowseSearchPage> {
   }
 
   _fetchProductsForSearch() async {
+    if (waitForNextRequest || _shouldStopRequests) {
+      return;
+    }
     waitForNextRequest = true;
+
     List<WS.Product> products = await appWooSignal(
       (api) => api.getProducts(
         perPage: 100,
@@ -56,14 +60,19 @@ class _BrowseSearchState extends NyState<BrowseSearchPage> {
         stockStatus: "instock",
       ),
     );
-    _products.addAll(products);
-    waitForNextRequest = false;
-    _page = _page + 1;
 
-    waitForNextRequest = false;
     if (products.length == 0) {
       _shouldStopRequests = true;
+      setState(() {
+        _isLoading = false;
+      });
+      return;
+    } else {
+      _products.addAll(products);
     }
+    waitForNextRequest = false;
+    _page = _page + 1;
+
     setState(() {
       _isLoading = false;
     });

LabelStoreMax/lib/resources/pages/home.dart

@@ -31,7 +31,7 @@ class _HomePageState extends State<HomePage> {
   Widget build(BuildContext context) {
     Widget theme =
         MelloThemeWidget(globalKey: _key, wooSignalApp: _wooSignalApp);
-    if (AppHelper.instance.themeType == "notic") {
+    if (AppHelper.instance.appConfig.theme == "notic") {
       theme = NoticThemeWidget(globalKey: _key, wooSignalApp: _wooSignalApp);
     }
     return theme;

LabelStoreMax/lib/resources/pages/home_search.dart

@@ -37,7 +37,7 @@ class _HomeSearchPageState extends State<HomeSearchPage> {
     Navigator.pushNamed(context, "/product-search",
             arguments: _txtSearchController.text)
         .then((search) {
-      if (AppHelper.instance.themeType != "notic") {
+      if (AppHelper.instance.appConfig.theme != "notic") {
         Navigator.pop(context);
       }
     });

LabelStoreMax/lib/resources/pages/no_connection_page.dart

@@ -73,7 +73,6 @@ class _NoConnectionPageState extends State<NoConnectionPage> {
     }
 
     AppHelper.instance.appConfig = wooSignalApp;
-    AppHelper.instance.themeType = wooSignalApp.theme;
     Navigator.pushNamed(context, "/home");
   }
 }