TapBox

marvik37 · Oct 19, 2020 · 3045b97 · 3045b97
1 parent 95a4e89
commit 3045b97
Show file tree

Hide file tree

Showing 4 changed files with 46 additions and 2 deletions.
diff --git a/source/Delegate/SelectNumberOfHolesDelegate.mc b/source/Delegate/SelectNumberOfHolesDelegate.mc
@@ -35,4 +35,36 @@ class SelectNumberOfHolesDelegate extends Ui.BehaviorDelegate{
         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/SelectNumberOfHoles.mc b/source/Gui/SelectNumberOfHoles.mc
@@ -13,9 +13,13 @@ module Gui{
 			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;
 		}
@@ -45,7 +49,7 @@ module Gui{
             var pos = [numberPos[0] - 15, numberPos[1] - 10];
 
             setArrowPos(up, down, pos);
-
+                       
             mDc.fillPolygon(up);
             mDc.fillPolygon(down);
 

diff --git a/source/Model/Course.mc b/source/Model/Course.mc
@@ -56,10 +56,15 @@ class Course{
     }
 
     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(keepScore != null && keepScore.size() > i && keepScore[i].isRegistered()){
+            	mHoles[i].setThrows(keepScore[i].getThrows());
+            	mHoles[i].setPar(keepScore[i].getPar());
+            }
         }
     }
 

diff --git a/source/View/SelectNumberOfHole.mc b/source/View/SelectNumberOfHole.mc
@@ -2,7 +2,7 @@ using Toybox.WatchUi as Ui;
 
 class SelectNumberOfHolesView extends Ui.View{
 
-    hidden var gui;
+    var gui;
     hidden var mController;
 
     hidden const MAX = 36;
@@ -41,6 +41,9 @@ class SelectNumberOfHolesView extends Ui.View{
     function setHole(){
     	var holes = gui.getNumberOfHoles();
     	mController.createNewCourse(holes);
+    	if(mController.getGame().getActiveHole().getIndex() >= holes){
+    		mController.getGame().selectHole(holes - 1);
+    	}
     }
 
     function addHole(){