Merge branch 'develop' into refresh_rework
This commit is contained in:
@@ -35,10 +35,8 @@ namespace Pinetime {
|
||||
|
||||
void Refresh() override;
|
||||
|
||||
void OnObjectEvent(lv_obj_t* pObj, lv_event_t i);
|
||||
|
||||
private:
|
||||
char displayedChar[5];
|
||||
char displayedChar[5] {};
|
||||
|
||||
uint16_t currentYear = 1970;
|
||||
Pinetime::Controllers::DateTime::Months currentMonth = Pinetime::Controllers::DateTime::Months::Unknown;
|
||||
@@ -63,7 +61,6 @@ namespace Pinetime {
|
||||
lv_obj_t* batteryPlug;
|
||||
lv_obj_t* heartbeatIcon;
|
||||
lv_obj_t* heartbeatValue;
|
||||
lv_obj_t* heartbeatBpm;
|
||||
lv_obj_t* stepIcon;
|
||||
lv_obj_t* stepValue;
|
||||
lv_obj_t* notificationIcon;
|
||||
|
Reference in New Issue
Block a user