oxen-io/session-ios
1
0
Fork 0
mirror of https://github.com/oxen-io/session-ios.git synced 2023-12-13 21:30:14 +01:00
Code Issues Projects Releases Wiki Activity

Add primitive color picker.

Browse source
This commit is contained in:
Matthew Chen 2018-12-20 09:59:31 -05:00
parent e6d499a354
commit 8aa68327e6
2 changed files with 27 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
SignalMessaging/ViewControllers/AttachmentApprovalViewController.swift
View file

@ -960,7 +960,6 @@ public class AttachmentPrepViewController: OWSViewController, PlayerProgressBarD
imageMediaView.isUserInteractionEnabled = true
mediaMessageView.superview?.addSubview(imageEditorView)
imageEditorView.autoPin(toEdgesOf: mediaMessageView)
imageEditorView.addRedBorder()
imageEditorView.addControls(to: imageEditorView)
}

30
SignalMessaging/Views/ImageEditor/ImageEditorView.swift
View file

@ -35,6 +35,10 @@ public class ImageEditorView: UIView, ImageEditorModelDelegate {
}
}
// TODO:
private static let defaultColor = UIColor.ows_signalBlue
private var currentColor = ImageEditorView.defaultColor
@objc
public required init(model: ImageEditorModel) {
self.model = model
@ -143,7 +147,11 @@ public class ImageEditorView: UIView, ImageEditorModelDelegate {
label: NSLocalizedString("IMAGE_EDITOR_CROP_BUTTON", comment: "Label for crop button in image editor."),
selector: #selector(didTapCrop(sender:)))
let stackView = UIStackView(arrangedSubviews: [brushButton, cropButton, undoButton, redoButton])
let redButton = colorButton(color: UIColor.red)
let whiteButton = colorButton(color: UIColor.white)
let blackButton = colorButton(color: UIColor.black)
let stackView = UIStackView(arrangedSubviews: [brushButton, cropButton, undoButton, redoButton, redButton, whiteButton, blackButton])
stackView.axis = .vertical
stackView.alignment = .center
stackView.spacing = 10
@ -166,6 +174,17 @@ public class ImageEditorView: UIView, ImageEditorModelDelegate {
button.addTarget(self, action: selector, for: .touchUpInside)
}
private func colorButton(color: UIColor) -> UIButton {
let button = OWSButton { [weak self] in
self?.didSelectColor(color)
}
let size: CGFloat = 20
let swatch = UIImage(color: color, size: CGSize(width: size, height: size))
button.setImage(swatch, for: .normal)
button.addBorder(with: UIColor.white)
return button
}
private func updateButtons() {
undoButton.isEnabled = model.canUndo()
redoButton.isEnabled = model.canRedo()
@ -209,6 +228,12 @@ public class ImageEditorView: UIView, ImageEditorModelDelegate {
updateButtons()
}
@objc func didSelectColor(_ color: UIColor) {
Logger.verbose("")
currentColor = color
}
@objc
public func handleTouchGesture(_ gestureRecognizer: UIGestureRecognizer) {
AssertIsOnMainThread()
@ -250,8 +275,7 @@ public class ImageEditorView: UIView, ImageEditorModelDelegate {
self.currentStrokeSamples.append(newSample)
}
// TODO: Color picker.
let strokeColor = UIColor.blue
let strokeColor = currentColor
// TODO: Tune stroke width.
let unitStrokeWidth = ImageEditorStrokeItem.defaultUnitStrokeWidth()