summaryrefslogtreecommitdiff
path: root/src/displayapp/screens/WatchFaceAnalog.h
diff options
context:
space:
mode:
authorJF002 <JF002@users.noreply.github.com>2021-04-26 21:10:11 +0200
committerGitHub <noreply@github.com>2021-04-26 21:10:11 +0200
commit4706c99db4c1e05f9dd90f152f2dea08d8f22ab2 (patch)
treecf2bea6d67e8d91a7d6222b8e0b55a0075575003 /src/displayapp/screens/WatchFaceAnalog.h
parente56ebb8bd621cc8838e86fa032d680a6e7a35ffc (diff)
parent69898545193a82f7d72c9f47c9d9de36167b157b (diff)
Merge pull request #293 from Avamander/patch-5
Reformatted all the files according to clang-format style
Diffstat (limited to 'src/displayapp/screens/WatchFaceAnalog.h')
-rw-r--r--src/displayapp/screens/WatchFaceAnalog.h103
1 files changed, 51 insertions, 52 deletions
diff --git a/src/displayapp/screens/WatchFaceAnalog.h b/src/displayapp/screens/WatchFaceAnalog.h
index 56b086ab..667f6241 100644
--- a/src/displayapp/screens/WatchFaceAnalog.h
+++ b/src/displayapp/screens/WatchFaceAnalog.h
@@ -22,68 +22,67 @@ namespace Pinetime {
namespace Screens {
class WatchFaceAnalog : public Screen {
- public:
- WatchFaceAnalog(DisplayApp* app,
- Controllers::DateTime& dateTimeController,
- Controllers::Battery& batteryController,
- Controllers::Ble& bleController,
- Controllers::NotificationManager& notificatioManager,
- Controllers::Settings &settingsController);
-
- ~WatchFaceAnalog() override;
+ public:
+ WatchFaceAnalog(DisplayApp* app,
+ Controllers::DateTime& dateTimeController,
+ Controllers::Battery& batteryController,
+ Controllers::Ble& bleController,
+ Controllers::NotificationManager& notificatioManager,
+ Controllers::Settings& settingsController);
- bool Refresh() override;
+ ~WatchFaceAnalog() override;
- private:
- uint8_t sHour, sMinute, sSecond;
- uint8_t hour;
- uint8_t minute;
- uint8_t second;
+ bool Refresh() override;
- Pinetime::Controllers::DateTime::Months month;
- uint8_t day;
- Pinetime::Controllers::DateTime::Days dayOfWeek;
+ private:
+ uint8_t sHour, sMinute, sSecond;
+ uint8_t hour;
+ uint8_t minute;
+ uint8_t second;
- Pinetime::Controllers::DateTime::Months currentMonth = Pinetime::Controllers::DateTime::Months::Unknown;
- Pinetime::Controllers::DateTime::Days currentDayOfWeek = Pinetime::Controllers::DateTime::Days::Unknown;
- uint8_t currentDay = 0;
+ Pinetime::Controllers::DateTime::Months month;
+ uint8_t day;
+ Pinetime::Controllers::DateTime::Days dayOfWeek;
- DirtyValue<float> batteryPercentRemaining {0};
- DirtyValue<std::chrono::time_point<std::chrono::system_clock, std::chrono::nanoseconds>> currentDateTime;
- DirtyValue<bool> notificationState {false};
+ Pinetime::Controllers::DateTime::Months currentMonth = Pinetime::Controllers::DateTime::Months::Unknown;
+ Pinetime::Controllers::DateTime::Days currentDayOfWeek = Pinetime::Controllers::DateTime::Days::Unknown;
+ uint8_t currentDay = 0;
- lv_obj_t *hour_body;
- lv_obj_t *hour_body_trace;
- lv_obj_t *minute_body;
- lv_obj_t *minute_body_trace;
- lv_obj_t *second_body;
+ DirtyValue<float> batteryPercentRemaining {0};
+ DirtyValue<std::chrono::time_point<std::chrono::system_clock, std::chrono::nanoseconds>> currentDateTime;
+ DirtyValue<bool> notificationState {false};
- // ##
- lv_point_t hour_point[2];
- lv_point_t hour_point_trace[2];
- lv_point_t minute_point[2];
- lv_point_t minute_point_trace[2];
- lv_point_t second_point[2];
+ lv_obj_t* hour_body;
+ lv_obj_t* hour_body_trace;
+ lv_obj_t* minute_body;
+ lv_obj_t* minute_body_trace;
+ lv_obj_t* second_body;
- // ##
- lv_style_t hour_line_style;
- lv_style_t hour_line_style_trace;
- lv_style_t minute_line_style;
- lv_style_t minute_line_style_trace;
- lv_style_t second_line_style;
-
- lv_obj_t* label_date_day;
- lv_obj_t* batteryIcon;
- lv_obj_t* notificationIcon;
-
+ // ##
+ lv_point_t hour_point[2];
+ lv_point_t hour_point_trace[2];
+ lv_point_t minute_point[2];
+ lv_point_t minute_point_trace[2];
+ lv_point_t second_point[2];
- Controllers::DateTime& dateTimeController;
- Controllers::Battery& batteryController;
- Controllers::Ble& bleController;
- Controllers::NotificationManager& notificatioManager;
- Controllers::Settings& settingsController;
+ // ##
+ lv_style_t hour_line_style;
+ lv_style_t hour_line_style_trace;
+ lv_style_t minute_line_style;
+ lv_style_t minute_line_style_trace;
+ lv_style_t second_line_style;
- void UpdateClock();
+ lv_obj_t* label_date_day;
+ lv_obj_t* batteryIcon;
+ lv_obj_t* notificationIcon;
+
+ Controllers::DateTime& dateTimeController;
+ Controllers::Battery& batteryController;
+ Controllers::Ble& bleController;
+ Controllers::NotificationManager& notificatioManager;
+ Controllers::Settings& settingsController;
+
+ void UpdateClock();
};
}
}