Skip to content

Commit

Permalink
0.1.12
Browse files Browse the repository at this point in the history
Fixed layout of New Conversation button for iPhone X
check if supporter has avatar
  • Loading branch information
soyombo-baterdene committed May 24, 2019
1 parent 07a19cd commit 42f40a3
Show file tree
Hide file tree
Showing 7 changed files with 13 additions and 7 deletions.
2 changes: 1 addition & 1 deletion ErxesSDK.podspec
@@ -1,7 +1,7 @@

Pod::Spec.new do |s|
s.name = 'ErxesSDK'
s.version = '0.1.11'
s.version = '0.1.12'
s.summary = 'A short description of erxes-ios-sdk.'
s.swift_version = '4.0'
s.description = 'erxes for IOS SDK, for integrating erxes into your iOS application https://erxes.io/'
Expand Down
2 changes: 1 addition & 1 deletion ErxesSDK/Assets/Erxes.storyboard
Expand Up @@ -883,7 +883,7 @@
</prototypes>
</tableView>
<view tag="1" contentMode="scaleToFill" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="mCA-Iy-s2S">
<rect key="frame" x="40" y="466" width="240" height="40"/>
<rect key="frame" x="40" y="425" width="240" height="40"/>
<autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMaxX="YES" flexibleMinY="YES"/>
<subviews>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" fixedFrame="YES" text="" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="b7u-Y4-cSW">
Expand Down
4 changes: 3 additions & 1 deletion ErxesSDK/Classes/Views/ChatVCMessage.swift
Expand Up @@ -43,7 +43,9 @@ public class ChatVCMessage: UIViewController {

var str = ""
let now = Utils.now()

if supporterAvatar == nil || supporterAvatar.count == 0{
supporterAvatar = "avatar.png"
}
if msgGreetings.count > 0, conversationId == nil {
str = "<div class=\"row\"><div class=\"img\"><img src=\"\(supporterAvatar!)\"/></div><div class=\"text\"><a>\(msgGreetings ?? "")</a></div><div class=\"date\">\(now!)</div></div>"
}
Expand Down
2 changes: 1 addition & 1 deletion Example/ErxesSDK/Info.plist
Expand Up @@ -15,7 +15,7 @@
<key>CFBundlePackageType</key>
<string>APPL</string>
<key>CFBundleShortVersionString</key>
<string>0.1.10</string>
<string>0.1.12</string>
<key>CFBundleSignature</key>
<string>????</string>
<key>CFBundleVersion</key>
Expand Down
6 changes: 5 additions & 1 deletion Example/ErxesSDK/ViewController.swift
Expand Up @@ -21,7 +21,11 @@ class ViewController: UIViewController {
}

@IBAction func btnClick(){
Erxes.start()

var messengerData = [String:Any]()
messengerData["user data"] = "what ever you want"
Erxes.start(email: "", phone: "", data: messengerData)

}

@IBAction func close(){
Expand Down

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 comments on commit 42f40a3

Please sign in to comment.