Skip to content

Commit 26478d9

Browse files
Riksu9000Riksu9000
committed
screens: Remove unused DisplayApp parameters
1 parent c782119 commit 26478d9

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

72 files changed

+99
-156
lines changed

‎src/displayapp/DisplayApp.cpp

+24-26
Original file line numberDiff line numberDiff line change
@@ -361,8 +361,7 @@ void DisplayApp::LoadScreen(Apps app, DisplayApp::FullRefreshDirections directio
361361
break;
362362
case Apps::None:
363363
case Apps::Clock:
364-
currentScreen = std::make_unique<Screens::Clock>(this,
365-
dateTimeController,
364+
currentScreen = std::make_unique<Screens::Clock>(dateTimeController,
366365
batteryController,
367366
bleController,
368367
notificationManager,
@@ -373,18 +372,18 @@ void DisplayApp::LoadScreen(Apps app, DisplayApp::FullRefreshDirections directio
373372
break;
374373

375374
case Apps::Error:
376-
currentScreen = std::make_unique<Screens::Error>(this, bootError);
375+
currentScreen = std::make_unique<Screens::Error>(bootError);
377376
break;
378377

379378
case Apps::FirmwareValidation:
380-
currentScreen = std::make_unique<Screens::FirmwareValidation>(this, validator);
379+
currentScreen = std::make_unique<Screens::FirmwareValidation>(validator);
381380
break;
382381
case Apps::FirmwareUpdate:
383-
currentScreen = std::make_unique<Screens::FirmwareUpdate>(this, bleController);
382+
currentScreen = std::make_unique<Screens::FirmwareUpdate>(bleController);
384383
break;
385384

386385
case Apps::PassKey:
387-
currentScreen = std::make_unique<Screens::PassKey>(this, bleController.GetPairingKey());
386+
currentScreen = std::make_unique<Screens::PassKey>(bleController.GetPairingKey());
388387
break;
389388

390389
case Apps::Notifications:
@@ -404,11 +403,10 @@ void DisplayApp::LoadScreen(Apps app, DisplayApp::FullRefreshDirections directio
404403
Screens::Notifications::Modes::Preview);
405404
break;
406405
case Apps::Timer:
407-
currentScreen = std::make_unique<Screens::Timer>(this, timerController);
406+
currentScreen = std::make_unique<Screens::Timer>(timerController);
408407
break;
409408
case Apps::Alarm:
410-
currentScreen =
411-
std::make_unique<Screens::Alarm>(this, alarmController, settingsController.GetClockType(), *systemTask, motorController);
409+
currentScreen = std::make_unique<Screens::Alarm>(alarmController, settingsController.GetClockType(), *systemTask, motorController);
412410
break;
413411

414412
// Settings
@@ -428,31 +426,31 @@ void DisplayApp::LoadScreen(Apps app, DisplayApp::FullRefreshDirections directio
428426
currentScreen = std::make_unique<Screens::SettingWatchFace>(this, settingsController, filesystem);
429427
break;
430428
case Apps::SettingTimeFormat:
431-
currentScreen = std::make_unique<Screens::SettingTimeFormat>(this, settingsController);
429+
currentScreen = std::make_unique<Screens::SettingTimeFormat>(settingsController);
432430
break;
433431
case Apps::SettingWakeUp:
434-
currentScreen = std::make_unique<Screens::SettingWakeUp>(this, settingsController);
432+
currentScreen = std::make_unique<Screens::SettingWakeUp>(settingsController);
435433
break;
436434
case Apps::SettingDisplay:
437435
currentScreen = std::make_unique<Screens::SettingDisplay>(this, settingsController);
438436
break;
439437
case Apps::SettingSteps:
440-
currentScreen = std::make_unique<Screens::SettingSteps>(this, settingsController);
438+
currentScreen = std::make_unique<Screens::SettingSteps>(settingsController);
441439
break;
442440
case Apps::SettingSetDateTime:
443441
currentScreen = std::make_unique<Screens::SettingSetDateTime>(this, dateTimeController, settingsController);
444442
break;
445443
case Apps::SettingChimes:
446-
currentScreen = std::make_unique<Screens::SettingChimes>(this, settingsController);
444+
currentScreen = std::make_unique<Screens::SettingChimes>(settingsController);
447445
break;
448446
case Apps::SettingShakeThreshold:
449-
currentScreen = std::make_unique<Screens::SettingShakeThreshold>(this, settingsController, motionController, *systemTask);
447+
currentScreen = std::make_unique<Screens::SettingShakeThreshold>(settingsController, motionController, *systemTask);
450448
break;
451449
case Apps::SettingBluetooth:
452450
currentScreen = std::make_unique<Screens::SettingBluetooth>(this, settingsController);
453451
break;
454452
case Apps::BatteryInfo:
455-
currentScreen = std::make_unique<Screens::BatteryInfo>(this, batteryController);
453+
currentScreen = std::make_unique<Screens::BatteryInfo>(batteryController);
456454
break;
457455
case Apps::SysInfo:
458456
currentScreen = std::make_unique<Screens::SystemInfo>(this,
@@ -465,37 +463,37 @@ void DisplayApp::LoadScreen(Apps app, DisplayApp::FullRefreshDirections directio
465463
touchPanel);
466464
break;
467465
case Apps::FlashLight:
468-
currentScreen = std::make_unique<Screens::FlashLight>(this, *systemTask, brightnessController);
466+
currentScreen = std::make_unique<Screens::FlashLight>(*systemTask, brightnessController);
469467
break;
470468
case Apps::StopWatch:
471-
currentScreen = std::make_unique<Screens::StopWatch>(this, *systemTask);
469+
currentScreen = std::make_unique<Screens::StopWatch>(*systemTask);
472470
break;
473471
case Apps::Twos:
474-
currentScreen = std::make_unique<Screens::Twos>(this);
472+
currentScreen = std::make_unique<Screens::Twos>();
475473
break;
476474
case Apps::Paint:
477-
currentScreen = std::make_unique<Screens::InfiniPaint>(this, lvgl, motorController);
475+
currentScreen = std::make_unique<Screens::InfiniPaint>(lvgl, motorController);
478476
break;
479477
case Apps::Paddle:
480-
currentScreen = std::make_unique<Screens::Paddle>(this, lvgl);
478+
currentScreen = std::make_unique<Screens::Paddle>(lvgl);
481479
break;
482480
case Apps::Music:
483-
currentScreen = std::make_unique<Screens::Music>(this, systemTask->nimble().music());
481+
currentScreen = std::make_unique<Screens::Music>(systemTask->nimble().music());
484482
break;
485483
case Apps::Navigation:
486-
currentScreen = std::make_unique<Screens::Navigation>(this, systemTask->nimble().navigation());
484+
currentScreen = std::make_unique<Screens::Navigation>(systemTask->nimble().navigation());
487485
break;
488486
case Apps::HeartRate:
489-
currentScreen = std::make_unique<Screens::HeartRate>(this, heartRateController, *systemTask);
487+
currentScreen = std::make_unique<Screens::HeartRate>(heartRateController, *systemTask);
490488
break;
491489
case Apps::Metronome:
492-
currentScreen = std::make_unique<Screens::Metronome>(this, motorController, *systemTask);
490+
currentScreen = std::make_unique<Screens::Metronome>(motorController, *systemTask);
493491
break;
494492
case Apps::Motion:
495-
currentScreen = std::make_unique<Screens::Motion>(this, motionController);
493+
currentScreen = std::make_unique<Screens::Motion>(motionController);
496494
break;
497495
case Apps::Steps:
498-
currentScreen = std::make_unique<Screens::Steps>(this, motionController, settingsController);
496+
currentScreen = std::make_unique<Screens::Steps>(motionController, settingsController);
499497
break;
500498
}
501499
currentApp = app;

‎src/displayapp/screens/Alarm.cpp

+1-2
Original file line numberDiff line numberDiff line change
@@ -40,8 +40,7 @@ static void StopAlarmTaskCallback(lv_task_t* task) {
4040
screen->StopAlerting();
4141
}
4242

43-
Alarm::Alarm(DisplayApp* app,
44-
Controllers::AlarmController& alarmController,
43+
Alarm::Alarm(Controllers::AlarmController& alarmController,
4544
Controllers::Settings::ClockType clockType,
4645
System::SystemTask& systemTask,
4746
Controllers::MotorController& motorController)

‎src/displayapp/screens/Alarm.h

+1-2
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,7 @@ namespace Pinetime {
2828
namespace Screens {
2929
class Alarm : public Screen {
3030
public:
31-
Alarm(DisplayApp* app,
32-
Controllers::AlarmController& alarmController,
31+
Alarm(Controllers::AlarmController& alarmController,
3332
Controllers::Settings::ClockType clockType,
3433
System::SystemTask& systemTask,
3534
Controllers::MotorController& motorController);

‎src/displayapp/screens/BatteryInfo.cpp

+1-2
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,7 @@
55

66
using namespace Pinetime::Applications::Screens;
77

8-
BatteryInfo::BatteryInfo(Pinetime::Applications::DisplayApp* app, const Pinetime::Controllers::Battery& batteryController)
9-
: batteryController {batteryController} {
8+
BatteryInfo::BatteryInfo(const Pinetime::Controllers::Battery& batteryController) : batteryController {batteryController} {
109

1110
batteryPercent = batteryController.PercentRemaining();
1211
batteryVoltage = batteryController.Voltage();

‎src/displayapp/screens/BatteryInfo.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ namespace Pinetime {
1414

1515
class BatteryInfo : public Screen {
1616
public:
17-
BatteryInfo(DisplayApp* app, const Pinetime::Controllers::Battery& batteryController);
17+
BatteryInfo(const Pinetime::Controllers::Battery& batteryController);
1818
~BatteryInfo() override;
1919

2020
void Refresh() override;

‎src/displayapp/screens/CheckboxList.cpp

-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@ namespace {
1313

1414
CheckboxList::CheckboxList(const uint8_t screenID,
1515
const uint8_t numScreens,
16-
DisplayApp* app,
1716
const char* optionsTitle,
1817
const char* optionsSymbol,
1918
uint32_t originalValue,

‎src/displayapp/screens/CheckboxList.h

-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@ namespace Pinetime {
2323

2424
CheckboxList(const uint8_t screenID,
2525
const uint8_t numScreens,
26-
DisplayApp* app,
2726
const char* optionsTitle,
2827
const char* optionsSymbol,
2928
uint32_t originalValue,

‎src/displayapp/screens/Clock.cpp

+8-16
Original file line numberDiff line numberDiff line change
@@ -17,17 +17,15 @@
1717

1818
using namespace Pinetime::Applications::Screens;
1919

20-
Clock::Clock(DisplayApp* app,
21-
Controllers::DateTime& dateTimeController,
20+
Clock::Clock(Controllers::DateTime& dateTimeController,
2221
const Controllers::Battery& batteryController,
2322
const Controllers::Ble& bleController,
2423
Controllers::NotificationManager& notificationManager,
2524
Controllers::Settings& settingsController,
2625
Controllers::HeartRateController& heartRateController,
2726
Controllers::MotionController& motionController,
2827
Controllers::FS& filesystem)
29-
: app {app},
30-
dateTimeController {dateTimeController},
28+
: dateTimeController {dateTimeController},
3129
batteryController {batteryController},
3230
bleController {bleController},
3331
notificationManager {notificationManager},
@@ -74,8 +72,7 @@ bool Clock::OnButtonPushed() {
7472
}
7573

7674
std::unique_ptr<Screen> Clock::WatchFaceDigitalScreen() {
77-
return std::make_unique<Screens::WatchFaceDigital>(app,
78-
dateTimeController,
75+
return std::make_unique<Screens::WatchFaceDigital>(dateTimeController,
7976
batteryController,
8077
bleController,
8178
notificationManager,
@@ -85,17 +82,15 @@ std::unique_ptr<Screen> Clock::WatchFaceDigitalScreen() {
8582
}
8683

8784
std::unique_ptr<Screen> Clock::WatchFaceAnalogScreen() {
88-
return std::make_unique<Screens::WatchFaceAnalog>(app,
89-
dateTimeController,
85+
return std::make_unique<Screens::WatchFaceAnalog>(dateTimeController,
9086
batteryController,
9187
bleController,
9288
notificationManager,
9389
settingsController);
9490
}
9591

9692
std::unique_ptr<Screen> Clock::WatchFacePineTimeStyleScreen() {
97-
return std::make_unique<Screens::WatchFacePineTimeStyle>(app,
98-
dateTimeController,
93+
return std::make_unique<Screens::WatchFacePineTimeStyle>(dateTimeController,
9994
batteryController,
10095
bleController,
10196
notificationManager,
@@ -104,8 +99,7 @@ std::unique_ptr<Screen> Clock::WatchFacePineTimeStyleScreen() {
10499
}
105100

106101
std::unique_ptr<Screen> Clock::WatchFaceTerminalScreen() {
107-
return std::make_unique<Screens::WatchFaceTerminal>(app,
108-
dateTimeController,
102+
return std::make_unique<Screens::WatchFaceTerminal>(dateTimeController,
109103
batteryController,
110104
bleController,
111105
notificationManager,
@@ -115,8 +109,7 @@ std::unique_ptr<Screen> Clock::WatchFaceTerminalScreen() {
115109
}
116110

117111
std::unique_ptr<Screen> Clock::WatchFaceInfineatScreen() {
118-
return std::make_unique<Screens::WatchFaceInfineat>(app,
119-
dateTimeController,
112+
return std::make_unique<Screens::WatchFaceInfineat>(dateTimeController,
120113
batteryController,
121114
bleController,
122115
notificationManager,
@@ -126,8 +119,7 @@ std::unique_ptr<Screen> Clock::WatchFaceInfineatScreen() {
126119
}
127120

128121
std::unique_ptr<Screen> Clock::WatchFaceCasioStyleG7710() {
129-
return std::make_unique<Screens::WatchFaceCasioStyleG7710>(app,
130-
dateTimeController,
122+
return std::make_unique<Screens::WatchFaceCasioStyleG7710>(dateTimeController,
131123
batteryController,
132124
bleController,
133125
notificationManager,

‎src/displayapp/screens/Clock.h

+1-3
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,7 @@ namespace Pinetime {
2121
namespace Screens {
2222
class Clock : public Screen {
2323
public:
24-
Clock(DisplayApp* app,
25-
Controllers::DateTime& dateTimeController,
24+
Clock(Controllers::DateTime& dateTimeController,
2625
const Controllers::Battery& batteryController,
2726
const Controllers::Ble& bleController,
2827
Controllers::NotificationManager& notificationManager,
@@ -36,7 +35,6 @@ namespace Pinetime {
3635
bool OnButtonPushed() override;
3736

3837
private:
39-
DisplayApp* app;
4038
Controllers::DateTime& dateTimeController;
4139
const Controllers::Battery& batteryController;
4240
const Controllers::Ble& bleController;

‎src/displayapp/screens/Error.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ namespace {
99
}
1010
}
1111

12-
Error::Error(Pinetime::Applications::DisplayApp* app, System::BootErrors error) {
12+
Error::Error(System::BootErrors error) {
1313

1414
lv_obj_t* warningLabel = lv_label_create(lv_scr_act(), nullptr);
1515
lv_obj_set_style_local_text_color(warningLabel, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, LV_COLOR_ORANGE);

‎src/displayapp/screens/Error.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ namespace Pinetime {
99
namespace Screens {
1010
class Error : public Screen {
1111
public:
12-
Error(DisplayApp* app, System::BootErrors error);
12+
Error(System::BootErrors error);
1313
~Error() override;
1414

1515
void ButtonEventHandler();

‎src/displayapp/screens/FirmwareUpdate.cpp

+1-2
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,7 @@
55

66
using namespace Pinetime::Applications::Screens;
77

8-
FirmwareUpdate::FirmwareUpdate(Pinetime::Applications::DisplayApp* app, const Pinetime::Controllers::Ble& bleController)
9-
: bleController {bleController} {
8+
FirmwareUpdate::FirmwareUpdate(const Pinetime::Controllers::Ble& bleController) : bleController {bleController} {
109

1110
titleLabel = lv_label_create(lv_scr_act(), nullptr);
1211
lv_label_set_text_static(titleLabel, "Firmware update");

‎src/displayapp/screens/FirmwareUpdate.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ namespace Pinetime {
1414

1515
class FirmwareUpdate : public Screen {
1616
public:
17-
FirmwareUpdate(DisplayApp* app, const Pinetime::Controllers::Ble& bleController);
17+
FirmwareUpdate(const Pinetime::Controllers::Ble& bleController);
1818
~FirmwareUpdate() override;
1919

2020
void Refresh() override;

‎src/displayapp/screens/FirmwareValidation.cpp

+1-2
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,7 @@ namespace {
1414
}
1515
}
1616

17-
FirmwareValidation::FirmwareValidation(Pinetime::Applications::DisplayApp* app, Pinetime::Controllers::FirmwareValidator& validator)
18-
: validator {validator} {
17+
FirmwareValidation::FirmwareValidation(Pinetime::Controllers::FirmwareValidator& validator) : validator {validator} {
1918
labelVersion = lv_label_create(lv_scr_act(), nullptr);
2019
lv_label_set_text_fmt(labelVersion,
2120
"Version : %lu.%lu.%lu\n"

‎src/displayapp/screens/FirmwareValidation.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ namespace Pinetime {
1313

1414
class FirmwareValidation : public Screen {
1515
public:
16-
FirmwareValidation(DisplayApp* app, Pinetime::Controllers::FirmwareValidator& validator);
16+
FirmwareValidation(Pinetime::Controllers::FirmwareValidator& validator);
1717
~FirmwareValidation() override;
1818

1919
void OnButtonEvent(lv_obj_t* object, lv_event_t event);

‎src/displayapp/screens/FlashLight.cpp

+1-3
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,7 @@ namespace {
1414
}
1515
}
1616

17-
FlashLight::FlashLight(Pinetime::Applications::DisplayApp* app,
18-
System::SystemTask& systemTask,
19-
Controllers::BrightnessController& brightnessController)
17+
FlashLight::FlashLight(System::SystemTask& systemTask, Controllers::BrightnessController& brightnessController)
2018
: systemTask {systemTask}, brightnessController {brightnessController} {
2119

2220
brightnessController.Set(Controllers::BrightnessController::Levels::Low);

‎src/displayapp/screens/FlashLight.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ namespace Pinetime {
1313

1414
class FlashLight : public Screen {
1515
public:
16-
FlashLight(DisplayApp* app, System::SystemTask& systemTask, Controllers::BrightnessController& brightness);
16+
FlashLight(System::SystemTask& systemTask, Controllers::BrightnessController& brightness);
1717
~FlashLight() override;
1818

1919
bool OnTouchEvent(Pinetime::Applications::TouchEvents event) override;

‎src/displayapp/screens/HeartRate.cpp

+1-3
Original file line numberDiff line numberDiff line change
@@ -28,9 +28,7 @@ namespace {
2828
}
2929
}
3030

31-
HeartRate::HeartRate(Pinetime::Applications::DisplayApp* app,
32-
Controllers::HeartRateController& heartRateController,
33-
System::SystemTask& systemTask)
31+
HeartRate::HeartRate(Controllers::HeartRateController& heartRateController, System::SystemTask& systemTask)
3432
: heartRateController {heartRateController}, systemTask {systemTask} {
3533
bool isHrRunning = heartRateController.State() != Controllers::HeartRateController::States::Stopped;
3634
label_hr = lv_label_create(lv_scr_act(), nullptr);

‎src/displayapp/screens/HeartRate.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ namespace Pinetime {
1717

1818
class HeartRate : public Screen {
1919
public:
20-
HeartRate(DisplayApp* app, Controllers::HeartRateController& HeartRateController, System::SystemTask& systemTask);
20+
HeartRate(Controllers::HeartRateController& HeartRateController, System::SystemTask& systemTask);
2121
~HeartRate() override;
2222

2323
void Refresh() override;

‎src/displayapp/screens/InfiniPaint.cpp

+1-3
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,7 @@
77

88
using namespace Pinetime::Applications::Screens;
99

10-
InfiniPaint::InfiniPaint(Pinetime::Applications::DisplayApp* app,
11-
Pinetime::Components::LittleVgl& lvgl,
12-
Pinetime::Controllers::MotorController& motor)
10+
InfiniPaint::InfiniPaint(Pinetime::Components::LittleVgl& lvgl, Pinetime::Controllers::MotorController& motor)
1311
: lvgl {lvgl}, motor {motor} {
1412
std::fill(b, b + bufferSize, selectColor);
1513
}

0 commit comments

Comments
 (0)