Merge branch 'develop'

MVMCoreUI/Atoms/TextFields/DigitEntryField.swift

@@ -207,7 +207,7 @@ import UIKit
         
         let digitBox = DigitBox()
         digitBox.isAccessibilityElement = true
-        MVMCoreUICommonViewsUtility.addDismissToolbar(digitBox.digitField, delegate: self)
+        digitBox.digitField.inputAccessoryView = MVMCoreUICommonViewsUtility.getToolbarWithDoneButton(delegate: self)
         digitBox.digitField.delegate = self
         digitBox.digitBoxDelegate = self
         return digitBox
@@ -330,11 +330,9 @@ import UIKit
     
     public override func set(with model: MoleculeModelProtocol, _ delegateObject: MVMCoreUIDelegateObject?, _ additionalData: [AnyHashable: Any]?) {
     
-        
         guard let model = model as? DigitEntryFieldModel else { return }
         
         numberOfDigits = model.digits
-        
         setAsSecureTextEntry(model.secureEntry)
         
         for digitBox in digitBoxes {

MVMCoreUI/Atoms/TextFields/EntryField.swift

@@ -116,8 +116,7 @@ import UIKit
         set (newFeedback) {
             feedbackLabel.text = newFeedback
             feedbackLabel.accessibilityElementsHidden = feedbackLabel.text?.isEmpty ?? true
-            entryFieldContainer.refreshUI()
+            entryFieldContainer.refreshUI(updateMoleculeLayout: true)
-            delegateObject?.moleculeDelegate?.moleculeLayoutUpdated(self)
         }
     }
     

MVMCoreUI/Atoms/TextFields/TextEntryField.swift

@@ -50,6 +50,10 @@ import UIKit
     /// Validate when user resigns editing. Default: true
     public var validateWhenDoneEditing: Bool = true
     
+    public var textEntryFieldModel: TextEntryFieldModel? {
+        return model as? TextEntryFieldModel
+    }
+
     //--------------------------------------------------
     // MARK: - Computed Properties
     //--------------------------------------------------
@@ -87,7 +91,7 @@ import UIKit
         get { return textField.text }
         set {
             textField.text = newValue
-            (model as? TextEntryFieldModel)?.text = newValue
+            textEntryFieldModel?.text = newValue
         }
     }
     
@@ -167,7 +171,8 @@ import UIKit
             textField.heightAnchor.constraint(equalToConstant: 24),
             textField.topAnchor.constraint(equalTo: container.topAnchor, constant: 12),
             textField.leadingAnchor.constraint(equalTo: container.leadingAnchor, constant: 16),
-            container.bottomAnchor.constraint(equalTo: textField.bottomAnchor, constant: 12)])
+            container.bottomAnchor.constraint(equalTo: textField.bottomAnchor, constant: 12)
+        ])
         
         textFieldTrailingConstraint = container.trailingAnchor.constraint(equalTo: textField.trailingAnchor, constant: 16)
         textFieldTrailingConstraint?.isActive = true
@@ -366,7 +371,6 @@ extension TextEntryField {
             defaultValidationBlock()
         }
         
-        
         uiTextFieldDelegate = delegateObject.uiTextFieldDelegate
         observingTextFieldDelegate = delegateObject.observingTextFieldDelegate
         MVMCoreUICommonViewsUtility.addDismissToolbar(textField, delegate: uiTextFieldDelegate)

MVMCoreUI/BaseControllers/ViewController.swift

@@ -36,7 +36,7 @@ import UIKit
 
     /// Checks if the screen width has changed
     open func screenSizeChanged() -> Bool {
-        return MVMCoreGetterUtility.cgfequalwiththreshold(previousScreenSize.width, view.bounds.size.width, 0.1)
+        return !MVMCoreGetterUtility.cgfequalwiththreshold(previousScreenSize.width, view.bounds.size.width, 0.1)
     }
     
     // MARK: - Response handling
@@ -276,15 +276,16 @@ import UIKit
     
     open override func viewDidLayoutSubviews() {
         // Add to fix a constraint bug where the width is zero and things get messed up.
-        guard isViewLoaded,
+        guard isViewLoaded, view.bounds.width > 1 else {
-            view.bounds.width > 1 else {
+            super.viewDidLayoutSubviews()
-                super.viewDidLayoutSubviews()
+            return
-                return
         }
+        
         if needsUpdateUI || screenSizeChanged() {
             updateViews()
             needsUpdateUI = false
         }
+        
         previousScreenSize = view.bounds.size;
         
         super.viewDidLayoutSubviews()

MVMCoreUI/Containers/Views/EntryFieldContainer.swift

@@ -260,13 +260,21 @@ import UIKit
         refreshUI(bottomBarSize: 1)
     }
     
-    open func refreshUI(bottomBarSize: CGFloat? = nil) {
+    open func refreshUI(bottomBarSize: CGFloat? = nil, updateMoleculeLayout: Bool = false) {
         
         if !disableAllBorders {
             let size: CGFloat = bottomBarSize ?? (showError ? 4 : 1)
+            var heightChanged = false
+            
+            if let bottomHeight = bottomBar?.bounds.height {
+                heightChanged = size != bottomHeight
+            }
             bottomBar?.frame = CGRect(x: 0, y: bounds.height - size, width: bounds.width, height: size)
             
-            delegateObject?.moleculeDelegate?.moleculeLayoutUpdated(self)
+            if updateMoleculeLayout || heightChanged {
+                delegateObject?.moleculeDelegate?.moleculeLayoutUpdated(self)
+            }
+            
             setNeedsDisplay()
             layoutIfNeeded()
         }

MVMCoreUI/Utility/MVMCoreUICommonViewsUtility+Extension.swift

@@ -9,12 +9,15 @@
 import Foundation
 
 public extension MVMCoreUICommonViewsUtility {
+    
     static func getToolbarWithDoneButton(delegate: ObservingTextFieldDelegate) -> UIToolbar {
+        
         let toolbar = self.makeEmptyToolbar()
         let space = UIBarButtonItem(barButtonSystemItem: .flexibleSpace, target: nil, action: nil)
         let button = UIBarButtonItem(barButtonSystemItem: .done, target: delegate, action: #selector(ObservingTextFieldDelegate.dismissFieldInput(sender:)))
         button.tintColor = .black
         toolbar.setItems([space, button], animated: false)
+        
         return toolbar
     }
 }

MVMCoreUI/Utility/MVMCoreUICommonViewsUtility.m

@@ -260,15 +260,15 @@ static const CGFloat VertialShadowOffset = 6;
     UIBezierPath *shadowPath = [UIBezierPath bezierPath];
     
     //get the variables for frame
-    CGFloat x = 0;
+    CGFloat x = rect.origin.x;
-    CGFloat y = 0;
+    CGFloat y = rect.origin.y;
     CGFloat width = CGRectGetWidth(rect);
     CGFloat height = CGRectGetHeight(rect);
     
     [shadowPath moveToPoint:CGPointMake(x + HorizontalShadowInset, y)];
-    [shadowPath addLineToPoint:CGPointMake(width - HorizontalShadowInset, y)];
+    [shadowPath addLineToPoint:CGPointMake(x + width - HorizontalShadowInset, y)];
-    [shadowPath addLineToPoint:CGPointMake(width - HorizontalShadowInset, height-VertialShadowOffset/2)];
+    [shadowPath addLineToPoint:CGPointMake(x + width - HorizontalShadowInset, height-VertialShadowOffset/2)];
-    [shadowPath addQuadCurveToPoint:CGPointMake(x + HorizontalShadowInset, height - VertialShadowOffset/2) controlPoint:CGPointMake(width/2.f, height - VertialShadowOffset * 1.5)];
+    [shadowPath addQuadCurveToPoint:CGPointMake(x + HorizontalShadowInset, height - VertialShadowOffset/2) controlPoint:CGPointMake((x + width)/2.f, height - VertialShadowOffset * 1.5)];
     [shadowPath addLineToPoint:CGPointMake(x + HorizontalShadowInset, y)];
     [shadowPath closePath];