Skip to content

Commit cd4a3e1

Browse files
joaquimorgjoaquimorg
committed
New Steps app
Settings to set the steps goal More detail in Motion app New 42px Font
1 parent bbc24e8 commit cd4a3e1

15 files changed

Lines changed: 542 additions & 18 deletions

File tree

‎src/CMakeLists.txt‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -406,6 +406,7 @@ list(APPEND SOURCE_FILES
406406
displayapp/screens/FlashLight.cpp
407407
displayapp/screens/List.cpp
408408
displayapp/screens/BatteryInfo.cpp
409+
displayapp/screens/Steps.cpp
409410

410411
## Settings
411412
displayapp/screens/settings/QuickSettings.cpp
@@ -414,6 +415,7 @@ list(APPEND SOURCE_FILES
414415
displayapp/screens/settings/SettingTimeFormat.cpp
415416
displayapp/screens/settings/SettingWakeUp.cpp
416417
displayapp/screens/settings/SettingDisplay.cpp
418+
displayapp/screens/settings/SettingSteps.cpp
417419

418420
## Watch faces
419421
displayapp/icons/bg_clock.c
@@ -466,6 +468,7 @@ list(APPEND SOURCE_FILES
466468
displayapp/fonts/jetbrains_mono_extrabold_compressed.c
467469
displayapp/fonts/jetbrains_mono_bold_20.c
468470
displayapp/fonts/jetbrains_mono_76.c
471+
displayapp/fonts/jetbrains_mono_42.c
469472
displayapp/fonts/lv_font_sys_48.c
470473
displayapp/lv_pinetime_theme.c
471474

‎src/components/motion/MotionController.h‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,9 @@ namespace Pinetime {
88
public:
99
void Update(int16_t x, int16_t y, int16_t z, uint32_t nbSteps);
1010

11-
uint16_t X() const { return x; }
12-
uint16_t Y() const { return y; }
13-
uint16_t Z() const { return z; }
11+
int16_t X() const { return x; }
12+
int16_t Y() const { return y; }
13+
int16_t Z() const { return z; }
1414
uint32_t NbSteps() const { return nbSteps; }
1515
bool ShouldWakeUp(bool isSleeping);
1616

‎src/components/settings/Settings.h‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -60,6 +60,12 @@ namespace Pinetime {
6060
};
6161
Controllers::BrightnessController::Levels GetBrightness() const { return settings.brightLevel; };
6262

63+
void SetStepsGoal( uint32_t goal ) {
64+
if ( goal != settings.stepsGoal ) settingsChanged = true;
65+
settings.stepsGoal = goal;
66+
};
67+
uint32_t GetStepsGoal() const { return settings.stepsGoal; };
68+
6369
private:
6470

6571
Pinetime::Drivers::SpiNorFlash& spiNorFlash;

‎src/displayapp/Apps.h‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@ namespace Pinetime {
44
namespace Applications {
55
enum class Apps {
66
None, Launcher, Clock, SysInfo, FirmwareUpdate, FirmwareValidation, NotificationsPreview, Notifications, FlashLight, BatteryInfo,
7-
Music, Paint, Paddle, Twos, HeartRate, Navigation, StopWatch, Motion,
8-
QuickSettings, Settings, SettingWatchFace, SettingTimeFormat, SettingDisplay, SettingWakeUp
7+
Music, Paint, Paddle, Twos, HeartRate, Navigation, StopWatch, Motion, Steps,
8+
QuickSettings, Settings, SettingWatchFace, SettingTimeFormat, SettingDisplay, SettingWakeUp, SettingSteps
99
};
1010
}
1111
}

‎src/displayapp/DisplayApp.cpp‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@
2424
#include "displayapp/screens/Twos.h"
2525
#include "displayapp/screens/FlashLight.h"
2626
#include "displayapp/screens/BatteryInfo.h"
27+
#include "displayapp/screens/Steps.h"
2728

2829
#include "drivers/Cst816s.h"
2930
#include "drivers/St7789.h"
@@ -36,6 +37,7 @@
3637
#include "displayapp/screens/settings/SettingTimeFormat.h"
3738
#include "displayapp/screens/settings/SettingWakeUp.h"
3839
#include "displayapp/screens/settings/SettingDisplay.h"
40+
#include "displayapp/screens/settings/SettingSteps.h"
3941

4042
using namespace Pinetime::Applications;
4143
using namespace Pinetime::Applications::Display;
@@ -270,6 +272,10 @@ void DisplayApp::LoadApp(Apps app, DisplayApp::FullRefreshDirections direction)
270272
currentScreen = std::make_unique<Screens::SettingDisplay>(this, settingsController);
271273
returnApp(Apps::Settings, FullRefreshDirections::Down, TouchEvents::SwipeDown);
272274
break;
275+
case Apps::SettingSteps:
276+
currentScreen = std::make_unique<Screens::SettingSteps>(this, settingsController);
277+
returnApp(Apps::Settings, FullRefreshDirections::Down, TouchEvents::SwipeDown);
278+
break;
273279
case Apps::BatteryInfo:
274280
currentScreen = std::make_unique<Screens::BatteryInfo>(this, batteryController);
275281
returnApp(Apps::Settings, FullRefreshDirections::Down, TouchEvents::SwipeDown);
@@ -308,6 +314,9 @@ void DisplayApp::LoadApp(Apps app, DisplayApp::FullRefreshDirections direction)
308314
case Apps::Motion:
309315
currentScreen = std::make_unique<Screens::Motion>(this, motionController);
310316
break;
317+
case Apps::Steps:
318+
currentScreen = std::make_unique<Screens::Steps>(this, motionController, settingsController);
319+
break;
311320
}
312321
currentApp = app;
313322
}

‎src/displayapp/fonts/jetbrains_mono_42.c‎

Lines changed: 258 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,258 @@
1+
/*******************************************************************************
2+
* Size: 42 px
3+
* Bpp: 1
4+
* Opts:
5+
******************************************************************************/
6+
7+
#ifdef LV_LVGL_H_INCLUDE_SIMPLE
8+
#include "lvgl.h"
9+
#else
10+
#include "lvgl/lvgl.h"
11+
#endif
12+
13+
#ifndef JETBRAINS_MONO_42
14+
#define JETBRAINS_MONO_42 1
15+
#endif
16+
17+
#if JETBRAINS_MONO_42
18+
19+
/*-----------------
20+
* BITMAPS
21+
*----------------*/
22+
23+
/*Store the image of the glyphs*/
24+
static LV_ATTRIBUTE_LARGE_CONST const uint8_t glyph_bitmap[] = {
25+
/* U+0025 "%" */
26+
0x1f, 0x80, 0x7, 0x3f, 0xc0, 0xe, 0x7f, 0xe0,
27+
0x1c, 0xf0, 0xf0, 0x1c, 0xe0, 0x70, 0x38, 0xe0,
28+
0x70, 0x70, 0xe0, 0x70, 0x70, 0xe0, 0x70, 0xe0,
29+
0xe0, 0x71, 0xc0, 0xe0, 0x71, 0xc0, 0xf0, 0xf3,
30+
0x80, 0x7f, 0xe7, 0x0, 0x3f, 0xc7, 0x0, 0x1f,
31+
0x8e, 0x0, 0x0, 0x1c, 0x0, 0x0, 0x3c, 0x0,
32+
0x0, 0x38, 0x0, 0x0, 0x71, 0xf8, 0x0, 0xe3,
33+
0xfc, 0x0, 0xe7, 0xfe, 0x1, 0xcf, 0xf, 0x3,
34+
0x8e, 0x7, 0x3, 0x8e, 0x7, 0x7, 0xe, 0x7,
35+
0xe, 0xe, 0x7, 0xe, 0xe, 0x7, 0x1c, 0xe,
36+
0x7, 0x38, 0xf, 0xf, 0x38, 0x7, 0xfe, 0x70,
37+
0x3, 0xfc, 0xe0, 0x1, 0xf8,
38+
39+
/* U+0030 "0" */
40+
0x3, 0xf8, 0x1, 0xff, 0xc0, 0xff, 0xfe, 0x1f,
41+
0x7, 0xc7, 0xc0, 0x7c, 0xf0, 0x7, 0xbc, 0x0,
42+
0x7f, 0x80, 0xf, 0xf0, 0x1, 0xfe, 0x0, 0x3f,
43+
0xc0, 0x7, 0xf8, 0x0, 0xff, 0xe, 0x1f, 0xe3,
44+
0xe3, 0xfc, 0x7c, 0x7f, 0x8f, 0x8f, 0xf0, 0xe1,
45+
0xfe, 0x0, 0x3f, 0xc0, 0x7, 0xf8, 0x0, 0xff,
46+
0x0, 0x1f, 0xe0, 0x3, 0xfc, 0x0, 0x7f, 0x80,
47+
0xf, 0xf0, 0x1, 0xef, 0x0, 0x79, 0xf0, 0x1f,
48+
0x1f, 0x7, 0xc3, 0xff, 0xf8, 0x1f, 0xfc, 0x0,
49+
0xfe, 0x0,
50+
51+
/* U+0031 "1" */
52+
0x3, 0xf0, 0x0, 0xfe, 0x0, 0x3f, 0xc0, 0x1f,
53+
0xf8, 0x7, 0xcf, 0x1, 0xf1, 0xe0, 0x3c, 0x3c,
54+
0x7, 0x7, 0x80, 0x80, 0xf0, 0x0, 0x1e, 0x0,
55+
0x3, 0xc0, 0x0, 0x78, 0x0, 0xf, 0x0, 0x1,
56+
0xe0, 0x0, 0x3c, 0x0, 0x7, 0x80, 0x0, 0xf0,
57+
0x0, 0x1e, 0x0, 0x3, 0xc0, 0x0, 0x78, 0x0,
58+
0xf, 0x0, 0x1, 0xe0, 0x0, 0x3c, 0x0, 0x7,
59+
0x80, 0x0, 0xf0, 0x0, 0x1e, 0x0, 0x3, 0xc0,
60+
0x0, 0x78, 0xf, 0xff, 0xff, 0xff, 0xff, 0xff,
61+
0xff, 0xf8,
62+
63+
/* U+0032 "2" */
64+
0x3, 0xf8, 0x1, 0xff, 0xc0, 0x7f, 0xfe, 0x1f,
65+
0x7, 0xc7, 0xc0, 0x3c, 0xf0, 0x7, 0xbc, 0x0,
66+
0x7f, 0x80, 0xf, 0xf0, 0x1, 0xe0, 0x0, 0x3c,
67+
0x0, 0x7, 0x80, 0x1, 0xf0, 0x0, 0x3c, 0x0,
68+
0xf, 0x80, 0x1, 0xe0, 0x0, 0x7c, 0x0, 0x1f,
69+
0x0, 0x7, 0xc0, 0x1, 0xf0, 0x0, 0x7e, 0x0,
70+
0xf, 0x80, 0x3, 0xe0, 0x0, 0xf8, 0x0, 0x3e,
71+
0x0, 0xf, 0x80, 0x3, 0xe0, 0x0, 0xf8, 0x0,
72+
0x3e, 0x0, 0x7, 0xff, 0xfe, 0xff, 0xff, 0xdf,
73+
0xff, 0xf8,
74+
75+
/* U+0033 "3" */
76+
0x7f, 0xff, 0x8f, 0xff, 0xf1, 0xff, 0xfe, 0x0,
77+
0x3, 0xc0, 0x0, 0xf0, 0x0, 0x3c, 0x0, 0xf,
78+
0x0, 0x3, 0xc0, 0x0, 0xf0, 0x0, 0x3e, 0x0,
79+
0x7, 0x80, 0x1, 0xfe, 0x0, 0x3f, 0xf0, 0x7,
80+
0xff, 0x0, 0x3, 0xf0, 0x0, 0x1e, 0x0, 0x3,
81+
0xc0, 0x0, 0x3c, 0x0, 0x7, 0x80, 0x0, 0xf0,
82+
0x0, 0x1e, 0x0, 0x3, 0xfc, 0x0, 0x7f, 0x80,
83+
0xf, 0xf0, 0x1, 0xef, 0x0, 0x79, 0xf0, 0x1f,
84+
0x1f, 0x7, 0xc3, 0xff, 0xf0, 0x1f, 0xfc, 0x0,
85+
0xfe, 0x0,
86+
87+
/* U+0034 "4" */
88+
0x0, 0x1e, 0x0, 0xf, 0x80, 0x3, 0xc0, 0x1,
89+
0xe0, 0x0, 0x78, 0x0, 0x3c, 0x0, 0x1f, 0x0,
90+
0x7, 0x80, 0x3, 0xc0, 0x1, 0xf0, 0x0, 0x78,
91+
0x0, 0x3e, 0x0, 0xf, 0x0, 0x7, 0x80, 0xf3,
92+
0xe0, 0x3c, 0xf0, 0xf, 0x7c, 0x3, 0xde, 0x0,
93+
0xff, 0x0, 0x3f, 0xc0, 0xf, 0xf0, 0x3, 0xff,
94+
0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x0, 0x3,
95+
0xc0, 0x0, 0xf0, 0x0, 0x3c, 0x0, 0xf, 0x0,
96+
0x3, 0xc0, 0x0, 0xf0, 0x0, 0x3c,
97+
98+
/* U+0035 "5" */
99+
0x7f, 0xff, 0x9f, 0xff, 0xe7, 0xff, 0xf9, 0xe0,
100+
0x0, 0x78, 0x0, 0x1e, 0x0, 0x7, 0x80, 0x1,
101+
0xe0, 0x0, 0x78, 0x0, 0x1e, 0x0, 0x7, 0x8f,
102+
0x81, 0xef, 0xf8, 0x7f, 0xff, 0x1f, 0x87, 0xe7,
103+
0xc0, 0x79, 0xe0, 0x1f, 0x0, 0x3, 0xc0, 0x0,
104+
0xf0, 0x0, 0x3c, 0x0, 0xf, 0x0, 0x3, 0xc0,
105+
0x0, 0xf0, 0x0, 0x3c, 0x0, 0xf, 0xf0, 0x3,
106+
0xde, 0x1, 0xe7, 0x80, 0x78, 0xf8, 0x7e, 0x3f,
107+
0xff, 0x3, 0xff, 0x80, 0x3f, 0x0,
108+
109+
/* U+0036 "6" */
110+
0x0, 0x3c, 0x0, 0x7, 0x80, 0x0, 0x78, 0x0,
111+
0xf, 0x0, 0x1, 0xe0, 0x0, 0x1e, 0x0, 0x3,
112+
0xc0, 0x0, 0x3c, 0x0, 0x7, 0x80, 0x0, 0x70,
113+
0x0, 0xf, 0x0, 0x1, 0xe7, 0xc0, 0x1f, 0xff,
114+
0x3, 0xff, 0xfc, 0x3f, 0xf, 0xc7, 0xc0, 0x3e,
115+
0x78, 0x1, 0xe7, 0x80, 0x1f, 0xf0, 0x0, 0xff,
116+
0x0, 0xf, 0xf0, 0x0, 0xff, 0x0, 0xf, 0xf0,
117+
0x0, 0xff, 0x0, 0xf, 0xf8, 0x1, 0xe7, 0x80,
118+
0x1e, 0x7c, 0x3, 0xe3, 0xf0, 0xfc, 0x1f, 0xff,
119+
0x80, 0xff, 0xf0, 0x1, 0xf8, 0x0,
120+
121+
/* U+0037 "7" */
122+
0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
123+
0x0, 0x1e, 0xf0, 0x1, 0xef, 0x0, 0x1e, 0xf0,
124+
0x3, 0xcf, 0x0, 0x3c, 0x0, 0x3, 0x80, 0x0,
125+
0x78, 0x0, 0x7, 0x80, 0x0, 0xf0, 0x0, 0xf,
126+
0x0, 0x0, 0xf0, 0x0, 0x1e, 0x0, 0x1, 0xe0,
127+
0x0, 0x3c, 0x0, 0x3, 0xc0, 0x0, 0x3c, 0x0,
128+
0x7, 0x80, 0x0, 0x78, 0x0, 0x7, 0x80, 0x0,
129+
0xf0, 0x0, 0xf, 0x0, 0x1, 0xe0, 0x0, 0x1e,
130+
0x0, 0x1, 0xe0, 0x0, 0x3c, 0x0, 0x3, 0xc0,
131+
0x0, 0x7c, 0x0, 0x7, 0x80, 0x0,
132+
133+
/* U+0038 "8" */
134+
0x1, 0xf8, 0x0, 0xff, 0xf0, 0x1f, 0xff, 0x83,
135+
0xf0, 0xfc, 0x3c, 0x3, 0xc7, 0xc0, 0x3e, 0x78,
136+
0x1, 0xe7, 0x80, 0x1e, 0x78, 0x1, 0xe7, 0x80,
137+
0x1e, 0x3c, 0x3, 0xc3, 0xe0, 0x7c, 0x1f, 0xf,
138+
0x80, 0xff, 0xf0, 0x3, 0xfc, 0x0, 0x7f, 0xe0,
139+
0xf, 0xff, 0x3, 0xe0, 0x7c, 0x3c, 0x3, 0xc7,
140+
0x80, 0x1e, 0xf0, 0x0, 0xff, 0x0, 0xf, 0xf0,
141+
0x0, 0xff, 0x0, 0xf, 0xf0, 0x0, 0xff, 0x80,
142+
0x1f, 0x7c, 0x3, 0xe7, 0xe0, 0x7e, 0x3f, 0xff,
143+
0xc0, 0xff, 0xf0, 0x3, 0xfc, 0x0,
144+
145+
/* U+0039 "9" */
146+
0x3, 0xf8, 0x0, 0xff, 0xf0, 0x1f, 0xff, 0x83,
147+
0xe0, 0xfc, 0x7c, 0x3, 0xe7, 0x80, 0x1e, 0xf8,
148+
0x1, 0xff, 0x0, 0xf, 0xf0, 0x0, 0xff, 0x0,
149+
0xf, 0xf0, 0x0, 0xff, 0x0, 0xf, 0xf8, 0x1,
150+
0xf7, 0x80, 0x1e, 0x7c, 0x3, 0xe3, 0xe0, 0x7e,
151+
0x3f, 0xff, 0xc1, 0xff, 0xfc, 0x7, 0xe7, 0x80,
152+
0x0, 0xf8, 0x0, 0xf, 0x0, 0x1, 0xe0, 0x0,
153+
0x1e, 0x0, 0x3, 0xc0, 0x0, 0x3c, 0x0, 0x7,
154+
0x80, 0x0, 0xf8, 0x0, 0xf, 0x0, 0x1, 0xe0,
155+
0x0, 0x1e, 0x0, 0x3, 0xc0, 0x0,
156+
157+
/* U+003A ":" */
158+
0x7d, 0xff, 0xff, 0xff, 0xef, 0x80, 0x0, 0x0,
159+
0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x1,
160+
0xf7, 0xff, 0xff, 0xff, 0xbe
161+
};
162+
163+
164+
/*---------------------
165+
* GLYPH DESCRIPTION
166+
*--------------------*/
167+
168+
static const lv_font_fmt_txt_glyph_dsc_t glyph_dsc[] = {
169+
{.bitmap_index = 0, .adv_w = 0, .box_w = 0, .box_h = 0, .ofs_x = 0, .ofs_y = 0} /* id = 0 reserved */,
170+
{.bitmap_index = 0, .adv_w = 403, .box_w = 24, .box_h = 31, .ofs_x = 1, .ofs_y = 0},
171+
{.bitmap_index = 93, .adv_w = 403, .box_w = 19, .box_h = 31, .ofs_x = 3, .ofs_y = 0},
172+
{.bitmap_index = 167, .adv_w = 403, .box_w = 19, .box_h = 31, .ofs_x = 4, .ofs_y = 0},
173+
{.bitmap_index = 241, .adv_w = 403, .box_w = 19, .box_h = 31, .ofs_x = 3, .ofs_y = 0},
174+
{.bitmap_index = 315, .adv_w = 403, .box_w = 19, .box_h = 31, .ofs_x = 3, .ofs_y = 0},
175+
{.bitmap_index = 389, .adv_w = 403, .box_w = 18, .box_h = 31, .ofs_x = 3, .ofs_y = 0},
176+
{.bitmap_index = 459, .adv_w = 403, .box_w = 18, .box_h = 31, .ofs_x = 3, .ofs_y = 0},
177+
{.bitmap_index = 529, .adv_w = 403, .box_w = 20, .box_h = 31, .ofs_x = 3, .ofs_y = 0},
178+
{.bitmap_index = 607, .adv_w = 403, .box_w = 20, .box_h = 31, .ofs_x = 3, .ofs_y = 0},
179+
{.bitmap_index = 685, .adv_w = 403, .box_w = 20, .box_h = 31, .ofs_x = 3, .ofs_y = 0},
180+
{.bitmap_index = 763, .adv_w = 403, .box_w = 20, .box_h = 31, .ofs_x = 3, .ofs_y = 0},
181+
{.bitmap_index = 841, .adv_w = 403, .box_w = 7, .box_h = 24, .ofs_x = 9, .ofs_y = 0}
182+
};
183+
184+
/*---------------------
185+
* CHARACTER MAPPING
186+
*--------------------*/
187+
188+
189+
190+
/*Collect the unicode lists and glyph_id offsets*/
191+
static const lv_font_fmt_txt_cmap_t cmaps[] =
192+
{
193+
{
194+
.range_start = 37, .range_length = 1, .glyph_id_start = 1,
195+
.unicode_list = NULL, .glyph_id_ofs_list = NULL, .list_length = 0, .type = LV_FONT_FMT_TXT_CMAP_FORMAT0_TINY
196+
},
197+
{
198+
.range_start = 48, .range_length = 11, .glyph_id_start = 2,
199+
.unicode_list = NULL, .glyph_id_ofs_list = NULL, .list_length = 0, .type = LV_FONT_FMT_TXT_CMAP_FORMAT0_TINY
200+
}
201+
};
202+
203+
204+
205+
/*--------------------
206+
* ALL CUSTOM DATA
207+
*--------------------*/
208+
209+
#if LV_VERSION_CHECK(8, 0, 0)
210+
/*Store all the custom data of the font*/
211+
static lv_font_fmt_txt_glyph_cache_t cache;
212+
static const lv_font_fmt_txt_dsc_t font_dsc = {
213+
#else
214+
static lv_font_fmt_txt_dsc_t font_dsc = {
215+
#endif
216+
.glyph_bitmap = glyph_bitmap,
217+
.glyph_dsc = glyph_dsc,
218+
.cmaps = cmaps,
219+
.kern_dsc = NULL,
220+
.kern_scale = 0,
221+
.cmap_num = 2,
222+
.bpp = 1,
223+
.kern_classes = 0,
224+
.bitmap_format = 0,
225+
#if LV_VERSION_CHECK(8, 0, 0)
226+
.cache = &cache
227+
#endif
228+
};
229+
230+
231+
/*-----------------
232+
* PUBLIC FONT
233+
*----------------*/
234+
235+
/*Initialize a public general font descriptor*/
236+
#if LV_VERSION_CHECK(8, 0, 0)
237+
const lv_font_t jetbrains_mono_42 = {
238+
#else
239+
lv_font_t jetbrains_mono_42 = {
240+
#endif
241+
.get_glyph_dsc = lv_font_get_glyph_dsc_fmt_txt, /*Function pointer to get glyph's data*/
242+
.get_glyph_bitmap = lv_font_get_bitmap_fmt_txt, /*Function pointer to get glyph's bitmap*/
243+
.line_height = 31, /*The maximum line height required by the font*/
244+
.base_line = 0, /*Baseline measured from the bottom of the line*/
245+
#if !(LVGL_VERSION_MAJOR == 6 && LVGL_VERSION_MINOR == 0)
246+
.subpx = LV_FONT_SUBPX_NONE,
247+
#endif
248+
#if LV_VERSION_CHECK(7, 4, 0)
249+
.underline_position = -7,
250+
.underline_thickness = 2,
251+
#endif
252+
.dsc = &font_dsc /*The custom font data. Will be accessed by `get_glyph_bitmap/dsc` */
253+
};
254+
255+
256+
257+
#endif /*#if JETBRAINS_MONO_42*/
258+

‎src/displayapp/screens/ApplicationList.cpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ std::unique_ptr<Screen> ApplicationList::CreateScreen1() {
4747
{Symbols::stopWatch, Apps::StopWatch},
4848
{Symbols::music, Apps::Music},
4949
{Symbols::map, Apps::Navigation},
50-
{Symbols::shoe, Apps::Motion},
50+
{Symbols::shoe, Apps::Steps},
5151
{Symbols::heartBeat, Apps::HeartRate},
5252
{"", Apps::None},
5353
}
@@ -62,7 +62,7 @@ std::unique_ptr<Screen> ApplicationList::CreateScreen2() {
6262
{Symbols::paintbrush, Apps::Paint},
6363
{Symbols::paddle, Apps::Paddle},
6464
{"2", Apps::Twos},
65-
{"", Apps::None},
65+
{"M", Apps::Motion},
6666
{"", Apps::None},
6767
{"", Apps::None},
6868
}

0 commit comments

Comments
 (0)