Merge branch 'airplane-mode' of https://github.com/evergreen22/InfiniTime into evergreen22-airplane-mode

Apply a few changes that were requested in the PR during the review.

# Conflicts:
#	src/CMakeLists.txt
#	src/displayapp/Apps.h
#	src/displayapp/DisplayApp.cpp
#	src/displayapp/Messages.h
#	src/displayapp/screens/settings/Settings.cpp

1 files changed, 9 insertions, 4 deletions

diff --git a/src/displayapp/screens/WatchFaceTerminal.cpp b/src/displayapp/screens/WatchFaceTerminal.cpp
index 033aad88..ccfbdd0b 100644
--- a/src/displayapp/screens/WatchFaceTerminal.cpp
+++ b/src/displayapp/screens/WatchFaceTerminal.cpp
@@ -114,11 +114,16 @@ void WatchFaceTerminal::Refresh() {
   }
 
   bleState = bleController.IsConnected();
-  if (bleState.IsUpdated()) {
-    if (bleState.Get()) {
-      lv_label_set_text_static(connectState, "[STAT]#387b54 Connected#");
+  bleRadioEnabled = bleController.IsRadioEnabled();
+  if (bleState.IsUpdated() || bleRadioEnabled.IsUpdated()) {
+    if(!bleRadioEnabled.Get()) {
+      lv_label_set_text_static(connectState, "[STAT]#387b54 Disabled#");
     } else {
-      lv_label_set_text_static(connectState, "[STAT]#387b54 Disconnected#");
+      if (bleState.Get()) {
+        lv_label_set_text_static(connectState, "[STAT]#387b54 Connected#");
+      } else {
+        lv_label_set_text_static(connectState, "[STAT]#387b54 Disconnected#");
+      }
     }
   }