Merge branch 'InfiniTimeOrg:main' into main

Author: tituscmd

src/displayapp/DisplayApp.cpp

@@ -476,9 +476,6 @@ void DisplayApp::Refresh() {
         LoadNewScreen(Apps::Clock, DisplayApp::FullRefreshDirections::None);
         motorController.RunForDuration(35);
         break;
-      case Messages::OnChargingEvent:
-        motorController.RunForDuration(15);
-        break;
     }
   }
 

src/displayapp/Messages.h

@@ -24,7 +24,6 @@ namespace Pinetime {
         AlarmTriggered,
         Chime,
         BleRadioEnableToggle,
-        OnChargingEvent,
       };
     }
   }

src/displayapp/screens/FirmwareUpdate.cpp

@@ -2,6 +2,7 @@
 #include <lvgl/lvgl.h>
 #include "components/ble/BleController.h"
 #include "displayapp/DisplayApp.h"
+#include "displayapp/InfiniTimeTheme.h"
 
 using namespace Pinetime::Applications::Screens;
 
@@ -12,6 +13,9 @@ FirmwareUpdate::FirmwareUpdate(const Pinetime::Controllers::Ble& bleController)
   lv_obj_align(titleLabel, nullptr, LV_ALIGN_IN_TOP_MID, 0, 50);
 
   bar1 = lv_bar_create(lv_scr_act(), nullptr);
+  lv_obj_set_style_local_bg_color(bar1, LV_BAR_PART_BG, LV_STATE_DEFAULT, Colors::bgAlt);
+  lv_obj_set_style_local_bg_opa(bar1, LV_BAR_PART_BG, LV_STATE_DEFAULT, LV_OPA_100);
+  lv_obj_set_style_local_radius(bar1, LV_BAR_PART_BG, LV_STATE_DEFAULT, LV_RADIUS_CIRCLE);
   lv_obj_set_size(bar1, 200, 30);
   lv_obj_align(bar1, nullptr, LV_ALIGN_CENTER, 0, 0);
   lv_bar_set_range(bar1, 0, 1000);
@@ -75,7 +79,7 @@ void FirmwareUpdate::DisplayProgression() const {
   const uint32_t total = bleController.FirmwareUpdateTotalBytes();
   const int16_t permille = current / (total / 1000);
 
-  lv_label_set_text_fmt(percentLabel, "%d %%", permille / 10);
+  lv_label_set_text_fmt(percentLabel, "%d%%", permille / 10);
 
   lv_bar_set_value(bar1, permille, LV_ANIM_OFF);
 }

src/displayapp/screens/SystemInfo.cpp

@@ -198,7 +198,7 @@ std::unique_ptr<Screen> SystemInfo::CreateScreen3() {
                         " #808080 Free# %d/%d\n"
                         " #808080 Min free# %d\n"
                         " #808080 Alloc err# %d\n"
-                        " #808080 Ovrfl err# %d\n",
+                        " #808080 Ovrfl err# %d",
                         bleAddr[5],
                         bleAddr[4],
                         bleAddr[3],

src/displayapp/screens/Timer.cpp

@@ -59,8 +59,8 @@ Timer::Timer(Controllers::Timer& timerController) : timer {timerController} {
   lv_obj_set_event_cb(btnPlayPause, btnEventHandler);
   lv_obj_set_size(btnPlayPause, LV_HOR_RES, 50);
 
-  txtPlayPause = lv_label_create(lv_scr_act(), nullptr);
-  lv_obj_align(txtPlayPause, btnPlayPause, LV_ALIGN_CENTER, 0, 0);
+  // Create the label as a child of the button so it stays centered by default
+  txtPlayPause = lv_label_create(btnPlayPause, nullptr);
 
   if (timer.IsRunning()) {
     SetTimerRunning();

src/systemtask/SystemTask.cpp

@@ -339,7 +339,6 @@ void SystemTask::Work() {
         case Messages::OnChargingEvent:
           batteryController.ReadPowerState();
           GoToRunning();
-          displayApp.PushMessage(Applications::Display::Messages::OnChargingEvent);
           break;
         case Messages::MeasureBatteryTimerExpired:
           batteryController.MeasureVoltage();