Rebase upstream develop

Author: dmlls

src/displayapp/Apps.h

@@ -34,7 +34,6 @@ namespace Pinetime {
       SettingDisplay,
       SettingWakeUp,
       SettingSteps,
-      SettingPineTimeStyle,
       SettingWatchFaceInfineat,
       SettingSetDate,
       SettingSetTime,

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);

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}