Merge branch 'Set-number-of-holes'

marvik37 · Oct 19, 2020 · f02c358 · f02c358
2 parents eb8b627 + 3045b97
commit f02c358
Show file tree

Hide file tree

Showing 14 changed files with 352 additions and 29 deletions.
diff --git a/resources/Menus/MainMenu.xml b/resources/Menus/MainMenu.xml
@@ -1,6 +1,7 @@
 <menu id="MainMenu" title="@Strings.MainMenuTitle">
     <menu-item id="selectHole" label="@Strings.MenuSelectHole"></menu-item>
     <menu-item id="changePar" label="@Strings.MenuPar"></menu-item>
+    <menu-item id="numberOfHoles" label="@Strings.NumberOfHoles"></menu-item>
     <menu-item id="newGame" label="@Strings.MenuNewGame"></menu-item>
     <menu-item id="scorecard" label="@Strings.MenuScorecard"></menu-item>
 </menu>
diff --git a/resources/strings/strings.xml b/resources/strings/strings.xml
@@ -7,4 +7,8 @@
     <string id="MenuPar">Edit Par</string>
     <string id="MenuNewGame">New game</string>
     <string id="MenuScorecard">Scorecard</string>
+    <string id="NumberOfHoles">Number of holes</string>
+
+    <!-- Titles -->
+    <string id="numberOfHolesPickerTitle">Number of holes</string>
 </strings>
diff --git a/source/Delegate/MainMenuDelegate.mc b/source/Delegate/MainMenuDelegate.mc
@@ -19,8 +19,11 @@ class MainMenuDelegate extends Ui.MenuInputDelegate{
         }else if(item == :scorecard){
             var view = new ScoreCardView(mController);
             Ui.switchToView(view, new ScoreCardDelegate(view, mController), Ui.SLIDE_UP);
+        }else if(item == :numberOfHoles){
+        	var picker = new SelectNumberOfHolesView(mController);
+        	Ui.pushView(picker, new SelectNumberOfHolesDelegate(picker, mController), Ui.SLIDE_UP);
         }
-
+		
         if(item == :changePar){
             mController.editPar = true;
         }

diff --git a/source/Delegate/ScoreCardDelegate.mc b/source/Delegate/ScoreCardDelegate.mc
@@ -16,18 +16,18 @@ class ScoreCardDelegate extends Ui.BehaviorDelegate{
 
         switch(key){
             case Ui.KEY_UP:
-                relatedView.shiftScoreCard();
+                relatedView.previousPage();
                 break;
             case Ui.KEY_DOWN:
-                relatedView.shiftScoreCard();
+                relatedView.nextPage();
                 break;
         }
         relatedView.requestUpdate();
         return false;
     }
 
     function onTap(clickEvent) {
-        relatedView.shiftScoreCard();
+        relatedView.nextPage();
         relatedView.requestUpdate();
         return false;
     }

diff --git a/source/Delegate/SelectNumberOfHolesDelegate.mc b/source/Delegate/SelectNumberOfHolesDelegate.mc
@@ -0,0 +1,70 @@
+using Toybox.WatchUi as Ui;
+
+class SelectNumberOfHolesDelegate extends Ui.BehaviorDelegate{
+
+    hidden var mController;
+    hidden var relatedView;
+
+    function initialize(view, controller) {
+        BehaviorDelegate.initialize();
+        relatedView = view;
+        mController = controller;
+    }
+
+   function onCancel() {
+        WatchUi.popView(WatchUi.SLIDE_IMMEDIATE);
+    }
+
+	 function onKey(keyEvent) {
+        var key = keyEvent.getKey();
+
+        switch(key){
+            case Ui.KEY_UP:
+                relatedView.addHole();
+                break;
+            case Ui.KEY_DOWN:
+                relatedView.removeHole();
+                break;
+            case Ui.KEY_ENTER:
+            	relatedView.setHole();
+                Ui.popView(Ui.SLIDE_IMMEDIATE);
+                return false;
+                break;
+        }
+        relatedView.requestUpdate();
+        return false;
+    }
+
+    function onTap(keyEvent){
+
+    	if(tapUp(keyEvent)){
+    		relatedView.addHole();
+    	}
+    	if(tapDown(keyEvent)){
+    		relatedView.removeHole();
+    	}
+    	relatedView.requestUpdate();
+
+    	return false;
+    }
+
+	hidden function tapDown(keyEvent) {
+	    var coordinates = keyEvent.getCoordinates();
+	    var gui = relatedView.gui;
+	    var tapDown = gui.tapBoxDown;
+
+	    return coordinates[0] > tapDown[0] && coordinates[0] < tapDown[0] + gui.TAP_BOX_WIDTH
+	    && coordinates[1] > tapDown[1] && coordinates[1] < tapDown[1] + gui.TAP_BOX_HEIGHT;
+
+    }
+
+    hidden function tapUp(keyEvent) {
+        var coordinates = keyEvent.getCoordinates();
+        var gui = relatedView.gui;
+        var tapUp = gui.tapBoxUp;
+
+        return coordinates[0] > tapUp[0] && coordinates[0] < tapUp[0] + gui.TAP_BOX_WIDTH
+        && coordinates[1] > tapUp[1] && coordinates[1] < tapUp[1] + gui.TAP_BOX_HEIGHT;
+    }
+
+}
diff --git a/source/Gui/Gui.mc b/source/Gui/Gui.mc
@@ -15,8 +15,15 @@ module Gui {
     /** TEXT JUSTIFYCATION **/
     const CENTER_TEXT = Gfx.TEXT_JUSTIFY_CENTER | Gfx.TEXT_JUSTIFY_VCENTER;
 
-
-
+
+
+	/** Arrows **/
+	const UP_ARROW = [[0,20], [30,20], [15,0]];
+    const DOWN_ARROW = [[0,0], [30,0], [15,20]]; 
+
+
+	const TAP_BOX_HEIGHT = 50;
+	const TAP_BOX_WIDTH = 50; 
 
     /** COLORS **/
     const BLACK = Gfx.COLOR_BLACK;

diff --git a/source/Gui/MainGui.mc b/source/Gui/MainGui.mc
@@ -9,11 +9,8 @@ module Gui{
 
     class MainGui extends CommonGui{
 
-        const UP_ARROW = [[0,20], [30,20], [15,0]];
-        const DOWN_ARROW = [[0,0], [30,0], [15,20]]; 
+
 
-        const TAP_BOX_HEIGHT = 50;
-        const TAP_BOX_WIDTH = 50; 
 
         var tapBoxUp;
         var tapBoxDown;
@@ -119,8 +116,8 @@ module Gui{
                     editParValue(MEDIUM_FONT);
                 }else if(version == Vivoactive){
                     editParValue(SMALL_FONT);
-                }else if(version == Forerunner645){
-                    editParValue(TINY_FONT|| version == Big);
+                }else if(version == Forerunner645 || version == Big){
+                    editParValue(TINY_FONT);
                 }
 
             }else{

diff --git a/source/Gui/ScoreCardGui.mc b/source/Gui/ScoreCardGui.mc
@@ -44,17 +44,39 @@ module Gui{
         }
 
 
-        function update(front) {
+        function update(page) {
             setColor();
             drawTable();
-            if(front){
-                drawScoreFront9();
-            }else{
-                drawScoreBack9();
-            }
+            drawScore(page);
 
         }
+
+		hidden function drawScore(page){
+			var startHole = 9*page - 8;
+			var lastHole = 9*page;
+			var holes = mController.getGame().getCourse().getHoles();
+			if(holes.size() < lastHole){
+            	lastHole = holes.size();
+            }
+			var title = "Hole " + startHole + "-" + lastHole;
+			titleText(title);
+
+            var x = left + (columnWidth/2);
+
+
+
+            for(var i = startHole; i <= lastHole; i++){
+                drawTopLine(i, x);
+                x += columnWidth;
+            }
 
+            x = left + (columnWidth/2);
+            for(var i = startHole-1; i < lastHole; i++){
+                color(holes[i], x);
+                drawBottomLine(throws(holes[i]), x);
+                x += columnWidth;
+            }
+		}
 
         hidden function drawTable() {
 

diff --git a/source/Gui/SelectNumberOfHoles.mc b/source/Gui/SelectNumberOfHoles.mc
@@ -0,0 +1,84 @@
+
+module Gui{
+	class SelectNumberOfHoles extends CommonGui{
+
+		var tapBoxUp;
+        var tapBoxDown;
+
+		hidden var numberPos;
+        hidden var arrowPos;
+		hidden var numberOfHoles;
+
+		function initialize(dc, controller){
+			CommonGui.initialize(dc, controller);
+			numberPos = [ width/2, height/2 ];
+
+			tapBoxUp = [numberPos[0] - 25, numberPos[1] - 75];
+			tapBoxDown = [numberPos[0] - 25, numberPos[1] + 25];
+
+			numberOfHoles = controller.getGame().getCourse().getNumberOfHoles();
+		}
+
+
+		function setNumberOfHoles(n){
+			numberOfHoles = n;
+		}
+
+		function getNumberOfHoles(){
+			return numberOfHoles;
+		}
+
+		function update(){
+			setColor();
+			updateNumber();
+		}
+
+		hidden function updateNumber(){
+			drawArrows();
+			drawNumber();
+		}
+
+		hidden function drawNumber(){
+			drawText(numberOfHoles,numberPos, LARGE_FONT, CENTER_TEXT);
+		}
+
+		hidden function drawArrows() {
+            var up = [UP_ARROW[0], UP_ARROW[1], UP_ARROW[2]];
+            var down = [DOWN_ARROW[0], DOWN_ARROW[1], DOWN_ARROW[2]];
+
+            var pos = [numberPos[0] - 15, numberPos[1] - 10];
+
+            setArrowPos(up, down, pos);
+
+            mDc.fillPolygon(up);
+            mDc.fillPolygon(down);
+
+            resetArrowPos(up, down, pos);
+        }
+
+		hidden function setArrowPos(up, down, pos) {
+            for(var i = 0; i < up.size(); i++){
+                up[i][0] += pos[0];
+                up[i][1] += pos[1] - 50;
+            }
+
+            for(var i = 0; i < down.size(); i++){
+                down[i][0] += pos[0];
+                down[i][1] += pos[1] + 50;
+            }
+        }
+
+        hidden function resetArrowPos(up, down, pos) {
+            for(var i = 0; i < up.size(); i++){
+                up[i][0] -= pos[0];
+                up[i][1] -= pos[1] - 50;
+            }
+
+            for(var i = 0; i < down.size(); i++){
+                down[i][0] -= pos[0];
+                down[i][1] -= pos[1] + 50;
+            }
+        }
+
+	}
+}
diff --git a/source/Model/Controller.mc b/source/Model/Controller.mc
@@ -31,7 +31,11 @@ class Controller{
         }
 
     }
-
+
+	function addHole(){
+
+	}
+
     function parValue() {
         return mGame.getActiveHole().getPar().toString();
     }
@@ -140,4 +144,8 @@ class Controller{
         }
         mGame.selectHole(0);
     }
+
+    function createNewCourse(numberOfHoles){
+    	mGame.newCourse(numberOfHoles);
+    }
 }
diff --git a/source/Model/Course.mc b/source/Model/Course.mc
@@ -2,18 +2,24 @@
 class Course{
 
     hidden var mHoles;
+    hidden var numberOfHoles;
 
     function initialize(state, par){
         if(state == null){
-            createNewCourse(par);
+            setUpCourse(par);
         }else{
             lastCourse(state, par);
         }
 
     }
-
+
+	function getNumberOfHoles(){
+		return numberOfHoles;
+	}
+
     function lastCourse(state, par) {
         mHoles = new [state.size()];
+       	numberOfHoles = mHoles.size();
         for(var i = 0; i < mHoles.size(); i++){
             var hole = new Hole(i);
             if(state[i] != 0){
@@ -29,12 +35,35 @@ class Course{
         }
     }
 
-    function createNewCourse(par) {
-        mHoles = new [18];
+    hidden function setUpCourse(par) {
+    	if(par == null){
+    		mHoles = new [18];
+    		numberOfHoles = mHoles.size();
+	        for(var i = 0; i < mHoles.size(); i++){
+	            mHoles[i] = new Hole(i);
+	        }
+    	}else{
+    		numberOfHoles = par.size();
+    		mHoles = new [numberOfHoles];
+
+    		for(var i = 0; i < numberOfHoles; i++){
+    			mHoles[i] = new Hole(i);
+    			mHoles[i].setPar(par[i]);
+    		}
+    	}
+
+
+    }
+
+    function createCourse(holes){
+    	var keepScore = mHoles;
+    	numberOfHoles = holes;
+    	mHoles = new [numberOfHoles];
         for(var i = 0; i < mHoles.size(); i++){
             mHoles[i] = new Hole(i);
-            if(par != null){
-                mHoles[i].setPar(par[i]);
+            if(keepScore != null && keepScore.size() > i && keepScore[i].isRegistered()){
+            	mHoles[i].setThrows(keepScore[i].getThrows());
+            	mHoles[i].setPar(keepScore[i].getPar());
             }
         }
     }