summaryrefslogtreecommitdiff
path: root/src/displayapp/screens/settings
diff options
context:
space:
mode:
authorJames A. Jerkins <evergreen@jamesjerkinscomputer.com>2021-12-24 02:30:14 (GMT)
committerJames A. Jerkins <evergreen@jamesjerkinscomputer.com>2021-12-24 02:30:14 (GMT)
commit319030d9e16e833cf8bff569a9ecfa452165ea27 (patch)
treeae2890204710ac41fd7f637ac1c367c09f671009 /src/displayapp/screens/settings
parent3b0b48020d96353fc6cd114aa80fc2fec98363a3 (diff)
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
Diffstat (limited to 'src/displayapp/screens/settings')
-rw-r--r--src/displayapp/screens/settings/SettingAirplaneMode.cpp89
-rw-r--r--src/displayapp/screens/settings/SettingAirplaneMode.h30
-rw-r--r--src/displayapp/screens/settings/Settings.cpp22
3 files changed, 130 insertions, 11 deletions
diff --git a/src/displayapp/screens/settings/SettingAirplaneMode.cpp b/src/displayapp/screens/settings/SettingAirplaneMode.cpp
new file mode 100644
index 0000000..0a364de
--- /dev/null
+++ b/src/displayapp/screens/settings/SettingAirplaneMode.cpp
@@ -0,0 +1,89 @@
+#include "displayapp/screens/settings/SettingAirplaneMode.h"
+#include <lvgl/lvgl.h>
+#include "displayapp/DisplayApp.h"
+#include "displayapp/Messages.h"
+#include "displayapp/screens/Styles.h"
+#include "displayapp/screens/Screen.h"
+#include "displayapp/screens/Symbols.h"
+
+using namespace Pinetime::Applications::Screens;
+
+namespace {
+ static void event_handler(lv_obj_t* obj, lv_event_t event) {
+ SettingAirplaneMode* screen = static_cast<SettingAirplaneMode*>(obj->user_data);
+ screen->UpdateSelected(obj, event);
+ }
+}
+
+constexpr std::array<const char*, 2> SettingAirplaneMode::options;
+
+SettingAirplaneMode::SettingAirplaneMode(Pinetime::Applications::DisplayApp* app, Pinetime::Controllers::Settings& settingsController)
+ : Screen(app), settingsController {settingsController} {
+
+ lv_obj_t* container1 = lv_cont_create(lv_scr_act(), nullptr);
+
+ lv_obj_set_style_local_bg_opa(container1, LV_CONT_PART_MAIN, LV_STATE_DEFAULT, LV_OPA_TRANSP);
+ lv_obj_set_style_local_pad_all(container1, LV_CONT_PART_MAIN, LV_STATE_DEFAULT, 10);
+ lv_obj_set_style_local_pad_inner(container1, LV_CONT_PART_MAIN, LV_STATE_DEFAULT, 5);
+ lv_obj_set_style_local_border_width(container1, LV_CONT_PART_MAIN, LV_STATE_DEFAULT, 0);
+
+ lv_obj_set_pos(container1, 10, 60);
+ lv_obj_set_width(container1, LV_HOR_RES - 20);
+ lv_obj_set_height(container1, LV_VER_RES - 50);
+ lv_cont_set_layout(container1, LV_LAYOUT_COLUMN_LEFT);
+
+ lv_obj_t* title = lv_label_create(lv_scr_act(), nullptr);
+ lv_label_set_text_static(title, "Airplane mode");
+ lv_label_set_align(title, LV_LABEL_ALIGN_CENTER);
+ lv_obj_align(title, lv_scr_act(), LV_ALIGN_IN_TOP_MID, 15, 15);
+
+ lv_obj_t* icon = lv_label_create(lv_scr_act(), nullptr);
+ lv_obj_set_style_local_text_color(icon, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, LV_COLOR_ORANGE);
+ lv_label_set_text_static(icon, Symbols::airplane);
+ lv_label_set_align(icon, LV_LABEL_ALIGN_CENTER);
+ lv_obj_align(icon, title, LV_ALIGN_OUT_LEFT_MID, -10, 0);
+
+ for (unsigned int i = 0; i < options.size(); i++) {
+ cbOption[i] = lv_checkbox_create(container1, nullptr);
+ lv_checkbox_set_text(cbOption[i], options[i]);
+ cbOption[i]->user_data = this;
+ lv_obj_set_event_cb(cbOption[i], event_handler);
+ SetRadioButtonStyle(cbOption[i]);
+ }
+
+ if (settingsController.GetAirplaneMode() == false) {
+ lv_checkbox_set_checked(cbOption[0], true);
+ priorMode = false;
+ } else {
+ lv_checkbox_set_checked(cbOption[1], true);
+ priorMode = true;
+ }
+}
+
+SettingAirplaneMode::~SettingAirplaneMode() {
+ lv_obj_clean(lv_scr_act());
+ // Do not call SaveSettings - see src/components/settings/Settings.h
+ if (priorMode != settingsController.GetAirplaneMode()) {
+ app->PushMessage(Pinetime::Applications::Display::Messages::AirplaneModeToggle);
+ }
+}
+
+void SettingAirplaneMode::UpdateSelected(lv_obj_t* object, lv_event_t event) {
+ if (event == LV_EVENT_VALUE_CHANGED) {
+ for (unsigned int i = 0; i < options.size(); i++) {
+ if (object == cbOption[i]) {
+ lv_checkbox_set_checked(cbOption[i], true);
+
+ if (i == 0) {
+ settingsController.SetAirplaneMode(false);
+ };
+ if (i == 1) {
+ settingsController.SetAirplaneMode(true);
+ };
+
+ } else {
+ lv_checkbox_set_checked(cbOption[i], false);
+ }
+ }
+ }
+}
diff --git a/src/displayapp/screens/settings/SettingAirplaneMode.h b/src/displayapp/screens/settings/SettingAirplaneMode.h
new file mode 100644
index 0000000..fcc0222
--- /dev/null
+++ b/src/displayapp/screens/settings/SettingAirplaneMode.h
@@ -0,0 +1,30 @@
+#pragma once
+
+#include <array>
+#include <cstdint>
+#include <lvgl/lvgl.h>
+
+#include "components/settings/Settings.h"
+#include "displayapp/screens/Screen.h"
+
+namespace Pinetime {
+
+ namespace Applications {
+ namespace Screens {
+
+ class SettingAirplaneMode : public Screen {
+ public:
+ SettingAirplaneMode(DisplayApp* app, Pinetime::Controllers::Settings& settingsController);
+ ~SettingAirplaneMode() override;
+
+ void UpdateSelected(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()];
+ bool priorMode;
+ };
+ }
+ }
+}
diff --git a/src/displayapp/screens/settings/Settings.cpp b/src/displayapp/screens/settings/Settings.cpp
index 392c12e..6be00f5 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);