Revert "remove PTS, Terminal and Infineat faces"
This reverts commit 3ade3153e5
.
This commit is contained in:
parent
e3967e8a90
commit
104e750a75
|
@ -5,8 +5,11 @@ namespace Pinetime {
|
||||||
enum class WatchFace : uint8_t {
|
enum class WatchFace : uint8_t {
|
||||||
Digital = 0,
|
Digital = 0,
|
||||||
Analog = 1,
|
Analog = 1,
|
||||||
CasioStyleG7710 = 2,
|
PineTimeStyle = 2,
|
||||||
Fuzzy = 3,
|
Terminal = 3,
|
||||||
|
Infineat = 4,
|
||||||
|
CasioStyleG7710 = 5,
|
||||||
|
Fuzzy = 6,
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -8,8 +8,11 @@
|
||||||
#include "components/settings/Settings.h"
|
#include "components/settings/Settings.h"
|
||||||
#include "displayapp/DisplayApp.h"
|
#include "displayapp/DisplayApp.h"
|
||||||
#include "displayapp/screens/WatchFaceDigital.h"
|
#include "displayapp/screens/WatchFaceDigital.h"
|
||||||
|
#include "displayapp/screens/WatchFaceTerminal.h"
|
||||||
|
#include "displayapp/screens/WatchFaceInfineat.h"
|
||||||
#include "displayapp/screens/WatchFaceAnalog.h"
|
#include "displayapp/screens/WatchFaceAnalog.h"
|
||||||
#include "displayapp/screens/WatchFaceFuzzy.h"
|
#include "displayapp/screens/WatchFaceFuzzy.h"
|
||||||
|
#include "displayapp/screens/WatchFacePineTimeStyle.h"
|
||||||
#include "displayapp/screens/WatchFaceCasioStyleG7710.h"
|
#include "displayapp/screens/WatchFaceCasioStyleG7710.h"
|
||||||
|
|
||||||
using namespace Pinetime::Applications::Screens;
|
using namespace Pinetime::Applications::Screens;
|
||||||
|
@ -41,6 +44,15 @@ Clock::Clock(Controllers::DateTime& dateTimeController,
|
||||||
case WatchFace::Analog:
|
case WatchFace::Analog:
|
||||||
return WatchFaceAnalogScreen();
|
return WatchFaceAnalogScreen();
|
||||||
break;
|
break;
|
||||||
|
case WatchFace::PineTimeStyle:
|
||||||
|
return WatchFacePineTimeStyleScreen();
|
||||||
|
break;
|
||||||
|
case WatchFace::Terminal:
|
||||||
|
return WatchFaceTerminalScreen();
|
||||||
|
break;
|
||||||
|
case WatchFace::Infineat:
|
||||||
|
return WatchFaceInfineatScreen();
|
||||||
|
break;
|
||||||
case WatchFace::CasioStyleG7710:
|
case WatchFace::CasioStyleG7710:
|
||||||
return WatchFaceCasioStyleG7710();
|
return WatchFaceCasioStyleG7710();
|
||||||
break;
|
break;
|
||||||
|
@ -83,6 +95,36 @@ std::unique_ptr<Screen> Clock::WatchFaceAnalogScreen() {
|
||||||
settingsController);
|
settingsController);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
std::unique_ptr<Screen> Clock::WatchFacePineTimeStyleScreen() {
|
||||||
|
return std::make_unique<Screens::WatchFacePineTimeStyle>(dateTimeController,
|
||||||
|
batteryController,
|
||||||
|
bleController,
|
||||||
|
notificationManager,
|
||||||
|
settingsController,
|
||||||
|
motionController,
|
||||||
|
weatherService);
|
||||||
|
}
|
||||||
|
|
||||||
|
std::unique_ptr<Screen> Clock::WatchFaceTerminalScreen() {
|
||||||
|
return std::make_unique<Screens::WatchFaceTerminal>(dateTimeController,
|
||||||
|
batteryController,
|
||||||
|
bleController,
|
||||||
|
notificationManager,
|
||||||
|
settingsController,
|
||||||
|
heartRateController,
|
||||||
|
motionController);
|
||||||
|
}
|
||||||
|
|
||||||
|
std::unique_ptr<Screen> Clock::WatchFaceInfineatScreen() {
|
||||||
|
return std::make_unique<Screens::WatchFaceInfineat>(dateTimeController,
|
||||||
|
batteryController,
|
||||||
|
bleController,
|
||||||
|
notificationManager,
|
||||||
|
settingsController,
|
||||||
|
motionController,
|
||||||
|
filesystem);
|
||||||
|
}
|
||||||
|
|
||||||
std::unique_ptr<Screen> Clock::WatchFaceCasioStyleG7710() {
|
std::unique_ptr<Screen> Clock::WatchFaceCasioStyleG7710() {
|
||||||
return std::make_unique<Screens::WatchFaceCasioStyleG7710>(dateTimeController,
|
return std::make_unique<Screens::WatchFaceCasioStyleG7710>(dateTimeController,
|
||||||
batteryController,
|
batteryController,
|
||||||
|
|
|
@ -43,6 +43,9 @@ namespace Pinetime {
|
||||||
std::array<Screens::CheckboxList::Item, settingsPerScreen * nScreens> watchfaces {
|
std::array<Screens::CheckboxList::Item, settingsPerScreen * nScreens> watchfaces {
|
||||||
{{"Digital face", true},
|
{{"Digital face", true},
|
||||||
{"Analog face", true},
|
{"Analog face", true},
|
||||||
|
{"PineTimeStyle", true},
|
||||||
|
{"Terminal", true},
|
||||||
|
{"Infineat face", Applications::Screens::WatchFaceInfineat::IsAvailable(filesystem)},
|
||||||
{"Casio G7710", Applications::Screens::WatchFaceCasioStyleG7710::IsAvailable(filesystem)},
|
{"Casio G7710", Applications::Screens::WatchFaceCasioStyleG7710::IsAvailable(filesystem)},
|
||||||
{"Fuzzy Clock", true},
|
{"Fuzzy Clock", true},
|
||||||
{"", false}}};
|
{"", false}}};
|
||||||
|
|
Loading…
Reference in New Issue
Block a user