Merge branch 'develop' of JF/PineTime into master

1 files changed, 20 insertions, 22 deletions

diff --git a/src/displayapp/screens/Twos.h b/src/displayapp/screens/Twos.h
index 7223c7a..3367618 100644
--- a/src/displayapp/screens/Twos.h
+++ b/src/displayapp/screens/Twos.h
@@ -11,30 +11,28 @@ namespace Pinetime {
     };
     namespace Screens {
       class Twos : public Screen {
-        public:
-          Twos(DisplayApp* app);
-          ~Twos() override;
-          bool Refresh() override;
-          
-          bool OnTouchEvent(TouchEvents event) override;
+      public:
+        Twos(DisplayApp* app);
+        ~Twos() override;
+        bool Refresh() override;
 
-        private:
+        bool OnTouchEvent(TouchEvents event) override;
 
-          lv_style_t style_cell1;
-          lv_style_t style_cell2;
-          lv_style_t style_cell3;
-          lv_style_t style_cell4;
-          lv_style_t style_cell5;
-          
-          
-          lv_obj_t *scoreText;
-          lv_obj_t *gridDisplay;
-          Tile grid[4][4];
-          unsigned int score = 0;
-          void updateGridDisplay(Tile grid[][4]);
-          bool tryMerge(Tile grid[][4], int &newRow, int &newCol, int oldRow, int oldCol);
-          bool tryMove(Tile grid[][4], int newRow, int newCol, int oldRow, int oldCol);
-          bool placeNewTile();
+      private:
+        lv_style_t style_cell1;
+        lv_style_t style_cell2;
+        lv_style_t style_cell3;
+        lv_style_t style_cell4;
+        lv_style_t style_cell5;
+
+        lv_obj_t* scoreText;
+        lv_obj_t* gridDisplay;
+        Tile grid[4][4];
+        unsigned int score = 0;
+        void updateGridDisplay(Tile grid[][4]);
+        bool tryMerge(Tile grid[][4], int& newRow, int& newCol, int oldRow, int oldCol);
+        bool tryMove(Tile grid[][4], int newRow, int newCol, int oldRow, int oldCol);
+        bool placeNewTile();
       };
     }
   }