Merge branch 'develop' into notification-title

# Conflicts:
#	src/displayapp/screens/Notifications.cpp

1 files changed, 3 insertions, 3 deletions

diff --git a/src/displayapp/screens/InfiniPaint.h b/src/displayapp/screens/InfiniPaint.h
index 9a7ac076..da9c39ba 100644
--- a/src/displayapp/screens/InfiniPaint.h
+++ b/src/displayapp/screens/InfiniPaint.h
@@ -19,8 +19,6 @@ namespace Pinetime {
 
         bool Refresh() override;
 
-        bool OnButtonPushed() override;
-
         bool OnTouchEvent(TouchEvents event) override;
 
         bool OnTouchEvent(uint16_t x, uint16_t y) override;
@@ -31,7 +29,9 @@ namespace Pinetime {
         static constexpr uint16_t height = 10;
         static constexpr uint16_t bufferSize = width * height;
         lv_color_t b[bufferSize];
-        bool running = true;
+        lv_color_t selectColor = LV_COLOR_WHITE;
+        uint8_t color = 2;
+        
       };
     }
   }