Skip to content

Commit 5891adf

Browse files
Added multiple pride flags
1 parent 5187d1e commit 5891adf

File tree

8 files changed

+398
-183
lines changed

8 files changed

+398
-183
lines changed

src/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -426,7 +426,7 @@ list(APPEND SOURCE_FILES
426426
displayapp/screens/WatchFaceTerminal.cpp
427427
displayapp/screens/WatchFacePineTimeStyle.cpp
428428
displayapp/screens/WatchFaceCasioStyleG7710.cpp
429-
displayapp/screens/WatchFaceTransFlag.cpp
429+
displayapp/screens/WatchFacePrideFlag.cpp
430430

431431
##
432432

src/components/settings/Settings.h

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,7 @@ namespace Pinetime {
3636
};
3737
enum class PTSGaugeStyle : uint8_t { Full, Half, Numeric };
3838
enum class PTSWeather : uint8_t { On, Off };
39+
enum class PrideFlag: uint8_t {Rainbow, Trans, Bi, Lesbian};
3940

4041
struct PineTimeStyle {
4142
Colors ColorTime = Colors::Teal;
@@ -154,6 +155,16 @@ namespace Pinetime {
154155
return settings.PTS.weatherEnable;
155156
};
156157

158+
void SetPrideFlag(PrideFlag prideFlag) {
159+
if (prideFlag != settings.prideFlag)
160+
settingsChanged = true;
161+
settings.prideFlag = prideFlag;
162+
};
163+
164+
PrideFlag GetPrideFlag() const {
165+
return settings.prideFlag;
166+
};
167+
157168
void SetAppMenu(uint8_t menu) {
158169
appMenu = menu;
159170
};
@@ -319,6 +330,8 @@ namespace Pinetime {
319330

320331
PineTimeStyle PTS;
321332

333+
PrideFlag prideFlag = PrideFlag::Rainbow;
334+
322335
WatchFaceInfineat watchFaceInfineat;
323336

324337
std::bitset<5> wakeUpMode {0};

src/displayapp/UserApps.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
#include "displayapp/screens/WatchFaceInfineat.h"
1515
#include "displayapp/screens/WatchFacePineTimeStyle.h"
1616
#include "displayapp/screens/WatchFaceTerminal.h"
17-
#include "displayapp/screens/WatchFaceTransFlag.h"
17+
#include "displayapp/screens/WatchFacePrideFlag.h"
1818

1919
namespace Pinetime {
2020
namespace Applications {

src/displayapp/apps/Apps.h.in

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ namespace Pinetime {
5252
Terminal,
5353
Infineat,
5454
CasioStyleG7710,
55-
TransFlag,
55+
PrideFlag,
5656
};
5757

5858
template <Apps>

src/displayapp/apps/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ else()
2727
set(DEFAULT_WATCHFACE_TYPES "${DEFAULT_WATCHFACE_TYPES}, WatchFace::Terminal")
2828
set(DEFAULT_WATCHFACE_TYPES "${DEFAULT_WATCHFACE_TYPES}, WatchFace::Infineat")
2929
set(DEFAULT_WATCHFACE_TYPES "${DEFAULT_WATCHFACE_TYPES}, WatchFace::CasioStyleG7710")
30-
set(DEFAULT_WATCHFACE_TYPES "${DEFAULT_WATCHFACE_TYPES}, WatchFace::TransFlag")
30+
set(DEFAULT_WATCHFACE_TYPES "${DEFAULT_WATCHFACE_TYPES}, WatchFace::PrideFlag")
3131
set(WATCHFACE_TYPES "${DEFAULT_WATCHFACE_TYPES}" CACHE STRING "List of watch faces to build into the firmware")
3232
endif()
3333

0 commit comments

Comments
 (0)