InfiniTime.git

diff --git a/src/displayapp/screens/settings/SettingBluetooth.cpp b/src/displayapp/screens/settings/SettingBluetooth.cpp
index 177e18703c0fc4acb0e95685e57ff5dd7640de95..fd07be8851bb97ac589a7be4983d3c6472936b9d 100644
--- a/src/displayapp/screens/settings/SettingBluetooth.cpp
+++ b/src/displayapp/screens/settings/SettingBluetooth.cpp
@@ -9,84 +9,52 @@
 using namespace Pinetime::Applications::Screens;
 
 namespace {
-  void OnBluetoothDisabledEvent(lv_obj_t* obj, lv_event_t event) {
-    auto* screen = static_cast<SettingBluetooth*>(obj->user_data);
-    screen->OnBluetoothDisabled(event);
-  }
+  struct Option {
+    const char* name;
+    bool radioEnabled;
+  };
 
-  void OnBluetoothEnabledEvent(lv_obj_t* obj, lv_event_t event) {
-    auto* screen = static_cast<SettingBluetooth*>(obj->user_data);
-    screen->OnBluetoothEnabled(event);
-  }
+  constexpr std::array<Option, 2> options = {{
+    {"Enabled", true},
+    {"Disabled", false},
+  }};
+
+  std::array<CheckboxList::Item, CheckboxList::MaxItems> CreateOptionArray() {
+    std::array<Pinetime::Applications::Screens::CheckboxList::Item, CheckboxList::MaxItems> optionArray;
+    for (size_t i = 0; i < CheckboxList::MaxItems; i++) {
+      if (i >= options.size()) {
+        optionArray[i].name = "";
+        optionArray[i].enabled = false;
+      } else {
+        optionArray[i].name = options[i].name;
+        optionArray[i].enabled = true;
+      }
+    }
+    return optionArray;
+  };
 }
 
 SettingBluetooth::SettingBluetooth(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, "Bluetooth");
-  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::bluetooth);
-  lv_label_set_align(icon, LV_LABEL_ALIGN_CENTER);
-  lv_obj_align(icon, title, LV_ALIGN_OUT_LEFT_MID, -10, 0);
-
-  cbEnabled = lv_checkbox_create(container1, nullptr);
-  lv_checkbox_set_text(cbEnabled, " Enabled");
-  cbEnabled->user_data = this;
-  lv_obj_set_event_cb(cbEnabled, OnBluetoothEnabledEvent);
-  SetRadioButtonStyle(cbEnabled);
-
-  cbDisabled = lv_checkbox_create(container1, nullptr);
-  lv_checkbox_set_text(cbDisabled, " Disabled");
-  cbDisabled->user_data = this;
-  lv_obj_set_event_cb(cbDisabled, OnBluetoothDisabledEvent);
-  SetRadioButtonStyle(cbDisabled);
-
-  if (settingsController.GetBleRadioEnabled()) {
-    lv_checkbox_set_checked(cbEnabled, true);
-    priorMode = true;
-  } else {
-    lv_checkbox_set_checked(cbDisabled, true);
-    priorMode = false;
-  }
+  : Screen(app),
+    checkboxList(
+      0,
+      1,
+      app,
+      "Bluetooth",
+      Symbols::bluetooth,
+      settingsController.GetBleRadioEnabled() ? 0 : 1,
+      [&settings = settingsController](uint32_t index) {
+        const bool priorMode = settings.GetBleRadioEnabled();
+        const bool newMode = options[index].radioEnabled;
+        if (newMode != priorMode) {
+          settings.SetBleRadioEnabled(newMode);
+        }
+      },
+      CreateOptionArray()) {
 }
 
 SettingBluetooth::~SettingBluetooth() {
   lv_obj_clean(lv_scr_act());
-  // Do not call SaveSettings - see src/components/settings/Settings.h
-  if (priorMode != settingsController.GetBleRadioEnabled()) {
-    app->PushMessage(Pinetime::Applications::Display::Messages::BleRadioEnableToggle);
-  }
-}
-
-void SettingBluetooth::OnBluetoothDisabled(lv_event_t event) {
-  if (event == LV_EVENT_VALUE_CHANGED) {
-    lv_checkbox_set_checked(cbEnabled, false);
-    lv_checkbox_set_checked(cbDisabled, true);
-    settingsController.SetBleRadioEnabled(false);
-  }
-}
-
-void SettingBluetooth::OnBluetoothEnabled(lv_event_t event) {
-  if (event == LV_EVENT_VALUE_CHANGED) {
-    lv_checkbox_set_checked(cbEnabled, true);
-    lv_checkbox_set_checked(cbDisabled, false);
-    settingsController.SetBleRadioEnabled(true);
-  }
+  // Pushing the message in the OnValueChanged function causes a freeze?
+  app->PushMessage(Pinetime::Applications::Display::Messages::BleRadioEnableToggle);
 }




diff --git a/src/displayapp/screens/settings/SettingBluetooth.h b/src/displayapp/screens/settings/SettingBluetooth.h
index 35efcafe7fc67f9c13fac578bcd15168f1da76c4..611a0d5ce9e409383d92bf0dc99f1f188b4048d3 100644
--- a/src/displayapp/screens/settings/SettingBluetooth.h
+++ b/src/displayapp/screens/settings/SettingBluetooth.h
@@ -6,6 +6,7 @@ #include 
 
 #include "components/settings/Settings.h"
 #include "displayapp/screens/Screen.h"
+#include "displayapp/screens/CheckboxList.h"
 
 namespace Pinetime {
 
@@ -17,14 +18,8 @@       public:
         SettingBluetooth(DisplayApp* app, Pinetime::Controllers::Settings& settingsController);
         ~SettingBluetooth() override;
 
-        void OnBluetoothEnabled(lv_event_t event);
-        void OnBluetoothDisabled(lv_event_t event);
-
       private:
-        Controllers::Settings& settingsController;
-        lv_obj_t* cbEnabled;
-        lv_obj_t* cbDisabled;
-        bool priorMode;
+        CheckboxList checkboxList;
       };
     }
   }