ETM-Schurig/powersync-app
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix app name in controloverlay

Browse Source
This commit is contained in:
Michael Zanetti 2021-08-30 16:11:34 +02:00
parent 59cd1d3420
commit 12a8eb9d0c
3 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
androidservice/controlviews/Main.qml
View File

@ -11,7 +11,7 @@ ApplicationWindow {
visible: true visible: true
visibility: ApplicationWindow.FullScreen visibility: ApplicationWindow.FullScreen
color: Material.background color: Material.background
title: appName title: Configuration.appName
Material.theme: NymeaUtils.isDark(Style.backgroundColor) ? Material.Dark : Material.Light Material.theme: NymeaUtils.isDark(Style.backgroundColor) ? Material.Dark : Material.Light
Material.background: Style.backgroundColor Material.background: Style.backgroundColor
@ -23,9 +23,6 @@ ApplicationWindow {
font.capitalization: Font.MixedCase font.capitalization: Font.MixedCase
font.family: Style.fontFamily 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 margins: 16
property int bigMargins: 20 property int bigMargins: 20

2
nymea-app/ui/PushButtonAuthPage.qml
View File

@ -87,7 +87,7 @@ Page {
Label { Label {
Layout.fillWidth: true Layout.fillWidth: true
horizontalAlignment: Text.AlignHCenter 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 wrapMode: Text.WordWrap
} }

2
nymea-app/ui/mainviews/EnergyView.qml
View File

@ -86,7 +86,7 @@ MainViewBase {
rootMeter: root.rootMeter rootMeter: root.rootMeter
meters: consumers meters: consumers
title: qsTr("Total consumed energy") title: qsTr("Total consumed energy")
visible: consumers.count > 0 visible: rootMeterTotalEnergyState || consumers.count > 0
} }
SmartMeterChart { SmartMeterChart {