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, 6 deletions

diff --git a/src/displayapp/screens/BleIcon.cpp b/src/displayapp/screens/BleIcon.cpp
index a30d23b..019f803 100644
--- a/src/displayapp/screens/BleIcon.cpp
+++ b/src/displayapp/screens/BleIcon.cpp
@@ -2,11 +2,14 @@
 #include "displayapp/screens/Symbols.h"
 using namespace Pinetime::Applications::Screens;
 
-const char* BleIcon::GetIcon(Pinetime::Controllers::Ble::ConnectStates state) {
-  if (state == Pinetime::Controllers::Ble::ConnectStates::Connected)
-    return Symbols::bluetooth;
-  else if (state == Pinetime::Controllers::Ble::ConnectStates::Airplane)
+const char* BleIcon::GetIcon(bool isRadioEnabled, bool isConnected) {
+  if(!isRadioEnabled) {
     return Symbols::airplane;
-  else
-    return Symbols::none;
+  }
+
+  if (isConnected) {
+    return Symbols::bluetooth;
+  }
+
+  return Symbols::none;
 }