Skip to content

Commit

Permalink
* Fix - Weird creation channel navigation flow
Browse files Browse the repository at this point in the history
* Modify - Empty messages string in channel
  • Loading branch information
tezpark committed May 6, 2020
1 parent 4a49fb5 commit 19ed247
Show file tree
Hide file tree
Showing 18 changed files with 66 additions and 48 deletions.
4 changes: 4 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion SendBirdUIKit.framework.dSYM/Contents/Info.plist
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
<key>CFBundleSignature</key>
<string>????</string>
<key>CFBundleShortVersionString</key>
<string>1.0.4</string>
<string>1.0.5</string>
<key>CFBundleVersion</key>
<string>1</string>
</dict>
Expand Down
Binary file not shown.
Binary file modified SendBirdUIKit.framework/Assets.car
Binary file not shown.
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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 }

Expand Down Expand Up @@ -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)
}
Expand Down
32 changes: 23 additions & 9 deletions SendBirdUIKit.framework/Headers/SBUMain.swift
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Binary file modified SendBirdUIKit.framework/Info.plist
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file modified SendBirdUIKit.framework/SBUChannelSettingCell.nib/runtime.nib
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file modified SendBirdUIKit.framework/SBUMessageInputView.nib/runtime.nib
Binary file not shown.
Binary file modified SendBirdUIKit.framework/SBUUserCell.nib/objects-13.0+.nib
Binary file not shown.
Binary file modified SendBirdUIKit.framework/SBUUserCell.nib/runtime.nib
Binary file not shown.
Binary file modified SendBirdUIKit.framework/SendBirdUIKit
Binary file not shown.
68 changes: 34 additions & 34 deletions SendBirdUIKit.framework/_CodeSignature/CodeResources
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<dict>
<key>Assets.car</key>
<data>
2jGI/aLnZIcqvM978bWSkW9Y/bg=
QR3AD0JlD+ffy8P6QrCzfnR+aFU=
</data>
<key>Headers/SBUBaseChannelCell.swift</key>
<data>
Expand All @@ -26,7 +26,7 @@
</data>
<key>Headers/SBUChannelViewController.swift</key>
<data>
vh8wcp93vbpxkPY84VQ5mgtMk4I=
+DwfiJPbh3fMo5+nWBHU1iRLA1A=
</data>
<key>Headers/SBUColorSet.swift</key>
<data>
Expand Down Expand Up @@ -62,7 +62,7 @@
</data>
<key>Headers/SBUMain.swift</key>
<data>
GfzYr91csjP8d965Q5rJCGZJBMc=
Qod4EHlzC3YgwJKXTOxOI8jK/6Q=
</data>
<key>Headers/SBUMemberListViewController.swift</key>
<data>
Expand Down Expand Up @@ -106,7 +106,7 @@
</data>
<key>Info.plist</key>
<data>
DgFkZ466l0jR5NQGQFPlD+E7M+s=
Y5cavGY0EeRa/Cz8opmO6kuolf8=
</data>
<key>Modules/SendBirdUIKit.swiftmodule/arm.swiftdoc</key>
<data>
Expand Down Expand Up @@ -174,35 +174,35 @@
</data>
<key>SBUChannelSettingCell.nib/objects-11.0+.nib</key>
<data>
IyNdq4ea4+O5Rr18NYAbXXuLPns=
u2aoEH7n5e8y+V2SQjuHdjgtIf0=
</data>
<key>SBUChannelSettingCell.nib/objects-13.0+.nib</key>
<data>
Q+0MpmvSo6UE/AzQI2taC5JpOpY=
ZR0WJSuSijxqDvRYxxTftGzHXHM=
</data>
<key>SBUChannelSettingCell.nib/runtime.nib</key>
<data>
TQqzHwjYnJAjBJr3JR8MUGHvBlg=
Pi5PYHoUzoPRXjzTTUXJDOlclYQ=
</data>
<key>SBUMessageInputView.nib/objects-11.0+.nib</key>
<data>
Nrvegd94ugvAzuhd5A6a20mggXU=
3q1ZFJuFfg7IFd1xi0Ee12ehYtc=
</data>
<key>SBUMessageInputView.nib/objects-13.0+.nib</key>
<data>
bXXNFzDhbVC0JJXzIgNDn/i5oxk=
QLH14BOfMBX8sU82BPqVK0K7CAM=
</data>
<key>SBUMessageInputView.nib/runtime.nib</key>
<data>
DqOIa+YXQc0N/qhSEGjiseGAe74=
taCBj/DZ7q5kW77PevJT4aT7i1U=
</data>
<key>SBUUserCell.nib/objects-13.0+.nib</key>
<data>
VT89Zp2yLWlsVUmOV7qR23MePQU=
gVIp2QJExY8uAvF4FXqrc4r1WCQ=
</data>
<key>SBUUserCell.nib/runtime.nib</key>
<data>
cgzRnXjet7RxQVAaoyiEgWey3WE=
YqDkUI654RkMYDAQI5MEuEmrf40=
</data>
</dict>
<key>files2</key>
Expand All @@ -211,11 +211,11 @@
<dict>
<key>hash</key>
<data>
2jGI/aLnZIcqvM978bWSkW9Y/bg=
QR3AD0JlD+ffy8P6QrCzfnR+aFU=
</data>
<key>hash2</key>
<data>
G4ubfdfPCOeLRBWeW8pmPapSRJSNf9CvAFMxfPzsXIE=
7leCVTZJvPC4SPAad5PD5mOXqlSC/bhhfMPyviVezHY=
</data>
</dict>
<key>Headers/SBUBaseChannelCell.swift</key>
Expand Down Expand Up @@ -266,11 +266,11 @@
<dict>
<key>hash</key>
<data>
vh8wcp93vbpxkPY84VQ5mgtMk4I=
+DwfiJPbh3fMo5+nWBHU1iRLA1A=
</data>
<key>hash2</key>
<data>
Nkioc3Hb90uj8OiWcgEeK9AY/LHznkuDc8vtURVWp1I=
8JNTOhGyJ0HJDL6gyUvLbEukLrMRuZfBF7NuoEYzFAw=
</data>
</dict>
<key>Headers/SBUColorSet.swift</key>
Expand Down Expand Up @@ -365,11 +365,11 @@
<dict>
<key>hash</key>
<data>
GfzYr91csjP8d965Q5rJCGZJBMc=
Qod4EHlzC3YgwJKXTOxOI8jK/6Q=
</data>
<key>hash2</key>
<data>
JfpQPLofGjFcdI/2el2gypP6N7pAjXRZwAR12NmRrfA=
Ptlqaab5f3cQsRKHjgoEcLbtHjMDueICGxYGjHYf8mU=
</data>
</dict>
<key>Headers/SBUMemberListViewController.swift</key>
Expand Down Expand Up @@ -662,88 +662,88 @@
<dict>
<key>hash</key>
<data>
IyNdq4ea4+O5Rr18NYAbXXuLPns=
u2aoEH7n5e8y+V2SQjuHdjgtIf0=
</data>
<key>hash2</key>
<data>
1YUHKoDJQFPaWQkWV8F0zJ+TJHhErd5HjMYd/xKI1uY=
lNi9ef89HnAxgJtHzztJG7KRnL/X/Ih2ZN5ky7erGeM=
</data>
</dict>
<key>SBUChannelSettingCell.nib/objects-13.0+.nib</key>
<dict>
<key>hash</key>
<data>
Q+0MpmvSo6UE/AzQI2taC5JpOpY=
ZR0WJSuSijxqDvRYxxTftGzHXHM=
</data>
<key>hash2</key>
<data>
dVB9rNO9JBiN/T8SKX0nDYFpoOyZcdtOUsR5SAlOC4A=
v5QWYda/zo28sxL7Oz5CyCwpwVBTLY2SfzomUzr0+kU=
</data>
</dict>
<key>SBUChannelSettingCell.nib/runtime.nib</key>
<dict>
<key>hash</key>
<data>
TQqzHwjYnJAjBJr3JR8MUGHvBlg=
Pi5PYHoUzoPRXjzTTUXJDOlclYQ=
</data>
<key>hash2</key>
<data>
UlK9zk2Vhpwli1T2tiOww9ZNOGt9X90mBOszLAouUsQ=
dHtDC6NsR5b6b7vE1/gohO18wv8XsRbPsTlmqepv+fQ=
</data>
</dict>
<key>SBUMessageInputView.nib/objects-11.0+.nib</key>
<dict>
<key>hash</key>
<data>
Nrvegd94ugvAzuhd5A6a20mggXU=
3q1ZFJuFfg7IFd1xi0Ee12ehYtc=
</data>
<key>hash2</key>
<data>
FQsFzyF/0KJxV7earCPPKO1epy/PxItnEikrW2ZnjKc=
ly63aY0IKKuP7JeLsAuXPvSanryY8W85y1jlPa7wIYs=
</data>
</dict>
<key>SBUMessageInputView.nib/objects-13.0+.nib</key>
<dict>
<key>hash</key>
<data>
bXXNFzDhbVC0JJXzIgNDn/i5oxk=
QLH14BOfMBX8sU82BPqVK0K7CAM=
</data>
<key>hash2</key>
<data>
/F+Tl0eSXq1sMo1JDiKsg0e5AFM/uJFTovUpBks8jfs=
9QTqXKmaHBe/NU8gdX4jn/tUDiYz/doU9aEscf4OYa0=
</data>
</dict>
<key>SBUMessageInputView.nib/runtime.nib</key>
<dict>
<key>hash</key>
<data>
DqOIa+YXQc0N/qhSEGjiseGAe74=
taCBj/DZ7q5kW77PevJT4aT7i1U=
</data>
<key>hash2</key>
<data>
4L5BssQJ6SZm4bv1LIiPKy6UbqRIDFvmp8TPtAvVmAk=
4FqOBiXx6zpk27c5xTUgOIbpiawHJVljL8itooINRvk=
</data>
</dict>
<key>SBUUserCell.nib/objects-13.0+.nib</key>
<dict>
<key>hash</key>
<data>
VT89Zp2yLWlsVUmOV7qR23MePQU=
gVIp2QJExY8uAvF4FXqrc4r1WCQ=
</data>
<key>hash2</key>
<data>
9ma+kpEsCX+kN2jT0QFuJW9dvybTOYDHGMr4rTO8hyc=
ILAYRyCMYoPx1+Lv+PCnv/CwO0AYJzyCzPPyiQEL7fQ=
</data>
</dict>
<key>SBUUserCell.nib/runtime.nib</key>
<dict>
<key>hash</key>
<data>
cgzRnXjet7RxQVAaoyiEgWey3WE=
YqDkUI654RkMYDAQI5MEuEmrf40=
</data>
<key>hash2</key>
<data>
61UME11bByLgdp2CCbWoUNJhEJcM65D/KOrIelRWu/w=
Dj1G3xllvSCP7o6d7pniF9VYT2a7CVLq7Jg9CTUfIPg=
</data>
</dict>
</dict>
Expand Down
2 changes: 1 addition & 1 deletion SendBirdUIKit.podspec
Original file line number Diff line number Diff line change
@@ -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"
Expand Down

0 comments on commit 19ed247

Please sign in to comment.