ThePain/Swiftgram
1
0
Fork 0
mirror of https://github.com/Swiftgram/Telegram-iOS.git synced 2025-10-09 03:20:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix color picker

Browse Source
This commit is contained in:
Ilya Laktyushin 2019-11-27 23:44:58 +04:00
parent e602216c7f
commit 252262b441
1 changed files with 27 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
submodules/SettingsUI/Sources/Themes/WallpaperColorPanelNode.swift
View File

@ -102,7 +102,7 @@ private class ColorInputFieldNode: ASDisplayNode, UITextFieldDelegate {
private var previousColor: UIColor?
private var validLayout: (CGSize, Bool)?
private var returned = false
private var skipEndEditing = false
init(theme: PresentationTheme) {
self.theme = theme
@ -190,6 +190,10 @@ private class ColorInputFieldNode: ASDisplayNode, UITextFieldDelegate {
}
@objc private func removePressed() {
if self.textFieldNode.textField.isFirstResponder {
self.skipEndEditing = true
}
self.colorRemoved?()
self.removeButton.layer.removeAnimation(forKey: "opacity")
self.removeButton.alpha = 1.0
@ -218,7 +222,7 @@ private class ColorInputFieldNode: ASDisplayNode, UITextFieldDelegate {
}
@objc func textFieldTextChanged(_ sender: UITextField) {
if let text = sender.text, text.count == 6, let color = UIColor(hexString: text) {
if let color = self.colorFromCurrentText() {
self.setColor(color)
}
@ -228,19 +232,19 @@ private class ColorInputFieldNode: ASDisplayNode, UITextFieldDelegate {
}
@objc func textFieldShouldReturn(_ textField: UITextField) -> Bool {
self.returned = true
if let text = self.textFieldNode.textField.text, text.count == 6, let color = UIColor(hexString: text) {
self.skipEndEditing = true
if let color = self.colorFromCurrentText() {
self.setColor(color)
} else {
self.setColor(self.previousColor ?? .black, isDefault: self.previousIsDefault ?? false)
}
self.textFieldNode.resignFirstResponder()
self.textFieldNode.textField.resignFirstResponder()
return false
}
func textFieldShouldBeginEditing(_ textField: UITextField) -> Bool {
if self.isSelected {
self.returned = false
self.skipEndEditing = false
self.previousColor = self.color
self.previousIsDefault = self.isDefault
@ -254,11 +258,25 @@ private class ColorInputFieldNode: ASDisplayNode, UITextFieldDelegate {
}
@objc func textFieldDidEndEditing(_ textField: UITextField) {
if !self.returned {
if !self.skipEndEditing {
self.setColor(self.previousColor ?? .black, isDefault: self.previousIsDefault ?? false)
}
}
func setSkipEndEditingIfNeeded() {
if self.textFieldNode.textField.isFirstResponder && self.colorFromCurrentText() != nil {
self.skipEndEditing = true
}
}
private func colorFromCurrentText() -> UIColor? {
if let text = self.textFieldNode.textField.text, text.count == 6, let color = UIColor(hexString: text) {
return color
} else {
return nil
}
}
private func updateSelectionLayout(size: CGSize, transition: ContainedViewLayoutTransition) {
self.measureNode.attributedText = NSAttributedString(string: self.textFieldNode.textField.text ?? "", font: self.textFieldNode.textField.font)
let size = self.measureNode.updateLayout(size)
@ -393,6 +411,7 @@ final class WallpaperColorPanelNode: ASDisplayNode {
}
self.firstColorFieldNode.colorSelected = { [weak self] in
if let strongSelf = self {
strongSelf.secondColorFieldNode.setSkipEndEditingIfNeeded()
strongSelf.updateState({ current in
var updated = current
if updated.selection != .none {
@ -428,6 +447,7 @@ final class WallpaperColorPanelNode: ASDisplayNode {
}
self.secondColorFieldNode.colorSelected = { [weak self] in
if let strongSelf = self {
strongSelf.firstColorFieldNode.setSkipEndEditingIfNeeded()
strongSelf.updateState({ current in
var updated = current
updated.selection = .second