v2.0.8 Added pull to refresh, Pubspec.yaml updates, Bug fixes

woosignal · Jun 4, 2020 · c70f9d0 · c70f9d0
1 parent cf33609
commit c70f9d0
Show file tree

Hide file tree

Showing 11 changed files with 42 additions and 33 deletions.
diff --git a/LabelStoreMax/CHANGELOG.md b/LabelStoreMax/CHANGELOG.md
@@ -1,3 +1,9 @@
+## [2.0.8] - 2020-06-04
+
+* Added pull to refresh
+* Pubspec.yaml updates
+* Bug fixes
+
 ## [2.0.7] - 2020-05-26
 
 * New default locales added for Spanish, German, French, Hindi, Italian, Portuguese

diff --git a/LabelStoreMax/lib/app_payment_methods.dart b/LabelStoreMax/lib/app_payment_methods.dart
@@ -58,4 +58,4 @@ List<PaymentType> arrPaymentMethods = [
 //      pay: myCustomPaymentFunction
 //    ),
 //  ),
-];
+].where((e) => e != null).toList();
diff --git a/LabelStoreMax/lib/helpers/tools.dart b/LabelStoreMax/lib/helpers/tools.dart
@@ -479,7 +479,7 @@ Widget refreshableScroll(context,
     @required onTap,
     key}) {
   return SmartRefresher(
-    enablePullDown: false,
+    enablePullDown: true,
     enablePullUp: true,
     footer: CustomFooter(
       builder: (BuildContext context, LoadStatus mode) {

diff --git a/LabelStoreMax/lib/labelconfig.dart b/LabelStoreMax/lib/labelconfig.dart
@@ -16,7 +16,7 @@ import 'dart:ui';
  Developer Notes
 
  SUPPORT EMAIL - [email protected]
- VERSION - 2.0.7
+ VERSION - 2.0.8
  https://woosignal.com
  */
 

diff --git a/LabelStoreMax/lib/pages/account_order_detail.dart b/LabelStoreMax/lib/pages/account_order_detail.dart
@@ -77,7 +77,9 @@ class _AccountOrderDetailPageState extends State<AccountOrderDetailPage> {
                       crossAxisAlignment: CrossAxisAlignment.start,
                       mainAxisAlignment: MainAxisAlignment.spaceBetween,
                       children: <Widget>[
-                        Flexible(child: Text("${capitalize(trans(context, "Ships to"))}:")),
+                        Flexible(
+                            child: Text(
+                                "${capitalize(trans(context, "Ships to"))}:")),
                         Flexible(
                           child: Text(
                             [
@@ -152,13 +154,15 @@ class _AccountOrderDetailPageState extends State<AccountOrderDetailPage> {
                                   children: <Widget>[
                                     Text(
                                       formatStringCurrency(
-                                          total: _order.lineItems[i].total,),
+                                        total: _order.lineItems[i].total,
+                                      ),
                                       style: Theme.of(context)
                                           .primaryTextTheme
                                           .bodyText2
                                           .copyWith(
-                                              fontWeight: FontWeight.w600,
-                                              color: Colors.black,),
+                                            fontWeight: FontWeight.w600,
+                                            color: Colors.black,
+                                          ),
                                       textAlign: TextAlign.left,
                                     ),
                                     Text(
@@ -169,8 +173,9 @@ class _AccountOrderDetailPageState extends State<AccountOrderDetailPage> {
                                           .primaryTextTheme
                                           .bodyText1
                                           .copyWith(
-                                              fontWeight: FontWeight.w600,
-                                              color: Colors.black,),
+                                            fontWeight: FontWeight.w600,
+                                            color: Colors.black,
+                                          ),
                                       textAlign: TextAlign.left,
                                     ),
                                   ],

diff --git a/LabelStoreMax/lib/pages/browse_category.dart b/LabelStoreMax/lib/pages/browse_category.dart
@@ -120,13 +120,12 @@ class _BrowseCategoryPageState extends State<BrowseCategoryPage> {
   }
 
   void _onRefresh() async {
+    _products = [];
+    _page = 1;
+    _shouldStopRequests = false;
+    waitForNextRequest = false;
     await _fetchMoreProducts();
-    setState(() {});
-    if (_shouldStopRequests) {
-      _refreshController.resetNoData();
-    } else {
-      _refreshController.refreshCompleted();
-    }
+    _refreshController.refreshCompleted();
   }
 
   void _onLoading() async {

diff --git a/LabelStoreMax/lib/pages/browse_search.dart b/LabelStoreMax/lib/pages/browse_search.dart
@@ -108,13 +108,12 @@ class _BrowseSearchState extends State<BrowseSearchPage> {
   }
 
   void _onRefresh() async {
+    _products = [];
+    _page = 1;
+    _shouldStopRequests = false;
+    waitForNextRequest = false;
     await _fetchProductsForSearch();
-    setState(() {});
-    if (_shouldStopRequests) {
-      _refreshController.resetNoData();
-    } else {
-      _refreshController.refreshCompleted();
-    }
+    _refreshController.refreshCompleted();
   }
 
   void _onLoading() async {

diff --git a/LabelStoreMax/lib/pages/checkout_confirmation.dart b/LabelStoreMax/lib/pages/checkout_confirmation.dart
@@ -219,7 +219,8 @@ class CheckoutConfirmationPageState extends State<CheckoutConfirmationPage> {
                                   leadTitle: (CheckoutSession.getInstance
                                           .billingDetails.billingAddress
                                           .hasMissingFields()
-                                      ? trans(context, "Billing address is incomplete")
+                                      ? trans(
+                                          context, "Billing address is incomplete")
                                       : CheckoutSession.getInstance
                                           .billingDetails.billingAddress
                                           .addressFull()),

diff --git a/LabelStoreMax/lib/pages/home.dart b/LabelStoreMax/lib/pages/home.dart
@@ -193,13 +193,12 @@ class _HomePageState extends State<HomePage> {
   }
 
   void _onRefresh() async {
+    _products = [];
+    _page = 1;
+    _shouldStopRequests = false;
+    waitForNextRequest = false;
     await _fetchMoreProducts();
-    setState(() {});
-    if (_shouldStopRequests) {
-      _refreshController.resetNoData();
-    } else {
-      _refreshController.refreshCompleted();
-    }
+    _refreshController.refreshCompleted();
   }
 
   void _onLoading() async {

diff --git a/LabelStoreMax/pubspec.lock b/LabelStoreMax/pubspec.lock
@@ -550,7 +550,7 @@ packages:
       name: woosignal
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.0.8"
+    version: "1.0.9"
   woosignal_stripe:
     dependency: "direct main"
     description:
@@ -564,7 +564,7 @@ packages:
       name: wp_json_api
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "0.1.2"
+    version: "0.1.3"
   xml:
     dependency: transitive
     description:

diff --git a/LabelStoreMax/pubspec.yaml b/LabelStoreMax/pubspec.yaml
@@ -1,5 +1,5 @@
 # Label StoreMax
-# Version 2.0.7
+# Version 2.0.8
 #authors: - "Anthony Gordon"
 #documentation: https://woosignal.com/docs/app/ios/label-storemax
 #homepage: https://woosignal.com/
@@ -24,10 +24,10 @@ environment:
   sdk: ">=2.1.0 <3.0.0"
 
 dependencies:
-  woosignal: ^1.0.8
+  woosignal: ^1.0.9
   woosignal_stripe: ^0.0.4
   razorpay_flutter: ^1.2.1
-  wp_json_api: ^0.1.2
+  wp_json_api: ^0.1.3
   shared_preferences: ^0.5.7+3
   cached_network_image: ^2.2.0+1
   page_transition: ^1.1.5
-Original file line number
+Diff line change
@@ Expand Up / @@ -58,4 +58,4 @@ List<PaymentType> arrPaymentMethods = [ @@
     //      pay: myCustomPaymentFunction
     //    ),
     //  ),
-    ];
+    ].where((e) => e != null).toList();