From b2073a5d59b9d945d2962967ad4feab722cdc311 Mon Sep 17 00:00:00 2001 From: QSD_faris Date: Fri, 26 Jan 2024 16:40:57 +0100 Subject: [PATCH] update example project --- .../SwiftExample.xcodeproj/project.pbxproj | 16 +-- .../xcshareddata/swiftpm/Package.resolved | 4 +- .../messenger.imageset/Contents.json | 21 +++ .../messenger.imageset/messenger-2.png | Bin 0 -> 7440 bytes .../SwiftExample/Base.lproj/Main.storyboard | 16 +-- .../SwiftExample/ViewController.swift | 23 ++- .../SwiftExample/SwiftExample/error_page.html | 131 ++++++++++++++++++ 7 files changed, 179 insertions(+), 32 deletions(-) create mode 100644 Examples/SwiftExample/SwiftExample/Assets.xcassets/messenger.imageset/Contents.json create mode 100644 Examples/SwiftExample/SwiftExample/Assets.xcassets/messenger.imageset/messenger-2.png create mode 100644 Examples/SwiftExample/SwiftExample/error_page.html diff --git a/Examples/SwiftExample/SwiftExample.xcodeproj/project.pbxproj b/Examples/SwiftExample/SwiftExample.xcodeproj/project.pbxproj index 434a789..241f68b 100644 --- a/Examples/SwiftExample/SwiftExample.xcodeproj/project.pbxproj +++ b/Examples/SwiftExample/SwiftExample.xcodeproj/project.pbxproj @@ -13,7 +13,7 @@ 5E19F59B2B477AE400E37F55 /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 5E19F5992B477AE400E37F55 /* Main.storyboard */; }; 5E19F59D2B477AE400E37F55 /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 5E19F59C2B477AE400E37F55 /* Assets.xcassets */; }; 5E19F5A02B477AE400E37F55 /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 5E19F59E2B477AE400E37F55 /* LaunchScreen.storyboard */; }; - 5EA7B6F02B549B6200C9B3AC /* messenger-sdk-ios in Frameworks */ = {isa = PBXBuildFile; productRef = 5EA7B6EF2B549B6200C9B3AC /* messenger-sdk-ios */; }; + 5ED8E9D92B64072C0007CD34 /* messenger-sdk-ios in Frameworks */ = {isa = PBXBuildFile; productRef = 5ED8E9D82B64072C0007CD34 /* messenger-sdk-ios */; }; /* End PBXBuildFile section */ /* Begin PBXCopyFilesBuildPhase section */ @@ -45,7 +45,7 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - 5EA7B6F02B549B6200C9B3AC /* messenger-sdk-ios in Frameworks */, + 5ED8E9D92B64072C0007CD34 /* messenger-sdk-ios in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -100,7 +100,7 @@ ); name = SwiftExample; packageProductDependencies = ( - 5EA7B6EF2B549B6200C9B3AC /* messenger-sdk-ios */, + 5ED8E9D82B64072C0007CD34 /* messenger-sdk-ios */, ); productName = SwiftExample; productReference = 5E19F5902B477AE400E37F55 /* SwiftExample.app */; @@ -131,7 +131,7 @@ ); mainGroup = 5E19F5872B477AE400E37F55; packageReferences = ( - 5EA7B6EE2B549B6200C9B3AC /* XCRemoteSwiftPackageReference "messenger-sdk-ios" */, + 5ED8E9D72B64072C0007CD34 /* XCRemoteSwiftPackageReference "messenger-sdk-ios" */, ); productRefGroup = 5E19F5912B477AE400E37F55 /* Products */; projectDirPath = ""; @@ -384,20 +384,20 @@ /* End XCConfigurationList section */ /* Begin XCRemoteSwiftPackageReference section */ - 5EA7B6EE2B549B6200C9B3AC /* XCRemoteSwiftPackageReference "messenger-sdk-ios" */ = { + 5ED8E9D72B64072C0007CD34 /* XCRemoteSwiftPackageReference "messenger-sdk-ios" */ = { isa = XCRemoteSwiftPackageReference; repositoryURL = "https://github.com/deskpro/messenger-sdk-ios.git"; requirement = { kind = upToNextMajorVersion; - minimumVersion = 0.0.4; + minimumVersion = 0.0.5; }; }; /* End XCRemoteSwiftPackageReference section */ /* Begin XCSwiftPackageProductDependency section */ - 5EA7B6EF2B549B6200C9B3AC /* messenger-sdk-ios */ = { + 5ED8E9D82B64072C0007CD34 /* messenger-sdk-ios */ = { isa = XCSwiftPackageProductDependency; - package = 5EA7B6EE2B549B6200C9B3AC /* XCRemoteSwiftPackageReference "messenger-sdk-ios" */; + package = 5ED8E9D72B64072C0007CD34 /* XCRemoteSwiftPackageReference "messenger-sdk-ios" */; productName = "messenger-sdk-ios"; }; /* End XCSwiftPackageProductDependency section */ diff --git a/Examples/SwiftExample/SwiftExample.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved b/Examples/SwiftExample/SwiftExample.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved index c325792..e293daa 100644 --- a/Examples/SwiftExample/SwiftExample.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved +++ b/Examples/SwiftExample/SwiftExample.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved @@ -5,8 +5,8 @@ "kind" : "remoteSourceControl", "location" : "https://github.com/deskpro/messenger-sdk-ios.git", "state" : { - "revision" : "acd128d826940bf1ef4fbd551cc5afd5369196b9", - "version" : "0.0.4" + "revision" : "819692434d517e650d8c0b779760b6d5b764a45e", + "version" : "0.0.5" } } ], diff --git a/Examples/SwiftExample/SwiftExample/Assets.xcassets/messenger.imageset/Contents.json b/Examples/SwiftExample/SwiftExample/Assets.xcassets/messenger.imageset/Contents.json new file mode 100644 index 0000000..be4d3f4 --- /dev/null +++ b/Examples/SwiftExample/SwiftExample/Assets.xcassets/messenger.imageset/Contents.json @@ -0,0 +1,21 @@ +{ + "images" : [ + { + "filename" : "messenger-2.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "idiom" : "universal", + "scale" : "2x" + }, + { + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/Examples/SwiftExample/SwiftExample/Assets.xcassets/messenger.imageset/messenger-2.png b/Examples/SwiftExample/SwiftExample/Assets.xcassets/messenger.imageset/messenger-2.png new file mode 100644 index 0000000000000000000000000000000000000000..deebb4344c8a04eaad721daedac1e5d638514895 GIT binary patch literal 7440 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 O0000 + @@ -34,33 +35,18 @@ - - - - diff --git a/Examples/SwiftExample/SwiftExample/ViewController.swift b/Examples/SwiftExample/SwiftExample/ViewController.swift index b7f092b..3803dba 100644 --- a/Examples/SwiftExample/SwiftExample/ViewController.swift +++ b/Examples/SwiftExample/SwiftExample/ViewController.swift @@ -10,12 +10,10 @@ import DeskproFramework class ViewController: UIViewController { - @IBOutlet weak var openBtn: UIButton! @IBOutlet weak var testBtn: UIButton! @IBOutlet weak var testLbl: UILabel! - //let messengerConfig = MessengerConfig(appUrl: "http://178.62.74.147:3001/d/", appId: "B0ED0B34-8507-4248-8738-0B0D80A6F7E9") - let messengerConfig = MessengerConfig(appUrl: "https://dev-pr-12670.earthly.deskprodemo.com/deskpro-messenger/deskpro/1/d/", appId: "") + let messengerConfig = MessengerConfig(appUrl: "https://dev-pr-12730.earthly.deskprodemo.com/deskpro-messenger/deskpro/1/d/", appId: "1") var messenger: DeskPro? @@ -23,14 +21,25 @@ class ViewController: UIViewController { super.viewDidLoad() messenger = DeskPro(messengerConfig: messengerConfig, containingViewController: self) + + setupLauncherButton() + } + + @IBAction func testTapped(_ sender: Any) { + testLbl.text = messenger?.test() } - @IBAction func openTapped(_ sender: Any) { - messenger?.present().show() + private func setupLauncherButton() { + let floatingBtn = DeskproButton() + floatingBtn.setColor(.systemBlue) + floatingBtn.setImage(named: "messenger", color: .white) + floatingBtn.addTarget(self, action: #selector(floatingBtnnTapped), for: .touchUpInside) + self.view.addSubview(floatingBtn) + floatingBtn.setPosition(.bottomRight, inView: self.view) } - @IBAction func testTapped(_ sender: Any) { - testLbl.text = messenger?.test() + @objc private func floatingBtnnTapped() { + messenger?.present().show() } } diff --git a/Examples/SwiftExample/SwiftExample/error_page.html b/Examples/SwiftExample/SwiftExample/error_page.html new file mode 100644 index 0000000..c4662ad --- /dev/null +++ b/Examples/SwiftExample/SwiftExample/error_page.html @@ -0,0 +1,131 @@ + + + + + + + + +
+ +

Loading...

+
+
+ +
⚠
+

Something's gone wrong

+

Content could not be loaded

+ +
+ + +