Merge branch 'bugfix/carousel' into 'develop'

cleaning

See merge request BPHV_MIPS/mvm_core_ui!451

MVMCoreUI.xcodeproj/project.pbxproj

@@ -274,6 +274,7 @@
 		D236E5B5241FEB1000C38625 /* ListTwoColumnPriceDescriptionModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = D236E5B3241FEB1000C38625 /* ListTwoColumnPriceDescriptionModel.swift */; };
 		D236E5B7242007C500C38625 /* MVMControllerModelProtocol.swift in Sources */ = {isa = PBXBuildFile; fileRef = D236E5B6242007C500C38625 /* MVMControllerModelProtocol.swift */; };
 		D23EA7E82473654300D60C34 /* PanelNavigationItemModelProtocol.swift in Sources */ = {isa = PBXBuildFile; fileRef = D23EA7E72473654300D60C34 /* PanelNavigationItemModelProtocol.swift */; };
+		D23EA7FB2475F09800D60C34 /* CarouselItemProtocol.swift in Sources */ = {isa = PBXBuildFile; fileRef = D23EA7FA2475F09800D60C34 /* CarouselItemProtocol.swift */; };
 		D243859923A16B1800332775 /* Container.swift in Sources */ = {isa = PBXBuildFile; fileRef = D243859823A16B1800332775 /* Container.swift */; };
 		D2509ED12472ED9B001BFB9D /* NavigationItemModelProtocol.swift in Sources */ = {isa = PBXBuildFile; fileRef = D2509ED02472ED9B001BFB9D /* NavigationItemModelProtocol.swift */; };
 		D2509ED62472EE2F001BFB9D /* NavigationItemButtonModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = D2509ED52472EE2F001BFB9D /* NavigationItemButtonModel.swift */; };
@@ -699,6 +700,7 @@
 		D236E5B3241FEB1000C38625 /* ListTwoColumnPriceDescriptionModel.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ListTwoColumnPriceDescriptionModel.swift; sourceTree = "<group>"; };
 		D236E5B6242007C500C38625 /* MVMControllerModelProtocol.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MVMControllerModelProtocol.swift; sourceTree = "<group>"; };
 		D23EA7E72473654300D60C34 /* PanelNavigationItemModelProtocol.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PanelNavigationItemModelProtocol.swift; sourceTree = "<group>"; };
+		D23EA7FA2475F09800D60C34 /* CarouselItemProtocol.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CarouselItemProtocol.swift; sourceTree = "<group>"; };
 		D243859823A16B1800332775 /* Container.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Container.swift; sourceTree = "<group>"; };
 		D2509ED02472ED9B001BFB9D /* NavigationItemModelProtocol.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NavigationItemModelProtocol.swift; sourceTree = "<group>"; };
 		D2509ED52472EE2F001BFB9D /* NavigationItemButtonModel.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = NavigationItemButtonModel.swift; sourceTree = "<group>"; };
@@ -872,6 +874,7 @@
 			children = (
 				D2E2A9A023E095AB000B42E6 /* ButtonModelProtocol.swift */,
 				014AA72323C501E2006F3E93 /* ContainerModelProtocol.swift */,
+				D23EA7FA2475F09800D60C34 /* CarouselItemProtocol.swift */,
 				012A88C3238D86E600FE3DA1 /* CarouselItemModelProtocol.swift */,
 				012A88B0238C880100FE3DA1 /* CarouselPagingModelProtocol.swift */,
 				01EB3683236097C0006832FA /* MoleculeModelProtocol.swift */,
@@ -2285,6 +2288,7 @@
 				525239C22407BD1000454969 /* ListTwoColumnPriceDetails.swift in Sources */,
 				AA997252247530B100FC7472 /* ListLeftVariableIconAllTextLinks.swift in Sources */,
 				D2A5146122121FBF00345BFB /* MoleculeStackTemplate.swift in Sources */,
+				D23EA7FB2475F09800D60C34 /* CarouselItemProtocol.swift in Sources */,
 				D2E2A9A323E096B1000B42E6 /* DisableableModelProtocol.swift in Sources */,
 				D29DF11821E6805F003B2FB9 /* NSLayoutConstraint+MFConvenience.m in Sources */,
 				27F973532466074500CAB5C5 /* PageBehavior.swift in Sources */,

MVMCoreUI/Atomic/Molecules/Items/CarouselItem.swift

@@ -8,7 +8,7 @@
 
 import Foundation
 
-open class CarouselItem: MoleculeCollectionViewCell {
+open class CarouselItem: MoleculeCollectionViewCell, CarouselItemProtocol {
     
     open var allowsPeaking = false
     var peakingLeftArrow = UIImageView(image: MVMCoreUIUtility.imageNamed("peakingRightArrow")?.withRenderingMode(.alwaysTemplate))

MVMCoreUI/Atomic/Organisms/Carousel.swift

@@ -36,7 +36,7 @@ open class Carousel: View {
     open var numberOfPages = 0
     
     /// The models for the molecules.
-    var molecules: [MoleculeModelProtocol]?
+    var molecules: [MoleculeModelProtocol & CarouselItemModelProtocol]?
     
     /// The horizontal alignment of the cell in the collection view. Only noticeable if the itemWidthPercent is less than 100%.
     public var itemAlignment = UICollectionView.ScrollPosition.left
@@ -177,10 +177,8 @@ open class Carousel: View {
             // Sets up the row data with buffer cells on each side (for illusion of endless scroll... also has one more buffer cell on each side in case we can peek that cell).
             loop = true
 
-            molecules?.insert(newMolecules.last!, at: 0)
+            molecules?.insert(contentsOf: newMolecules.suffix(2), at: 0)
-            molecules?.insert(newMolecules[(newMolecules.count - 2)], at: 0)
+            molecules?.append(contentsOf: newMolecules.prefix(2))
-            molecules?.append(newMolecules.first!)
-            molecules?.append(newMolecules[1])
         }
         
         pageIndex = 0
@@ -259,15 +257,15 @@ open class Carousel: View {
             let visibleItemsPaths = collectionView.indexPathsForVisibleItems.sorted { $0.row < $1.row }
             
             if let firstItem = visibleItemsPaths.first, firstItem.row != currentIndex {
-                (collectionView.cellForItem(at: firstItem) as? CarouselItem)?.setPeaking(true, animated: true)
+                (collectionView.cellForItem(at: firstItem) as? CarouselItemProtocol)?.setPeaking(true, animated: true)
             }
             if let lastItem = visibleItemsPaths.last, lastItem.row != currentIndex {
-                (collectionView.cellForItem(at: lastItem) as? CarouselItem)?.setPeaking(true, animated: true)
+                (collectionView.cellForItem(at: lastItem) as? CarouselItemProtocol)?.setPeaking(true, animated: true)
             }
         } else {
             // Hide peaking.
             for item in collectionView.visibleCells {
-                (item as? CarouselItem)?.setPeaking(false, animated: true)
+                (item as? CarouselItemProtocol)?.setPeaking(false, animated: true)
             }
         }
     }
@@ -301,7 +299,7 @@ extension Carousel: UICollectionViewDelegateFlowLayout {
     }
     
     open func collectionView(_ collectionView: UICollectionView, didEndDisplaying cell: UICollectionViewCell, forItemAt indexPath: IndexPath) {
-        (cell as? CarouselItem)?.setPeaking(false, animated: false)
+        (cell as? CarouselItemProtocol)?.setPeaking(false, animated: false)
     }
 }
 

MVMCoreUI/Atomic/Organisms/CarouselModel.swift

@@ -19,7 +19,7 @@ import UIKit
     }
     
     public var backgroundColor: Color?
-    public var molecules: [CarouselItemModel]
+    public var molecules: [MoleculeModelProtocol & CarouselItemModelProtocol]
     public var index: Int = 0
     public var spacing: Float?
     public var border: Bool?
@@ -29,7 +29,7 @@ import UIKit
     public var itemAlignment: UICollectionView.ScrollPosition?
     public var pagingMolecule: (CarouselPagingModelProtocol & MoleculeModelProtocol)?
 
-    public init(molecules: [CarouselItemModel]) {
+    public init(molecules: [MoleculeModelProtocol & CarouselItemModelProtocol]) {
         self.molecules = molecules
     }
     
@@ -57,7 +57,7 @@ import UIKit
     
     required public init(from decoder: Decoder) throws {
         let typeContainer = try decoder.container(keyedBy: CodingKeys.self)
-        molecules = try typeContainer.decode([CarouselItemModel].self, forKey: .molecules)
+        molecules = try typeContainer.decodeModels(codingKey: .molecules)
         index = try typeContainer.decodeIfPresent(Int.self, forKey: .index) ?? 0
         backgroundColor = try typeContainer.decodeIfPresent(Color.self, forKey: .backgroundColor)
         spacing = try typeContainer.decodeIfPresent(Float.self, forKey: .spacing)
@@ -73,7 +73,7 @@ import UIKit
         var container = encoder.container(keyedBy: CodingKeys.self)
         try container.encode(moleculeName, forKey: .moleculeName)
         try container.encodeIfPresent(backgroundColor, forKey: .backgroundColor)
-        try container.encode(molecules, forKey: .molecules)
+        try container.encodeModels(molecules, forKey: .molecules)
         try container.encode(spacing, forKey: .spacing)
         try container.encode(border, forKey: .border)
         try container.encode(loop, forKey: .loop)

MVMCoreUI/Atomic/Protocols/ModelProtocols/CarouselItemModelProtocol.swift

@@ -9,7 +9,5 @@
 import Foundation
 
 
-public protocol CarouselItemModelProtocol: ContainerModelProtocol, MoleculeModelProtocol {
+public protocol CarouselItemModelProtocol: ContainerModelProtocol {
-    var peakingUI: Bool? { get }
-    var peakingArrowColor: Color? { get }
 }

MVMCoreUI/Atomic/Protocols/ModelProtocols/CarouselItemProtocol.swift

@@ -0,0 +1,15 @@
+//
+//  CarouselItemProtocol.swift
+//  MVMCoreUI
+//
+//  Created by Scott Pfeil on 5/20/20.
+//  Copyright © 2020 Verizon Wireless. All rights reserved.
+//
+
+import Foundation
+
+public protocol CarouselItemProtocol: UICollectionViewCell {
+
+    /// Notifies the cell if it is peaking or not.
+    func setPeaking(_ peaking: Bool, animated: Bool)
+}