scott/InfiniTime
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases 1 Wiki Activity

add pink color

Browse source
This commit is contained in:
Akseli Lahtinen 2022-09-12 11:22:01 +03:00 committed by JF
parent 809323df3a
commit 8c35c3c3d4
3 changed files with 9 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/components/settings/Settings.h
View file

@ -34,7 +34,8 @@ namespace Pinetime {
Navy, Navy,
Magenta, Magenta,
Purple, Purple,
Orange Orange,
Pink
}; };
struct PineTimeStyle { struct PineTimeStyle {
Colors ColorTime = Colors::Teal; Colors ColorTime = Colors::Teal;

2
src/displayapp/Colors.cpp
View file

@ -39,6 +39,8 @@ lv_color_t Pinetime::Applications::Convert(Pinetime::Controllers::Settings::Colo
return LV_COLOR_MAKE(0xb0, 0x0, 0xb0); return LV_COLOR_MAKE(0xb0, 0x0, 0xb0);
case Pinetime::Controllers::Settings::Colors::Orange: case Pinetime::Controllers::Settings::Colors::Orange:
return LV_COLOR_ORANGE; return LV_COLOR_ORANGE;
case Pinetime::Controllers::Settings::Colors::Pink:
return LV_COLOR_MAKE(0xFF, 0xAE, 0xC9);
default: default:
return LV_COLOR_WHITE; return LV_COLOR_WHITE;
} }

4
src/displayapp/screens/WatchFacePineTimeStyle.cpp
View file

@ -579,7 +579,7 @@ void WatchFacePineTimeStyle::UpdateSelected(lv_obj_t* object, lv_event_t event)
Pinetime::Controllers::Settings::Colors WatchFacePineTimeStyle::GetNext(Pinetime::Controllers::Settings::Colors color) { Pinetime::Controllers::Settings::Colors WatchFacePineTimeStyle::GetNext(Pinetime::Controllers::Settings::Colors color) {
auto colorAsInt = static_cast<uint8_t>(color); auto colorAsInt = static_cast<uint8_t>(color);
Pinetime::Controllers::Settings::Colors nextColor; Pinetime::Controllers::Settings::Colors nextColor;
if (colorAsInt < 16) { if (colorAsInt < 17) {
nextColor = static_cast<Controllers::Settings::Colors>(colorAsInt + 1); nextColor = static_cast<Controllers::Settings::Colors>(colorAsInt + 1);
} else { } else {
nextColor = static_cast<Controllers::Settings::Colors>(0); nextColor = static_cast<Controllers::Settings::Colors>(0);
@ -594,7 +594,7 @@ Pinetime::Controllers::Settings::Colors WatchFacePineTimeStyle::GetPrevious(Pine
if (colorAsInt > 0) { if (colorAsInt > 0) {
prevColor = static_cast<Controllers::Settings::Colors>(colorAsInt - 1); prevColor = static_cast<Controllers::Settings::Colors>(colorAsInt - 1);
} else { } else {
prevColor = static_cast<Controllers::Settings::Colors>(16); prevColor = static_cast<Controllers::Settings::Colors>(17);
} }
return prevColor; return prevColor;
} }