diff --git a/CHANGELOG.md b/CHANGELOG.md index 388d6fb2f..feabc869d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,9 @@ # Change Log +### v1.0.5 (May 6, 2020) +* Fixed - Weird creation channel navigation flow +* Modified - Empty messages string in channel + ### v1.0.4 (Apr 29, 2020) * Added - UIKit version information to User-Agent * Fixed - Crash issue while scrolling TableView diff --git a/SendBirdUIKit.framework.dSYM/Contents/Info.plist b/SendBirdUIKit.framework.dSYM/Contents/Info.plist index 70dd1f989..07284d462 100644 --- a/SendBirdUIKit.framework.dSYM/Contents/Info.plist +++ b/SendBirdUIKit.framework.dSYM/Contents/Info.plist @@ -13,7 +13,7 @@ CFBundleSignature ???? CFBundleShortVersionString - 1.0.4 + 1.0.5 CFBundleVersion 1 diff --git a/SendBirdUIKit.framework.dSYM/Contents/Resources/DWARF/SendBirdUIKit b/SendBirdUIKit.framework.dSYM/Contents/Resources/DWARF/SendBirdUIKit index e602f5113..4806833e5 100644 Binary files a/SendBirdUIKit.framework.dSYM/Contents/Resources/DWARF/SendBirdUIKit and b/SendBirdUIKit.framework.dSYM/Contents/Resources/DWARF/SendBirdUIKit differ diff --git a/SendBirdUIKit.framework/Assets.car b/SendBirdUIKit.framework/Assets.car index c24d65733..9fbb31238 100644 Binary files a/SendBirdUIKit.framework/Assets.car and b/SendBirdUIKit.framework/Assets.car differ diff --git a/SendBirdUIKit.framework/Headers/SBUChannelViewController.swift b/SendBirdUIKit.framework/Headers/SBUChannelViewController.swift index 0a0135613..dc65619b3 100644 --- a/SendBirdUIKit.framework/Headers/SBUChannelViewController.swift +++ b/SendBirdUIKit.framework/Headers/SBUChannelViewController.swift @@ -335,7 +335,7 @@ open class SBUChannelViewController: UIViewController, UITableViewDelegate, UITa guard let messages = messages else { self?.isRequestingLoad = false; return } guard messages.count != 0 else { - self?.emptyView.updateType(.noChannels) + self?.emptyView.updateType(.noMessages) self?.hasPrevious = false self?.isRequestingLoad = false return @@ -603,7 +603,7 @@ open class SBUChannelViewController: UIViewController, UITableViewDelegate, UITa self.fullMessageList = self.sortedFullMessageList() DispatchQueue.main.async { - self.emptyView.updateType(self.fullMessageList.isEmpty ? .noChannels : .none) + self.emptyView.updateType(self.fullMessageList.isEmpty ? .noMessages : .none) guard needReload == true else { return } @@ -1439,7 +1439,7 @@ open class SBUChannelViewController: UIViewController, UITableViewDelegate, UITa // MARK: - SBUEmptyViewDelegate public func didSelectRetry() { - self.emptyView.updateType(.noChannels) + self.emptyView.updateType(.noMessages) self.loadChannel(channelUrl: self.channel?.channelUrl) } diff --git a/SendBirdUIKit.framework/Headers/SBUMain.swift b/SendBirdUIKit.framework/Headers/SBUMain.swift index 3f6dd5c84..3ca15ba59 100644 --- a/SendBirdUIKit.framework/Headers/SBUMain.swift +++ b/SendBirdUIKit.framework/Headers/SBUMain.swift @@ -173,25 +173,39 @@ public class SBUMain: NSObject { public static func openChannel(channelUrl: String, basedOnChannelList: Bool = true) { guard SBUGlobals.CurrentUser != nil else { return } - let rootViewController = UIApplication.shared.keyWindow?.rootViewController + var rootViewController = UIApplication.shared.keyWindow?.rootViewController var viewController: UIViewController? = nil + if let tabbarController: UITabBarController = rootViewController as? UITabBarController { + rootViewController = tabbarController.selectedViewController + } + if let navigationController: UINavigationController = rootViewController?.presentedViewController as? UINavigationController { for subViewController in navigationController.viewControllers { - if subViewController is SBUChannelListViewController { + if let subViewController = subViewController as? SBUChannelListViewController { + navigationController.popToViewController(subViewController, animated: false) + viewController = subViewController + break + } else if let subViewController = subViewController as? SBUChannelViewController { + viewController = subViewController + } + } + } else if let navigationController: UINavigationController = rootViewController as? UINavigationController { + for subViewController in navigationController.viewControllers { + if let subViewController = subViewController as? SBUChannelListViewController { navigationController.popToViewController(subViewController, animated: false) - viewController = subViewController as! SBUChannelListViewController + viewController = subViewController break - } else if subViewController is SBUChannelViewController { - viewController = subViewController as! SBUChannelViewController + } else if let subViewController = subViewController as? SBUChannelViewController { + viewController = subViewController } } } - if viewController is SBUChannelListViewController { - (viewController as! SBUChannelListViewController).showChannel(channelUrl: channelUrl) - } else if viewController is SBUChannelViewController { - (viewController as! SBUChannelViewController).loadChannel(channelUrl: channelUrl) + if let viewController = viewController as? SBUChannelListViewController { + viewController.showChannel(channelUrl: channelUrl) + } else if let viewController = viewController as? SBUChannelViewController { + viewController.loadChannel(channelUrl: channelUrl) } else { if basedOnChannelList == true { // If based on channelList diff --git a/SendBirdUIKit.framework/Info.plist b/SendBirdUIKit.framework/Info.plist index 60e7af1bc..cb9040922 100644 Binary files a/SendBirdUIKit.framework/Info.plist and b/SendBirdUIKit.framework/Info.plist differ diff --git a/SendBirdUIKit.framework/SBUChannelSettingCell.nib/objects-11.0+.nib b/SendBirdUIKit.framework/SBUChannelSettingCell.nib/objects-11.0+.nib index 466a1fbbc..bb2ca90ba 100644 Binary files a/SendBirdUIKit.framework/SBUChannelSettingCell.nib/objects-11.0+.nib and b/SendBirdUIKit.framework/SBUChannelSettingCell.nib/objects-11.0+.nib differ diff --git a/SendBirdUIKit.framework/SBUChannelSettingCell.nib/objects-13.0+.nib b/SendBirdUIKit.framework/SBUChannelSettingCell.nib/objects-13.0+.nib index b3d00cb3b..9264e97e4 100644 Binary files a/SendBirdUIKit.framework/SBUChannelSettingCell.nib/objects-13.0+.nib and b/SendBirdUIKit.framework/SBUChannelSettingCell.nib/objects-13.0+.nib differ diff --git a/SendBirdUIKit.framework/SBUChannelSettingCell.nib/runtime.nib b/SendBirdUIKit.framework/SBUChannelSettingCell.nib/runtime.nib index b5e59c7e1..3c9269892 100644 Binary files a/SendBirdUIKit.framework/SBUChannelSettingCell.nib/runtime.nib and b/SendBirdUIKit.framework/SBUChannelSettingCell.nib/runtime.nib differ diff --git a/SendBirdUIKit.framework/SBUMessageInputView.nib/objects-11.0+.nib b/SendBirdUIKit.framework/SBUMessageInputView.nib/objects-11.0+.nib index d30be87ae..73d01b0fa 100644 Binary files a/SendBirdUIKit.framework/SBUMessageInputView.nib/objects-11.0+.nib and b/SendBirdUIKit.framework/SBUMessageInputView.nib/objects-11.0+.nib differ diff --git a/SendBirdUIKit.framework/SBUMessageInputView.nib/objects-13.0+.nib b/SendBirdUIKit.framework/SBUMessageInputView.nib/objects-13.0+.nib index ad9ffd076..2fac01062 100644 Binary files a/SendBirdUIKit.framework/SBUMessageInputView.nib/objects-13.0+.nib and b/SendBirdUIKit.framework/SBUMessageInputView.nib/objects-13.0+.nib differ diff --git a/SendBirdUIKit.framework/SBUMessageInputView.nib/runtime.nib b/SendBirdUIKit.framework/SBUMessageInputView.nib/runtime.nib index 401921677..d2b634d13 100644 Binary files a/SendBirdUIKit.framework/SBUMessageInputView.nib/runtime.nib and b/SendBirdUIKit.framework/SBUMessageInputView.nib/runtime.nib differ diff --git a/SendBirdUIKit.framework/SBUUserCell.nib/objects-13.0+.nib b/SendBirdUIKit.framework/SBUUserCell.nib/objects-13.0+.nib index b1013d384..fd2d40a63 100644 Binary files a/SendBirdUIKit.framework/SBUUserCell.nib/objects-13.0+.nib and b/SendBirdUIKit.framework/SBUUserCell.nib/objects-13.0+.nib differ diff --git a/SendBirdUIKit.framework/SBUUserCell.nib/runtime.nib b/SendBirdUIKit.framework/SBUUserCell.nib/runtime.nib index a88920638..ca92e280f 100644 Binary files a/SendBirdUIKit.framework/SBUUserCell.nib/runtime.nib and b/SendBirdUIKit.framework/SBUUserCell.nib/runtime.nib differ diff --git a/SendBirdUIKit.framework/SendBirdUIKit b/SendBirdUIKit.framework/SendBirdUIKit index 54e7c59d8..ec7142d3f 100755 Binary files a/SendBirdUIKit.framework/SendBirdUIKit and b/SendBirdUIKit.framework/SendBirdUIKit differ diff --git a/SendBirdUIKit.framework/_CodeSignature/CodeResources b/SendBirdUIKit.framework/_CodeSignature/CodeResources index 238ad556a..c2d310217 100644 --- a/SendBirdUIKit.framework/_CodeSignature/CodeResources +++ b/SendBirdUIKit.framework/_CodeSignature/CodeResources @@ -6,7 +6,7 @@ Assets.car - 2jGI/aLnZIcqvM978bWSkW9Y/bg= + QR3AD0JlD+ffy8P6QrCzfnR+aFU= Headers/SBUBaseChannelCell.swift @@ -26,7 +26,7 @@ Headers/SBUChannelViewController.swift - vh8wcp93vbpxkPY84VQ5mgtMk4I= + +DwfiJPbh3fMo5+nWBHU1iRLA1A= Headers/SBUColorSet.swift @@ -62,7 +62,7 @@ Headers/SBUMain.swift - GfzYr91csjP8d965Q5rJCGZJBMc= + Qod4EHlzC3YgwJKXTOxOI8jK/6Q= Headers/SBUMemberListViewController.swift @@ -106,7 +106,7 @@ Info.plist - DgFkZ466l0jR5NQGQFPlD+E7M+s= + Y5cavGY0EeRa/Cz8opmO6kuolf8= Modules/SendBirdUIKit.swiftmodule/arm.swiftdoc @@ -174,35 +174,35 @@ SBUChannelSettingCell.nib/objects-11.0+.nib - IyNdq4ea4+O5Rr18NYAbXXuLPns= + u2aoEH7n5e8y+V2SQjuHdjgtIf0= SBUChannelSettingCell.nib/objects-13.0+.nib - Q+0MpmvSo6UE/AzQI2taC5JpOpY= + ZR0WJSuSijxqDvRYxxTftGzHXHM= SBUChannelSettingCell.nib/runtime.nib - TQqzHwjYnJAjBJr3JR8MUGHvBlg= + Pi5PYHoUzoPRXjzTTUXJDOlclYQ= SBUMessageInputView.nib/objects-11.0+.nib - Nrvegd94ugvAzuhd5A6a20mggXU= + 3q1ZFJuFfg7IFd1xi0Ee12ehYtc= SBUMessageInputView.nib/objects-13.0+.nib - bXXNFzDhbVC0JJXzIgNDn/i5oxk= + QLH14BOfMBX8sU82BPqVK0K7CAM= SBUMessageInputView.nib/runtime.nib - DqOIa+YXQc0N/qhSEGjiseGAe74= + taCBj/DZ7q5kW77PevJT4aT7i1U= SBUUserCell.nib/objects-13.0+.nib - VT89Zp2yLWlsVUmOV7qR23MePQU= + gVIp2QJExY8uAvF4FXqrc4r1WCQ= SBUUserCell.nib/runtime.nib - cgzRnXjet7RxQVAaoyiEgWey3WE= + YqDkUI654RkMYDAQI5MEuEmrf40= files2 @@ -211,11 +211,11 @@ hash - 2jGI/aLnZIcqvM978bWSkW9Y/bg= + QR3AD0JlD+ffy8P6QrCzfnR+aFU= hash2 - G4ubfdfPCOeLRBWeW8pmPapSRJSNf9CvAFMxfPzsXIE= + 7leCVTZJvPC4SPAad5PD5mOXqlSC/bhhfMPyviVezHY= Headers/SBUBaseChannelCell.swift @@ -266,11 +266,11 @@ hash - vh8wcp93vbpxkPY84VQ5mgtMk4I= + +DwfiJPbh3fMo5+nWBHU1iRLA1A= hash2 - Nkioc3Hb90uj8OiWcgEeK9AY/LHznkuDc8vtURVWp1I= + 8JNTOhGyJ0HJDL6gyUvLbEukLrMRuZfBF7NuoEYzFAw= Headers/SBUColorSet.swift @@ -365,11 +365,11 @@ hash - GfzYr91csjP8d965Q5rJCGZJBMc= + Qod4EHlzC3YgwJKXTOxOI8jK/6Q= hash2 - JfpQPLofGjFcdI/2el2gypP6N7pAjXRZwAR12NmRrfA= + Ptlqaab5f3cQsRKHjgoEcLbtHjMDueICGxYGjHYf8mU= Headers/SBUMemberListViewController.swift @@ -662,88 +662,88 @@ hash - IyNdq4ea4+O5Rr18NYAbXXuLPns= + u2aoEH7n5e8y+V2SQjuHdjgtIf0= hash2 - 1YUHKoDJQFPaWQkWV8F0zJ+TJHhErd5HjMYd/xKI1uY= + lNi9ef89HnAxgJtHzztJG7KRnL/X/Ih2ZN5ky7erGeM= SBUChannelSettingCell.nib/objects-13.0+.nib hash - Q+0MpmvSo6UE/AzQI2taC5JpOpY= + ZR0WJSuSijxqDvRYxxTftGzHXHM= hash2 - dVB9rNO9JBiN/T8SKX0nDYFpoOyZcdtOUsR5SAlOC4A= + v5QWYda/zo28sxL7Oz5CyCwpwVBTLY2SfzomUzr0+kU= SBUChannelSettingCell.nib/runtime.nib hash - TQqzHwjYnJAjBJr3JR8MUGHvBlg= + Pi5PYHoUzoPRXjzTTUXJDOlclYQ= hash2 - UlK9zk2Vhpwli1T2tiOww9ZNOGt9X90mBOszLAouUsQ= + dHtDC6NsR5b6b7vE1/gohO18wv8XsRbPsTlmqepv+fQ= SBUMessageInputView.nib/objects-11.0+.nib hash - Nrvegd94ugvAzuhd5A6a20mggXU= + 3q1ZFJuFfg7IFd1xi0Ee12ehYtc= hash2 - FQsFzyF/0KJxV7earCPPKO1epy/PxItnEikrW2ZnjKc= + ly63aY0IKKuP7JeLsAuXPvSanryY8W85y1jlPa7wIYs= SBUMessageInputView.nib/objects-13.0+.nib hash - bXXNFzDhbVC0JJXzIgNDn/i5oxk= + QLH14BOfMBX8sU82BPqVK0K7CAM= hash2 - /F+Tl0eSXq1sMo1JDiKsg0e5AFM/uJFTovUpBks8jfs= + 9QTqXKmaHBe/NU8gdX4jn/tUDiYz/doU9aEscf4OYa0= SBUMessageInputView.nib/runtime.nib hash - DqOIa+YXQc0N/qhSEGjiseGAe74= + taCBj/DZ7q5kW77PevJT4aT7i1U= hash2 - 4L5BssQJ6SZm4bv1LIiPKy6UbqRIDFvmp8TPtAvVmAk= + 4FqOBiXx6zpk27c5xTUgOIbpiawHJVljL8itooINRvk= SBUUserCell.nib/objects-13.0+.nib hash - VT89Zp2yLWlsVUmOV7qR23MePQU= + gVIp2QJExY8uAvF4FXqrc4r1WCQ= hash2 - 9ma+kpEsCX+kN2jT0QFuJW9dvybTOYDHGMr4rTO8hyc= + ILAYRyCMYoPx1+Lv+PCnv/CwO0AYJzyCzPPyiQEL7fQ= SBUUserCell.nib/runtime.nib hash - cgzRnXjet7RxQVAaoyiEgWey3WE= + YqDkUI654RkMYDAQI5MEuEmrf40= hash2 - 61UME11bByLgdp2CCbWoUNJhEJcM65D/KOrIelRWu/w= + Dj1G3xllvSCP7o6d7pniF9VYT2a7CVLq7Jg9CTUfIPg= diff --git a/SendBirdUIKit.podspec b/SendBirdUIKit.podspec index fc1e86492..67558d970 100644 --- a/SendBirdUIKit.podspec +++ b/SendBirdUIKit.podspec @@ -1,6 +1,6 @@ Pod::Spec.new do |s| s.name = "SendBirdUIKit" - s.version = "1.0.4" + s.version = "1.0.5" s.summary = "UIKit based on SendBirdSDK" s.description = "SendBird UIKit is a framework composed of basic UI components based on SendBirdSDK." s.homepage = "https://sendbird.com"