Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,7 @@ It integrates the following projects:
- RTOS: **[FreeRTOS](https://freertos.org)** under the MIT license
- UI: **[LittleVGL/LVGL](https://lvgl.io/)** under the MIT license
- BLE stack: **[NimBLE](https://github.com/apache/mynewt-nimble)** under the Apache 2.0 license
- Font: **[Jetbrains Mono](https://www.jetbrains.com/fr-fr/lp/mono/)** under the Apache 2.0 license
- Font: **[Noto Sans](https://fonts.google.com/noto/specimen/Noto+Sans)** under the Apache 2.0 license

## Credits

Expand Down
8 changes: 4 additions & 4 deletions src/displayapp/InfiniTimeTheme.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -218,10 +218,10 @@ static void basic_init() {
lv_theme_t* lv_pinetime_theme_init() {
theme.color_primary = LV_COLOR_WHITE;
theme.color_secondary = LV_COLOR_GRAY;
theme.font_small = &jetbrains_mono_bold_20;
theme.font_normal = &jetbrains_mono_bold_20;
theme.font_subtitle = &jetbrains_mono_bold_20;
theme.font_title = &jetbrains_mono_bold_20;
theme.font_small = &noto_sans_bold_20;
theme.font_normal = &noto_sans_bold_20;
theme.font_subtitle = &noto_sans_bold_20;
theme.font_title = &noto_sans_bold_20;
theme.flags = 0;

basic_init();
Expand Down
8 changes: 2 additions & 6 deletions src/displayapp/fonts/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,13 +1,9 @@
set(FONTS jetbrains_mono_42 jetbrains_mono_76 jetbrains_mono_bold_20
jetbrains_mono_extrabold_compressed lv_font_sys_48
set(FONTS noto_sans_42 noto_sans_76 noto_sans_bold_20
noto_sans_extrabold_compressed lv_font_sys_48
open_sans_light fontawesome_weathericons)
find_program(LV_FONT_CONV "lv_font_conv" NO_CACHE REQUIRED
HINTS "${CMAKE_SOURCE_DIR}/node_modules/.bin")
message(STATUS "Using ${LV_FONT_CONV} to generate font files")
configure_file(${CMAKE_CURRENT_LIST_DIR}/jetbrains_mono_bold_20.c_zero.patch
${CMAKE_CURRENT_BINARY_DIR}/jetbrains_mono_bold_20.c_zero.patch COPYONLY)
configure_file(${CMAKE_CURRENT_LIST_DIR}/jetbrains_mono_bold_20.c_M.patch
${CMAKE_CURRENT_BINARY_DIR}/jetbrains_mono_bold_20.c_M.patch COPYONLY)
if(CMAKE_VERSION VERSION_GREATER_EQUAL 3.12)
# FindPython3 module introduces with CMake 3.12
# https://cmake.org/cmake/help/latest/module/FindPython3.html
Expand Down
Binary file removed src/displayapp/fonts/JetBrainsMono-Bold.ttf
Binary file not shown.
Binary file removed src/displayapp/fonts/JetBrainsMono-ExtraBold.ttf
Binary file not shown.
Binary file removed src/displayapp/fonts/JetBrainsMono-Light.ttf
Binary file not shown.
Binary file removed src/displayapp/fonts/JetBrainsMono-Regular.ttf
Binary file not shown.
Binary file added src/displayapp/fonts/NotoSans-Bold.ttf
Binary file not shown.
Binary file added src/displayapp/fonts/NotoSans-ExtraBold.ttf
Binary file not shown.
Binary file added src/displayapp/fonts/NotoSans-Light.ttf
Binary file not shown.
Binary file added src/displayapp/fonts/NotoSans-Regular.ttf
Binary file not shown.
2 changes: 1 addition & 1 deletion src/displayapp/fonts/README.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Fonts

- [Jetbrains Mono](https://www.jetbrains.com/lp/mono/)
- [Noto sans](https://fonts.google.com/noto/specimen/Noto+Sans)
- [Font Awesome](https://fontawesome.com/v5/cheatsheet/free/solid)
- [Open Sans Light](https://fonts.google.com/specimen/Open+Sans)
- [Material Symbols](https://fonts.google.com/icons)
Expand Down
11 changes: 5 additions & 6 deletions src/displayapp/fonts/fonts.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"jetbrains_mono_bold_20": {
"sources": [
{
"file": "JetBrainsMono-Bold.ttf",
"file": "NotoSans-Bold.ttf",
"range": "0x20-0x7e, 0x410-0x44f, 0xB0"
},
{
Expand All @@ -11,13 +11,12 @@
}
],
"bpp": 1,
"size": 20,
"patches": ["jetbrains_mono_bold_20.c_zero.patch", "jetbrains_mono_bold_20.c_M.patch"]
"size": 20
},
"jetbrains_mono_42": {
"sources": [
{
"file": "JetBrainsMono-Regular.ttf",
"file": "NotoSans-Regular.ttf",
"range": "0x25, 0x2b, 0x2d, 0x2e, 0x30-0x3a, 0x43, 0x46, 0x4b-0x4d, 0x66, 0x69, 0x6b, 0x6d, 0x74, 0xb0"
}
],
Expand All @@ -27,7 +26,7 @@
"jetbrains_mono_76": {
"sources": [
{
"file": "JetBrainsMono-Light.ttf",
"file": "NotoSans-Light.ttf",
"range": "0x25, 0x2D, 0x2F, 0x30-0x3a, 0x43, 0x46, 0xb0"
}
],
Expand All @@ -37,7 +36,7 @@
"jetbrains_mono_extrabold_compressed": {
"sources": [
{
"file": "JetBrainsMono-ExtraBold.ttf",
"file": "NotoSans-ExtraBold.ttf",
"range": "0x30-0x3a"
}
],
Expand Down
8 changes: 0 additions & 8 deletions src/displayapp/fonts/jetbrains_mono_bold_20.c_M.patch

This file was deleted.

6 changes: 0 additions & 6 deletions src/displayapp/fonts/jetbrains_mono_bold_20.c_zero.patch

This file was deleted.

4 changes: 2 additions & 2 deletions src/displayapp/screens/Alarm.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ Alarm::Alarm(Controllers::AlarmController& alarmController,
hourCounter.EnableTwelveHourMode();

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

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

Expand Down
4 changes: 2 additions & 2 deletions src/displayapp/screens/Alarm.h
Original file line number Diff line number Diff line change
Expand Up @@ -62,8 +62,8 @@ namespace Pinetime {
void HideInfo();
void ToggleRecurrence();
void UpdateAlarmTime();
Widgets::Counter hourCounter = Widgets::Counter(0, 23, jetbrains_mono_76);
Widgets::Counter minuteCounter = Widgets::Counter(0, 59, jetbrains_mono_76);
Widgets::Counter hourCounter = Widgets::Counter(0, 23, noto_sans_76);
Widgets::Counter minuteCounter = Widgets::Counter(0, 59, noto_sans_76);
};
}

Expand Down
2 changes: 1 addition & 1 deletion src/displayapp/screens/BatteryInfo.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ BatteryInfo::BatteryInfo(const Pinetime::Controllers::Battery& batteryController
lv_obj_align(status, charging_bar, LV_ALIGN_OUT_BOTTOM_MID, 0, 20);

percent = lv_label_create(lv_scr_act(), nullptr);
lv_obj_set_style_local_text_font(percent, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, &jetbrains_mono_76);
lv_obj_set_style_local_text_font(percent, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, &noto_sans_76);
lv_label_set_text_fmt(percent, "%02i%%", batteryPercent);
lv_label_set_align(percent, LV_LABEL_ALIGN_LEFT);
lv_obj_align(percent, nullptr, LV_ALIGN_CENTER, 0, -60);
Expand Down
10 changes: 5 additions & 5 deletions src/displayapp/screens/Dice.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ Dice::Dice(Controllers::MotionController& motionController,
static_cast<uint32_t>(motionController.Z())};
gen.seed(sseq);

lv_obj_t* nCounterLabel = MakeLabel(&jetbrains_mono_bold_20,
lv_obj_t* nCounterLabel = MakeLabel(&noto_sans_bold_20,
LV_COLOR_WHITE,
LV_LABEL_LONG_EXPAND,
0,
Expand All @@ -60,7 +60,7 @@ Dice::Dice(Controllers::MotionController& motionController,
0,
0);

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

resultTotalLabel = MakeLabel(&jetbrains_mono_42,
resultTotalLabel = MakeLabel(&noto_sans_42,
resultColors[currentColorIndex],
LV_LABEL_LONG_BREAK,
120,
Expand All @@ -92,7 +92,7 @@ Dice::Dice(Controllers::MotionController& motionController,
LV_ALIGN_IN_TOP_RIGHT,
11,
38);
resultIndividualLabel = MakeLabel(&jetbrains_mono_bold_20,
resultIndividualLabel = MakeLabel(&noto_sans_bold_20,
resultColors[currentColorIndex],
LV_LABEL_LONG_BREAK,
90,
Expand All @@ -112,7 +112,7 @@ Dice::Dice(Controllers::MotionController& motionController,
lv_obj_set_size(btnRoll, 240, 50);
lv_obj_align(btnRoll, lv_scr_act(), LV_ALIGN_IN_BOTTOM_MID, 0, 0);

btnRollLabel = MakeLabel(&jetbrains_mono_bold_20,
btnRollLabel = MakeLabel(&noto_sans_bold_20,
LV_COLOR_WHITE,
LV_LABEL_LONG_EXPAND,
0,
Expand Down
4 changes: 2 additions & 2 deletions src/displayapp/screens/Dice.h
Original file line number Diff line number Diff line change
Expand Up @@ -35,8 +35,8 @@ namespace Pinetime {
uint8_t currentColorIndex;
void NextColor();

Widgets::Counter nCounter = Widgets::Counter(1, 9, jetbrains_mono_42);
Widgets::Counter dCounter = Widgets::Counter(2, 99, jetbrains_mono_42);
Widgets::Counter nCounter = Widgets::Counter(1, 9, noto_sans_42);
Widgets::Counter dCounter = Widgets::Counter(2, 99, noto_sans_42);

bool openingRoll = true;
uint8_t currentRollHysteresis = 0;
Expand Down
2 changes: 1 addition & 1 deletion src/displayapp/screens/HeartRate.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ HeartRate::HeartRate(Controllers::HeartRateController& heartRateController, Syst
bool isHrRunning = heartRateController.State() != Controllers::HeartRateController::States::Stopped;
label_hr = lv_label_create(lv_scr_act(), nullptr);

lv_obj_set_style_local_text_font(label_hr, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, &jetbrains_mono_76);
lv_obj_set_style_local_text_font(label_hr, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, &noto_sans_76);

if (isHrRunning) {
lv_obj_set_style_local_text_color(label_hr, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, Colors::highlight);
Expand Down
2 changes: 1 addition & 1 deletion src/displayapp/screens/List.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ List::List(uint8_t screenID,

lv_obj_t* text = lv_label_create(itemApps[i], nullptr);
lv_label_set_text_fmt(text, "%s", applications[i].name);
lv_obj_align(text, icon, LV_ALIGN_OUT_RIGHT_MID, 0, 0);
lv_obj_align(text, icon, LV_ALIGN_OUT_RIGHT_MID, -8, 0);
}
}
}
Expand Down
4 changes: 2 additions & 2 deletions src/displayapp/screens/Metronome.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -35,8 +35,8 @@ Metronome::Metronome(Controllers::MotorController& motorController, System::Syst
lv_arc_set_adjustable(bpmArc, true);
lv_obj_align(bpmArc, lv_scr_act(), LV_ALIGN_IN_TOP_MID, 0, 0);

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

bpmTap = lv_btn_create(lv_scr_act(), nullptr);
bpmTap->user_data = this;
Expand Down
2 changes: 1 addition & 1 deletion src/displayapp/screens/Navigation.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -213,7 +213,7 @@ Navigation::Navigation(Pinetime::Controllers::NavigationService& nav) : navServi
txtManDist = lv_label_create(lv_scr_act(), nullptr);
lv_label_set_long_mode(txtManDist, LV_LABEL_LONG_BREAK);
lv_obj_set_style_local_text_color(txtManDist, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, LV_COLOR_GREEN);
lv_obj_set_style_local_text_font(txtManDist, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, &jetbrains_mono_42);
lv_obj_set_style_local_text_font(txtManDist, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, &noto_sans_42);
lv_obj_set_width(txtManDist, LV_HOR_RES);
lv_label_set_text_static(txtManDist, "--M");
lv_label_set_align(txtManDist, LV_LABEL_ALIGN_CENTER);
Expand Down
4 changes: 2 additions & 2 deletions src/displayapp/screens/Notifications.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@
#include "displayapp/InfiniTimeTheme.h"

using namespace Pinetime::Applications::Screens;
extern lv_font_t jetbrains_mono_extrabold_compressed;
extern lv_font_t jetbrains_mono_bold_20;
extern lv_font_t noto_sans_extrabold_compressed;
extern lv_font_t noto_sans_bold_20;

Notifications::Notifications(DisplayApp* app,
Pinetime::Controllers::NotificationManager& notificationManager,
Expand Down
2 changes: 1 addition & 1 deletion src/displayapp/screens/Paddle.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ Paddle::Paddle(Pinetime::Components::LittleVgl& lvgl) : lvgl {lvgl} {
lv_obj_set_style_local_border_width(background, LV_BTN_PART_MAIN, LV_STATE_DEFAULT, 1);

points = lv_label_create(lv_scr_act(), nullptr);
lv_obj_set_style_local_text_font(points, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, &jetbrains_mono_42);
lv_obj_set_style_local_text_font(points, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, &noto_sans_42);
lv_label_set_text_static(points, "0000");
lv_obj_align(points, lv_scr_act(), LV_ALIGN_IN_TOP_MID, 0, 10);

Expand Down
2 changes: 1 addition & 1 deletion src/displayapp/screens/PassKey.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ using namespace Pinetime::Applications::Screens;
PassKey::PassKey(uint32_t key) {
passkeyLabel = lv_label_create(lv_scr_act(), nullptr);
lv_obj_set_style_local_text_color(passkeyLabel, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, LV_COLOR_YELLOW);
lv_obj_set_style_local_text_font(passkeyLabel, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, &jetbrains_mono_42);
lv_obj_set_style_local_text_font(passkeyLabel, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, &noto_sans_42);
lv_label_set_text_fmt(passkeyLabel, "%06u", key);
lv_obj_align(passkeyLabel, nullptr, LV_ALIGN_CENTER, 0, -20);
}
Expand Down
2 changes: 1 addition & 1 deletion src/displayapp/screens/Steps.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ Steps::Steps(Controllers::MotionController& motionController, Controllers::Setti

lSteps = lv_label_create(lv_scr_act(), nullptr);
lv_obj_set_style_local_text_color(lSteps, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, LV_COLOR_LIME);
lv_obj_set_style_local_text_font(lSteps, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, &jetbrains_mono_42);
lv_obj_set_style_local_text_font(lSteps, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, &noto_sans_42);
lv_label_set_text_fmt(lSteps, "%li", stepsCount);
lv_obj_align(lSteps, nullptr, LV_ALIGN_CENTER, 0, -40);

Expand Down
6 changes: 3 additions & 3 deletions src/displayapp/screens/StopWatch.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ StopWatch::StopWatch(System::SystemTask& systemTask) : wakeLock(systemTask) {
lv_obj_align(msecTime, lapText, LV_ALIGN_OUT_TOP_MID, 0, 0);

time = lv_label_create(lv_scr_act(), nullptr);
lv_obj_set_style_local_text_font(time, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, &jetbrains_mono_76);
lv_obj_set_style_local_text_font(time, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, &noto_sans_76);
lv_label_set_text_static(time, "00:00");
lv_obj_set_style_local_text_color(time, LV_LABEL_PART_MAIN, LV_STATE_DISABLED, Colors::lightGray);
lv_obj_align(time, msecTime, LV_ALIGN_OUT_TOP_MID, 0, 0);
Expand Down Expand Up @@ -111,7 +111,7 @@ void StopWatch::SetInterfaceStopped() {
lv_label_set_text_static(msecTime, "00");

if (isHoursLabelUpdated) {
lv_obj_set_style_local_text_font(time, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, &jetbrains_mono_76);
lv_obj_set_style_local_text_font(time, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, &noto_sans_76);
lv_obj_realign(time);
isHoursLabelUpdated = false;
}
Expand Down Expand Up @@ -157,7 +157,7 @@ void StopWatch::Refresh() {
} else {
lv_label_set_text_fmt(time, "%02d:%02d:%02d", currentTimeSeparated.hours, currentTimeSeparated.mins, currentTimeSeparated.secs);
if (!isHoursLabelUpdated) {
lv_obj_set_style_local_text_font(time, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, &jetbrains_mono_42);
lv_obj_set_style_local_text_font(time, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, &noto_sans_42);
lv_obj_realign(time);
isHoursLabelUpdated = true;
}
Expand Down
2 changes: 1 addition & 1 deletion src/displayapp/screens/Timer.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ static void btnEventHandler(lv_obj_t* obj, lv_event_t event) {
Timer::Timer(Controllers::Timer& timerController) : timer {timerController} {

lv_obj_t* colonLabel = lv_label_create(lv_scr_act(), nullptr);
lv_obj_set_style_local_text_font(colonLabel, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, &jetbrains_mono_76);
lv_obj_set_style_local_text_font(colonLabel, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, &noto_sans_76);
lv_obj_set_style_local_text_color(colonLabel, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, LV_COLOR_WHITE);
lv_label_set_text_static(colonLabel, ":");
lv_obj_align(colonLabel, lv_scr_act(), LV_ALIGN_CENTER, 0, -29);
Expand Down
4 changes: 2 additions & 2 deletions src/displayapp/screens/Timer.h
Original file line number Diff line number Diff line change
Expand Up @@ -38,8 +38,8 @@ namespace Pinetime::Applications {
lv_objmask_mask_t* highlightMask;

lv_task_t* taskRefresh;
Widgets::Counter minuteCounter = Widgets::Counter(0, 59, jetbrains_mono_76);
Widgets::Counter secondCounter = Widgets::Counter(0, 59, jetbrains_mono_76);
Widgets::Counter minuteCounter = Widgets::Counter(0, 59, noto_sans_76);
Widgets::Counter secondCounter = Widgets::Counter(0, 59, noto_sans_76);

bool buttonPressing = false;
lv_coord_t maskPosition = 0;
Expand Down
2 changes: 1 addition & 1 deletion src/displayapp/screens/WatchFaceDigital.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ WatchFaceDigital::WatchFaceDigital(Controllers::DateTime& dateTimeController,
lv_obj_set_style_local_text_color(label_date, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, lv_color_hex(0x999999));

label_time = lv_label_create(lv_scr_act(), nullptr);
lv_obj_set_style_local_text_font(label_time, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, &jetbrains_mono_extrabold_compressed);
lv_obj_set_style_local_text_font(label_time, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, &noto_sans_extrabold_compressed);

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

Expand Down
2 changes: 1 addition & 1 deletion src/displayapp/screens/Weather.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ Weather::Weather(Controllers::Settings& settingsController, Controllers::SimpleW

temperature = lv_label_create(lv_scr_act(), nullptr);
lv_obj_set_style_local_text_color(temperature, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, LV_COLOR_WHITE);
lv_obj_set_style_local_text_font(temperature, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, &jetbrains_mono_42);
lv_obj_set_style_local_text_font(temperature, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, &noto_sans_42);
lv_label_set_text(temperature, "---");
lv_obj_align(temperature, nullptr, LV_ALIGN_CENTER, 0, -30);
lv_obj_set_auto_realign(temperature, true);
Expand Down
6 changes: 3 additions & 3 deletions src/displayapp/screens/settings/SettingSetDate.h
Original file line number Diff line number Diff line change
Expand Up @@ -27,9 +27,9 @@ namespace Pinetime {
lv_obj_t* btnSetTime;
lv_obj_t* lblSetTime;

Widgets::Counter dayCounter = Widgets::Counter(1, 31, jetbrains_mono_bold_20);
Widgets::Counter monthCounter = Widgets::Counter(1, 12, jetbrains_mono_bold_20);
Widgets::Counter yearCounter = Widgets::Counter(1970, 9999, jetbrains_mono_bold_20);
Widgets::Counter dayCounter = Widgets::Counter(1, 31, noto_sans_bold_20);
Widgets::Counter monthCounter = Widgets::Counter(1, 12, noto_sans_bold_20);
Widgets::Counter yearCounter = Widgets::Counter(1970, 9999, noto_sans_bold_20);
};
}
}
Expand Down
4 changes: 2 additions & 2 deletions src/displayapp/screens/settings/SettingSetTime.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ SettingSetTime::SettingSetTime(Pinetime::Controllers::DateTime& dateTimeControll
lv_obj_align(icon, title, LV_ALIGN_OUT_LEFT_MID, -10, 0);

lv_obj_t* staticLabel = lv_label_create(lv_scr_act(), nullptr);
lv_obj_set_style_local_text_font(staticLabel, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, &jetbrains_mono_42);
lv_obj_set_style_local_text_font(staticLabel, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, &noto_sans_42);
lv_label_set_text_static(staticLabel, "00:00:00");
lv_obj_align(staticLabel, lv_scr_act(), LV_ALIGN_CENTER, 0, POS_Y_TEXT);

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

lblampm = lv_label_create(lv_scr_act(), nullptr);
lv_obj_set_style_local_text_font(lblampm, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, &jetbrains_mono_bold_20);
lv_obj_set_style_local_text_font(lblampm, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, &noto_sans_bold_20);
lv_label_set_text_static(lblampm, " ");
lv_obj_align(lblampm, lv_scr_act(), LV_ALIGN_CENTER, 75, -50);

Expand Down
4 changes: 2 additions & 2 deletions src/displayapp/screens/settings/SettingSetTime.h
Original file line number Diff line number Diff line change
Expand Up @@ -30,8 +30,8 @@ namespace Pinetime {
lv_obj_t* lblampm;
lv_obj_t* btnSetTime;
lv_obj_t* lblSetTime;
Widgets::Counter hourCounter = Widgets::Counter(0, 23, jetbrains_mono_42);
Widgets::Counter minuteCounter = Widgets::Counter(0, 59, jetbrains_mono_42);
Widgets::Counter hourCounter = Widgets::Counter(0, 23, noto_sans_42);
Widgets::Counter minuteCounter = Widgets::Counter(0, 59, noto_sans_42);
};
}
}
Expand Down
Loading
Loading