Skip to content

Commit 35130d1

Browse files
committed
v1.6.7
1 parent 10434c2 commit 35130d1

File tree

7 files changed

+14
-36
lines changed

7 files changed

+14
-36
lines changed

resources-deu/strings/strings.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
<!-- runtime strings -->
99
<string id="SelectCapacityMethod">Coloumbzähler</string>
1010
<string id="SelectFitLogging">Daten loggen</string>
11-
<string id="SelectFieldRolling">Felder rotieren</string>
11+
<string id="SelectRotateFields">Felder rotieren</string>
1212
<string id="MenuSettings">Einstellungen</string>
1313
<string id="MenuDatafields">Datenfelder</string>
1414
<string id="Off">-- Aus --</string>

resources/settings/properties.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<property id="appVersion" type="string"></property> <!-- used to display app version -->
33
<property id="BatteryCalcMethod" type="Boolean">false</property> <!-- default use voltage method -->
44
<property id="FitLogging" type="Boolean">false</property> <!-- default don't log data -->
5-
<property id="FieldRolling" type="Boolean">false</property> <!-- default don't roll fields -->
5+
<property id="RotateFields" type="Boolean">false</property> <!-- default don't rotate fields -->
66
<property id="UserSetting1" type="Number">10</property> <!-- default show batt remaining -->
77
<property id="UserSetting2" type="Number">3</property> <!-- default show dynamo power -->
88
<property id="UserSetting3" type="Number">6</property> <!-- default show battery voltage -->

resources/settings/settings.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
<settingConfig type="boolean" />
1313
</setting>
1414

15-
<setting propertyKey="@Properties.FieldRolling" title="@Strings.SelectFieldRolling">
15+
<setting propertyKey="@Properties.RotateFields" title="@Strings.SelectRotateFields">
1616
<settingConfig type="boolean" />
1717
</setting>
1818

resources/strings/strings.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
<!-- runtime strings -->
99
<string id="SelectCapacityMethod">Coloumbcount</string>
1010
<string id="SelectFitLogging">Log data</string>
11-
<string id="SelectFieldRolling">Rotate fields</string>
11+
<string id="SelectRotateFields">Rotate fields</string>
1212
<string id="MenuSettings">Settings</string>
1313
<string id="MenuDatafields">Datafields</string>
1414
<string id="Off">-- hide --</string>

source/ForumsladerApp.mc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ enum {
3434
// settings adjustable by user in garmin mobile app / garmin express
3535
enum {
3636
DisplayField1, DisplayField2, DisplayField3, DisplayField4, // user selected display values
37-
BattCalcMethod, FitLogging, FieldRolling // user configurable switches
37+
BattCalcMethod, FitLogging, RotateFields // user configurable switches
3838
}
3939

4040
// app states
@@ -126,7 +126,7 @@ class ForumsladerApp extends AppBase {
126126
$.UserSettings[$.DisplayField4] = readKey("UserSetting4", 0);
127127
$.UserSettings[$.BattCalcMethod] = readKey("BatteryCalcMethod", false);
128128
$.UserSettings[$.FitLogging] = readKey("FitLogging", false);
129-
$.UserSettings[$.FieldRolling] = readKey("FieldRolling", false);
129+
$.UserSettings[$.RotateFields] = readKey("RotateFields", false);
130130

131131
// get speedunit from garmin device settings
132132
if (System.getDeviceSettings().paceUnits == System.UNIT_METRIC) {

source/ForumsladerSettings.mc

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -37,8 +37,8 @@ class SettingsMenuDelegate extends WatchUi.Menu2InputDelegate {
3737
null, :battCalc, $.UserSettings[$.BattCalcMethod] as Boolean, null));
3838
menu.addItem(new WatchUi.ToggleMenuItem(WatchUi.loadResource($.Rez.Strings.SelectFitLogging) as String,
3939
null, :fitLog, $.UserSettings[$.FitLogging] as Boolean, null));
40-
menu.addItem(new WatchUi.ToggleMenuItem(WatchUi.loadResource($.Rez.Strings.SelectFieldRolling) as String,
41-
null, :fieldRoll, $.UserSettings[$.FieldRolling] as Boolean, null));
40+
menu.addItem(new WatchUi.ToggleMenuItem(WatchUi.loadResource($.Rez.Strings.SelectRotateFields) as String,
41+
null, :fieldRoll, $.UserSettings[$.RotateFields] as Boolean, null));
4242
WatchUi.pushView(menu, new $.SubMenuDelegate(), WatchUi.SLIDE_IMMEDIATE);
4343
} else if (id == :fields) {
4444
// When the fields menu item is selected, push a new menu with picklists generated by custom icons
@@ -89,7 +89,7 @@ class SubMenuDelegate extends WatchUi.Menu2InputDelegate {
8989
} else if (id == :battCalc) {
9090
$.UserSettings[$.BattCalcMethod] = item.isEnabled();
9191
} else if (id == :fieldRoll) {
92-
$.UserSettings[$.FieldRolling] = item.isEnabled();
92+
$.UserSettings[$.RotateFields] = item.isEnabled();
9393
}
9494
}
9595
WatchUi.requestUpdate();
@@ -104,7 +104,7 @@ class SubMenuDelegate extends WatchUi.Menu2InputDelegate {
104104
Properties.setValue("UserSetting4", $.UserSettings[$.DisplayField4] as Number);
105105
Properties.setValue("BatteryCalcMethod", $.UserSettings[$.BattCalcMethod] as Boolean);
106106
Properties.setValue("FitLogging", $.UserSettings[$.FitLogging] as Boolean);
107-
Properties.setValue("FieldRolling", $.UserSettings[$.FieldRolling] as Boolean);
107+
Properties.setValue("RotateFields", $.UserSettings[$.RotateFields] as Boolean);
108108
// go back
109109
WatchUi.popView(WatchUi.SLIDE_IMMEDIATE);
110110
}

source/ForumsladerView.mc

Lines changed: 4 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ class ForumsladerView extends SimpleDataField {
7272

7373
// early exit if no show fields are configured
7474
if ($.UserSettings.slice(0,4).toString().equals("[0, 0, 0, 0]")) {
75-
return "N/A";
75+
return "--";
7676
}
7777

7878
// calculate battery voltage and capacity
@@ -86,9 +86,9 @@ class ForumsladerView extends SimpleDataField {
8686
} else { // use voltage calculation method
8787
_capacity = _data.FLdata[FL_socState];
8888
}
89-
89+
9090
// display up to 4 show fields, either as concatenated string or selective with rotation
91-
if ($.UserSettings[$.FieldRolling] == false) {
91+
if ($.UserSettings[$.RotateFields] == false) {
9292
for (var i = 0; i < 4; i++)
9393
{
9494
if ($.UserSettings[i] > 0) {
@@ -191,26 +191,4 @@ class ForumsladerView extends SimpleDataField {
191191
}
192192
}
193193

194-
}
195-
196-
/*
197-
//! The data field alert
198-
class DataFieldAlertView extends WatchUi.DataFieldAlert {
199-
200-
//! Constructor
201-
public function initialize() {
202-
DataFieldAlert.initialize();
203-
}
204-
205-
//! Update the view
206-
//! @param dc Device context
207-
public function onUpdate(dc as Dc) as Void {
208-
dc.setColor(Graphics.COLOR_BLACK, Graphics.COLOR_BLACK);
209-
dc.clear();
210-
dc.setColor(Graphics.COLOR_WHITE, Graphics.COLOR_TRANSPARENT);
211-
212-
dc.drawText(dc.getWidth() / 2, dc.getHeight() / 2 - 30, Graphics.FONT_SMALL, "Alert: 10 sec elapsed", Graphics.TEXT_JUSTIFY_CENTER);
213-
}
214-
}
215-
216-
*/
194+
}

0 commit comments

Comments
 (0)