Skip to content

Commit 4dc9a3e

Browse files
committed
Merge branch 'release/1.4.0'
2 parents a9d19b3 + 2234061 commit 4dc9a3e

File tree

3 files changed

+11
-7
lines changed

3 files changed

+11
-7
lines changed

Sources/Pam/flex/FlexParser.swift

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
//
77

88
import Foundation
9+
import UIKit
910

1011
public class PView {
1112
var props: [String: String] = [:]
@@ -212,7 +213,6 @@ extension String {
212213
guard let doubleValue = Double(self) else {
213214
return nil
214215
}
215-
216-
return CGFloat(doubleValue)
216+
return doubleValue
217217
}
218218
}

Sources/Pam/noti/models/PamPushMessage.swift

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -47,10 +47,13 @@ public struct PamPushMessage {
4747
let date = item["created_date"] as? String
4848
let isRead = item["is_open"] as? Bool
4949
var bannerUrl: String?
50+
_ = bannerUrl;
5051

51-
if let flexView = FlexParser.shared.parse(flex: flex) as? PContainer {
52-
if let img = flexView.childs[0] as? PImage {
53-
bannerUrl = img.props["src"]
52+
if let flex = flex {
53+
if let flexView = FlexParser.shared.parse(flex: flex) as? PContainer {
54+
if let img = flexView.childs[0] as? PImage {
55+
bannerUrl = img.props["src"]
56+
}
5457
}
5558
}
5659

Sources/Pam/trackingConsent/cells/table_cells.xib

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="18122" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
2+
<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="20037" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
33
<device id="retina6_1" orientation="portrait" appearance="light"/>
44
<dependencies>
5-
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="18093"/>
5+
<deployment identifier="iOS"/>
6+
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="20020"/>
67
<capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
78
</dependencies>
89
<objects>

0 commit comments

Comments
 (0)