Small code improvements (#47)

* move files around

* renamed classes

.vscode/launch.json

@@ -9,7 +9,9 @@
             "request": "launch",
             "name": "Run App",
             "stopAtLaunch": false,
-            "device": "${command:GetTargetDevice}"
+            "device": "fr945"
+          //  "device": "${command:GetTargetDevice}"
+
         },
         {
             "type": "monkeyc",

source/delegates/endOfMatchDelegate.mc

@@ -1,7 +1,7 @@
 import Toybox.Lang;
 import Toybox.WatchUi;
 
-class endOfMatchDelegate extends WatchUi.InputDelegate {
+class EndOfMatchDelegate extends WatchUi.InputDelegate {
 
     function initialize() {
         InputDelegate.initialize();

source/delegates/initialScreenDelegate.mc

@@ -1,7 +1,7 @@
 import Toybox.Lang;
 import Toybox.WatchUi;
 
-class initialScreenDelegate extends WatchUi.InputDelegate {
+class InitialScreenDelegate extends WatchUi.InputDelegate {
 
     function initialize() {
         InputDelegate.initialize();
@@ -12,7 +12,7 @@ class initialScreenDelegate extends WatchUi.InputDelegate {
         switch (keyEvent.getKey()) {
             case KEY_ESC: {}
             case KEY_ENTER: {
-                WatchUi.pushView(new Rez.Menus.SetsMenu(), new menuNumberSetsDelegate(), WatchUi.SLIDE_BLINK);
+                WatchUi.pushView(new Rez.Menus.SetsMenu(), new MenuNumberSetsDelegate(), WatchUi.SLIDE_BLINK);
                 break;
             }
         }

source/delegates/menuNumberSetsDelegate.mc → source/delegates/menu/menuNumberSetsDelegate.mc

@@ -2,15 +2,15 @@ import Toybox.Lang;
 import Toybox.System;
 import Toybox.WatchUi;
 
-class menuNumberSetsDelegate extends WatchUi.MenuInputDelegate {
+class MenuNumberSetsDelegate extends WatchUi.MenuInputDelegate {
 
     function initialize() {
         MenuInputDelegate.initialize();
     }
 
     function onMenuItem(item as Symbol) as Void {
 
-        var nbrSets = matchConfig.UNLIMITED_SETS;
+        var nbrSets = MatchConfig.UNLIMITED_SETS;
 
          switch (item) {
             case :sets_unlimited: {
@@ -29,11 +29,11 @@ class menuNumberSetsDelegate extends WatchUi.MenuInputDelegate {
         Application.getApp().getMatchConfig().setNumberOfSets(nbrSets);
 
         // if not unlimited sets, lets ask about super tie config
-        if (nbrSets != matchConfig.UNLIMITED_SETS) {
-            WatchUi.pushView(new Rez.Menus.SuperTieMenu(), new menuSuperTieDelegate(), WatchUi.SLIDE_BLINK);
+        if (nbrSets != MatchConfig.UNLIMITED_SETS) {
+            WatchUi.pushView(new Rez.Menus.SuperTieMenu(), new MenuSuperTieDelegate(), WatchUi.SLIDE_BLINK);
         } else {
             Application.getApp().initMatch();
-            WatchUi.pushView(new scoreView(), new scoreDelegate(), WatchUi.SLIDE_UP);
+            WatchUi.pushView(new ScoreView(), new ScoreDelegate(), WatchUi.SLIDE_UP);
         }
     }
 

source/delegates/menuSuperTieDelegate.mc → source/delegates/menu/menuSuperTieDelegate.mc

@@ -2,7 +2,7 @@ import Toybox.Lang;
 import Toybox.System;
 import Toybox.WatchUi;
 
-class menuSuperTieDelegate extends WatchUi.MenuInputDelegate {
+class MenuSuperTieDelegate extends WatchUi.MenuInputDelegate {
 
     function initialize() {
         MenuInputDelegate.initialize();
@@ -19,7 +19,7 @@ class menuSuperTieDelegate extends WatchUi.MenuInputDelegate {
 
         Application.getApp().getMatchConfig().setSuperTie(superTie);
         Application.getApp().initMatch();
-        WatchUi.pushView(new scoreView(), new scoreDelegate(), WatchUi.SLIDE_UP);
+        WatchUi.pushView(new ScoreView(), new ScoreDelegate(), WatchUi.SLIDE_UP);
     }
 
 }

source/delegates/scoreDelegate.mc

@@ -2,7 +2,7 @@ import Toybox.Lang;
 import Toybox.WatchUi;
 import Toybox.ActivityMonitor;
 
-class scoreDelegate extends WatchUi.InputDelegate {
+class ScoreDelegate extends WatchUi.InputDelegate {
 
     function initialize() {
         InputDelegate.initialize();
@@ -17,7 +17,7 @@ class scoreDelegate extends WatchUi.InputDelegate {
                 var endOfMatch = match.incP1();
 
                 if (endOfMatch) {
-                    WatchUi.pushView(new endView(), new endOfMatchDelegate(), WatchUi.SLIDE_UP);
+                    WatchUi.pushView(new EndView(), new EndOfMatchDelegate(), WatchUi.SLIDE_UP);
                 }
 
                 break;
@@ -26,7 +26,7 @@ class scoreDelegate extends WatchUi.InputDelegate {
                 var endOfMatch = match.incP2();
 
                 if (endOfMatch) {
-                    WatchUi.pushView(new endView(), new endOfMatchDelegate(), WatchUi.SLIDE_UP);
+                    WatchUi.pushView(new EndView(), new EndOfMatchDelegate(), WatchUi.SLIDE_UP);
                 }
 
                 break;

source/garminpadelApp.mc

@@ -10,7 +10,7 @@ class garminpadelApp extends Application.AppBase {
 
     function initialize() {
         AppBase.initialize();
-        matchConfig = new matchConfig();
+        matchConfig = new MatchConfig();
     }
 
     function onStart(state as Dictionary?) as Void {
@@ -20,22 +20,22 @@ class garminpadelApp extends Application.AppBase {
     }
 
     function getInitialView() as Array<Views or InputDelegates>? {
-        return [ new initialView(), new initialScreenDelegate() ] as Array<Views or InputDelegates>;
+        return [ new InitialView(), new InitialScreenDelegate() ] as Array<Views or InputDelegates>;
     }
 
     // TODO kinda meh that we allow everyone to update the matchConfig and we rely it's on a valid state at this moment
     function initMatch() as Void {
-        self.match = new padelMatch(self.matchConfig);
+        self.match = new PadelMatch(self.matchConfig);
 
         self.session = ActivityRecording.createSession({:sport => Activity.SPORT_RACKET, :subSport => Activity.SUB_SPORT_PADEL, :name => "Padel match"});
         self.session.start();
     }
 
-    function getMatch() as padelMatch {
+    function getMatch() as PadelMatch {
         return self.match;
     }
 
-    function getMatchConfig() as matchConfig {
+    function getMatchConfig() as MatchConfig {
         return self.matchConfig;
     }
 

source/model/match.mc → source/model/PadelMatch.mc

@@ -1,6 +1,6 @@
 import Toybox.Lang;
 
-class padelMatch {
+class PadelMatch {
 
     private var numberOfSets;
     private var superTie;
@@ -9,12 +9,12 @@ class padelMatch {
 
     private var matchStatus;
 
-    function initialize(config as matchConfig) {
+    function initialize(config as MatchConfig) {
 
         numberOfSets = config.getNumberOfSets();
         superTie = config.getSuperTie();
 
-        matchStatus = new matchStatus();
+        matchStatus = new MatchStatus();
 
         historicalScores = [];
     }

source/model/matchConfig.mc

@@ -1,6 +1,6 @@
 import Toybox.Lang;
 
-class matchConfig {
+class MatchConfig {
 
     public static const UNLIMITED_SETS = 10;
 

source/model/matchStatus.mc

@@ -1,4 +1,4 @@
-class matchStatus {
+class MatchStatus {
 
     static const AVAILABLE_POINTS = [0, 15, 30, 40];
 

source/views/endView.mc

@@ -1,7 +1,7 @@
 import Toybox.Graphics;
 import Toybox.WatchUi;
 
-class endView extends WatchUi.View {
+class EndView extends WatchUi.View {
 
     function initialize() {
         View.initialize();

source/views/initialView.mc

@@ -1,7 +1,7 @@
 import Toybox.Graphics;
 import Toybox.WatchUi;
 
-class initialView extends WatchUi.View {
+class InitialView extends WatchUi.View {
 
     function initialize() {
         View.initialize();

source/views/scoreView.mc

@@ -5,7 +5,7 @@ import Toybox.Graphics;
 using Toybox.Time;
 using Toybox.Time.Gregorian;
 
-class scoreView extends WatchUi.View {
+class ScoreView extends WatchUi.View {
 
     function initialize() {
         View.initialize();