Stop passing app around

Following 7c7a860
InfiniTimeOrg · May 27, 2023 · c6d65db · c6d65db
1 parent e77219e
commit c6d65db
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 13 deletions.
diff --git a/src/displayapp/DisplayApp.cpp b/src/displayapp/DisplayApp.cpp
@@ -522,7 +522,7 @@ void DisplayApp::LoadScreen(Apps app, DisplayApp::FullRefreshDirections directio
       currentScreen = std::make_unique<Screens::Twos>();
       break;
     case Apps::Gallery:
-      currentScreen = std::make_unique<Screens::Gallery>(this, filesystem);
+      currentScreen = std::make_unique<Screens::Gallery>(filesystem);
       break;
     case Apps::Paint:
       currentScreen = std::make_unique<Screens::InfiniPaint>(lvgl, motorController);

diff --git a/src/displayapp/screens/FileView.cpp b/src/displayapp/screens/FileView.cpp
@@ -5,8 +5,8 @@
 
 using namespace Pinetime::Applications::Screens;
 
-FileView::FileView(uint8_t screenID, uint8_t nScreens, DisplayApp* app, const char* path)
-  : screenID(screenID), nScreens(nScreens), Screen(app), pageIndicator(screenID, nScreens) {
+FileView::FileView(uint8_t screenID, uint8_t nScreens, const char* path)
+  : screenID(screenID), nScreens(nScreens), Screen(), pageIndicator(screenID, nScreens) {
   label = nullptr;
 
   const char* c = strrchr(path, '/') + 1;
@@ -57,16 +57,16 @@ FileView::~FileView() {
   lv_obj_clean(lv_scr_act());
 }
 
-ImageView::ImageView(uint8_t screenID, uint8_t nScreens, DisplayApp* app, const char* path) : FileView(screenID, nScreens, app, path) {
+ImageView::ImageView(uint8_t screenID, uint8_t nScreens, const char* path) : FileView(screenID, nScreens, path) {
   lv_obj_t* image = lv_img_create(lv_scr_act(), nullptr);
   lv_img_set_src(image, path);
   lv_obj_align(image, lv_scr_act(), LV_ALIGN_CENTER, 0, 0);
 
   ShowInfo();
 }
 
-TextView::TextView(uint8_t screenID, uint8_t nScreens, DisplayApp* app, const char* path, Pinetime::Controllers::FS& fs)
-  : FileView(screenID, nScreens, app, path) {
+TextView::TextView(uint8_t screenID, uint8_t nScreens, const char* path, Pinetime::Controllers::FS& fs)
+  : FileView(screenID, nScreens, path) {
 
   lv_obj_t* label = lv_label_create(lv_scr_act(), nullptr);
   lv_label_set_long_mode(label, LV_LABEL_LONG_BREAK);

diff --git a/src/displayapp/screens/FileView.h b/src/displayapp/screens/FileView.h
@@ -10,7 +10,7 @@ namespace Pinetime {
     namespace Screens {
       class FileView : public Screen {
       public:
-        FileView(uint8_t screenID, uint8_t nScreens, DisplayApp* app, const char* path);
+        FileView(uint8_t screenID, uint8_t nScreens, const char* path);
         ~FileView() override;
 
         void ShowInfo();
@@ -27,12 +27,12 @@ namespace Pinetime {
 
       class ImageView : public FileView {
       public:
-        ImageView(uint8_t screenID, uint8_t nScreens, DisplayApp* app, const char* path);
+        ImageView(uint8_t screenID, uint8_t nScreens, const char* path);
       };
 
       class TextView : public FileView {
       public:
-        TextView(uint8_t screenID, uint8_t nScreens, DisplayApp* app, const char* path, Pinetime::Controllers::FS& fs);
+        TextView(uint8_t screenID, uint8_t nScreens, const char* path, Pinetime::Controllers::FS& fs);
         ~TextView() override;
 
       private:

diff --git a/src/displayapp/screens/Gallery.cpp b/src/displayapp/screens/Gallery.cpp
@@ -4,7 +4,7 @@
 
 using namespace Pinetime::Applications::Screens;
 
-Gallery::Gallery(DisplayApp* app, Pinetime::Controllers::FS& filesystem) : Screen(app), filesystem(filesystem) {
+Gallery::Gallery(Pinetime::Controllers::FS& filesystem) : Screen(), filesystem(filesystem) {
   ListDir();
 
   if (nScreens == 0) {
@@ -94,9 +94,9 @@ bool Gallery::Open(int n) {
   strncat(fullname, info.name, sizeof(fullname) - strlen(directory) - 2 - 1);
 
   if (StringEndsWith(fullname, ".bin")) {
-    current = std::make_unique<ImageView>(n, nScreens, app, fullname);
+    current = std::make_unique<ImageView>(n, nScreens, fullname);
   } else if (StringEndsWith(fullname, ".txt")) {
-    current = std::make_unique<TextView>(n, nScreens, app, fullname, filesystem);
+    current = std::make_unique<TextView>(n, nScreens, fullname, filesystem);
   } else {
     return false;
   }

diff --git a/src/displayapp/screens/Gallery.h b/src/displayapp/screens/Gallery.h
@@ -12,7 +12,7 @@ namespace Pinetime {
       public:
         static constexpr const char* directory = "/gallery/";
 
-        Gallery(DisplayApp* app, Pinetime::Controllers::FS& filesystem);
+        Gallery(Pinetime::Controllers::FS& filesystem);
         ~Gallery() override;
         bool OnTouchEvent(Pinetime::Applications::TouchEvents event) override;