app is now working with OmniMenu

Author: adamjakab

source/iHIIT.mc

@@ -1,14 +1,17 @@
 using Toybox.Application as App;
 using Toybox.System as Sys;
+using Toybox.WatchUi as Ui;
+import Toybox.Lang;
 
 /**
  * ENTRY POINT
  */
 class iHIIT extends App.AppBase {
   //@todo: Make sure to set this to false when creating a release
-  private var debug_mode = false;
+  private var debug_mode as Boolean = false;
 
-  protected var controller;
+  // The controller
+  protected var controller as $.iHIITController;
 
   public function initialize() {
     AppBase.initialize();
@@ -17,31 +20,24 @@ class iHIIT extends App.AppBase {
 
   // Return the initial view of your application here
   public function getInitialView() {
-    //return [new SelectWorkoutView(), new SelectWorkoutDelegate()];
-
-    //TEMPORARY - SKIP workout selection
-    controller.beginCurrentWorkout();
-    return [new DoWorkoutView(), new DoWorkoutDelegate()];
-
-    //TEMPORARY - TEST OmniMenu
-    //return controller.testOmniMenu();
+    return controller.getInitialApplicationView();
   }
 
   // Hook called on application start up
-  public function onStart(state) {
+  public function onStart(state) as Void {
     Sys.println("App:::START");
   }
 
   // Hook called on application stop
-  public function onStop(state) {
+  public function onStop(state) as Void {
     Sys.println("App:::STOP");
   }
 
   public function getController() as $.iHIITController {
     return controller;
   }
 
-  public function isDebugMode() {
+  public function isDebugMode() as Boolean {
     return debug_mode;
   }
 }

source/iHIITController.mc

@@ -22,6 +22,17 @@ class iHIITController {
     finish_workout_option = 0;
   }
 
+  public function getInitialApplicationView() as [Ui.View, Ui.BehaviorDelegate] {
+    return [new SelectWorkoutView(), new SelectWorkoutDelegate()];
+
+    //TEMPORARY - SKIP workout selection
+    //initialize(1)
+    //beginCurrentWorkout();
+    //return [new DoWorkoutView(), new DoWorkoutDelegate()];
+
+    //TEMPORARY - TEST OmniMenu
+    //return testOmniMenu();
+  }
   /*
    * Start the selected workout
    */
@@ -56,20 +67,20 @@ class iHIITController {
 
     // Resume
     if (!currentWorkout.isTerminated()) {
-      choices.put(0, {
+      choices.put(choices.size(), {
         "label" => Ui.loadResource(Rez.Strings.finish_workout_prompt_resume),
         "callback" => method(:resumeWorkout),
       });
     }
 
     // Save & Exit
-    choices.put(1, {
+    choices.put(choices.size(), {
       "label" => Ui.loadResource(Rez.Strings.finish_workout_prompt_save_and_exit),
       "callback" => method(:saveWorkout),
     });
 
     // Discard and Exit
-    choices.put(2, {
+    choices.put(choices.size(), {
       "label" => Ui.loadResource(Rez.Strings.finish_workout_prompt_discard_and_exit),
       "callback" => method(:discardWorkout),
     });
@@ -82,7 +93,7 @@ class iHIITController {
    */
   function resumeWorkout() {
     if (!currentWorkout.isPaused()) {
-      Sys.println("Controller: RESUME REFUSED - Workout must be paused to be resumed");
+      Sys.println("Controller: RESUME REFUSED - Workout is already ended.");
       return;
     }
 
@@ -218,8 +229,8 @@ class iHIITController {
   // @TODO: REMOVE ME!
   // public function testOmniMenu() {
   //   var choices = {
-  //     0 => { "label" => "Choice #1", "callback" => method(:choiceOneAction) },
-  //     1 => { "label" => "Choice #2", "callback" => method(:choiceTwoAction) },
+  //     0 => { "label" => "Choice #1", "callback" => null },
+  //     1 => { "label" => "Choice #2", "callback" => null },
   //     2 => { "label" => "Choice #3", "callback" => null },
   //     3 => { "label" => "Choice #4", "callback" => null },
   //     4 => { "label" => "Choice #5", "callback" => null },
@@ -228,14 +239,6 @@ class iHIITController {
   //   return [new OmniMenuView(choices, 0), new OmniMenuDelegate(null)];
   // }
 
-  // public function choiceOneAction() {
-  //   Sys.println("Controller: Choice One Action!");
-  // }
-
-  // public function choiceTwoAction() {
-  //   Sys.println("Controller: Choice Two Action!");
-  // }
-
   // Handle timing out after exit
   public function onExit() {
     Sys.exit();

source/view/discardConfirmation/discardConfirmationDelegate.mc

@@ -26,7 +26,7 @@ class OmniMenuView extends Ui.View {
   }
 
   public function onShow() {
-    Sys.println("OmniMenu: Show");
+    Sys.println("OmniMenu: Show (index: " + currentChoiceIndex + ")");
     ctrl.omniMenuChoices = defaultChoices;
     ctrl.omniMenuSelectedIndex = currentChoiceIndex;
   }
@@ -72,7 +72,10 @@ class OmniMenuView extends Ui.View {
     dc.setColor(Gfx.COLOR_DK_GRAY, Gfx.COLOR_TRANSPARENT);
     dc.drawText(width / 2, y, Gfx.FONT_SYSTEM_MEDIUM, txt, Gfx.TEXT_JUSTIFY_CENTER);
 
-    // View.onUpdate(dc);
+    // Update current index stored in the controller in this instance
+    // So next time the OnShow is called we can restore it (necessary for concatenated OmniMenu displays)
+    currentChoiceIndex = ctrl.omniMenuSelectedIndex;
+
     Sys.println("OmniMenu:::updated");
   }