From 12a8eb9d0c27a075d3ee7291a5ee698d6b937641 Mon Sep 17 00:00:00 2001
From: Michael Zanetti <michael_zanetti@gmx.net>
Date: Mon, 30 Aug 2021 16:11:34 +0200
Subject: [PATCH] Fix app name in controloverlay

---
 androidservice/controlviews/Main.qml  | 5 +----
 nymea-app/ui/PushButtonAuthPage.qml   | 2 +-
 nymea-app/ui/mainviews/EnergyView.qml | 2 +-
 3 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/androidservice/controlviews/Main.qml b/androidservice/controlviews/Main.qml
index 5544451f..68a355c2 100644
--- a/androidservice/controlviews/Main.qml
+++ b/androidservice/controlviews/Main.qml
@@ -11,7 +11,7 @@ ApplicationWindow {
     visible: true
     visibility: ApplicationWindow.FullScreen
     color: Material.background
-    title: appName
+    title: Configuration.appName
 
     Material.theme: NymeaUtils.isDark(Style.backgroundColor) ? Material.Dark : Material.Light
     Material.background: Style.backgroundColor
@@ -23,9 +23,6 @@ ApplicationWindow {
     font.capitalization: Font.MixedCase
     font.family: Style.fontFamily
 
-    property string appName: "appBranding" in app ? app.appBranding : "nymea:app"
-    property string systemName: "coreBranding" in app ? app.coreBranding : "nymea"
-
     property int margins: 16
     property int bigMargins: 20
 
diff --git a/nymea-app/ui/PushButtonAuthPage.qml b/nymea-app/ui/PushButtonAuthPage.qml
index efc09614..619048d4 100644
--- a/nymea-app/ui/PushButtonAuthPage.qml
+++ b/nymea-app/ui/PushButtonAuthPage.qml
@@ -87,7 +87,7 @@ Page {
         Label {
             Layout.fillWidth: true
             horizontalAlignment: Text.AlignHCenter
-            text: qsTr("Please press the button on your %1 box to authenticate this device.").arg(Configuration.systemName)
+            text: qsTr("Please press the button on your %1 gateway to authenticate this device.").arg(Configuration.systemName)
             wrapMode: Text.WordWrap
         }
 
diff --git a/nymea-app/ui/mainviews/EnergyView.qml b/nymea-app/ui/mainviews/EnergyView.qml
index 317906df..a77978f0 100644
--- a/nymea-app/ui/mainviews/EnergyView.qml
+++ b/nymea-app/ui/mainviews/EnergyView.qml
@@ -86,7 +86,7 @@ MainViewBase {
                 rootMeter: root.rootMeter
                 meters: consumers
                 title: qsTr("Total consumed energy")
-                visible: consumers.count > 0
+                visible: rootMeterTotalEnergyState || consumers.count > 0
             }
 
             SmartMeterChart {