keejef
/
session-ios
mirror of https://github.com/oxen-io/session-ios
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Removed a resolved todo and fixed some variable naming

Browse Source
pull/559/head
Morgan Pretty 3 years ago
parent bdf2b825ad
commit 6009c30805
4 changed files with 113 additions and 113 deletions
Show Stats Download Patch File Download Diff File

104
Session/Conversations/ConversationVC.swift
Unescape Escape View File

@ -106,18 +106,18 @@ final class ConversationVC : BaseVC, ConversationViewModelDelegate, OWSConversat
}() }()
lazy var messagesTableView: MessagesTableView = { lazy var messagesTableView: MessagesTableView = {
let tableView: MessagesTableView = MessagesTableView() let result: MessagesTableView = MessagesTableView()
tableView.dataSource = self result.dataSource = self
tableView.delegate = self result.delegate = self
tableView.contentInsetAdjustmentBehavior = .never result.contentInsetAdjustmentBehavior = .never
tableView.contentInset = UIEdgeInsets( result.contentInset = UIEdgeInsets(
top: 0, top: 0,
leading: 0, leading: 0,
bottom: Values.mediumSpacing, bottom: Values.mediumSpacing,
trailing: 0 trailing: 0
) )
return tableView return result
}() }()
lazy var snInputView = InputView(delegate: self) lazy var snInputView = InputView(delegate: self)
@ -158,56 +158,56 @@ final class ConversationVC : BaseVC, ConversationViewModelDelegate, OWSConversat
}() }()
lazy var footerControlsStackView: UIStackView = { lazy var footerControlsStackView: UIStackView = {
let stackView: UIStackView = UIStackView() let result: UIStackView = UIStackView()
stackView.translatesAutoresizingMaskIntoConstraints = false result.translatesAutoresizingMaskIntoConstraints = false
stackView.axis = .vertical result.axis = .vertical
stackView.alignment = .trailing result.alignment = .trailing
stackView.distribution = .equalSpacing result.distribution = .equalSpacing
stackView.spacing = 10 result.spacing = 10
stackView.layoutMargins = UIEdgeInsets(top: 0, left: 20, bottom: 0, right: 20) result.layoutMargins = UIEdgeInsets(top: 0, left: 20, bottom: 0, right: 20)
stackView.isLayoutMarginsRelativeArrangement = true result.isLayoutMarginsRelativeArrangement = true
return stackView return result
}() }()
lazy var scrollButton = ScrollToBottomButton(delegate: self) lazy var scrollButton = ScrollToBottomButton(delegate: self)
lazy var messageRequestView: UIView = { lazy var messageRequestView: UIView = {
let view: UIView = UIView() let result: UIView = UIView()
view.translatesAutoresizingMaskIntoConstraints = false result.translatesAutoresizingMaskIntoConstraints = false
view.isHidden = !thread.isMessageRequest() result.isHidden = !thread.isMessageRequest()
view.setGradient(Gradients.defaultBackground) result.setGradient(Gradients.defaultBackground)
return view return result
}() }()
private let messageRequestDescriptionLabel: UILabel = { private let messageRequestDescriptionLabel: UILabel = {
let label: UILabel = UILabel() let result: UILabel = UILabel()
label.translatesAutoresizingMaskIntoConstraints = false result.translatesAutoresizingMaskIntoConstraints = false
label.font = UIFont.systemFont(ofSize: 12) result.font = UIFont.systemFont(ofSize: 12)
label.text = NSLocalizedString("MESSAGE_REQUESTS_INFO", comment: "") result.text = NSLocalizedString("MESSAGE_REQUESTS_INFO", comment: "")
label.textColor = Colors.sessionMessageRequestsInfoText result.textColor = Colors.sessionMessageRequestsInfoText
label.textAlignment = .center result.textAlignment = .center
label.numberOfLines = 2 result.numberOfLines = 2
return label return result
}() }()
private let messageRequestAcceptButton: UIButton = { private let messageRequestAcceptButton: UIButton = {
let button: UIButton = UIButton() let result: UIButton = UIButton()
button.translatesAutoresizingMaskIntoConstraints = false result.translatesAutoresizingMaskIntoConstraints = false
button.clipsToBounds = true result.clipsToBounds = true
button.titleLabel?.font = UIFont.boldSystemFont(ofSize: 18) result.titleLabel?.font = UIFont.boldSystemFont(ofSize: 18)
button.setTitle(NSLocalizedString("TXT_DELETE_ACCEPT", comment: ""), for: .normal) result.setTitle(NSLocalizedString("TXT_DELETE_ACCEPT", comment: ""), for: .normal)
button.setTitleColor(Colors.sessionHeading, for: .normal) result.setTitleColor(Colors.sessionHeading, for: .normal)
button.setBackgroundImage( result.setBackgroundImage(
Colors.sessionHeading Colors.sessionHeading
.withAlphaComponent(isDarkMode ? 0.2 : 0.06) .withAlphaComponent(isDarkMode ? 0.2 : 0.06)
.toImage(isDarkMode: isDarkMode), .toImage(isDarkMode: isDarkMode),
for: .highlighted for: .highlighted
) )
button.layer.cornerRadius = (ConversationVC.messageRequestButtonHeight / 2) result.layer.cornerRadius = (ConversationVC.messageRequestButtonHeight / 2)
button.layer.borderColor = { result.layer.borderColor = {
if #available(iOS 13.0, *) { if #available(iOS 13.0, *) {
return Colors.sessionHeading return Colors.sessionHeading
.resolvedColor( .resolvedColor(
@ -218,27 +218,27 @@ final class ConversationVC : BaseVC, ConversationViewModelDelegate, OWSConversat
return Colors.sessionHeading.cgColor return Colors.sessionHeading.cgColor
}() }()
button.layer.borderWidth = 1 result.layer.borderWidth = 1
button.addTarget(self, action: #selector(acceptMessageRequest), for: .touchUpInside) result.addTarget(self, action: #selector(acceptMessageRequest), for: .touchUpInside)
return button return result
}() }()
private let messageRequestDeleteButton: UIButton = { private let messageRequestDeleteButton: UIButton = {
let button: UIButton = UIButton() let result: UIButton = UIButton()
button.translatesAutoresizingMaskIntoConstraints = false result.translatesAutoresizingMaskIntoConstraints = false
button.clipsToBounds = true result.clipsToBounds = true
button.titleLabel?.font = UIFont.boldSystemFont(ofSize: 18) result.titleLabel?.font = UIFont.boldSystemFont(ofSize: 18)
button.setTitle(NSLocalizedString("TXT_DELETE_TITLE", comment: ""), for: .normal) result.setTitle(NSLocalizedString("TXT_DELETE_TITLE", comment: ""), for: .normal)
button.setTitleColor(Colors.destructive, for: .normal) result.setTitleColor(Colors.destructive, for: .normal)
button.setBackgroundImage( result.setBackgroundImage(
Colors.destructive Colors.destructive
.withAlphaComponent(isDarkMode ? 0.2 : 0.06) .withAlphaComponent(isDarkMode ? 0.2 : 0.06)
.toImage(isDarkMode: isDarkMode), .toImage(isDarkMode: isDarkMode),
for: .highlighted for: .highlighted
) )
button.layer.cornerRadius = (ConversationVC.messageRequestButtonHeight / 2) result.layer.cornerRadius = (ConversationVC.messageRequestButtonHeight / 2)
button.layer.borderColor = { result.layer.borderColor = {
if #available(iOS 13.0, *) { if #available(iOS 13.0, *) {
return Colors.destructive return Colors.destructive
.resolvedColor( .resolvedColor(
@ -249,10 +249,10 @@ final class ConversationVC : BaseVC, ConversationViewModelDelegate, OWSConversat
return Colors.destructive.cgColor return Colors.destructive.cgColor
}() }()
button.layer.borderWidth = 1 result.layer.borderWidth = 1
button.addTarget(self, action: #selector(deleteMessageRequest), for: .touchUpInside) result.addTarget(self, action: #selector(deleteMessageRequest), for: .touchUpInside)
return button return result
}() }()
// MARK: Settings // MARK: Settings

1
Session/Home/HomeVC.swift
Unescape Escape View File

@ -289,7 +289,6 @@ final class HomeVC : BaseVC, UITableViewDataSource, UITableViewDelegate, NewConv
tableView.insertRows(at: [IndexPath(row: 0, section: 0)], with: .automatic) tableView.insertRows(at: [IndexPath(row: 0, section: 0)], with: .automatic)
} }
// TODO: Crash due to change from Message Requests getting approved?
inboxRowChanges.forEach { rowChange in inboxRowChanges.forEach { rowChange in
let rowChange = rowChange as! YapDatabaseViewRowChange let rowChange = rowChange as! YapDatabaseViewRowChange
let key = rowChange.collectionKey.key let key = rowChange.collectionKey.key

59
Session/Home/Message Requests/MessageRequestsViewController.swift
Unescape Escape View File

@ -24,53 +24,54 @@ class MessageRequestsViewController: BaseVC, UITableViewDelegate, UITableViewDat
// MARK: - UI // MARK: - UI
private lazy var tableView: UITableView = { private lazy var tableView: UITableView = {
let tableView: UITableView = UITableView() let result: UITableView = UITableView()
tableView.translatesAutoresizingMaskIntoConstraints = false result.translatesAutoresizingMaskIntoConstraints = false
tableView.backgroundColor = .clear result.backgroundColor = .clear
tableView.separatorStyle = .none result.separatorStyle = .none
tableView.register(MessageRequestsCell.self, forCellReuseIdentifier: MessageRequestsCell.reuseIdentifier) result.register(MessageRequestsCell.self, forCellReuseIdentifier: MessageRequestsCell.reuseIdentifier)
tableView.register(ConversationCell.self, forCellReuseIdentifier: ConversationCell.reuseIdentifier) result.register(ConversationCell.self, forCellReuseIdentifier: ConversationCell.reuseIdentifier)
tableView.dataSource = self result.dataSource = self
tableView.delegate = self result.delegate = self
let bottomInset = Values.newConversationButtonBottomOffset + NewConversationButtonSet.expandedButtonSize + Values.largeSpacing + NewConversationButtonSet.collapsedButtonSize let bottomInset = Values.newConversationButtonBottomOffset + NewConversationButtonSet.expandedButtonSize + Values.largeSpacing + NewConversationButtonSet.collapsedButtonSize
tableView.contentInset = UIEdgeInsets(top: 0, left: 0, bottom: bottomInset, right: 0) result.contentInset = UIEdgeInsets(top: 0, left: 0, bottom: bottomInset, right: 0)
tableView.showsVerticalScrollIndicator = false result.showsVerticalScrollIndicator = false
return tableView return result
}() }()
private lazy var fadeView: UIView = { private lazy var fadeView: UIView = {
let view: UIView = UIView() let result: UIView = UIView()
view.translatesAutoresizingMaskIntoConstraints = false result.translatesAutoresizingMaskIntoConstraints = false
view.isUserInteractionEnabled = false result.isUserInteractionEnabled = false
view.setGradient(Gradients.homeVCFade) result.setGradient(Gradients.homeVCFade)
return view return result
}() }()
private lazy var clearAllButton: UIButton = { private lazy var clearAllButton: UIButton = {
let button: UIButton = UIButton() let result: UIButton = UIButton()
button.translatesAutoresizingMaskIntoConstraints = false result.translatesAutoresizingMaskIntoConstraints = false
button.clipsToBounds = true result.clipsToBounds = true
button.titleLabel?.font = UIFont.boldSystemFont(ofSize: 18) result.titleLabel?.font = UIFont.boldSystemFont(ofSize: 18)
button.setTitle(NSLocalizedString("MESSAGE_REQUESTS_CLEAR_ALL", comment: ""), for: .normal) result.setTitle(NSLocalizedString("MESSAGE_REQUESTS_CLEAR_ALL", comment: ""), for: .normal)
button.setTitleColor(Colors.destructive, for: .normal) result.setTitleColor(Colors.destructive, for: .normal)
button.setBackgroundImage( result.setBackgroundImage(
Colors.destructive Colors.destructive
.withAlphaComponent(isDarkMode ? 0.2 : 0.06) .withAlphaComponent(isDarkMode ? 0.2 : 0.06)
.toImage(isDarkMode: isDarkMode), .toImage(isDarkMode: isDarkMode),
for: .highlighted for: .highlighted
) )
button.layer.cornerRadius = (NewConversationButtonSet.collapsedButtonSize / 2) result.layer.cornerRadius = (NewConversationButtonSet.collapsedButtonSize / 2)
button.layer.borderColor = Colors.destructive.cgColor result.layer.borderColor = Colors.destructive.cgColor
button.layer.borderWidth = 1.5 result.layer.borderWidth = 1.5
button.addTarget(self, action: #selector(clearAllTapped), for: .touchUpInside) result.addTarget(self, action: #selector(clearAllTapped), for: .touchUpInside)
return button return result
}() }()
// MARK: Lifecycle // MARK: - Lifecycle
override func viewDidLoad() { override func viewDidLoad() {
super.viewDidLoad() super.viewDidLoad()

62
Session/Home/Views/MessageRequestsCell.swift
Unescape Escape View File

@ -25,54 +25,54 @@ class MessageRequestsCell: UITableViewCell {
// MARK: - UI // MARK: - UI
private let iconContainerView: UIView = { private let iconContainerView: UIView = {
let view: UIView = UIView() let result: UIView = UIView()
view.translatesAutoresizingMaskIntoConstraints = false result.translatesAutoresizingMaskIntoConstraints = false
view.clipsToBounds = true result.clipsToBounds = true
view.backgroundColor = Colors.sessionMessageRequestsBubble result.backgroundColor = Colors.sessionMessageRequestsBubble
view.layer.cornerRadius = (Values.mediumProfilePictureSize / 2) result.layer.cornerRadius = (Values.mediumProfilePictureSize / 2)
return view return result
}() }()
private let iconImageView: UIImageView = { private let iconImageView: UIImageView = {
let view: UIImageView = UIImageView(image: #imageLiteral(resourceName: "message_requests").withRenderingMode(.alwaysTemplate)) let result: UIImageView = UIImageView(image: #imageLiteral(resourceName: "message_requests").withRenderingMode(.alwaysTemplate))
view.translatesAutoresizingMaskIntoConstraints = false result.translatesAutoresizingMaskIntoConstraints = false
view.tintColor = Colors.sessionMessageRequestsIcon result.tintColor = Colors.sessionMessageRequestsIcon
return view return result
}() }()
private let titleLabel: UILabel = { private let titleLabel: UILabel = {
let label: UILabel = UILabel() let result: UILabel = UILabel()
label.translatesAutoresizingMaskIntoConstraints = false result.translatesAutoresizingMaskIntoConstraints = false
label.setContentHuggingPriority(.defaultHigh, for: .horizontal) result.setContentHuggingPriority(.defaultHigh, for: .horizontal)
label.setContentCompressionResistancePriority(.defaultLow, for: .horizontal) result.setContentCompressionResistancePriority(.defaultLow, for: .horizontal)
label.font = .boldSystemFont(ofSize: Values.mediumFontSize) result.font = .boldSystemFont(ofSize: Values.mediumFontSize)
label.text = NSLocalizedString("MESSAGE_REQUESTS_TITLE", comment: "") result.text = NSLocalizedString("MESSAGE_REQUESTS_TITLE", comment: "")
label.textColor = Colors.sessionMessageRequestsTitle result.textColor = Colors.sessionMessageRequestsTitle
label.lineBreakMode = .byTruncatingTail result.lineBreakMode = .byTruncatingTail
return label return result
}() }()
private let unreadCountView: UIView = { private let unreadCountView: UIView = {
let view: UIView = UIView() let result: UIView = UIView()
view.translatesAutoresizingMaskIntoConstraints = false result.translatesAutoresizingMaskIntoConstraints = false
view.clipsToBounds = true result.clipsToBounds = true
view.backgroundColor = Colors.text.withAlphaComponent(Values.veryLowOpacity) result.backgroundColor = Colors.text.withAlphaComponent(Values.veryLowOpacity)
view.layer.cornerRadius = (ConversationCell.unreadCountViewSize / 2) result.layer.cornerRadius = (ConversationCell.unreadCountViewSize / 2)
return view return result
}() }()
private let unreadCountLabel: UILabel = { private let unreadCountLabel: UILabel = {
let label = UILabel() let result = UILabel()
label.translatesAutoresizingMaskIntoConstraints = false result.translatesAutoresizingMaskIntoConstraints = false
label.font = .boldSystemFont(ofSize: Values.verySmallFontSize) result.font = .boldSystemFont(ofSize: Values.verySmallFontSize)
label.textColor = Colors.text result.textColor = Colors.text
label.textAlignment = .center result.textAlignment = .center
return label return result
}() }()
private func setUpViewHierarchy() { private func setUpViewHierarchy() {

Write Preview
Loading…
Cancel
Save