Merge pull request #12 from woosignal/master

v3.2.0 updates

Author: agordn52

CHANGELOG.md

@@ -1,3 +1,9 @@
+## [3.2.0] - 2022-11-03
+
+* Add Menu Links to `WooSignalApp` class
+* Fix expected API return types for Dimension
+* Dependency updates
+
 ## [3.1.1] - 2022-08-29
 
 * Dependency updates

README.md

@@ -15,7 +15,7 @@ In your flutter project add the dependency:
 ``` dart 
 dependencies:
   ...
-  woosignal: ^3.1.1
+  woosignal: ^3.2.0
 ```
 
 ### Usage example #

lib/models/menu_link.dart

@@ -0,0 +1,34 @@
+// Copyright (c) 2022, WooSignal Ltd.
+// All rights reserved.
+//
+// Redistribution and use in source and binary forms are permitted
+// provided that the above copyright notice and this paragraph are
+// duplicated in all such forms and that any documentation,
+// advertising materials, and other materials related to such
+// distribution and use acknowledge that the software was developed
+// by the WooSignal. The name of the
+// WooSignal may not be used to endorse or promote products derived
+// from this software without specific prior written permission.
+// THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR
+// IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
+// WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
+
+class MenuLink {
+  late String label;
+  late String linkUrl;
+  late String iconUrl;
+  late int order;
+
+  MenuLink(
+      {required this.label,
+      required this.linkUrl,
+      required this.iconUrl,
+      required this.order});
+
+  MenuLink.fromJson(Map<String, dynamic> json) {
+    label = json['label'];
+    linkUrl = json['link_url'];
+    iconUrl = json['icon_url'];
+    order = json['order'];
+  }
+}

lib/models/response/dimension.dart

@@ -0,0 +1,32 @@
+// Copyright (c) 2022, WooSignal Ltd.
+// All rights reserved.
+//
+// Redistribution and use in source and binary forms are permitted
+// provided that the above copyright notice and this paragraph are
+// duplicated in all such forms and that any documentation,
+// advertising materials, and other materials related to such
+// distribution and use acknowledge that the software was developed
+// by the WooSignal. The name of the
+// WooSignal may not be used to endorse or promote products derived
+// from this software without specific prior written permission.
+// THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR
+// IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
+// WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
+
+class Dimension {
+  final String? length;
+  final String? width;
+  final String? height;
+
+  Dimension(this.length, this.height, this.width);
+
+  Dimension.fromJson(Map<String, dynamic> json)
+      : length =
+            json['length'] is int ? json['length'].toString() : json['length'],
+        width = json['width'] is int ? json['width'].toString() : json['width'],
+        height =
+            json['height'] is int ? json['height'].toString() : json['height'];
+
+  Map<String, dynamic> toJson() =>
+      {'length': length, 'width': width, 'height': height};
+}

lib/models/response/product_tag.dart

@@ -37,18 +37,18 @@ class ProductTag {
     slug = json['slug'];
     description = json['description'];
     count = json['count'];
-    links = json['_links'] != null ? new Links.fromJson(json['_links']) : null;
+    links = json['_links'] != null ? Links.fromJson(json['_links']) : null;
   }
 
   Map<String, dynamic> toJson() {
-    final Map<String, dynamic> data = new Map<String, dynamic>();
-    data['id'] = this.id;
-    data['name'] = this.name;
-    data['slug'] = this.slug;
-    data['description'] = this.description;
-    data['count'] = this.count;
-    if (this.links != null) {
-      data['_links'] = this.links!.toJson();
+    final Map<String, dynamic> data = <String, dynamic>{};
+    data['id'] = id;
+    data['name'] = name;
+    data['slug'] = slug;
+    data['description'] = description;
+    data['count'] = count;
+    if (links != null) {
+      data['_links'] = links!.toJson();
     }
     return data;
   }

lib/models/response/product_variation.dart

@@ -14,6 +14,7 @@
 // WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
 
 import 'package:woosignal/models/image.dart';
+import 'package:woosignal/models/response/dimension.dart';
 
 import '../meta_data.dart';
 
@@ -160,22 +161,6 @@ class Category {
       };
 }
 
-class Dimension {
-  final String? length;
-  final String? width;
-  final String? height;
-
-  Dimension(this.length, this.height, this.width);
-
-  Dimension.fromJson(Map<String, dynamic> json)
-      : length = json['length'],
-        width = json['width'],
-        height = json['height'];
-
-  Map<String, dynamic> toJson() =>
-      {'length': length, 'width': width, 'height': height};
-}
-
 class Attribute {
   final int? id;
   final String? name;

lib/models/response/products.dart

@@ -14,6 +14,7 @@
 // WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
 
 import 'package:woosignal/models/image.dart';
+import 'package:woosignal/models/response/dimension.dart';
 
 import '../meta_data.dart';
 
@@ -174,7 +175,9 @@ class Product {
         backordersAllowed = json['backorders_allowed'],
         backordered = json['backordered'],
         soldIndividually = json['sold_individually'],
-        weight = json['weight'],
+        weight = (json['weight'] is double
+            ? json['weight'].toString()
+            : json['weight']),
         dimensions = Dimension.fromJson(json['dimensions']),
         shippingRequired = json['shipping_required'],
         shippingTaxable = json['shipping_taxable'],
@@ -257,22 +260,6 @@ class Category {
       };
 }
 
-class Dimension {
-  final String? length;
-  final String? width;
-  final String? height;
-
-  Dimension(this.length, this.height, this.width);
-
-  Dimension.fromJson(Map<String, dynamic> json)
-      : length = json['length'],
-        width = json['width'],
-        height = json['height'];
-
-  Map<String, dynamic> toJson() =>
-      {'length': length, 'width': width, 'height': height};
-}
-
 class Attribute {
   final int? id;
   final String? name;

lib/models/response/woosignal_app.dart

@@ -13,6 +13,8 @@
 // IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
 // WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
 
+import 'package:woosignal/models/menu_link.dart';
+
 class WooSignalApp {
   String? appName;
   String? appLogo;
@@ -46,6 +48,7 @@ class WooSignalApp {
   String? stripeCountryCode;
   String? themeFont;
   Map<String, dynamic>? socialLinks;
+  List<MenuLink> menuLinks = [];
   Map<String, dynamic>? themeColors;
 
   WooSignalApp(
@@ -78,6 +81,7 @@ class WooSignalApp {
       this.wishlistEnabled,
       this.themeFont,
       this.socialLinks,
+      this.menuLinks = const [],
       this.themeColors});
 
   WooSignalApp.fromJson(Map<String, dynamic> json) {
@@ -147,6 +151,11 @@ class WooSignalApp {
         json['theme_colors'] is Map<String, dynamic>?) {
       themeColors = json['theme_colors'];
     }
+    if (json.containsKey('menu_links')) {
+      menuLinks = List.from(json['menu_links'])
+          .map((bet) => MenuLink.fromJson(bet))
+          .toList();
+    }
   }
 
   Map<String, dynamic> toJson() {

lib/networking/api_provider.dart

@@ -36,8 +36,8 @@ class ApiProvider {
       AndroidDeviceInfo androidDeviceInfo = await deviceInfo.androidInfo;
       _deviceMeta = {
         "model": androidDeviceInfo.device,
-        "brand": androidDeviceInfo.brand
-            ?.replaceAll(RegExp('[^\u0001-\u007F]'), '_'),
+        "brand":
+            androidDeviceInfo.brand.replaceAll(RegExp('[^\u0001-\u007F]'), '_'),
         "manufacturer": androidDeviceInfo.manufacturer,
         "version": androidDeviceInfo.version.sdkInt.toString(),
         "uuid": uuid,

lib/woosignal.dart

@@ -53,7 +53,7 @@ import 'package:woosignal/models/response/setting_option_batch.dart';
 import 'package:woosignal/models/response/product_batch.dart';
 
 /// WooSignal Package version
-const String wooSignalVersion = "3.1.1";
+const String wooSignalVersion = "3.2.0";
 
 class WooSignal {
   WooSignal._privateConstructor();