Added refresh button and the score

Author: BlindDev

SnakeGame/Base.lproj/Main.storyboard

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="10117" systemVersion="15G31" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" initialViewController="BYZ-38-t0r">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="10117" systemVersion="15G31" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" initialViewController="NWJ-XV-QCd">
     <dependencies>
         <deployment identifier="iOS"/>
         <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="10085"/>
@@ -15,11 +15,11 @@
                         <viewControllerLayoutGuide type="bottom" id="wfy-db-euE"/>
                     </layoutGuides>
                     <view key="view" contentMode="scaleToFill" id="8bC-Xf-vdC">
-                        <rect key="frame" x="0.0" y="0.0" width="600" height="600"/>
+                        <rect key="frame" x="0.0" y="64" width="600" height="536"/>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                         <subviews>
                             <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="2J6-BG-JmJ" customClass="GameFieldView" customModule="SnakeGame" customModuleProvider="target">
-                                <rect key="frame" x="0.0" y="20" width="600" height="580"/>
+                                <rect key="frame" x="0.0" y="0.0" width="600" height="536"/>
                                 <color key="backgroundColor" red="0.96078431369999995" green="0.94509803920000002" blue="0.97254901959999995" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                 <gestureRecognizers/>
                                 <connections>
@@ -33,7 +33,7 @@
                         <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="calibratedWhite"/>
                         <constraints>
                             <constraint firstAttribute="trailingMargin" secondItem="2J6-BG-JmJ" secondAttribute="trailing" constant="-20" id="IDa-sc-3JD"/>
-                            <constraint firstItem="2J6-BG-JmJ" firstAttribute="top" secondItem="8bC-Xf-vdC" secondAttribute="topMargin" constant="20" id="Nqp-Pf-oL9"/>
+                            <constraint firstItem="2J6-BG-JmJ" firstAttribute="top" secondItem="8bC-Xf-vdC" secondAttribute="topMargin" id="Nqp-Pf-oL9"/>
                             <constraint firstItem="wfy-db-euE" firstAttribute="top" secondItem="2J6-BG-JmJ" secondAttribute="bottom" id="OWE-i7-JMs"/>
                             <constraint firstItem="wfy-db-euE" firstAttribute="top" secondItem="2J6-BG-JmJ" secondAttribute="bottom" id="Oh6-IM-in2"/>
                             <constraint firstItem="2J6-BG-JmJ" firstAttribute="leading" secondItem="8bC-Xf-vdC" secondAttribute="leadingMargin" constant="-20" id="bc1-gk-Vse"/>
@@ -46,6 +46,13 @@
                             </mask>
                         </variation>
                     </view>
+                    <navigationItem key="navigationItem" id="5l0-jo-AZ5">
+                        <barButtonItem key="rightBarButtonItem" systemItem="refresh" id="Fbd-Qz-sEe">
+                            <connections>
+                                <action selector="refreshAction:" destination="BYZ-38-t0r" id="bg1-jj-vQj"/>
+                            </connections>
+                        </barButtonItem>
+                    </navigationItem>
                     <connections>
                         <outlet property="gameFieldView" destination="2J6-BG-JmJ" id="F2g-dZ-D8U"/>
                     </connections>
@@ -72,6 +79,24 @@
                     </connections>
                 </swipeGestureRecognizer>
             </objects>
+            <point key="canvasLocation" x="1153" y="364"/>
+        </scene>
+        <!--Navigation Controller-->
+        <scene sceneID="WDu-K6-fqb">
+            <objects>
+                <navigationController automaticallyAdjustsScrollViewInsets="NO" id="NWJ-XV-QCd" sceneMemberID="viewController">
+                    <toolbarItems/>
+                    <navigationBar key="navigationBar" contentMode="scaleToFill" translucent="NO" id="Rdc-Ac-meb">
+                        <rect key="frame" x="0.0" y="0.0" width="320" height="44"/>
+                        <autoresizingMask key="autoresizingMask"/>
+                    </navigationBar>
+                    <nil name="viewControllers"/>
+                    <connections>
+                        <segue destination="BYZ-38-t0r" kind="relationship" relationship="rootViewController" id="vud-Dz-jiT"/>
+                    </connections>
+                </navigationController>
+                <placeholder placeholderIdentifier="IBFirstResponder" id="7fm-xV-GAl" userLabel="First Responder" sceneMemberID="firstResponder"/>
+            </objects>
             <point key="canvasLocation" x="341" y="364"/>
         </scene>
     </scenes>

SnakeGame/GameFieldView.swift

@@ -18,8 +18,6 @@ class GameFieldView: UIView {
 
     var delegate: DidDrawDelegate?
 
-    var correctSize: CGSize!
-    
     func renderSegments(segments: [GameSegment]){
 
         for i in 0..<segments.count {
@@ -51,8 +49,6 @@ class GameFieldView: UIView {
     }
 
     override func drawRect(rect: CGRect) {
-
-        correctSize = rect.size
 
         delegate?.viewDidDraw()
     }

SnakeGame/GameModel.swift

@@ -11,7 +11,8 @@ import UIKit
 let side: CGFloat = UIScreen.mainScreen().bounds.width / 30
 
 protocol BrainDelegate {
-    func snakeIsDead()
+    func snakeIsDeadWithScore(value: Int)
+    func updateScoreWithScore(value: Int)
 }
 
 class GameBrain {
@@ -72,6 +73,7 @@ class GameBrain {
     init(viewSize: CGSize){
 
         screen = viewSize
+        score = 0
 
         //prepareView
         borders = []
@@ -182,36 +184,40 @@ class GameBrain {
         return CGPoint(x: x, y: y)
     }
 
+    private var score: Int!
 
     func updateHead(){
 
         headPoint.x += direction.x
         headPoint.y += direction.y
 
-        for border in borders {
+        func checkContainingInSegments(segments: [GameSegment]) {
 
-            if border.parameters.rect.contains(headPoint) {
-                
-                delegate?.snakeIsDead()
-                return
+            for segment in segments {
+                if segment.parameters.rect.contains(headPoint) {
+                    
+                    delegate?.snakeIsDeadWithScore(score)
+                    return
+                }
             }
-        }
-        
-        for segment in snake {
-            if segment.parameters.rect.contains(headPoint) {
+            
+            moveHead()
+            
+            if food.parameters.rect.contains(headPoint) {
+                
+                score = score + 1
 
-                delegate?.snakeIsDead()
-                return
+                delegate?.updateScoreWithScore(score)
+                
+                snake.insert(food, atIndex: 0)
+                
+                food = newSegment()
             }
+
         }
 
-        moveHead()
+        checkContainingInSegments(borders + snake)
 
-        if food.parameters.rect.contains(headPoint) {
-            snake.insert(food, atIndex: 0)
-            
-            food = newSegment()
-        }
     }
 
     private func moveHead() {

SnakeGame/GameViewController.swift

@@ -28,7 +28,9 @@ class GameViewController: UIViewController {
         default:
             break
         }
-
+    }
+    @IBAction func refreshAction(sender: UIBarButtonItem) {
+        resetBrain()
     }
 
     private var brain: GameBrain!
@@ -39,32 +41,40 @@ class GameViewController: UIViewController {
         gameFieldView.delegate = self
     }
 
-
-
     @objc private func movePoint() {
 
         brain.updateHead()
-        updateViewHead()
+        gameFieldView.renderSegments(brain.segments)
     }
 
-    private func updateViewHead(){
-        gameFieldView.renderSegments(brain.segments)
+    private func resetBrain() {
+        brain = GameBrain(viewSize: gameFieldView.bounds.size)
+        brain.delegate = self
+        gameFieldView.renderBorders(brain.borders)
+        
+        timer = NSTimer.scheduledTimerWithTimeInterval(0.10,  target: self, selector: #selector(movePoint), userInfo: nil, repeats: true)
     }
 }
 
 extension GameViewController: DidDrawDelegate{
+    
     func viewDidDraw() {
-        brain = GameBrain(viewSize: gameFieldView.correctSize)
-        brain.delegate = self
-        gameFieldView.renderBorders(brain.borders)
 
-        timer = NSTimer.scheduledTimerWithTimeInterval(0.50,  target: self, selector: #selector(movePoint), userInfo: nil, repeats: true)
+        resetBrain()
     }
 }
 
 extension GameViewController: BrainDelegate {
-    func snakeIsDead() {
+    func snakeIsDeadWithScore(value: Int) {
+        
+        navigationItem.title = "Game over! Score: \(value)"
+
         timer.invalidate()
         timer = nil
     }
+    
+    func updateScoreWithScore(value: Int) {
+        
+        navigationItem.title = "Score: \(value)"
+    }
 }