From 319030d9e16e833cf8bff569a9ecfa452165ea27 Mon Sep 17 00:00:00 2001
From: "James A. Jerkins" <evergreen@jamesjerkinscomputer.com>
Date: Thu, 23 Dec 2021 20:30:14 -0600
Subject: Add airplane mode feature

Implements 'Airplane mode' feature to disable and enable bluetooth/ble
Adds airplaneMode as a non-persisted setting
Adds a setting menu for switching airplane mode on and off
Displays an airplane symbol on the Digital watch face and the
    PineTimeStyle watch face when airplane mode is enabled
Always enables bluetooth/ble on boot (disable airplane mode)
Alphabetizes the settings menu options
Style cleanups

Closes #632
---
 src/displayapp/screens/settings/Settings.cpp | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

(limited to 'src/displayapp/screens/settings/Settings.cpp')

diff --git a/src/displayapp/screens/settings/Settings.cpp b/src/displayapp/screens/settings/Settings.cpp
index 392c12e0..6be00f57 100644
--- a/src/displayapp/screens/settings/Settings.cpp
+++ b/src/displayapp/screens/settings/Settings.cpp
@@ -36,10 +36,10 @@ bool Settings::OnTouchEvent(Pinetime::Applications::TouchEvents event) {
 std::unique_ptr<Screen> Settings::CreateScreen1() {
 
   std::array<Screens::List::Applications, 4> applications {{
-    {Symbols::sun, "Display", Apps::SettingDisplay},
-    {Symbols::eye, "Wake Up", Apps::SettingWakeUp},
-    {Symbols::clock, "Time format", Apps::SettingTimeFormat},
-    {Symbols::home, "Watch face", Apps::SettingWatchFace},
+    {Symbols::list, "About", Apps::SysInfo},
+    {Symbols::airplane, "Airplane mode", Apps::SettingAirplaneMode},
+    {Symbols::batteryHalf, "Battery", Apps::BatteryInfo},
+    {Symbols::sun, "Display", Apps::SettingDisplay}
   }};
 
   return std::make_unique<Screens::List>(0, 3, app, settingsController, applications);
@@ -48,10 +48,10 @@ std::unique_ptr<Screen> Settings::CreateScreen1() {
 std::unique_ptr<Screen> Settings::CreateScreen2() {
 
   std::array<Screens::List::Applications, 4> applications {{
-    {Symbols::shoe, "Steps", Apps::SettingSteps},
+    {Symbols::check, "Firmware", Apps::FirmwareValidation},
+    {Symbols::paintbrush, "PTS colors", Apps::SettingPineTimeStyle},
     {Symbols::clock, "Set date", Apps::SettingSetDate},
-    {Symbols::clock, "Set time", Apps::SettingSetTime},
-    {Symbols::batteryHalf, "Battery", Apps::BatteryInfo}
+    {Symbols::clock, "Set time", Apps::SettingSetTime}
   }};
 
   return std::make_unique<Screens::List>(1, 3, app, settingsController, applications);
@@ -60,10 +60,10 @@ std::unique_ptr<Screen> Settings::CreateScreen2() {
 std::unique_ptr<Screen> Settings::CreateScreen3() {
 
   std::array<Screens::List::Applications, 4> applications {{
-    {Symbols::paintbrush, "PTS Colors", Apps::SettingPineTimeStyle},
-    {Symbols::check, "Firmware", Apps::FirmwareValidation},
-    {Symbols::list, "About", Apps::SysInfo},
-    {Symbols::none, "None", Apps::None},
+    {Symbols::shoe, "Steps", Apps::SettingSteps},
+    {Symbols::clock, "Time format", Apps::SettingTimeFormat},
+    {Symbols::eye, "Wake up", Apps::SettingWakeUp},
+    {Symbols::home, "Watch face", Apps::SettingWatchFace}
   }};
 
   return std::make_unique<Screens::List>(2, 3, app, settingsController, applications);
-- 
cgit v1.2.3-70-g09d2