Implement SettingWatchFace list
This commit is contained in:
parent
b561e7f3d0
commit
a3bfbb5e08
4 changed files with 55 additions and 62 deletions
|
@ -133,6 +133,14 @@ namespace Pinetime {
|
||||||
return settingsMenu;
|
return settingsMenu;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
void SetWatchfacesMenu(uint8_t menu) {
|
||||||
|
watchFacesMenu = menu;
|
||||||
|
};
|
||||||
|
|
||||||
|
uint8_t GetWatchfacesMenu() const {
|
||||||
|
return watchFacesMenu;
|
||||||
|
};
|
||||||
|
|
||||||
void SetClockType(ClockType clocktype) {
|
void SetClockType(ClockType clocktype) {
|
||||||
if (clocktype != settings.clockType) {
|
if (clocktype != settings.clockType) {
|
||||||
settingsChanged = true;
|
settingsChanged = true;
|
||||||
|
@ -262,6 +270,7 @@ namespace Pinetime {
|
||||||
|
|
||||||
uint8_t appMenu = 0;
|
uint8_t appMenu = 0;
|
||||||
uint8_t settingsMenu = 0;
|
uint8_t settingsMenu = 0;
|
||||||
|
uint8_t watchFacesMenu = 0;
|
||||||
/* ble state is intentionally not saved with the other watch settings and initialized
|
/* ble state is intentionally not saved with the other watch settings and initialized
|
||||||
* to off (false) on every boot because we always want ble to be enabled on startup
|
* to off (false) on every boot because we always want ble to be enabled on startup
|
||||||
*/
|
*/
|
||||||
|
|
|
@ -43,10 +43,10 @@ Clock::Clock(DisplayApp* app,
|
||||||
case 2:
|
case 2:
|
||||||
return WatchFacePineTimeStyleScreen();
|
return WatchFacePineTimeStyleScreen();
|
||||||
break;
|
break;
|
||||||
// case 3:
|
|
||||||
// return WatchFaceTerminalScreen();
|
|
||||||
// break;
|
|
||||||
case 3:
|
case 3:
|
||||||
|
return WatchFaceTerminalScreen();
|
||||||
|
break;
|
||||||
|
case 4:
|
||||||
return WatchFaceInfineatScreen();
|
return WatchFaceInfineatScreen();
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
|
|
@ -1,59 +1,31 @@
|
||||||
#include "displayapp/screens/settings/SettingWatchFace.h"
|
#include "displayapp/screens/settings/SettingWatchFace.h"
|
||||||
#include <lvgl/lvgl.h>
|
#include <lvgl/lvgl.h>
|
||||||
#include "displayapp/DisplayApp.h"
|
#include "displayapp/DisplayApp.h"
|
||||||
|
#include "displayapp/screens/CheckboxList.h"
|
||||||
#include "displayapp/screens/Screen.h"
|
#include "displayapp/screens/Screen.h"
|
||||||
#include "displayapp/screens/Styles.h"
|
#include "displayapp/screens/Styles.h"
|
||||||
#include "displayapp/screens/Symbols.h"
|
#include "displayapp/screens/Symbols.h"
|
||||||
|
#include "components/settings/Settings.h"
|
||||||
|
|
||||||
using namespace Pinetime::Applications::Screens;
|
using namespace Pinetime::Applications::Screens;
|
||||||
|
|
||||||
namespace {
|
constexpr const char* SettingWatchFace::title;
|
||||||
void event_handler(lv_obj_t* obj, lv_event_t event) {
|
constexpr const char* SettingWatchFace::symbol;
|
||||||
auto* screen = static_cast<SettingWatchFace*>(obj->user_data);
|
|
||||||
screen->UpdateSelected(obj, event);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
constexpr std::array<const char*, 4> SettingWatchFace::options;
|
|
||||||
|
|
||||||
SettingWatchFace::SettingWatchFace(Pinetime::Applications::DisplayApp* app, Pinetime::Controllers::Settings& settingsController)
|
SettingWatchFace::SettingWatchFace(Pinetime::Applications::DisplayApp* app, Pinetime::Controllers::Settings& settingsController)
|
||||||
: Screen(app), settingsController {settingsController} {
|
: Screen(app),
|
||||||
|
settingsController {settingsController},
|
||||||
lv_obj_t* container1 = lv_cont_create(lv_scr_act(), nullptr);
|
screens {app,
|
||||||
|
settingsController.GetWatchfacesMenu(),
|
||||||
// lv_obj_set_style_local_bg_color(container1, LV_CONT_PART_MAIN, LV_STATE_DEFAULT, lv_color_hex(0x111111));
|
{
|
||||||
lv_obj_set_style_local_bg_opa(container1, LV_CONT_PART_MAIN, LV_STATE_DEFAULT, LV_OPA_TRANSP);
|
[this]() -> std::unique_ptr<Screen> {
|
||||||
lv_obj_set_style_local_pad_all(container1, LV_CONT_PART_MAIN, LV_STATE_DEFAULT, 10);
|
return CreateScreen1();
|
||||||
lv_obj_set_style_local_pad_inner(container1, LV_CONT_PART_MAIN, LV_STATE_DEFAULT, 5);
|
},
|
||||||
lv_obj_set_style_local_border_width(container1, LV_CONT_PART_MAIN, LV_STATE_DEFAULT, 0);
|
[this]() -> std::unique_ptr<Screen> {
|
||||||
|
return CreateScreen2();
|
||||||
lv_obj_set_pos(container1, 10, 60);
|
|
||||||
lv_obj_set_width(container1, LV_HOR_RES - 20);
|
|
||||||
lv_obj_set_height(container1, LV_VER_RES - 50);
|
|
||||||
lv_cont_set_layout(container1, LV_LAYOUT_COLUMN_LEFT);
|
|
||||||
|
|
||||||
lv_obj_t* title = lv_label_create(lv_scr_act(), nullptr);
|
|
||||||
lv_label_set_text_static(title, "Watch face");
|
|
||||||
lv_label_set_align(title, LV_LABEL_ALIGN_CENTER);
|
|
||||||
lv_obj_align(title, lv_scr_act(), LV_ALIGN_IN_TOP_MID, 10, 15);
|
|
||||||
|
|
||||||
lv_obj_t* icon = lv_label_create(lv_scr_act(), nullptr);
|
|
||||||
lv_obj_set_style_local_text_color(icon, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, LV_COLOR_ORANGE);
|
|
||||||
lv_label_set_text_static(icon, Symbols::home);
|
|
||||||
lv_label_set_align(icon, LV_LABEL_ALIGN_CENTER);
|
|
||||||
lv_obj_align(icon, title, LV_ALIGN_OUT_LEFT_MID, -10, 0);
|
|
||||||
|
|
||||||
for (unsigned int i = 0; i < options.size(); i++) {
|
|
||||||
cbOption[i] = lv_checkbox_create(container1, nullptr);
|
|
||||||
lv_checkbox_set_text(cbOption[i], options[i]);
|
|
||||||
cbOption[i]->user_data = this;
|
|
||||||
lv_obj_set_event_cb(cbOption[i], event_handler);
|
|
||||||
SetRadioButtonStyle(cbOption[i]);
|
|
||||||
|
|
||||||
if (settingsController.GetClockFace() == i) {
|
|
||||||
lv_checkbox_set_checked(cbOption[i], true);
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
},
|
||||||
|
Screens::ScreenListModes::UpDown} {
|
||||||
}
|
}
|
||||||
|
|
||||||
SettingWatchFace::~SettingWatchFace() {
|
SettingWatchFace::~SettingWatchFace() {
|
||||||
|
@ -61,15 +33,22 @@ SettingWatchFace::~SettingWatchFace() {
|
||||||
settingsController.SaveSettings();
|
settingsController.SaveSettings();
|
||||||
}
|
}
|
||||||
|
|
||||||
void SettingWatchFace::UpdateSelected(lv_obj_t* object, lv_event_t event) {
|
bool SettingWatchFace::OnTouchEvent(Pinetime::Applications::TouchEvents event) {
|
||||||
if (event == LV_EVENT_VALUE_CHANGED) {
|
return screens.OnTouchEvent(event);
|
||||||
for (unsigned int i = 0; i < options.size(); i++) {
|
|
||||||
if (object == cbOption[i]) {
|
|
||||||
lv_checkbox_set_checked(cbOption[i], true);
|
|
||||||
settingsController.SetClockFace(i);
|
|
||||||
} else {
|
|
||||||
lv_checkbox_set_checked(cbOption[i], false);
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
std::unique_ptr<Screen> SettingWatchFace::CreateScreen1() {
|
||||||
|
std::array<const char*, 4> watchfaces {" Digital face", " Analog face", " PineTimeStyle", " Terminal"};
|
||||||
|
return std::make_unique<Screens::CheckboxList>(0, 2, app, settingsController, title,
|
||||||
|
symbol, &Controllers::Settings::SetClockFace,
|
||||||
|
&Controllers::Settings::GetClockFace,
|
||||||
|
watchfaces);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
std::unique_ptr<Screen> SettingWatchFace::CreateScreen2() {
|
||||||
|
std::array<const char*, 4> watchfaces {" Infineat face", "", "", ""};
|
||||||
|
return std::make_unique<Screens::CheckboxList>(1, 2, app, settingsController, title,
|
||||||
|
symbol, &Controllers::Settings::SetClockFace,
|
||||||
|
&Controllers::Settings::GetClockFace,
|
||||||
|
watchfaces);
|
||||||
}
|
}
|
||||||
|
|
|
@ -4,8 +4,10 @@
|
||||||
#include <cstdint>
|
#include <cstdint>
|
||||||
#include <lvgl/lvgl.h>
|
#include <lvgl/lvgl.h>
|
||||||
|
|
||||||
|
#include "displayapp/screens/ScreenList.h"
|
||||||
#include "components/settings/Settings.h"
|
#include "components/settings/Settings.h"
|
||||||
#include "displayapp/screens/Screen.h"
|
#include "displayapp/screens/Screen.h"
|
||||||
|
#include "displayapp/screens/Symbols.h"
|
||||||
|
|
||||||
namespace Pinetime {
|
namespace Pinetime {
|
||||||
|
|
||||||
|
@ -17,13 +19,16 @@ namespace Pinetime {
|
||||||
SettingWatchFace(DisplayApp* app, Pinetime::Controllers::Settings& settingsController);
|
SettingWatchFace(DisplayApp* app, Pinetime::Controllers::Settings& settingsController);
|
||||||
~SettingWatchFace() override;
|
~SettingWatchFace() override;
|
||||||
|
|
||||||
void UpdateSelected(lv_obj_t* object, lv_event_t event);
|
bool OnTouchEvent(TouchEvents event) override;
|
||||||
|
|
||||||
private:
|
private:
|
||||||
static constexpr std::array<const char*, 4> options = {" Digital face", " Analog face", " PineTimeStyle", " Terminal"};
|
|
||||||
Controllers::Settings& settingsController;
|
Controllers::Settings& settingsController;
|
||||||
|
ScreenList<2> screens;
|
||||||
|
|
||||||
lv_obj_t* cbOption[options.size()];
|
static constexpr const char* title = "Watch face";
|
||||||
|
static constexpr const char* symbol = Symbols::home;
|
||||||
|
std::unique_ptr<Screen> CreateScreen1();
|
||||||
|
std::unique_ptr<Screen> CreateScreen2();
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue