Merge branch 'develop' into feature/list_leftvariable_radiobutton_alltextlinks

MVMCoreUI/Atomic/Atoms/Views/Label/Label.swift

@@ -402,11 +402,11 @@ public typealias ActionBlock = () -> ()
                     attributedString.insert(mutableString, at: imageAtt.location)
                     
                 case let fontAtt as LabelAttributeFontModel:
-                    if let fontStyle = fontAtt.style?.rawValue {
+                    if let fontStyle = fontAtt.style {
-                        let styles = MFStyler.styleGetAttributedString("0", withStyle: fontStyle)
                         attributedString.removeAttribute(.font, range: range)
                         attributedString.removeAttribute(.foregroundColor, range: range)
-                        attributedString.addAttributes(styles.attributes(at: 0, effectiveRange: nil), range: range)
+                        attributedString.addAttribute(.font, value: fontStyle.getFont(), range: range)
+                        attributedString.addAttribute(.foregroundColor, value: fontStyle.color(), range: range)
                     } else {
                         let fontSize = fontAtt.size
                         var font: UIFont?

MVMCoreUI/Atomic/Molecules/Items/MoleculeCollectionViewCell.swift

@@ -14,6 +14,7 @@ open class MoleculeCollectionViewCell: CollectionViewCell {
     open override func set(with model: MoleculeModelProtocol, _ delegateObject: MVMCoreUIDelegateObject?, _ additionalData: [AnyHashable: Any]?) {
         super.set(with: model, delegateObject, additionalData)
         guard let collectionModel = model as? MoleculeCollectionItemModel else { return }
+        
         if molecule == nil {
             if let moleculeView = MoleculeObjectMapping.shared()?.createMolecule(collectionModel.molecule, delegateObject: delegateObject, additionalData: additionalData) {
                 addMolecule(moleculeView)
@@ -24,13 +25,12 @@ open class MoleculeCollectionViewCell: CollectionViewCell {
         
         guard let molecule = molecule as? (UIView & MVMCoreUIViewConstrainingProtocol) else { return }
         containerHelper.set(with: collectionModel, for: molecule)
-        accessibilityElements = molecule.subviews
     }
     
     open override func reset() {
         super.reset()
         molecule?.reset()
-        backgroundColor = .white
+        backgroundColor = .mvmWhite
     }
     
     open class func nameForReuse(_ model: MoleculeModelProtocol, _ delegateObject: MVMCoreUIDelegateObject?) -> String? {

MVMCoreUI/Atomic/Templates/ModalMoleculeListTemplate.swift

@@ -8,6 +8,7 @@
 
 import UIKit
 
+
 open class ModalMoleculeListTemplate: MoleculeListTemplate {
     //--------------------------------------------------
     // MARK: - Properties
@@ -15,13 +16,20 @@ open class ModalMoleculeListTemplate: MoleculeListTemplate {
     
     public var closeButton: Button?
         
+    //--------------------------------------------------
+    // MARK: - Lifecycle
+    //--------------------------------------------------
+    
     override open func handleNewData() {
         super.handleNewData()
+        
         closeButton = MVMCoreUICommonViewsUtility.addCloseButton(to: view, action: { _ in
             MVMCoreNavigationHandler.shared()?.removeCurrentViewController()
         })
+    }
     
+    open override func viewDidLayoutSubviews() {
+        super.viewDidLayoutSubviews()
         accessibilityElements = [closeButton as Any, tableView as Any]
-        UIAccessibility.post(notification: .layoutChanged, argument: closeButton)
     }
 }

MVMCoreUI/Atomic/Templates/MoleculeListTemplate.swift

@@ -8,6 +8,7 @@
 
 import UIKit
 
+
 open class MoleculeListTemplate: ThreeLayerTableViewController, TemplateProtocol {
     //--------------------------------------------------
     // MARK: - Stored Properties

MVMCoreUI/BaseClasses/CollectionViewCell.swift

@@ -8,8 +8,12 @@
 
 import Foundation
 
+
 /// A base collection view cell with basic mvm functionality.
 open class CollectionViewCell: UICollectionViewCell, MoleculeViewProtocol, MVMCoreViewProtocol, CollectionTemplateItemProtocol {
+    //--------------------------------------------------
+    // MARK: - Properties
+    //--------------------------------------------------
     
     // Convenience helpers
     open var molecule: MoleculeViewProtocol?
@@ -21,6 +25,10 @@ open class CollectionViewCell: UICollectionViewCell, MoleculeViewProtocol, MVMCo
     
     private var initialSetupPerformed = false
     
+    //--------------------------------------------------
+    // MARK: - Properties
+    //--------------------------------------------------
+    
     // MARK: - Inits
     public override init(frame: CGRect) {
         super.init(frame: .zero)
@@ -39,6 +47,10 @@ open class CollectionViewCell: UICollectionViewCell, MoleculeViewProtocol, MVMCo
         }
     }
     
+    //--------------------------------------------------
+    // MARK: - Properties
+    //--------------------------------------------------
+    
     // MARK: - MVMCoreViewProtocol
     open func setupView() {
         isAccessibilityElement = false
@@ -58,10 +70,14 @@ open class CollectionViewCell: UICollectionViewCell, MoleculeViewProtocol, MVMCo
     
     open func reset() {
         molecule?.reset()
-        backgroundColor = .white
+        backgroundColor = .mvmWhite
         width = nil
     }
     
+    //--------------------------------------------------
+    // MARK: - Properties
+    //--------------------------------------------------
+    
     // MARK: - MoleculeViewProtocol
     open func set(with model: MoleculeModelProtocol, _ delegateObject: MVMCoreUIDelegateObject?, _ additionalData: [AnyHashable: Any]?) {
         guard let model = model as? CollectionItemModelProtocol else { return }
@@ -85,7 +101,10 @@ open class CollectionViewCell: UICollectionViewCell, MoleculeViewProtocol, MVMCo
         self.molecule = molecule
     }
     
+    //--------------------------------------------------
     // MARK: - CollectionTemplateItemProtocol
+    //--------------------------------------------------
+    
     public func set(width: CGFloat) {
         self.width = width
     }
@@ -96,9 +115,9 @@ open class CollectionViewCell: UICollectionViewCell, MoleculeViewProtocol, MVMCo
         guard let width = width else { return autoLayoutAttributes }
         
         let targetSize = CGSize(width: width, height: 0)
-        let newSize = contentView.systemLayoutSizeFitting(targetSize, withHorizontalFittingPriority: UILayoutPriority.required, verticalFittingPriority: UILayoutPriority.defaultLow)
+        let newSize = contentView.systemLayoutSizeFitting(targetSize, withHorizontalFittingPriority: .required, verticalFittingPriority: .defaultLow)
         let newFrame = CGRect(origin: autoLayoutAttributes.frame.origin, size: newSize)
         autoLayoutAttributes.frame = newFrame
         return autoLayoutAttributes
-   }
+    }
 }

MVMCoreUI/BaseClasses/TableViewCell.swift

@@ -206,7 +206,6 @@ import UIKit
         caret.translatesAutoresizingMaskIntoConstraints = true
         caret.isAccessibilityElement = true
         caret.accessibilityTraits = .button
-        caret.accessibilityLabel = "Caret,"
         caret.accessibilityHint = MVMCoreUIUtility.hardcodedString(withKey: "AccTabHint")
         caret.size = .small(.vertical)
         if let size = caret.size?.dimensions() {

MVMCoreUI/Styles/Styler.swift

@@ -81,6 +81,16 @@ open class Styler {
             }
         }
         
+        public func color() -> UIColor {
+            switch self {
+            case .B3:
+                return .mvmCoolGray6
+                
+            default:
+                return .mvmBlack
+            }
+        }
+        
         /// Determines if the selected font case is bold or regular.
         public func isBold() -> Bool {
             

MVMCoreUI/TopAlert/MVMCoreUITopAlertMainView.m

@@ -248,6 +248,8 @@
         
         // Sets the color
         if (color) {
+            self.button.layer.borderColor = color.CGColor;
+            [self.button setTitleColor:color forState:UIControlStateNormal];
             [self.closeButton setTintColor:color];
         }