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

WIP, extract subclass

Browse Source
pull/1/head
Michael Kirk 8 years ago committed by sdkjfhsdkjhfsdlkjhfsdf
parent 9ee9a0efeb
commit a5c5dd3f96
2 changed files with 148 additions and 97 deletions
Show Stats Download Patch File Download Diff File

1
Signal/src/ViewControllers/ConversationView/ConversationInputToolbar.m
Unescape Escape View File

@ -123,7 +123,6 @@ static void *kConversationInputTextViewObservingContext = &kConversationInputTex
setTitle:NSLocalizedString(@"SEND_BUTTON_TITLE", @"Label for the send button in the conversation view.") setTitle:NSLocalizedString(@"SEND_BUTTON_TITLE", @"Label for the send button in the conversation view.")
forState:UIControlStateNormal]; forState:UIControlStateNormal];
[self.sendButton setTitleColor:[UIColor ows_materialBlueColor] forState:UIControlStateNormal]; [self.sendButton setTitleColor:[UIColor ows_materialBlueColor] forState:UIControlStateNormal];
self.sendButton.titleLabel.font = [UIFont ows_regularFontWithSize:17.0f];
self.sendButton.titleLabel.textAlignment = NSTextAlignmentCenter; self.sendButton.titleLabel.textAlignment = NSTextAlignmentCenter;
self.sendButton.titleLabel.font = [UIFont ows_mediumFontWithSize:16.f]; self.sendButton.titleLabel.font = [UIFont ows_mediumFontWithSize:16.f];
[self.sendButton addTarget:self action:@selector(sendButtonPressed) forControlEvents:UIControlEventTouchUpInside]; [self.sendButton addTarget:self action:@selector(sendButtonPressed) forControlEvents:UIControlEventTouchUpInside];

244
SignalMessaging/attachments/AttachmentApprovalViewController.swift
Unescape Escape View File

@ -11,9 +11,6 @@ public protocol AttachmentApprovalViewControllerDelegate: class {
func didCancelAttachment(attachment: SignalAttachment) func didCancelAttachment(attachment: SignalAttachment)
} }
// TODO
let kMinTextViewHeight: CGFloat = 80
@objc @objc
public class AttachmentApprovalViewController: OWSViewController, UITextViewDelegate { public class AttachmentApprovalViewController: OWSViewController, UITextViewDelegate {
@ -27,8 +24,6 @@ public class AttachmentApprovalViewController: OWSViewController, UITextViewDele
private(set) var bottomToolbar: UIView! private(set) var bottomToolbar: UIView!
private(set) var mediaMessageView: MediaMessageView! private(set) var mediaMessageView: MediaMessageView!
private(set) var scrollView: UIScrollView! private(set) var scrollView: UIScrollView!
private var textView: UITextView!
private(set) var textViewHeightConstraint: NSLayoutConstraint!
// MARK: Initializers // MARK: Initializers
@ -175,42 +170,43 @@ public class AttachmentApprovalViewController: OWSViewController, UITextViewDele
topToolbar.items = [cancelButton] topToolbar.items = [cancelButton]
// Bottom Toolbar // Bottom Toolbar
let bottomToolbar: UIToolbar = makeClearToolbar() self.bottomToolbar = MessagingToolbar()
self.bottomToolbar = bottomToolbar //// let bottomToolbar: UIToolbar = makeClearToolbar()
self.textView = UITextView() // self.bottomToolbar = bottomToolbar
textView.delegate = self // self.textView = UITextView()
self.textView.backgroundColor = UIColor.white // textView.delegate = self
self.textView.layer.cornerRadius = 4.0 // self.textView.backgroundColor = UIColor.white
// self.textView.layer.cornerRadius = 4.0
let textViewItem = UIBarButtonItem(customView: textView) //
// textView.autoresizingMask = [.flexibleWidth, .flexibleHeight]; // let textViewItem = UIBarButtonItem(customView: textView)
textView.translatesAutoresizingMaskIntoConstraints = false // // textView.autoresizingMask = [.flexibleWidth, .flexibleHeight];
// textView.translatesAutoresizingMaskIntoConstraints = false
let sendTitle = NSLocalizedString("ATTACHMENT_APPROVAL_SEND_BUTTON", comment: "Label for 'send' button in the 'attachment approval' dialog.") //
let sendButton = UIBarButtonItem(title: sendTitle, // let sendTitle = NSLocalizedString("ATTACHMENT_APPROVAL_SEND_BUTTON", comment: "Label for 'send' button in the 'attachment approval' dialog.")
style: .plain, // let sendButton = UIBarButtonItem(title: sendTitle,
target: self, // style: .plain,
action: #selector(sendPressed)) // target: self,
sendButton.tintColor = UIColor.white // action: #selector(sendPressed))
// sendButton.tintColor = UIColor.white
let flexibleSpace = UIBarButtonItem(barButtonSystemItem: .flexibleSpace, target: nil, action: nil) //
bottomToolbar.items = [textViewItem, sendButton] // let flexibleSpace = UIBarButtonItem(barButtonSystemItem: .flexibleSpace, target: nil, action: nil)
// bottomToolbar.items = [flexibleSpace, sendButton] // bottomToolbar.items = [textViewItem, sendButton]
bottomToolbar.setBackgroundImage(UIImage(), forToolbarPosition: .any, barMetrics: .default) //// bottomToolbar.items = [flexibleSpace, sendButton]
// bottomToolbar.backgroundColor = UIColor.clear // bottomToolbar.setBackgroundImage(UIImage(), forToolbarPosition: .any, barMetrics: .default)
bottomToolbar.backgroundColor = UIColor.yellow //// bottomToolbar.backgroundColor = UIColor.clear
bottomToolbar.autoSetDimension(.height, toSize: 40, relation: .greaterThanOrEqual) // bottomToolbar.backgroundColor = UIColor.yellow
// bottomToolbar.autoSetDimension(.height, toSize: 40, relation: .greaterThanOrEqual)
let kToolbarMargin: CGFloat = 4.0 //
// textView.autoSetDimensions(to: CGSize(width: 200, height: 40)) // let kToolbarMargin: CGFloat = 4.0
textView.autoPinEdge(toSuperviewEdge: .leading, withInset: kToolbarMargin) // // textView.autoSetDimensions(to: CGSize(width: 200, height: 40))
textView.autoPinEdge(toSuperviewEdge: .top, withInset: kToolbarMargin) // textView.autoPinEdge(toSuperviewEdge: .leading, withInset: kToolbarMargin)
// TODO get actualy offset based on button size. // textView.autoPinEdge(toSuperviewEdge: .top, withInset: kToolbarMargin)
let kTrailingOffset: CGFloat = 80 // // TODO get actualy offset based on button size.
textView.autoPinEdge(toSuperviewEdge: .trailing, withInset: kTrailingOffset) // let kTrailingOffset: CGFloat = 80
textView.autoPinEdge(toSuperviewEdge: .bottom, withInset: kToolbarMargin) // textView.autoPinEdge(toSuperviewEdge: .trailing, withInset: kTrailingOffset)
// textView.autoPinEdge(toSuperviewEdge: .bottom, withInset: kToolbarMargin)
self.textViewHeightConstraint = textView.autoSetDimension(.height, toSize: kMinTextViewHeight) //
// self.textViewHeightConstraint = textView.autoSetDimension(.height, toSize: kMinTextViewHeight)
// self.bottomToolbar = MessagingToolbar() // self.bottomToolbar = MessagingToolbar()
// Making a toolbar transparent requires setting an empty uiimage // Making a toolbar transparent requires setting an empty uiimage
@ -230,56 +226,112 @@ public class AttachmentApprovalViewController: OWSViewController, UITextViewDele
return true return true
} }
class MessagingToolbar: UIToolbar { class MessagingToolbar: UIToolbar, UITextViewDelegate {
let sendButton: UIButton // let toolbar: UIToolbar
// let sendButton: UIButton
let textView: UITextView let textView: UITextView
private(set) var textViewHeightConstraint: NSLayoutConstraint!
private static var kMinTextViewHeight: CGFloat {
return UIFont.ows_dynamicTypeBody().lineHeight + 4
}
init() { init() {
self.sendButton = UIButton(type: .system) let textView = UITextView()
self.sendButton.setTitle("Send", for: .normal) self.textViewHeightConstraint = textView.autoSetDimension(.height, toSize: MessagingToolbar.kMinTextViewHeight)
self.sendButton.tintColor = UIColor.white self.textView = textView
self.textView = UITextView()
textView.backgroundColor = UIColor.white
textView.layer.cornerRadius = 2.0
super.init(frame: CGRect.zero) super.init(frame: CGRect.zero)
backgroundColor = UIColor.green let kToolbarMargin: CGFloat = 4
let kSendButtonWidth: CGFloat = 40
let kMinToolbarHeight: CGFloat = 40
addSubview(sendButton) self.backgroundColor = UIColor.ows_inputToolbarBackground()
addSubview(textView)
// textView.autoPinEdge(toSuperviewEdge: .leading, withInset: 4.0) textView.backgroundColor = UIColor.white
// textView.autoPinEdge(.trailing, to: .leading, of: sendButton, withOffset: -4.0) textView.layer.cornerRadius = 4.0
// textView.autoPinHeightToSuperview(withMargin: 2.0) textView.font = UIFont.ows_dynamicTypeBody()
// sendButton.autoPinEdge(toSuperviewEdge: .trailing, withInset: 4.0)
// sendButton.autoPinHeightToSuperview(withMargin: 2.0) let textViewItem = UIBarButtonItem(customView: textView)
// self.autoSetDimension(.height, toSize: 40, relation: .greaterThanOrEqual) // TODO is this necessary?
} textView.translatesAutoresizingMaskIntoConstraints = false
override func layoutSubviews() { let sendTitle = NSLocalizedString("ATTACHMENT_APPROVAL_SEND_BUTTON", comment: "Label for 'send' button in the 'attachment approval' dialog.")
super.layoutSubviews()
let kMargin = 4 let sendButton = UIBarButtonItem(title: sendTitle,
let kTextViewHeight = 40 style: .plain,
let kTextViewWidth = 200 target: self,
action: #selector(sendPressed))
// TODO
// self.sendButton.titleLabel.font = [UIFont ows_mediumFontWithSize:16.f];
// center text alignment
sendButton.tintColor = UIColor.ows_materialBlue()
sendButton.width = kSendButtonWidth
let kSendButtonHeight = 40 self.items = [textViewItem, sendButton]
let kSendButtonWidth = 100
self.textView.frame = CGRect(x: kMargin, y: kMargin, width: kTextViewWidth, height: kTextViewHeight) // toolbar doesn't render without some minimum height set.
self.sendButton.frame = CGRect(x: kMargin * 2 + kTextViewWidth, y: kMargin, width: kSendButtonWidth, height: kSendButtonHeight) self.autoSetDimension(.height, toSize: kMinToolbarHeight, relation: .greaterThanOrEqual)
self.frame = CGRect(x: 0, y: 0, width: 320, height: kTextViewHeight + 2 * kMargin)
self.bounds = self.frame
// self.textView.sizeToFit() // Adding textView to a toolbar item inserts it into a "hostView"
// This isn't really documentd, but I've verified it works on iOS10
textView.autoPinEdge(toSuperviewEdge: .leading, withInset: kToolbarMargin)
textView.autoPinEdge(toSuperviewEdge: .top, withInset: kToolbarMargin)
// let maxHeight = max(self.sendButton.frame.size.height, self.textView.frame.size.height) let kTrailingOffset: CGFloat = kSendButtonWidth + kToolbarMargin * 2
// let fittedFrame = CGRect(x: frame.origin.x, y: frame.origin.y, width: frame.size.width, height: maxHeight) textView.autoPinEdge(toSuperviewEdge: .trailing, withInset: kTrailingOffset)
// self.frame = fittedFrame textView.autoPinEdge(toSuperviewEdge: .bottom, withInset: kToolbarMargin)
// self.bounds = fittedFrame
textView.delegate = self
}
// MARK: - UITextViewDelegate
public func textViewDidChange(_ textView: UITextView) {
Logger.debug("\(self.logTag) in \(#function)")
// CGFloat fixedWidth = textView.frame.size.width;
// CGSize newSize = [textView sizeThatFits:CGSizeMake(fixedWidth, MAXFLOAT)];
// CGRect newFrame = textView.frame;
// newFrame.size = CGSizeMake(fmaxf(newSize.width, fixedWidth), newSize.height);
// textView.frame = newFrame;
let fixedWidth = textView.frame.size.width
let newSize = textView.sizeThatFits(CGSize(width: fixedWidth, height: CGFloat.greatestFiniteMagnitude))
// let newFrame = CGRect(x: textView.frame.origin.x, y: textView.frame.origin.y, width: fixedWidth, height: newSize.height)
// Logger.debug("\(self.logTag) oldFrame: \(textView.frame), newFrame: \(newFrame)")
Logger.debug("\(self.logTag) oldHeight: \(self.textViewHeightConstraint.constant), newHeight: \(newSize.height)")
// TODO clamp to a max, only when changed
self.textViewHeightConstraint.constant = max(MessagingToolbar.kMinTextViewHeight, newSize.height)
setNeedsLayout()
layoutIfNeeded()
// textView.frame = newFrame
} }
// override func layoutSubviews() {
// super.layoutSubviews()
//
// let kMargin = 4
// let kTextViewHeight = 40
// let kTextViewWidth = 200
//
// let kSendButtonHeight = 40
// let kSendButtonWidth = 100
//
// self.textView.frame = CGRect(x: kMargin, y: kMargin, width: kTextViewWidth, height: kTextViewHeight)
// self.sendButton.frame = CGRect(x: kMargin * 2 + kTextViewWidth, y: kMargin, width: kSendButtonWidth, height: kSendButtonHeight)
// self.frame = CGRect(x: 0, y: 0, width: 320, height: kTextViewHeight + 2 * kMargin)
// self.bounds = self.frame
//
//// self.textView.sizeToFit()
//
//// let maxHeight = max(self.sendButton.frame.size.height, self.textView.frame.size.height)
//// let fittedFrame = CGRect(x: frame.origin.x, y: frame.origin.y, width: frame.size.width, height: maxHeight)
//// self.frame = fittedFrame
//// self.bounds = fittedFrame
// }
required init?(coder aDecoder: NSCoder) { required init?(coder aDecoder: NSCoder) {
fatalError("init(coder:) has not been implemented") fatalError("init(coder:) has not been implemented")
} }
@ -299,27 +351,27 @@ public class AttachmentApprovalViewController: OWSViewController, UITextViewDele
return toolbar return toolbar
} }
// MARK: - UITextViewDelegate // // MARK: - UITextViewDelegate
//
public func textViewDidChange(_ textView: UITextView) { // public func textViewDidChange(_ textView: UITextView) {
Logger.debug("\(self.logTag) in \(#function)") // Logger.debug("\(self.logTag) in \(#function)")
// CGFloat fixedWidth = textView.frame.size.width; //// CGFloat fixedWidth = textView.frame.size.width;
// CGSize newSize = [textView sizeThatFits:CGSizeMake(fixedWidth, MAXFLOAT)]; //// CGSize newSize = [textView sizeThatFits:CGSizeMake(fixedWidth, MAXFLOAT)];
// CGRect newFrame = textView.frame; //// CGRect newFrame = textView.frame;
// newFrame.size = CGSizeMake(fmaxf(newSize.width, fixedWidth), newSize.height); //// newFrame.size = CGSizeMake(fmaxf(newSize.width, fixedWidth), newSize.height);
// textView.frame = newFrame; //// textView.frame = newFrame;
let fixedWidth = textView.frame.size.width // let fixedWidth = textView.frame.size.width
let newSize = textView.sizeThatFits(CGSize(width: fixedWidth, height: CGFloat.greatestFiniteMagnitude)) // let newSize = textView.sizeThatFits(CGSize(width: fixedWidth, height: CGFloat.greatestFiniteMagnitude))
// let newFrame = CGRect(x: textView.frame.origin.x, y: textView.frame.origin.y, width: fixedWidth, height: newSize.height) //// let newFrame = CGRect(x: textView.frame.origin.x, y: textView.frame.origin.y, width: fixedWidth, height: newSize.height)
// Logger.debug("\(self.logTag) oldFrame: \(textView.frame), newFrame: \(newFrame)") //// Logger.debug("\(self.logTag) oldFrame: \(textView.frame), newFrame: \(newFrame)")
//
Logger.debug("\(self.logTag) oldHeight: \(self.textViewHeightConstraint.constant), newHeight: \(newSize.height)") // Logger.debug("\(self.logTag) oldHeight: \(self.textViewHeightConstraint.constant), newHeight: \(newSize.height)")
// TODO clamp to a max. // // TODO clamp to a max.
self.textViewHeightConstraint.constant = max(kMinTextViewHeight, newSize.height) // self.textViewHeightConstraint.constant = max(kMinTextViewHeight, newSize.height)
self.bottomToolbar.setNeedsLayout() // self.bottomToolbar.setNeedsLayout()
self.bottomToolbar.layoutIfNeeded() // self.bottomToolbar.layoutIfNeeded()
// textView.frame = newFrame //// textView.frame = newFrame
} // }
// - (void)textViewDidChange:(UITextView *)textView // - (void)textViewDidChange:(UITextView *)textView
// MARK: - Event Handlers // MARK: - Event Handlers

Write Preview
Loading…
Cancel
Save