Skip to content

Commit e43a173

Browse files
committed
* Modify - File message information in channel preview
* Modify - Access control for channel objects * Add - Required initializers
1 parent 40db54e commit e43a173

File tree

63 files changed

+1066
-566
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

63 files changed

+1066
-566
lines changed

CHANGELOG.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,10 @@
11
# Change Log
22

3+
### v1.0.8 (May 28, 2020)
4+
* Modified - File message information in channel preview
5+
* Modified - Access control for channel objects
6+
* Added - Required initializers
7+
38
### v1.0.7 (May 21, 2020)
49
* Fixed - placeholder not appearing normally when loading image.
510

SendBirdUIKit.framework.dSYM/Contents/Info.plist

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
<key>CFBundleSignature</key>
1414
<string>????</string>
1515
<key>CFBundleShortVersionString</key>
16-
<string>1.0.7</string>
16+
<string>1.0.8</string>
1717
<key>CFBundleVersion</key>
1818
<string>1</string>
1919
</dict>
223 KB
Binary file not shown.

SendBirdUIKit.framework/Assets.car

0 Bytes
Binary file not shown.

SendBirdUIKit.framework/Headers/SBUBaseMessageCell.swift

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -188,15 +188,15 @@ public class MessageProfileView: UIView {
188188
private let leftSpace: CGFloat = 12
189189
private let rightSpace: CGFloat = 12
190190

191-
init(urlString: String) {
191+
public init(urlString: String) {
192192
self.urlString = urlString
193193
super.init(frame: .init(x: 0, y: 0, width: 26, height: 26))
194194
self.setupViews()
195195
self.setupAutolayout()
196196
self.configure(urlString: urlString)
197197
}
198198

199-
override init(frame: CGRect) {
199+
override public init(frame: CGRect) {
200200
super.init(frame: frame)
201201
self.setupViews()
202202
self.setupAutolayout()
@@ -254,15 +254,15 @@ public class UserNameView: UIView {
254254

255255
var username: String = ""
256256

257-
init(username: String) {
257+
public init(username: String) {
258258
self.username = username
259259
super.init(frame: .zero)
260260
self.setupViews()
261261
self.setupAutolayout()
262262
self.configure(username: self.username)
263263
}
264264

265-
override init(frame: CGRect) {
265+
override public init(frame: CGRect) {
266266
super.init(frame: frame)
267267
self.setupViews()
268268
self.setupAutolayout()
@@ -330,7 +330,7 @@ public class MessageStateView: UIView {
330330
var receiptState: SBUMessageReceiptState = .none
331331
var position: MessagePosition = .center
332332

333-
init(sendingState: SBDMessageSendingStatus, receiptState: SBUMessageReceiptState) {
333+
public init(sendingState: SBDMessageSendingStatus, receiptState: SBUMessageReceiptState) {
334334
self.receiptState = receiptState
335335
super.init(frame: .zero)
336336
self.setupViews()
@@ -339,7 +339,7 @@ public class MessageStateView: UIView {
339339
receiptState: self.receiptState, position: .center)
340340
}
341341

342-
override init(frame: CGRect) {
342+
override public init(frame: CGRect) {
343343
super.init(frame: frame)
344344
self.setupViews()
345345
self.setupAutolayout()

SendBirdUIKit.framework/Headers/SBUChannelListViewController.swift

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -65,6 +65,20 @@ open class SBUChannelListViewController: UIViewController, UITableViewDelegate,
6565
var customCell: SBUBaseChannelCell? = nil
6666

6767
// MARK: - Lifecycle
68+
@available(*, unavailable, renamed: "SBUChannelListViewController()")
69+
required public init?(coder: NSCoder) {
70+
super.init(coder: coder)
71+
SBULog.info("")
72+
}
73+
74+
/// If you have channel object, use this initialize function.
75+
/// - Parameter channel: Channel object
76+
public init() {
77+
super.init(nibName: nil, bundle: nil)
78+
SBULog.info("")
79+
}
80+
81+
6882
open override func loadView() {
6983
super.loadView()
7084
SBULog.info("")

SendBirdUIKit.framework/Headers/SBUChannelSettingsViewController.swift

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ open class SBUChannelSettingsViewController: UIViewController, UITableViewDelega
5454
private let actionSheetIdPicker = 2
5555

5656
/// One of two must be set.
57-
private var channel: SBDGroupChannel?
57+
public private(set) var channel: SBDGroupChannel?
5858
private var channelUrl: String?
5959

6060

@@ -102,7 +102,7 @@ open class SBUChannelSettingsViewController: UIViewController, UITableViewDelega
102102
self.tableView.bounces = false
103103
self.tableView.alwaysBounceVertical = false
104104
self.tableView.separatorStyle = .none
105-
self.tableView.register(SBUChannelSettingCell.loadNib(), forCellReuseIdentifier: SBUChannelSettingCell.className)
105+
self.tableView.register(SBUChannelSettingCell.loadNibForSB(), forCellReuseIdentifier: SBUChannelSettingCell.className)
106106
self.tableView.tableHeaderView = self.userInfoView
107107
self.tableView.rowHeight = UITableView.automaticDimension
108108
self.tableView.estimatedRowHeight = 44.0

SendBirdUIKit.framework/Headers/SBUChannelViewController.swift

Lines changed: 29 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ open class SBUChannelViewController: UIViewController, UITableViewDelegate, UITa
5353
}()
5454

5555
private lazy var _messageInputView: SBUMessageInputView = {
56-
return SBUMessageInputView.loadViewFromNib() as! SBUMessageInputView
56+
return SBUMessageInputView.loadViewFromNibForSB() as! SBUMessageInputView
5757
}()
5858

5959
private lazy var _newMessageInfoView: SBUNewMessageInfo = {
@@ -76,7 +76,7 @@ open class SBUChannelViewController: UIViewController, UITableViewDelegate, UITa
7676
// for Logic
7777

7878
/// One of two must be set.
79-
private var channel: SBDGroupChannel?
79+
public private(set) var channel: SBDGroupChannel?
8080
private var channelUrl: String?
8181

8282
@SBUAtomic var fullMessageList: [SBDBaseMessage] = []
@@ -436,14 +436,16 @@ open class SBUChannelViewController: UIViewController, UITableViewDelegate, UITa
436436
}
437437
}
438438

439-
private func sendUserMessage(text: String) {
439+
public func sendUserMessage(text: String) {
440440
let text = text.trimmingCharacters(in: .whitespacesAndNewlines)
441-
var preSendMessage: SBDUserMessage?
442441
guard let messageParam = SBDUserMessageParams(message: text) else { return }
443-
442+
self.sendUserMessage(messageParams: messageParam)
443+
}
444+
445+
public func sendUserMessage(messageParams: SBDUserMessageParams) {
444446
SBULog.info("[Request] Send user message")
445447

446-
preSendMessage = self.channel?.sendUserMessage(with: messageParam) { [weak self] userMessage, error in
448+
let preSendMessage = self.channel?.sendUserMessage(with: messageParams) { [weak self] userMessage, error in
447449
guard let self = self else { return }
448450
if let error = error {
449451
guard let requestId = userMessage?.requestId else { return }
@@ -454,12 +456,12 @@ open class SBUChannelViewController: UIViewController, UITableViewDelegate, UITa
454456
SBULog.error("[Failed] Send user message request: \(error.localizedDescription)")
455457
return
456458
}
457-
459+
458460
guard let message = userMessage else { return }
459461
guard let requestId = userMessage?.requestId else { return }
460462

461463
SBULog.info("[Succeed] Send user message: \(message.description)")
462-
464+
463465
self.preSendMessages.removeValue(forKey: requestId)
464466
self.resendableMessages.removeValue(forKey: requestId)
465467
self.upsertMessages(messages: [message], needReload: true)
@@ -476,27 +478,31 @@ open class SBUChannelViewController: UIViewController, UITableViewDelegate, UITa
476478
self.scrollToBottom()
477479
}
478480

479-
private func sendFileMessage(fileData: Data, fileName: String, mimeType: String) {
481+
public func sendFileMessage(fileData: Data, fileName: String, mimeType: String) {
482+
let messageParams = SBDFileMessageParams(file: fileData)!
483+
messageParams.fileName = fileName
484+
messageParams.mimeType = mimeType
485+
messageParams.fileSize = UInt(fileData.count)
486+
487+
self.sendFileMessage(messageParams: messageParams)
488+
}
489+
490+
public func sendFileMessage(messageParams: SBDFileMessageParams) {
480491
/*********************************
481492
Thumbnail is a premium feature.
482493
***********************************/
483494

484-
var preSendMessage: SBDFileMessage?
485-
486-
let fileMessageParams = SBDFileMessageParams(file: fileData)!
487-
fileMessageParams.fileName = fileName
488-
fileMessageParams.mimeType = mimeType
489-
fileMessageParams.fileSize = UInt(fileData.count)
490495
guard let channel = self.channel else { return }
491496

492497
SBULog.info("[Request] Send file message")
493-
preSendMessage = channel.sendFileMessage(with: fileMessageParams,
498+
var preSendMessage: SBDFileMessage?
499+
preSendMessage = channel.sendFileMessage(with: messageParams,
494500
progressHandler: {
495501
// [weak self]
496502
bytesSent, totalBytesSent, totalBytesExpectedToSend in
497503

498504
//// If need reload cell for progress, call reload action in here.
499-
guard let requestId = preSendMessage?.requestId else { return }
505+
guard let requestId = preSendMessage?.requestId else { return }
500506
let fileTransferProgress = CGFloat(totalBytesSent) / CGFloat(totalBytesExpectedToSend)
501507
SBULog.info("File message transfer progress: \(requestId) - \(fileTransferProgress)")
502508

@@ -516,7 +522,9 @@ open class SBUChannelViewController: UIViewController, UITableViewDelegate, UITa
516522
if let error = error {
517523
guard let requestId = fileMessage?.requestId else { return }
518524
self?.resendableMessages[requestId] = fileMessage
519-
self?.resendableFileData[requestId] = ["data": fileData, "type": mimeType, "filename": fileName] as [String : AnyObject]
525+
if let fileData = messageParams.file, let mimeType = messageParams.mimeType, let fileName = messageParams.fileName {
526+
self?.resendableFileData[requestId] = ["data": fileData, "type": mimeType, "filename": fileName] as [String : AnyObject]
527+
}
520528
self?.preSendMessages.removeValue(forKey: requestId)
521529
self?.preSendFileData.removeValue(forKey: requestId)
522530
self?.sortAllMessageList(needReload: true)
@@ -544,7 +552,9 @@ open class SBUChannelViewController: UIViewController, UITableViewDelegate, UITa
544552
guard let unwrappedPreSendMessage = preSendMessage, let requestId = unwrappedPreSendMessage.requestId else { return }
545553
SBULog.info("Presend file message: \(unwrappedPreSendMessage.description)")
546554
self.preSendMessages[requestId] = unwrappedPreSendMessage
547-
self.preSendFileData[requestId] = ["data": fileData, "type": mimeType, "filename": fileName] as [String : AnyObject]
555+
if let fileData = messageParams.file, let mimeType = messageParams.mimeType, let fileName = messageParams.fileName {
556+
self.preSendFileData[requestId] = ["data": fileData, "type": mimeType, "filename": fileName] as [String : AnyObject]
557+
}
548558
self.fileTransferProgress[requestId] = 0
549559
self.sortAllMessageList(needReload: true)
550560
}

SendBirdUIKit.framework/Headers/SBUCreateChannelViewController.swift

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@ open class SBUCreateChannelViewController: UIViewController, UITableViewDelegate
8888
self.tableView.delegate = self
8989
self.tableView.dataSource = self
9090
self.tableView.separatorStyle = .none
91-
self.tableView.register(SBUUserCell.loadNib(), forCellReuseIdentifier: SBUUserCell.className) // for xib
91+
self.tableView.register(SBUUserCell.loadNibForSB(), forCellReuseIdentifier: SBUUserCell.className) // for xib
9292
self.tableView.rowHeight = UITableView.automaticDimension
9393
self.tableView.estimatedRowHeight = 44.0
9494
self.view.addSubview(self.tableView)
@@ -180,7 +180,7 @@ open class SBUCreateChannelViewController: UIViewController, UITableViewDelegate
180180

181181
if let users = users {
182182
// for using customized user list
183-
if let customizedUsers = self.customizedUsers {
183+
if self.customizedUsers != nil {
184184
self.customizedUsers! += users
185185
}
186186

SendBirdUIKit.framework/Headers/SBUInviteUserViewController.swift

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ open class SBUInviteUserViewController: UIViewController, UITableViewDelegate, U
4747
}()
4848

4949
// for logic
50-
private var channel: SBDGroupChannel?
50+
public private(set) var channel: SBDGroupChannel?
5151
private var channelUrl: String?
5252

5353
@SBUAtomic private var customizedUsers: [SBUUser]?
@@ -125,7 +125,7 @@ open class SBUInviteUserViewController: UIViewController, UITableViewDelegate, U
125125
self.tableView.delegate = self
126126
self.tableView.dataSource = self
127127
self.tableView.separatorStyle = .none
128-
self.tableView.register(SBUUserCell.loadNib(), forCellReuseIdentifier: SBUUserCell.className) // for xib
128+
self.tableView.register(SBUUserCell.loadNibForSB(), forCellReuseIdentifier: SBUUserCell.className) // for xib
129129
self.tableView.rowHeight = UITableView.automaticDimension
130130
self.tableView.estimatedRowHeight = 44.0
131131
self.view.addSubview(self.tableView)
@@ -239,7 +239,7 @@ open class SBUInviteUserViewController: UIViewController, UITableViewDelegate, U
239239

240240
if let users = users {
241241
// Customized user list
242-
if let customizedUsers = self.customizedUsers {
242+
if self.customizedUsers != nil {
243243
self.customizedUsers! += users
244244
}
245245

0 commit comments

Comments
 (0)