From f5e7dba87326d30a717a1424280fb97aed7bae2e Mon Sep 17 00:00:00 2001 From: Ryan Rix Date: Mon, 25 Sep 2023 23:42:04 -0700 Subject: [PATCH] remove paint and paddle apps --- src/CMakeLists.txt | 7 ------- src/displayapp/Apps.h | 2 -- src/displayapp/DisplayApp.cpp | 8 -------- src/displayapp/screens/ApplicationList.h | 2 -- 4 files changed, 19 deletions(-) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index db2913ea..6dcd2b3b 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -375,8 +375,6 @@ list(APPEND SOURCE_FILES displayapp/screens/Screen.cpp displayapp/screens/Clock.cpp displayapp/screens/Tile.cpp - displayapp/screens/InfiniPaint.cpp - displayapp/screens/Paddle.cpp displayapp/screens/StopWatch.cpp displayapp/screens/BatteryIcon.cpp displayapp/screens/BleIcon.cpp @@ -429,9 +427,6 @@ list(APPEND SOURCE_FILES ## Watch faces displayapp/screens/WatchFaceAnalog.cpp displayapp/screens/WatchFaceDigital.cpp - displayapp/screens/WatchFaceInfineat.cpp - displayapp/screens/WatchFaceTerminal.cpp - displayapp/screens/WatchFacePineTimeStyle.cpp displayapp/screens/WatchFaceCasioStyleG7710.cpp displayapp/screens/WatchFaceFuzzy.cpp @@ -601,9 +596,7 @@ set(INCLUDE_FILES displayapp/screens/Screen.h displayapp/screens/Clock.h displayapp/screens/Tile.h - displayapp/screens/InfiniPaint.h displayapp/screens/StopWatch.h - displayapp/screens/Paddle.h displayapp/screens/BatteryIcon.h displayapp/screens/BleIcon.h displayapp/screens/NotificationIcon.h diff --git a/src/displayapp/Apps.h b/src/displayapp/Apps.h index f253bc03..ebf86ef6 100644 --- a/src/displayapp/Apps.h +++ b/src/displayapp/Apps.h @@ -16,8 +16,6 @@ namespace Pinetime { FlashLight, BatteryInfo, Music, - Paint, - Paddle, Twos, HeartRate, Navigation, diff --git a/src/displayapp/DisplayApp.cpp b/src/displayapp/DisplayApp.cpp index cd941f16..87bd00fe 100644 --- a/src/displayapp/DisplayApp.cpp +++ b/src/displayapp/DisplayApp.cpp @@ -14,8 +14,6 @@ #include "displayapp/screens/Clock.h" #include "displayapp/screens/FirmwareUpdate.h" #include "displayapp/screens/FirmwareValidation.h" -#include "displayapp/screens/InfiniPaint.h" -#include "displayapp/screens/Paddle.h" #include "displayapp/screens/StopWatch.h" #include "displayapp/screens/Metronome.h" #include "displayapp/screens/Music.h" @@ -522,12 +520,6 @@ void DisplayApp::LoadScreen(Apps app, DisplayApp::FullRefreshDirections directio case Apps::Twos: currentScreen = std::make_unique(); break; - case Apps::Paint: - currentScreen = std::make_unique(lvgl, motorController); - break; - case Apps::Paddle: - currentScreen = std::make_unique(lvgl); - break; case Apps::Music: currentScreen = std::make_unique(systemTask->nimble().music()); break; diff --git a/src/displayapp/screens/ApplicationList.h b/src/displayapp/screens/ApplicationList.h index 371ee710..ef09cd24 100644 --- a/src/displayapp/screens/ApplicationList.h +++ b/src/displayapp/screens/ApplicationList.h @@ -50,8 +50,6 @@ namespace Pinetime { {Symbols::heartBeat, Apps::HeartRate, true}, {Symbols::music, Apps::Music, true}, - {Symbols::paintbrush, Apps::Paint, true}, - {Symbols::paddle, Apps::Paddle, true}, {"2", Apps::Twos, true}, {Symbols::drum, Apps::Metronome, true}, {Symbols::map, Apps::Navigation, Applications::Screens::Navigation::IsAvailable(filesystem)},