From efee8ecdb53ff24bbda4bcb453afed778d89fc72 Mon Sep 17 00:00:00 2001
From: Diego Miguel <dmlls@diegomiguel.me>
Date: Sun, 2 Jan 2022 15:46:52 +0100
Subject: [PATCH] Rebase upstream develop

---
 src/displayapp/Apps.h                        | 1 -
 src/displayapp/DisplayApp.cpp                | 5 -----
 src/displayapp/screens/settings/Settings.cpp | 7 +------
 3 files changed, 1 insertion(+), 12 deletions(-)

diff --git a/src/displayapp/Apps.h b/src/displayapp/Apps.h
index 117f169a4c..dfeb2a7df2 100644
--- a/src/displayapp/Apps.h
+++ b/src/displayapp/Apps.h
@@ -34,7 +34,6 @@ namespace Pinetime {
       SettingDisplay,
       SettingWakeUp,
       SettingSteps,
-      SettingPineTimeStyle,
       SettingWatchFaceInfineat,
       SettingSetDate,
       SettingSetTime,
diff --git a/src/displayapp/DisplayApp.cpp b/src/displayapp/DisplayApp.cpp
index 2a98a478e2..578f8e13fc 100644
--- a/src/displayapp/DisplayApp.cpp
+++ b/src/displayapp/DisplayApp.cpp
@@ -45,7 +45,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/SettingWatchFaceInfineat.h"
 #include "displayapp/screens/settings/SettingSetDate.h"
 #include "displayapp/screens/settings/SettingSetTime.h"
@@ -417,10 +416,6 @@ void DisplayApp::LoadApp(Apps app, DisplayApp::FullRefreshDirections direction)
       currentScreen = std::make_unique<Screens::SettingSetTime>(this, dateTimeController);
       ReturnApp(Apps::Settings, FullRefreshDirections::Down, TouchEvents::SwipeDown);
       break;
-    case Apps::SettingPineTimeStyle:
-      currentScreen = std::make_unique<Screens::SettingPineTimeStyle>(this, settingsController);
-      ReturnApp(Apps::Settings, FullRefreshDirections::Down, TouchEvents::SwipeDown);
-      break;
     case Apps::SettingWatchFaceInfineat:
       currentScreen = std::make_unique<Screens::SettingWatchFaceInfineat>(this, settingsController);
       ReturnApp(Apps::Settings, FullRefreshDirections::Down, TouchEvents::SwipeDown);
diff --git a/src/displayapp/screens/settings/Settings.cpp b/src/displayapp/screens/settings/Settings.cpp
index d3e6538a32..c29b4207b6 100644
--- a/src/displayapp/screens/settings/Settings.cpp
+++ b/src/displayapp/screens/settings/Settings.cpp
@@ -66,12 +66,7 @@ std::unique_ptr<Screen> Settings::CreateScreen3() {
     {Symbols::none, "None", Apps::None}
   }};
 
-  if (settingsController.GetClockFace() == 2) { // PineTimeSylte
-    apps.insert(
-      apps.begin(),
-      {Symbols::paintbrush, "PTS Colors", Apps::SettingPineTimeStyle}
-    );
-  } else if (settingsController.GetClockFace() == 3) {  // WatchFaceInfineat
+  if (settingsController.GetClockFace() == 3) {  // WatchFaceInfineat
     apps.insert(
       apps.begin(),
       {Symbols::paintbrush, "Side Cover", Apps::SettingWatchFaceInfineat}