Merge branch 'develop' into motion-sensor

# Conflicts:
#	src/CMakeLists.txt
#	src/displayapp/Apps.h
#	src/displayapp/DisplayApp.cpp
#	src/displayapp/DisplayApp.h
#	src/displayapp/lv_pinetime_theme.c
#	src/displayapp/screens/ApplicationList.cpp
#	src/drivers/TwiMaster.cpp
#	src/systemtask/SystemTask.h

1 files changed, 40 insertions, 6 deletions

diff --git a/src/displayapp/screens/InfiniPaint.cpp b/src/displayapp/screens/InfiniPaint.cpp
index 6d1f75b8..b6a7e3e4 100644
--- a/src/displayapp/screens/InfiniPaint.cpp
+++ b/src/displayapp/screens/InfiniPaint.cpp
@@ -6,7 +6,7 @@ using namespace Pinetime::Applications::Screens;
 
 InfiniPaint::InfiniPaint(Pinetime::Applications::DisplayApp* app, Pinetime::Components::LittleVgl& lvgl) : Screen(app), lvgl{lvgl} {
   app->SetTouchMode(DisplayApp::TouchModes::Polling);
-  std::fill(b, b + bufferSize, LV_COLOR_WHITE);
+  std::fill(b, b + bufferSize, selectColor);
 }
 
 InfiniPaint::~InfiniPaint() {
@@ -19,12 +19,46 @@ bool InfiniPaint::Refresh() {
   return running;
 }
 
-bool InfiniPaint::OnButtonPushed() {
-  running = false;
-  return true;
-}
-
 bool InfiniPaint::OnTouchEvent(Pinetime::Applications::TouchEvents event) {
+  switch(event) {
+    case Pinetime::Applications::TouchEvents::LongTap:      
+      switch (color) {
+        case 0:
+          selectColor = LV_COLOR_MAGENTA;
+          break;
+        case 1:
+          selectColor = LV_COLOR_GREEN;
+          break;
+        case 2:
+          selectColor = LV_COLOR_WHITE;
+          break;
+        case 3:
+          selectColor = LV_COLOR_RED;
+          break;
+        case 4:
+          selectColor = LV_COLOR_CYAN;
+          break;
+        case 5:
+          selectColor = LV_COLOR_YELLOW;
+          break;
+        case 6:
+          selectColor = LV_COLOR_BLUE;
+          break;
+        case 7:
+          selectColor = LV_COLOR_BLACK;
+          break;
+      
+        default:
+          color = 0;
+          break;
+      }
+
+      std::fill(b, b + bufferSize, selectColor);  
+      color++;
+      return true;
+    default:
+      return true;
+  }
   return true;
 }