Skip to content

Fixed GPS Bug which was causing crashing in the v0.5.0 version #22

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
allRisc merged 1 commit into from
Oct 5, 2022
Merged

Fixed GPS Bug which was causing crashing in the v0.5.0 version #22

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion manifest.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0"?>
<!-- This is a generated file. It is highly recommended that you DO NOT edit this file. -->
<iq:manifest xmlns:iq="http://www.garmin.com/xml/connectiq" version="3">
<iq:application entry="RefWatchApp" id="62e70bab837e411496ffddb91a2e7e02" launcherIcon="@Drawables.LauncherIcon" minSdkVersion="3.0.0" name="@Strings.AppName" type="watch-app" version="0.5.0">
<iq:application entry="RefWatchApp" id="62e70bab837e411496ffddb91a2e7e02" launcherIcon="@Drawables.LauncherIcon" minSdkVersion="3.0.0" name="@Strings.AppName" type="watch-app" version="0.5.1">
<iq:products>
<iq:product id="fenix5"/>
<iq:product id="fenix5plus"/>
Expand All @@ -14,6 +14,9 @@
<iq:product id="fenix6s"/>
<iq:product id="fenix6spro"/>
<iq:product id="fenix6xpro"/>
<iq:product id="fenix7"/>
<iq:product id="fenix7s"/>
<iq:product id="fenix7x"/>
<iq:product id="fr245"/>
<iq:product id="fr245m"/>
<iq:product id="fr255"/>
Expand Down
208 changes: 104 additions & 104 deletions source/AppData.mc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,14 +27,14 @@ using ViewDrawables as draw;
using Toybox.System;

class AppData {
hidden static var batterySaver;
hidden static var batterySaver;
hidden static var reminderInterval;
hidden static var ncaaMode;
hidden static var gpsOff;
hidden static var darkMode;
hidden static var thickRing;
hidden static var ncaaMode;
hidden static var gpsOff;
hidden static var darkMode;
hidden static var thickRing;
hidden static var separateActivities;
hidden static var periodLength;
hidden static var numPeriods;
hidden static var breakLength;
Expand All @@ -47,7 +47,7 @@ class AppData {
}

static function initAppData() {
batterySaver = Store.getValue(Ui.loadResource(Rez.Strings.BatterySaver_StorageID));
batterySaver = Store.getValue(Ui.loadResource(Rez.Strings.BatterySaver_StorageID));
if (batterySaver == null) {
setBatterySaver(false);
}
Expand All @@ -67,15 +67,15 @@ class AppData {
setGPSOff(false);
}

darkMode = Store.getValue(Ui.loadResource(Rez.Strings.DarkMode_StorageID));
if (darkMode == null) {
setDarkMode(false);
}
thickRing = Store.getValue(Ui.loadResource(Rez.Strings.ThickRing_StorageID));
if (thickRing == null) {
setThickRing(false);
}
darkMode = Store.getValue(Ui.loadResource(Rez.Strings.DarkMode_StorageID));
if (darkMode == null) {
setDarkMode(false);
}
thickRing = Store.getValue(Ui.loadResource(Rez.Strings.ThickRing_StorageID));
if (thickRing == null) {
setThickRing(false);
}

separateActivities = Store.getValue(Ui.loadResource(Rez.Strings.SeparateActivities_StorageID));
if (separateActivities == null) {
Expand Down Expand Up @@ -120,13 +120,13 @@ class AppData {
gpsOff = Store.getValue(Ui.loadResource(Rez.Strings.GPSOff_StorageID));
setGPSOff(gpsOff);

batterySaver = Store.getValue(Ui.loadResource(Rez.Strings.BatterySaver_StorageID));
RTime.updateBatterSaver(batterySaver);
darkMode = Store.getValue(Ui.loadResource(Rez.Strings.DarkMode_StorageID));
draw.setDarkMode(darkMode);
batterySaver = Store.getValue(Ui.loadResource(Rez.Strings.BatterySaver_StorageID));
RTime.updateBatterSaver(batterySaver);
darkMode = Store.getValue(Ui.loadResource(Rez.Strings.DarkMode_StorageID));
draw.setDarkMode(darkMode);

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

static function get(id) {
switch (id) {
case Ui.loadResource(Rez.Strings.BatterySaver_StorageID) :
return batterySaver;
break;
case Ui.loadResource(Rez.Strings.NCAAMode_StorageID) :
return ncaaMode;
break;
case Ui.loadResource(Rez.Strings.GPSOff_StorageID) :
return gpsOff;
break;
case Ui.loadResource(Rez.Strings.DarkMode_StorageID) :
return darkMode;
break;
case Ui.loadResource(Rez.Strings.ThickRing_StorageID) :
return thickRing;
break;
case Ui.loadResource(Rez.Strings.BatterySaver_StorageID) :
return batterySaver;
break;
case Ui.loadResource(Rez.Strings.NCAAMode_StorageID) :
return ncaaMode;
break;
case Ui.loadResource(Rez.Strings.GPSOff_StorageID) :
return gpsOff;
break;
case Ui.loadResource(Rez.Strings.DarkMode_StorageID) :
return darkMode;
break;
case Ui.loadResource(Rez.Strings.ThickRing_StorageID) :
return thickRing;
break;
case Ui.loadResource(Rez.Strings.SeparateActivities_StorageID) :
return separateActivities;
case Ui.loadResource(Rez.Strings.ReminderInterval_StorageID) :
Expand Down Expand Up @@ -182,23 +182,24 @@ class AppData {

static function set(id, val) {
switch (id) {
case Ui.loadResource(Rez.Strings.BatterySaver_StorageID) :
setBatterySaver(val);
break;
case Ui.loadResource(Rez.Strings.NCAAMode_StorageID) :
setNCAAMode(val);
break;
case Ui.loadResource(Rez.Strings.BatterySaver_StorageID) :
setBatterySaver(val);
break;
case Ui.loadResource(Rez.Strings.NCAAMode_StorageID) :
setNCAAMode(val);
break;
case Ui.loadResource(Rez.Strings.GPSOff_StorageID) :
setGPSOff(val);
break;
case Ui.loadResource(Rez.Strings.DarkMode_StorageID) :
setDarkMode(val);
break;
case Ui.loadResource(Rez.Strings.ThickRing_StorageID) :
setThickRing(val);
break;
setGPSOff(val);
break;
case Ui.loadResource(Rez.Strings.DarkMode_StorageID) :
setDarkMode(val);
break;
case Ui.loadResource(Rez.Strings.ThickRing_StorageID) :
setThickRing(val);
break;
case Ui.loadResource(Rez.Strings.SeparateActivities_StorageID) :
setSeparateActivities(val);
break;
case Ui.loadResource(Rez.Strings.ReminderInterval_StorageID) :
setReminderInterval(val);
break;
Expand All @@ -224,25 +225,25 @@ class AppData {
}

// Getter Methods
static function getBatterySaver() {
return batterySaver;
}

static function getNCAAMode() {
return ncaaMode;
}

static function getGPSOff() {
return gpsOff;
static function getBatterySaver() {
return batterySaver;
}

static function getNCAAMode() {
return ncaaMode;
}

static function getGPSOff() {
return gpsOff;
}

static function getDarkMode() {
return darkMode;
}

static function getThickRing() {
return thickRing;
}

static function getDarkMode() {
return darkMode;
}

static function getThickRing() {
return thickRing;
}

static function getSeparateActivities() {
return separateActivities;
Expand Down Expand Up @@ -276,41 +277,40 @@ class AppData {
return numOTPeriods;
}

// Setter Methods
static function setBatterySaver(val) {
batterySaver = val;
RTime.updateBatterSaver(val);
Store.setValue(Ui.loadResource(Rez.Strings.BatterySaver_StorageID), val);
}

static function setNCAAMode(val) {
ncaaMode = val;
Store.setValue(Ui.loadResource(Rez.Strings.NCAAMode_StorageID), val);
}

static function setGPSOff(val) {
gpsOff = val;

var callback = new Lang.Method(RefWatchApp, :onPosition);
if (val) {
Position.enableLocationEvents(Position.LOCATION_DISABLE, callback);
} else {
Position.enableLocationEvents(Position.LOCATION_CONTINUOUS, callback);
}

Store.setValue(Ui.loadResource(Rez.Strings.GPSOff_StorageID), val);
}

static function setDarkMode(val) {
darkMode = val;
draw.setDarkMode(val);
Store.setValue(Ui.loadResource(Rez.Strings.DarkMode_StorageID), val);
}

static function setThickRing(val) {
thickRing = val;
Store.setValue(Ui.loadResource(Rez.Strings.ThickRing_StorageID), val);
}
// Setter Methods
static function setBatterySaver(val) {
batterySaver = val;
RTime.updateBatterSaver(val);
Store.setValue(Ui.loadResource(Rez.Strings.BatterySaver_StorageID), val);
}

static function setNCAAMode(val) {
ncaaMode = val;
Store.setValue(Ui.loadResource(Rez.Strings.NCAAMode_StorageID), val);
}

static function setGPSOff(val) {
gpsOff = val;

if (val) {
Position.enableLocationEvents(Position.LOCATION_DISABLE, null);
} else {
Position.enableLocationEvents(Position.LOCATION_CONTINUOUS, null);
}

Store.setValue(Ui.loadResource(Rez.Strings.GPSOff_StorageID), val);
}

static function setDarkMode(val) {
darkMode = val;
draw.setDarkMode(val);
Store.setValue(Ui.loadResource(Rez.Strings.DarkMode_StorageID), val);
}

static function setThickRing(val) {
thickRing = val;
Store.setValue(Ui.loadResource(Rez.Strings.ThickRing_StorageID), val);
}

static function setSeparateActivities(val) {
separateActivities = val;
Expand Down