diff --git a/Session.xcodeproj/project.pbxproj b/Session.xcodeproj/project.pbxproj index 0f0b70c63..10dfc1ac7 100644 --- a/Session.xcodeproj/project.pbxproj +++ b/Session.xcodeproj/project.pbxproj @@ -140,8 +140,8 @@ 7B4C75CB26B37E0F0000AC89 /* UnsendRequest.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7B4C75CA26B37E0F0000AC89 /* UnsendRequest.swift */; }; 7B4C75CD26BB92060000AC89 /* DeletedMessageView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7B4C75CC26BB92060000AC89 /* DeletedMessageView.swift */; }; 7B7CB18B270591630079FF93 /* ShareLogsModal.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7B7CB18A270591630079FF93 /* ShareLogsModal.swift */; }; - 7BA9057C278E58B300998B3C /* HomeVC+Search.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7BA9057B278E58B300998B3C /* HomeVC+Search.swift */; }; - 7BA9057E27911C5800998B3C /* GlobalSearch.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7BA9057D27911C5800998B3C /* GlobalSearch.swift */; }; + 7BA7F4BB279F9F5800B3A466 /* EmptySearchResultCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7BA7F4BA279F9F5800B3A466 /* EmptySearchResultCell.swift */; }; + 7BA9057E27911C5800998B3C /* GlobalSearchViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7BA9057D27911C5800998B3C /* GlobalSearchViewController.swift */; }; 7BC01A3E241F40AB00BC7C55 /* NotificationServiceExtension.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7BC01A3D241F40AB00BC7C55 /* NotificationServiceExtension.swift */; }; 7BC01A42241F40AB00BC7C55 /* SessionNotificationServiceExtension.appex in Embed App Extensions */ = {isa = PBXBuildFile; fileRef = 7BC01A3B241F40AB00BC7C55 /* SessionNotificationServiceExtension.appex */; settings = {ATTRIBUTES = (RemoveHeadersOnCopy, ); }; }; 7BDCFC08242186E700641C39 /* NotificationServiceExtensionContext.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7BDCFC07242186E700641C39 /* NotificationServiceExtensionContext.swift */; }; @@ -1109,8 +1109,8 @@ 7B4C75CA26B37E0F0000AC89 /* UnsendRequest.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = UnsendRequest.swift; sourceTree = ""; }; 7B4C75CC26BB92060000AC89 /* DeletedMessageView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DeletedMessageView.swift; sourceTree = ""; }; 7B7CB18A270591630079FF93 /* ShareLogsModal.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ShareLogsModal.swift; sourceTree = ""; }; - 7BA9057B278E58B300998B3C /* HomeVC+Search.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "HomeVC+Search.swift"; sourceTree = ""; }; - 7BA9057D27911C5800998B3C /* GlobalSearch.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = GlobalSearch.swift; sourceTree = ""; }; + 7BA7F4BA279F9F5800B3A466 /* EmptySearchResultCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = EmptySearchResultCell.swift; sourceTree = ""; }; + 7BA9057D27911C5800998B3C /* GlobalSearchViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = GlobalSearchViewController.swift; sourceTree = ""; }; 7BC01A3B241F40AB00BC7C55 /* SessionNotificationServiceExtension.appex */ = {isa = PBXFileReference; explicitFileType = "wrapper.app-extension"; includeInIndex = 0; path = SessionNotificationServiceExtension.appex; sourceTree = BUILT_PRODUCTS_DIR; }; 7BC01A3D241F40AB00BC7C55 /* NotificationServiceExtension.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NotificationServiceExtension.swift; sourceTree = ""; }; 7BC01A3F241F40AB00BC7C55 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; @@ -2025,6 +2025,15 @@ path = Utilities; sourceTree = ""; }; + 7BA7F4B9279F9F3700B3A466 /* GlobalSearch */ = { + isa = PBXGroup; + children = ( + 7BA9057D27911C5800998B3C /* GlobalSearchViewController.swift */, + 7BA7F4BA279F9F5800B3A466 /* EmptySearchResultCell.swift */, + ); + path = GlobalSearch; + sourceTree = ""; + }; 7BC01A3C241F40AB00BC7C55 /* SessionNotificationServiceExtension */ = { isa = PBXGroup; children = ( @@ -2760,9 +2769,8 @@ isa = PBXGroup; children = ( B8BB82A4238F627000BA5194 /* HomeVC.swift */, - 7BA9057B278E58B300998B3C /* HomeVC+Search.swift */, B83F2B85240C7B8F000A54AB /* NewConversationButtonSet.swift */, - 7BA9057D27911C5800998B3C /* GlobalSearch.swift */, + 7BA7F4B9279F9F3700B3A466 /* GlobalSearch */, ); path = Home; sourceTree = ""; @@ -4783,7 +4791,6 @@ 7B7CB18B270591630079FF93 /* ShareLogsModal.swift in Sources */, 4C4AEC4520EC343B0020E72B /* DismissableTextField.swift in Sources */, 3496955E219B605E00DCFE74 /* PhotoLibrary.swift in Sources */, - 7BA9057C278E58B300998B3C /* HomeVC+Search.swift in Sources */, C3A76A8D25DB83F90074CB90 /* PermissionMissingModal.swift in Sources */, 340FC8A9204DAC8D007AEB0F /* NotificationSettingsOptionsViewController.m in Sources */, B849789625D4A2F500D0D0B3 /* LinkPreviewView.swift in Sources */, @@ -4818,7 +4825,7 @@ B821494625D4D6FF009C0F2A /* URLModal.swift in Sources */, C374EEEB25DA3CA70073A857 /* ConversationTitleView.swift in Sources */, B88FA7F2260C3EB10049422F /* OpenGroupSuggestionGrid.swift in Sources */, - 7BA9057E27911C5800998B3C /* GlobalSearch.swift in Sources */, + 7BA9057E27911C5800998B3C /* GlobalSearchViewController.swift in Sources */, 4CA485BB2232339F004B9E7D /* PhotoCaptureViewController.swift in Sources */, 34330AA31E79686200DF2FB9 /* OWSProgressView.m in Sources */, 344825C6211390C800DB4BD8 /* OWSOrphanDataCleaner.m in Sources */, @@ -4876,6 +4883,7 @@ 76EB054018170B33006006FC /* AppDelegate.m in Sources */, 340FC8B6204DAC8D007AEB0F /* OWSQRCodeScanningViewController.m in Sources */, C33100082558FF6D00070591 /* NewConversationButtonSet.swift in Sources */, + 7BA7F4BB279F9F5800B3A466 /* EmptySearchResultCell.swift in Sources */, C3AAFFF225AE99710089E6DD /* AppDelegate.swift in Sources */, B8BB82A5238F627000BA5194 /* HomeVC.swift in Sources */, C31A6C5A247F214E001123EF /* UIView+Glow.swift in Sources */, diff --git a/Session/Home/GlobalSearch/EmptySearchResultCell.swift b/Session/Home/GlobalSearch/EmptySearchResultCell.swift new file mode 100644 index 000000000..3feb6cd0d --- /dev/null +++ b/Session/Home/GlobalSearch/EmptySearchResultCell.swift @@ -0,0 +1,57 @@ +// Copyright © 2022 Rangeproof Pty Ltd. All rights reserved. + +import NVActivityIndicatorView + +class EmptySearchResultCell: UITableViewCell { + static let reuseIdentifier = "EmptySearchResultCell" + + private lazy var messageLabel: UILabel = { + let result = UILabel() + result.textAlignment = .center + result.numberOfLines = 3 + result.textColor = Colors.text + result.text = NSLocalizedString("CONVERSATION_SEARCH_NO_RESULTS", comment: "") + return result + }() + + private lazy var spinner: NVActivityIndicatorView = { + let result = NVActivityIndicatorView(frame: CGRect.zero, type: .circleStrokeSpin, color: Colors.text, padding: nil) + result.set(.width, to: 40) + result.set(.height, to: 40) + return result + }() + override init(style: UITableViewCell.CellStyle, reuseIdentifier: String?) { + super.init(style: style, reuseIdentifier: reuseIdentifier) + + backgroundColor = .clear + + contentView.addSubview(messageLabel) + messageLabel.autoSetDimension(.height, toSize: 150) + messageLabel.autoPinEdge(toSuperviewMargin: .top, relation: .greaterThanOrEqual) + messageLabel.autoPinEdge(toSuperviewMargin: .leading, relation: .greaterThanOrEqual) + messageLabel.autoPinEdge(toSuperviewMargin: .bottom, relation: .greaterThanOrEqual) + messageLabel.autoPinEdge(toSuperviewMargin: .trailing, relation: .greaterThanOrEqual) + messageLabel.autoVCenterInSuperview() + messageLabel.autoHCenterInSuperview() + messageLabel.setContentHuggingHigh() + messageLabel.setCompressionResistanceHigh() + + contentView.addSubview(spinner) + spinner.autoCenterInSuperview() + } + + required init?(coder aDecoder: NSCoder) { + notImplemented() + } + + public func configure(isLoading: Bool) { + if isLoading { + spinner.stopAnimating() + spinner.startAnimating() + messageLabel.isHidden = true + } else { + spinner.stopAnimating() + messageLabel.isHidden = false + } + } +} diff --git a/Session/Home/GlobalSearch/GlobalSearchViewController.swift b/Session/Home/GlobalSearch/GlobalSearchViewController.swift new file mode 100644 index 000000000..57a56ee58 --- /dev/null +++ b/Session/Home/GlobalSearch/GlobalSearchViewController.swift @@ -0,0 +1,326 @@ +// Copyright © 2022 Rangeproof Pty Ltd. All rights reserved. + +@objc +class GlobalSearchViewController: BaseVC, UITableViewDelegate, UITableViewDataSource { + @objc public var searchText = "" { + didSet { + AssertIsOnMainThread() + // Use a slight delay to debounce updates. + refreshSearchResults() + } + } + var searchResultSet: HomeScreenSearchResultSet = HomeScreenSearchResultSet.empty + private var lastSearchText: String? + var searcher: FullTextSearcher { + return FullTextSearcher.shared + } + var isLoading = false + + enum SearchSection: Int { + case noResults + case contacts + case messages + } + + // MARK: UI Components + + internal lazy var searchBar: SearchBar = { + let result = SearchBar() + result.tintColor = Colors.text + result.delegate = self + return result + }() + + internal lazy var tableView: UITableView = { + let result = UITableView(frame: .zero, style: .grouped) + result.rowHeight = UITableView.automaticDimension + result.estimatedRowHeight = 60 + result.separatorStyle = .none + result.keyboardDismissMode = .onDrag + result.register(EmptySearchResultCell.self, forCellReuseIdentifier: EmptySearchResultCell.reuseIdentifier) + result.register(ConversationCell.self, forCellReuseIdentifier: ConversationCell.reuseIdentifier) + result.showsVerticalScrollIndicator = false + return result + }() + + // MARK: Dependencies + + var dbReadConnection: YapDatabaseConnection { + return OWSPrimaryStorage.shared().dbReadConnection + } + + // MARK: View Lifecycle + public override func viewDidLoad() { + super.viewDidLoad() + setUpGradientBackground() + + tableView.dataSource = self + tableView.delegate = self + view.addSubview(tableView) + tableView.pin(.leading, to: .leading, of: view) + tableView.pin(.top, to: .top, of: view, withInset: Values.smallSpacing) + tableView.pin(.trailing, to: .trailing, of: view) + tableView.pin(.bottom, to: .bottom, of: view) + + navigationItem.hidesBackButton = true + setupNavigationBar() + } + + public override func viewWillAppear(_ animated: Bool) { + super.viewWillAppear(animated) + searchBar.becomeFirstResponder() + } + + private func setupNavigationBar() { + let searchBarContainer = UIView() + searchBarContainer.layoutMargins = UIEdgeInsets.zero + searchBar.sizeToFit() + searchBar.layoutMargins = UIEdgeInsets.zero + searchBarContainer.set(.height, to: 44) + searchBarContainer.set(.width, to: UIScreen.main.bounds.width - 32) + searchBarContainer.addSubview(searchBar) + searchBar.autoPinEdgesToSuperviewMargins() + navigationItem.titleView = searchBarContainer + } + + private func reloadTableData() { + tableView.reloadData() + } + + // MARK: Update Search Results + + var refreshTimer: Timer? + + private func refreshSearchResults() { + + guard !searchResultSet.isEmpty else { + // To avoid incorrectly showing the "no results" state, + // always search immediately if the current result set is empty. + refreshTimer?.invalidate() + refreshTimer = nil + + updateSearchResults(searchText: searchText) + return + } + + if refreshTimer != nil { + // Don't start a new refresh timer if there's already one active. + return + } + + refreshTimer?.invalidate() + refreshTimer = WeakTimer.scheduledTimer(timeInterval: 0.1, target: self, userInfo: nil, repeats: false) { [weak self] _ in + guard let self = self else { + return + } + + self.updateSearchResults(searchText: self.searchText) + self.refreshTimer = nil + } + } + + private func updateSearchResults(searchText rawSearchText: String) { + + let searchText = rawSearchText.stripped + guard searchText.count > 0 else { + searchResultSet = HomeScreenSearchResultSet.empty + lastSearchText = nil + reloadTableData() + return + } + guard lastSearchText != searchText else { return } + + lastSearchText = searchText + + var searchResults: HomeScreenSearchResultSet? + self.dbReadConnection.asyncRead({[weak self] transaction in + guard let self = self else { return } + self.isLoading = true + searchResults = self.searcher.searchForHomeScreen(searchText: searchText, maxSearchResults: searchText.count * 50, transaction: transaction) + }, completionBlock: { [weak self] in + AssertIsOnMainThread() + guard let self = self, let results = searchResults, self.lastSearchText == searchText else { return } + self.searchResultSet = results + self.isLoading = false + self.reloadTableData() + }) + } + +} + +// MARK: - UISearchBarDelegate +extension GlobalSearchViewController: UISearchBarDelegate { + public func searchBarTextDidBeginEditing(_ searchBar: UISearchBar) { + self.updateSearchText() + self.ensureSearchBarCancelButton() + } + + public func searchBarTextDidEndEditing(_ searchBar: UISearchBar) { + self.updateSearchText() + self.ensureSearchBarCancelButton() + } + + public func searchBar(_ searchBar: UISearchBar, textDidChange searchText: String) { + self.updateSearchText() + self.ensureSearchBarCancelButton() + } + + public func searchBarCancelButtonClicked(_ searchBar: UISearchBar) { + searchBar.text = nil + searchBar.resignFirstResponder() + self.ensureSearchBarCancelButton() + self.navigationController?.popViewController(animated: true) + } + + func ensureSearchBarCancelButton() { + let shouldShowCancelButton = searchBar.isFirstResponder || (searchBar.text ?? "").count > 0 + guard searchBar.showsCancelButton != shouldShowCancelButton else { return } + self.searchBar.setShowsCancelButton(shouldShowCancelButton, animated: true) + } + + func updateSearchText() { + guard let searchText = searchBar.text?.ows_stripped() else { return } + self.searchText = searchText + } +} + +// MARK: - UITableViewDelegate & UITableViewDataSource +extension GlobalSearchViewController { + + // MARK: UITableViewDelegate + + public func tableView(_ tableView: UITableView, didSelectRowAt indexPath: IndexPath) { + tableView.deselectRow(at: indexPath, animated: false) + guard let searchSection = SearchSection(rawValue: indexPath.section) else { return } + switch searchSection { + case .noResults: + SNLog("shouldn't be able to tap 'no results' section") + case .contacts: + let sectionResults = searchResultSet.conversations + guard let searchResult = sectionResults[safe: indexPath.row], let threadId = searchResult.thread.threadRecord.uniqueId, let thread = TSThread.fetch(uniqueId: threadId) else { return } + show(thread, highlightedMessageID: nil, animated: true) + case .messages: + let sectionResults = searchResultSet.messages + guard let searchResult = sectionResults[safe: indexPath.row], let threadId = searchResult.thread.threadRecord.uniqueId, let thread = TSThread.fetch(uniqueId: threadId) else { return } + show(thread, highlightedMessageID: searchResult.messageId, animated: true) + } + tableView.deselectRow(at: indexPath, animated: true) + } + + private func show(_ thread: TSThread, highlightedMessageID: String?, animated: Bool) { + DispatchMainThreadSafe { + if let presentedVC = self.presentedViewController { + presentedVC.dismiss(animated: false, completion: nil) + } + let conversationVC = ConversationVC(thread: thread, focusedMessageID: highlightedMessageID) + self.navigationController?.pushViewController(conversationVC, animated: true) + } + } + + // MARK: UITableViewDataSource + + public func numberOfSections(in tableView: UITableView) -> Int { + return 3 + } + + public func tableView(_ tableView: UITableView, viewForFooterInSection section: Int) -> UIView? { + UIView() + } + + public func tableView(_ tableView: UITableView, heightForFooterInSection section: Int) -> CGFloat { + .leastNonzeroMagnitude + } + + public func tableView(_ tableView: UITableView, heightForHeaderInSection section: Int) -> CGFloat { + guard nil != self.tableView(tableView, titleForHeaderInSection: section) else { + return .leastNonzeroMagnitude + } + return UITableView.automaticDimension + } + + public func tableView(_ tableView: UITableView, viewForHeaderInSection section: Int) -> UIView? { + guard let title = self.tableView(tableView, titleForHeaderInSection: section) else { + return UIView() + } + + let titleLabel = UILabel() + titleLabel.text = title + titleLabel.textColor = Colors.text + titleLabel.font = .boldSystemFont(ofSize: Values.mediumFontSize) + + let container = UIView() + container.backgroundColor = Colors.cellBackground + container.layoutMargins = UIEdgeInsets(top: Values.smallSpacing, left: Values.mediumSpacing, bottom: Values.smallSpacing, right: Values.mediumSpacing) + container.addSubview(titleLabel) + titleLabel.autoPinEdgesToSuperviewMargins() + + return container + } + + public func tableView(_ tableView: UITableView, titleForHeaderInSection section: Int) -> String? { + guard let searchSection = SearchSection(rawValue: section) else { return nil } + + switch searchSection { + case .noResults: + return nil + case .contacts: + if searchResultSet.conversations.count > 0 { + return NSLocalizedString("SEARCH_SECTION_CONTACTS", comment: "") + } else { + return nil + } + case .messages: + if searchResultSet.messages.count > 0 { + return NSLocalizedString("SEARCH_SECTION_MESSAGES", comment: "") + } else { + return nil + } + } + } + + public func tableView(_ tableView: UITableView, numberOfRowsInSection section: Int) -> Int { + guard let searchSection = SearchSection(rawValue: section) else { return 0 } + switch searchSection { + case .noResults: + return (searchText.count > 0 && searchResultSet.isEmpty) ? 1 : 0 + case .contacts: + return searchResultSet.conversations.count + case .messages: + return searchResultSet.messages.count + } + } + + public func tableView(_ tableView: UITableView, heightForRowAt indexPath: IndexPath) -> CGFloat { + return UITableView.automaticDimension + } + + public func tableView(_ tableView: UITableView, cellForRowAt indexPath: IndexPath) -> UITableViewCell { + + guard let searchSection = SearchSection(rawValue: indexPath.section) else { + return UITableViewCell() + } + + switch searchSection { + case .noResults: + guard let cell = tableView.dequeueReusableCell(withIdentifier: EmptySearchResultCell.reuseIdentifier) as? EmptySearchResultCell, indexPath.row == 0 else { return UITableViewCell() } + cell.configure(isLoading: isLoading) + return cell + case .contacts: + let sectionResults = searchResultSet.conversations + let cell = tableView.dequeueReusableCell(withIdentifier: ConversationCell.reuseIdentifier) as! ConversationCell + cell.isShowingGlobalSearchResult = true + let searchResult = sectionResults[safe: indexPath.row] + cell.threadViewModel = searchResult?.thread + cell.configure(messageDate: searchResult?.messageDate, snippet: searchResult?.snippet, searchText: searchResultSet.searchText) + return cell + case .messages: + let sectionResults = searchResultSet.messages + let cell = tableView.dequeueReusableCell(withIdentifier: ConversationCell.reuseIdentifier) as! ConversationCell + cell.isShowingGlobalSearchResult = true + let searchResult = sectionResults[safe: indexPath.row] + cell.threadViewModel = searchResult?.thread + cell.configure(messageDate: searchResult?.messageDate, snippet: searchResult?.snippet, searchText: searchResultSet.searchText) + return cell + } + } +} diff --git a/Session/Home/HomeVC+Search.swift b/Session/Home/HomeVC+Search.swift deleted file mode 100644 index d6af134b5..000000000 --- a/Session/Home/HomeVC+Search.swift +++ /dev/null @@ -1,4 +0,0 @@ -import UIKit - -extension HomeVC { -} diff --git a/Session/Home/HomeVC.swift b/Session/Home/HomeVC.swift index 8fa1a755f..87f4ab0b6 100644 --- a/Session/Home/HomeVC.swift +++ b/Session/Home/HomeVC.swift @@ -295,7 +295,7 @@ final class HomeVC : BaseVC, UITableViewDataSource, UITableViewDelegate, NewConv leftBarButtonItem.isAccessibilityElement = true navigationItem.leftBarButtonItem = leftBarButtonItem // Right bar button item - search button - let rightBarButtonItem = UIBarButtonItem(barButtonSystemItem: .search, target: self, action: nil) + let rightBarButtonItem = UIBarButtonItem(barButtonSystemItem: .search, target: self, action: #selector(showSearchUI)) rightBarButtonItem.accessibilityLabel = "Search button" rightBarButtonItem.isAccessibilityElement = true navigationItem.rightBarButtonItem = rightBarButtonItem @@ -413,6 +413,11 @@ final class HomeVC : BaseVC, UITableViewDataSource, UITableViewDelegate, NewConv present(navigationController, animated: true, completion: nil) } + @objc private func showSearchUI() { + let searchController = GlobalSearchViewController() + self.navigationController?.pushViewController(searchController, animated: true) + } + @objc private func showPath() { let pathVC = PathVC() let navigationController = OWSNavigationController(rootViewController: pathVC) diff --git a/SessionUIKit/Components/SearchBar.swift b/SessionUIKit/Components/SearchBar.swift index aab982f5f..e4748b0ba 100644 --- a/SessionUIKit/Components/SearchBar.swift +++ b/SessionUIKit/Components/SearchBar.swift @@ -29,7 +29,6 @@ public final class SearchBar : UISearchBar { searchTextField.backgroundColor = Colors.searchBarBackground // The search bar background color searchTextField.textColor = Colors.text searchTextField.attributedPlaceholder = NSAttributedString(string: NSLocalizedString("Search", comment: ""), attributes: [ .foregroundColor : Colors.searchBarPlaceholder ]) - searchTextField.keyboardAppearance = .dark setPositionAdjustment(UIOffset(horizontal: 4, vertical: 0), for: UISearchBar.Icon.search) searchTextPositionAdjustment = UIOffset(horizontal: 2, vertical: 0) setPositionAdjustment(UIOffset(horizontal: -4, vertical: 0), for: UISearchBar.Icon.clear)