From 6009c308053b873039c499d30d67ec7a032cca33 Mon Sep 17 00:00:00 2001 From: Morgan Pretty Date: Fri, 11 Feb 2022 17:17:09 +1100 Subject: [PATCH] Removed a resolved todo and fixed some variable naming --- Session/Conversations/ConversationVC.swift | 104 +++++++++--------- Session/Home/HomeVC.swift | 1 - .../MessageRequestsViewController.swift | 59 +++++----- Session/Home/Views/MessageRequestsCell.swift | 62 +++++------ 4 files changed, 113 insertions(+), 113 deletions(-) diff --git a/Session/Conversations/ConversationVC.swift b/Session/Conversations/ConversationVC.swift index 4aef2c616..b975c3c4f 100644 --- a/Session/Conversations/ConversationVC.swift +++ b/Session/Conversations/ConversationVC.swift @@ -106,18 +106,18 @@ final class ConversationVC : BaseVC, ConversationViewModelDelegate, OWSConversat }() lazy var messagesTableView: MessagesTableView = { - let tableView: MessagesTableView = MessagesTableView() - tableView.dataSource = self - tableView.delegate = self - tableView.contentInsetAdjustmentBehavior = .never - tableView.contentInset = UIEdgeInsets( + let result: MessagesTableView = MessagesTableView() + result.dataSource = self + result.delegate = self + result.contentInsetAdjustmentBehavior = .never + result.contentInset = UIEdgeInsets( top: 0, leading: 0, bottom: Values.mediumSpacing, trailing: 0 ) - return tableView + return result }() lazy var snInputView = InputView(delegate: self) @@ -158,56 +158,56 @@ final class ConversationVC : BaseVC, ConversationViewModelDelegate, OWSConversat }() lazy var footerControlsStackView: UIStackView = { - let stackView: UIStackView = UIStackView() - stackView.translatesAutoresizingMaskIntoConstraints = false - stackView.axis = .vertical - stackView.alignment = .trailing - stackView.distribution = .equalSpacing - stackView.spacing = 10 - stackView.layoutMargins = UIEdgeInsets(top: 0, left: 20, bottom: 0, right: 20) - stackView.isLayoutMarginsRelativeArrangement = true + let result: UIStackView = UIStackView() + result.translatesAutoresizingMaskIntoConstraints = false + result.axis = .vertical + result.alignment = .trailing + result.distribution = .equalSpacing + result.spacing = 10 + result.layoutMargins = UIEdgeInsets(top: 0, left: 20, bottom: 0, right: 20) + result.isLayoutMarginsRelativeArrangement = true - return stackView + return result }() lazy var scrollButton = ScrollToBottomButton(delegate: self) lazy var messageRequestView: UIView = { - let view: UIView = UIView() - view.translatesAutoresizingMaskIntoConstraints = false - view.isHidden = !thread.isMessageRequest() - view.setGradient(Gradients.defaultBackground) + let result: UIView = UIView() + result.translatesAutoresizingMaskIntoConstraints = false + result.isHidden = !thread.isMessageRequest() + result.setGradient(Gradients.defaultBackground) - return view + return result }() private let messageRequestDescriptionLabel: UILabel = { - let label: UILabel = UILabel() - label.translatesAutoresizingMaskIntoConstraints = false - label.font = UIFont.systemFont(ofSize: 12) - label.text = NSLocalizedString("MESSAGE_REQUESTS_INFO", comment: "") - label.textColor = Colors.sessionMessageRequestsInfoText - label.textAlignment = .center - label.numberOfLines = 2 + let result: UILabel = UILabel() + result.translatesAutoresizingMaskIntoConstraints = false + result.font = UIFont.systemFont(ofSize: 12) + result.text = NSLocalizedString("MESSAGE_REQUESTS_INFO", comment: "") + result.textColor = Colors.sessionMessageRequestsInfoText + result.textAlignment = .center + result.numberOfLines = 2 - return label + return result }() private let messageRequestAcceptButton: UIButton = { - let button: UIButton = UIButton() - button.translatesAutoresizingMaskIntoConstraints = false - button.clipsToBounds = true - button.titleLabel?.font = UIFont.boldSystemFont(ofSize: 18) - button.setTitle(NSLocalizedString("TXT_DELETE_ACCEPT", comment: ""), for: .normal) - button.setTitleColor(Colors.sessionHeading, for: .normal) - button.setBackgroundImage( + let result: UIButton = UIButton() + result.translatesAutoresizingMaskIntoConstraints = false + result.clipsToBounds = true + result.titleLabel?.font = UIFont.boldSystemFont(ofSize: 18) + result.setTitle(NSLocalizedString("TXT_DELETE_ACCEPT", comment: ""), for: .normal) + result.setTitleColor(Colors.sessionHeading, for: .normal) + result.setBackgroundImage( Colors.sessionHeading .withAlphaComponent(isDarkMode ? 0.2 : 0.06) .toImage(isDarkMode: isDarkMode), for: .highlighted ) - button.layer.cornerRadius = (ConversationVC.messageRequestButtonHeight / 2) - button.layer.borderColor = { + result.layer.cornerRadius = (ConversationVC.messageRequestButtonHeight / 2) + result.layer.borderColor = { if #available(iOS 13.0, *) { return Colors.sessionHeading .resolvedColor( @@ -218,27 +218,27 @@ final class ConversationVC : BaseVC, ConversationViewModelDelegate, OWSConversat return Colors.sessionHeading.cgColor }() - button.layer.borderWidth = 1 - button.addTarget(self, action: #selector(acceptMessageRequest), for: .touchUpInside) + result.layer.borderWidth = 1 + result.addTarget(self, action: #selector(acceptMessageRequest), for: .touchUpInside) - return button + return result }() private let messageRequestDeleteButton: UIButton = { - let button: UIButton = UIButton() - button.translatesAutoresizingMaskIntoConstraints = false - button.clipsToBounds = true - button.titleLabel?.font = UIFont.boldSystemFont(ofSize: 18) - button.setTitle(NSLocalizedString("TXT_DELETE_TITLE", comment: ""), for: .normal) - button.setTitleColor(Colors.destructive, for: .normal) - button.setBackgroundImage( + let result: UIButton = UIButton() + result.translatesAutoresizingMaskIntoConstraints = false + result.clipsToBounds = true + result.titleLabel?.font = UIFont.boldSystemFont(ofSize: 18) + result.setTitle(NSLocalizedString("TXT_DELETE_TITLE", comment: ""), for: .normal) + result.setTitleColor(Colors.destructive, for: .normal) + result.setBackgroundImage( Colors.destructive .withAlphaComponent(isDarkMode ? 0.2 : 0.06) .toImage(isDarkMode: isDarkMode), for: .highlighted ) - button.layer.cornerRadius = (ConversationVC.messageRequestButtonHeight / 2) - button.layer.borderColor = { + result.layer.cornerRadius = (ConversationVC.messageRequestButtonHeight / 2) + result.layer.borderColor = { if #available(iOS 13.0, *) { return Colors.destructive .resolvedColor( @@ -249,10 +249,10 @@ final class ConversationVC : BaseVC, ConversationViewModelDelegate, OWSConversat return Colors.destructive.cgColor }() - button.layer.borderWidth = 1 - button.addTarget(self, action: #selector(deleteMessageRequest), for: .touchUpInside) + result.layer.borderWidth = 1 + result.addTarget(self, action: #selector(deleteMessageRequest), for: .touchUpInside) - return button + return result }() // MARK: Settings diff --git a/Session/Home/HomeVC.swift b/Session/Home/HomeVC.swift index b2a0e279f..ca03fcfcd 100644 --- a/Session/Home/HomeVC.swift +++ b/Session/Home/HomeVC.swift @@ -289,7 +289,6 @@ final class HomeVC : BaseVC, UITableViewDataSource, UITableViewDelegate, NewConv tableView.insertRows(at: [IndexPath(row: 0, section: 0)], with: .automatic) } - // TODO: Crash due to change from Message Requests getting approved? inboxRowChanges.forEach { rowChange in let rowChange = rowChange as! YapDatabaseViewRowChange let key = rowChange.collectionKey.key diff --git a/Session/Home/Message Requests/MessageRequestsViewController.swift b/Session/Home/Message Requests/MessageRequestsViewController.swift index 5a419d9e5..943e90afe 100644 --- a/Session/Home/Message Requests/MessageRequestsViewController.swift +++ b/Session/Home/Message Requests/MessageRequestsViewController.swift @@ -24,53 +24,54 @@ class MessageRequestsViewController: BaseVC, UITableViewDelegate, UITableViewDat // MARK: - UI private lazy var tableView: UITableView = { - let tableView: UITableView = UITableView() - tableView.translatesAutoresizingMaskIntoConstraints = false - tableView.backgroundColor = .clear - tableView.separatorStyle = .none - tableView.register(MessageRequestsCell.self, forCellReuseIdentifier: MessageRequestsCell.reuseIdentifier) - tableView.register(ConversationCell.self, forCellReuseIdentifier: ConversationCell.reuseIdentifier) - tableView.dataSource = self - tableView.delegate = self + let result: UITableView = UITableView() + result.translatesAutoresizingMaskIntoConstraints = false + result.backgroundColor = .clear + result.separatorStyle = .none + result.register(MessageRequestsCell.self, forCellReuseIdentifier: MessageRequestsCell.reuseIdentifier) + result.register(ConversationCell.self, forCellReuseIdentifier: ConversationCell.reuseIdentifier) + result.dataSource = self + result.delegate = self let bottomInset = Values.newConversationButtonBottomOffset + NewConversationButtonSet.expandedButtonSize + Values.largeSpacing + NewConversationButtonSet.collapsedButtonSize - tableView.contentInset = UIEdgeInsets(top: 0, left: 0, bottom: bottomInset, right: 0) - tableView.showsVerticalScrollIndicator = false + result.contentInset = UIEdgeInsets(top: 0, left: 0, bottom: bottomInset, right: 0) + result.showsVerticalScrollIndicator = false - return tableView + return result }() private lazy var fadeView: UIView = { - let view: UIView = UIView() - view.translatesAutoresizingMaskIntoConstraints = false - view.isUserInteractionEnabled = false - view.setGradient(Gradients.homeVCFade) + let result: UIView = UIView() + result.translatesAutoresizingMaskIntoConstraints = false + result.isUserInteractionEnabled = false + result.setGradient(Gradients.homeVCFade) - return view + return result }() private lazy var clearAllButton: UIButton = { - let button: UIButton = UIButton() - button.translatesAutoresizingMaskIntoConstraints = false - button.clipsToBounds = true - button.titleLabel?.font = UIFont.boldSystemFont(ofSize: 18) - button.setTitle(NSLocalizedString("MESSAGE_REQUESTS_CLEAR_ALL", comment: ""), for: .normal) - button.setTitleColor(Colors.destructive, for: .normal) - button.setBackgroundImage( + let result: UIButton = UIButton() + result.translatesAutoresizingMaskIntoConstraints = false + result.clipsToBounds = true + result.titleLabel?.font = UIFont.boldSystemFont(ofSize: 18) + result.setTitle(NSLocalizedString("MESSAGE_REQUESTS_CLEAR_ALL", comment: ""), for: .normal) + result.setTitleColor(Colors.destructive, for: .normal) + result.setBackgroundImage( Colors.destructive .withAlphaComponent(isDarkMode ? 0.2 : 0.06) .toImage(isDarkMode: isDarkMode), for: .highlighted ) - button.layer.cornerRadius = (NewConversationButtonSet.collapsedButtonSize / 2) - button.layer.borderColor = Colors.destructive.cgColor - button.layer.borderWidth = 1.5 - button.addTarget(self, action: #selector(clearAllTapped), for: .touchUpInside) + result.layer.cornerRadius = (NewConversationButtonSet.collapsedButtonSize / 2) + result.layer.borderColor = Colors.destructive.cgColor + result.layer.borderWidth = 1.5 + result.addTarget(self, action: #selector(clearAllTapped), for: .touchUpInside) - return button + return result }() - // MARK: Lifecycle + // MARK: - Lifecycle + override func viewDidLoad() { super.viewDidLoad() diff --git a/Session/Home/Views/MessageRequestsCell.swift b/Session/Home/Views/MessageRequestsCell.swift index cae14730a..5229a9540 100644 --- a/Session/Home/Views/MessageRequestsCell.swift +++ b/Session/Home/Views/MessageRequestsCell.swift @@ -25,54 +25,54 @@ class MessageRequestsCell: UITableViewCell { // MARK: - UI private let iconContainerView: UIView = { - let view: UIView = UIView() - view.translatesAutoresizingMaskIntoConstraints = false - view.clipsToBounds = true - view.backgroundColor = Colors.sessionMessageRequestsBubble - view.layer.cornerRadius = (Values.mediumProfilePictureSize / 2) + let result: UIView = UIView() + result.translatesAutoresizingMaskIntoConstraints = false + result.clipsToBounds = true + result.backgroundColor = Colors.sessionMessageRequestsBubble + result.layer.cornerRadius = (Values.mediumProfilePictureSize / 2) - return view + return result }() private let iconImageView: UIImageView = { - let view: UIImageView = UIImageView(image: #imageLiteral(resourceName: "message_requests").withRenderingMode(.alwaysTemplate)) - view.translatesAutoresizingMaskIntoConstraints = false - view.tintColor = Colors.sessionMessageRequestsIcon + let result: UIImageView = UIImageView(image: #imageLiteral(resourceName: "message_requests").withRenderingMode(.alwaysTemplate)) + result.translatesAutoresizingMaskIntoConstraints = false + result.tintColor = Colors.sessionMessageRequestsIcon - return view + return result }() private let titleLabel: UILabel = { - let label: UILabel = UILabel() - label.translatesAutoresizingMaskIntoConstraints = false - label.setContentHuggingPriority(.defaultHigh, for: .horizontal) - label.setContentCompressionResistancePriority(.defaultLow, for: .horizontal) - label.font = .boldSystemFont(ofSize: Values.mediumFontSize) - label.text = NSLocalizedString("MESSAGE_REQUESTS_TITLE", comment: "") - label.textColor = Colors.sessionMessageRequestsTitle - label.lineBreakMode = .byTruncatingTail + let result: UILabel = UILabel() + result.translatesAutoresizingMaskIntoConstraints = false + result.setContentHuggingPriority(.defaultHigh, for: .horizontal) + result.setContentCompressionResistancePriority(.defaultLow, for: .horizontal) + result.font = .boldSystemFont(ofSize: Values.mediumFontSize) + result.text = NSLocalizedString("MESSAGE_REQUESTS_TITLE", comment: "") + result.textColor = Colors.sessionMessageRequestsTitle + result.lineBreakMode = .byTruncatingTail - return label + return result }() private let unreadCountView: UIView = { - let view: UIView = UIView() - view.translatesAutoresizingMaskIntoConstraints = false - view.clipsToBounds = true - view.backgroundColor = Colors.text.withAlphaComponent(Values.veryLowOpacity) - view.layer.cornerRadius = (ConversationCell.unreadCountViewSize / 2) + let result: UIView = UIView() + result.translatesAutoresizingMaskIntoConstraints = false + result.clipsToBounds = true + result.backgroundColor = Colors.text.withAlphaComponent(Values.veryLowOpacity) + result.layer.cornerRadius = (ConversationCell.unreadCountViewSize / 2) - return view + return result }() private let unreadCountLabel: UILabel = { - let label = UILabel() - label.translatesAutoresizingMaskIntoConstraints = false - label.font = .boldSystemFont(ofSize: Values.verySmallFontSize) - label.textColor = Colors.text - label.textAlignment = .center + let result = UILabel() + result.translatesAutoresizingMaskIntoConstraints = false + result.font = .boldSystemFont(ofSize: Values.verySmallFontSize) + result.textColor = Colors.text + result.textAlignment = .center - return label + return result }() private func setUpViewHierarchy() {