Merge branch 'feature/text_view_atom' into 'develop'
Text view atom See merge request BPHV_MIPS/mvm_core_ui!370
This commit is contained in:
commit
3c47042c30
@ -88,6 +88,8 @@
|
|||||||
0A6682A42434DB8D00AD3CA1 /* ListLeftVariableRadioButtonBodyTextModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0A6682A32434DB8D00AD3CA1 /* ListLeftVariableRadioButtonBodyTextModel.swift */; };
|
0A6682A42434DB8D00AD3CA1 /* ListLeftVariableRadioButtonBodyTextModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0A6682A32434DB8D00AD3CA1 /* ListLeftVariableRadioButtonBodyTextModel.swift */; };
|
||||||
0A6682AA2435125F00AD3CA1 /* Styler.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0A6682A92435125F00AD3CA1 /* Styler.swift */; };
|
0A6682AA2435125F00AD3CA1 /* Styler.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0A6682A92435125F00AD3CA1 /* Styler.swift */; };
|
||||||
0A6682AC243531C300AD3CA1 /* Padding.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0A6682AB243531C300AD3CA1 /* Padding.swift */; };
|
0A6682AC243531C300AD3CA1 /* Padding.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0A6682AB243531C300AD3CA1 /* Padding.swift */; };
|
||||||
|
0A6682B5243769C700AD3CA1 /* TextView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0A6682B3243769C700AD3CA1 /* TextView.swift */; };
|
||||||
|
0A6682B6243769C700AD3CA1 /* TextViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0A6682B4243769C700AD3CA1 /* TextViewModel.swift */; };
|
||||||
0A69F611241BDEA700F7231B /* RuleAnyRequiredModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0A69F610241BDEA700F7231B /* RuleAnyRequiredModel.swift */; };
|
0A69F611241BDEA700F7231B /* RuleAnyRequiredModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0A69F610241BDEA700F7231B /* RuleAnyRequiredModel.swift */; };
|
||||||
0A6BF4722360C56C0028F841 /* BaseDropdownEntryField.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0A6BF4712360C56C0028F841 /* BaseDropdownEntryField.swift */; };
|
0A6BF4722360C56C0028F841 /* BaseDropdownEntryField.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0A6BF4712360C56C0028F841 /* BaseDropdownEntryField.swift */; };
|
||||||
0A7BAD74232A8DC700FB8E22 /* HeadlineBodyButton.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0A7BAD73232A8DC700FB8E22 /* HeadlineBodyButton.swift */; };
|
0A7BAD74232A8DC700FB8E22 /* HeadlineBodyButton.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0A7BAD73232A8DC700FB8E22 /* HeadlineBodyButton.swift */; };
|
||||||
@ -311,6 +313,8 @@
|
|||||||
D282AAB4223FDDAE00C46919 /* MFLoadImageView.swift in Sources */ = {isa = PBXBuildFile; fileRef = D282AAB3223FDDAE00C46919 /* MFLoadImageView.swift */; };
|
D282AAB4223FDDAE00C46919 /* MFLoadImageView.swift in Sources */ = {isa = PBXBuildFile; fileRef = D282AAB3223FDDAE00C46919 /* MFLoadImageView.swift */; };
|
||||||
D282AABA224131D100C46919 /* MFTransparentGIFView.swift in Sources */ = {isa = PBXBuildFile; fileRef = D282AAB9224131D100C46919 /* MFTransparentGIFView.swift */; };
|
D282AABA224131D100C46919 /* MFTransparentGIFView.swift in Sources */ = {isa = PBXBuildFile; fileRef = D282AAB9224131D100C46919 /* MFTransparentGIFView.swift */; };
|
||||||
D282AACB2243C61700C46919 /* ButtonView.swift in Sources */ = {isa = PBXBuildFile; fileRef = D282AACA2243C61700C46919 /* ButtonView.swift */; };
|
D282AACB2243C61700C46919 /* ButtonView.swift in Sources */ = {isa = PBXBuildFile; fileRef = D282AACA2243C61700C46919 /* ButtonView.swift */; };
|
||||||
|
D28764AA2458980300CB882D /* ThreeLayerFillMiddleTemplate.swift in Sources */ = {isa = PBXBuildFile; fileRef = D28764A92458980300CB882D /* ThreeLayerFillMiddleTemplate.swift */; };
|
||||||
|
D28764AC245898A400CB882D /* ThreeLayerFillMiddleTemplateModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = D28764AB245898A400CB882D /* ThreeLayerFillMiddleTemplateModel.swift */; };
|
||||||
D28A837923C7D5BC00DFE4FC /* PageModelProtocol.swift in Sources */ = {isa = PBXBuildFile; fileRef = D28A837823C7D5BC00DFE4FC /* PageModelProtocol.swift */; };
|
D28A837923C7D5BC00DFE4FC /* PageModelProtocol.swift in Sources */ = {isa = PBXBuildFile; fileRef = D28A837823C7D5BC00DFE4FC /* PageModelProtocol.swift */; };
|
||||||
D28A837B23C928DA00DFE4FC /* MoleculeListCellProtocol.swift in Sources */ = {isa = PBXBuildFile; fileRef = D28A837A23C928DA00DFE4FC /* MoleculeListCellProtocol.swift */; };
|
D28A837B23C928DA00DFE4FC /* MoleculeListCellProtocol.swift in Sources */ = {isa = PBXBuildFile; fileRef = D28A837A23C928DA00DFE4FC /* MoleculeListCellProtocol.swift */; };
|
||||||
D28A837D23CCA86A00DFE4FC /* TabsListItemModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = D28A837C23CCA86A00DFE4FC /* TabsListItemModel.swift */; };
|
D28A837D23CCA86A00DFE4FC /* TabsListItemModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = D28A837C23CCA86A00DFE4FC /* TabsListItemModel.swift */; };
|
||||||
@ -542,6 +546,8 @@
|
|||||||
0A6682A32434DB8D00AD3CA1 /* ListLeftVariableRadioButtonBodyTextModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ListLeftVariableRadioButtonBodyTextModel.swift; sourceTree = "<group>"; };
|
0A6682A32434DB8D00AD3CA1 /* ListLeftVariableRadioButtonBodyTextModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ListLeftVariableRadioButtonBodyTextModel.swift; sourceTree = "<group>"; };
|
||||||
0A6682A92435125F00AD3CA1 /* Styler.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Styler.swift; sourceTree = "<group>"; };
|
0A6682A92435125F00AD3CA1 /* Styler.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Styler.swift; sourceTree = "<group>"; };
|
||||||
0A6682AB243531C300AD3CA1 /* Padding.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Padding.swift; sourceTree = "<group>"; };
|
0A6682AB243531C300AD3CA1 /* Padding.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Padding.swift; sourceTree = "<group>"; };
|
||||||
|
0A6682B3243769C700AD3CA1 /* TextView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = TextView.swift; sourceTree = "<group>"; };
|
||||||
|
0A6682B4243769C700AD3CA1 /* TextViewModel.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = TextViewModel.swift; sourceTree = "<group>"; };
|
||||||
0A69F610241BDEA700F7231B /* RuleAnyRequiredModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RuleAnyRequiredModel.swift; sourceTree = "<group>"; };
|
0A69F610241BDEA700F7231B /* RuleAnyRequiredModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RuleAnyRequiredModel.swift; sourceTree = "<group>"; };
|
||||||
0A6BF4712360C56C0028F841 /* BaseDropdownEntryField.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BaseDropdownEntryField.swift; sourceTree = "<group>"; };
|
0A6BF4712360C56C0028F841 /* BaseDropdownEntryField.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BaseDropdownEntryField.swift; sourceTree = "<group>"; };
|
||||||
0A7BAD73232A8DC700FB8E22 /* HeadlineBodyButton.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = HeadlineBodyButton.swift; sourceTree = "<group>"; };
|
0A7BAD73232A8DC700FB8E22 /* HeadlineBodyButton.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = HeadlineBodyButton.swift; sourceTree = "<group>"; };
|
||||||
@ -766,6 +772,8 @@
|
|||||||
D282AAB3223FDDAE00C46919 /* MFLoadImageView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MFLoadImageView.swift; sourceTree = "<group>"; };
|
D282AAB3223FDDAE00C46919 /* MFLoadImageView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MFLoadImageView.swift; sourceTree = "<group>"; };
|
||||||
D282AAB9224131D100C46919 /* MFTransparentGIFView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MFTransparentGIFView.swift; sourceTree = "<group>"; };
|
D282AAB9224131D100C46919 /* MFTransparentGIFView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MFTransparentGIFView.swift; sourceTree = "<group>"; };
|
||||||
D282AACA2243C61700C46919 /* ButtonView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ButtonView.swift; sourceTree = "<group>"; };
|
D282AACA2243C61700C46919 /* ButtonView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ButtonView.swift; sourceTree = "<group>"; };
|
||||||
|
D28764A92458980300CB882D /* ThreeLayerFillMiddleTemplate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ThreeLayerFillMiddleTemplate.swift; sourceTree = "<group>"; };
|
||||||
|
D28764AB245898A400CB882D /* ThreeLayerFillMiddleTemplateModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ThreeLayerFillMiddleTemplateModel.swift; sourceTree = "<group>"; };
|
||||||
D28A837823C7D5BC00DFE4FC /* PageModelProtocol.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PageModelProtocol.swift; sourceTree = "<group>"; };
|
D28A837823C7D5BC00DFE4FC /* PageModelProtocol.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PageModelProtocol.swift; sourceTree = "<group>"; };
|
||||||
D28A837A23C928DA00DFE4FC /* MoleculeListCellProtocol.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MoleculeListCellProtocol.swift; sourceTree = "<group>"; };
|
D28A837A23C928DA00DFE4FC /* MoleculeListCellProtocol.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MoleculeListCellProtocol.swift; sourceTree = "<group>"; };
|
||||||
D28A837C23CCA86A00DFE4FC /* TabsListItemModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TabsListItemModel.swift; sourceTree = "<group>"; };
|
D28A837C23CCA86A00DFE4FC /* TabsListItemModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TabsListItemModel.swift; sourceTree = "<group>"; };
|
||||||
@ -1599,6 +1607,8 @@
|
|||||||
D2D6CD4122E78FAB00D701B8 /* ThreeLayerTemplate.swift */,
|
D2D6CD4122E78FAB00D701B8 /* ThreeLayerTemplate.swift */,
|
||||||
D2092350244F7BE80044AD09 /* ThreeLayerCenterTemplateModel.swift */,
|
D2092350244F7BE80044AD09 /* ThreeLayerCenterTemplateModel.swift */,
|
||||||
D209234E244F77FD0044AD09 /* ThreeLayerCenterTemplate.swift */,
|
D209234E244F77FD0044AD09 /* ThreeLayerCenterTemplate.swift */,
|
||||||
|
D28764AB245898A400CB882D /* ThreeLayerFillMiddleTemplateModel.swift */,
|
||||||
|
D28764A92458980300CB882D /* ThreeLayerFillMiddleTemplate.swift */,
|
||||||
D264FAA4243F66A500D98315 /* CollectionTemplateItemProtocol.swift */,
|
D264FAA4243F66A500D98315 /* CollectionTemplateItemProtocol.swift */,
|
||||||
D264FA8B243BCD8E00D98315 /* CollectionTemplateModel.swift */,
|
D264FA8B243BCD8E00D98315 /* CollectionTemplateModel.swift */,
|
||||||
D264FA8D243BCD9A00D98315 /* CollectionTemplate.swift */,
|
D264FA8D243BCD9A00D98315 /* CollectionTemplate.swift */,
|
||||||
@ -1939,6 +1949,8 @@
|
|||||||
D2B18B7D236090D500A9AEDC /* BaseClasses */ = {
|
D2B18B7D236090D500A9AEDC /* BaseClasses */ = {
|
||||||
isa = PBXGroup;
|
isa = PBXGroup;
|
||||||
children = (
|
children = (
|
||||||
|
0A6682B4243769C700AD3CA1 /* TextViewModel.swift */,
|
||||||
|
0A6682B3243769C700AD3CA1 /* TextView.swift */,
|
||||||
C003506023AA94CD00B6AC29 /* Button.swift */,
|
C003506023AA94CD00B6AC29 /* Button.swift */,
|
||||||
D2B18B7E2360913400A9AEDC /* Control.swift */,
|
D2B18B7E2360913400A9AEDC /* Control.swift */,
|
||||||
D2B18B802360945C00A9AEDC /* View.swift */,
|
D2B18B802360945C00A9AEDC /* View.swift */,
|
||||||
@ -2162,6 +2174,7 @@
|
|||||||
0A7BAD74232A8DC700FB8E22 /* HeadlineBodyButton.swift in Sources */,
|
0A7BAD74232A8DC700FB8E22 /* HeadlineBodyButton.swift in Sources */,
|
||||||
D2FB151D23A40F1500C20E10 /* MoleculeStackItem.swift in Sources */,
|
D2FB151D23A40F1500C20E10 /* MoleculeStackItem.swift in Sources */,
|
||||||
AA11A41F23F15D3100D7962F /* ListRightVariablePayments.swift in Sources */,
|
AA11A41F23F15D3100D7962F /* ListRightVariablePayments.swift in Sources */,
|
||||||
|
D28764AA2458980300CB882D /* ThreeLayerFillMiddleTemplate.swift in Sources */,
|
||||||
D29DF29621E7ADB8003B2FB9 /* StackableViewController.m in Sources */,
|
D29DF29621E7ADB8003B2FB9 /* StackableViewController.m in Sources */,
|
||||||
0116A4E5228B19640094F3ED /* RadioButtonSelectionHelper.swift in Sources */,
|
0116A4E5228B19640094F3ED /* RadioButtonSelectionHelper.swift in Sources */,
|
||||||
D2092353244F7D630044AD09 /* MVMCoreUIViewControllerMappingObject+Extension.swift in Sources */,
|
D2092353244F7D630044AD09 /* MVMCoreUIViewControllerMappingObject+Extension.swift in Sources */,
|
||||||
@ -2169,6 +2182,7 @@
|
|||||||
D2E1FADB2260D3D200AEFD8C /* MVMCoreUIDelegateObject.swift in Sources */,
|
D2E1FADB2260D3D200AEFD8C /* MVMCoreUIDelegateObject.swift in Sources */,
|
||||||
94382086243238D100B43AF3 /* WebViewModel.swift in Sources */,
|
94382086243238D100B43AF3 /* WebViewModel.swift in Sources */,
|
||||||
D27CD40E2322EEAF00C1DC07 /* TabsTableViewCell.swift in Sources */,
|
D27CD40E2322EEAF00C1DC07 /* TabsTableViewCell.swift in Sources */,
|
||||||
|
0A6682B5243769C700AD3CA1 /* TextView.swift in Sources */,
|
||||||
D224799B231965AD003FCCF9 /* AccordionMoleculeTableViewCell.swift in Sources */,
|
D224799B231965AD003FCCF9 /* AccordionMoleculeTableViewCell.swift in Sources */,
|
||||||
D21B7F602437C5BC00051ABF /* MoleculeStackView.swift in Sources */,
|
D21B7F602437C5BC00051ABF /* MoleculeStackView.swift in Sources */,
|
||||||
0A6682A42434DB8D00AD3CA1 /* ListLeftVariableRadioButtonBodyTextModel.swift in Sources */,
|
0A6682A42434DB8D00AD3CA1 /* ListLeftVariableRadioButtonBodyTextModel.swift in Sources */,
|
||||||
@ -2212,6 +2226,7 @@
|
|||||||
AA617AB22453012400910B8F /* ListDeviceComplexLinkSmallModel.swift in Sources */,
|
AA617AB22453012400910B8F /* ListDeviceComplexLinkSmallModel.swift in Sources */,
|
||||||
D260106323D0C05000764D80 /* StackItemModel.swift in Sources */,
|
D260106323D0C05000764D80 /* StackItemModel.swift in Sources */,
|
||||||
D2E2A99823D8D63C000B42E6 /* ActionDetailWithImageModel.swift in Sources */,
|
D2E2A99823D8D63C000B42E6 /* ActionDetailWithImageModel.swift in Sources */,
|
||||||
|
D28764AC245898A400CB882D /* ThreeLayerFillMiddleTemplateModel.swift in Sources */,
|
||||||
BBBBC87D24374A4900B0F079 /* ListThreeColumnBillChangesDividerModel.swift in Sources */,
|
BBBBC87D24374A4900B0F079 /* ListThreeColumnBillChangesDividerModel.swift in Sources */,
|
||||||
D2E2A99D23DA3217000B42E6 /* UIStackViewAlignment+Extension.swift in Sources */,
|
D2E2A99D23DA3217000B42E6 /* UIStackViewAlignment+Extension.swift in Sources */,
|
||||||
01EB369423609801006832FA /* HeadlineBodyModel.swift in Sources */,
|
01EB369423609801006832FA /* HeadlineBodyModel.swift in Sources */,
|
||||||
@ -2370,6 +2385,7 @@
|
|||||||
D2D90B42240463E100DD6EC9 /* MoleculeHeaderModel.swift in Sources */,
|
D2D90B42240463E100DD6EC9 /* MoleculeHeaderModel.swift in Sources */,
|
||||||
012A88B1238C880100FE3DA1 /* CarouselPagingModelProtocol.swift in Sources */,
|
012A88B1238C880100FE3DA1 /* CarouselPagingModelProtocol.swift in Sources */,
|
||||||
D29DF2C921E7BFC6003B2FB9 /* MFSizeObject.m in Sources */,
|
D29DF2C921E7BFC6003B2FB9 /* MFSizeObject.m in Sources */,
|
||||||
|
0A6682B6243769C700AD3CA1 /* TextViewModel.swift in Sources */,
|
||||||
9445890E2385C3F800DE9FD4 /* MultiProgressModel.swift in Sources */,
|
9445890E2385C3F800DE9FD4 /* MultiProgressModel.swift in Sources */,
|
||||||
011D95A5240455DC000E3791 /* FormGroupRule.swift in Sources */,
|
011D95A5240455DC000E3791 /* FormGroupRule.swift in Sources */,
|
||||||
D2A6390522CBCE160052ED1F /* MoleculeCollectionViewCell.swift in Sources */,
|
D2A6390522CBCE160052ED1F /* MoleculeCollectionViewCell.swift in Sources */,
|
||||||
|
|||||||
@ -6,7 +6,7 @@
|
|||||||
// Copyright © 2020 Verizon Wireless. All rights reserved.
|
// Copyright © 2020 Verizon Wireless. All rights reserved.
|
||||||
//
|
//
|
||||||
|
|
||||||
@objcMembers public class BaseDropdownEntryFieldModel: TextEntryFieldModel {
|
@objcMembers open class BaseDropdownEntryFieldModel: TextEntryFieldModel {
|
||||||
//--------------------------------------------------
|
//--------------------------------------------------
|
||||||
// MARK: - Properties
|
// MARK: - Properties
|
||||||
//--------------------------------------------------
|
//--------------------------------------------------
|
||||||
|
|||||||
@ -6,7 +6,7 @@
|
|||||||
// Copyright © 2020 Verizon Wireless. All rights reserved.
|
// Copyright © 2020 Verizon Wireless. All rights reserved.
|
||||||
//
|
//
|
||||||
|
|
||||||
@objcMembers public class DateDropdownEntryFieldModel: BaseDropdownEntryFieldModel {
|
@objcMembers open class DateDropdownEntryFieldModel: BaseDropdownEntryFieldModel {
|
||||||
//--------------------------------------------------
|
//--------------------------------------------------
|
||||||
// MARK: - Properties
|
// MARK: - Properties
|
||||||
//--------------------------------------------------
|
//--------------------------------------------------
|
||||||
|
|||||||
@ -13,7 +13,7 @@ import UIKit
|
|||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
@objcMembers open class DigitBox: EntryFieldContainer, UITextFieldDelegate, TextFieldDidDeleteProtocol {
|
@objcMembers open class DigitBox: EntryFieldContainer, UITextFieldDelegate, TextInputDidDeleteProtocol {
|
||||||
//--------------------------------------------------
|
//--------------------------------------------------
|
||||||
// MARK: - Outlets
|
// MARK: - Outlets
|
||||||
//--------------------------------------------------
|
//--------------------------------------------------
|
||||||
@ -125,7 +125,7 @@ import UIKit
|
|||||||
updateView(MVMCoreUIUtility.getWidth())
|
updateView(MVMCoreUIUtility.getWidth())
|
||||||
}
|
}
|
||||||
|
|
||||||
@objc public func textFieldDidDelete() {
|
@objc public func textInputDidDelete() {
|
||||||
|
|
||||||
digitBoxDelegate?.digitFieldDidDelete?(digitField)
|
digitBoxDelegate?.digitFieldDidDelete?(digitField)
|
||||||
}
|
}
|
||||||
|
|||||||
@ -7,7 +7,7 @@
|
|||||||
//
|
//
|
||||||
|
|
||||||
|
|
||||||
@objcMembers public class DigitEntryFieldModel: TextEntryFieldModel {
|
@objcMembers open class DigitEntryFieldModel: TextEntryFieldModel {
|
||||||
//--------------------------------------------------
|
//--------------------------------------------------
|
||||||
// MARK: - Properties
|
// MARK: - Properties
|
||||||
//--------------------------------------------------
|
//--------------------------------------------------
|
||||||
|
|||||||
@ -9,7 +9,7 @@
|
|||||||
import Foundation
|
import Foundation
|
||||||
|
|
||||||
|
|
||||||
@objcMembers public class EntryFieldModel: MoleculeModelProtocol, FormFieldProtocol, FormRuleWatcherFieldProtocol, EnableableModelProtocol {
|
@objcMembers open class EntryFieldModel: MoleculeModelProtocol, FormFieldProtocol, FormRuleWatcherFieldProtocol, EnableableModelProtocol {
|
||||||
//--------------------------------------------------
|
//--------------------------------------------------
|
||||||
// MARK: - Properties
|
// MARK: - Properties
|
||||||
//--------------------------------------------------
|
//--------------------------------------------------
|
||||||
|
|||||||
@ -6,7 +6,7 @@
|
|||||||
// Copyright © 2020 Verizon Wireless. All rights reserved.
|
// Copyright © 2020 Verizon Wireless. All rights reserved.
|
||||||
//
|
//
|
||||||
|
|
||||||
@objcMembers public class ItemDropdownEntryFieldModel: BaseDropdownEntryFieldModel {
|
@objcMembers open class ItemDropdownEntryFieldModel: BaseDropdownEntryFieldModel {
|
||||||
//--------------------------------------------------
|
//--------------------------------------------------
|
||||||
// MARK: - Properties
|
// MARK: - Properties
|
||||||
//--------------------------------------------------
|
//--------------------------------------------------
|
||||||
|
|||||||
@ -6,7 +6,7 @@
|
|||||||
// Copyright © 2020 Verizon Wireless. All rights reserved.
|
// Copyright © 2020 Verizon Wireless. All rights reserved.
|
||||||
//
|
//
|
||||||
|
|
||||||
@objcMembers public class MdnEntryFieldModel: TextEntryFieldModel {
|
@objcMembers open class MdnEntryFieldModel: TextEntryFieldModel {
|
||||||
//--------------------------------------------------
|
//--------------------------------------------------
|
||||||
// MARK: - Properties
|
// MARK: - Properties
|
||||||
//--------------------------------------------------
|
//--------------------------------------------------
|
||||||
|
|||||||
@ -134,7 +134,7 @@ import UIKit
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/// If you're using a MFViewController, you must set this to it
|
/// If you're using a ViewController, you must set this to it
|
||||||
public weak var uiTextFieldDelegate: UITextFieldDelegate? {
|
public weak var uiTextFieldDelegate: UITextFieldDelegate? {
|
||||||
get { return textField.delegate }
|
get { return textField.delegate }
|
||||||
set { textField.delegate = newValue }
|
set { textField.delegate = newValue }
|
||||||
|
|||||||
@ -7,7 +7,7 @@
|
|||||||
//
|
//
|
||||||
|
|
||||||
|
|
||||||
@objcMembers public class TextEntryFieldModel: EntryFieldModel {
|
@objcMembers open class TextEntryFieldModel: EntryFieldModel {
|
||||||
//--------------------------------------------------
|
//--------------------------------------------------
|
||||||
// MARK: - Types
|
// MARK: - Types
|
||||||
//--------------------------------------------------
|
//--------------------------------------------------
|
||||||
@ -17,6 +17,7 @@
|
|||||||
case secure
|
case secure
|
||||||
case number
|
case number
|
||||||
case email
|
case email
|
||||||
|
case text
|
||||||
}
|
}
|
||||||
|
|
||||||
//--------------------------------------------------
|
//--------------------------------------------------
|
||||||
@ -37,7 +38,6 @@
|
|||||||
//--------------------------------------------------
|
//--------------------------------------------------
|
||||||
|
|
||||||
private enum CodingKeys: String, CodingKey {
|
private enum CodingKeys: String, CodingKey {
|
||||||
case moleculeName
|
|
||||||
case placeholder
|
case placeholder
|
||||||
case enabledTextColor
|
case enabledTextColor
|
||||||
case disabledTextColor
|
case disabledTextColor
|
||||||
@ -66,7 +66,6 @@
|
|||||||
public override func encode(to encoder: Encoder) throws {
|
public override func encode(to encoder: Encoder) throws {
|
||||||
try super.encode(to: encoder)
|
try super.encode(to: encoder)
|
||||||
var container = encoder.container(keyedBy: CodingKeys.self)
|
var container = encoder.container(keyedBy: CodingKeys.self)
|
||||||
try container.encode(moleculeName, forKey: .moleculeName)
|
|
||||||
try container.encodeIfPresent(placeholder, forKey: .placeholder)
|
try container.encodeIfPresent(placeholder, forKey: .placeholder)
|
||||||
try container.encode(enabledTextColor, forKey: .enabledTextColor)
|
try container.encode(enabledTextColor, forKey: .enabledTextColor)
|
||||||
try container.encode(disabledTextColor, forKey: .disabledTextColor)
|
try container.encode(disabledTextColor, forKey: .disabledTextColor)
|
||||||
|
|||||||
@ -51,6 +51,9 @@ import Foundation
|
|||||||
try? ModelRegistry.register(LabelAttributeStrikeThroughModel.self)
|
try? ModelRegistry.register(LabelAttributeStrikeThroughModel.self)
|
||||||
try? ModelRegistry.register(LabelAttributeActionModel.self)
|
try? ModelRegistry.register(LabelAttributeActionModel.self)
|
||||||
|
|
||||||
|
// TextView
|
||||||
|
MoleculeObjectMapping.shared()?.register(viewClass: TextView.self, viewModelClass: TextViewModel.self)
|
||||||
|
|
||||||
// Buttons
|
// Buttons
|
||||||
MoleculeObjectMapping.shared()?.register(viewClass: PillButton.self, viewModelClass: ButtonModel.self)
|
MoleculeObjectMapping.shared()?.register(viewClass: PillButton.self, viewModelClass: ButtonModel.self)
|
||||||
MoleculeObjectMapping.shared()?.register(viewClass: TwoButtonView.self, viewModelClass: TwoButtonViewModel.self)
|
MoleculeObjectMapping.shared()?.register(viewClass: TwoButtonView.self, viewModelClass: TwoButtonViewModel.self)
|
||||||
@ -176,9 +179,6 @@ import Foundation
|
|||||||
MoleculeObjectMapping.shared()?.register(viewClass: ListDeviceComplexLinkSmall.self, viewModelClass: ListDeviceComplexLinkSmallModel.self)
|
MoleculeObjectMapping.shared()?.register(viewClass: ListDeviceComplexLinkSmall.self, viewModelClass: ListDeviceComplexLinkSmallModel.self)
|
||||||
MoleculeObjectMapping.shared()?.register(viewClass: ListDeviceComplexLinkMedium.self, viewModelClass: ListDeviceComplexLinkMediumModel.self)
|
MoleculeObjectMapping.shared()?.register(viewClass: ListDeviceComplexLinkMedium.self, viewModelClass: ListDeviceComplexLinkMediumModel.self)
|
||||||
|
|
||||||
// TODO: Need View
|
|
||||||
try? ModelRegistry.register(TabsModel.self)
|
|
||||||
|
|
||||||
// Helper models
|
// Helper models
|
||||||
try? ModelRegistry.register(RuleRequiredModel.self)
|
try? ModelRegistry.register(RuleRequiredModel.self)
|
||||||
try? ModelRegistry.register(RuleAnyRequiredModel.self)
|
try? ModelRegistry.register(RuleAnyRequiredModel.self)
|
||||||
|
|||||||
@ -0,0 +1,21 @@
|
|||||||
|
//
|
||||||
|
// ThreeLayerFillMiddleTemplate.swift
|
||||||
|
// MVMCoreUI
|
||||||
|
//
|
||||||
|
// Created by Scott Pfeil on 4/28/20.
|
||||||
|
// Copyright © 2020 Verizon Wireless. All rights reserved.
|
||||||
|
//
|
||||||
|
|
||||||
|
import Foundation
|
||||||
|
|
||||||
|
|
||||||
|
@objcMembers open class ThreeLayerFillMiddleTemplate: ThreeLayerTemplate<ThreeLayerFillMiddleTemplateModel> {
|
||||||
|
open override func spaceBetweenMiddleAndBottom() -> CGFloat? {
|
||||||
|
return 0
|
||||||
|
}
|
||||||
|
|
||||||
|
open override func handleNewData() {
|
||||||
|
super.handleNewData()
|
||||||
|
heightConstraint?.isActive = true
|
||||||
|
}
|
||||||
|
}
|
||||||
@ -0,0 +1,15 @@
|
|||||||
|
//
|
||||||
|
// ThreeLayerFillMiddleTemplateModel.swift
|
||||||
|
// MVMCoreUI
|
||||||
|
//
|
||||||
|
// Created by Scott Pfeil on 4/28/20.
|
||||||
|
// Copyright © 2020 Verizon Wireless. All rights reserved.
|
||||||
|
//
|
||||||
|
|
||||||
|
import Foundation
|
||||||
|
|
||||||
|
@objcMembers public class ThreeLayerFillMiddleTemplateModel: ThreeLayerPageTemplateModel {
|
||||||
|
public override class var identifier: String {
|
||||||
|
return "threeLayerFillMiddle"
|
||||||
|
}
|
||||||
|
}
|
||||||
@ -49,4 +49,8 @@ import UIKit
|
|||||||
open override func spaceBetweenTopAndMiddle() -> CGFloat? {
|
open override func spaceBetweenTopAndMiddle() -> CGFloat? {
|
||||||
return 0
|
return 0
|
||||||
}
|
}
|
||||||
|
|
||||||
|
open override func spaceBetweenMiddleAndBottom() -> CGFloat? {
|
||||||
|
return nil
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@ -8,8 +8,8 @@
|
|||||||
|
|
||||||
import UIKit
|
import UIKit
|
||||||
|
|
||||||
public protocol TextFieldDidDeleteProtocol: class {
|
public protocol TextInputDidDeleteProtocol: class {
|
||||||
func textFieldDidDelete()
|
func textInputDidDelete()
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
@ -17,6 +17,7 @@ public protocol TextFieldDidDeleteProtocol: class {
|
|||||||
//--------------------------------------------------
|
//--------------------------------------------------
|
||||||
// MARK: - Properties
|
// MARK: - Properties
|
||||||
//--------------------------------------------------
|
//--------------------------------------------------
|
||||||
|
|
||||||
private var initialSetupPerformed = false
|
private var initialSetupPerformed = false
|
||||||
|
|
||||||
/// Set to true to hide the blinking textField cursor.
|
/// Set to true to hide the blinking textField cursor.
|
||||||
@ -27,7 +28,7 @@ public protocol TextFieldDidDeleteProtocol: class {
|
|||||||
//--------------------------------------------------
|
//--------------------------------------------------
|
||||||
|
|
||||||
/// Holds a reference to the delegating class so this class can internally influence the TextField behavior as well.
|
/// Holds a reference to the delegating class so this class can internally influence the TextField behavior as well.
|
||||||
public weak var didDeleteDelegate: TextFieldDidDeleteProtocol?
|
public weak var didDeleteDelegate: TextInputDidDeleteProtocol?
|
||||||
|
|
||||||
//--------------------------------------------------
|
//--------------------------------------------------
|
||||||
// MARK: - Initialization
|
// MARK: - Initialization
|
||||||
@ -50,7 +51,7 @@ public protocol TextFieldDidDeleteProtocol: class {
|
|||||||
public func initialSetup() {
|
public func initialSetup() {
|
||||||
|
|
||||||
if !initialSetupPerformed {
|
if !initialSetupPerformed {
|
||||||
tintColor = .black
|
tintColor = .mvmBlack
|
||||||
initialSetupPerformed = true
|
initialSetupPerformed = true
|
||||||
setupView()
|
setupView()
|
||||||
}
|
}
|
||||||
@ -68,7 +69,7 @@ public protocol TextFieldDidDeleteProtocol: class {
|
|||||||
|
|
||||||
open override func deleteBackward() {
|
open override func deleteBackward() {
|
||||||
super.deleteBackward()
|
super.deleteBackward()
|
||||||
didDeleteDelegate?.textFieldDidDelete()
|
didDeleteDelegate?.textInputDidDelete()
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -86,7 +87,9 @@ extension TextField: MVMCoreViewProtocol {
|
|||||||
|
|
||||||
/// MARK:- MoleculeViewProtocol
|
/// MARK:- MoleculeViewProtocol
|
||||||
extension TextField: MoleculeViewProtocol {
|
extension TextField: MoleculeViewProtocol {
|
||||||
open func set(with model: MoleculeModelProtocol, _ delegateObject: MVMCoreUIDelegateObject?, _ additionalData: [AnyHashable : Any]?) {
|
|
||||||
|
open func set(with model: MoleculeModelProtocol, _ delegateObject: MVMCoreUIDelegateObject?, _ additionalData: [AnyHashable: Any]?) {
|
||||||
|
|
||||||
if let color = model.backgroundColor?.uiColor {
|
if let color = model.backgroundColor?.uiColor {
|
||||||
backgroundColor = color
|
backgroundColor = color
|
||||||
}
|
}
|
||||||
|
|||||||
490
MVMCoreUI/BaseClasses/TextView.swift
Normal file
490
MVMCoreUI/BaseClasses/TextView.swift
Normal file
@ -0,0 +1,490 @@
|
|||||||
|
//
|
||||||
|
// TextView.swift
|
||||||
|
// MVMCoreUI
|
||||||
|
//
|
||||||
|
// Created by Kevin Christiano on 4/1/20.
|
||||||
|
// Copyright © 2020 Verizon Wireless. All rights reserved.
|
||||||
|
//
|
||||||
|
|
||||||
|
import UIKit
|
||||||
|
|
||||||
|
|
||||||
|
@objc open class TextView: UITextView, UITextViewDelegate, MVMCoreViewProtocol {
|
||||||
|
//--------------------------------------------------
|
||||||
|
// MARK: - Properties
|
||||||
|
//--------------------------------------------------
|
||||||
|
|
||||||
|
open var model: MoleculeModelProtocol?
|
||||||
|
|
||||||
|
private var initialSetupPerformed = false
|
||||||
|
|
||||||
|
/// If true then text textView is currently displaying the stored placeholder text as there is not content to display.
|
||||||
|
public var isShowingPlaceholder: Bool = false {
|
||||||
|
didSet { textViewModel?.showsPlaceholder = isShowingPlaceholder }
|
||||||
|
}
|
||||||
|
|
||||||
|
/// Set to true to hide the blinking textField cursor.
|
||||||
|
public var hideBlinkingCaret = false
|
||||||
|
|
||||||
|
public var textViewModel: TextViewModel? {
|
||||||
|
return model as? TextViewModel
|
||||||
|
}
|
||||||
|
|
||||||
|
//--------------------------------------------------
|
||||||
|
// MARK: - Drawing Properties
|
||||||
|
//--------------------------------------------------
|
||||||
|
|
||||||
|
private(set) var fieldState: FieldState = .original {
|
||||||
|
didSet (oldState) {
|
||||||
|
// Will not update if new state is the same as old.
|
||||||
|
if fieldState != oldState {
|
||||||
|
DispatchQueue.main.async { [weak self] in
|
||||||
|
guard let self = self else { return }
|
||||||
|
|
||||||
|
self.fieldState.setStateUI(for: self)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/// Determines if the top, left, and right borders should be drawn.
|
||||||
|
private var hideBorders = false
|
||||||
|
|
||||||
|
public var borderStrokeColor: UIColor = .mvmCoolGray3
|
||||||
|
public var bottomStrokeColor: UIColor = .mvmBlack
|
||||||
|
private var borderPath: UIBezierPath = UIBezierPath()
|
||||||
|
private var bottomPath: UIBezierPath = UIBezierPath()
|
||||||
|
|
||||||
|
//--------------------------------------------------
|
||||||
|
// MARK: - Property Observers
|
||||||
|
//--------------------------------------------------
|
||||||
|
|
||||||
|
private var _isEnabled: Bool = true
|
||||||
|
private var _showError: Bool = false
|
||||||
|
private var _isSelected: Bool = false
|
||||||
|
|
||||||
|
public var isEnabled: Bool {
|
||||||
|
get { return _isEnabled }
|
||||||
|
set (enabled) {
|
||||||
|
|
||||||
|
_isEnabled = enabled
|
||||||
|
_isSelected = false
|
||||||
|
_showError = false
|
||||||
|
|
||||||
|
fieldState = enabled ? .original : .disabled
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
public var showError: Bool {
|
||||||
|
get { return _showError }
|
||||||
|
set (error) {
|
||||||
|
|
||||||
|
_showError = error
|
||||||
|
_isEnabled = true
|
||||||
|
_isSelected = false
|
||||||
|
|
||||||
|
fieldState = error ? .error : .original
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
public var isSelected: Bool {
|
||||||
|
get { return _isSelected }
|
||||||
|
set (selected) {
|
||||||
|
|
||||||
|
_isSelected = selected
|
||||||
|
_isEnabled = true
|
||||||
|
|
||||||
|
if _showError {
|
||||||
|
fieldState = selected ? .selectedError : .error
|
||||||
|
} else {
|
||||||
|
fieldState = selected ? .selected : .original
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
//--------------------------------------------------
|
||||||
|
// MARK: - Delegate
|
||||||
|
//--------------------------------------------------
|
||||||
|
|
||||||
|
/// Holds a reference to the delegating class so this class can internally influence the TextField behavior as well.
|
||||||
|
public weak var didDeleteDelegate: TextInputDidDeleteProtocol?
|
||||||
|
|
||||||
|
/// Holds a reference to the delegating class so this class can internally influence the TextField behavior as well.
|
||||||
|
private weak var proprietorTextDelegate: UITextViewDelegate?
|
||||||
|
|
||||||
|
/// If you're using a ViewController, you must set this to it.
|
||||||
|
public weak var uiTextViewDelegate: UITextViewDelegate? {
|
||||||
|
get { return delegate }
|
||||||
|
set {
|
||||||
|
delegate = self
|
||||||
|
proprietorTextDelegate = newValue
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
var delegateObject: MVMCoreUIDelegateObject?
|
||||||
|
|
||||||
|
//--------------------------------------------------
|
||||||
|
// MARK: - Constraint
|
||||||
|
//--------------------------------------------------
|
||||||
|
|
||||||
|
public var heightConstraint: NSLayoutConstraint?
|
||||||
|
|
||||||
|
//--------------------------------------------------
|
||||||
|
// MARK: - Initialization
|
||||||
|
//--------------------------------------------------
|
||||||
|
|
||||||
|
public override init(frame: CGRect, textContainer: NSTextContainer?) {
|
||||||
|
super.init(frame: .zero, textContainer: nil)
|
||||||
|
initialSetup()
|
||||||
|
}
|
||||||
|
|
||||||
|
public convenience init() {
|
||||||
|
self.init(frame: .zero, textContainer: nil)
|
||||||
|
}
|
||||||
|
|
||||||
|
public required init?(coder: NSCoder) {
|
||||||
|
super.init(coder: coder)
|
||||||
|
initialSetup()
|
||||||
|
}
|
||||||
|
|
||||||
|
convenience init(delegate: UITextViewDelegate) {
|
||||||
|
self.init(frame: .zero, textContainer: nil)
|
||||||
|
self.delegate = delegate
|
||||||
|
}
|
||||||
|
|
||||||
|
//--------------------------------------------------
|
||||||
|
// MARK: - Lifecycle
|
||||||
|
//--------------------------------------------------
|
||||||
|
|
||||||
|
public func initialSetup() {
|
||||||
|
|
||||||
|
if !initialSetupPerformed {
|
||||||
|
tintColor = .mvmBlack
|
||||||
|
initialSetupPerformed = true
|
||||||
|
setupView()
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
open func updateView(_ size: CGFloat) {
|
||||||
|
|
||||||
|
setNeedsDisplay()
|
||||||
|
}
|
||||||
|
|
||||||
|
/// Will be called only once.
|
||||||
|
open func setupView() {
|
||||||
|
|
||||||
|
translatesAutoresizingMaskIntoConstraints = false
|
||||||
|
initialConfiguration()
|
||||||
|
}
|
||||||
|
|
||||||
|
public func initialConfiguration() {
|
||||||
|
|
||||||
|
insetsLayoutMarginsFromSafeArea = false
|
||||||
|
showsVerticalScrollIndicator = false
|
||||||
|
showsHorizontalScrollIndicator = false
|
||||||
|
isSecureTextEntry = false
|
||||||
|
textContainerInset = UIEdgeInsets(top: Padding.Three, left: Padding.Three, bottom: Padding.Three, right: Padding.Three)
|
||||||
|
backgroundColor = .mvmWhite
|
||||||
|
clipsToBounds = true
|
||||||
|
smartQuotesType = .no
|
||||||
|
smartDashesType = .no
|
||||||
|
smartInsertDeleteType = .no
|
||||||
|
inputAccessoryView = nil
|
||||||
|
font = textViewModel?.fontStyle.getFont()
|
||||||
|
isEditable = true
|
||||||
|
isOpaque = false
|
||||||
|
}
|
||||||
|
|
||||||
|
open func reset() {
|
||||||
|
|
||||||
|
text = ""
|
||||||
|
inputAccessoryView?.removeFromSuperview()
|
||||||
|
inputAccessoryView = nil
|
||||||
|
initialConfiguration()
|
||||||
|
}
|
||||||
|
|
||||||
|
open override func layoutSubviews() {
|
||||||
|
super.layoutSubviews()
|
||||||
|
|
||||||
|
setNeedsDisplay()
|
||||||
|
}
|
||||||
|
|
||||||
|
//--------------------------------------------------
|
||||||
|
// MARK: - Draw
|
||||||
|
//--------------------------------------------------
|
||||||
|
|
||||||
|
/// This handles the top, left, and right border lines.
|
||||||
|
open override func draw(_ rect: CGRect) {
|
||||||
|
super.draw(rect)
|
||||||
|
|
||||||
|
borderPath.removeAllPoints()
|
||||||
|
bottomPath.removeAllPoints()
|
||||||
|
|
||||||
|
if !hideBorders {
|
||||||
|
// Brings the other half of the line inside the view to prevent line cropping.
|
||||||
|
let origin = bounds.origin
|
||||||
|
let size = frame.size
|
||||||
|
let insetLean: CGFloat = 0.5
|
||||||
|
borderPath.lineWidth = 1
|
||||||
|
|
||||||
|
// Drawing begins and ends from the bottom left.
|
||||||
|
borderPath.move(to: CGPoint(x: origin.x + insetLean, y: origin.y + size.height))
|
||||||
|
borderPath.addLine(to: CGPoint(x: origin.x + insetLean, y: origin.y + insetLean))
|
||||||
|
borderPath.addLine(to: CGPoint(x: origin.x + size.width - insetLean, y: origin.y + insetLean))
|
||||||
|
borderPath.addLine(to: CGPoint(x: origin.x + size.width - insetLean, y: origin.y + size.height))
|
||||||
|
|
||||||
|
borderStrokeColor.setStroke()
|
||||||
|
borderPath.stroke()
|
||||||
|
|
||||||
|
let lineWidth: CGFloat = showError || isSelected ? 4 : 1
|
||||||
|
bottomPath.lineWidth = lineWidth
|
||||||
|
bottomPath.move(to: CGPoint(x: origin.x + size.width, y: origin.y + size.height - (lineWidth / 2)))
|
||||||
|
bottomPath.addLine(to: CGPoint(x: origin.x, y: origin.y + size.height - (lineWidth / 2)))
|
||||||
|
|
||||||
|
bottomStrokeColor.setStroke()
|
||||||
|
bottomPath.stroke()
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
//--------------------------------------------------
|
||||||
|
// MARK: - Draw States
|
||||||
|
//--------------------------------------------------
|
||||||
|
|
||||||
|
public enum FieldState {
|
||||||
|
case original
|
||||||
|
case error
|
||||||
|
case selectedError
|
||||||
|
case selected
|
||||||
|
case disabled
|
||||||
|
|
||||||
|
public func setStateUI(for inputField: TextView) {
|
||||||
|
|
||||||
|
switch self {
|
||||||
|
case .original:
|
||||||
|
inputField.originalUI()
|
||||||
|
|
||||||
|
case .error:
|
||||||
|
inputField.errorUI()
|
||||||
|
|
||||||
|
case .selectedError:
|
||||||
|
inputField.selectedErrorUI()
|
||||||
|
|
||||||
|
case .selected:
|
||||||
|
inputField.selectedUI()
|
||||||
|
|
||||||
|
case .disabled:
|
||||||
|
inputField.disabledUI()
|
||||||
|
}
|
||||||
|
|
||||||
|
inputField.setNeedsDisplay()
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
open func originalUI() {
|
||||||
|
|
||||||
|
isEditable = textViewModel?.editable ?? true
|
||||||
|
isUserInteractionEnabled = true
|
||||||
|
hideBorders = textViewModel?.hideBorders ?? false
|
||||||
|
borderStrokeColor = .mvmCoolGray3
|
||||||
|
bottomStrokeColor = .mvmBlack
|
||||||
|
textColor = isShowingPlaceholder ? textViewModel?.placeholderTextColor.uiColor : textViewModel?.enabledTextColor.uiColor
|
||||||
|
}
|
||||||
|
|
||||||
|
open func errorUI() {
|
||||||
|
|
||||||
|
isEditable = textViewModel?.editable ?? true
|
||||||
|
isUserInteractionEnabled = true
|
||||||
|
hideBorders = textViewModel?.hideBorders ?? false
|
||||||
|
borderStrokeColor = .mvmOrange
|
||||||
|
bottomStrokeColor = .mvmOrange
|
||||||
|
textColor = textViewModel?.enabledTextColor.uiColor
|
||||||
|
}
|
||||||
|
|
||||||
|
open func selectedErrorUI() {
|
||||||
|
|
||||||
|
isEditable = textViewModel?.editable ?? true
|
||||||
|
isUserInteractionEnabled = true
|
||||||
|
hideBorders = textViewModel?.hideBorders ?? false
|
||||||
|
borderStrokeColor = .mvmBlack
|
||||||
|
bottomStrokeColor = .mvmOrange
|
||||||
|
textColor = textViewModel?.enabledTextColor.uiColor
|
||||||
|
}
|
||||||
|
|
||||||
|
open func selectedUI() {
|
||||||
|
|
||||||
|
isEditable = textViewModel?.editable ?? true
|
||||||
|
isUserInteractionEnabled = true
|
||||||
|
hideBorders = textViewModel?.hideBorders ?? false
|
||||||
|
borderStrokeColor = .mvmBlack
|
||||||
|
bottomStrokeColor = .mvmBlack
|
||||||
|
textColor = textViewModel?.enabledTextColor.uiColor
|
||||||
|
}
|
||||||
|
|
||||||
|
open func disabledUI() {
|
||||||
|
|
||||||
|
isEditable = textViewModel?.editable ?? false
|
||||||
|
isUserInteractionEnabled = false
|
||||||
|
hideBorders = textViewModel?.hideBorders ?? false
|
||||||
|
borderStrokeColor = .mvmCoolGray3
|
||||||
|
bottomStrokeColor = .mvmCoolGray3
|
||||||
|
textColor = textViewModel?.disabledTextColor.uiColor
|
||||||
|
}
|
||||||
|
|
||||||
|
//--------------------------------------------------
|
||||||
|
// MARK: - Methods
|
||||||
|
//--------------------------------------------------
|
||||||
|
|
||||||
|
/// Alters the blinking caret line as per design standards.
|
||||||
|
open override func caretRect(for position: UITextPosition) -> CGRect {
|
||||||
|
|
||||||
|
if hideBlinkingCaret {
|
||||||
|
return .zero
|
||||||
|
}
|
||||||
|
|
||||||
|
let caretRect = super.caretRect(for: position)
|
||||||
|
return CGRect(origin: caretRect.origin, size: CGSize(width: 1, height: caretRect.height))
|
||||||
|
}
|
||||||
|
|
||||||
|
open override func deleteBackward() {
|
||||||
|
super.deleteBackward()
|
||||||
|
didDeleteDelegate?.textInputDidDelete()
|
||||||
|
}
|
||||||
|
|
||||||
|
public func setTextAppearance() {
|
||||||
|
|
||||||
|
if isShowingPlaceholder {
|
||||||
|
setTextContentTraits()
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
public func setPlaceholderIfAvailable() {
|
||||||
|
|
||||||
|
if let placeholder = textViewModel?.placeholder, !placeholder.isEmpty && text.isEmpty {
|
||||||
|
setPlaceholderContentTraits()
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
public func setTextContentTraits() {
|
||||||
|
|
||||||
|
isShowingPlaceholder = false
|
||||||
|
text = ""
|
||||||
|
font = textViewModel?.fontStyle.getFont()
|
||||||
|
textColor = textViewModel?.enabledTextColor.uiColor
|
||||||
|
}
|
||||||
|
|
||||||
|
public func setPlaceholderContentTraits() {
|
||||||
|
|
||||||
|
isShowingPlaceholder = true
|
||||||
|
textColor = textViewModel?.placeholderTextColor.uiColor
|
||||||
|
font = textViewModel?.placeholderFontStyle.getFont()
|
||||||
|
text = textViewModel?.placeholder
|
||||||
|
}
|
||||||
|
|
||||||
|
@objc func dismissFieldInput(_ sender: TextView) {
|
||||||
|
|
||||||
|
resignFirstResponder()
|
||||||
|
}
|
||||||
|
|
||||||
|
//--------------------------------------------------
|
||||||
|
// MARK: - UITextViewDelegate
|
||||||
|
//--------------------------------------------------
|
||||||
|
|
||||||
|
@objc public func textViewShouldBeginEditing(_ textView: UITextView) -> Bool {
|
||||||
|
|
||||||
|
return proprietorTextDelegate?.textViewShouldBeginEditing?(textView) ?? true
|
||||||
|
}
|
||||||
|
|
||||||
|
@objc public func textViewDidBeginEditing(_ textView: UITextView) {
|
||||||
|
|
||||||
|
setTextAppearance()
|
||||||
|
isSelected = true
|
||||||
|
proprietorTextDelegate?.textViewDidBeginEditing?(textView)
|
||||||
|
}
|
||||||
|
|
||||||
|
@objc public func textView(_ textView: UITextView, shouldChangeTextIn range: NSRange, replacementText text: String) -> Bool {
|
||||||
|
|
||||||
|
return proprietorTextDelegate?.textView?(textView, shouldChangeTextIn: range, replacementText: text) ?? true
|
||||||
|
}
|
||||||
|
|
||||||
|
@objc public func textViewDidChange(_ textView: UITextView) {
|
||||||
|
|
||||||
|
textViewModel?.text = textView.text
|
||||||
|
proprietorTextDelegate?.textViewDidChange?(textView)
|
||||||
|
}
|
||||||
|
|
||||||
|
@objc public func textViewShouldEndEditing(_ textView: UITextView) -> Bool {
|
||||||
|
|
||||||
|
return proprietorTextDelegate?.textViewShouldEndEditing?(textView) ?? true
|
||||||
|
}
|
||||||
|
|
||||||
|
@objc public func textViewDidEndEditing(_ textView: UITextView) {
|
||||||
|
|
||||||
|
setPlaceholderIfAvailable()
|
||||||
|
isSelected = false
|
||||||
|
proprietorTextDelegate?.textViewDidEndEditing?(textView)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// MARK:- MoleculeViewProtocol
|
||||||
|
extension TextView: MoleculeViewProtocol {
|
||||||
|
|
||||||
|
open func set(with model: MoleculeModelProtocol, _ delegateObject: MVMCoreUIDelegateObject?, _ additionalData: [AnyHashable: Any]?) {
|
||||||
|
self.model = model
|
||||||
|
self.delegateObject = delegateObject
|
||||||
|
|
||||||
|
if let color = model.backgroundColor?.uiColor {
|
||||||
|
backgroundColor = color
|
||||||
|
}
|
||||||
|
|
||||||
|
guard let model = model as? TextViewModel else { return }
|
||||||
|
|
||||||
|
heightConstraint?.isActive = false
|
||||||
|
if let height = model.height {
|
||||||
|
heightConstraint = heightAnchor.constraint(equalToConstant: height)
|
||||||
|
heightConstraint?.isActive = true
|
||||||
|
}
|
||||||
|
|
||||||
|
isEditable = model.editable
|
||||||
|
textAlignment = model.textAlignment
|
||||||
|
textColor = model.enabledTextColor.uiColor
|
||||||
|
hideBorders = model.hideBorders
|
||||||
|
text = model.text
|
||||||
|
uiTextViewDelegate = delegateObject?.uiTextViewDelegate
|
||||||
|
|
||||||
|
if let accessibilityText = model.accessibilityText {
|
||||||
|
accessibilityLabel = accessibilityText
|
||||||
|
}
|
||||||
|
|
||||||
|
switch model.type {
|
||||||
|
case .secure, .password:
|
||||||
|
isSecureTextEntry = true
|
||||||
|
case .number:
|
||||||
|
keyboardType = .numberPad
|
||||||
|
case .email:
|
||||||
|
keyboardType = .emailAddress
|
||||||
|
default:
|
||||||
|
break
|
||||||
|
}
|
||||||
|
|
||||||
|
font = model.fontStyle.getFont()
|
||||||
|
setPlaceholderIfAvailable()
|
||||||
|
|
||||||
|
if isEditable {
|
||||||
|
FormValidator.setupValidation(for: model, delegate: delegateObject?.formHolderDelegate)
|
||||||
|
let observingDelegate = delegateObject?.uiTextViewDelegate ?? self
|
||||||
|
inputAccessoryView = UIToolbar.getToolbarWithDoneButton(delegate: observingDelegate,
|
||||||
|
action: #selector(dismissFieldInput))
|
||||||
|
|
||||||
|
if (model.selected ?? false) && !model.wasInitiallySelected {
|
||||||
|
model.wasInitiallySelected = true
|
||||||
|
DispatchQueue.main.async {
|
||||||
|
self.becomeFirstResponder()
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
if !model.enabled {
|
||||||
|
isEnabled = false
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
95
MVMCoreUI/BaseClasses/TextViewModel.swift
Normal file
95
MVMCoreUI/BaseClasses/TextViewModel.swift
Normal file
@ -0,0 +1,95 @@
|
|||||||
|
//
|
||||||
|
// TextViewModel.swift
|
||||||
|
// MVMCoreUI
|
||||||
|
//
|
||||||
|
// Created by Kevin Christiano on 4/2/20.
|
||||||
|
// Copyright © 2020 Verizon Wireless. All rights reserved.
|
||||||
|
//
|
||||||
|
|
||||||
|
import Foundation
|
||||||
|
|
||||||
|
|
||||||
|
open class TextViewModel: TextEntryFieldModel {
|
||||||
|
//--------------------------------------------------
|
||||||
|
// MARK: - Properties
|
||||||
|
//--------------------------------------------------
|
||||||
|
|
||||||
|
public override class var identifier: String {
|
||||||
|
return "textView"
|
||||||
|
}
|
||||||
|
|
||||||
|
public var accessibilityText: String?
|
||||||
|
public var fontStyle: Styler.Font = Styler.Font.RegularBodySmall
|
||||||
|
public var textAlignment: NSTextAlignment = .left
|
||||||
|
public var height: CGFloat?
|
||||||
|
public var placeholderTextColor: Color = Color(uiColor: .mvmCoolGray3)
|
||||||
|
public var placeholderFontStyle: Styler.Font = Styler.Font.RegularMicro
|
||||||
|
public var showsPlaceholder: Bool = false
|
||||||
|
public var hideBorders: Bool = false
|
||||||
|
public var editable: Bool = true
|
||||||
|
|
||||||
|
//--------------------------------------------------
|
||||||
|
// MARK: - Keys
|
||||||
|
//--------------------------------------------------
|
||||||
|
|
||||||
|
private enum CodingKeys: String, CodingKey {
|
||||||
|
case text
|
||||||
|
case accessibilityText
|
||||||
|
case fontStyle
|
||||||
|
case textAlignment
|
||||||
|
case height
|
||||||
|
case hideBorders
|
||||||
|
case placeholderFontStyle
|
||||||
|
case placeholderTextColor
|
||||||
|
case editable
|
||||||
|
}
|
||||||
|
|
||||||
|
//--------------------------------------------------
|
||||||
|
// MARK: - Codec
|
||||||
|
//--------------------------------------------------
|
||||||
|
|
||||||
|
required public init(from decoder: Decoder) throws {
|
||||||
|
try super.init(from: decoder)
|
||||||
|
let typeContainer = try decoder.container(keyedBy: CodingKeys.self)
|
||||||
|
|
||||||
|
if let placeholderFontStyle = try typeContainer.decodeIfPresent(Styler.Font.self, forKey: .placeholderFontStyle) {
|
||||||
|
self.placeholderFontStyle = placeholderFontStyle
|
||||||
|
}
|
||||||
|
|
||||||
|
if let placeholderTextColor = try typeContainer.decodeIfPresent(Color.self, forKey: .placeholderTextColor) {
|
||||||
|
self.placeholderTextColor = placeholderTextColor
|
||||||
|
}
|
||||||
|
|
||||||
|
if let textAlignment = try typeContainer.decodeIfPresent(NSTextAlignment.self, forKey: .textAlignment) {
|
||||||
|
self.textAlignment = textAlignment
|
||||||
|
}
|
||||||
|
|
||||||
|
if let hideBorders = try typeContainer.decodeIfPresent(Bool.self, forKey: .hideBorders) {
|
||||||
|
self.hideBorders = hideBorders
|
||||||
|
}
|
||||||
|
|
||||||
|
if let editable = try typeContainer.decodeIfPresent(Bool.self, forKey: .editable) {
|
||||||
|
self.editable = editable
|
||||||
|
}
|
||||||
|
|
||||||
|
if let fontStyle = try typeContainer.decodeIfPresent(Styler.Font.self, forKey: .fontStyle) {
|
||||||
|
self.fontStyle = fontStyle
|
||||||
|
}
|
||||||
|
|
||||||
|
accessibilityText = try typeContainer.decodeIfPresent(String.self, forKey: .accessibilityText)
|
||||||
|
height = try typeContainer.decodeIfPresent(CGFloat.self, forKey: .height)
|
||||||
|
}
|
||||||
|
|
||||||
|
public override func encode(to encoder: Encoder) throws {
|
||||||
|
var container = encoder.container(keyedBy: CodingKeys.self)
|
||||||
|
try container.encodeIfPresent(accessibilityText, forKey: .accessibilityText)
|
||||||
|
try container.encodeIfPresent(height, forKey: .height)
|
||||||
|
try container.encode(fontStyle, forKey: .fontStyle)
|
||||||
|
try container.encode(hideBorders, forKey: .hideBorders)
|
||||||
|
try container.encode(text, forKey: .text)
|
||||||
|
try container.encode(placeholderFontStyle, forKey: .placeholderFontStyle)
|
||||||
|
try container.encode(placeholderTextColor, forKey: .placeholderTextColor)
|
||||||
|
try container.encode(textAlignment, forKey: .textAlignment)
|
||||||
|
try container.encode(editable, forKey: .editable)
|
||||||
|
}
|
||||||
|
}
|
||||||
@ -8,10 +8,13 @@
|
|||||||
|
|
||||||
import UIKit
|
import UIKit
|
||||||
|
|
||||||
|
|
||||||
open class MVMCoreUIDelegateObject: DelegateObject {
|
open class MVMCoreUIDelegateObject: DelegateObject {
|
||||||
|
|
||||||
public weak var formHolderDelegate: FormHolderProtocol?
|
public weak var formHolderDelegate: FormHolderProtocol?
|
||||||
public weak var buttonDelegate: ButtonDelegateProtocol?
|
public weak var buttonDelegate: ButtonDelegateProtocol?
|
||||||
public weak var uiTextFieldDelegate: UITextFieldDelegate?
|
public weak var uiTextFieldDelegate: UITextFieldDelegate?
|
||||||
|
public weak var uiTextViewDelegate: UITextViewDelegate?
|
||||||
public weak var observingTextFieldDelegate: ObservingTextFieldDelegate?
|
public weak var observingTextFieldDelegate: ObservingTextFieldDelegate?
|
||||||
public weak var moleculeDelegate: MoleculeDelegateProtocol?
|
public weak var moleculeDelegate: MoleculeDelegateProtocol?
|
||||||
|
|
||||||
@ -20,6 +23,7 @@ open class MVMCoreUIDelegateObject: DelegateObject {
|
|||||||
formHolderDelegate = delegate as? FormHolderProtocol
|
formHolderDelegate = delegate as? FormHolderProtocol
|
||||||
buttonDelegate = delegate as? ButtonDelegateProtocol
|
buttonDelegate = delegate as? ButtonDelegateProtocol
|
||||||
uiTextFieldDelegate = delegate as? UITextFieldDelegate
|
uiTextFieldDelegate = delegate as? UITextFieldDelegate
|
||||||
|
uiTextViewDelegate = delegate as? UITextViewDelegate
|
||||||
observingTextFieldDelegate = delegate as? ObservingTextFieldDelegate
|
observingTextFieldDelegate = delegate as? ObservingTextFieldDelegate
|
||||||
moleculeDelegate = delegate as? MoleculeDelegateProtocol
|
moleculeDelegate = delegate as? MoleculeDelegateProtocol
|
||||||
}
|
}
|
||||||
@ -28,4 +32,3 @@ open class MVMCoreUIDelegateObject: DelegateObject {
|
|||||||
return controller?.delegateObject?() as? MVMCoreUIDelegateObject
|
return controller?.delegateObject?() as? MVMCoreUIDelegateObject
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@ -23,6 +23,7 @@ public extension MVMCoreUIViewControllerMappingObject {
|
|||||||
|
|
||||||
register(template: ThreeLayerTemplate.self)
|
register(template: ThreeLayerTemplate.self)
|
||||||
register(template: ThreeLayerCenterTemplate.self)
|
register(template: ThreeLayerCenterTemplate.self)
|
||||||
|
register(template: ThreeLayerFillMiddleTemplate.self)
|
||||||
|
|
||||||
register(template: CollectionTemplate.self)
|
register(template: CollectionTemplate.self)
|
||||||
}
|
}
|
||||||
|
|||||||
@ -142,7 +142,7 @@ open class Styler {
|
|||||||
}
|
}
|
||||||
|
|
||||||
/// Returns the font based on the declared enum case.
|
/// Returns the font based on the declared enum case.
|
||||||
public func getFont(_ genericScaling: Bool = true) -> UIFont? {
|
public func getFont(_ genericScaling: Bool = true) -> UIFont {
|
||||||
|
|
||||||
let size = genericScaling ? sizeFontGeneric(forCurrentDevice: pointSize()) : pointSize()
|
let size = genericScaling ? sizeFontGeneric(forCurrentDevice: pointSize()) : pointSize()
|
||||||
|
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user