Using stackview instead of colletionview for stars.

MVMCoreUI.xcodeproj/project.pbxproj

@@ -235,7 +235,6 @@
 		AA71AD4024A32FE700ACA76F /* HeadersH2Link.swift in Sources */ = {isa = PBXBuildFile; fileRef = AA71AD3F24A32FE700ACA76F /* HeadersH2Link.swift */; };
 		AA7F32AB246C0F7900C965BA /* ListLeftVariableRadioButtonAllTextAndLinksModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = AA7F32AA246C0F7900C965BA /* ListLeftVariableRadioButtonAllTextAndLinksModel.swift */; };
 		AA7F32AD246C0F8C00C965BA /* ListLeftVariableRadioButtonAllTextAndLinks.swift in Sources */ = {isa = PBXBuildFile; fileRef = AA7F32AC246C0F8C00C965BA /* ListLeftVariableRadioButtonAllTextAndLinks.swift */; };
-		AA817FE6251C71B600EF0C6C /* StarCollectionViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = AA817FE5251C71B600EF0C6C /* StarCollectionViewCell.swift */; };
 		AA85236C244435A20059CC1E /* RadioSwatchCollectionViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = AA85236B244435A20059CC1E /* RadioSwatchCollectionViewCell.swift */; };
 		AA9972502475309F00FC7472 /* ListLeftVariableIconAllTextLinksModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = AA99724F2475309F00FC7472 /* ListLeftVariableIconAllTextLinksModel.swift */; };
 		AA997252247530B100FC7472 /* ListLeftVariableIconAllTextLinks.swift in Sources */ = {isa = PBXBuildFile; fileRef = AA997251247530B100FC7472 /* ListLeftVariableIconAllTextLinks.swift */; };
@@ -733,7 +732,6 @@
 		AA71AD3F24A32FE700ACA76F /* HeadersH2Link.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = HeadersH2Link.swift; sourceTree = "<group>"; };
 		AA7F32AA246C0F7900C965BA /* ListLeftVariableRadioButtonAllTextAndLinksModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ListLeftVariableRadioButtonAllTextAndLinksModel.swift; sourceTree = "<group>"; };
 		AA7F32AC246C0F8C00C965BA /* ListLeftVariableRadioButtonAllTextAndLinks.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ListLeftVariableRadioButtonAllTextAndLinks.swift; sourceTree = "<group>"; };
-		AA817FE5251C71B600EF0C6C /* StarCollectionViewCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = StarCollectionViewCell.swift; sourceTree = "<group>"; };
 		AA85236B244435A20059CC1E /* RadioSwatchCollectionViewCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RadioSwatchCollectionViewCell.swift; sourceTree = "<group>"; };
 		AA99724F2475309F00FC7472 /* ListLeftVariableIconAllTextLinksModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ListLeftVariableIconAllTextLinksModel.swift; sourceTree = "<group>"; };
 		AA997251247530B100FC7472 /* ListLeftVariableIconAllTextLinks.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ListLeftVariableIconAllTextLinks.swift; sourceTree = "<group>"; };
@@ -1900,7 +1898,6 @@
 				AA37CBD42519072F0027344C /* Stars.swift */,
 				AA07EA902510A442009A2AE3 /* StarModel.swift */,
 				AA07EA922510A451009A2AE3 /* Star.swift */,
-				AA817FE5251C71B600EF0C6C /* StarCollectionViewCell.swift */,
 			);
 			path = Views;
 			sourceTree = "<group>";
@@ -2240,7 +2237,6 @@
 				AAC6F167243332E400F295C1 /* RadioSwatchesModel.swift in Sources */,
 				324FB6AA249366F3002552C7 /* ListLeftVariableNumberedListBodyTextModel.swift in Sources */,
 				5248BFED23F12E350059236A /* ListThreeColumnPlanDataDividerModel.swift in Sources */,
-				AA817FE6251C71B600EF0C6C /* StarCollectionViewCell.swift in Sources */,
 				AA0A257824766C8A00862F64 /* ListLeftVariableIconWithRightCaretBodyTextModel.swift in Sources */,
 				0A5D59C223AD2F5700EFD9E9 /* AppleGuidelinesProtocol.swift in Sources */,
 				8D070BB0241B56530099AC56 /* ListRightVariableTotalDataModel.swift in Sources */,

MVMCoreUI/Atomic/Atoms/Views/Star.swift

@@ -15,7 +15,9 @@ import Foundation
     //--------------------------------------------------
     private var starLayer: CAShapeLayer?
     private let maskLayer = CAShapeLayer()
-    public var starModel: StarModel?
+    public var starModel: StarModel? {
+        return model as? StarModel
+    }
     public var progressBar = UIProgressView(progressViewStyle: .bar)
     
     //--------------------------------------------------
@@ -37,12 +39,12 @@ import Foundation
         //Mask the star
         maskLayer.removeFromSuperlayer()
         maskLayer.path = star.path
-        self.layer.mask = maskLayer
+        layer.mask = maskLayer
     }
     
     func drawStar() -> CAShapeLayer {
         let shapeLayer = CAShapeLayer()
-        shapeLayer.frame = self.bounds
+        shapeLayer.frame = bounds
         let starPath = UIBezierPath()
         let center = shapeLayer.position
         let theta = .pi / CGFloat(5.0)
@@ -86,12 +88,15 @@ import Foundation
         progressBar.translatesAutoresizingMaskIntoConstraints = false
         addSubview(progressBar)
         NSLayoutConstraint.constraintPinSubview(toSuperview: progressBar)
+        widthConstraint = widthAnchor.constraint(equalToConstant: 30)
+        widthConstraint?.isActive = true
+        heightConstraint = heightAnchor.constraint(equalTo: widthAnchor, multiplier: 1)
+        heightConstraint?.isActive = true
     }
     
     public override func set(with model: MoleculeModelProtocol, _ delegateObject: MVMCoreUIDelegateObject?, _ additionalData: [AnyHashable: Any]?) {
         super.set(with: model, delegateObject, additionalData)
         guard let model = model as? StarModel else { return }
-        self.starModel = model
         progressBar.progress = Float((model.percent) / 100.0)
         progressBar.progressTintColor = model.fillColor.uiColor
         progressBar.trackTintColor = .mvmWhite
@@ -100,10 +105,7 @@ import Foundation
     
     func setFrame(with size: CGFloat) {
         progressBar.frame = CGRect(x: 0, y: 0, width: size, height: size)
-        widthConstraint = widthAnchor.constraint(equalToConstant: size)
+        widthConstraint?.constant = size
-        widthConstraint?.isActive = true
-        heightConstraint = heightAnchor.constraint(equalTo: widthAnchor, multiplier: 1)
-        heightConstraint?.isActive = true
         setNeedsDisplay()
     }
 }

MVMCoreUI/Atomic/Atoms/Views/StarCollectionViewCell.swift

@@ -1,24 +0,0 @@
-//
-//  StarCollectionViewCell.swift
-//  MVMCoreUI
-//
-//  Created by Lekshmi S on 24/09/20.
-//  Copyright © 2020 Verizon Wireless. All rights reserved.
-//
-
-import Foundation
-
-open class StarCollectionViewCell: CollectionViewCell {
-    public let star = Star()
-    
-    open override func setupView() {
-        super.setupView()
-        addMolecule(star)
-        MVMCoreUIUtility.setMarginsFor(contentView, leading: 0, top: 0, trailing: 0, bottom: 0)
-    }
-    
-    open override func set(with model: MoleculeModelProtocol, _ delegateObject: MVMCoreUIDelegateObject?, _ additionalData: [AnyHashable: Any]?) {
-        guard let model = model as? StarModel else { return }
-        star.set(with: model, delegateObject, additionalData)
-    }
-}

MVMCoreUI/Atomic/Atoms/Views/StarModel.swift

@@ -57,9 +57,9 @@ open class StarModel: MoleculeModelProtocol {
         var container = encoder.container(keyedBy: CodingKeys.self)
         try container.encodeIfPresent(backgroundColor, forKey: .backgroundColor)
         try container.encode(moleculeName, forKey: .moleculeName)
-        try container.encodeIfPresent(percent, forKey: .percent)
+        try container.encode(percent, forKey: .percent)
-        try container.encodeIfPresent(borderColor, forKey: .borderColor)
+        try container.encode(borderColor, forKey: .borderColor)
-        try container.encodeIfPresent(fillColor, forKey: .fillColor)
+        try container.encode(fillColor, forKey: .fillColor)
-        try container.encodeIfPresent(size, forKey: .size)
+        try container.encode(size, forKey: .size)
     }
 }

MVMCoreUI/Atomic/Atoms/Views/Stars.swift

@@ -12,144 +12,71 @@ open class Stars: View {
     //--------------------------------------------------
     // MARK: - Properties
     //--------------------------------------------------
-    public var collectionView: CollectionView!
+    private var stack = UIStackView()
-    public var stars: [StarModel]?
+    public var starsModel: StarsModel? {
-    private var size: CGFloat?
+        return model as? StarsModel
+    }
     private var delegateObject: MVMCoreUIDelegateObject?
-    private var starBackgroundColor: Color?
-    private var borderColor: Color?
-    private var fillColor: Color?
-    private var progress: CGFloat?
-    private var cellSize: CGFloat = 30.0
-    
-    //------------------------------------------------------
-    // MARK: - Constraints
-    //------------------------------------------------------
-    public var collectionViewHeight: NSLayoutConstraint?
     private let itemSpacing: CGFloat = 3.0
     
     //--------------------------------------------------
     // MARK: - Lifecycle
     //--------------------------------------------------
-    open override func layoutSubviews() {
-        super.layoutSubviews()
-        // Accounts for any collection size changes
-        setHeight()
-        DispatchQueue.main.async {
-            self.collectionView.collectionViewLayout.invalidateLayout()
-        }
-    }
-    
     open override func setupView() {
         super.setupView()
-        collectionView = createCollectionView()
+        stack.translatesAutoresizingMaskIntoConstraints = false
-        addSubview(collectionView)
+        addSubview(stack)
-        NSLayoutConstraint.constraintPinSubview(toSuperview: collectionView)
+        stack.topAnchor.constraint(equalTo: topAnchor).isActive = true
-        collectionViewHeight = collectionView.heightAnchor.constraint(equalToConstant: 30)
+        bottomAnchor.constraint(equalTo: stack.bottomAnchor).isActive = true
-        collectionViewHeight?.isActive = true
+        stack.axis = .horizontal
+        stack.spacing = itemSpacing
     }
     
     @objc override open func updateView(_ size: CGFloat) {
         super.updateView(size)
-        self.size = size
+        stack.updateView(size)
-        collectionView.updateView(size)
     }
     
     open override func set(with model: MoleculeModelProtocol, _ delegateObject: MVMCoreUIDelegateObject?, _ additionalData: [AnyHashable: Any]?) {
         super.set(with: model, delegateObject, additionalData)
         self.delegateObject = delegateObject
-        
+        createStar()
-        guard let starsModel = model as? StarsModel else { return }
-        stars = starsModel.stars
-        cellSize = starsModel.size
-        starBackgroundColor = starsModel.starBackgroundColor ?? Color(uiColor: .clear)
-        borderColor = starsModel.borderColor
-        fillColor = starsModel.fillColor
-        progress = starsModel.percent
-        collectionView.reloadData()
     }
     
     //------------------------------------------------------
     // MARK: - Methods
     //------------------------------------------------------
-    /// Creates the collection view.
+    func createStar() {
-    open func createCollectionView() -> CollectionView {
+        if let starsModel = starsModel {
-        let collection = CollectionView(frame: .zero, collectionViewLayout: createCollectionViewLayout())
+            stack.subviews.forEach({$0.removeFromSuperview()})
-        collection.dataSource = self
+            let stars = starsModel.stars
-        collection.delegate = self
+            for (index, starModel) in stars.enumerated() {
-        collection.register(StarCollectionViewCell.self, forCellWithReuseIdentifier: "StarCollectionViewCell")
+                let star = Star()
-        return collection
-    }
                 
-    /// Creates the layout for the collection.
+                //Fill the stars based on percentage. Ex: if there were 4 stars, 75 percent is 3 full stars
-    open func createCollectionViewLayout() -> UICollectionViewLayout {
+                let percentRequiredToFillStarFully = CGFloat(100/(starsModel.stars.count))
-        let layout = UICollectionViewFlowLayout()
+                let numberOfFilledStars = Int(starsModel.percent/percentRequiredToFillStarFully)
-        layout.scrollDirection = .vertical
+                if index < numberOfFilledStars {
-        layout.minimumLineSpacing = itemSpacing
+                    starModel.percent = 100
-        layout.minimumInteritemSpacing = itemSpacing
+                } else if index == numberOfFilledStars {
-        return layout
+                    let remainingProgress = (starsModel.percent).truncatingRemainder(dividingBy: percentRequiredToFillStarFully)
-    }
+                    let fillPercent = (remainingProgress/percentRequiredToFillStarFully) * 100
+                    starModel.percent = fillPercent
+                } else {
+                    starModel.percent = 0
+                }
                 
-    open func setHeight() {
+                starModel.backgroundColor = starsModel.starBackgroundColor
-        guard let stars = stars, stars.count > 0 else {
+                if let borderColor = starsModel.borderColor {
-            collectionViewHeight?.constant = 0
+                    starModel.borderColor = borderColor
-            return
+                }
-        }
+                if let fillColor = starsModel.fillColor {
-        // Calculate the height
+                    starModel.fillColor = fillColor
-        let starsInRow = floor(CGFloat(collectionView.bounds.width/(cellSize + itemSpacing)))
+                }
-        let numberOfRows = ceil(CGFloat(stars.count)/starsInRow)
+                starModel.size = starsModel.size
-        let height = (numberOfRows * cellSize) + (itemSpacing * (numberOfRows-1))
+                star.set(with: starModel, delegateObject, nil)
-        
+                stack.addArrangedSubview(star)
-        if let oldHeight = collectionViewHeight?.constant,
-            height != oldHeight {
-            // Notify delegate of height change, called async to avoid various race conditions caused while happening while laying out initially.
-            DispatchQueue.main.async {
-                self.delegateObject?.moleculeDelegate?.moleculeLayoutUpdated(self)
             }
         }
-        collectionViewHeight?.constant = CGFloat(height)
-    }
-}
-
-//------------------------------------------------------
-// MARK: - Delegate methods
-//------------------------------------------------------
-extension Stars: UICollectionViewDelegateFlowLayout {
-    open func collectionView(_ collectionView: UICollectionView, layout collectionViewLayout: UICollectionViewLayout, sizeForItemAt indexPath: IndexPath) -> CGSize {
-        return CGSize(width: cellSize, height: cellSize)
-    }
-}
-
-extension Stars: UICollectionViewDataSource {
-    open func collectionView(_ collectionView: UICollectionView, numberOfItemsInSection section: Int) -> Int {
-        return stars?.count ?? 0
-    }
-    
-    open func collectionView(_ collectionView: UICollectionView, cellForItemAt indexPath: IndexPath) -> UICollectionViewCell {
-        guard let molecule = stars?[indexPath.row], let cell = collectionView.dequeueReusableCell(withReuseIdentifier: "StarCollectionViewCell", for: indexPath) as? StarCollectionViewCell else {
-                fatalError()
-        }
-        cell.reset()
-        
-        //Fill the stars based on percentage. Ex: if there were 4 stars, 75 percent is 3 full stars
-        let percentRequiredToFillStarFully = CGFloat(100/(stars?.count ?? 1))
-        let numberOfFilledStars = Int((progress ?? 0)/percentRequiredToFillStarFully)
-        if indexPath.row < numberOfFilledStars {
-            molecule.percent = 100
-        } else if indexPath.row == numberOfFilledStars {
-            let remainingProgress = (progress ?? 0).truncatingRemainder(dividingBy: percentRequiredToFillStarFully)
-            let fillPercent = (remainingProgress/percentRequiredToFillStarFully) * 100
-            molecule.percent = fillPercent
-        } else {
-            molecule.percent = 0
-        }
-        molecule.backgroundColor = starBackgroundColor
-        molecule.borderColor = borderColor ?? Color(uiColor: .mvmBlack)
-        molecule.fillColor = fillColor ?? Color(uiColor: .mvmBlack)
-        molecule.size = cellSize
-        cell.set(with: molecule, delegateObject, nil)
-        cell.updateView(size ?? collectionView.bounds.width)
-        cell.layoutIfNeeded()
-        return cell
     }
 }

MVMCoreUI/Atomic/Atoms/Views/StarsModel.swift

@@ -18,8 +18,8 @@ import Foundation
     public var starBackgroundColor: Color?
     public var stars: [StarModel]
     @Percent public var percent: CGFloat = 0
-    public var borderColor: Color = Color(uiColor: .mvmBlack)
+    public var borderColor: Color?
-    public var fillColor: Color = Color(uiColor: .mvmBlack)
+    public var fillColor: Color?
     public var size: CGFloat = 30.0
     
     //--------------------------------------------------
@@ -64,9 +64,9 @@ import Foundation
         try container.encode(stars, forKey: .stars)
         try container.encodeIfPresent(backgroundColor, forKey: .backgroundColor)
         try container.encodeIfPresent(starBackgroundColor, forKey: .starBackgroundColor)
-        try container.encodeIfPresent(percent, forKey: .percent)
         try container.encodeIfPresent(borderColor, forKey: .borderColor)
         try container.encodeIfPresent(fillColor, forKey: .fillColor)
-        try container.encodeIfPresent(size, forKey: .size)
+        try container.encode(percent, forKey: .percent)
+        try container.encode(size, forKey: .size)
     }
 }