Merge branch 'littlevgl'

# Conflicts:
#	src/DisplayApp/Screens/Clock.cpp
#	src/DisplayApp/Screens/Clock.h

1 files changed, 10 insertions, 5 deletions

diff --git a/src/DisplayApp/Screens/Screen.h b/src/DisplayApp/Screens/Screen.h
index 5e2fa43e..6cbd41ad 100644
--- a/src/DisplayApp/Screens/Screen.h
+++ b/src/DisplayApp/Screens/Screen.h
@@ -1,17 +1,22 @@
 #pragma once
 
-#include <Components/Gfx/Gfx.h>
-
 namespace Pinetime {
   namespace Applications {
+    class DisplayApp;
     namespace Screens {
       class Screen {
         public:
-          Screen(Components::Gfx& gfx) : gfx{gfx} {}
-          virtual void Refresh(bool fullRefresh) = 0;
+          Screen(DisplayApp* app) : app{app} {}
+          virtual ~Screen() = default;
+
+          // Return false if the app can be closed, true if it must continue to run
+          virtual bool Refresh() = 0;
+
+          // Return false if the button hasn't been handled by the app, true if it has been handled
+          virtual bool OnButtonPushed() { return false; }
 
         protected:
-          Components::Gfx& gfx;
+          DisplayApp* app;
       };
     }
   }