Skip to content

Commit 7b39130

Browse files
JF002JF002
authored
Merge pull request #231 from Panky-codes/feature/add-stop-watch
Added stopwatch
2 parents a3ff2e4 + 49f3018 commit 7b39130

10 files changed

Lines changed: 376 additions & 45 deletions

File tree

‎README.md‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,7 @@ As of now, here is the list of achievements of this project:
4444
* Notification (displays the last notification received)
4545
* Paddle (single player pong-like game)
4646
* Two (2048 clone game)
47+
* Stopwatch (with all the necessary functions such as play, pause, lap, stop)
4748
- Supported by 2 companion apps (development is in progress):
4849
* [Gadgetbridge](https://codeberg.org/Freeyourgadget/Gadgetbridge/) (on Android)
4950
* [Amazfish](https://openrepos.net/content/piggz/amazfish) (on SailfishOS and Linux)

‎src/CMakeLists.txt‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -485,6 +485,7 @@ list(APPEND SOURCE_FILES
485485
displayapp/screens/Meter.cpp
486486
displayapp/screens/InfiniPaint.cpp
487487
displayapp/screens/Paddle.cpp
488+
displayapp/screens/StopWatch.cpp
488489
displayapp/screens/BatteryIcon.cpp
489490
displayapp/screens/BleIcon.cpp
490491
displayapp/screens/NotificationIcon.cpp
@@ -644,6 +645,7 @@ set(INCLUDE_FILES
644645
displayapp/screens/Tile.h
645646
displayapp/screens/Meter.h
646647
displayapp/screens/InfiniPaint.h
648+
displayapp/screens/StopWatch.h
647649
displayapp/screens/Paddle.h
648650
displayapp/screens/DropDownDemo.h
649651
displayapp/screens/BatteryIcon.h

‎src/displayapp/Apps.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,6 @@
22

33
namespace Pinetime {
44
namespace Applications {
5-
enum class Apps {None, Launcher, Clock, SysInfo, Meter, Brightness, Music, FirmwareValidation, Paint, Paddle, Notifications, Twos, HeartRate, Navigation};
5+
enum class Apps {None, Launcher, Clock, SysInfo, Meter, Brightness, Music, FirmwareValidation, Paint, Paddle, Notifications, Twos, HeartRate, Navigation, StopWatch};
66
}
77
}

‎src/displayapp/DisplayApp.cpp‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212
#include "displayapp/screens/FirmwareValidation.h"
1313
#include "displayapp/screens/InfiniPaint.h"
1414
#include "displayapp/screens/Paddle.h"
15+
#include "displayapp/screens/StopWatch.h"
1516
#include "displayapp/screens/Meter.h"
1617
#include "displayapp/screens/Music.h"
1718
#include "displayapp/screens/Navigation.h"
@@ -204,6 +205,7 @@ void DisplayApp::RunningState() {
204205
break;
205206
case Apps::SysInfo: currentScreen.reset(new Screens::SystemInfo(this, dateTimeController, batteryController, brightnessController, bleController, watchdog)); break;
206207
case Apps::Meter: currentScreen.reset(new Screens::Meter(this)); break;
208+
case Apps::StopWatch: currentScreen.reset(new Screens::StopWatch(this)); break;
207209
case Apps::Twos: currentScreen.reset(new Screens::Twos(this)); break;
208210
case Apps::Paint: currentScreen.reset(new Screens::InfiniPaint(this, lvgl)); break;
209211
case Apps::Paddle: currentScreen.reset(new Screens::Paddle(this, lvgl)); break;

‎src/displayapp/fonts/Readme.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
* Bpp : 1 bit-per-pixel
1111
* Do not enable font compression and horizontal subpixel hinting
1212
* Load the file `JetBrainsMono-Bold.tff` and specify the following range : `0x20-0x7f, 0x410-0x44f`
13-
* Add a 2nd font, load the file `FontAwesome5-Solid+Brands+Regular.woff` and specify the following range : `0xf293, 0xf294, 0xf244, 0xf240, 0xf242, 0xf243, 0xf241, 0xf54b, 0xf21e, 0xf1e6, 0xf54b, 0xf017, 0xf129, 0xf03a, 0xf185, 0xf560, 0xf001, 0xf3fd, 0xf069, 0xf1fc, 0xf45d, 0xf59f, 0xf5a0, 0xf029, 0xf027, 0xf028, 0xf6a9, 0xf04b, 0xf04c, 0xf048, 0xf051, 0xf095, 0xf3dd`
13+
* Add a 2nd font, load the file `FontAwesome5-Solid+Brands+Regular.woff` and specify the following range : `0xf293, 0xf294, 0xf244, 0xf240, 0xf242, 0xf243, 0xf241, 0xf54b, 0xf21e, 0xf1e6, 0xf54b, 0xf017, 0xf129, 0xf03a, 0xf185, 0xf560, 0xf001, 0xf3fd, 0xf069, 0xf1fc, 0xf45d, 0xf59f, 0xf5a0, 0xf029, 0xf027, 0xf028, 0xf6a9, 0xf04b, 0xf04c, 0xf048, 0xf051, 0xf095, 0xf3dd, 0xf04d, 0xf2f2, 0xf024`
1414
* Click on Convert, and download the file `jetbrains_mono_bold_20.c` and copy it in `src/DisplayApp/Fonts`
1515

1616
Add new symbols:

‎src/displayapp/fonts/jetbrains_mono_bold_20.c‎

Lines changed: 66 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -466,8 +466,8 @@ static LV_ATTRIBUTE_LARGE_CONST const uint8_t gylph_bitmap[] = {
466466
0x66, 0x66, 0x66, 0x6c, 0x63,
467467

468468
/* U+417 "З" */
469-
0x1f, 0x8f, 0xfd, 0xc7, 0x80, 0x70, 0x1c, 0x3e,
470-
0x7, 0xf0, 0xf, 0x0, 0xe0, 0x1d, 0x83, 0xb8,
469+
0x1f, 0xf, 0xf3, 0xc7, 0x0, 0x60, 0x1c, 0x1e,
470+
0x3, 0xf0, 0xe, 0x0, 0xe0, 0x1f, 0x83, 0xf8,
471471
0xf7, 0xfc, 0x3e, 0x0,
472472

473473
/* U+418 "И" */
@@ -615,7 +615,7 @@ static LV_ATTRIBUTE_LARGE_CONST const uint8_t gylph_bitmap[] = {
615615
0x70,
616616

617617
/* U+437 "з" */
618-
0x3f, 0x1f, 0xfe, 0x1c, 0x7, 0x1f, 0x7, 0xe0,
618+
0x3f, 0x1f, 0xfe, 0x1c, 0x7, 0x1f, 0x87, 0xe0,
619619
0x1c, 0x7, 0xe1, 0xdf, 0xe3, 0xf0,
620620

621621
/* U+438 "и" */
@@ -738,6 +738,15 @@ static LV_ATTRIBUTE_LARGE_CONST const uint8_t gylph_bitmap[] = {
738738
0xcf, 0x9f, 0xff, 0xf1, 0xff, 0xfc, 0x1f, 0xff,
739739
0x1, 0xff, 0xc0, 0x1f, 0xf0, 0x0, 0x70, 0x0,
740740

741+
/* U+F024 "" */
742+
0x70, 0x0, 0xf, 0x80, 0x0, 0xf8, 0x0, 0xf,
743+
0xff, 0xf, 0x7f, 0xff, 0xf7, 0xff, 0xff, 0x7f,
744+
0xff, 0xf7, 0xff, 0xff, 0x7f, 0xff, 0xf7, 0xff,
745+
0xff, 0x7f, 0xff, 0xf7, 0xff, 0xff, 0x7f, 0xff,
746+
0xf7, 0xff, 0xff, 0x7f, 0x7f, 0xe7, 0x0, 0x78,
747+
0x70, 0x0, 0x7, 0x0, 0x0, 0x70, 0x0, 0x7,
748+
0x0, 0x0,
749+
741750
/* U+F027 "" */
742751
0x0, 0xc0, 0x3, 0x80, 0xf, 0x0, 0x3e, 0xf,
743752
0xfc, 0x9f, 0xf9, 0xbf, 0xf1, 0xff, 0xe3, 0xff,
@@ -789,6 +798,13 @@ static LV_ATTRIBUTE_LARGE_CONST const uint8_t gylph_bitmap[] = {
789798
0xff, 0xfc, 0xff, 0xff, 0x3f, 0xff, 0xcf, 0xff,
790799
0xf3, 0xff, 0xfc, 0xff, 0x7e, 0x1f, 0x80,
791800

801+
/* U+F04D "" */
802+
0x7f, 0xff, 0xbf, 0xff, 0xff, 0xff, 0xff, 0xff,
803+
0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
804+
0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
805+
0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
806+
0xff, 0xff, 0xff, 0xff, 0x7f, 0xff, 0x80,
807+
792808
/* U+F051 "" */
793809
0xe0, 0x3f, 0x81, 0xfe, 0xf, 0xf8, 0x7f, 0xe3,
794810
0xff, 0x9f, 0xfe, 0xff, 0xff, 0xff, 0xff, 0xff,
@@ -897,6 +913,13 @@ static LV_ATTRIBUTE_LARGE_CONST const uint8_t gylph_bitmap[] = {
897913
0x81, 0xf8, 0x6d, 0x99, 0x9a, 0x36, 0x7, 0x80,
898914
0xe0, 0x18, 0x2, 0x0, 0x0,
899915

916+
/* U+F2F2 "" */
917+
0x7, 0xe0, 0x7, 0xe0, 0x1, 0x80, 0x3, 0xc0,
918+
0xf, 0xf2, 0x1f, 0xff, 0x3e, 0x7e, 0x7e, 0x7e,
919+
0xfe, 0x7e, 0xfe, 0x7f, 0xfe, 0x7f, 0xfe, 0x7f,
920+
0xfe, 0x7f, 0xff, 0xff, 0x7f, 0xfe, 0x7f, 0xfe,
921+
0x3f, 0xfc, 0x1f, 0xf8, 0x7, 0xe0,
922+
900923
/* U+F3DD "" */
901924
0x40, 0x0, 0x40, 0x70, 0x0, 0x7e, 0x3c, 0x0,
902925
0x3f, 0x8f, 0x80, 0x1f, 0x81, 0xe0, 0x1f, 0xc0,
@@ -1080,7 +1103,7 @@ static const lv_font_fmt_txt_glyph_dsc_t glyph_dsc[] = {
10801103
{.bitmap_index = 1514, .adv_w = 192, .box_w = 11, .box_h = 17, .ofs_x = 1, .ofs_y = -3},
10811104
{.bitmap_index = 1538, .adv_w = 192, .box_w = 9, .box_h = 14, .ofs_x = 2, .ofs_y = 0},
10821105
{.bitmap_index = 1554, .adv_w = 192, .box_w = 12, .box_h = 14, .ofs_x = 0, .ofs_y = 0},
1083-
{.bitmap_index = 1575, .adv_w = 192, .box_w = 11, .box_h = 14, .ofs_x = 0, .ofs_y = 0},
1106+
{.bitmap_index = 1575, .adv_w = 192, .box_w = 11, .box_h = 14, .ofs_x = 1, .ofs_y = 0},
10841107
{.bitmap_index = 1595, .adv_w = 192, .box_w = 9, .box_h = 14, .ofs_x = 1, .ofs_y = 0},
10851108
{.bitmap_index = 1611, .adv_w = 192, .box_w = 9, .box_h = 19, .ofs_x = 1, .ofs_y = 0},
10861109
{.bitmap_index = 1633, .adv_w = 192, .box_w = 10, .box_h = 14, .ofs_x = 2, .ofs_y = 0},
@@ -1139,47 +1162,51 @@ static const lv_font_fmt_txt_glyph_dsc_t glyph_dsc[] = {
11391162
{.bitmap_index = 2498, .adv_w = 192, .box_w = 9, .box_h = 11, .ofs_x = 1, .ofs_y = 0},
11401163
{.bitmap_index = 2511, .adv_w = 320, .box_w = 20, .box_h = 20, .ofs_x = 0, .ofs_y = -3},
11411164
{.bitmap_index = 2561, .adv_w = 320, .box_w = 19, .box_h = 20, .ofs_x = 0, .ofs_y = -3},
1142-
{.bitmap_index = 2609, .adv_w = 240, .box_w = 15, .box_h = 15, .ofs_x = 0, .ofs_y = 0},
1143-
{.bitmap_index = 2638, .adv_w = 360, .box_w = 23, .box_h = 19, .ofs_x = 0, .ofs_y = -2},
1144-
{.bitmap_index = 2693, .adv_w = 280, .box_w = 18, .box_h = 17, .ofs_x = 0, .ofs_y = -1},
1145-
{.bitmap_index = 2732, .adv_w = 320, .box_w = 20, .box_h = 17, .ofs_x = 0, .ofs_y = -1},
1146-
{.bitmap_index = 2775, .adv_w = 280, .box_w = 13, .box_h = 17, .ofs_x = 2, .ofs_y = -1},
1147-
{.bitmap_index = 2803, .adv_w = 280, .box_w = 18, .box_h = 21, .ofs_x = 0, .ofs_y = -3},
1148-
{.bitmap_index = 2851, .adv_w = 280, .box_w = 18, .box_h = 17, .ofs_x = 0, .ofs_y = -1},
1149-
{.bitmap_index = 2890, .adv_w = 280, .box_w = 13, .box_h = 17, .ofs_x = 2, .ofs_y = -1},
1150-
{.bitmap_index = 2918, .adv_w = 320, .box_w = 19, .box_h = 20, .ofs_x = 0, .ofs_y = -3},
1151-
{.bitmap_index = 2966, .adv_w = 320, .box_w = 20, .box_h = 21, .ofs_x = 0, .ofs_y = -3},
1152-
{.bitmap_index = 3019, .adv_w = 120, .box_w = 8, .box_h = 19, .ofs_x = 0, .ofs_y = -2},
1153-
{.bitmap_index = 3038, .adv_w = 320, .box_w = 20, .box_h = 20, .ofs_x = 0, .ofs_y = -3},
1154-
{.bitmap_index = 3088, .adv_w = 240, .box_w = 15, .box_h = 19, .ofs_x = 0, .ofs_y = -2},
1155-
{.bitmap_index = 3124, .adv_w = 320, .box_w = 20, .box_h = 19, .ofs_x = 0, .ofs_y = -2},
1156-
{.bitmap_index = 3172, .adv_w = 320, .box_w = 20, .box_h = 17, .ofs_x = 0, .ofs_y = -1},
1157-
{.bitmap_index = 3215, .adv_w = 400, .box_w = 25, .box_h = 12, .ofs_x = 0, .ofs_y = 1},
1158-
{.bitmap_index = 3253, .adv_w = 400, .box_w = 25, .box_h = 12, .ofs_x = 0, .ofs_y = 1},
1159-
{.bitmap_index = 3291, .adv_w = 400, .box_w = 25, .box_h = 12, .ofs_x = 0, .ofs_y = 1},
1160-
{.bitmap_index = 3329, .adv_w = 400, .box_w = 25, .box_h = 12, .ofs_x = 0, .ofs_y = 1},
1161-
{.bitmap_index = 3367, .adv_w = 400, .box_w = 25, .box_h = 12, .ofs_x = 0, .ofs_y = 1},
1162-
{.bitmap_index = 3405, .adv_w = 280, .box_w = 15, .box_h = 20, .ofs_x = 1, .ofs_y = -3},
1163-
{.bitmap_index = 3443, .adv_w = 200, .box_w = 11, .box_h = 21, .ofs_x = 0, .ofs_y = -3},
1164-
{.bitmap_index = 3472, .adv_w = 400, .box_w = 25, .box_h = 21, .ofs_x = 0, .ofs_y = -3},
1165-
{.bitmap_index = 3538, .adv_w = 360, .box_w = 23, .box_h = 17, .ofs_x = 0, .ofs_y = -1},
1166-
{.bitmap_index = 3587, .adv_w = 320, .box_w = 20, .box_h = 20, .ofs_x = 0, .ofs_y = -2},
1167-
{.bitmap_index = 3637, .adv_w = 400, .box_w = 25, .box_h = 19, .ofs_x = 0, .ofs_y = -2},
1168-
{.bitmap_index = 3697, .adv_w = 320, .box_w = 20, .box_h = 21, .ofs_x = 0, .ofs_y = -3},
1169-
{.bitmap_index = 3750, .adv_w = 360, .box_w = 22, .box_h = 20, .ofs_x = 0, .ofs_y = -2},
1170-
{.bitmap_index = 3805, .adv_w = 360, .box_w = 22, .box_h = 19, .ofs_x = 0, .ofs_y = -2},
1171-
{.bitmap_index = 3858, .adv_w = 320, .box_w = 20, .box_h = 15, .ofs_x = 0, .ofs_y = 0}
1165+
{.bitmap_index = 2609, .adv_w = 320, .box_w = 20, .box_h = 20, .ofs_x = 0, .ofs_y = -3},
1166+
{.bitmap_index = 2659, .adv_w = 240, .box_w = 15, .box_h = 15, .ofs_x = 0, .ofs_y = 0},
1167+
{.bitmap_index = 2688, .adv_w = 360, .box_w = 23, .box_h = 19, .ofs_x = 0, .ofs_y = -2},
1168+
{.bitmap_index = 2743, .adv_w = 280, .box_w = 18, .box_h = 17, .ofs_x = 0, .ofs_y = -1},
1169+
{.bitmap_index = 2782, .adv_w = 320, .box_w = 20, .box_h = 17, .ofs_x = 0, .ofs_y = -1},
1170+
{.bitmap_index = 2825, .adv_w = 280, .box_w = 13, .box_h = 17, .ofs_x = 2, .ofs_y = -1},
1171+
{.bitmap_index = 2853, .adv_w = 280, .box_w = 18, .box_h = 21, .ofs_x = 0, .ofs_y = -3},
1172+
{.bitmap_index = 2901, .adv_w = 280, .box_w = 18, .box_h = 17, .ofs_x = 0, .ofs_y = -1},
1173+
{.bitmap_index = 2940, .adv_w = 280, .box_w = 18, .box_h = 17, .ofs_x = 0, .ofs_y = -1},
1174+
{.bitmap_index = 2979, .adv_w = 280, .box_w = 13, .box_h = 17, .ofs_x = 2, .ofs_y = -1},
1175+
{.bitmap_index = 3007, .adv_w = 320, .box_w = 19, .box_h = 20, .ofs_x = 0, .ofs_y = -3},
1176+
{.bitmap_index = 3055, .adv_w = 320, .box_w = 20, .box_h = 21, .ofs_x = 0, .ofs_y = -3},
1177+
{.bitmap_index = 3108, .adv_w = 120, .box_w = 8, .box_h = 19, .ofs_x = 0, .ofs_y = -2},
1178+
{.bitmap_index = 3127, .adv_w = 320, .box_w = 20, .box_h = 20, .ofs_x = 0, .ofs_y = -3},
1179+
{.bitmap_index = 3177, .adv_w = 240, .box_w = 15, .box_h = 19, .ofs_x = 0, .ofs_y = -2},
1180+
{.bitmap_index = 3213, .adv_w = 320, .box_w = 20, .box_h = 19, .ofs_x = 0, .ofs_y = -2},
1181+
{.bitmap_index = 3261, .adv_w = 320, .box_w = 20, .box_h = 17, .ofs_x = 0, .ofs_y = -1},
1182+
{.bitmap_index = 3304, .adv_w = 400, .box_w = 25, .box_h = 12, .ofs_x = 0, .ofs_y = 1},
1183+
{.bitmap_index = 3342, .adv_w = 400, .box_w = 25, .box_h = 12, .ofs_x = 0, .ofs_y = 1},
1184+
{.bitmap_index = 3380, .adv_w = 400, .box_w = 25, .box_h = 12, .ofs_x = 0, .ofs_y = 1},
1185+
{.bitmap_index = 3418, .adv_w = 400, .box_w = 25, .box_h = 12, .ofs_x = 0, .ofs_y = 1},
1186+
{.bitmap_index = 3456, .adv_w = 400, .box_w = 25, .box_h = 12, .ofs_x = 0, .ofs_y = 1},
1187+
{.bitmap_index = 3494, .adv_w = 280, .box_w = 15, .box_h = 20, .ofs_x = 1, .ofs_y = -3},
1188+
{.bitmap_index = 3532, .adv_w = 200, .box_w = 11, .box_h = 21, .ofs_x = 0, .ofs_y = -3},
1189+
{.bitmap_index = 3561, .adv_w = 280, .box_w = 16, .box_h = 19, .ofs_x = 1, .ofs_y = -2},
1190+
{.bitmap_index = 3599, .adv_w = 400, .box_w = 25, .box_h = 21, .ofs_x = 0, .ofs_y = -3},
1191+
{.bitmap_index = 3665, .adv_w = 360, .box_w = 23, .box_h = 17, .ofs_x = 0, .ofs_y = -1},
1192+
{.bitmap_index = 3714, .adv_w = 320, .box_w = 20, .box_h = 20, .ofs_x = 0, .ofs_y = -2},
1193+
{.bitmap_index = 3764, .adv_w = 400, .box_w = 25, .box_h = 19, .ofs_x = 0, .ofs_y = -2},
1194+
{.bitmap_index = 3824, .adv_w = 320, .box_w = 20, .box_h = 21, .ofs_x = 0, .ofs_y = -3},
1195+
{.bitmap_index = 3877, .adv_w = 360, .box_w = 22, .box_h = 20, .ofs_x = 0, .ofs_y = -2},
1196+
{.bitmap_index = 3932, .adv_w = 360, .box_w = 22, .box_h = 19, .ofs_x = 0, .ofs_y = -2},
1197+
{.bitmap_index = 3985, .adv_w = 320, .box_w = 20, .box_h = 15, .ofs_x = 0, .ofs_y = 0}
11721198
};
11731199

11741200
/*---------------------
11751201
* CHARACTER MAPPING
11761202
*--------------------*/
11771203

11781204
static const uint16_t unicode_list_2[] = {
1179-
0x0, 0x16, 0x26, 0x27, 0x28, 0x39, 0x47, 0x4a,
1180-
0x4b, 0x50, 0x68, 0x94, 0x128, 0x184, 0x1e5, 0x1fb,
1181-
0x21d, 0x23f, 0x240, 0x241, 0x242, 0x243, 0x292, 0x293,
1182-
0x3dc, 0x3fc, 0x45c, 0x54a, 0x55f, 0x59e, 0x59f, 0x6a8
1205+
0x0, 0x16, 0x23, 0x26, 0x27, 0x28, 0x39, 0x47,
1206+
0x4a, 0x4b, 0x4c, 0x50, 0x68, 0x94, 0x128, 0x184,
1207+
0x1e5, 0x1fb, 0x21d, 0x23f, 0x240, 0x241, 0x242, 0x243,
1208+
0x292, 0x293, 0x2f1, 0x3dc, 0x3fc, 0x45c, 0x54a, 0x55f,
1209+
0x59e, 0x59f, 0x6a8
11831210
};
11841211

11851212
/*Collect the unicode lists and glyph_id offsets*/
@@ -1195,7 +1222,7 @@ static const lv_font_fmt_txt_cmap_t cmaps[] =
11951222
},
11961223
{
11971224
.range_start = 61441, .range_length = 1705, .glyph_id_start = 160,
1198-
.unicode_list = unicode_list_2, .glyph_id_ofs_list = NULL, .list_length = 32, .type = LV_FONT_FMT_TXT_CMAP_SPARSE_TINY
1225+
.unicode_list = unicode_list_2, .glyph_id_ofs_list = NULL, .list_length = 35, .type = LV_FONT_FMT_TXT_CMAP_SPARSE_TINY
11991226
}
12001227
};
12011228

‎src/displayapp/screens/ApplicationList.cpp‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -62,11 +62,11 @@ std::unique_ptr<Screen> ApplicationList::CreateScreen1() {
6262
std::unique_ptr<Screen> ApplicationList::CreateScreen2() {
6363
std::array<Screens::Tile::Applications, 6> applications {
6464
{{Symbols::map, Apps::Navigation},
65-
{Symbols::asterisk, Apps::Meter},
65+
{Symbols::stopWatch, Apps::StopWatch},
6666
{Symbols::paintbrush, Apps::Paint},
67-
{Symbols::info, Apps::Notifications},
68-
{Symbols::paddle, Apps::Paddle},
69-
{"2", Apps::Twos}
67+
{Symbols::info, Apps::Notifications},
68+
{Symbols::paddle, Apps::Paddle},
69+
{"2", Apps::Twos}
7070
}
7171
};
7272

0 commit comments

Comments
 (0)