Do not compile GFX and older fonts anymore.

Refactor SystemTask in its own class.
Refactor Screen to be able to close current screen and open a new one.
Re-enable sleep/wake up and propagate button event to Screens.

1 files changed, 9 insertions, 7 deletions

diff --git a/src/DisplayApp/Screens/Tile.h b/src/DisplayApp/Screens/Tile.h
index c9de2c5..03cfb6d 100644
--- a/src/DisplayApp/Screens/Tile.h
+++ b/src/DisplayApp/Screens/Tile.h
@@ -15,18 +15,18 @@ namespace Pinetime {
     namespace Screens {
       class Tile : public Screen {
         public:
-          explicit Tile(DisplayApp* app, Components::Gfx& gfx);
+          explicit Tile(DisplayApp* app);
           ~Tile() override;
-          void Refresh(bool fullRefresh) override;
-          void OnObjectEvent(lv_obj_t* obj, lv_event_t event);
 
-          void OnButtonPushed() override {nextScreen = NextScreen::Clock;}
+          bool Refresh(bool fullRefresh) override;
+          bool OnButtonPushed() override;
+
+          void OnObjectEvent(lv_obj_t* obj, lv_event_t event);
 
         private:
-          const FONT_INFO largeFont {lCD_70ptFontInfo.height, lCD_70ptFontInfo.startChar, lCD_70ptFontInfo.endChar, lCD_70ptFontInfo.spacePixels, lCD_70ptFontInfo.charInfo, lCD_70ptFontInfo.data};
-          const FONT_INFO smallFont {lCD_14ptFontInfo.height, lCD_14ptFontInfo.startChar, lCD_14ptFontInfo.endChar, lCD_14ptFontInfo.spacePixels, lCD_14ptFontInfo.charInfo, lCD_14ptFontInfo.data};
 
-          lv_style_t* labelStyle;
+          lv_style_t* labelRelStyle;
+          lv_style_t* labelPrStyle;
           lv_obj_t * label1;
           lv_obj_t * label2;
           lv_obj_t * label3;
@@ -50,6 +50,8 @@ namespace Pinetime {
 
           uint32_t clickCount = 0 ;
           uint32_t previousClickCount = 0;
+          void StartApp();
+          bool running = true;
       };
     }
   }