diff options
Diffstat (limited to 'src/displayapp')
| -rw-r--r-- | src/displayapp/Apps.h | 2 | ||||
| -rw-r--r-- | src/displayapp/DisplayApp.cpp | 10 | ||||
| -rw-r--r-- | src/displayapp/Messages.h | 1 | ||||
| -rw-r--r-- | src/displayapp/screens/PassKey.cpp | 24 | ||||
| -rw-r--r-- | src/displayapp/screens/PassKey.h | 21 |
5 files changed, 0 insertions, 58 deletions
diff --git a/src/displayapp/Apps.h b/src/displayapp/Apps.h index 5f7906b..a92adb4 100644 --- a/src/displayapp/Apps.h +++ b/src/displayapp/Apps.h @@ -20,8 +20,6 @@ namespace Pinetime { StopWatch, Motion, Steps, - Weather, - PassKey, QuickSettings, Settings, SettingWatchFace, diff --git a/src/displayapp/DisplayApp.cpp b/src/displayapp/DisplayApp.cpp index 661fd61..6489bb0 100644 --- a/src/displayapp/DisplayApp.cpp +++ b/src/displayapp/DisplayApp.cpp @@ -24,7 +24,6 @@ #include "displayapp/screens/FlashLight.h" #include "displayapp/screens/BatteryInfo.h" #include "displayapp/screens/Steps.h" -#include "displayapp/screens/PassKey.h" #include "displayapp/screens/Error.h" #include "drivers/Cst816s.h" @@ -215,9 +214,6 @@ void DisplayApp::Refresh() { LoadApp(Apps::Alarm, DisplayApp::FullRefreshDirections::None); } break; - case Messages::ShowPairingKey: - LoadApp(Apps::PassKey, DisplayApp::FullRefreshDirections::Up); - break; case Messages::TouchEvent: { if (state != States::Running) { break; @@ -360,12 +356,6 @@ void DisplayApp::LoadApp(Apps app, DisplayApp::FullRefreshDirections direction) currentScreen = std::make_unique<Screens::FirmwareUpdate>(this, bleController); ReturnApp(Apps::Clock, FullRefreshDirections::Down, TouchEvents::None); break; - - case Apps::PassKey: - currentScreen = std::make_unique<Screens::PassKey>(this, bleController.GetPairingKey()); - ReturnApp(Apps::Clock, FullRefreshDirections::Down, TouchEvents::SwipeDown); - break; - case Apps::Notifications: currentScreen = std::make_unique<Screens::Notifications>( this, notificationManager, systemTask->nimble().alertService(), motorController, *systemTask, Screens::Notifications::Modes::Normal); diff --git a/src/displayapp/Messages.h b/src/displayapp/Messages.h index 58df455..57d02be 100644 --- a/src/displayapp/Messages.h +++ b/src/displayapp/Messages.h @@ -19,7 +19,6 @@ namespace Pinetime { UpdateTimeOut, DimScreen, RestoreBrightness, - ShowPairingKey, AlarmTriggered, Clock, BleRadioEnableToggle diff --git a/src/displayapp/screens/PassKey.cpp b/src/displayapp/screens/PassKey.cpp deleted file mode 100644 index 9e43a54..0000000 --- a/src/displayapp/screens/PassKey.cpp +++ /dev/null @@ -1,24 +0,0 @@ -#include "PassKey.h" -#include "displayapp/DisplayApp.h" - -using namespace Pinetime::Applications::Screens; - -PassKey::PassKey(Pinetime::Applications::DisplayApp* app, uint32_t key) : Screen(app) { - passkeyLabel = lv_label_create(lv_scr_act(), nullptr); - lv_obj_set_style_local_text_color(passkeyLabel, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, lv_color_hex(0xFFFF00)); - lv_obj_set_style_local_text_font(passkeyLabel, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, &jetbrains_mono_42); - lv_label_set_text_fmt(passkeyLabel, "%06u", key); - lv_obj_align(passkeyLabel, nullptr, LV_ALIGN_CENTER, 0, -20); - - backgroundLabel = lv_label_create(lv_scr_act(), nullptr); - lv_obj_set_click(backgroundLabel, true); - lv_label_set_long_mode(backgroundLabel, LV_LABEL_LONG_CROP); - lv_obj_set_size(backgroundLabel, 240, 240); - lv_obj_set_pos(backgroundLabel, 0, 0); - lv_label_set_text(backgroundLabel, ""); -} - -PassKey::~PassKey() { - lv_obj_clean(lv_scr_act()); -} - diff --git a/src/displayapp/screens/PassKey.h b/src/displayapp/screens/PassKey.h deleted file mode 100644 index 16e72a3..0000000 --- a/src/displayapp/screens/PassKey.h +++ /dev/null @@ -1,21 +0,0 @@ -#pragma once - -#include "Screen.h" -#include <lvgl/lvgl.h> - -namespace Pinetime { - namespace Applications { - namespace Screens { - - class PassKey : public Screen { - public: - PassKey(DisplayApp* app, uint32_t key); - ~PassKey() override; - - private: - lv_obj_t* passkeyLabel; - lv_obj_t* backgroundLabel; - }; - } - } -} |
