From e334735697d2d10fe3e5e6038c51bacaec729ceb Mon Sep 17 00:00:00 2001 From: josh Date: Wed, 20 Sep 2023 16:12:14 -0400 Subject: [PATCH] Added swipe left to show music controls and a green $ to the prompt in terminal watch face --- src/displayapp/DisplayApp.cpp | 3 +++ src/displayapp/screens/WatchFaceTerminal.cpp | 11 +++++++++-- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/src/displayapp/DisplayApp.cpp b/src/displayapp/DisplayApp.cpp index cd941f16..b788e0cc 100644 --- a/src/displayapp/DisplayApp.cpp +++ b/src/displayapp/DisplayApp.cpp @@ -301,6 +301,9 @@ void DisplayApp::Refresh() { case TouchEvents::SwipeRight: LoadNewScreen(Apps::QuickSettings, DisplayApp::FullRefreshDirections::RightAnim); break; + case TouchEvents::SwipeLeft: + LoadNewScreen(Apps::Music, DisplayApp::FullRefreshDirections::LeftAnim); + break; case TouchEvents::DoubleTap: PushMessageToSystemTask(System::Messages::GoToSleep); break; diff --git a/src/displayapp/screens/WatchFaceTerminal.cpp b/src/displayapp/screens/WatchFaceTerminal.cpp index 72383729..ac00f5a3 100644 --- a/src/displayapp/screens/WatchFaceTerminal.cpp +++ b/src/displayapp/screens/WatchFaceTerminal.cpp @@ -10,8 +10,11 @@ #include "components/motion/MotionController.h" #include "components/settings/Settings.h" + + using namespace Pinetime::Applications::Screens; + WatchFaceTerminal::WatchFaceTerminal(Controllers::DateTime& dateTimeController, const Controllers::Battery& batteryController, const Controllers::Ble& bleController, @@ -43,12 +46,14 @@ WatchFaceTerminal::WatchFaceTerminal(Controllers::DateTime& dateTimeController, lv_obj_align(label_date, lv_scr_act(), LV_ALIGN_IN_LEFT_MID, 0, -40); label_prompt_1 = lv_label_create(lv_scr_act(), nullptr); + lv_label_set_recolor(label_prompt_1, true); lv_obj_align(label_prompt_1, lv_scr_act(), LV_ALIGN_IN_LEFT_MID, 0, -80); - lv_label_set_text_static(label_prompt_1, "user@watch:~ $ now"); + lv_label_set_text_static(label_prompt_1, "user@watch:~ #00ff00 $# now"); label_prompt_2 = lv_label_create(lv_scr_act(), nullptr); + lv_label_set_recolor(label_prompt_1, true); lv_obj_align(label_prompt_2, lv_scr_act(), LV_ALIGN_IN_LEFT_MID, 0, 60); - lv_label_set_text_static(label_prompt_2, "user@watch:~ $"); + lv_label_set_text_static(label_prompt_2, "user@watch:~ #00ff00 $#"); label_time = lv_label_create(lv_scr_act(), nullptr); lv_label_set_recolor(label_time, true); @@ -143,6 +148,8 @@ void WatchFaceTerminal::Refresh() { lv_label_set_text_static(heartbeatValue, "[L_HR]#ee3311 ---#"); } } + + stepCount = motionController.NbSteps(); if (stepCount.IsUpdated()) {