1 files changed, 45 insertions, 46 deletions

diff --git a/src/displayapp/screens/ApplicationList.cpp b/src/displayapp/screens/ApplicationList.cpp
index 0f6be27..531636e 100644
--- a/src/displayapp/screens/ApplicationList.cpp
+++ b/src/displayapp/screens/ApplicationList.cpp
@@ -8,78 +8,77 @@
 
 using namespace Pinetime::Applications::Screens;
 
-ApplicationList::ApplicationList(Pinetime::Applications::DisplayApp *app) : 
-    Screen(app),
-    screens{app, {
-      [this]() -> std::unique_ptr<Screen> { return CreateScreen1(); }, 
-      [this]() -> std::unique_ptr<Screen> { return CreateScreen2(); },
-      //[this]() -> std::unique_ptr<Screen> { return CreateScreen3(); }
-      }
-    }
-{
-}
+ApplicationList::ApplicationList(Pinetime::Applications::DisplayApp *app) :
+        Screen(app),
+        screens{app, {
+                [this]() -> std::unique_ptr<Screen> { return CreateScreen1(); },
+                [this]() -> std::unique_ptr<Screen> { return CreateScreen2(); },
+                //[this]() -> std::unique_ptr<Screen> { return CreateScreen3(); }
+          }
+        } {}
+
 
-ApplicationList::~ApplicationList()
-{
+ApplicationList::~ApplicationList() {
   lv_obj_clean(lv_scr_act());
 }
 
-bool ApplicationList::Refresh()
-{
-  if (running)
+bool ApplicationList::Refresh() {
+  if(running)
     running = screens.Refresh();
   return running;
 }
 
-bool ApplicationList::OnButtonPushed()
-{
+bool ApplicationList::OnButtonPushed() {
   running = false;
   app->StartApp(Apps::Clock);
   return true;
 }
 
-bool ApplicationList::OnTouchEvent(Pinetime::Applications::TouchEvents event)
-{
+bool ApplicationList::OnTouchEvent(Pinetime::Applications::TouchEvents event) {
   return screens.OnTouchEvent(event);
 }
 
-std::unique_ptr<Screen> ApplicationList::CreateScreen1()
-{
-  std::array<Screens::Tile::Applications, 6> applications{
-      {{Symbols::clock, Apps::Clock},
-       {Symbols::music, Apps::Music},
-       {Symbols::sun, Apps::Brightness},
-       {Symbols::list, Apps::SysInfo},
-       {Symbols::check, Apps::FirmwareValidation},
-       {Symbols::heartBeat, Apps::HeartRate}}
+std::unique_ptr<Screen> ApplicationList::CreateScreen1() {
+  std::array<Screens::Tile::Applications, 6> applications {
+          {{Symbols::clock, Apps::Clock},
+          {Symbols::music, Apps::Music},
+          {Symbols::sun, Apps::Brightness},
+          {Symbols::list, Apps::SysInfo},
+          {Symbols::check, Apps::FirmwareValidation},
+          {Symbols::heartBeat, Apps::HeartRate}
+          }
+
 
   };
 
   return std::unique_ptr<Screen>(new Screens::Tile(app, applications));
 }
 
-std::unique_ptr<Screen> ApplicationList::CreateScreen2()
-{
-  std::array<Screens::Tile::Applications, 6> applications{
-      {{Symbols::map, Apps::Navigation},
-       {Symbols::asterisk, Apps::Meter},
-       {Symbols::paintbrush, Apps::Paint},
-       {Symbols::info, Apps::Notifications},
-       {Symbols::paddle, Apps::Paddle},
-       {"2", Apps::Twos}}};
+std::unique_ptr<Screen> ApplicationList::CreateScreen2() {
+  std::array<Screens::Tile::Applications, 6> applications {
+          {{Symbols::map, Apps::Navigation},
+           {Symbols::asterisk, Apps::Meter},
+           {Symbols::paintbrush, Apps::Paint},
+                  {Symbols::info, Apps::Notifications},
+                  {Symbols::paddle, Apps::Paddle},
+                  {"2", Apps::Twos}
+          }
+  };
 
   return std::unique_ptr<Screen>(new Screens::Tile(app, applications));
 }
 
-std::unique_ptr<Screen> ApplicationList::CreateScreen3()
-{
-  std::array<Screens::Tile::Applications, 6> applications{
-      {{"A", Apps::Meter},
-       {"B", Apps::None},
-       {"C", Apps::Clock},
-       {"D", Apps::Music},
-       {"E", Apps::SysInfo},
-       {"F", Apps::Brightness}}};
+std::unique_ptr<Screen> ApplicationList::CreateScreen3() {
+  std::array<Screens::Tile::Applications, 6> applications {
+          {{"A", Apps::Meter},
+           {"B", Apps::Navigation},
+           {"C", Apps::Clock},
+           {"D", Apps::Music},
+           {"E", Apps::SysInfo},
+           {"F", Apps::Brightness}
+          }
+  };
 
   return std::unique_ptr<Screen>(new Screens::Tile(app, applications));
 }
+