Add Select to action menu and re-add menu/enter behavior on main view

Author: ch1bo

src/MainView.mc

@@ -210,6 +210,15 @@ class MainViewDelegate extends WatchUi.BehaviorDelegate {
     logf(DEBUG, "MainView onKey $1$", [key]);
     if (isActionButton(key)) {
       return onAction();
+    } else if (key == KEY_MENU || key == KEY_ENTER) {
+      var provider = currentProvider();
+      if (provider instanceof CounterBasedProvider) {
+        provider.next();
+        WatchUi.requestUpdate();
+      } else {
+        WatchUi.pushView(new ProviderList(), new ProviderListDelegate(), WatchUi.SLIDE_LEFT);
+      }
+      return true;
     }
     return false;
   }

src/ProviderActionMenu.mc

@@ -3,7 +3,8 @@ import Toybox.WatchUi;
 function showProviderActionMenu(provider as Provider) {
   log(DEBUG, "showProviderActionMenu");
   var menu = new WatchUi.ActionMenu({});
-  menu.addItem(new ActionMenuItem({ :label => "Menu" }, :menu));
+  menu.addItem(new ActionMenuItem({ :label => "Select" }, :select));
+  menu.addItem(new ActionMenuItem({ :label => "Configure" }, :configure));
   if (provider instanceof CounterBasedProvider) {
     menu.addItem(new ActionMenuItem({ :label => "Next" }, :next));
   }
@@ -22,7 +23,10 @@ class ProviderActionMenuDelegate extends WatchUi.ActionMenuDelegate {
 
   function onSelect(item) {
     switch (item.getId()) {
-    case :menu:
+    case :select:
+      WatchUi.pushView(new ProviderList(), new ProviderListDelegate(), WatchUi.SLIDE_LEFT);
+      return;
+    case :configure:
       WatchUi.pushView(new MainMenu(), new MainMenuDelegate(), WatchUi.SLIDE_LEFT);
       return;
     case :next: