Refactor: Modify for-in loop in foundationView and Add cards() in fou…

…ndationDelegate #26

CardGameApp/CardGameApp/DelegateModel/FoundationDelegate.swift

@@ -53,4 +53,8 @@ class FoundationDelegate: FoundationManageable, Stackable {
         return self.foundations[at.column].getCard(at: at.row)
     }
 
+    func cards(in column: Int) -> [Card] {
+        return self.foundations[column].getCards()
+    }
+
 }

CardGameApp/CardGameApp/Model/CardStack.swift

@@ -96,6 +96,9 @@ struct CardStack {
         return (self.cards.count == 0)
     }
 
+    func getCards()-> [Card] {
+        return self.cards
+    }
 }
 
 

CardGameApp/CardGameApp/Model/CustomProtocols.swift

@@ -46,6 +46,7 @@ protocol CardStackManageable {
 protocol FoundationManageable {
     func cardInTurn(at:(column: Int, row: Int)) -> Card
     func countOfCards(of: Int) -> Int
+    func cards(in column: Int) -> [Card]
 }
 
 protocol StackManageable {

CardGameApp/CardGameApp/View/FoundationView.swift

@@ -45,23 +45,19 @@ class FoundationView: UIView {
 
     func redraw() {
         self.subviews.forEach({ $0.removeFromSuperview() })
-
         for i in FoundationDelegate.range {
             let newOrigin = CGPoint(x: PositionX.allValues[i].value, y: PositionY.upper.value)
             let frameForDraw = CGRect(origin: newOrigin, size: ViewController.cardSize)
-
             if foundationManager.countOfCards(of: i) == 0 {
                 self.drawEmptyDock(in: frameForDraw)
             } else {
-                for j in 0..<foundationManager.countOfCards(of: i) {
-                    let card = foundationManager.cardInTurn(at: (column: i, row: j))
+                for card in foundationManager.cards(in: i) {
                     let cardImage = CardImageView(frame: frameForDraw)
                     cardImage.getImage(of: card)
                     addSubview(cardImage)
                 }
             }
         }
-
     }
 
 }