remove support for FR735, FR935, Fenix5 (#130)

* Revert "Revert "migrate to menu2 (#126)" (#129)"

This reverts commit 471dadf.

* remove support for FR735, FR935, F5

Author: pedrorijo91

manifest.xml

@@ -26,12 +26,6 @@
             <iq:product id="epix2pro42mm"/>
             <iq:product id="epix2pro47mm"/>
             <iq:product id="epix2pro51mm"/>
-            <iq:product id="fenix5"/>
-            <iq:product id="fenix5plus"/>
-            <iq:product id="fenix5s"/>
-            <iq:product id="fenix5splus"/>
-            <iq:product id="fenix5x"/>
-            <iq:product id="fenix5xplus"/>
             <iq:product id="fenix6"/>
             <iq:product id="fenix6pro"/>
             <iq:product id="fenix6s"/>
@@ -66,9 +60,7 @@
             <iq:product id="fr57047mm"/>
             <iq:product id="fr645"/>
             <iq:product id="fr645m"/>
-            <iq:product id="fr735xt"/>
             <iq:product id="fr745"/>
-            <iq:product id="fr935"/>
             <iq:product id="fr945"/>
             <iq:product id="fr945lte"/>
             <iq:product id="fr955"/>

resources/menus/golden_point.xml

@@ -8,13 +8,30 @@ class InitialScreenDelegate extends WatchUi.InputDelegate {
     }
 
     function onKey(keyEvent as WatchUi.KeyEvent) as Boolean {
-
         switch (keyEvent.getKey()) {
             case KEY_ESC: {
                 System.exit();
             }
             case KEY_ENTER: {
-                WatchUi.pushView(new Rez.Menus.GoldenPointMenu(), new MenuGoldenPointDelegate(), WatchUi.SLIDE_BLINK);
+
+                var menu = new WatchUi.Menu2({:title=>"Score"});
+                menu.addItem(
+                    new MenuItem(
+                        "Golden Point",
+                        "",
+                        :golden_point_yes,
+                        {}
+                    )
+                );
+                menu.addItem(
+                    new MenuItem(
+                        "Advantages",
+                        "",
+                        :golden_point_no,
+                        {}
+                    )
+                );
+                WatchUi.pushView(menu, new MenuGoldenPointDelegate(), WatchUi.SLIDE_BLINK);
                 break;
             }
         }

resources/menus/number_of_sets.xml

@@ -2,23 +2,49 @@ import Toybox.Lang;
 import Toybox.System;
 import Toybox.WatchUi;
 
-class MenuGoldenPointDelegate extends WatchUi.MenuInputDelegate {
+class MenuGoldenPointDelegate extends WatchUi.Menu2InputDelegate {
 
     function initialize() {
-        MenuInputDelegate.initialize();
+        Menu2InputDelegate.initialize();
     }
 
-    function onMenuItem(item as Symbol) as Void {
-        
-        var goldenPoint = true;
-        if (item == :golden_point_yes) {
+    function onSelect(item as MenuItem) {
+       var goldenPoint = true;
+        if (item.getId() == :golden_point_yes) {
             goldenPoint = true;
-        } else if (item == :golden_point_no) {
+        } else if (item.getId() == :golden_point_no) {
             goldenPoint = false;
         }
 
         Application.getApp().getMatchConfig().setGoldenPoint(goldenPoint);
-        WatchUi.pushView(new Rez.Menus.SetsMenu(), new MenuNumberSetsDelegate(), WatchUi.SLIDE_BLINK);
+
+         var menu = new WatchUi.Menu2({:title=>"Sets"});
+                menu.addItem(
+                    new MenuItem(
+                        "Unlimited",
+                        "",
+                        :sets_unlimited,
+                        {}
+                    )
+                );
+                 menu.addItem(
+                    new MenuItem(
+                        "3",
+                        "",
+                        :sets_3,
+                        {}
+                    )
+                );
+                 menu.addItem(
+                    new MenuItem(
+                        "5",
+                        "",
+                        :sets_5,
+                        {}
+                    )
+                );
+                
+        WatchUi.pushView(menu, new MenuNumberSetsDelegate(), WatchUi.SLIDE_BLINK);
     }
 
 }

resources/menus/super_tie.xml

@@ -2,17 +2,17 @@ import Toybox.Lang;
 import Toybox.System;
 import Toybox.WatchUi;
 
-class MenuNumberSetsDelegate extends WatchUi.MenuInputDelegate {
+class MenuNumberSetsDelegate extends WatchUi.Menu2InputDelegate {
 
     function initialize() {
-        MenuInputDelegate.initialize();
+        Menu2InputDelegate.initialize();
     }
 
-    function onMenuItem(item as Symbol) as Void {
+    function onSelect(item as MenuItem) as Void {
 
         var nbrSets = MatchConfig.UNLIMITED_SETS;
 
-         switch (item) {
+         switch (item.getId()) {
             case :sets_unlimited: {
                 break;
             }
@@ -30,7 +30,33 @@ class MenuNumberSetsDelegate extends WatchUi.MenuInputDelegate {
 
         // 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);
+            var menu = new WatchUi.Menu2({:title=>"Super Tie"});
+                menu.addItem(
+                    new MenuItem(
+                        "Yes",
+                        "",
+                        :super_tie_yes,
+                        {}
+                    )
+                );
+                 menu.addItem(
+                    new MenuItem(
+                        "No",
+                        "",
+                        :super_tie_no,
+                        {}
+                    )
+                );
+                 menu.addItem(
+                    new MenuItem(
+                        "5",
+                        "",
+                        :sets_5,
+                        {}
+                    )
+                );
+                
+        WatchUi.pushView(menu, new MenuSuperTieDelegate(), WatchUi.SLIDE_BLINK);
         } else {
             Application.getApp().initMatch();
             WatchUi.pushView(new ScoreView(), new ScoreDelegate(), WatchUi.SLIDE_UP);

source/delegates/initialScreenDelegate.mc

@@ -2,18 +2,17 @@ import Toybox.Lang;
 import Toybox.System;
 import Toybox.WatchUi;
 
-class MenuSuperTieDelegate extends WatchUi.MenuInputDelegate {
+class MenuSuperTieDelegate extends WatchUi.Menu2InputDelegate {
 
     function initialize() {
-        MenuInputDelegate.initialize();
+        Menu2InputDelegate.initialize();
     }
 
-    function onMenuItem(item as Symbol) as Void {
-        
+    function onSelect(item as MenuItem) as Void {
         var superTie = false;
-        if (item == :super_tie_yes) {
+        if (item.getId() == :super_tie_yes) {
             superTie = true;
-        } else if (item == :super_tie_no) {
+        } else if (item.getId() == :super_tie_no) {
             superTie = false;
         }