From 2bdff7ed2b490cb8ce5599341e12d707c0ba7fd0 Mon Sep 17 00:00:00 2001
From: JF <jf@codingfield.com>
Date: Thu, 20 Feb 2020 18:17:53 +0100
Subject: Re-enable BLE display on Clock screen

---
 src/DisplayApp/DisplayApp.cpp    |  2 +-
 src/DisplayApp/Screens/Clock.cpp | 10 ++++++----
 src/DisplayApp/Screens/Tile.cpp  |  4 +---
 3 files changed, 8 insertions(+), 8 deletions(-)

(limited to 'src')

diff --git a/src/DisplayApp/DisplayApp.cpp b/src/DisplayApp/DisplayApp.cpp
index 959c84a0..34d81ddc 100644
--- a/src/DisplayApp/DisplayApp.cpp
+++ b/src/DisplayApp/DisplayApp.cpp
@@ -31,7 +31,7 @@ DisplayApp::DisplayApp(Pinetime::Drivers::St7789& lcd,
         batteryController{batteryController},
         bleController{bleController},
         dateTimeController{dateTimeController},
-        currentScreen{new Screens::Tile(this, gfx) } {
+        currentScreen{new Screens::Clock(this, gfx, dateTimeController) } {
   msgQueue = xQueueCreate(queueSize, itemSize);
 }
 
diff --git a/src/DisplayApp/Screens/Clock.cpp b/src/DisplayApp/Screens/Clock.cpp
index 8513d3ed..806a1c2c 100644
--- a/src/DisplayApp/Screens/Clock.cpp
+++ b/src/DisplayApp/Screens/Clock.cpp
@@ -81,10 +81,12 @@ void Clock::Refresh(bool fullRefresh) {
   }
 
   if (fullRefresh || bleState.IsUpdated()) {
-    uint16_t color = (bleState.Get() == BleConnectionStates::Connected) ? 0xffff : 0x0000;
-    gfx.DrawString(10, 0, color, "BLE", &smallFont, false);
-    lv_label_set_text(label_ble, "BLE");
-    // TODO color
+    if(bleState.Get() == BleConnectionStates::Connected) {
+      lv_obj_set_hidden(label_ble, false);
+      lv_label_set_text(label_ble, "BLE");
+    } else {
+      lv_obj_set_hidden(label_ble, true);
+    }
   }
 
   currentDateTime = dateTimeController.CurrentDateTime();
diff --git a/src/DisplayApp/Screens/Tile.cpp b/src/DisplayApp/Screens/Tile.cpp
index d89562c7..ac930ba7 100644
--- a/src/DisplayApp/Screens/Tile.cpp
+++ b/src/DisplayApp/Screens/Tile.cpp
@@ -20,9 +20,7 @@ static void event_handler(lv_obj_t * obj, lv_event_t event) {
   screen->OnObjectEvent(obj, event);
 }
 
-//static const char * btnm_map1[] = {"App1", "App2", "App3", "\n", "App4", "App5", "App11", ""};
-//static const char * btnm_map2[] = {"App6", "App7", "App8", "\n", "App9", "App10", "App22",""};
-static const char * btnm_map1[] = {"App1", ""};
+static const char * btnm_map1[] = {"App1", "App2", "App3", "\n", "App4", "App5", "App11", ""};
 
 Tile::Tile(DisplayApp* app, Pinetime::Components::Gfx &gfx) : Screen(app, gfx) {
 
-- 
cgit v1.2.3