Skip to content

Commit

Permalink
Merge pull request #19 from Teknasyon-Teknoloji/dependency-update
Browse files Browse the repository at this point in the history
Dependency update
  • Loading branch information
osmanyildirim authored Nov 5, 2024
2 parents 1d4ae24 + 6cf9456 commit 81d4980
Show file tree
Hide file tree
Showing 5 changed files with 57 additions and 212 deletions.
8 changes: 4 additions & 4 deletions Desk360LiveChat.podspec
Original file line number Diff line number Diff line change
@@ -1,20 +1,20 @@
Pod::Spec.new do |s|
s.name = "Desk360LiveChat"
s.version = "1.0.9"
s.version = "1.1.0"
s.summary = "Desk360 Live Chat provides simplicity and usability in one place. With this feature, you can provide live support to your customers directly within your app just by writing a few lines of code."
s.homepage = "https://github.com/Teknasyon-Teknoloji/desk360-livechat-ios-sdk"
s.license = { :type => "Commercial", :file => "LICENSE" }
s.author = { "Teknasyon" => "http://www.teknasyon.com/" }
s.source = { :git => "https://github.com/Teknasyon-Teknoloji/desk360-livechat-ios-sdk.git", :tag => s.version.to_s }
s.swift_version = "5.1"
s.ios.deployment_target = "12.0"
s.ios.deployment_target = "13.0"
s.source_files = "Sources/**/*.swift"

s.dependency 'Alamofire', '~> 5.0'
s.dependency 'Alamofire'
s.dependency 'PersistenceKit'
s.dependency 'Firebase/Database'
s.dependency 'Firebase/Auth'
s.dependency 'Firebase', '~> 8.15.0'
s.dependency 'Firebase'
s.dependency 'NVActivityIndicatorView'
s.dependency 'Kingfisher'

Expand Down
151 changes: 0 additions & 151 deletions Package.resolved

This file was deleted.

10 changes: 5 additions & 5 deletions Package.swift
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import PackageDescription
let package = Package(
name: "Desk360LiveChat",
platforms: [
.iOS(.v12),
.iOS(.v13),
.macOS(.v10_14)
],
products: [
Expand All @@ -15,11 +15,11 @@ let package = Package(
),
],
dependencies: [
.package(name: "Firebase", url: "https://github.com/firebase/firebase-ios-sdk.git", .exact("10.27.0")),
.package(url: "https://github.com/Alamofire/Alamofire.git", .exact("5.0.0")),
.package(url: "https://github.com/onevcat/Kingfisher.git", .upToNextMajor(from: "7.0.0")),
.package(name: "Firebase", url: "https://github.com/firebase/firebase-ios-sdk.git", .branch("main")),
.package(url: "https://github.com/Alamofire/Alamofire.git", .branch("master")),
.package(url: "https://github.com/onevcat/Kingfisher.git", .branch("master")),
.package(url: "https://github.com/Teknasyon-Teknoloji/PersistenceKit.git", .branch("master")),
.package(url: "https://github.com/ninjaprox/NVActivityIndicatorView.git", .upToNextMajor(from: "5.1.0"))
.package(url: "https://github.com/ninjaprox/NVActivityIndicatorView.git", .branch("master"))
],
targets: [
.target(
Expand Down
59 changes: 27 additions & 32 deletions Sources/Core/Extensions/UI/UIApplication+Extenstion.swift
Original file line number Diff line number Diff line change
Expand Up @@ -8,38 +8,33 @@
import UIKit

extension UIApplication {
var statusBarUIView: UIView? {

if #available(iOS 13.0, *) {
let tag = 3848245

let keyWindow = UIApplication
.shared
.connectedScenes
.compactMap { $0 as? UIWindowScene }
.first?
.windows
.first

if let statusBar = keyWindow?.viewWithTag(tag) {
return statusBar
} else {
var statusBarFrame = keyWindow?.windowScene?.statusBarManager?.statusBarFrame ?? .zero
var statusBarUIView: UIView? {
if #available(iOS 13.0, *) {
let tag = 3848245

let keyWindow = UIApplication.shared
.connectedScenes
.compactMap { $0 as? UIWindowScene }
.first?
.windows
.first

if let statusBar = keyWindow?.viewWithTag(tag) {
return statusBar
} else {
var statusBarFrame = keyWindow?.windowScene?.statusBarManager?.statusBarFrame ?? .zero
statusBarFrame.size.height = keyWindow?.safeAreaInsets.top ?? 0
let statusBarView = UIView(frame: statusBarFrame)
statusBarView.tag = tag
statusBarView.layer.zPosition = 999999

keyWindow?.addSubview(statusBarView)
return statusBarView
}

} else {

if responds(to: Selector(("statusBar"))) {
return value(forKey: "statusBar") as? UIView
}
}
return nil
}
let statusBarView = UIView(frame: statusBarFrame)
statusBarView.tag = tag
statusBarView.layer.zPosition = 999999

keyWindow?.addSubview(statusBarView)
return statusBarView
}
} else if responds(to: Selector(("statusBar"))) {
return value(forKey: "statusBar") as? UIView
}
return nil
}
}
41 changes: 21 additions & 20 deletions Sources/Networking/Services/AgentProvider.swift
Original file line number Diff line number Diff line change
Expand Up @@ -79,26 +79,27 @@ final class AgentProviding: AgentProvider {

private var databse: Database { .liveChatDB }

func checkOnlineAgent(for companyID: Int) -> Future<Bool, Error> {
let promise = Promise<Bool, Error>()
databse
.reference(to: .online(companyID: companyID, applicationID: 0))
.getData { error, snapshot in
if let error = error {
Logger.logError(error)
promise.fail(error: error)
}
guard let snapshot = snapshot else { return }
func checkOnlineAgent(for companyID: Int) -> Future<Bool, Error> {
let promise = Promise<Bool, Error>()
databse
.reference(to: .online(companyID: companyID, applicationID: 0))
.getData { error, snapshot in
if let error = error {
Logger.logError(error)
promise.fail(error: error)
}

guard let snapshot else { return }
let value = snapshot.value as? Int ?? 0
if snapshot.exists() && value > 0 {
promise.succeed(value: true)
} else {
promise.succeed(value: false)
}
}
return promise.future
}
if snapshot.exists() && value > 0 {
promise.succeed(value: true)
} else {
promise.succeed(value: false)
}
}

return promise.future
}

func getOnlineAgentInfo(uid: String) -> Future<Agent?, Error> {
Logger.log(event: .info, "Fetching online agent")
Expand Down Expand Up @@ -157,7 +158,7 @@ final class AgentProviding: AgentProvider {
return
}
guard let messagesDic = snapshot?.value as? [String: [String: Any]] else {
Logger.log(event: .error, "No recent messages \(snapshot?.value)")
Logger.log(event: .error, "No recent messages \(snapshot?.value ?? "")")
promise.succeed(value: nil)
return
}
Expand Down

0 comments on commit 81d4980

Please sign in to comment.