From 4df809fad1ee60f048cc5b08ddd6f6baaae4b245 Mon Sep 17 00:00:00 2001
From: Itai Nelken <70802936+Itai-Nelken@users.noreply.github.com>
Date: Fri, 3 Sep 2021 16:07:54 +0300
Subject: [PATCH 1/2] Update WatchFaceAnalog.cpp

---
 src/displayapp/screens/WatchFaceAnalog.cpp | 18 ++++++++++++++++--
 1 file changed, 16 insertions(+), 2 deletions(-)

diff --git a/src/displayapp/screens/WatchFaceAnalog.cpp b/src/displayapp/screens/WatchFaceAnalog.cpp
index 75e35c1bdc..df72c5566e 100644
--- a/src/displayapp/screens/WatchFaceAnalog.cpp
+++ b/src/displayapp/screens/WatchFaceAnalog.cpp
@@ -69,6 +69,11 @@ WatchFaceAnalog::WatchFaceAnalog(Pinetime::Applications::DisplayApp* app,
   lv_label_set_text(batteryIcon, Symbols::batteryHalf);
   lv_obj_align(batteryIcon, NULL, LV_ALIGN_IN_TOP_RIGHT, 0, 0);
 
+  batteryPlug = lv_label_create(lv_scr_act(), nullptr);
+  lv_obj_set_style_local_text_color(batteryPlug, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, lv_color_hex(0xFF0000));
+  lv_label_set_text(batteryPlug, Symbols::plug);
+  lv_obj_align(batteryPlug, batteryIcon, LV_ALIGN_IN_TOP_RIGHT, 20, 0);
+
   notificationIcon = lv_label_create(lv_scr_act(), NULL);
   lv_obj_set_style_local_text_color(notificationIcon, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, lv_color_hex(0x00FF00));
   lv_label_set_text(notificationIcon, NotificationIcon::GetIcon(false));
@@ -179,9 +184,18 @@ void WatchFaceAnalog::UpdateClock() {
 void WatchFaceAnalog::Refresh() {
   batteryPercentRemaining = batteryController.PercentRemaining();
   if (batteryPercentRemaining.IsUpdated()) {
-    auto batteryPercent = batteryPercentRemaining.Get();
-    lv_label_set_text(batteryIcon, BatteryIcon::GetBatteryIcon(batteryPercent));
+    if (batteryController.IsCharging()) {
+      auto isCharging = batteryController.IsCharging() || batteryController.IsPowerPresent();
+      lv_label_set_text(batteryPlug, BatteryIcon::GetPlugIcon(isCharging));
+      lv_obj_realign(batteryPlug);
+      lv_label_set_text(batteryIcon, "");
+    } else {
+      auto batteryPercent = batteryPercentRemaining.Get();
+      lv_label_set_text(batteryIcon, BatteryIcon::GetBatteryIcon(batteryPercent));
+      lv_label_set_text(batteryPlug, "");
+    }
   }
+  lv_obj_align(batteryPlug, batteryIcon, LV_ALIGN_IN_TOP_RIGHT, 20, 0);
 
   notificationState = notificationManager.AreNewNotificationsAvailable();
 

From f194a2dc8a5e87034a77639211d5d4a218cde5e5 Mon Sep 17 00:00:00 2001
From: Itai Nelken <70802936+Itai-Nelken@users.noreply.github.com>
Date: Fri, 3 Sep 2021 16:09:57 +0300
Subject: [PATCH 2/2] Update WatchFaceAnalog.h

---
 src/displayapp/screens/WatchFaceAnalog.h | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/displayapp/screens/WatchFaceAnalog.h b/src/displayapp/screens/WatchFaceAnalog.h
index 406f4d50a7..3f78b01596 100644
--- a/src/displayapp/screens/WatchFaceAnalog.h
+++ b/src/displayapp/screens/WatchFaceAnalog.h
@@ -72,6 +72,7 @@ namespace Pinetime {
 
         lv_obj_t* label_date_day;
         lv_obj_t* batteryIcon;
+        lv_obj_t* batteryPlug;
         lv_obj_t* notificationIcon;
 
         Controllers::DateTime& dateTimeController;