fix: stuck charging screen issue (#487)

Closes #462

Author: martonborzak

main.qml

@@ -231,9 +231,33 @@ ApplicationWindow {
         width: 480; height: 800
         x: 0; y: 0
         asynchronous: true
-        source: "qrc:/basic_ui/ChargingScreen.qml"
         visible: StandbyControl.mode == StandbyControl.ON || StandbyControl.mode == StandbyControl.DIM
-        active: visible
+        active: false
+    }
+
+    Connections {
+        target: Battery
+
+        onIsChargingChanged: {
+            if (Battery.isCharging) {
+                chargingScreen.setSource("qrc:/basic_ui/ChargingScreen.qml");
+                chargingScreen.active = true;
+            } else {
+                chargingScreenTimer.start();
+            }
+        }
+    }
+
+    Timer {
+        id: chargingScreenTimer
+        repeat: false
+        interval: 700
+        running: false
+
+        onTriggered: {
+            chargingScreen.setSource("");
+            chargingScreen.active = false;
+        }
     }
 
 

sources/hardware/linux/arm/bq27441.cpp

@@ -29,6 +29,7 @@
 #include <QtDebug>
 
 #include "../../../notifications.h"
+#include "../../../standbycontrol.h"
 #include "QFile"
 
 static Q_LOGGING_CATEGORY(CLASS_LC, "hw.dev.BQ27441");
@@ -47,6 +48,9 @@ BQ27441::BQ27441(InterruptHandler *interruptHandler, const QString &i2cDevice, i
             updateBatteryValues();
         }
     });
+
+    StandbyControl *standbyControl = StandbyControl::getInstance();
+    connect(standbyControl, &StandbyControl::standByOff, this, [=]() { updateBatteryValues(); });
 }
 
 BQ27441::~BQ27441() { close(); }

sources/standbycontrol.cpp

@@ -153,8 +153,13 @@ void StandbyControl::wakeup() {
             // start bluetooth scanning
 
             // reset battery charging screen
-            QObject *showClock = m_config->getQMLObject("showClock");
-            QMetaObject::invokeMethod(showClock, "start", Qt::AutoConnection);
+            if (m_batteryFuelGauge->getIsCharging()) {
+                qCDebug(CLASS_LC()) << "Battery is charging";
+                QObject *showClock = m_config->getQMLObject("showClock");
+                QMetaObject::invokeMethod(showClock, "start", Qt::AutoConnection);
+            } else {
+                qCDebug(CLASS_LC()) << "Battery not is charging";
+            }
 
             QTimer::singleShot(300, this, [=]() {
                 // disable touch event catcher