Skip to content

More pride watch faces #2438

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
ngarnsworthy wants to merge 7 commits into
base: main
Choose a base branch
from
+40 −3
Open

More pride watch faces #2438

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
ba96b54
Add non-binary flag
ngarnsworthy May 10, 2026
f20c2c8
Add pride flag watchface documentation
ngarnsworthy May 10, 2026
e95f8a3
Added aro, ace, aroace, and pan flags and updated the text color for …
ngarnsworthy May 11, 2026
f981f1b
Fix formatting
ngarnsworthy May 11, 2026
caf0a5a
Updated watch colors for more contrast and cleaned up code and refera…
ngarnsworthy May 11, 2026
dd5801f
New better contrast and fix includes
ngarnsworthy May 11, 2026
65d2dd6
Make all text colors black and white
ngarnsworthy May 12, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions doc/gettingStarted/Watchfaces.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,3 +29,7 @@ InfiniTime has 6 apps on the `main` branch at the time of writing.

### Casio G7710
![Casio G7710 face](/doc/gettingStarted/Watchfaces/CasioG7710.png)

### Pride Flag
![Pride flag face](/doc/gettingStarted/Watchfaces/Pride.png)
- You can long-press on the display to change flags. (Gay, Lesbian, Bi, Trans, Non-binary)
Comment thread
ngarnsworthy marked this conversation as resolved.
Outdated
Binary file added doc/gettingStarted/Watchfaces/Pride.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion src/components/settings/Settings.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ namespace Pinetime {
};
enum class PTSGaugeStyle : uint8_t { Full, Half, Numeric };
enum class PTSWeather : uint8_t { On, Off };
enum class PrideFlag : uint8_t { Gay, Trans, Bi, Lesbian };
enum class PrideFlag : uint8_t { Gay, Trans, Bi, Lesbian, Nonbinary, Ace, Aro, AroAce, Pan };
enum class DfuAndFsMode : uint8_t { Disabled, Enabled, EnabledTillReboot };

struct PineTimeStyle {
Expand Down
38 changes: 36 additions & 2 deletions src/displayapp/screens/WatchFacePrideFlag.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,8 @@
#include "components/battery/BatteryController.h"
#include "components/ble/BleController.h"
#include "displayapp/screens/Symbols.h"
#include "drivers/Bma421_C/bma4_defs.h"
Comment thread
ngarnsworthy marked this conversation as resolved.
Outdated
#include "lvgl/src/lv_misc/lv_color.h"

using namespace Pinetime::Applications::Screens;

Expand All @@ -15,7 +17,7 @@ namespace {
Pinetime::Controllers::Settings::PrideFlag GetNext(Pinetime::Controllers::Settings::PrideFlag prideFlag) {
const auto prideFlagAsInt = static_cast<uint8_t>(prideFlag);
Pinetime::Controllers::Settings::PrideFlag nextFlag;
if (prideFlagAsInt < 3) {
if (prideFlagAsInt < 8) {
nextFlag = static_cast<Pinetime::Controllers::Settings::PrideFlag>(prideFlagAsInt + 1);
} else {
nextFlag = static_cast<Pinetime::Controllers::Settings::PrideFlag>(0);
Expand All @@ -29,7 +31,7 @@ namespace {
if (prideFlagAsInt > 0) {
prevFlag = static_cast<Pinetime::Controllers::Settings::PrideFlag>(prideFlagAsInt - 1);
} else {
prevFlag = static_cast<Pinetime::Controllers::Settings::PrideFlag>(3);
prevFlag = static_cast<Pinetime::Controllers::Settings::PrideFlag>(8);
}
return prevFlag;
}
Expand Down Expand Up @@ -62,6 +64,8 @@ namespace {
constexpr lv_color_t grayPurple = LV_COLOR_MAKE(0x9b, 0x4f, 0x96);
constexpr lv_color_t darkBlue = LV_COLOR_MAKE(0x00, 0x38, 0xa8);
constexpr lv_color_t orange = LV_COLOR_MAKE(0xef, 0x76, 0x27);
constexpr lv_color_t sunOrange = LV_COLOR_MAKE(0xe2, 0x8c, 0x00);
constexpr lv_color_t brightYellow = LV_COLOR_MAKE(0xec, 0xcd, 0x00);
constexpr lv_color_t lightOrange = LV_COLOR_MAKE(0xff, 0x9b, 0x55);
constexpr lv_color_t lightPurple = LV_COLOR_MAKE(0xd4, 0x61, 0xa6);
constexpr lv_color_t darkPurple = LV_COLOR_MAKE(0xb5, 0x56, 0x90);
Expand All @@ -71,14 +75,29 @@ namespace {
constexpr lv_color_t lightGreen = LV_COLOR_MAKE(0x98, 0xe8, 0xc1);
constexpr lv_color_t indigo = LV_COLOR_MAKE(0x50, 0x49, 0xcc);
constexpr lv_color_t steelBlue = LV_COLOR_MAKE(0x3d, 0x1a, 0x78);
constexpr lv_color_t skyBlue = LV_COLOR_MAKE(0x4a, 0x91, 0xe8);
constexpr std::array<lv_color_t, 7> gayColours {darkGreen, cyan, lightGreen, LV_COLOR_WHITE, lightBlue, indigo, steelBlue};
constexpr std::array<lv_color_t, 5> transColours {lightBlue, lightPink, LV_COLOR_WHITE, lightPink, lightBlue};
constexpr std::array<lv_color_t, 5> biColours {hotPink, hotPink, grayPurple, darkBlue, darkBlue};
constexpr std::array<lv_color_t, 7> lesbianColours {LV_COLOR_RED, orange, lightOrange, LV_COLOR_WHITE, lightPurple, darkPurple, magenta};
constexpr std::array<lv_color_t, 4> nonbinaryColours {LV_COLOR_YELLOW, LV_COLOR_WHITE, LV_COLOR_PURPLE, LV_COLOR_BLACK};
constexpr std::array<lv_color_t, 4> aceColours {LV_COLOR_BLACK, LV_COLOR_GRAY, LV_COLOR_WHITE, LV_COLOR_PURPLE};
constexpr std::array<lv_color_t, 5> aroColours {LV_COLOR_GREEN, lightGreen, LV_COLOR_WHITE, LV_COLOR_GRAY, LV_COLOR_BLACK};
constexpr std::array<lv_color_t, 5> aroaceColours {sunOrange,
brightYellow,
LV_COLOR_WHITE,
LV_COLOR_MAKE(0x62, 0xae, 0xdc),
LV_COLOR_MAKE(0x20, 0x38, 0x56)};
constexpr std::array<lv_color_t, 3> panColours {hotPink, LV_COLOR_YELLOW, skyBlue};
constexpr PrideFlagData gayFlagData(gayColours, LV_COLOR_BLACK, LV_COLOR_BLACK, LV_COLOR_WHITE);
constexpr PrideFlagData transFlagData(transColours, LV_COLOR_WHITE, LV_COLOR_BLACK, LV_COLOR_WHITE);
constexpr PrideFlagData biFlagData(biColours, LV_COLOR_BLACK, LV_COLOR_WHITE, LV_COLOR_BLACK);
constexpr PrideFlagData lesbianFlagData(lesbianColours, LV_COLOR_WHITE, LV_COLOR_BLACK, LV_COLOR_WHITE);
constexpr PrideFlagData nonbinaryFlagData(nonbinaryColours, skyBlue, lightPink, skyBlue);
constexpr PrideFlagData aceFlagData(aceColours, LV_COLOR_WHITE, LV_COLOR_BLACK, LV_COLOR_BLACK);
constexpr PrideFlagData aroFlagData(aroColours, LV_COLOR_WHITE, LV_COLOR_BLACK, LV_COLOR_WHITE);
constexpr PrideFlagData aroaceFlagData(aroaceColours, LV_COLOR_WHITE, LV_COLOR_BLACK, LV_COLOR_WHITE);
constexpr PrideFlagData panFlagData(panColours, LV_COLOR_BLACK, LV_COLOR_BLACK, LV_COLOR_BLACK);
}

WatchFacePrideFlag::WatchFacePrideFlag(Controllers::DateTime& dateTimeController,
Expand Down Expand Up @@ -333,5 +352,20 @@ void WatchFacePrideFlag::UpdateScreen(const Pinetime::Controllers::Settings::Pri
case Pinetime::Controllers::Settings::PrideFlag::Lesbian:
UseFlagData(lesbianFlagData);
break;
case Pinetime::Controllers::Settings::PrideFlag::Nonbinary:
UseFlagData(nonbinaryFlagData);
break;
case Pinetime::Controllers::Settings::PrideFlag::Ace:
UseFlagData(aceFlagData);
break;
case Pinetime::Controllers::Settings::PrideFlag::Aro:
UseFlagData(aroFlagData);
break;
case Pinetime::Controllers::Settings::PrideFlag::AroAce:
UseFlagData(aroaceFlagData);
break;
case Pinetime::Controllers::Settings::PrideFlag::Pan:
UseFlagData(panFlagData);
break;
}
}
Loading