Skip to content

Commit 62f23a6

Browse files
liamchargerliamcharger
committed
Remove all references to JetBrains mono
1 parent 8cb6b9d commit 62f23a6

27 files changed

+57
-57
lines changed

‎README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,7 @@ It integrates the following projects:
9898
- RTOS: **[FreeRTOS](https://freertos.org)** under the MIT license
9999
- UI: **[LittleVGL/LVGL](https://lvgl.io/)** under the MIT license
100100
- BLE stack: **[NimBLE](https://github.com/apache/mynewt-nimble)** under the Apache 2.0 license
101-
- Font: **[Jetbrains Mono](https://www.jetbrains.com/fr-fr/lp/mono/)** under the Apache 2.0 license
101+
- Font: **[Noto Sans](https://fonts.google.com/noto/specimen/Noto+Sans)** under the Apache 2.0 license
102102

103103
## Credits
104104

‎src/displayapp/InfiniTimeTheme.cpp

+4-4
Original file line numberDiff line numberDiff line change
@@ -218,10 +218,10 @@ static void basic_init() {
218218
lv_theme_t* lv_pinetime_theme_init() {
219219
theme.color_primary = LV_COLOR_WHITE;
220220
theme.color_secondary = LV_COLOR_GRAY;
221-
theme.font_small = &jetbrains_mono_bold_20;
222-
theme.font_normal = &jetbrains_mono_bold_20;
223-
theme.font_subtitle = &jetbrains_mono_bold_20;
224-
theme.font_title = &jetbrains_mono_bold_20;
221+
theme.font_small = &noto_sans_bold_20;
222+
theme.font_normal = &noto_sans_bold_20;
223+
theme.font_subtitle = &noto_sans_bold_20;
224+
theme.font_title = &noto_sans_bold_20;
225225
theme.flags = 0;
226226

227227
basic_init();

‎src/displayapp/fonts/CMakeLists.txt

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
set(FONTS jetbrains_mono_42 jetbrains_mono_76 jetbrains_mono_bold_20
2-
jetbrains_mono_extrabold_compressed lv_font_sys_48
1+
set(FONTS noto_sans_42 noto_sans_76 noto_sans_bold_20
2+
noto_sans_extrabold_compressed lv_font_sys_48
33
open_sans_light fontawesome_weathericons)
44
find_program(LV_FONT_CONV "lv_font_conv" NO_CACHE REQUIRED
55
HINTS "${CMAKE_SOURCE_DIR}/node_modules/.bin")

‎src/displayapp/fonts/README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# Fonts
22

3-
- [Jetbrains Mono](https://www.jetbrains.com/lp/mono/)
3+
- [Noto sans](https://fonts.google.com/noto/specimen/Noto+Sans)
44
- [Font Awesome](https://fontawesome.com/v5/cheatsheet/free/solid)
55
- [Open Sans Light](https://fonts.google.com/specimen/Open+Sans)
66
- [Material Symbols](https://fonts.google.com/icons)

‎src/displayapp/screens/Alarm.cpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ Alarm::Alarm(Controllers::AlarmController& alarmController,
5656
hourCounter.EnableTwelveHourMode();
5757

5858
lblampm = lv_label_create(lv_scr_act(), nullptr);
59-
lv_obj_set_style_local_text_font(lblampm, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, &jetbrains_mono_bold_20);
59+
lv_obj_set_style_local_text_font(lblampm, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, &noto_sans_bold_20);
6060
lv_label_set_text_static(lblampm, "AM");
6161
lv_label_set_align(lblampm, LV_LABEL_ALIGN_CENTER);
6262
lv_obj_align(lblampm, lv_scr_act(), LV_ALIGN_CENTER, 0, 30);
@@ -70,7 +70,7 @@ Alarm::Alarm(Controllers::AlarmController& alarmController,
7070
minuteCounter.SetValueChangedEventCallback(this, ValueChangedHandler);
7171

7272
lv_obj_t* colonLabel = lv_label_create(lv_scr_act(), nullptr);
73-
lv_obj_set_style_local_text_font(colonLabel, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, &jetbrains_mono_76);
73+
lv_obj_set_style_local_text_font(colonLabel, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, &noto_sans_76);
7474
lv_label_set_text_static(colonLabel, ":");
7575
lv_obj_align(colonLabel, lv_scr_act(), LV_ALIGN_CENTER, 0, -29);
7676

‎src/displayapp/screens/Alarm.h

+2-2
Original file line numberDiff line numberDiff line change
@@ -62,8 +62,8 @@ namespace Pinetime {
6262
void HideInfo();
6363
void ToggleRecurrence();
6464
void UpdateAlarmTime();
65-
Widgets::Counter hourCounter = Widgets::Counter(0, 23, jetbrains_mono_76);
66-
Widgets::Counter minuteCounter = Widgets::Counter(0, 59, jetbrains_mono_76);
65+
Widgets::Counter hourCounter = Widgets::Counter(0, 23, noto_sans_76);
66+
Widgets::Counter minuteCounter = Widgets::Counter(0, 59, noto_sans_76);
6767
};
6868
}
6969

‎src/displayapp/screens/BatteryInfo.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ BatteryInfo::BatteryInfo(const Pinetime::Controllers::Battery& batteryController
2727
lv_obj_align(status, charging_bar, LV_ALIGN_OUT_BOTTOM_MID, 0, 20);
2828

2929
percent = lv_label_create(lv_scr_act(), nullptr);
30-
lv_obj_set_style_local_text_font(percent, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, &jetbrains_mono_76);
30+
lv_obj_set_style_local_text_font(percent, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, &noto_sans_76);
3131
lv_label_set_text_fmt(percent, "%02i%%", batteryPercent);
3232
lv_label_set_align(percent, LV_LABEL_ALIGN_LEFT);
3333
lv_obj_align(percent, nullptr, LV_ALIGN_CENTER, 0, -60);

‎src/displayapp/screens/Dice.cpp

+5-5
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ Dice::Dice(Controllers::MotionController& motionController,
4949
static_cast<uint32_t>(motionController.Z())};
5050
gen.seed(sseq);
5151

52-
lv_obj_t* nCounterLabel = MakeLabel(&jetbrains_mono_bold_20,
52+
lv_obj_t* nCounterLabel = MakeLabel(&noto_sans_bold_20,
5353
LV_COLOR_WHITE,
5454
LV_LABEL_LONG_EXPAND,
5555
0,
@@ -60,7 +60,7 @@ Dice::Dice(Controllers::MotionController& motionController,
6060
0,
6161
0);
6262

63-
lv_obj_t* dCounterLabel = MakeLabel(&jetbrains_mono_bold_20,
63+
lv_obj_t* dCounterLabel = MakeLabel(&noto_sans_bold_20,
6464
LV_COLOR_WHITE,
6565
LV_LABEL_LONG_EXPAND,
6666
0,
@@ -82,7 +82,7 @@ Dice::Dice(Controllers::MotionController& motionController,
8282
std::uniform_int_distribution<> distrib(0, resultColors.size() - 1);
8383
currentColorIndex = distrib(gen);
8484

85-
resultTotalLabel = MakeLabel(&jetbrains_mono_42,
85+
resultTotalLabel = MakeLabel(&noto_sans_42,
8686
resultColors[currentColorIndex],
8787
LV_LABEL_LONG_BREAK,
8888
120,
@@ -92,7 +92,7 @@ Dice::Dice(Controllers::MotionController& motionController,
9292
LV_ALIGN_IN_TOP_RIGHT,
9393
11,
9494
38);
95-
resultIndividualLabel = MakeLabel(&jetbrains_mono_bold_20,
95+
resultIndividualLabel = MakeLabel(&noto_sans_bold_20,
9696
resultColors[currentColorIndex],
9797
LV_LABEL_LONG_BREAK,
9898
90,
@@ -112,7 +112,7 @@ Dice::Dice(Controllers::MotionController& motionController,
112112
lv_obj_set_size(btnRoll, 240, 50);
113113
lv_obj_align(btnRoll, lv_scr_act(), LV_ALIGN_IN_BOTTOM_MID, 0, 0);
114114

115-
btnRollLabel = MakeLabel(&jetbrains_mono_bold_20,
115+
btnRollLabel = MakeLabel(&noto_sans_bold_20,
116116
LV_COLOR_WHITE,
117117
LV_LABEL_LONG_EXPAND,
118118
0,

‎src/displayapp/screens/Dice.h

+2-2
Original file line numberDiff line numberDiff line change
@@ -35,8 +35,8 @@ namespace Pinetime {
3535
uint8_t currentColorIndex;
3636
void NextColor();
3737

38-
Widgets::Counter nCounter = Widgets::Counter(1, 9, jetbrains_mono_42);
39-
Widgets::Counter dCounter = Widgets::Counter(2, 99, jetbrains_mono_42);
38+
Widgets::Counter nCounter = Widgets::Counter(1, 9, noto_sans_42);
39+
Widgets::Counter dCounter = Widgets::Counter(2, 99, noto_sans_42);
4040

4141
bool openingRoll = true;
4242
uint8_t currentRollHysteresis = 0;

‎src/displayapp/screens/HeartRate.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ HeartRate::HeartRate(Controllers::HeartRateController& heartRateController, Syst
3333
bool isHrRunning = heartRateController.State() != Controllers::HeartRateController::States::Stopped;
3434
label_hr = lv_label_create(lv_scr_act(), nullptr);
3535

36-
lv_obj_set_style_local_text_font(label_hr, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, &jetbrains_mono_76);
36+
lv_obj_set_style_local_text_font(label_hr, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, &noto_sans_76);
3737

3838
if (isHrRunning) {
3939
lv_obj_set_style_local_text_color(label_hr, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, Colors::highlight);

‎src/displayapp/screens/Metronome.cpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -35,8 +35,8 @@ Metronome::Metronome(Controllers::MotorController& motorController, System::Syst
3535
lv_arc_set_adjustable(bpmArc, true);
3636
lv_obj_align(bpmArc, lv_scr_act(), LV_ALIGN_IN_TOP_MID, 0, 0);
3737

38-
bpmValue = createLabel("120", bpmArc, LV_ALIGN_IN_TOP_MID, &jetbrains_mono_76, 0, 55);
39-
createLabel("bpm", bpmValue, LV_ALIGN_OUT_BOTTOM_MID, &jetbrains_mono_bold_20, 0, 0);
38+
bpmValue = createLabel("120", bpmArc, LV_ALIGN_IN_TOP_MID, &noto_sans_76, 0, 55);
39+
createLabel("bpm", bpmValue, LV_ALIGN_OUT_BOTTOM_MID, &noto_sans_bold_20, 0, 0);
4040

4141
bpmTap = lv_btn_create(lv_scr_act(), nullptr);
4242
bpmTap->user_data = this;

‎src/displayapp/screens/Navigation.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -213,7 +213,7 @@ Navigation::Navigation(Pinetime::Controllers::NavigationService& nav) : navServi
213213
txtManDist = lv_label_create(lv_scr_act(), nullptr);
214214
lv_label_set_long_mode(txtManDist, LV_LABEL_LONG_BREAK);
215215
lv_obj_set_style_local_text_color(txtManDist, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, LV_COLOR_GREEN);
216-
lv_obj_set_style_local_text_font(txtManDist, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, &jetbrains_mono_42);
216+
lv_obj_set_style_local_text_font(txtManDist, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, &noto_sans_42);
217217
lv_obj_set_width(txtManDist, LV_HOR_RES);
218218
lv_label_set_text_static(txtManDist, "--M");
219219
lv_label_set_align(txtManDist, LV_LABEL_ALIGN_CENTER);

‎src/displayapp/screens/Notifications.cpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@
77
#include "displayapp/InfiniTimeTheme.h"
88

99
using namespace Pinetime::Applications::Screens;
10-
extern lv_font_t jetbrains_mono_extrabold_compressed;
11-
extern lv_font_t jetbrains_mono_bold_20;
10+
extern lv_font_t noto_sans_extrabold_compressed;
11+
extern lv_font_t noto_sans_bold_20;
1212

1313
Notifications::Notifications(DisplayApp* app,
1414
Pinetime::Controllers::NotificationManager& notificationManager,

‎src/displayapp/screens/Paddle.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ Paddle::Paddle(Pinetime::Components::LittleVgl& lvgl) : lvgl {lvgl} {
1616
lv_obj_set_style_local_border_width(background, LV_BTN_PART_MAIN, LV_STATE_DEFAULT, 1);
1717

1818
points = lv_label_create(lv_scr_act(), nullptr);
19-
lv_obj_set_style_local_text_font(points, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, &jetbrains_mono_42);
19+
lv_obj_set_style_local_text_font(points, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, &noto_sans_42);
2020
lv_label_set_text_static(points, "0000");
2121
lv_obj_align(points, lv_scr_act(), LV_ALIGN_IN_TOP_MID, 0, 10);
2222

‎src/displayapp/screens/PassKey.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ using namespace Pinetime::Applications::Screens;
66
PassKey::PassKey(uint32_t key) {
77
passkeyLabel = lv_label_create(lv_scr_act(), nullptr);
88
lv_obj_set_style_local_text_color(passkeyLabel, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, LV_COLOR_YELLOW);
9-
lv_obj_set_style_local_text_font(passkeyLabel, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, &jetbrains_mono_42);
9+
lv_obj_set_style_local_text_font(passkeyLabel, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, &noto_sans_42);
1010
lv_label_set_text_fmt(passkeyLabel, "%06u", key);
1111
lv_obj_align(passkeyLabel, nullptr, LV_ALIGN_CENTER, 0, -20);
1212
}

‎src/displayapp/screens/Steps.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ Steps::Steps(Controllers::MotionController& motionController, Controllers::Setti
3232

3333
lSteps = lv_label_create(lv_scr_act(), nullptr);
3434
lv_obj_set_style_local_text_color(lSteps, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, LV_COLOR_LIME);
35-
lv_obj_set_style_local_text_font(lSteps, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, &jetbrains_mono_42);
35+
lv_obj_set_style_local_text_font(lSteps, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, &noto_sans_42);
3636
lv_label_set_text_fmt(lSteps, "%li", stepsCount);
3737
lv_obj_align(lSteps, nullptr, LV_ALIGN_CENTER, 0, -40);
3838

‎src/displayapp/screens/StopWatch.cpp

+3-3
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ StopWatch::StopWatch(System::SystemTask& systemTask) : wakeLock(systemTask) {
6767
lv_obj_align(msecTime, lapText, LV_ALIGN_OUT_TOP_MID, 0, 0);
6868

6969
time = lv_label_create(lv_scr_act(), nullptr);
70-
lv_obj_set_style_local_text_font(time, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, &jetbrains_mono_76);
70+
lv_obj_set_style_local_text_font(time, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, &noto_sans_76);
7171
lv_label_set_text_static(time, "00:00");
7272
lv_obj_set_style_local_text_color(time, LV_LABEL_PART_MAIN, LV_STATE_DISABLED, Colors::lightGray);
7373
lv_obj_align(time, msecTime, LV_ALIGN_OUT_TOP_MID, 0, 0);
@@ -111,7 +111,7 @@ void StopWatch::SetInterfaceStopped() {
111111
lv_label_set_text_static(msecTime, "00");
112112

113113
if (isHoursLabelUpdated) {
114-
lv_obj_set_style_local_text_font(time, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, &jetbrains_mono_76);
114+
lv_obj_set_style_local_text_font(time, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, &noto_sans_76);
115115
lv_obj_realign(time);
116116
isHoursLabelUpdated = false;
117117
}
@@ -157,7 +157,7 @@ void StopWatch::Refresh() {
157157
} else {
158158
lv_label_set_text_fmt(time, "%02d:%02d:%02d", currentTimeSeparated.hours, currentTimeSeparated.mins, currentTimeSeparated.secs);
159159
if (!isHoursLabelUpdated) {
160-
lv_obj_set_style_local_text_font(time, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, &jetbrains_mono_42);
160+
lv_obj_set_style_local_text_font(time, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, &noto_sans_42);
161161
lv_obj_realign(time);
162162
isHoursLabelUpdated = true;
163163
}

‎src/displayapp/screens/Timer.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ static void btnEventHandler(lv_obj_t* obj, lv_event_t event) {
2020
Timer::Timer(Controllers::Timer& timerController) : timer {timerController} {
2121

2222
lv_obj_t* colonLabel = lv_label_create(lv_scr_act(), nullptr);
23-
lv_obj_set_style_local_text_font(colonLabel, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, &jetbrains_mono_76);
23+
lv_obj_set_style_local_text_font(colonLabel, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, &noto_sans_76);
2424
lv_obj_set_style_local_text_color(colonLabel, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, LV_COLOR_WHITE);
2525
lv_label_set_text_static(colonLabel, ":");
2626
lv_obj_align(colonLabel, lv_scr_act(), LV_ALIGN_CENTER, 0, -29);

‎src/displayapp/screens/Timer.h

+2-2
Original file line numberDiff line numberDiff line change
@@ -38,8 +38,8 @@ namespace Pinetime::Applications {
3838
lv_objmask_mask_t* highlightMask;
3939

4040
lv_task_t* taskRefresh;
41-
Widgets::Counter minuteCounter = Widgets::Counter(0, 59, jetbrains_mono_76);
42-
Widgets::Counter secondCounter = Widgets::Counter(0, 59, jetbrains_mono_76);
41+
Widgets::Counter minuteCounter = Widgets::Counter(0, 59, noto_sans_76);
42+
Widgets::Counter secondCounter = Widgets::Counter(0, 59, noto_sans_76);
4343

4444
bool buttonPressing = false;
4545
lv_coord_t maskPosition = 0;

‎src/displayapp/screens/WatchFaceDigital.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ WatchFaceDigital::WatchFaceDigital(Controllers::DateTime& dateTimeController,
5858
lv_obj_set_style_local_text_color(label_date, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, lv_color_hex(0x999999));
5959

6060
label_time = lv_label_create(lv_scr_act(), nullptr);
61-
lv_obj_set_style_local_text_font(label_time, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, &jetbrains_mono_extrabold_compressed);
61+
lv_obj_set_style_local_text_font(label_time, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, &noto_sans_extrabold_compressed);
6262

6363
lv_obj_align(label_time, lv_scr_act(), LV_ALIGN_IN_RIGHT_MID, 0, 0);
6464

‎src/displayapp/screens/Weather.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ Weather::Weather(Controllers::Settings& settingsController, Controllers::SimpleW
4040

4141
temperature = lv_label_create(lv_scr_act(), nullptr);
4242
lv_obj_set_style_local_text_color(temperature, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, LV_COLOR_WHITE);
43-
lv_obj_set_style_local_text_font(temperature, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, &jetbrains_mono_42);
43+
lv_obj_set_style_local_text_font(temperature, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, &noto_sans_42);
4444
lv_label_set_text(temperature, "---");
4545
lv_obj_align(temperature, nullptr, LV_ALIGN_CENTER, 0, -30);
4646
lv_obj_set_auto_realign(temperature, true);

‎src/displayapp/screens/settings/SettingSetDate.h

+3-3
Original file line numberDiff line numberDiff line change
@@ -27,9 +27,9 @@ namespace Pinetime {
2727
lv_obj_t* btnSetTime;
2828
lv_obj_t* lblSetTime;
2929

30-
Widgets::Counter dayCounter = Widgets::Counter(1, 31, jetbrains_mono_bold_20);
31-
Widgets::Counter monthCounter = Widgets::Counter(1, 12, jetbrains_mono_bold_20);
32-
Widgets::Counter yearCounter = Widgets::Counter(1970, 9999, jetbrains_mono_bold_20);
30+
Widgets::Counter dayCounter = Widgets::Counter(1, 31, noto_sans_bold_20);
31+
Widgets::Counter monthCounter = Widgets::Counter(1, 12, noto_sans_bold_20);
32+
Widgets::Counter yearCounter = Widgets::Counter(1970, 9999, noto_sans_bold_20);
3333
};
3434
}
3535
}

‎src/displayapp/screens/settings/SettingSetTime.cpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ SettingSetTime::SettingSetTime(Pinetime::Controllers::DateTime& dateTimeControll
4141
lv_obj_align(icon, title, LV_ALIGN_OUT_LEFT_MID, -10, 0);
4242

4343
lv_obj_t* staticLabel = lv_label_create(lv_scr_act(), nullptr);
44-
lv_obj_set_style_local_text_font(staticLabel, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, &jetbrains_mono_42);
44+
lv_obj_set_style_local_text_font(staticLabel, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, &noto_sans_42);
4545
lv_label_set_text_static(staticLabel, "00:00:00");
4646
lv_obj_align(staticLabel, lv_scr_act(), LV_ALIGN_CENTER, 0, POS_Y_TEXT);
4747

@@ -59,7 +59,7 @@ SettingSetTime::SettingSetTime(Pinetime::Controllers::DateTime& dateTimeControll
5959
minuteCounter.SetValueChangedEventCallback(this, ValueChangedHandler);
6060

6161
lblampm = lv_label_create(lv_scr_act(), nullptr);
62-
lv_obj_set_style_local_text_font(lblampm, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, &jetbrains_mono_bold_20);
62+
lv_obj_set_style_local_text_font(lblampm, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, &noto_sans_bold_20);
6363
lv_label_set_text_static(lblampm, " ");
6464
lv_obj_align(lblampm, lv_scr_act(), LV_ALIGN_CENTER, 75, -50);
6565

‎src/displayapp/screens/settings/SettingSetTime.h

+2-2
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,8 @@ namespace Pinetime {
3030
lv_obj_t* lblampm;
3131
lv_obj_t* btnSetTime;
3232
lv_obj_t* lblSetTime;
33-
Widgets::Counter hourCounter = Widgets::Counter(0, 23, jetbrains_mono_42);
34-
Widgets::Counter minuteCounter = Widgets::Counter(0, 59, jetbrains_mono_42);
33+
Widgets::Counter hourCounter = Widgets::Counter(0, 23, noto_sans_42);
34+
Widgets::Counter minuteCounter = Widgets::Counter(0, 59, noto_sans_42);
3535
};
3636
}
3737
}

‎src/displayapp/screens/settings/SettingSteps.cpp

+3-3
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ SettingSteps::SettingSteps(Pinetime::Controllers::Settings& settingsController)
3939
lv_obj_align(icon, title, LV_ALIGN_OUT_LEFT_MID, -10, 0);
4040

4141
stepValue = lv_label_create(lv_scr_act(), nullptr);
42-
lv_obj_set_style_local_text_font(stepValue, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, &jetbrains_mono_42);
42+
lv_obj_set_style_local_text_font(stepValue, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, &noto_sans_42);
4343
lv_label_set_text_fmt(stepValue, "%lu", settingsController.GetStepsGoal());
4444
lv_label_set_align(stepValue, LV_LABEL_ALIGN_CENTER);
4545
lv_obj_align(stepValue, lv_scr_act(), LV_ALIGN_CENTER, 0, -20);
@@ -53,7 +53,7 @@ SettingSteps::SettingSteps(Pinetime::Controllers::Settings& settingsController)
5353
lv_obj_align(btnPlus, lv_scr_act(), LV_ALIGN_IN_BOTTOM_RIGHT, 0, 0);
5454
lv_obj_set_style_local_bg_color(btnPlus, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, Colors::bgAlt);
5555
lv_obj_t* lblPlus = lv_label_create(btnPlus, nullptr);
56-
lv_obj_set_style_local_text_font(lblPlus, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, &jetbrains_mono_42);
56+
lv_obj_set_style_local_text_font(lblPlus, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, &noto_sans_42);
5757
lv_label_set_text_static(lblPlus, "+");
5858
lv_obj_set_event_cb(btnPlus, event_handler);
5959

@@ -64,7 +64,7 @@ SettingSteps::SettingSteps(Pinetime::Controllers::Settings& settingsController)
6464
lv_obj_align(btnMinus, lv_scr_act(), LV_ALIGN_IN_BOTTOM_LEFT, 0, 0);
6565
lv_obj_set_style_local_bg_color(btnMinus, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, Colors::bgAlt);
6666
lv_obj_t* lblMinus = lv_label_create(btnMinus, nullptr);
67-
lv_obj_set_style_local_text_font(lblMinus, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, &jetbrains_mono_42);
67+
lv_obj_set_style_local_text_font(lblMinus, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, &noto_sans_42);
6868
lv_label_set_text_static(lblMinus, "-");
6969
}
7070

‎src/displayapp/widgets/Counter.cpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -151,7 +151,7 @@ void Counter::Create() {
151151
lv_obj_set_event_cb(upBtn, upBtnEventHandler);
152152

153153
lv_obj_t* upLabel = lv_label_create(upBtn, nullptr);
154-
lv_obj_set_style_local_text_font(upLabel, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, &jetbrains_mono_42);
154+
lv_obj_set_style_local_text_font(upLabel, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, &noto_sans_42);
155155
lv_label_set_text_static(upLabel, "+");
156156
lv_obj_align(upLabel, nullptr, LV_ALIGN_CENTER, 0, 0);
157157

@@ -163,7 +163,7 @@ void Counter::Create() {
163163
lv_obj_set_event_cb(downBtn, downBtnEventHandler);
164164

165165
lv_obj_t* downLabel = lv_label_create(downBtn, nullptr);
166-
lv_obj_set_style_local_text_font(downLabel, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, &jetbrains_mono_42);
166+
lv_obj_set_style_local_text_font(downLabel, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, &noto_sans_42);
167167
lv_label_set_text_static(downLabel, "-");
168168
lv_obj_align(downLabel, nullptr, LV_ALIGN_CENTER, 0, 0);
169169

0 commit comments

Comments
 (0)