|
|
|
@ -29,18 +29,22 @@ class ConversationSearchViewController: UITableViewController {
|
|
|
|
case messages
|
|
|
|
case messages
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
var blockedPhoneNumberSet = Set<String>()
|
|
|
|
|
|
|
|
|
|
|
|
// MARK: View Lifecyle
|
|
|
|
// MARK: View Lifecyle
|
|
|
|
|
|
|
|
|
|
|
|
override func viewDidLoad() {
|
|
|
|
override func viewDidLoad() {
|
|
|
|
super.viewDidLoad()
|
|
|
|
super.viewDidLoad()
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
let blockingManager = OWSBlockingManager.shared()
|
|
|
|
|
|
|
|
blockedPhoneNumberSet = Set(blockingManager.blockedPhoneNumbers())
|
|
|
|
|
|
|
|
|
|
|
|
tableView.rowHeight = UITableViewAutomaticDimension
|
|
|
|
tableView.rowHeight = UITableViewAutomaticDimension
|
|
|
|
tableView.estimatedRowHeight = 60
|
|
|
|
tableView.estimatedRowHeight = 60
|
|
|
|
|
|
|
|
|
|
|
|
tableView.register(EmptySearchResultCell.self, forCellReuseIdentifier: EmptySearchResultCell.reuseIdentifier)
|
|
|
|
tableView.register(EmptySearchResultCell.self, forCellReuseIdentifier: EmptySearchResultCell.reuseIdentifier)
|
|
|
|
tableView.register(ConversationSearchResultCell.self, forCellReuseIdentifier: ConversationSearchResultCell.reuseIdentifier)
|
|
|
|
tableView.register(HomeViewCell.self, forCellReuseIdentifier: HomeViewCell.cellReuseIdentifier())
|
|
|
|
tableView.register(MessageSearchResultCell.self, forCellReuseIdentifier: MessageSearchResultCell.reuseIdentifier)
|
|
|
|
tableView.register(ContactTableViewCell.self, forCellReuseIdentifier: ContactTableViewCell.reuseIdentifier())
|
|
|
|
tableView.register(ContactSearchResultCell.self, forCellReuseIdentifier: ContactSearchResultCell.reuseIdentifier)
|
|
|
|
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
// MARK: UITableViewDelegate
|
|
|
|
// MARK: UITableViewDelegate
|
|
|
|
@ -131,7 +135,7 @@ class ConversationSearchViewController: UITableViewController {
|
|
|
|
cell.configure(searchText: searchText)
|
|
|
|
cell.configure(searchText: searchText)
|
|
|
|
return cell
|
|
|
|
return cell
|
|
|
|
case .conversations:
|
|
|
|
case .conversations:
|
|
|
|
guard let cell = tableView.dequeueReusableCell(withIdentifier: ConversationSearchResultCell.reuseIdentifier) as? ConversationSearchResultCell else {
|
|
|
|
guard let cell = tableView.dequeueReusableCell(withIdentifier: HomeViewCell.cellReuseIdentifier()) as? HomeViewCell else {
|
|
|
|
owsFail("cell was unexpectedly nil")
|
|
|
|
owsFail("cell was unexpectedly nil")
|
|
|
|
return UITableViewCell()
|
|
|
|
return UITableViewCell()
|
|
|
|
}
|
|
|
|
}
|
|
|
|
@ -140,10 +144,10 @@ class ConversationSearchViewController: UITableViewController {
|
|
|
|
owsFail("searchResult was unexpectedly nil")
|
|
|
|
owsFail("searchResult was unexpectedly nil")
|
|
|
|
return UITableViewCell()
|
|
|
|
return UITableViewCell()
|
|
|
|
}
|
|
|
|
}
|
|
|
|
cell.configure(searchResult: searchResult)
|
|
|
|
cell.configure(withThread: searchResult.thread, contactsManager: contactsManager, blockedPhoneNumber: self.blockedPhoneNumberSet)
|
|
|
|
return cell
|
|
|
|
return cell
|
|
|
|
case .contacts:
|
|
|
|
case .contacts:
|
|
|
|
guard let cell = tableView.dequeueReusableCell(withIdentifier: ContactSearchResultCell.reuseIdentifier) as? ContactSearchResultCell else {
|
|
|
|
guard let cell = tableView.dequeueReusableCell(withIdentifier: ContactTableViewCell.reuseIdentifier()) as? ContactTableViewCell else {
|
|
|
|
owsFail("cell was unexpectedly nil")
|
|
|
|
owsFail("cell was unexpectedly nil")
|
|
|
|
return UITableViewCell()
|
|
|
|
return UITableViewCell()
|
|
|
|
}
|
|
|
|
}
|
|
|
|
@ -152,11 +156,10 @@ class ConversationSearchViewController: UITableViewController {
|
|
|
|
owsFail("searchResult was unexpectedly nil")
|
|
|
|
owsFail("searchResult was unexpectedly nil")
|
|
|
|
return UITableViewCell()
|
|
|
|
return UITableViewCell()
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
cell.configure(with: searchResult.signalAccount, contactsManager: contactsManager)
|
|
|
|
cell.configure(searchResult: searchResult)
|
|
|
|
|
|
|
|
return cell
|
|
|
|
return cell
|
|
|
|
case .messages:
|
|
|
|
case .messages:
|
|
|
|
guard let cell = tableView.dequeueReusableCell(withIdentifier: MessageSearchResultCell.reuseIdentifier) as? MessageSearchResultCell else {
|
|
|
|
guard let cell = tableView.dequeueReusableCell(withIdentifier: HomeViewCell.cellReuseIdentifier()) as? HomeViewCell else {
|
|
|
|
owsFail("cell was unexpectedly nil")
|
|
|
|
owsFail("cell was unexpectedly nil")
|
|
|
|
return UITableViewCell()
|
|
|
|
return UITableViewCell()
|
|
|
|
}
|
|
|
|
}
|
|
|
|
@ -166,7 +169,32 @@ class ConversationSearchViewController: UITableViewController {
|
|
|
|
return UITableViewCell()
|
|
|
|
return UITableViewCell()
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
cell.configure(searchResult: searchResult)
|
|
|
|
var overrideSnippet = NSAttributedString()
|
|
|
|
|
|
|
|
var overrideDate: Date?
|
|
|
|
|
|
|
|
if searchResult.messageId != nil {
|
|
|
|
|
|
|
|
if let messageDate = searchResult.messageDate {
|
|
|
|
|
|
|
|
overrideDate = messageDate
|
|
|
|
|
|
|
|
} else {
|
|
|
|
|
|
|
|
owsFail("\(ConversationSearchViewController.logTag) message search result is missing message timestamp")
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
// Note that we only use the snippet for message results,
|
|
|
|
|
|
|
|
// not conversation results. HomeViewCell will generate
|
|
|
|
|
|
|
|
// a snippet for conversations that reflects the latest
|
|
|
|
|
|
|
|
// contents.
|
|
|
|
|
|
|
|
if let messageSnippet = searchResult.snippet {
|
|
|
|
|
|
|
|
overrideSnippet = NSAttributedString(string: messageSnippet)
|
|
|
|
|
|
|
|
} else {
|
|
|
|
|
|
|
|
owsFail("\(ConversationSearchViewController.logTag) message search result is missing message snippet")
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
cell.configure(withThread: searchResult.thread,
|
|
|
|
|
|
|
|
contactsManager: contactsManager,
|
|
|
|
|
|
|
|
blockedPhoneNumber: self.blockedPhoneNumberSet,
|
|
|
|
|
|
|
|
overrideSnippet: overrideSnippet,
|
|
|
|
|
|
|
|
overrideDate: overrideDate)
|
|
|
|
|
|
|
|
|
|
|
|
return cell
|
|
|
|
return cell
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
@ -227,154 +255,6 @@ class ConversationSearchViewController: UITableViewController {
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
class ConversationSearchResultCell: UITableViewCell {
|
|
|
|
|
|
|
|
static let reuseIdentifier = "ConversationSearchResultCell"
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
let nameLabel: UILabel
|
|
|
|
|
|
|
|
let snippetLabel: UILabel
|
|
|
|
|
|
|
|
let avatarView: AvatarImageView
|
|
|
|
|
|
|
|
let avatarWidth: UInt = 40
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
override init(style: UITableViewCellStyle, reuseIdentifier: String?) {
|
|
|
|
|
|
|
|
self.nameLabel = UILabel()
|
|
|
|
|
|
|
|
self.snippetLabel = UILabel()
|
|
|
|
|
|
|
|
self.avatarView = AvatarImageView()
|
|
|
|
|
|
|
|
avatarView.autoSetDimensions(to: CGSize(width: CGFloat(avatarWidth), height: CGFloat(avatarWidth)))
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
super.init(style: style, reuseIdentifier: reuseIdentifier)
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
nameLabel.font = UIFont.ows_dynamicTypeBody.ows_mediumWeight()
|
|
|
|
|
|
|
|
snippetLabel.font = UIFont.ows_dynamicTypeFootnote
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
let textRows = UIStackView(arrangedSubviews: [nameLabel, snippetLabel])
|
|
|
|
|
|
|
|
textRows.axis = .vertical
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
let columns = UIStackView(arrangedSubviews: [avatarView, textRows])
|
|
|
|
|
|
|
|
columns.axis = .horizontal
|
|
|
|
|
|
|
|
columns.spacing = 8
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
contentView.addSubview(columns)
|
|
|
|
|
|
|
|
columns.autoPinEdgesToSuperviewMargins()
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
required init?(coder aDecoder: NSCoder) {
|
|
|
|
|
|
|
|
fatalError("init(coder:) has not been implemented")
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
var contactsManager: OWSContactsManager {
|
|
|
|
|
|
|
|
return Environment.current().contactsManager
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
func configure(searchResult: ConversationSearchResult) {
|
|
|
|
|
|
|
|
self.avatarView.image = OWSAvatarBuilder.buildImage(thread: searchResult.thread.threadRecord, diameter: avatarWidth, contactsManager: self.contactsManager)
|
|
|
|
|
|
|
|
self.nameLabel.text = searchResult.thread.name
|
|
|
|
|
|
|
|
self.snippetLabel.text = searchResult.snippet
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
class MessageSearchResultCell: UITableViewCell {
|
|
|
|
|
|
|
|
static let reuseIdentifier = "MessageSearchResultCell"
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
let nameLabel: UILabel
|
|
|
|
|
|
|
|
let snippetLabel: UILabel
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
override init(style: UITableViewCellStyle, reuseIdentifier: String?) {
|
|
|
|
|
|
|
|
self.nameLabel = UILabel()
|
|
|
|
|
|
|
|
self.snippetLabel = UILabel()
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
super.init(style: style, reuseIdentifier: reuseIdentifier)
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
nameLabel.font = UIFont.ows_dynamicTypeBody.ows_mediumWeight()
|
|
|
|
|
|
|
|
snippetLabel.font = UIFont.ows_dynamicTypeFootnote
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
let textRows = UIStackView(arrangedSubviews: [nameLabel, snippetLabel])
|
|
|
|
|
|
|
|
textRows.axis = .vertical
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
contentView.addSubview(textRows)
|
|
|
|
|
|
|
|
textRows.autoPinEdgesToSuperviewMargins()
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
required init?(coder aDecoder: NSCoder) {
|
|
|
|
|
|
|
|
fatalError("init(coder:) has not been implemented")
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
func configure(searchResult: ConversationSearchResult) {
|
|
|
|
|
|
|
|
self.nameLabel.text = searchResult.thread.name
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
guard let snippet = searchResult.snippet else {
|
|
|
|
|
|
|
|
self.snippetLabel.text = nil
|
|
|
|
|
|
|
|
return
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
guard let encodedString = snippet.data(using: .utf8) else {
|
|
|
|
|
|
|
|
self.snippetLabel.text = nil
|
|
|
|
|
|
|
|
return
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
// Bold snippet text
|
|
|
|
|
|
|
|
do {
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
// FIXME - The snippet marks up the matched search text with <b> tags.
|
|
|
|
|
|
|
|
// We can parse this into an attributed string, but it also takes on an undesirable font.
|
|
|
|
|
|
|
|
// We want to apply our own font without clobbering bold in the process - maybe by enumerating and inspecting the attributes? Or maybe we can pass in a base font?
|
|
|
|
|
|
|
|
let attributedSnippet = try NSMutableAttributedString(data: encodedString,
|
|
|
|
|
|
|
|
options: [NSAttributedString.DocumentReadingOptionKey.documentType: NSAttributedString.DocumentType.html],
|
|
|
|
|
|
|
|
documentAttributes: nil)
|
|
|
|
|
|
|
|
attributedSnippet.addAttribute(NSAttributedStringKey.font, value: self.snippetLabel.font, range: NSRange(location: 0, length: attributedSnippet.length))
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
self.snippetLabel.attributedText = attributedSnippet
|
|
|
|
|
|
|
|
} catch {
|
|
|
|
|
|
|
|
owsFail("failed to generate snippet: \(error)")
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
class ContactSearchResultCell: UITableViewCell {
|
|
|
|
|
|
|
|
static let reuseIdentifier = "ContactSearchResultCell"
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
let nameLabel: UILabel
|
|
|
|
|
|
|
|
let snippetLabel: UILabel
|
|
|
|
|
|
|
|
let avatarView: AvatarImageView
|
|
|
|
|
|
|
|
let avatarWidth: UInt = 40
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
override init(style: UITableViewCellStyle, reuseIdentifier: String?) {
|
|
|
|
|
|
|
|
self.nameLabel = UILabel()
|
|
|
|
|
|
|
|
self.snippetLabel = UILabel()
|
|
|
|
|
|
|
|
self.avatarView = AvatarImageView()
|
|
|
|
|
|
|
|
avatarView.autoSetDimensions(to: CGSize(width: CGFloat(avatarWidth), height: CGFloat(avatarWidth)))
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
super.init(style: style, reuseIdentifier: reuseIdentifier)
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
nameLabel.font = UIFont.ows_dynamicTypeBody.ows_mediumWeight()
|
|
|
|
|
|
|
|
snippetLabel.font = UIFont.ows_dynamicTypeFootnote
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
let textRows = UIStackView(arrangedSubviews: [nameLabel, snippetLabel])
|
|
|
|
|
|
|
|
textRows.axis = .vertical
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
let columns = UIStackView(arrangedSubviews: [avatarView, textRows])
|
|
|
|
|
|
|
|
columns.axis = .horizontal
|
|
|
|
|
|
|
|
columns.spacing = 8
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
contentView.addSubview(columns)
|
|
|
|
|
|
|
|
columns.autoPinEdgesToSuperviewMargins()
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
required init?(coder aDecoder: NSCoder) {
|
|
|
|
|
|
|
|
fatalError("init(coder:) has not been implemented")
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
var contactsManager: OWSContactsManager {
|
|
|
|
|
|
|
|
return Environment.current().contactsManager
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
func configure(searchResult: ContactSearchResult) {
|
|
|
|
|
|
|
|
let avatarBuilder = OWSContactAvatarBuilder.init(signalId: searchResult.recipientId, diameter: avatarWidth, contactsManager: contactsManager)
|
|
|
|
|
|
|
|
self.avatarView.image = avatarBuilder.build()
|
|
|
|
|
|
|
|
self.nameLabel.text = self.contactsManager.displayName(forPhoneIdentifier: searchResult.recipientId)
|
|
|
|
|
|
|
|
self.snippetLabel.text = searchResult.recipientId
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
class EmptySearchResultCell: UITableViewCell {
|
|
|
|
class EmptySearchResultCell: UITableViewCell {
|
|
|
|
static let reuseIdentifier = "EmptySearchResultCell"
|
|
|
|
static let reuseIdentifier = "EmptySearchResultCell"
|
|
|
|
|
|
|
|
|
|
|
|
|
Matthew Chen
7 years ago