Externalize card creation and create 2 base cards to customize.

Author: luxorules

CardAnimation.xcodeproj/project.pbxproj

@@ -9,6 +9,7 @@
 /* Begin PBXBuildFile section */
 		D21FB6791BCED32B0021B734 /* ComponentViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = D21FB6781BCED32B0021B734 /* ComponentViewController.swift */; settings = {ASSET_TAGS = (); }; };
 		D21FB67C1BCED4C20021B734 /* AnimatedCardsView.swift in Sources */ = {isa = PBXBuildFile; fileRef = D21FB67B1BCED4C20021B734 /* AnimatedCardsView.swift */; settings = {ASSET_TAGS = (); }; };
+		D21FC1301BD0730D004D033D /* CardViews.swift in Sources */ = {isa = PBXBuildFile; fileRef = D21FC12F1BD0730D004D033D /* CardViews.swift */; settings = {ASSET_TAGS = (); }; };
 		FDD71FB91BBB360A00E076EE /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = FDD71FB81BBB360A00E076EE /* AppDelegate.swift */; };
 		FDD71FBB1BBB360A00E076EE /* ViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = FDD71FBA1BBB360A00E076EE /* ViewController.swift */; };
 		FDD71FBE1BBB360A00E076EE /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = FDD71FBC1BBB360A00E076EE /* Main.storyboard */; };
@@ -47,6 +48,7 @@
 /* Begin PBXFileReference section */
 		D21FB6781BCED32B0021B734 /* ComponentViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ComponentViewController.swift; sourceTree = "<group>"; };
 		D21FB67B1BCED4C20021B734 /* AnimatedCardsView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = AnimatedCardsView.swift; path = AnimatedCardView/AnimatedCardsView.swift; sourceTree = "<group>"; };
+		D21FC12F1BD0730D004D033D /* CardViews.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = CardViews.swift; sourceTree = "<group>"; };
 		FDD71FB51BBB360A00E076EE /* CardAnimation.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = CardAnimation.app; sourceTree = BUILT_PRODUCTS_DIR; };
 		FDD71FB81BBB360A00E076EE /* AppDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = "<group>"; };
 		FDD71FBA1BBB360A00E076EE /* ViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ViewController.swift; sourceTree = "<group>"; };
@@ -100,6 +102,7 @@
 			isa = PBXGroup;
 			children = (
 				D21FB67B1BCED4C20021B734 /* AnimatedCardsView.swift */,
+				D21FC12F1BD0730D004D033D /* CardViews.swift */,
 			);
 			name = Component;
 			sourceTree = "<group>";
@@ -309,6 +312,7 @@
 				D21FB67C1BCED4C20021B734 /* AnimatedCardsView.swift in Sources */,
 				FDD71FB91BBB360A00E076EE /* AppDelegate.swift in Sources */,
 				D21FB6791BCED32B0021B734 /* ComponentViewController.swift in Sources */,
+				D21FC1301BD0730D004D033D /* CardViews.swift in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};

CardAnimation/AnimatedCardView/AnimatedCardsView.swift

@@ -11,7 +11,7 @@ import UIKit
 public protocol AnimatedCardsViewDataSource : class {
     func numberOfVisibleCards() -> Int
     func numberOfCards() -> Int
-    func contentForCardNumber(number:Int, size:(width:CGFloat, height:CGFloat)) -> UIView
+    func cardNumber(number:Int) -> BaseCardView
 }
 
 public class AnimatedCardsView: UIView {
@@ -71,13 +71,11 @@ public class AnimatedCardsView: UIView {
     // MARK: Initializers
     override init(frame: CGRect) {
         super.init(frame: frame)
-        configure()
     }
 
     required public init?(coder aDecoder: NSCoder) {
         super.init(coder: aDecoder)
         backgroundColor = UIColor.yellowColor()
-        configure()
     }
 
     // MARK: Config
@@ -127,9 +125,9 @@ public class AnimatedCardsView: UIView {
         currentIndex++
 
         let frontView = cardArray.removeFirst()
-        
-        if currentIndex + cardArray.count < cardCount {
-            addNewCardViewWithIndex(currentIndex, insertOnRear: true)
+        let lastIndex = currentIndex + cardArray.count
+        if lastIndex < cardCount {
+            addNewCardViewWithIndex(lastIndex, insertOnRear: true)
         }
 
         UIView.animateWithDuration(animationsSpeed*1.5, animations: {
@@ -163,8 +161,8 @@ extension AnimatedCardsView {
             }
         }
 
-        cardArray = (0..<maxVisibleCardCount).map { (tagId) in
-            let view = generateNewCardViewWithTagId(tagId)
+        cardArray = (0..<maxVisibleCardCount).map { (index) in
+            let view = generateNewCardViewWithIndex(index)
             addSubview(view)
             applyConstraintsToView(view)
             return view
@@ -173,7 +171,7 @@ extension AnimatedCardsView {
 
     private func addNewCardViewWithIndex(index:Int, insertOnRear rear:Bool = false) -> UIView {
         let newIndex = rear ? subviews.count : 0
-        let newView = generateNewCardViewWithTagId(index)
+        let newView = generateNewCardViewWithIndex(index)
         rear ? insertSubview(newView, atIndex: newIndex) : addSubview(newView)
         rear ? cardArray.append(newView) : cardArray.insert(newView, atIndex: newIndex)
         applyConstraintsToView(newView)
@@ -182,21 +180,9 @@ extension AnimatedCardsView {
         return newView
     }
 
-    private func generateNewCardViewWithTagId(tagId:NSInteger) -> UIView {
-        let view = UIView()
+    private func generateNewCardViewWithIndex(index:Int) -> UIView {
+        let view = self.dataSourceDelegate!.cardNumber(index)
         view.translatesAutoresizingMaskIntoConstraints = false
-        view.tag = tagId+1
-        switch tagId {
-        case 0: view.backgroundColor = UIColor.purpleColor()
-        case 1: view.backgroundColor = UIColor.redColor()
-        case 2: view.backgroundColor = UIColor.blackColor()
-        case 3: view.backgroundColor = UIColor.greenColor()
-        case 4: view.backgroundColor = UIColor.brownColor()
-        case 5: view.backgroundColor = UIColor.darkGrayColor()
-        case 6: view.backgroundColor = UIColor.blueColor()
-        case 7: view.backgroundColor = UIColor.orangeColor()
-        default: view.backgroundColor = UIColor.whiteColor()
-        }
         return view
     }
 

CardAnimation/CardViews.swift

@@ -0,0 +1,35 @@
+//
+//  CardView.swift
+//  CardAnimation
+//
+//  Created by Luis Sanchez Garcia on 16/10/15.
+//  Copyright © 2015 seedante. All rights reserved.
+//
+
+import UIKit
+
+public class BaseCardView: UIView {
+
+}
+
+class ImageCardView: BaseCardView {
+    var imageView:UIImageView!
+    override init(frame: CGRect) {
+        super.init(frame: frame)
+        configure()
+    }
+
+    required init?(coder aDecoder: NSCoder) {
+        super.init(coder: aDecoder)
+        configure()
+    }
+    
+    private func configure() {
+        imageView = UIImageView.init(frame: frame)
+        imageView.autoresizingMask = [.FlexibleWidth, .FlexibleHeight]
+        imageView.backgroundColor = UIColor.lightGrayColor()
+        imageView.clipsToBounds = true
+        imageView.contentMode = .ScaleAspectFill
+        addSubview(imageView)
+    }
+}

CardAnimation/ComponentViewController.swift

@@ -39,6 +39,25 @@ class ComponentViewController: UIViewController {
 
 }
 
+enum JusticeLeagueLogos: String {
+    case WonderWoman = "wonder_woman_logo_by_kalangozilla.jpg"
+    case Superman = "superman_kingdom_come_logo_by_kalangozilla.jpg"
+    case Batman = "batman_begins_poster_style_logo_by_kalangozilla.jpg"
+    case GreenLantern = "green_lantern_corps_logo_by_kalangozilla.jpg"
+    case Flash = "flash_logo_by_kalangozilla.jpg"
+    case Aquaman = "aquaman_young_justice_logo_by_kalangozilla.jpg"
+    case CaptainMarvel = "classic_captain_marvel_jr_logo_by_kalangozilla.jpg"
+    //can't find Cybord's Logo.
+    case AllMembers = "JLAFRICA.jpeg"
+    
+    static var logoArray : [JusticeLeagueLogos]  {
+        get {
+            return [.Superman, .WonderWoman, .Batman, .GreenLantern, .Flash, .Aquaman, .CaptainMarvel, .AllMembers]
+        }
+    }
+}
+
+
 // MARK: - AnimatedCardsViewDataSource
 extension ComponentViewController : AnimatedCardsViewDataSource {
 
@@ -50,8 +69,11 @@ extension ComponentViewController : AnimatedCardsViewDataSource {
         return 8
     }
 
-    func contentForCardNumber(number:Int, size:(width:CGFloat, height:CGFloat)) -> UIView {
-        return UIView(frame: CGRect(x: 0, y: 0, width: size.width, height: size.height))
+    func cardNumber(number:Int) -> BaseCardView {
+        print(" 🃏 Requested card number \(number)")
+        let view = ImageCardView(frame: CGRect(x: 0, y: 0, width: 10, height: 10))
+        view.imageView.image = UIImage.init(named: JusticeLeagueLogos.logoArray[number].rawValue)
+        return view
     }
 
 }