From c546cdef99a52885a27ee832245f14fc43973af4 Mon Sep 17 00:00:00 2001
From: Matti Viljanen <matti.viljanen@kapsi.fi>
Date: Sun, 28 Aug 2022 00:54:50 +0300
Subject: [PATCH] Redesign the battery graph

---
 application/qml/components/BatteryGraph.qml | 93 ++++++++++++++++-----
 application/qml/cover/CoverPage.qml         |  1 +
 application/qml/pages/MainPage.qml          |  1 +
 3 files changed, 76 insertions(+), 19 deletions(-)

diff --git a/application/qml/components/BatteryGraph.qml b/application/qml/components/BatteryGraph.qml
index 86d8d40..e0cce2d 100644
--- a/application/qml/components/BatteryGraph.qml
+++ b/application/qml/components/BatteryGraph.qml
@@ -20,39 +20,94 @@ import Sailfish.Silica 1.0
 
 Item {
     id: batteryGraph
-    property real borderSize: width * 0.15
-    property real charge: battery.charge
-    property bool chargerConnected: battery.chargerConnected
+    property real borderSize: width * 0.1
+    property bool enableLowBatteryAnimation
+    property int _charge: battery.charge
+
     height: 1.75 * width
 
+//    Timer {
+//        id: debugChargeAnimation
+//        property int newCharge: -20
+//        repeat: true
+//        running: true
+//        interval: 300
+//        onTriggered: {
+//            newCharge = newCharge + 5
+//            if(newCharge > 120)
+//                newCharge = -20
+//            _charge = newCharge < 0 ? 0 : newCharge > 100 ? 100 : newCharge
+//        }
+//    }
+
+    Timer {
+        id: lowChargeBlink
+        property int counter: 0
+        running: (false && enableLowBatteryAnimation
+                  && !battery.chargerConnected
+                  && _charge <= settings.lowAlert)
+        repeat: true
+        interval: 400
+        onTriggered: {
+            counter = (counter + 1) % 5
+            if(counter === 0) {
+                batteryLevel.opacity = 0.0
+                restoreOpacity.start()
+            }
+        }
+    }
+
+    Timer {
+        id: restoreOpacity
+        running: false
+        repeat: false
+        interval: opacityAnimation.duration
+        onTriggered: batteryLevel.opacity = 1.0
+    }
+
     Rectangle {
         id: battTip
         anchors.top: parent.top
         anchors.horizontalCenter: parent.horizontalCenter
         width: 2 * borderSize
-        height: borderSize
-        color: "white"
-        radius: 0.25 * borderSize
+        height: 1.5 * borderSize
+        color: Theme.highlightBackgroundColor
+        radius: borderSize / 2
     }
     Rectangle {
         id: battBody
-        anchors.top: battTip.verticalCenter
-        anchors.bottom: parent.bottom
-        width: parent.width
-        color: "black"
-        border.color: "white"
+        anchors {
+            top: battTip.verticalCenter
+            bottom: parent.bottom
+            horizontalCenter: parent.horizontalCenter
+        }
+        width: parent.width * 0.75
+        color: "transparent"
+        border.color: Theme.highlightBackgroundColor
         border.width: borderSize
-        radius: 0.25 * borderSize
+        radius: borderSize
 
         Rectangle {
             id: batteryLevel
-            border.color: "black"
-            border.width: 0.4 * borderSize
-            x: borderSize
-            y: parent.height - x - height
-            width: parent.width - 2.0 * x
-            height: (parent.height - 2.0 * x) * charge / 100.0
-            color: charge >= 80 ? "white" : charge >= 50 ? "green" : charge >= 20 ? "orange" : "red"
+            anchors.horizontalCenter: parent.horizontalCenter
+            anchors.bottom: parent.bottom
+            anchors.bottomMargin: borderSize * 1.5
+            width: parent.width - 3 * borderSize
+            height: (borderSize) + ((parent.height - 4 * borderSize) * _charge / 100.0)
+            radius: borderSize / 2
+            opacity: 1.0
+            color: _charge >= 80 ? Theme.highlightBackgroundColor
+                 : _charge >= 50 ? Theme.highlightFromColor("green", Theme.colorScheme)
+                 : _charge >= 20 ? Theme.highlightFromColor("yellow", Theme.colorScheme)
+                 :                 Theme.highlightFromColor("red", Theme.colorScheme)
+            Behavior on color {
+                ColorAnimation {}
+            }
+            Behavior on opacity {
+                NumberAnimation {
+                    id: opacityAnimation
+                }
+            }
         }
     }
 }
diff --git a/application/qml/cover/CoverPage.qml b/application/qml/cover/CoverPage.qml
index b1182fd..9043a73 100644
--- a/application/qml/cover/CoverPage.qml
+++ b/application/qml/cover/CoverPage.qml
@@ -33,6 +33,7 @@ CoverBackground {
             x: coverPage.width * 0.3
             y: coverPage.width * 0.25
             width: 0.35 * coverPage.width
+            enableLowBatteryAnimation: coverPage.status === Cover.Active
         }
         CoverLabel {
             id: chargeLabel
diff --git a/application/qml/pages/MainPage.qml b/application/qml/pages/MainPage.qml
index 8a7bad5..c5a1731 100644
--- a/application/qml/pages/MainPage.qml
+++ b/application/qml/pages/MainPage.qml
@@ -106,6 +106,7 @@ Page {
                         rotation: 90
                         width: parent.width * 0.2
                         anchors.centerIn: parent
+                        enableLowBatteryAnimation: Qt.application.active
                     }
                 }
                 // Detail column