Merge pull request #425 from Raupinger/remove-watch-tap
Remove tap to switch Watchfaces
This commit is contained in:
commit
17c6583937
|
@ -32,22 +32,25 @@ Clock::Clock(DisplayApp* app,
|
||||||
notificatioManager {notificatioManager},
|
notificatioManager {notificatioManager},
|
||||||
settingsController {settingsController},
|
settingsController {settingsController},
|
||||||
heartRateController {heartRateController},
|
heartRateController {heartRateController},
|
||||||
motionController {motionController},
|
motionController {motionController} {
|
||||||
screens {app,
|
|
||||||
settingsController.GetClockFace(),
|
switch (settingsController.GetClockFace()) {
|
||||||
{
|
case 0:
|
||||||
[this]() -> std::unique_ptr<Screen> {
|
screen = WatchFaceDigitalScreen();
|
||||||
return WatchFaceDigitalScreen();
|
break;
|
||||||
},
|
case 1:
|
||||||
[this]() -> std::unique_ptr<Screen> {
|
screen = WatchFaceAnalogScreen();
|
||||||
return WatchFaceAnalogScreen();
|
break;
|
||||||
},
|
/*
|
||||||
// Examples for more watch faces
|
// Examples for more watch faces
|
||||||
//[this]() -> std::unique_ptr<Screen> { return WatchFaceMinimalScreen(); },
|
case 2:
|
||||||
//[this]() -> std::unique_ptr<Screen> { return WatchFaceCustomScreen(); }
|
screen = WatchFaceMinimalScreen();
|
||||||
},
|
break;
|
||||||
Screens::ScreenListModes::LongPress} {
|
case 3:
|
||||||
|
screen = WatchFaceCustomScreen();
|
||||||
|
break;
|
||||||
|
*/
|
||||||
|
}
|
||||||
settingsController.SetAppMenu(0);
|
settingsController.SetAppMenu(0);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -56,12 +59,12 @@ Clock::~Clock() {
|
||||||
}
|
}
|
||||||
|
|
||||||
bool Clock::Refresh() {
|
bool Clock::Refresh() {
|
||||||
screens.Refresh();
|
screen->Refresh();
|
||||||
return running;
|
return running;
|
||||||
}
|
}
|
||||||
|
|
||||||
bool Clock::OnTouchEvent(Pinetime::Applications::TouchEvents event) {
|
bool Clock::OnTouchEvent(Pinetime::Applications::TouchEvents event) {
|
||||||
return screens.OnTouchEvent(event);
|
return screen->OnTouchEvent(event);
|
||||||
}
|
}
|
||||||
|
|
||||||
std::unique_ptr<Screen> Clock::WatchFaceDigitalScreen() {
|
std::unique_ptr<Screen> Clock::WatchFaceDigitalScreen() {
|
||||||
|
|
|
@ -4,8 +4,8 @@
|
||||||
#include <chrono>
|
#include <chrono>
|
||||||
#include <cstdint>
|
#include <cstdint>
|
||||||
#include <memory>
|
#include <memory>
|
||||||
|
#include <components/heartrate/HeartRateController.h>
|
||||||
#include "Screen.h"
|
#include "Screen.h"
|
||||||
#include "ScreenList.h"
|
|
||||||
#include "components/datetime/DateTimeController.h"
|
#include "components/datetime/DateTimeController.h"
|
||||||
|
|
||||||
namespace Pinetime {
|
namespace Pinetime {
|
||||||
|
@ -47,7 +47,7 @@ namespace Pinetime {
|
||||||
Controllers::HeartRateController& heartRateController;
|
Controllers::HeartRateController& heartRateController;
|
||||||
Controllers::MotionController& motionController;
|
Controllers::MotionController& motionController;
|
||||||
|
|
||||||
ScreenList<2> screens;
|
std::unique_ptr<Screen> screen;
|
||||||
std::unique_ptr<Screen> WatchFaceDigitalScreen();
|
std::unique_ptr<Screen> WatchFaceDigitalScreen();
|
||||||
std::unique_ptr<Screen> WatchFaceAnalogScreen();
|
std::unique_ptr<Screen> WatchFaceAnalogScreen();
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue