From 5932391c8b2178cc0beed9f4c2b0aa4a24ac7e1f Mon Sep 17 00:00:00 2001 From: SteveAmor Date: Sun, 7 Nov 2021 10:50:33 +0000 Subject: Chimes option --- src/displayapp/DisplayApp.cpp | 8 ++++++++ 1 file changed, 8 insertions(+) (limited to 'src/displayapp/DisplayApp.cpp') diff --git a/src/displayapp/DisplayApp.cpp b/src/displayapp/DisplayApp.cpp index abe5851e..dd2336fc 100644 --- a/src/displayapp/DisplayApp.cpp +++ b/src/displayapp/DisplayApp.cpp @@ -47,6 +47,7 @@ #include "displayapp/screens/settings/SettingPineTimeStyle.h" #include "displayapp/screens/settings/SettingSetDate.h" #include "displayapp/screens/settings/SettingSetTime.h" +#include "displayapp/screens/settings/SettingChimes.h" #include "libs/lv_conf.h" @@ -268,6 +269,9 @@ void DisplayApp::Refresh() { // Added to remove warning // What should happen here? break; + case Messages::Clock: + LoadApp(Apps::Clock, DisplayApp::FullRefreshDirections::None); + break; } } @@ -386,6 +390,10 @@ void DisplayApp::LoadApp(Apps app, DisplayApp::FullRefreshDirections direction) currentScreen = std::make_unique(this, dateTimeController); ReturnApp(Apps::Settings, FullRefreshDirections::Down, TouchEvents::SwipeDown); break; + case Apps::SettingChimes: + currentScreen = std::make_unique(this, settingsController); + ReturnApp(Apps::Settings, FullRefreshDirections::Down, TouchEvents::SwipeDown); + break; case Apps::SettingPineTimeStyle: currentScreen = std::make_unique(this, settingsController); ReturnApp(Apps::Settings, FullRefreshDirections::Down, TouchEvents::SwipeDown); -- cgit v1.2.3-70-g09d2 From 94561b233136334c7507925b04a345adb0e6c769 Mon Sep 17 00:00:00 2001 From: SteveAmor Date: Sun, 2 Jan 2022 21:49:18 +0000 Subject: resolves conflicts --- src/displayapp/DisplayApp.cpp | 5 ----- src/displayapp/Messages.h | 1 + src/displayapp/screens/settings/SettingChimes.cpp | 2 +- src/displayapp/screens/settings/Settings.cpp | 2 +- 4 files changed, 3 insertions(+), 7 deletions(-) (limited to 'src/displayapp/DisplayApp.cpp') diff --git a/src/displayapp/DisplayApp.cpp b/src/displayapp/DisplayApp.cpp index dd2336fc..be1dad12 100644 --- a/src/displayapp/DisplayApp.cpp +++ b/src/displayapp/DisplayApp.cpp @@ -44,7 +44,6 @@ #include "displayapp/screens/settings/SettingWakeUp.h" #include "displayapp/screens/settings/SettingDisplay.h" #include "displayapp/screens/settings/SettingSteps.h" -#include "displayapp/screens/settings/SettingPineTimeStyle.h" #include "displayapp/screens/settings/SettingSetDate.h" #include "displayapp/screens/settings/SettingSetTime.h" #include "displayapp/screens/settings/SettingChimes.h" @@ -394,10 +393,6 @@ void DisplayApp::LoadApp(Apps app, DisplayApp::FullRefreshDirections direction) currentScreen = std::make_unique(this, settingsController); ReturnApp(Apps::Settings, FullRefreshDirections::Down, TouchEvents::SwipeDown); break; - case Apps::SettingPineTimeStyle: - currentScreen = std::make_unique(this, settingsController); - ReturnApp(Apps::Settings, FullRefreshDirections::Down, TouchEvents::SwipeDown); - break; case Apps::BatteryInfo: currentScreen = std::make_unique(this, batteryController); ReturnApp(Apps::Settings, FullRefreshDirections::Down, TouchEvents::SwipeDown); diff --git a/src/displayapp/Messages.h b/src/displayapp/Messages.h index beada33a..19d2c4d3 100644 --- a/src/displayapp/Messages.h +++ b/src/displayapp/Messages.h @@ -15,6 +15,7 @@ namespace Pinetime { UpdateTimeOut, DimScreen, RestoreBrightness, + ShowPairingKey, AlarmTriggered, Clock }; diff --git a/src/displayapp/screens/settings/SettingChimes.cpp b/src/displayapp/screens/settings/SettingChimes.cpp index dc06f4d8..0f008802 100644 --- a/src/displayapp/screens/settings/SettingChimes.cpp +++ b/src/displayapp/screens/settings/SettingChimes.cpp @@ -1,4 +1,4 @@ -#include "SettingChimes.h" +#include "displayapp/screens/settings/SettingChimes.h" #include #include "displayapp/DisplayApp.h" #include "displayapp/screens/Screen.h" diff --git a/src/displayapp/screens/settings/Settings.cpp b/src/displayapp/screens/settings/Settings.cpp index dfff53aa..678ad82e 100644 --- a/src/displayapp/screens/settings/Settings.cpp +++ b/src/displayapp/screens/settings/Settings.cpp @@ -61,9 +61,9 @@ std::unique_ptr Settings::CreateScreen3() { std::array applications {{ {Symbols::clock, "Chimes", Apps::SettingChimes}, - {Symbols::paintbrush, "PTS Colors", Apps::SettingPineTimeStyle}, {Symbols::check, "Firmware", Apps::FirmwareValidation}, {Symbols::list, "About", Apps::SysInfo}, + {Symbols::none, "None", Apps::None} }}; return std::make_unique(2, 3, app, settingsController, applications); -- cgit v1.2.3-70-g09d2 From 7a0f72ed8bc373a0dc25ef1b39db98b128367cc2 Mon Sep 17 00:00:00 2001 From: SteveAmor Date: Sun, 2 Jan 2022 22:33:23 +0000 Subject: resolve conflicts --- src/displayapp/DisplayApp.cpp | 3 --- 1 file changed, 3 deletions(-) (limited to 'src/displayapp/DisplayApp.cpp') diff --git a/src/displayapp/DisplayApp.cpp b/src/displayapp/DisplayApp.cpp index 6eb45645..41a72a6f 100644 --- a/src/displayapp/DisplayApp.cpp +++ b/src/displayapp/DisplayApp.cpp @@ -419,13 +419,10 @@ void DisplayApp::LoadApp(Apps app, DisplayApp::FullRefreshDirections direction) currentScreen = std::make_unique(this, dateTimeController); ReturnApp(Apps::Settings, FullRefreshDirections::Down, TouchEvents::SwipeDown); break; -<<<<<<< HEAD case Apps::SettingChimes: currentScreen = std::make_unique(this, settingsController); ReturnApp(Apps::Settings, FullRefreshDirections::Down, TouchEvents::SwipeDown); break; -======= ->>>>>>> develop case Apps::BatteryInfo: currentScreen = std::make_unique(this, batteryController); ReturnApp(Apps::Settings, FullRefreshDirections::Down, TouchEvents::SwipeDown); -- cgit v1.2.3-70-g09d2