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

moar.

Browse Source
This commit is contained in:
Kevin G Christiano 2019-09-25 14:43:29 -04:00
parent 35f7024f8d
commit 38c74acc6e
2 changed files with 7 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
MVMCoreUI/Atoms/Views/Checkbox.swift
View File

@ -31,16 +31,16 @@ import MVMCore
public var checkedColor: UIColor = .black public var checkedColor: UIColor = .black
public var unCheckedColor: UIColor = .mfPaleGrey() public var unCheckedColor: UIColor = .mfPaleGrey()
public var hasRoundBorder = false public var hasRoundCorners = false
private var shapeLayer: CAShapeLayer? private var shapeLayer: CAShapeLayer?
private var _lineColor: UIColor = .black private var _lineColor: UIColor = .black
private var _borderColor: UIColor = .black private var _borderColor: UIColor = .black
private var _lineWidth: CGFloat = 1.0 private var _lineWidth: CGFloat = 1
private var _cornerRadius: CGFloat = 5.0 private var _cornerRadius: CGFloat = 0
public func setCheckMarkLayer() { public func setCheckMarkLayer() {
checkedSquare.layer.cornerRadius = checkbox.isRoundRectCheckMark ? 5.0 : 0 layer.cornerRadius = hasRoundCorners ? 5 : 0
} }
public var lineWidth: CGFloat { public var lineWidth: CGFloat {

23
MVMCoreUI/Atoms/Views/CheckboxWithLabelView.swift
View File

@ -114,29 +114,14 @@
init(checkedColor: UIColor?, unCheck unCheckedColor: UIColor?, attributedText: NSAttributedString?) { init(checkedColor: UIColor?, unCheck unCheckedColor: UIColor?, attributedText: NSAttributedString?) {
super.init(frame: .zero) super.init(frame: .zero)
setup(withCheckedColor: checkedColor, unCheck: unCheckedColor, text: nil) setup(withCheckedColor: checkedColor, unCheck: unCheckedColor, text: nil)
descriptionAttributedText = attributedText setDescriptionAttributedText = attributedText
addAccessibleProperties() addAccessibleProperties()
} }
init?(checkMarkView: MVMCoreUICheckMarkView?, checkedColor: UIColor?, unCheck unCheckedColor: UIColor?, text: String?) { init(hasRoundedCheckbox: Bool) {
super.init(frame: .zero)
checkMark = checkMarkView
setup(withCheckedColor: checkedColor, unCheck: unCheckedColor, text: text)
addAccessibleProperties()
}
init?(checkMarkView: MVMCoreUICheckMarkView?, checkedColor: UIColor?, unCheck unCheckedColor: UIColor?, attributedText: NSAttributedString?) {
super.init(frame: .zero)
checkMark = checkMarkView
setup(withCheckedColor: checkedColor, unCheck: unCheckedColor, text: nil)
descriptionAttributedText = attributedText
addAccessibleProperties()
}
init(roundRect isRoundRect: Bool) {
super.init(frame: .zero) super.init(frame: .zero)
isRoundRectCheckMark = isRoundRect checkbox.hasRoundBorder = hasRoundRectCheckbox
setup(withCheckedColor: .white, unCheck: .white, text: nil) setup(withCheckedColor: .white, unCheck: .white, text: nil)
addAccessibleProperties() addAccessibleProperties()
setCheckMarkLayer() setCheckMarkLayer()
@ -262,8 +247,6 @@ extension CheckboxWithLabelView: FormValidationProtocol {
public func formFieldValue() -> Any? { public func formFieldValue() -> Any? {
return NSNumber(value: checkbox.isSelected) return NSNumber(value: checkbox.isSelected)
} }
} }
// MARK:- Accessibility // MARK:- Accessibility