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, 4 insertions, 3 deletions

diff --git a/src/displayapp/screens/settings/SettingAirplaneMode.h b/src/displayapp/screens/settings/SettingAirplaneMode.h
index fcc02228..b3478c64 100644
--- a/src/displayapp/screens/settings/SettingAirplaneMode.h
+++ b/src/displayapp/screens/settings/SettingAirplaneMode.h
@@ -17,12 +17,13 @@ namespace Pinetime {
         SettingAirplaneMode(DisplayApp* app, Pinetime::Controllers::Settings& settingsController);
         ~SettingAirplaneMode() override;
 
-        void UpdateSelected(lv_obj_t* object, lv_event_t event);
+        void OnAirplaneModeEnabled(lv_obj_t* object, lv_event_t event);
+        void OnAirplaneModeDisabled(lv_obj_t* object, lv_event_t event);
 
       private:
-        static constexpr std::array<const char*, 2> options = {" No", " Yes"};
         Controllers::Settings& settingsController;
-        lv_obj_t* cbOption[options.size()];
+        lv_obj_t* cbEnabled;
+        lv_obj_t* cbDisabled;
         bool priorMode;
       };
     }