7c7a8602c4
The DisplayApp class isn't used in the Screen base class and most screens, so requiring it is pointless. In this commit, DisplayApp pointers were added to screens which use it and the explicit Screen constructor was removed in those screens.
59 lines
1.9 KiB
C++
59 lines
1.9 KiB
C++
#pragma once
|
|
|
|
#include <memory>
|
|
#include "displayapp/screens/Screen.h"
|
|
#include "displayapp/screens/ScreenList.h"
|
|
|
|
namespace Pinetime {
|
|
namespace Controllers {
|
|
class DateTime;
|
|
class Battery;
|
|
class BrightnessController;
|
|
class Ble;
|
|
}
|
|
|
|
namespace Drivers {
|
|
class WatchdogView;
|
|
}
|
|
|
|
namespace Applications {
|
|
class DisplayApp;
|
|
|
|
namespace Screens {
|
|
class SystemInfo : public Screen {
|
|
public:
|
|
explicit SystemInfo(DisplayApp* app,
|
|
Pinetime::Controllers::DateTime& dateTimeController,
|
|
const Pinetime::Controllers::Battery& batteryController,
|
|
Pinetime::Controllers::BrightnessController& brightnessController,
|
|
const Pinetime::Controllers::Ble& bleController,
|
|
Pinetime::Drivers::WatchdogView& watchdog,
|
|
Pinetime::Controllers::MotionController& motionController,
|
|
const Pinetime::Drivers::Cst816S& touchPanel);
|
|
~SystemInfo() override;
|
|
bool OnTouchEvent(TouchEvents event) override;
|
|
|
|
private:
|
|
DisplayApp* app;
|
|
Pinetime::Controllers::DateTime& dateTimeController;
|
|
const Pinetime::Controllers::Battery& batteryController;
|
|
Pinetime::Controllers::BrightnessController& brightnessController;
|
|
const Pinetime::Controllers::Ble& bleController;
|
|
Pinetime::Drivers::WatchdogView& watchdog;
|
|
Pinetime::Controllers::MotionController& motionController;
|
|
const Pinetime::Drivers::Cst816S& touchPanel;
|
|
|
|
ScreenList<5> screens;
|
|
|
|
static bool sortById(const TaskStatus_t& lhs, const TaskStatus_t& rhs);
|
|
|
|
std::unique_ptr<Screen> CreateScreen1();
|
|
std::unique_ptr<Screen> CreateScreen2();
|
|
std::unique_ptr<Screen> CreateScreen3();
|
|
std::unique_ptr<Screen> CreateScreen4();
|
|
std::unique_ptr<Screen> CreateScreen5();
|
|
};
|
|
}
|
|
}
|
|
}
|