remove unused controllers from fuzzy
This commit is contained in:
parent
8cf38a3469
commit
9520b2ec9b
|
@ -5,8 +5,6 @@
|
||||||
#include "displayapp/screens/NotificationIcon.h"
|
#include "displayapp/screens/NotificationIcon.h"
|
||||||
#include "displayapp/screens/Symbols.h"
|
#include "displayapp/screens/Symbols.h"
|
||||||
#include "displayapp/screens/WeatherSymbols.h"
|
#include "displayapp/screens/WeatherSymbols.h"
|
||||||
#include "components/battery/BatteryController.h"
|
|
||||||
#include "components/ble/BleController.h"
|
|
||||||
#include "components/ble/NotificationManager.h"
|
#include "components/ble/NotificationManager.h"
|
||||||
#include "components/heartrate/HeartRateController.h"
|
#include "components/heartrate/HeartRateController.h"
|
||||||
#include "components/motion/MotionController.h"
|
#include "components/motion/MotionController.h"
|
||||||
|
@ -16,23 +14,19 @@
|
||||||
using namespace Pinetime::Applications::Screens;
|
using namespace Pinetime::Applications::Screens;
|
||||||
|
|
||||||
WatchFaceFuzzy::WatchFaceFuzzy(Controllers::DateTime& dateTimeController,
|
WatchFaceFuzzy::WatchFaceFuzzy(Controllers::DateTime& dateTimeController,
|
||||||
const Controllers::Battery& batteryController,
|
Controllers::NotificationManager& notificationManager,
|
||||||
const Controllers::Ble& bleController,
|
Controllers::Settings& settingsController,
|
||||||
Controllers::NotificationManager& notificationManager,
|
Controllers::HeartRateController& heartRateController,
|
||||||
Controllers::Settings& settingsController,
|
Controllers::MotionController& motionController,
|
||||||
Controllers::HeartRateController& heartRateController,
|
Controllers::SimpleWeatherService& weatherService)
|
||||||
Controllers::MotionController& motionController,
|
|
||||||
Controllers::SimpleWeatherService& weatherService)
|
|
||||||
: currentDateTime {{}},
|
: currentDateTime {{}},
|
||||||
dateTimeController {dateTimeController},
|
dateTimeController {dateTimeController},
|
||||||
notificationManager {notificationManager},
|
notificationManager {notificationManager},
|
||||||
settingsController {settingsController},
|
settingsController {settingsController},
|
||||||
heartRateController {heartRateController},
|
heartRateController {heartRateController},
|
||||||
motionController {motionController},
|
motionController {motionController},
|
||||||
weatherService {weatherService},
|
weatherService {weatherService}
|
||||||
statusIcons(batteryController, bleController) {
|
{
|
||||||
|
|
||||||
statusIcons.Create();
|
|
||||||
|
|
||||||
notificationIcon = lv_label_create(lv_scr_act(), nullptr);
|
notificationIcon = lv_label_create(lv_scr_act(), nullptr);
|
||||||
lv_obj_set_style_local_text_color(notificationIcon, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, LV_COLOR_LIME);
|
lv_obj_set_style_local_text_color(notificationIcon, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, LV_COLOR_LIME);
|
||||||
|
@ -90,8 +84,6 @@ WatchFaceFuzzy::~WatchFaceFuzzy() {
|
||||||
}
|
}
|
||||||
|
|
||||||
void WatchFaceFuzzy::Refresh() {
|
void WatchFaceFuzzy::Refresh() {
|
||||||
statusIcons.Update();
|
|
||||||
|
|
||||||
notificationState = notificationManager.AreNewNotificationsAvailable();
|
notificationState = notificationManager.AreNewNotificationsAvailable();
|
||||||
if (notificationState.IsUpdated()) {
|
if (notificationState.IsUpdated()) {
|
||||||
lv_label_set_text_static(notificationIcon, NotificationIcon::GetIcon(notificationState.Get()));
|
lv_label_set_text_static(notificationIcon, NotificationIcon::GetIcon(notificationState.Get()));
|
||||||
|
|
|
@ -28,13 +28,11 @@ namespace Pinetime {
|
||||||
class WatchFaceFuzzy : public Screen {
|
class WatchFaceFuzzy : public Screen {
|
||||||
public:
|
public:
|
||||||
WatchFaceFuzzy(Controllers::DateTime& dateTimeController,
|
WatchFaceFuzzy(Controllers::DateTime& dateTimeController,
|
||||||
const Controllers::Battery& batteryController,
|
Controllers::NotificationManager& notificationManager,
|
||||||
const Controllers::Ble& bleController,
|
Controllers::Settings& settingsController,
|
||||||
Controllers::NotificationManager& notificationManager,
|
Controllers::HeartRateController& heartRateController,
|
||||||
Controllers::Settings& settingsController,
|
Controllers::MotionController& motionController,
|
||||||
Controllers::HeartRateController& heartRateController,
|
Controllers::SimpleWeatherService& weather);
|
||||||
Controllers::MotionController& motionController,
|
|
||||||
Controllers::SimpleWeatherService& weather);
|
|
||||||
~WatchFaceFuzzy() override;
|
~WatchFaceFuzzy() override;
|
||||||
|
|
||||||
void Refresh() override;
|
void Refresh() override;
|
||||||
|
@ -53,7 +51,6 @@ namespace Pinetime {
|
||||||
Utility::DirtyValue<std::chrono::time_point<std::chrono::system_clock, std::chrono::days>> currentDate;
|
Utility::DirtyValue<std::chrono::time_point<std::chrono::system_clock, std::chrono::days>> currentDate;
|
||||||
|
|
||||||
lv_obj_t* label_time;
|
lv_obj_t* label_time;
|
||||||
lv_obj_t* label_time_ampm;
|
|
||||||
lv_obj_t* label_date;
|
lv_obj_t* label_date;
|
||||||
lv_obj_t* heartbeatIcon;
|
lv_obj_t* heartbeatIcon;
|
||||||
lv_obj_t* heartbeatValue;
|
lv_obj_t* heartbeatValue;
|
||||||
|
@ -71,8 +68,6 @@ namespace Pinetime {
|
||||||
Controllers::SimpleWeatherService& weatherService;
|
Controllers::SimpleWeatherService& weatherService;
|
||||||
|
|
||||||
lv_task_t* taskRefresh;
|
lv_task_t* taskRefresh;
|
||||||
Widgets::StatusIcons statusIcons;
|
|
||||||
|
|
||||||
|
|
||||||
static char const *nums[];
|
static char const *nums[];
|
||||||
static char const *mods[];
|
static char const *mods[];
|
||||||
|
@ -88,8 +83,6 @@ namespace Pinetime {
|
||||||
|
|
||||||
static Screens::Screen* Create(AppControllers& controllers) {
|
static Screens::Screen* Create(AppControllers& controllers) {
|
||||||
return new Screens::WatchFaceFuzzy(controllers.dateTimeController,
|
return new Screens::WatchFaceFuzzy(controllers.dateTimeController,
|
||||||
controllers.batteryController,
|
|
||||||
controllers.bleController,
|
|
||||||
controllers.notificationManager,
|
controllers.notificationManager,
|
||||||
controllers.settingsController,
|
controllers.settingsController,
|
||||||
controllers.heartRateController,
|
controllers.heartRateController,
|
||||||
|
|
Loading…
Reference in New Issue
Block a user