current state

MVMCoreUI.xcodeproj/project.pbxproj

@@ -95,6 +95,7 @@
 		0A7BAFA1232BE61800FB8E22 /* Checkbox.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0A7BAFA0232BE61800FB8E22 /* Checkbox.swift */; };
 		0A7ECC5D243CE85300C828E8 /* DoughnutChartItemModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0A7ECC5C243CE85300C828E8 /* DoughnutChartItemModel.swift */; };
 		0A7ECC5F243CEB1200C828E8 /* ColorViewWithLabel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0A7ECC5E243CEB1200C828E8 /* ColorViewWithLabel.swift */; };
+		0A7ECC702441001C00C828E8 /* UIToolbar+Extension.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0A7ECC6F2441001C00C828E8 /* UIToolbar+Extension.swift */; };
 		0A7EF85B23D8A52800B2AAD1 /* EntryFieldModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0A7EF85A23D8A52800B2AAD1 /* EntryFieldModel.swift */; };
 		0A7EF85D23D8A95600B2AAD1 /* TextEntryFieldModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0A7EF85C23D8A95600B2AAD1 /* TextEntryFieldModel.swift */; };
 		0A7EF85F23D8ABC500B2AAD1 /* MdnEntryFieldModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0A7EF85E23D8ABC500B2AAD1 /* MdnEntryFieldModel.swift */; };
@@ -504,6 +505,7 @@
 		0A7BAFA2232BE63400FB8E22 /* CheckboxLabel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CheckboxLabel.swift; sourceTree = "<group>"; };
 		0A7ECC5C243CE85300C828E8 /* DoughnutChartItemModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DoughnutChartItemModel.swift; sourceTree = "<group>"; };
 		0A7ECC5E243CEB1200C828E8 /* ColorViewWithLabel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ColorViewWithLabel.swift; sourceTree = "<group>"; };
+		0A7ECC6F2441001C00C828E8 /* UIToolbar+Extension.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "UIToolbar+Extension.swift"; sourceTree = "<group>"; };
 		0A7EF85A23D8A52800B2AAD1 /* EntryFieldModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = EntryFieldModel.swift; sourceTree = "<group>"; };
 		0A7EF85C23D8A95600B2AAD1 /* TextEntryFieldModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TextEntryFieldModel.swift; sourceTree = "<group>"; };
 		0A7EF85E23D8ABC500B2AAD1 /* MdnEntryFieldModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MdnEntryFieldModel.swift; sourceTree = "<group>"; };
@@ -1083,6 +1085,7 @@
 				D21EE53B23AD3AD4003D1A30 /* NSLayoutConstraintAxis+Extension.swift */,
 				D202AFE5242A6A9C00E5BEDF /* UICollectionViewScrollPosition+Extension.swift */,
 				013F801823FB4A8E00AD8013 /* UIContentMode+Extension.swift */,
+				0A7ECC6F2441001C00C828E8 /* UIToolbar+Extension.swift */,
 			);
 			path = Extensions;
 			sourceTree = "<group>";
@@ -2125,6 +2128,7 @@
 				BB47A586241615EF002BB23C /* ListOneColumnFullWidthTextDividerSubsectionModel.swift in Sources */,
 				D2B18B812360945C00A9AEDC /* View.swift in Sources */,
 				C6FA7D5423C77A4A00A3614A /* NumberedList.swift in Sources */,
+				0A7ECC702441001C00C828E8 /* UIToolbar+Extension.swift in Sources */,
 				D29DF26D21E6AA0B003B2FB9 /* FLAnimatedImageView.m in Sources */,
 				525019E52406852100EED91C /* ListFourColumnDataUsageDividerModel.swift in Sources */,
 				0A7EF86723D8B0AE00B2AAD1 /* DateDropdownEntryFieldModel.swift in Sources */,

MVMCoreUI/Atomic/Atoms/TextFields/BaseDropdownEntryField.swift

@@ -64,13 +64,7 @@ import UIKit
         super.setupFieldContainerContent(container)
         
         container.addSubview(dropDownCaretView)
-        
+        accessoryView = dropDownCaretView
-        textFieldTrailingConstraint?.isActive = false
-        textFieldTrailingConstraint = dropDownCaretView.leadingAnchor.constraint(equalTo: textField.trailingAnchor, constant: 6)
-        textFieldTrailingConstraint?.isActive = true
-        
-        container.trailingAnchor.constraint(equalTo: dropDownCaretView.trailingAnchor, constant: 16).isActive = true
-        dropDownCaretView.centerYAnchor.constraint(equalTo: container.centerYAnchor).isActive = true
     }
     
     public override func set(with model: MoleculeModelProtocol, _ delegateObject: MVMCoreUIDelegateObject?, _ additionalData: [AnyHashable: Any]?) {

MVMCoreUI/Atomic/Atoms/TextFields/EntryField.swift

@@ -36,7 +36,7 @@ import UIKit
         label.setContentCompressionResistancePriority(.required, for: .vertical)
         return label
     }()
-    
+
     //--------------------------------------------------
     // MARK: - Delegate
     //--------------------------------------------------
@@ -193,7 +193,7 @@ import UIKit
         entryFieldContainer.setContentCompressionResistancePriority(.required, for: .vertical)
         setupFieldContainerContent(entryFieldContainer)
         
-        titleContainerDistance = entryFieldContainer.topAnchor.constraint(equalTo: titleLabel.bottomAnchor, constant: 4)
+        titleContainerDistance = entryFieldContainer.topAnchor.constraint(equalTo: titleLabel.bottomAnchor, constant: Padding.One)
         titleContainerDistance?.isActive = true
         entryFieldContainerLeading = entryFieldContainer.leadingAnchor.constraint(equalTo: layoutMarginsGuide.leadingAnchor)
         entryFieldContainerLeading?.isActive = true
@@ -202,7 +202,7 @@ import UIKit
         
         addSubview(feedbackLabel)
         
-        feedbackContainerDistance = feedbackLabel.topAnchor.constraint(equalTo: entryFieldContainer.bottomAnchor, constant: PaddingOne)
+        feedbackContainerDistance = feedbackLabel.topAnchor.constraint(equalTo: entryFieldContainer.bottomAnchor, constant: Padding.Two)
         feedbackContainerDistance?.isActive = true
         feedbackLabelLeading = feedbackLabel.leadingAnchor.constraint(equalTo: layoutMarginsGuide.leadingAnchor)
         feedbackLabelLeading?.isActive = true
@@ -240,9 +240,9 @@ import UIKit
         
         backgroundColor = .clear
         isAccessibilityElement = false
-        titleLabel.font = MFStyler.fontRegularMicro()
+        titleLabel.font = Styler.Font.RegularMicro.getFont()
         titleLabel.textColor = .mvmBlack
-        feedbackLabel.font = MFStyler.fontRegularMicro()
+        feedbackLabel.font = Styler.Font.RegularMicro.getFont()
         feedbackLabel.textColor = .mvmBlack
         entryFieldContainer.reset()
     }

MVMCoreUI/Atomic/Atoms/TextFields/TextEntryField.swift

@@ -28,7 +28,7 @@ import UIKit
         let textField = TextField()
         textField.isAccessibilityElement = true
         textField.setContentCompressionResistancePriority(.required, for: .vertical)
-        textField.font = MFStyler.fontRegularBodyLarge()
+        textField.font = Styler.Font.RegularBodyLarge.getFont()
         textField.textColor = .mvmBlack
         textField.smartQuotesType = .no
         textField.smartDashesType = .no
@@ -36,6 +36,12 @@ import UIKit
         return textField
     }()
     
+    public var accessoryView: View? {
+        didSet {
+            accessoryView == nil ? removeAccessoryView() : constrainAccessoryView()
+        }
+    }
+    
     //--------------------------------------------------
     // MARK: - Stored Properties
     //--------------------------------------------------
@@ -54,7 +60,7 @@ import UIKit
     public var textEntryFieldModel: TextEntryFieldModel? {
         return model as? TextEntryFieldModel
     }
-
+    
     //--------------------------------------------------
     // MARK: - Computed Properties
     //--------------------------------------------------
@@ -141,6 +147,26 @@ import UIKit
     //--------------------------------------------------
     
     public var textFieldTrailingConstraint: NSLayoutConstraint?
+    public var accessoryViewTrailingConstraint: NSLayoutConstraint?
+    
+    public func constrainAccessoryView() {
+        
+        textFieldTrailingConstraint?.isActive = false
+        textFieldTrailingConstraint = accessoryView?.leadingAnchor.constraint(equalTo: textField.trailingAnchor, constant: Padding.Two)
+        textFieldTrailingConstraint?.isActive = true
+        
+        accessoryViewTrailingConstraint = entryFieldContainer.trailingAnchor.constraint(equalTo: accessoryView!.trailingAnchor, constant: Padding.Four)
+        accessoryViewTrailingConstraint?.isActive = true
+        accessoryView?.centerYAnchor.constraint(equalTo: entryFieldContainer.centerYAnchor).isActive = true
+    }
+    
+    public func removeAccessoryView() {
+        
+        accessoryView?.removeFromSuperview()
+        
+        textFieldTrailingConstraint = entryFieldContainer.trailingAnchor.constraint(equalTo: textField.trailingAnchor, constant: Padding.Four)
+        textFieldTrailingConstraint?.isActive = true
+    }
     
     //--------------------------------------------------
     // MARK: - Initializers
@@ -169,17 +195,17 @@ import UIKit
     
     @objc open override func setupFieldContainerContent(_ container: UIView) {
         
-        textField.font = MFStyler.fontRegularBodyLarge()
+        textField.font = Styler.Font.RegularBodyLarge.getFont()
         container.addSubview(textField)
         
         NSLayoutConstraint.activate([
-            textField.heightAnchor.constraint(equalToConstant: 24),
+            textField.heightAnchor.constraint(equalToConstant: Padding.Five),
-            textField.topAnchor.constraint(equalTo: container.topAnchor, constant: 12),
+            textField.topAnchor.constraint(equalTo: container.topAnchor, constant: Padding.Three),
-            textField.leadingAnchor.constraint(equalTo: container.leadingAnchor, constant: 16),
+            textField.leadingAnchor.constraint(equalTo: container.leadingAnchor, constant: Padding.Four),
-            container.bottomAnchor.constraint(equalTo: textField.bottomAnchor, constant: 12)
+            container.bottomAnchor.constraint(equalTo: textField.bottomAnchor, constant: Padding.Three)
         ])
         
-        textFieldTrailingConstraint = container.trailingAnchor.constraint(equalTo: textField.trailingAnchor, constant: 16)
+        textFieldTrailingConstraint = container.trailingAnchor.constraint(equalTo: textField.trailingAnchor, constant: Padding.Four)
         textFieldTrailingConstraint?.isActive = true
         
         textField.addTarget(self, action: #selector(startEditing), for: .editingDidBegin)
@@ -194,20 +220,20 @@ import UIKit
     @objc open override func updateView(_ size: CGFloat) {
         super.updateView(size)
         
-        textField.font = MFStyler.fontRegularBodyLarge()
+        textField.font = Styler.Font.RegularBodyLarge.getFont()
         layoutIfNeeded()
     }
     
     open override func reset() {
         super.reset()
         
-        textField.font = MFStyler.fontRegularBodyLarge()
+        textField.font = Styler.Font.RegularBodyLarge.getFont()
     }
     
     @objc deinit {
         setBothTextDelegates(to: nil)
     }
-
+    
     @objc public func setBothTextDelegates(to delegate: (UITextFieldDelegate & ObservingTextFieldDelegate)?) {
         observingTextFieldDelegate = delegate
         uiTextFieldDelegate = delegate
@@ -240,11 +266,11 @@ import UIKit
         text = textField.text
         _ = FormValidator.validate(delegate: delegateObject?.formHolderDelegate)
     }
-
+    
     @objc public func updateValidation(_ isValid: Bool) {
         let previousValidity = self.isValid
         self.isValid = isValid
-
+        
         if previousValidity && !isValid {
             showError = true
             observingTextFieldDelegate?.isInvalid?(textfield: self)
@@ -288,7 +314,7 @@ import UIKit
         super.set(with: model, delegateObject, additionalData)
         
         guard let model = model as? TextEntryFieldModel else { return }
-
+        
         model.updateUI = { [weak self] in
             MVMCoreDispatchUtility.performBlock(onMainThread: {
                 if self?.isSelected ?? false {
@@ -306,10 +332,13 @@ import UIKit
         switch model.type {
         case .password:
             textField.isSecureTextEntry = true
+            
         case .number:
             textField.keyboardType = .numberPad
+            
         case .email:
             textField.keyboardType = .emailAddress
+            
         default:
             break
         }

MVMCoreUI/Atomic/Extensions/UIToolbar+Extension.swift

@@ -0,0 +1,36 @@
+//
+//  UIToolbar+Extension.swift
+//  MVMCoreUI
+//
+//  Created by Kevin Christiano on 4/10/20.
+//  Copyright © 2020 Verizon Wireless. All rights reserved.
+//
+
+import Foundation
+
+/*
+public extension UIToolbar {
+    
+    class func makeEmptyToolbar() -> UIToolbar {
+        
+        let toolbar = UIToolbar(frame: CGRect(x: 0, y: 0, width: UIScreen.main.bounds.width, height: 44.0))
+        toolbar.autoresizingMask = [.flexibleLeftMargin, .flexibleRightMargin, .flexibleWidth]
+        toolbar.barStyle = .default
+        toolbar.barTintColor = .mvmCoolGray3
+        toolbar.isTranslucent = true
+        
+        return toolbar
+    }
+    
+    class func getToolbarWithDoneButton(delegate: ObservingTextFieldDelegate) -> UIToolbar {
+        
+        let toolbar = makeEmptyToolbar()
+        let space = UIBarButtonItem(barButtonSystemItem: .flexibleSpace, target: nil, action: nil)
+        let button = UIBarButtonItem(barButtonSystemItem: .done, target: delegate, action: #selector(ObservingTextFieldDelegate.dismissFieldInput))
+        button.tintColor = .mvmBlack
+        toolbar.setItems([space, button], animated: false)
+        
+        return toolbar
+    }
+}
+*/