Skip to content

Commit 6f595c7

Browse files
authored
Hide feels like when no data is available
1 parent a5a6f04 commit 6f595c7

File tree

1 file changed

+11
-7
lines changed

1 file changed

+11
-7
lines changed

apps/weather/app.js

Lines changed: 11 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -44,14 +44,15 @@ var layout = new Layout({type:"v", bgCol: g.theme.bg, c: [
4444
]},
4545
{type: "v", fillx: 1, c: [
4646
{pad:5},
47+
4748
{type: "h", pad: 2, c: [
4849
{type: "txt", font: "18%", id: "temp", label: "000"},
4950
{type: "txt", font: "12%", valign: -1, id: "tempUnit", label: "°C"},
5051
]},
5152
{filly: 1},
5253
{type: "h", pad: 1, c: [
53-
{type: "txt", font: "6x8", pad: 2, halign: 1, label: /*LANG*/"Feels:"},
54-
{type: "txt", font: "9%", pad: 2, halign: 1, id: "feelslike", label: "35°F"},
54+
{type: "txt", font: "6x8", pad: 2, halign: 1, id: "feelsLikeLabel",label: /*LANG*/"Feels:"},
55+
{type: "txt", font: "9%", pad: 2, halign: 1, id: "feelsLike", label: "35°F"},
5556
]},
5657
{filly: 1},
5758
{type: "h", pad: 2, c: [
@@ -94,9 +95,11 @@ function draw() {
9495
layout.temp.label = temp[1];
9596
layout.tempUnit.label = temp[2];
9697
if (!current || current.feels === undefined){
97-
layout.feelslike.label = "N/A";
98+
layout.feelsLike.label = "";
99+
layout.feelsLikeLabel.label="";
98100
}else{
99-
layout.feelslike.label = feelsLikeTemp[1]+feelsLikeTemp[2];
101+
layout.feelsLike.label = feelsLikeTemp[1]+feelsLikeTemp[2];
102+
layout.feelsLikeLabel.label="Feels: ";
100103
}
101104

102105
layout.hum.label = current.hum+"%";
@@ -106,6 +109,7 @@ function draw() {
106109
layout.cond.label = current.txt.charAt(0).toUpperCase()+(current.txt||'').slice(1);
107110
layout.loc.label = current.loc;
108111
layout.updateTime.label = `${formatDuration(Date.now() - current.time)} ago`; // How to autotranslate this and similar?
112+
//layout.clear(layout.feelsLike);
109113
layout.update();
110114
layout.render();
111115
}
@@ -125,9 +129,9 @@ function update() {
125129
} else {
126130
layout.forgetLazyState();
127131
if (NRF.getSecurityStatus().connected) {
128-
E.showMessage(/*LANG*/"Weather\nunknown\n\nIs Gadgetbridge\nweather\nreporting set\nup on your\nphone?");
132+
E.showMessage(/*LANG*/"Weather data\nexpired.\n\nRe-push weather\ndata from your\nphone");
129133
} else {
130-
E.showMessage(/*LANG*/"Weather\nunknown\n\nGadgetbridge\nnot connected");
134+
E.showMessage(/*LANG*/"Weather data\n has expired.");
131135
NRF.on("connect", update);
132136
}
133137
}
@@ -156,4 +160,4 @@ Bangle.setUI("clock");
156160
// This matters for widgets that hide themselves for clocks, like widclk or widclose
157161
delete Bangle.CLOCK;
158162

159-
Bangle.drawWidgets();
163+
Bangle.drawWidgets();

0 commit comments

Comments
 (0)