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

altered isEditable to editable to align with android

Browse Source
This commit is contained in:
Kevin G Christiano 2020-04-29 11:27:53 -04:00
parent 8bb6a7fb1d
commit 7a9d7d8919
2 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
MVMCoreUI/BaseClasses/TextView.swift
View File

@ -280,7 +280,7 @@ import UIKit
open func originalUI() { open func originalUI() {
isEditable = textViewModel?.isEditable ?? true isEditable = textViewModel?.editable ?? true
isUserInteractionEnabled = true isUserInteractionEnabled = true
hideBorders = textViewModel?.hideBorders ?? false hideBorders = textViewModel?.hideBorders ?? false
borderStrokeColor = .mvmCoolGray3 borderStrokeColor = .mvmCoolGray3
@ -290,7 +290,7 @@ import UIKit
open func errorUI() { open func errorUI() {
isEditable = textViewModel?.isEditable ?? true isEditable = textViewModel?.editable ?? true
isUserInteractionEnabled = true isUserInteractionEnabled = true
hideBorders = textViewModel?.hideBorders ?? false hideBorders = textViewModel?.hideBorders ?? false
borderStrokeColor = .mvmOrange borderStrokeColor = .mvmOrange
@ -300,7 +300,7 @@ import UIKit
open func selectedErrorUI() { open func selectedErrorUI() {
isEditable = textViewModel?.isEditable ?? true isEditable = textViewModel?.editable ?? true
isUserInteractionEnabled = true isUserInteractionEnabled = true
hideBorders = textViewModel?.hideBorders ?? false hideBorders = textViewModel?.hideBorders ?? false
borderStrokeColor = .mvmBlack borderStrokeColor = .mvmBlack
@ -310,7 +310,7 @@ import UIKit
open func selectedUI() { open func selectedUI() {
isEditable = textViewModel?.isEditable ?? true isEditable = textViewModel?.editable ?? true
isUserInteractionEnabled = true isUserInteractionEnabled = true
hideBorders = textViewModel?.hideBorders ?? false hideBorders = textViewModel?.hideBorders ?? false
borderStrokeColor = .mvmBlack borderStrokeColor = .mvmBlack
@ -320,7 +320,7 @@ import UIKit
open func disabledUI() { open func disabledUI() {
isEditable = textViewModel?.isEditable ?? false isEditable = textViewModel?.editable ?? false
isUserInteractionEnabled = false isUserInteractionEnabled = false
hideBorders = textViewModel?.hideBorders ?? false hideBorders = textViewModel?.hideBorders ?? false
borderStrokeColor = .mvmCoolGray3 borderStrokeColor = .mvmCoolGray3
@ -437,7 +437,7 @@ extension TextView: MoleculeViewProtocol {
heightConstraint?.isActive = true heightConstraint?.isActive = true
} }
isEditable = model.isEditable isEditable = model.editable
textAlignment = model.textAlignment textAlignment = model.textAlignment
textColor = model.enabledTextColor.uiColor textColor = model.enabledTextColor.uiColor
hideBorders = model.hideBorders hideBorders = model.hideBorders

10
MVMCoreUI/BaseClasses/TextViewModel.swift
View File

@ -26,7 +26,7 @@ open class TextViewModel: TextEntryFieldModel {
public var placeholderFontStyle: Styler.Font = Styler.Font.RegularMicro public var placeholderFontStyle: Styler.Font = Styler.Font.RegularMicro
public var showsPlaceholder: Bool = false public var showsPlaceholder: Bool = false
public var hideBorders: Bool = false public var hideBorders: Bool = false
public var isEditable: Bool = true public var editable: Bool = true
//-------------------------------------------------- //--------------------------------------------------
// MARK: - Keys // MARK: - Keys
@ -41,7 +41,7 @@ open class TextViewModel: TextEntryFieldModel {
case hideBorders case hideBorders
case placeholderFontStyle case placeholderFontStyle
case placeholderTextColor case placeholderTextColor
case isEditable = "editable" case editable
} }
//-------------------------------------------------- //--------------------------------------------------
@ -68,8 +68,8 @@ open class TextViewModel: TextEntryFieldModel {
self.hideBorders = hideBorders self.hideBorders = hideBorders
} }
if let isEditable = try typeContainer.decodeIfPresent(Bool.self, forKey: .isEditable) { if let editable = try typeContainer.decodeIfPresent(Bool.self, forKey: .editable) {
self.isEditable = isEditable self.editable = editable
} }
if let fontStyle = try typeContainer.decodeIfPresent(Styler.Font.self, forKey: .fontStyle) { if let fontStyle = try typeContainer.decodeIfPresent(Styler.Font.self, forKey: .fontStyle) {
@ -90,6 +90,6 @@ open class TextViewModel: TextEntryFieldModel {
try container.encode(placeholderFontStyle, forKey: .placeholderFontStyle) try container.encode(placeholderFontStyle, forKey: .placeholderFontStyle)
try container.encode(placeholderTextColor, forKey: .placeholderTextColor) try container.encode(placeholderTextColor, forKey: .placeholderTextColor)
try container.encode(textAlignment, forKey: .textAlignment) try container.encode(textAlignment, forKey: .textAlignment)
try container.encode(isEditable, forKey: .isEditable) try container.encode(editable, forKey: .editable)
} }
} }