Skip to content

Commit 23a3489

Browse files
allRiscallRisc
authored
Merge pull request #23 from allRisc/master
v0.5.1 Bug Fix Release
2 parents 878d3cd + c31ef18 commit 23a3489

2 files changed

Lines changed: 108 additions & 105 deletions

File tree

‎manifest.xml‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version="1.0"?>
22
<!-- This is a generated file. It is highly recommended that you DO NOT edit this file. -->
33
<iq:manifest xmlns:iq="http://www.garmin.com/xml/connectiq" version="3">
4-
<iq:application entry="RefWatchApp" id="62e70bab837e411496ffddb91a2e7e02" launcherIcon="@Drawables.LauncherIcon" minSdkVersion="3.0.0" name="@Strings.AppName" type="watch-app" version="0.5.0">
4+
<iq:application entry="RefWatchApp" id="62e70bab837e411496ffddb91a2e7e02" launcherIcon="@Drawables.LauncherIcon" minSdkVersion="3.0.0" name="@Strings.AppName" type="watch-app" version="0.5.1">
55
<iq:products>
66
<iq:product id="fenix5"/>
77
<iq:product id="fenix5plus"/>
@@ -14,6 +14,9 @@
1414
<iq:product id="fenix6s"/>
1515
<iq:product id="fenix6spro"/>
1616
<iq:product id="fenix6xpro"/>
17+
<iq:product id="fenix7"/>
18+
<iq:product id="fenix7s"/>
19+
<iq:product id="fenix7x"/>
1720
<iq:product id="fr245"/>
1821
<iq:product id="fr245m"/>
1922
<iq:product id="fr255"/>

‎source/AppData.mc‎

Lines changed: 104 additions & 104 deletions
Original file line numberDiff line numberDiff line change
@@ -27,14 +27,14 @@ using ViewDrawables as draw;
2727
using Toybox.System;
2828

2929
class AppData {
30-
hidden static var batterySaver;
30+
hidden static var batterySaver;
3131
hidden static var reminderInterval;
32-
hidden static var ncaaMode;
33-
hidden static var gpsOff;
34-
hidden static var darkMode;
35-
hidden static var thickRing;
32+
hidden static var ncaaMode;
33+
hidden static var gpsOff;
34+
hidden static var darkMode;
35+
hidden static var thickRing;
3636
hidden static var separateActivities;
37-
37+
3838
hidden static var periodLength;
3939
hidden static var numPeriods;
4040
hidden static var breakLength;
@@ -47,7 +47,7 @@ class AppData {
4747
}
4848

4949
static function initAppData() {
50-
batterySaver = Store.getValue(Ui.loadResource(Rez.Strings.BatterySaver_StorageID));
50+
batterySaver = Store.getValue(Ui.loadResource(Rez.Strings.BatterySaver_StorageID));
5151
if (batterySaver == null) {
5252
setBatterySaver(false);
5353
}
@@ -67,15 +67,15 @@ class AppData {
6767
setGPSOff(false);
6868
}
6969

70-
darkMode = Store.getValue(Ui.loadResource(Rez.Strings.DarkMode_StorageID));
71-
if (darkMode == null) {
72-
setDarkMode(false);
73-
}
74-
75-
thickRing = Store.getValue(Ui.loadResource(Rez.Strings.ThickRing_StorageID));
76-
if (thickRing == null) {
77-
setThickRing(false);
78-
}
70+
darkMode = Store.getValue(Ui.loadResource(Rez.Strings.DarkMode_StorageID));
71+
if (darkMode == null) {
72+
setDarkMode(false);
73+
}
74+
75+
thickRing = Store.getValue(Ui.loadResource(Rez.Strings.ThickRing_StorageID));
76+
if (thickRing == null) {
77+
setThickRing(false);
78+
}
7979

8080
separateActivities = Store.getValue(Ui.loadResource(Rez.Strings.SeparateActivities_StorageID));
8181
if (separateActivities == null) {
@@ -120,13 +120,13 @@ class AppData {
120120
gpsOff = Store.getValue(Ui.loadResource(Rez.Strings.GPSOff_StorageID));
121121
setGPSOff(gpsOff);
122122

123-
batterySaver = Store.getValue(Ui.loadResource(Rez.Strings.BatterySaver_StorageID));
124-
RTime.updateBatterSaver(batterySaver);
125-
126-
darkMode = Store.getValue(Ui.loadResource(Rez.Strings.DarkMode_StorageID));
127-
draw.setDarkMode(darkMode);
123+
batterySaver = Store.getValue(Ui.loadResource(Rez.Strings.BatterySaver_StorageID));
124+
RTime.updateBatterSaver(batterySaver);
125+
126+
darkMode = Store.getValue(Ui.loadResource(Rez.Strings.DarkMode_StorageID));
127+
draw.setDarkMode(darkMode);
128128

129-
thickRing = Store.getValue(Ui.loadResource(Rez.Strings.ThickRing_StorageID));
129+
thickRing = Store.getValue(Ui.loadResource(Rez.Strings.ThickRing_StorageID));
130130
separateActivities = Store.getValue(Ui.loadResource(Rez.Strings.SeparateActivities_StorageID));
131131
reminderInterval = Store.getValue(Ui.loadResource(Rez.Strings.ReminderInterval_StorageID));
132132
periodLength = Store.getValue(Ui.loadResource(Rez.Strings.PeriodLength_StorageID));
@@ -139,21 +139,21 @@ class AppData {
139139

140140
static function get(id) {
141141
switch (id) {
142-
case Ui.loadResource(Rez.Strings.BatterySaver_StorageID) :
143-
return batterySaver;
144-
break;
145-
case Ui.loadResource(Rez.Strings.NCAAMode_StorageID) :
146-
return ncaaMode;
147-
break;
148-
case Ui.loadResource(Rez.Strings.GPSOff_StorageID) :
149-
return gpsOff;
150-
break;
151-
case Ui.loadResource(Rez.Strings.DarkMode_StorageID) :
152-
return darkMode;
153-
break;
154-
case Ui.loadResource(Rez.Strings.ThickRing_StorageID) :
155-
return thickRing;
156-
break;
142+
case Ui.loadResource(Rez.Strings.BatterySaver_StorageID) :
143+
return batterySaver;
144+
break;
145+
case Ui.loadResource(Rez.Strings.NCAAMode_StorageID) :
146+
return ncaaMode;
147+
break;
148+
case Ui.loadResource(Rez.Strings.GPSOff_StorageID) :
149+
return gpsOff;
150+
break;
151+
case Ui.loadResource(Rez.Strings.DarkMode_StorageID) :
152+
return darkMode;
153+
break;
154+
case Ui.loadResource(Rez.Strings.ThickRing_StorageID) :
155+
return thickRing;
156+
break;
157157
case Ui.loadResource(Rez.Strings.SeparateActivities_StorageID) :
158158
return separateActivities;
159159
case Ui.loadResource(Rez.Strings.ReminderInterval_StorageID) :
@@ -182,23 +182,24 @@ class AppData {
182182

183183
static function set(id, val) {
184184
switch (id) {
185-
case Ui.loadResource(Rez.Strings.BatterySaver_StorageID) :
186-
setBatterySaver(val);
187-
break;
188-
case Ui.loadResource(Rez.Strings.NCAAMode_StorageID) :
189-
setNCAAMode(val);
190-
break;
185+
case Ui.loadResource(Rez.Strings.BatterySaver_StorageID) :
186+
setBatterySaver(val);
187+
break;
188+
case Ui.loadResource(Rez.Strings.NCAAMode_StorageID) :
189+
setNCAAMode(val);
190+
break;
191191
case Ui.loadResource(Rez.Strings.GPSOff_StorageID) :
192-
setGPSOff(val);
193-
break;
194-
case Ui.loadResource(Rez.Strings.DarkMode_StorageID) :
195-
setDarkMode(val);
196-
break;
197-
case Ui.loadResource(Rez.Strings.ThickRing_StorageID) :
198-
setThickRing(val);
199-
break;
192+
setGPSOff(val);
193+
break;
194+
case Ui.loadResource(Rez.Strings.DarkMode_StorageID) :
195+
setDarkMode(val);
196+
break;
197+
case Ui.loadResource(Rez.Strings.ThickRing_StorageID) :
198+
setThickRing(val);
199+
break;
200200
case Ui.loadResource(Rez.Strings.SeparateActivities_StorageID) :
201201
setSeparateActivities(val);
202+
break;
202203
case Ui.loadResource(Rez.Strings.ReminderInterval_StorageID) :
203204
setReminderInterval(val);
204205
break;
@@ -224,25 +225,25 @@ class AppData {
224225
}
225226

226227
// Getter Methods
227-
static function getBatterySaver() {
228-
return batterySaver;
229-
}
230-
231-
static function getNCAAMode() {
232-
return ncaaMode;
233-
}
234-
235-
static function getGPSOff() {
236-
return gpsOff;
228+
static function getBatterySaver() {
229+
return batterySaver;
230+
}
231+
232+
static function getNCAAMode() {
233+
return ncaaMode;
234+
}
235+
236+
static function getGPSOff() {
237+
return gpsOff;
238+
}
239+
240+
static function getDarkMode() {
241+
return darkMode;
242+
}
243+
244+
static function getThickRing() {
245+
return thickRing;
237246
}
238-
239-
static function getDarkMode() {
240-
return darkMode;
241-
}
242-
243-
static function getThickRing() {
244-
return thickRing;
245-
}
246247

247248
static function getSeparateActivities() {
248249
return separateActivities;
@@ -276,41 +277,40 @@ class AppData {
276277
return numOTPeriods;
277278
}
278279

279-
// Setter Methods
280-
static function setBatterySaver(val) {
281-
batterySaver = val;
282-
RTime.updateBatterSaver(val);
283-
Store.setValue(Ui.loadResource(Rez.Strings.BatterySaver_StorageID), val);
284-
}
285-
286-
static function setNCAAMode(val) {
287-
ncaaMode = val;
288-
Store.setValue(Ui.loadResource(Rez.Strings.NCAAMode_StorageID), val);
289-
}
290-
291-
static function setGPSOff(val) {
292-
gpsOff = val;
293-
294-
var callback = new Lang.Method(RefWatchApp, :onPosition);
295-
if (val) {
296-
Position.enableLocationEvents(Position.LOCATION_DISABLE, callback);
297-
} else {
298-
Position.enableLocationEvents(Position.LOCATION_CONTINUOUS, callback);
299-
}
300-
301-
Store.setValue(Ui.loadResource(Rez.Strings.GPSOff_StorageID), val);
302-
}
303-
304-
static function setDarkMode(val) {
305-
darkMode = val;
306-
draw.setDarkMode(val);
307-
Store.setValue(Ui.loadResource(Rez.Strings.DarkMode_StorageID), val);
308-
}
309-
310-
static function setThickRing(val) {
311-
thickRing = val;
312-
Store.setValue(Ui.loadResource(Rez.Strings.ThickRing_StorageID), val);
313-
}
280+
// Setter Methods
281+
static function setBatterySaver(val) {
282+
batterySaver = val;
283+
RTime.updateBatterSaver(val);
284+
Store.setValue(Ui.loadResource(Rez.Strings.BatterySaver_StorageID), val);
285+
}
286+
287+
static function setNCAAMode(val) {
288+
ncaaMode = val;
289+
Store.setValue(Ui.loadResource(Rez.Strings.NCAAMode_StorageID), val);
290+
}
291+
292+
static function setGPSOff(val) {
293+
gpsOff = val;
294+
295+
if (val) {
296+
Position.enableLocationEvents(Position.LOCATION_DISABLE, null);
297+
} else {
298+
Position.enableLocationEvents(Position.LOCATION_CONTINUOUS, null);
299+
}
300+
301+
Store.setValue(Ui.loadResource(Rez.Strings.GPSOff_StorageID), val);
302+
}
303+
304+
static function setDarkMode(val) {
305+
darkMode = val;
306+
draw.setDarkMode(val);
307+
Store.setValue(Ui.loadResource(Rez.Strings.DarkMode_StorageID), val);
308+
}
309+
310+
static function setThickRing(val) {
311+
thickRing = val;
312+
Store.setValue(Ui.loadResource(Rez.Strings.ThickRing_StorageID), val);
313+
}
314314

315315
static function setSeparateActivities(val) {
316316
separateActivities = val;

0 commit comments

Comments
 (0)