From 957a477428695f5dab6d82aa2bed3fe4394e8080 Mon Sep 17 00:00:00 2001
From: Natallia Zubareva <Ndobrovolskaya@gmail.com>
Date: Sun, 8 Apr 2018 21:25:46 +0300
Subject: [PATCH] Counter added. Restart logic implemented.

---
 memo/Base.lproj/Main.storyboard | 17 ++++++++++++-----
 memo/CardsView.swift            |  8 ++++++++
 memo/Model/Game.swift           |  5 ++---
 memo/ViewController.swift       | 13 +++++++++++++
 4 files changed, 35 insertions(+), 8 deletions(-)

diff --git a/memo/Base.lproj/Main.storyboard b/memo/Base.lproj/Main.storyboard
index c28e642..81b2e1b 100644
--- a/memo/Base.lproj/Main.storyboard
+++ b/memo/Base.lproj/Main.storyboard
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="14109" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES" initialViewController="BYZ-38-t0r">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="13771" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES" initialViewController="BYZ-38-t0r">
     <device id="retina4_7" orientation="portrait">
         <adaptation id="fullscreen"/>
     </device>
     <dependencies>
         <deployment identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="14088"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="13772"/>
         <capability name="Safe area layout guides" minToolsVersion="9.0"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
@@ -19,10 +19,16 @@
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                         <subviews>
                             <stackView opaque="NO" contentMode="scaleToFill" axis="vertical" alignment="top" spacing="20" translatesAutoresizingMaskIntoConstraints="NO" id="nF6-mb-2ZL" customClass="CardsView" customModule="memo" customModuleProvider="target">
-                                <rect key="frame" x="0.0" y="203.5" width="375" height="260"/>
+                                <rect key="frame" x="0.0" y="183.5" width="375" height="300.5"/>
                                 <subviews>
+                                    <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label1" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="zSh-3J-mK6">
+                                        <rect key="frame" x="0.0" y="0.0" width="49.5" height="20.5"/>
+                                        <fontDescription key="fontDescription" type="system" pointSize="17"/>
+                                        <nil key="textColor"/>
+                                        <nil key="highlightedColor"/>
+                                    </label>
                                     <stackView opaque="NO" contentMode="scaleToFill" distribution="fillEqually" spacing="20" translatesAutoresizingMaskIntoConstraints="NO" id="R1d-cK-V72">
-                                        <rect key="frame" x="0.0" y="0.0" width="375" height="120"/>
+                                        <rect key="frame" x="0.0" y="40.5" width="375" height="120"/>
                                         <subviews>
                                             <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="oLN-eX-Q2A">
                                                 <rect key="frame" x="0.0" y="0.0" width="79" height="120"/>
@@ -58,7 +64,7 @@
                                         </constraints>
                                     </stackView>
                                     <stackView opaque="NO" contentMode="scaleToFill" distribution="fillEqually" spacing="20" translatesAutoresizingMaskIntoConstraints="NO" id="zGT-pR-dBh">
-                                        <rect key="frame" x="0.0" y="140" width="375" height="120"/>
+                                        <rect key="frame" x="0.0" y="180.5" width="375" height="120"/>
                                         <subviews>
                                             <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="TKe-lY-Hpb">
                                                 <rect key="frame" x="0.0" y="0.0" width="79" height="120"/>
@@ -106,6 +112,7 @@
                                     </mask>
                                 </variation>
                                 <connections>
+                                    <outlet property="uiCounter" destination="zSh-3J-mK6" id="jqh-q8-omD"/>
                                     <outletCollection property="cards" destination="oLN-eX-Q2A" collectionClass="NSMutableArray" id="KW0-X6-vpm"/>
                                     <outletCollection property="cards" destination="LKB-cK-9Zu" collectionClass="NSMutableArray" id="sIw-dY-TNc"/>
                                     <outletCollection property="cards" destination="T55-pc-MsI" collectionClass="NSMutableArray" id="s57-qN-FFr"/>
diff --git a/memo/CardsView.swift b/memo/CardsView.swift
index cd69d8d..c22bf71 100644
--- a/memo/CardsView.swift
+++ b/memo/CardsView.swift
@@ -11,6 +11,8 @@ class CardsView: UIStackView {
     private let backColor = UIColor.brown
     
     @IBOutlet var cards: [UIButton]!
+    @IBOutlet var uiCounter: UILabel!
+
     
     @IBAction func cardTapped(_ sender: UIButton) {
         if let index = cards.index(of: sender) {
@@ -19,6 +21,7 @@ class CardsView: UIStackView {
     }
     
     func updateView(game: Game) {
+        uiCounter.text = String(game.counter)
         for (i, card) in game.cards.enumerated() {
             let button = cards[i]
             button.isHidden = card.isMatched
@@ -30,6 +33,11 @@ class CardsView: UIStackView {
             }
         }
     }
+    func initView(game: Game) {
+        for (i, card) in game.cards.enumerated() {
+            cards[i].setTitle(card.id, for: .normal)
+        }
+    }
     
     private func open(card: UIButton) {
         card.backgroundColor = cardColor
diff --git a/memo/Model/Game.swift b/memo/Model/Game.swift
index 978b528..9b0c670 100644
--- a/memo/Model/Game.swift
+++ b/memo/Model/Game.swift
@@ -3,6 +3,7 @@ import Foundation
 class Game {
     private (set) var cards: [Card]
     private var openedCardIndex: Int?
+    private (set) var counter: Int = 0
     
     init(cards: [Card]) {
         self.cards = cards
@@ -10,19 +11,17 @@ class Game {
     
     func showCard(at index: Int) {
         cards[index].isOpened = true
+        counter += 1
         
         if let previousCardIndex = openedCardIndex {
-            // та же карточка
             if index == previousCardIndex {
                 return
             }
             
-            // карточки совпали
             if cards[previousCardIndex] == cards[index] {
                 cards[previousCardIndex].isMatched = true
                 cards[index].isMatched = true
             }
-            // карточки не совпали
             else {
                 cards[previousCardIndex].isOpened = false
                 cards[index].isOpened = false
diff --git a/memo/ViewController.swift b/memo/ViewController.swift
index a6d331d..240d981 100644
--- a/memo/ViewController.swift
+++ b/memo/ViewController.swift
@@ -19,14 +19,27 @@ class ViewController: UIViewController, CardsViewDelegate {
         stackView.delegate = self
         startGame()
     }
+    private func isGameOver() -> Bool {
+        for card in game.cards {
+            if !card.isMatched  {
+                return false
+            }
+        }
+        return true
+    }
     
     func didTapCard(at index: Int) {
         game.showCard(at: index)
         stackView.updateView(game: game)
+        if isGameOver() {
+            startGame()
+        }
     }
     
     private func startGame() {
         let cards = images.map { Card(isOpened: false, isMatched: false, id: $0) }
         game = Game(cards: cards)
+        stackView.initView(game: game)
+        stackView.updateView(game: game)
     }
 }