resolves conflicts

1 files changed, 11 insertions, 5 deletions

diff --git a/src/displayapp/screens/InfiniPaint.cpp b/src/displayapp/screens/InfiniPaint.cpp
index 85a5e826..d279fafc 100644
--- a/src/displayapp/screens/InfiniPaint.cpp
+++ b/src/displayapp/screens/InfiniPaint.cpp
@@ -1,10 +1,15 @@
-#include "InfiniPaint.h"
-#include "../DisplayApp.h"
-#include "../LittleVgl.h"
+#include "displayapp/screens/InfiniPaint.h"
+#include "displayapp/DisplayApp.h"
+#include "displayapp/LittleVgl.h"
+
+#include <algorithm> // std::fill
 
 using namespace Pinetime::Applications::Screens;
 
-InfiniPaint::InfiniPaint(Pinetime::Applications::DisplayApp* app, Pinetime::Components::LittleVgl& lvgl) : Screen(app), lvgl {lvgl} {
+InfiniPaint::InfiniPaint(Pinetime::Applications::DisplayApp* app,
+                         Pinetime::Components::LittleVgl& lvgl,
+                         Pinetime::Controllers::MotorController& motor)
+  : Screen(app), lvgl {lvgl}, motor {motor} {
   std::fill(b, b + bufferSize, selectColor);
 }
 
@@ -15,6 +20,7 @@ InfiniPaint::~InfiniPaint() {
 bool InfiniPaint::OnTouchEvent(Pinetime::Applications::TouchEvents event) {
   switch (event) {
     case Pinetime::Applications::TouchEvents::LongTap:
+      color = (color + 1) % 8;
       switch (color) {
         case 0:
           selectColor = LV_COLOR_MAGENTA;
@@ -47,7 +53,7 @@ bool InfiniPaint::OnTouchEvent(Pinetime::Applications::TouchEvents event) {
       }
 
       std::fill(b, b + bufferSize, selectColor);
-      color++;
+      motor.RunForDuration(35);
       return true;
     default:
       return true;