mbrucedogs/mvm_core_ui
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'bugfix/kevin_lastminute' into 'release/6_14_merge'

Browse Source 
Bugfix/kevin lastminute

See merge request BPHV_MIPS/mvm_core_ui!49
This commit is contained in:
Suresh, Kamlesh 2019-04-26 13:48:20 -04:00
commit 6bb476e392
3 changed files with 31 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
MVMCoreUI/Atoms/Buttons/CaretButton.swift
View File

@ -13,8 +13,9 @@ open class CaretButton: MFCustomButton {
// MARK: - Constants
//------------------------------------------------------
private let CaretViewHeight: Float = 10.8
private let CaretViewWidth: Float = 6.6
private let CARET_VIEW_HEIGHT: Float = 10.5
private let CARET_VIEW_WIDTH: Float = 6.5
//------------------------------------------------------
// MARK: - Properties
@ -25,17 +26,11 @@ open class CaretButton: MFCustomButton {
@objc public var rightViewWidth: NSNumber?
@objc public var enabledColor: UIColor = .black {
didSet {
setTitleColor(enabledColor, for: .normal)
changeCaretColor()
}
didSet { changeCaretColor() }
}
@objc public var disabledColor: UIColor = .mfSilver() {
didSet {
setTitleColor(disabledColor, for: .disabled)
changeCaretColor()
}
didSet { changeCaretColor() }
}
private var caretSpacingConstraint: NSLayoutConstraint?
@ -61,10 +56,11 @@ open class CaretButton: MFCustomButton {
//------------------------------------------------------
private func changeCaretColor() {
setTitleColor(enabledColor, for: .normal)
setTitleColor(disabledColor, for: .disabled)
if let rightCaretView = rightView as? CaretView {
let lineColor = isEnabled ? enabledColor : disabledColor
rightCaretView.setLineColor(lineColor)
rightCaretView.setLineColor(isEnabled ? enabledColor : disabledColor)
}
}
@ -72,8 +68,8 @@ open class CaretButton: MFCustomButton {
rightView?.removeFromSuperview()
let width = CGFloat(rightViewWidth?.floatValue ?? CaretViewWidth)
let height = CGFloat(rightViewHeight?.floatValue ?? CaretViewHeight)
let width = CGFloat(rightViewWidth?.floatValue ?? CARET_VIEW_WIDTH)
let height = CGFloat(rightViewHeight?.floatValue ?? CARET_VIEW_HEIGHT)
let edgeInsets: UIEdgeInsets = contentEdgeInsets
contentEdgeInsets = UIEdgeInsets(top: edgeInsets.top, left: edgeInsets.left, bottom: edgeInsets.bottom, right: 4 + width)

14
MVMCoreUI/Atoms/Views/CaretView.swift
View File

@ -21,7 +21,7 @@ open class CaretView: MFView {
//------------------------------------------------------
@objc public init() {
super.init(frame: CGRect.zero)
super.init(frame: .zero)
}
@objc public override init(frame: CGRect) {
@ -98,25 +98,25 @@ open class CaretView: MFView {
open override func setWithJSON(_ json: [AnyHashable: Any]?, delegateObject: DelegateObject?, additionalData: [AnyHashable: Any]?) {
super.setWithJSON(json, delegateObject: delegateObject, additionalData: additionalData)
// Configure class properties with JSON values
guard let jsonDictionary = json else { return }
guard let dictionary = json else { return }
if let backgroundColorHex = jsonDictionary[KeyBackgroundColor] as? String {
if let backgroundColorHex = dictionary[KeyBackgroundColor] as? String {
backgroundColor = UIColor.mfGet(forHex: backgroundColorHex)
}
if let strokeColorHex = jsonDictionary["strokeColor"] as? String {
if let strokeColorHex = dictionary["strokeColor"] as? String {
strokeColor = UIColor.mfGet(forHex: strokeColorHex)
}
if let isHiddenValue = jsonDictionary[KeyIsHidden] as? Bool {
if let isHiddenValue = dictionary[KeyIsHidden] as? Bool {
isHidden = isHiddenValue
}
if let isOpaqueValue = jsonDictionary[KeyIsOpaque] as? Bool {
if let isOpaqueValue = dictionary[KeyIsOpaque] as? Bool {
isOpaque = isOpaqueValue
}
if let lineWidthValue = jsonDictionary["lineWidth"] as? CGFloat {
if let lineWidthValue = dictionary["lineWidth"] as? CGFloat {
lineWidth = lineWidthValue
}
}

19
MVMCoreUI/Atoms/Views/LabelWithInternalButton.swift
View File

@ -26,7 +26,7 @@ public typealias CoreObjectActionLoadPresentDelegate = MVMCoreActionDelegateProt
public var attributedText: NSAttributedString? {
willSet(newAttributedText) {
if let newAttribText = newAttributedText, !newAttribText.string.isEmpty {
if let newAttribText = newAttributedText {
let mutableAttributedText = NSMutableAttributedString(attributedString: newAttribText)
let paragraphStyle = NSMutableParagraphStyle()
@ -74,9 +74,16 @@ public typealias CoreObjectActionLoadPresentDelegate = MVMCoreActionDelegateProt
public var actionText: String?
public var backText: String?
private var text: String? {
willSet(newText) {
attributedText = NSAttributedString(string: newText ?? "")
private var internalText: String = ""
public var text: String? {
get {
return internalText
}
set {
guard let text = newValue else { return }
internalText = text
attributedText = NSAttributedString(string: text)
setAlternateNormalTextAttributes([NSAttributedString.Key.font: normalTextFont as Any])
setAlternateActionTextAttributes([NSAttributedString.Key.font: actionTextFont as Any])
setAlternateNormalTextAttributes([NSAttributedString.Key.foregroundColor: normalTextColor as Any])
@ -201,8 +208,8 @@ public typealias CoreObjectActionLoadPresentDelegate = MVMCoreActionDelegateProt
performAction = wButtonDelegate.button?(wSelf, shouldPerformActionWithMap: actionMap, additionalData: additionalData) ?? false
}
if let wDelegate = weakDelegate as? CoreObjectActionLoadPresentDelegate, performAction {
MVMCoreActionHandler.shared()?.handleAction(with: actionMap, additionalData: additionalData, delegate: wDelegate)
if performAction {
MVMCoreActionHandler.shared()?.handleAction(with: actionMap, additionalData: additionalData, delegate: weakDelegate as? CoreObjectActionLoadPresentDelegate)
}
}
}