mirror of https://github.com/oxen-io/session-ios
Start new conversation screen redesign
Niels Andriesse
6 years ago
parent
a292aedf7b
commit
823d6de2e6
@ -0,0 +1,170 @@
|
|||||||
|
|
||||||
|
@objc(LKNewConversationVCV2)
|
||||||
|
final class NewConversationVCV2 : OWSViewController, OWSQRScannerDelegate {
|
||||||
|
|
||||||
|
private lazy var userHexEncodedPublicKey: String = {
|
||||||
|
let userDefaults = UserDefaults.standard
|
||||||
|
if let masterHexEncodedPublicKey = userDefaults.string(forKey: "masterDeviceHexEncodedPublicKey") {
|
||||||
|
return masterHexEncodedPublicKey
|
||||||
|
} else {
|
||||||
|
return OWSIdentityManager.shared().identityKeyPair()!.hexEncodedPublicKey
|
||||||
|
}
|
||||||
|
}()
|
||||||
|
|
||||||
|
// MARK: Components
|
||||||
|
private lazy var publicKeyTextField = TextField(placeholder: NSLocalizedString("Enter public key of recipient", comment: ""))
|
||||||
|
|
||||||
|
// MARK: Lifecycle
|
||||||
|
override func viewDidLoad() {
|
||||||
|
// Set gradient background
|
||||||
|
view.backgroundColor = .clear
|
||||||
|
let gradient = Gradients.defaultLokiBackground
|
||||||
|
view.setGradient(gradient)
|
||||||
|
// Set navigation bar background color
|
||||||
|
if let navigationBar = navigationController?.navigationBar {
|
||||||
|
navigationBar.setBackgroundImage(UIImage(), for: UIBarMetrics.default)
|
||||||
|
navigationBar.shadowImage = UIImage()
|
||||||
|
navigationBar.isTranslucent = false
|
||||||
|
navigationBar.barTintColor = Colors.navigationBarBackground
|
||||||
|
}
|
||||||
|
// Set up the navigation bar buttons
|
||||||
|
let closeButton = UIBarButtonItem(image: #imageLiteral(resourceName: "X"), style: .plain, target: self, action: #selector(close))
|
||||||
|
closeButton.tintColor = Colors.text
|
||||||
|
navigationItem.leftBarButtonItem = closeButton
|
||||||
|
// Customize title
|
||||||
|
let titleLabel = UILabel()
|
||||||
|
titleLabel.text = NSLocalizedString("New Conversation", comment: "")
|
||||||
|
titleLabel.textColor = Colors.text
|
||||||
|
titleLabel.font = UIFont.boldSystemFont(ofSize: Values.veryLargeFontSize)
|
||||||
|
navigationItem.titleView = titleLabel
|
||||||
|
// Set up explanation label
|
||||||
|
let explanationLabel = UILabel()
|
||||||
|
explanationLabel.textColor = Colors.unimportant
|
||||||
|
explanationLabel.font = .systemFont(ofSize: Values.smallFontSize)
|
||||||
|
explanationLabel.text = NSLocalizedString("Users can share their public key by going into their account settings and tapping \"Share Public Key\", or by sharing their QR code.", comment: "")
|
||||||
|
explanationLabel.numberOfLines = 0
|
||||||
|
explanationLabel.textAlignment = .center
|
||||||
|
explanationLabel.lineBreakMode = .byWordWrapping
|
||||||
|
// Set up separator
|
||||||
|
let separator = Separator(title: NSLocalizedString("Your Public Key", comment: ""))
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
// // Background color & margins
|
||||||
|
// view.backgroundColor = Theme.backgroundColor
|
||||||
|
// view.layoutMargins = .zero
|
||||||
|
// // Navigation bar
|
||||||
|
// navigationItem.leftBarButtonItem = UIBarButtonItem(barButtonSystemItem: .stop, target: self, action: #selector(close))
|
||||||
|
// title = NSLocalizedString("New Conversation", comment: "")
|
||||||
|
// // Separator
|
||||||
|
// let separator = UIView()
|
||||||
|
// separator.autoSetDimension(.height, toSize: 1 / UIScreen.main.scale)
|
||||||
|
// separator.backgroundColor = Theme.hairlineColor
|
||||||
|
// // Explanation label
|
||||||
|
// let explanationLabel = UILabel()
|
||||||
|
// explanationLabel.textColor = Theme.primaryColor
|
||||||
|
// explanationLabel.font = UIFont.ows_dynamicTypeSubheadlineClamped
|
||||||
|
// explanationLabel.text = NSLocalizedString("Enter the public key of the person you'd like to securely message. They can share their public key with you by going into Loki Messenger's in-app settings and clicking \"Share Public Key\".", comment: "")
|
||||||
|
// explanationLabel.numberOfLines = 0
|
||||||
|
// explanationLabel.lineBreakMode = .byWordWrapping
|
||||||
|
// // QR code button
|
||||||
|
// let qrCodeButtonFont = UIFont.ows_dynamicTypeBodyClamped.ows_mediumWeight()
|
||||||
|
// let qrCodeButtonHeight = qrCodeButtonFont.pointSize * 48 / 17
|
||||||
|
// let qrCodeButton = OWSFlatButton.button(title: NSLocalizedString("Scan a QR Code Instead", comment: ""), font: qrCodeButtonFont, titleColor: .lokiGreen(), backgroundColor: .clear, target: self, selector: #selector(scanQRCode))
|
||||||
|
// qrCodeButton.setBackgroundColors(upColor: .clear, downColor: .clear)
|
||||||
|
// qrCodeButton.autoSetDimension(.height, toSize: qrCodeButtonHeight)
|
||||||
|
// qrCodeButton.button.contentHorizontalAlignment = .left
|
||||||
|
// // Next button
|
||||||
|
// let nextButtonFont = UIFont.ows_dynamicTypeBodyClamped.ows_mediumWeight()
|
||||||
|
// let nextButtonHeight = nextButtonFont.pointSize * 48 / 17
|
||||||
|
// let nextButton = OWSFlatButton.button(title: NSLocalizedString("Next", comment: ""), font: nextButtonFont, titleColor: .white, backgroundColor: .lokiGreen(), target: self, selector: #selector(handleNextButtonTapped))
|
||||||
|
// nextButton.autoSetDimension(.height, toSize: nextButtonHeight)
|
||||||
|
// Stack view
|
||||||
|
let stackView = UIStackView(arrangedSubviews: [ publicKeyTextField, UIView.spacer(withHeight: Values.smallSpacing), explanationLabel, UIView.spacer(withHeight: Values.veryLargeSpacing), separator, UIView.vStretchingSpacer() ])
|
||||||
|
stackView.axis = .vertical
|
||||||
|
stackView.alignment = .fill
|
||||||
|
stackView.layoutMargins = UIEdgeInsets(top: Values.mediumSpacing, left: Values.largeSpacing, bottom: Values.mediumSpacing, right: Values.largeSpacing)
|
||||||
|
stackView.isLayoutMarginsRelativeArrangement = true
|
||||||
|
view.addSubview(stackView)
|
||||||
|
stackView.pin(to: view)
|
||||||
|
}
|
||||||
|
|
||||||
|
override func viewDidAppear(_ animated: Bool) {
|
||||||
|
super.viewDidAppear(animated)
|
||||||
|
publicKeyTextField.becomeFirstResponder()
|
||||||
|
}
|
||||||
|
|
||||||
|
// MARK: General
|
||||||
|
@objc private func enableCopyButton() {
|
||||||
|
// copyButton.isUserInteractionEnabled = true
|
||||||
|
// UIView.transition(with: copyButton, duration: 0.25, options: .transitionCrossDissolve, animations: {
|
||||||
|
// self.copyButton.setTitle(NSLocalizedString("Copy", comment: ""))
|
||||||
|
// }, completion: nil)
|
||||||
|
}
|
||||||
|
|
||||||
|
// MARK: Interaction
|
||||||
|
@objc private func close() {
|
||||||
|
dismiss(animated: true, completion: nil)
|
||||||
|
}
|
||||||
|
|
||||||
|
@objc private func copyPublicKey() {
|
||||||
|
// UIPasteboard.general.string = userHexEncodedPublicKey
|
||||||
|
// copyButton.isUserInteractionEnabled = false
|
||||||
|
// UIView.transition(with: copyButton, duration: 0.25, options: .transitionCrossDissolve, animations: {
|
||||||
|
// self.copyButton.setTitle(NSLocalizedString("Copied ✓", comment: ""))
|
||||||
|
// }, completion: nil)
|
||||||
|
// Timer.scheduledTimer(timeInterval: 4, target: self, selector: #selector(enableCopyButton), userInfo: nil, repeats: false)
|
||||||
|
}
|
||||||
|
|
||||||
|
@objc private func sharePublicKey() {
|
||||||
|
let shareVC = UIActivityViewController(activityItems: [ userHexEncodedPublicKey ], applicationActivities: nil)
|
||||||
|
present(shareVC, animated: true, completion: nil)
|
||||||
|
// NSString *hexEncodedPublicKey;
|
||||||
|
// NSString *masterDeviceHexEncodedPublicKey = [NSUserDefaults.standardUserDefaults stringForKey:@"masterDeviceHexEncodedPublicKey"];
|
||||||
|
// if (masterDeviceHexEncodedPublicKey != nil) {
|
||||||
|
// hexEncodedPublicKey = masterDeviceHexEncodedPublicKey;
|
||||||
|
// } else {
|
||||||
|
// hexEncodedPublicKey = OWSIdentityManager.sharedManager.identityKeyPair.hexEncodedPublicKey;
|
||||||
|
// }
|
||||||
|
// UIActivityViewController *shareVC = [[UIActivityViewController alloc] initWithActivityItems:@[ hexEncodedPublicKey ] applicationActivities:nil];
|
||||||
|
// [self presentViewController:shareVC animated:YES completion:nil];
|
||||||
|
// [LKAnalytics.shared track:@"Public Key Shared"];
|
||||||
|
}
|
||||||
|
|
||||||
|
// @objc private func scanQRCode() {
|
||||||
|
// ows_ask(forCameraPermissions: { [weak self] hasCameraAccess in
|
||||||
|
// if hasCameraAccess {
|
||||||
|
// let message = NSLocalizedString("Scan the QR code of the person you'd like to securely message. They can find their QR code by going into Loki Messenger's in-app settings and clicking \"Show QR Code\".", comment: "")
|
||||||
|
// let scanQRCodeWrapperVC = ScanQRCodeWrapperVC(message: message)
|
||||||
|
// scanQRCodeWrapperVC.delegate = self
|
||||||
|
// self?.navigationController!.pushViewController(scanQRCodeWrapperVC, animated: true)
|
||||||
|
// } else {
|
||||||
|
// // Do nothing
|
||||||
|
// }
|
||||||
|
// })
|
||||||
|
// }
|
||||||
|
//
|
||||||
|
// func controller(_ controller: OWSQRCodeScanningViewController, didDetectQRCodeWith string: String) {
|
||||||
|
// Analytics.shared.track("QR Code Scanned")
|
||||||
|
// let hexEncodedPublicKey = string
|
||||||
|
// startNewConversationIfPossible(with: hexEncodedPublicKey)
|
||||||
|
// }
|
||||||
|
|
||||||
|
@objc private func handleNextButtonTapped() {
|
||||||
|
let hexEncodedPublicKey = publicKeyTextField.text?.trimmingCharacters(in: .whitespaces) ?? ""
|
||||||
|
startNewConversationIfPossible(with: hexEncodedPublicKey)
|
||||||
|
}
|
||||||
|
|
||||||
|
private func startNewConversationIfPossible(with hexEncodedPublicKey: String) {
|
||||||
|
if !ECKeyPair.isValidHexEncodedPublicKey(candidate: hexEncodedPublicKey) {
|
||||||
|
let alert = UIAlertController(title: NSLocalizedString("Invalid Public Key", comment: ""), message: NSLocalizedString("Please check the public key you entered and try again.", comment: ""), preferredStyle: .alert)
|
||||||
|
alert.addAction(UIAlertAction(title: NSLocalizedString("OK", comment: ""), style: .default, handler: nil))
|
||||||
|
presentAlert(alert)
|
||||||
|
} else {
|
||||||
|
let thread = TSContactThread.getOrCreateThread(contactId: hexEncodedPublicKey)
|
||||||
|
Analytics.shared.track("New Conversation Started")
|
||||||
|
SignalApp.shared().presentConversation(for: thread, action: .compose, animated: false)
|
||||||
|
presentingViewController!.dismiss(animated: true, completion: nil)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
@ -0,0 +1,65 @@
|
|||||||
|
|
||||||
|
final class Separator : UIView {
|
||||||
|
private let title: String
|
||||||
|
|
||||||
|
// MARK: Components
|
||||||
|
private lazy var titleLabel: UILabel = {
|
||||||
|
let result = UILabel()
|
||||||
|
result.textColor = Colors.text.withAlphaComponent(Values.unimportantElementOpacity)
|
||||||
|
result.font = .systemFont(ofSize: Values.smallFontSize)
|
||||||
|
result.textAlignment = .center
|
||||||
|
return result
|
||||||
|
}()
|
||||||
|
|
||||||
|
private lazy var lineLayer: CAShapeLayer = {
|
||||||
|
let result = CAShapeLayer()
|
||||||
|
result.lineWidth = Values.separatorThickness
|
||||||
|
result.strokeColor = Colors.separator.cgColor
|
||||||
|
result.fillColor = UIColor.clear.cgColor
|
||||||
|
return result
|
||||||
|
}()
|
||||||
|
|
||||||
|
// MARK: Initialization
|
||||||
|
init(title: String) {
|
||||||
|
self.title = title
|
||||||
|
super.init(frame: CGRect.zero)
|
||||||
|
setUpViewHierarchy()
|
||||||
|
}
|
||||||
|
|
||||||
|
override init(frame: CGRect) {
|
||||||
|
preconditionFailure("Use init(title:) instead.")
|
||||||
|
}
|
||||||
|
|
||||||
|
required init?(coder: NSCoder) {
|
||||||
|
preconditionFailure("Use init(title:) instead.")
|
||||||
|
}
|
||||||
|
|
||||||
|
private func setUpViewHierarchy() {
|
||||||
|
titleLabel.text = title
|
||||||
|
addSubview(titleLabel)
|
||||||
|
titleLabel.center(.horizontal, in: self)
|
||||||
|
titleLabel.center(.vertical, in: self)
|
||||||
|
layer.insertSublayer(lineLayer, at: 0)
|
||||||
|
}
|
||||||
|
|
||||||
|
// MARK: Updating
|
||||||
|
override func layoutSubviews() {
|
||||||
|
super.layoutSubviews()
|
||||||
|
updateLineLayer()
|
||||||
|
}
|
||||||
|
|
||||||
|
private func updateLineLayer() {
|
||||||
|
let w = width()
|
||||||
|
let h = height()
|
||||||
|
let path = UIBezierPath()
|
||||||
|
path.move(to: CGPoint(x: 0, y: h / 2))
|
||||||
|
let titleLabelFrame = titleLabel.frame.insetBy(dx: -10, dy: -6)
|
||||||
|
path.addLine(to: CGPoint(x: titleLabelFrame.origin.x, y: h / 2))
|
||||||
|
let oval = UIBezierPath(roundedRect: titleLabelFrame, cornerRadius: Values.separatorCornerRadius)
|
||||||
|
path.append(oval)
|
||||||
|
path.move(to: CGPoint(x: titleLabelFrame.origin.x + titleLabelFrame.width, y: h / 2))
|
||||||
|
path.addLine(to: CGPoint(x: w, y: h / 2))
|
||||||
|
path.close()
|
||||||
|
lineLayer.path = path.cgPath
|
||||||
|
}
|
||||||
|
}
|
||||||
@ -0,0 +1,40 @@
|
|||||||
|
|
||||||
|
final class TextField : UITextField {
|
||||||
|
|
||||||
|
init(placeholder: String) {
|
||||||
|
super.init(frame: CGRect.zero)
|
||||||
|
self.placeholder = placeholder
|
||||||
|
setUpStyle()
|
||||||
|
}
|
||||||
|
|
||||||
|
override init(frame: CGRect) {
|
||||||
|
preconditionFailure("Use init(placeholder:) instead.")
|
||||||
|
}
|
||||||
|
|
||||||
|
required init?(coder: NSCoder) {
|
||||||
|
preconditionFailure("Use init(placeholder:) instead.")
|
||||||
|
}
|
||||||
|
|
||||||
|
private func setUpStyle() {
|
||||||
|
textColor = Colors.text
|
||||||
|
font = .systemFont(ofSize: Values.smallFontSize)
|
||||||
|
let placeholder = NSMutableAttributedString(string: self.placeholder!)
|
||||||
|
let placeholderColor = Colors.text.withAlphaComponent(Values.unimportantElementOpacity)
|
||||||
|
placeholder.addAttribute(.foregroundColor, value: placeholderColor, range: NSRange(location: 0, length: placeholder.length))
|
||||||
|
attributedPlaceholder = placeholder
|
||||||
|
tintColor = Colors.accent
|
||||||
|
keyboardAppearance = .dark
|
||||||
|
set(.height, to: Values.textFieldHeight)
|
||||||
|
layer.borderColor = Colors.border.withAlphaComponent(Values.textFieldBorderOpacity).cgColor
|
||||||
|
layer.borderWidth = Values.borderThickness
|
||||||
|
layer.cornerRadius = Values.textFieldCornerRadius
|
||||||
|
}
|
||||||
|
|
||||||
|
override func textRect(forBounds bounds: CGRect) -> CGRect {
|
||||||
|
return bounds.insetBy(dx: Values.largeSpacing, dy: Values.largeSpacing)
|
||||||
|
}
|
||||||
|
|
||||||
|
override func editingRect(forBounds bounds: CGRect) -> CGRect {
|
||||||
|
return bounds.insetBy(dx: Values.largeSpacing, dy: Values.largeSpacing)
|
||||||
|
}
|
||||||
|
}
|
||||||
Loading…
Reference in New Issue