Navaron Bracke

sort barcode map keys for iOS; add barcode size on iOS

@@ -29,8 +29,27 @@ extension UIDeviceOrientation { @@ -29,8 +29,27 @@ extension UIDeviceOrientation {
29 29
30 extension Barcode { 30 extension Barcode {
31 var data: [String: Any?] { 31 var data: [String: Any?] {
32 - let corners = cornerPoints?.map({$0.cgPointValue.data})  
33 - return ["corners": corners, "format": format.rawValue, "rawBytes": rawData, "rawValue": rawValue, "type": valueType.rawValue, "calendarEvent": calendarEvent?.data, "contactInfo": contactInfo?.data, "driverLicense": driverLicense?.data, "email": email?.data, "geoPoint": geoPoint?.data, "phone": phone?.data, "sms": sms?.data, "url": url?.data, "wifi": wifi?.data, "displayValue": displayValue] 32 + return [
  33 + "calendarEvent": calendarEvent?.data,
  34 + "contactInfo": contactInfo?.data,
  35 + "corners": cornerPoints?.map({$0.cgPointValue.data}),
  36 + "displayValue": displayValue,
  37 + "driverLicense": driverLicense?.data,
  38 + "email": email?.data,
  39 + "format": format.rawValue,
  40 + "geoPoint": geoPoint?.data,
  41 + "phone": phone?.data,
  42 + "rawBytes": rawData,
  43 + "rawValue": rawValue,
  44 + "size": frame.isNull ? nil : [
  45 + "width": frame.width,
  46 + "height": frame.height,
  47 + ],
  48 + "sms": sms?.data,
  49 + "type": valueType.rawValue,
  50 + "url": url?.data,
  51 + "wifi": wifi?.data,
  52 + ]
34 } 53 }
35 } 54 }
36 55