Select missions with right encoder

TouchGFX/gui/include/gui/common/FrontendApplication.hpp

@@ -7,17 +7,16 @@ class FrontendHeap;
 
 using namespace touchgfx;
 
-class FrontendApplication : public FrontendApplicationBase
-{
+class FrontendApplication : public FrontendApplicationBase {
 public:
-    FrontendApplication(Model& m, FrontendHeap& heap);
-    virtual ~FrontendApplication() { }
+  FrontendApplication(Model &m, FrontendHeap &heap);
+  virtual ~FrontendApplication() {}
+
+  virtual void handleTickEvent() {
+    FrontendApplicationBase::handleTickEvent();
+    model.tick();
+  }
 
-    virtual void handleTickEvent()
-    {
-        model.tick();
-        FrontendApplicationBase::handleTickEvent();
-    }
 private:
 };
 

TouchGFX/gui/include/gui/containers/MissionSelectElement.hpp

@@ -1,6 +1,7 @@
 #ifndef MISSIONSELECTELEMENT_HPP
 #define MISSIONSELECTELEMENT_HPP
 
+#include "touchgfx/hal/Types.hpp"
 #include <gui_generated/containers/MissionSelectElementBase.hpp>
 #include <texts/TextKeysAndLanguages.hpp>
 
@@ -12,8 +13,11 @@ public:
   virtual void initialize();
 
   void setUp(uint32_t i, TEXTS label);
+  void setSelected(bool selected);
 
 protected:
+private:
+  touchgfx::colortype bgColor;
 };
 
 #endif // MISSIONSELECTELEMENT_HPP

TouchGFX/gui/include/gui/missionselect_screen/MissionSelectPresenter.hpp

@@ -8,29 +8,32 @@ using namespace touchgfx;
 
 class MissionSelectView;
 
-class MissionSelectPresenter : public touchgfx::Presenter, public ModelListener
-{
+class MissionSelectPresenter : public touchgfx::Presenter,
+                               public ModelListener {
 public:
-    MissionSelectPresenter(MissionSelectView& v);
+  MissionSelectPresenter(MissionSelectView &v);
 
-    /**
-     * The activate function is called automatically when this screen is "switched in"
-     * (ie. made active). Initialization logic can be placed here.
-     */
-    virtual void activate();
+  /**
+   * The activate function is called automatically when this screen is "switched
+   * in" (ie. made active). Initialization logic can be placed here.
+   */
+  virtual void activate();
 
-    /**
-     * The deactivate function is called automatically when this screen is "switched out"
-     * (ie. made inactive). Teardown functionality can be placed here.
-     */
-    virtual void deactivate();
+  /**
+   * The deactivate function is called automatically when this screen is
+   * "switched out" (ie. made inactive). Teardown functionality can be placed
+   * here.
+   */
+  virtual void deactivate();
 
-    virtual ~MissionSelectPresenter() {};
+  virtual ~MissionSelectPresenter(){};
+
+  virtual void notifyMissionChanged(Mission mission) override;
 
 private:
-    MissionSelectPresenter();
+  MissionSelectPresenter();
 
-    MissionSelectView& view;
+  MissionSelectView &view;
 };
 
 #endif // MISSIONSELECTPRESENTER_HPP

TouchGFX/gui/include/gui/missionselect_screen/MissionSelectView.hpp

@@ -1,17 +1,22 @@
 #ifndef MISSIONSELECTVIEW_HPP
 #define MISSIONSELECTVIEW_HPP
 
-#include <gui_generated/missionselect_screen/MissionSelectViewBase.hpp>
+#include "gui/containers/MissionSelectElement.hpp"
 #include <gui/missionselect_screen/MissionSelectPresenter.hpp>
+#include <gui_generated/missionselect_screen/MissionSelectViewBase.hpp>
 
-class MissionSelectView : public MissionSelectViewBase
-{
+class MissionSelectView : public MissionSelectViewBase {
 public:
-    MissionSelectView();
-    virtual ~MissionSelectView() {}
-    virtual void setupScreen();
-    virtual void tearDownScreen();
+  MissionSelectView();
+  virtual ~MissionSelectView() {}
+  virtual void setupScreen();
+  virtual void tearDownScreen();
+
+  void setSelectedMission(Mission mission);
+
 protected:
+private:
+  MissionSelectElement *selected;
 };
 
 #endif // MISSIONSELECTVIEW_HPP

TouchGFX/gui/include/gui/model/Model.hpp

@@ -1,21 +1,24 @@
 #ifndef MODEL_HPP
 #define MODEL_HPP
 
+#include "stw_defines.h"
 class ModelListener;
 
-class Model
-{
+class Model {
 public:
-    Model();
+  Model();
 
-    void bind(ModelListener* listener)
-    {
-        modelListener = listener;
-    }
+  void bind(ModelListener *listener) { modelListener = listener; }
+
+  void tick();
+
+  Mission getCurrentMission() const { return mission; }
 
-    void tick();
 protected:
-    ModelListener* modelListener;
+  ModelListener *modelListener;
+
+private:
+  Mission mission;
 };
 
 #endif // MODEL_HPP

TouchGFX/gui/include/gui/model/ModelListener.hpp

@@ -3,19 +3,20 @@
 
 #include <gui/model/Model.hpp>
 
-class ModelListener
-{
-public:
-    ModelListener() : model(0) {}
-    
-    virtual ~ModelListener() {}
+#include "stw_defines.h"
+
+class ModelListener {
+public:
+  ModelListener() : model(0) {}
+
+  virtual ~ModelListener() {}
+
+  void bind(Model *m) { model = m; }
+
+  virtual void notifyMissionChanged(Mission newMission){};
 
-    void bind(Model* m)
-    {
-        model = m;
-    }
 protected:
-    Model* model;
+  Model *model;
 };
 
 #endif // MODELLISTENER_HPP