Fix it again..
This commit is contained in:
parent
6a92529272
commit
108bbc3642
5 changed files with 31 additions and 4 deletions
|
@ -421,6 +421,7 @@ list(APPEND SOURCE_FILES
|
||||||
displayapp/icons/bg_clock.c
|
displayapp/icons/bg_clock.c
|
||||||
displayapp/screens/WatchFaceAnalog.cpp
|
displayapp/screens/WatchFaceAnalog.cpp
|
||||||
displayapp/screens/WatchFaceDigital.cpp
|
displayapp/screens/WatchFaceDigital.cpp
|
||||||
|
displayapp/screens/PineTimeStyle.cpp
|
||||||
|
|
||||||
##
|
##
|
||||||
|
|
||||||
|
@ -470,6 +471,7 @@ list(APPEND SOURCE_FILES
|
||||||
displayapp/fonts/jetbrains_mono_76.c
|
displayapp/fonts/jetbrains_mono_76.c
|
||||||
displayapp/fonts/jetbrains_mono_42.c
|
displayapp/fonts/jetbrains_mono_42.c
|
||||||
displayapp/fonts/lv_font_sys_48.c
|
displayapp/fonts/lv_font_sys_48.c
|
||||||
|
displayapp/fonts/open_sans_light.c
|
||||||
displayapp/lv_pinetime_theme.c
|
displayapp/lv_pinetime_theme.c
|
||||||
|
|
||||||
systemtask/SystemTask.cpp
|
systemtask/SystemTask.cpp
|
||||||
|
|
|
@ -14,6 +14,7 @@
|
||||||
#include "../DisplayApp.h"
|
#include "../DisplayApp.h"
|
||||||
#include "WatchFaceDigital.h"
|
#include "WatchFaceDigital.h"
|
||||||
#include "WatchFaceAnalog.h"
|
#include "WatchFaceAnalog.h"
|
||||||
|
#include "PineTimeStyle.h"
|
||||||
|
|
||||||
using namespace Pinetime::Applications::Screens;
|
using namespace Pinetime::Applications::Screens;
|
||||||
|
|
||||||
|
@ -42,6 +43,9 @@ Clock::Clock(DisplayApp* app,
|
||||||
[this]() -> std::unique_ptr<Screen> {
|
[this]() -> std::unique_ptr<Screen> {
|
||||||
return WatchFaceAnalogScreen();
|
return WatchFaceAnalogScreen();
|
||||||
},
|
},
|
||||||
|
[this]() -> std::unique_ptr<Screen> {
|
||||||
|
return PineTimeStyleScreen();
|
||||||
|
},
|
||||||
// Examples for more watch faces
|
// Examples for more watch faces
|
||||||
//[this]() -> std::unique_ptr<Screen> { return WatchFaceMinimalScreen(); },
|
//[this]() -> std::unique_ptr<Screen> { return WatchFaceMinimalScreen(); },
|
||||||
//[this]() -> std::unique_ptr<Screen> { return WatchFaceCustomScreen(); }
|
//[this]() -> std::unique_ptr<Screen> { return WatchFaceCustomScreen(); }
|
||||||
|
@ -80,6 +84,16 @@ std::unique_ptr<Screen> Clock::WatchFaceAnalogScreen() {
|
||||||
app, dateTimeController, batteryController, bleController, notificatioManager, settingsController);
|
app, dateTimeController, batteryController, bleController, notificatioManager, settingsController);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
std::unique_ptr<Screen> Clock::PineTimeStyleScreen() {
|
||||||
|
return std::make_unique<Screens::PineTimeStyle>(app,
|
||||||
|
dateTimeController,
|
||||||
|
batteryController,
|
||||||
|
bleController,
|
||||||
|
notificatioManager,
|
||||||
|
settingsController,
|
||||||
|
heartRateController);
|
||||||
|
}
|
||||||
|
|
||||||
/*
|
/*
|
||||||
// Examples for more watch faces
|
// Examples for more watch faces
|
||||||
std::unique_ptr<Screen> Clock::WatchFaceMinimalScreen() {
|
std::unique_ptr<Screen> Clock::WatchFaceMinimalScreen() {
|
||||||
|
@ -91,4 +105,4 @@ std::unique_ptr<Screen> Clock::WatchFaceCustomScreen() {
|
||||||
return std::make_unique<Screens::WatchFaceCustom>(app, dateTimeController, batteryController, bleController, notificatioManager,
|
return std::make_unique<Screens::WatchFaceCustom>(app, dateTimeController, batteryController, bleController, notificatioManager,
|
||||||
settingsController);
|
settingsController);
|
||||||
}
|
}
|
||||||
*/
|
*/
|
||||||
|
|
|
@ -47,9 +47,10 @@ namespace Pinetime {
|
||||||
Controllers::HeartRateController& heartRateController;
|
Controllers::HeartRateController& heartRateController;
|
||||||
Controllers::MotionController& motionController;
|
Controllers::MotionController& motionController;
|
||||||
|
|
||||||
ScreenList<2> screens;
|
ScreenList<3> screens;
|
||||||
std::unique_ptr<Screen> WatchFaceDigitalScreen();
|
std::unique_ptr<Screen> WatchFaceDigitalScreen();
|
||||||
std::unique_ptr<Screen> WatchFaceAnalogScreen();
|
std::unique_ptr<Screen> WatchFaceAnalogScreen();
|
||||||
|
std::unique_ptr<Screen> PineTimeStyleScreen();
|
||||||
|
|
||||||
// Examples for more watch faces
|
// Examples for more watch faces
|
||||||
// std::unique_ptr<Screen> WatchFaceMinimalScreen();
|
// std::unique_ptr<Screen> WatchFaceMinimalScreen();
|
||||||
|
|
|
@ -58,6 +58,15 @@ SettingWatchFace::SettingWatchFace(Pinetime::Applications::DisplayApp* app, Pine
|
||||||
lv_checkbox_set_checked(cbOption[optionsTotal], true);
|
lv_checkbox_set_checked(cbOption[optionsTotal], true);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
optionsTotal++;
|
||||||
|
cbOption[optionsTotal] = lv_checkbox_create(container1, nullptr);
|
||||||
|
lv_checkbox_set_text_static(cbOption[optionsTotal], " PineTimeStyle");
|
||||||
|
cbOption[optionsTotal]->user_data = this;
|
||||||
|
lv_obj_set_event_cb(cbOption[optionsTotal], event_handler);
|
||||||
|
if (settingsController.GetClockFace() == 2) {
|
||||||
|
lv_checkbox_set_checked(cbOption[optionsTotal], true);
|
||||||
|
}
|
||||||
|
|
||||||
optionsTotal++;
|
optionsTotal++;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -81,4 +90,4 @@ void SettingWatchFace::UpdateSelected(lv_obj_t* object, lv_event_t event) {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -417,6 +417,7 @@ typedef void* lv_indev_drv_user_data_t; /*Type of user data in the in
|
||||||
LV_FONT_DECLARE(jetbrains_mono_extrabold_compressed) \
|
LV_FONT_DECLARE(jetbrains_mono_extrabold_compressed) \
|
||||||
LV_FONT_DECLARE(jetbrains_mono_42) \
|
LV_FONT_DECLARE(jetbrains_mono_42) \
|
||||||
LV_FONT_DECLARE(jetbrains_mono_76) \
|
LV_FONT_DECLARE(jetbrains_mono_76) \
|
||||||
|
LV_FONT_DECLARE(open_sans_light) \
|
||||||
LV_FONT_DECLARE(lv_font_sys_48)
|
LV_FONT_DECLARE(lv_font_sys_48)
|
||||||
|
|
||||||
/* Enable it if you have fonts with a lot of characters.
|
/* Enable it if you have fonts with a lot of characters.
|
||||||
|
@ -758,4 +759,4 @@ typedef void* lv_obj_user_data_t;
|
||||||
|
|
||||||
/*--END OF LV_CONF_H--*/
|
/*--END OF LV_CONF_H--*/
|
||||||
|
|
||||||
#endif /*LV_CONF_H*/
|
#endif /*LV_CONF_H*/
|
||||||
|
|
Loading…
Reference in a new issue