From 5ef3c0d3be58b6741a9e443e6d2151de2b3a59bc Mon Sep 17 00:00:00 2001
From: Riku Isokoski <riksu9000@gmail.com>
Date: Sun, 2 Oct 2022 21:58:04 +0300
Subject: Implement a return app stack

Each opened app (screen) is pushed on a stack, which is then popped from
when returning instead of hard coded "previous apps". Return swipe and
refresh directions are automatically determined from the app transition.
---
 src/displayapp/DisplayApp.h | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

(limited to 'src/displayapp/DisplayApp.h')

diff --git a/src/displayapp/DisplayApp.h b/src/displayapp/DisplayApp.h
index 4c54e227..3c1829d5 100644
--- a/src/displayapp/DisplayApp.h
+++ b/src/displayapp/DisplayApp.h
@@ -20,6 +20,8 @@
 #include "displayapp/Messages.h"
 #include "BootErrors.h"
 
+#include "StaticStack.h"
+
 namespace Pinetime {
 
   namespace Drivers {
@@ -114,14 +116,18 @@ namespace Pinetime {
       static void Process(void* instance);
       void InitHw();
       void Refresh();
-      void ReturnApp(Apps app, DisplayApp::FullRefreshDirections direction, TouchEvents touchEvent);
-      void LoadApp(Apps app, DisplayApp::FullRefreshDirections direction);
+      void LoadNewScreen(Apps app, DisplayApp::FullRefreshDirections direction);
+      void LoadScreen(Apps app, DisplayApp::FullRefreshDirections direction);
       void PushMessageToSystemTask(Pinetime::System::Messages message);
 
       Apps nextApp = Apps::None;
       DisplayApp::FullRefreshDirections nextDirection;
       System::BootErrors bootError;
       void ApplyBrightness();
+
+      static constexpr size_t returnAppStackSize = 10;
+      StaticStack<Apps, returnAppStackSize> returnAppStack;
+      StaticStack<FullRefreshDirections, returnAppStackSize> appStackDirections;
     };
   }
 }
-- 
cgit v1.2.3-70-g09d2