diff --git a/resources-epix2pro42mm/layouts.xml b/resources-epix2pro42mm/layouts.xml
index 8b94115..31c88f0 100755
--- a/resources-epix2pro42mm/layouts.xml
+++ b/resources-epix2pro42mm/layouts.xml
@@ -26,22 +26,22 @@
-
+
-
+
-
+
-
+
-
+
-
+
diff --git a/resources-epix2pro51mm/layouts.xml b/resources-epix2pro51mm/layouts.xml
index 4b1415f..ea83f31 100755
--- a/resources-epix2pro51mm/layouts.xml
+++ b/resources-epix2pro51mm/layouts.xml
@@ -26,23 +26,23 @@
-
+
-
+
-
-
+
+
-
-
-
-
-
-
+
+
+
+
+
+
diff --git a/resources-round-240x240-f6s-f7s/fonts.xml b/resources-round-240x240-f6s-f7s/fonts.xml
new file mode 100644
index 0000000..07dd1cc
--- /dev/null
+++ b/resources-round-240x240-f6s-f7s/fonts.xml
@@ -0,0 +1,3 @@
+
+
+
diff --git a/resources-round-240x240-f6s-f7s/layouts.xml b/resources-round-240x240-f6s-f7s/layouts.xml
index 6786672..e725d2a 100755
--- a/resources-round-240x240-f6s-f7s/layouts.xml
+++ b/resources-round-240x240-f6s-f7s/layouts.xml
@@ -26,22 +26,22 @@
-
+
-
+
-
+
-
+
-
+
-
+
diff --git a/resources-round-240x240-f6s-f7s/repafield-icons-sm.fnt b/resources-round-240x240-f6s-f7s/repafield-icons-sm.fnt
new file mode 100644
index 0000000..83bd78b
--- /dev/null
+++ b/resources-round-240x240-f6s-f7s/repafield-icons-sm.fnt
@@ -0,0 +1,14 @@
+info face=repafield-icons size=12 unicode=1 bold=0 italic=0 stretchH=100 aa=100 padding=0,0,0,0 spacing=0,0
+common lineHeight=24 base=24 scaleW=168 scaleH=168 pages=1
+page id=0 file=repafield-icons-sm.png
+chars count=10
+char id=48 x=0 y=0 width=24 height=24 xoffset=0 yoffset=0 xadvance=30 page=0 chnl=15
+char id=49 x=24 y=0 width=24 height=24 xoffset=0 yoffset=0 xadvance=30 page=0 chnl=15
+char id=50 x=48 y=0 width=24 height=24 xoffset=0 yoffset=0 xadvance=30 page=0 chnl=15
+char id=51 x=72 y=0 width=24 height=24 xoffset=0 yoffset=0 xadvance=30 page=0 chnl=15
+char id=52 x=96 y=0 width=24 height=24 xoffset=0 yoffset=0 xadvance=30 page=0 chnl=15
+char id=53 x=0 y=24 width=24 height=24 xoffset=0 yoffset=0 xadvance=30 page=0 chnl=15
+char id=54 x=24 y=24 width=24 height=24 xoffset=0 yoffset=0 xadvance=30 page=0 chnl=15
+char id=55 x=48 y=24 width=24 height=24 xoffset=0 yoffset=0 xadvance=30 page=0 chnl=15
+char id=56 x=72 y=24 width=24 height=24 xoffset=0 yoffset=0 xadvance=30 page=0 chnl=15
+char id=57 x=96 y=24 width=24 height=24 xoffset=0 yoffset=0 xadvance=30 page=0 chnl=15
diff --git a/resources-round-240x240-f6s-f7s/repafield-icons-sm.png b/resources-round-240x240-f6s-f7s/repafield-icons-sm.png
new file mode 100644
index 0000000..699d46e
Binary files /dev/null and b/resources-round-240x240-f6s-f7s/repafield-icons-sm.png differ
diff --git a/resources-round-240x240/fonts.xml b/resources-round-240x240/fonts.xml
new file mode 100644
index 0000000..07dd1cc
--- /dev/null
+++ b/resources-round-240x240/fonts.xml
@@ -0,0 +1,3 @@
+
+
+
diff --git a/resources-round-240x240/layouts.xml b/resources-round-240x240/layouts.xml
index dcb4bc0..246c692 100755
--- a/resources-round-240x240/layouts.xml
+++ b/resources-round-240x240/layouts.xml
@@ -26,22 +26,22 @@
-
+
-
+
-
+
-
+
-
+
-
+
diff --git a/resources-round-240x240/repafield-icons-sm.fnt b/resources-round-240x240/repafield-icons-sm.fnt
new file mode 100644
index 0000000..83bd78b
--- /dev/null
+++ b/resources-round-240x240/repafield-icons-sm.fnt
@@ -0,0 +1,14 @@
+info face=repafield-icons size=12 unicode=1 bold=0 italic=0 stretchH=100 aa=100 padding=0,0,0,0 spacing=0,0
+common lineHeight=24 base=24 scaleW=168 scaleH=168 pages=1
+page id=0 file=repafield-icons-sm.png
+chars count=10
+char id=48 x=0 y=0 width=24 height=24 xoffset=0 yoffset=0 xadvance=30 page=0 chnl=15
+char id=49 x=24 y=0 width=24 height=24 xoffset=0 yoffset=0 xadvance=30 page=0 chnl=15
+char id=50 x=48 y=0 width=24 height=24 xoffset=0 yoffset=0 xadvance=30 page=0 chnl=15
+char id=51 x=72 y=0 width=24 height=24 xoffset=0 yoffset=0 xadvance=30 page=0 chnl=15
+char id=52 x=96 y=0 width=24 height=24 xoffset=0 yoffset=0 xadvance=30 page=0 chnl=15
+char id=53 x=0 y=24 width=24 height=24 xoffset=0 yoffset=0 xadvance=30 page=0 chnl=15
+char id=54 x=24 y=24 width=24 height=24 xoffset=0 yoffset=0 xadvance=30 page=0 chnl=15
+char id=55 x=48 y=24 width=24 height=24 xoffset=0 yoffset=0 xadvance=30 page=0 chnl=15
+char id=56 x=72 y=24 width=24 height=24 xoffset=0 yoffset=0 xadvance=30 page=0 chnl=15
+char id=57 x=96 y=24 width=24 height=24 xoffset=0 yoffset=0 xadvance=30 page=0 chnl=15
diff --git a/resources-round-240x240/repafield-icons-sm.png b/resources-round-240x240/repafield-icons-sm.png
new file mode 100644
index 0000000..699d46e
Binary files /dev/null and b/resources-round-240x240/repafield-icons-sm.png differ
diff --git a/resources-round-260x260/fonts.xml b/resources-round-260x260/fonts.xml
new file mode 100644
index 0000000..07dd1cc
--- /dev/null
+++ b/resources-round-260x260/fonts.xml
@@ -0,0 +1,3 @@
+
+
+
diff --git a/resources-round-260x260/layouts.xml b/resources-round-260x260/layouts.xml
index e6185e4..33399b7 100755
--- a/resources-round-260x260/layouts.xml
+++ b/resources-round-260x260/layouts.xml
@@ -26,22 +26,22 @@
-
+
-
+
-
+
-
+
-
+
-
+
diff --git a/resources-round-260x260/repafield-icons-sm.fnt b/resources-round-260x260/repafield-icons-sm.fnt
new file mode 100644
index 0000000..83bd78b
--- /dev/null
+++ b/resources-round-260x260/repafield-icons-sm.fnt
@@ -0,0 +1,14 @@
+info face=repafield-icons size=12 unicode=1 bold=0 italic=0 stretchH=100 aa=100 padding=0,0,0,0 spacing=0,0
+common lineHeight=24 base=24 scaleW=168 scaleH=168 pages=1
+page id=0 file=repafield-icons-sm.png
+chars count=10
+char id=48 x=0 y=0 width=24 height=24 xoffset=0 yoffset=0 xadvance=30 page=0 chnl=15
+char id=49 x=24 y=0 width=24 height=24 xoffset=0 yoffset=0 xadvance=30 page=0 chnl=15
+char id=50 x=48 y=0 width=24 height=24 xoffset=0 yoffset=0 xadvance=30 page=0 chnl=15
+char id=51 x=72 y=0 width=24 height=24 xoffset=0 yoffset=0 xadvance=30 page=0 chnl=15
+char id=52 x=96 y=0 width=24 height=24 xoffset=0 yoffset=0 xadvance=30 page=0 chnl=15
+char id=53 x=0 y=24 width=24 height=24 xoffset=0 yoffset=0 xadvance=30 page=0 chnl=15
+char id=54 x=24 y=24 width=24 height=24 xoffset=0 yoffset=0 xadvance=30 page=0 chnl=15
+char id=55 x=48 y=24 width=24 height=24 xoffset=0 yoffset=0 xadvance=30 page=0 chnl=15
+char id=56 x=72 y=24 width=24 height=24 xoffset=0 yoffset=0 xadvance=30 page=0 chnl=15
+char id=57 x=96 y=24 width=24 height=24 xoffset=0 yoffset=0 xadvance=30 page=0 chnl=15
diff --git a/resources-round-260x260/repafield-icons-sm.png b/resources-round-260x260/repafield-icons-sm.png
new file mode 100644
index 0000000..699d46e
Binary files /dev/null and b/resources-round-260x260/repafield-icons-sm.png differ
diff --git a/resources-round-280x280/fonts.xml b/resources-round-280x280/fonts.xml
new file mode 100644
index 0000000..07dd1cc
--- /dev/null
+++ b/resources-round-280x280/fonts.xml
@@ -0,0 +1,3 @@
+
+
+
diff --git a/resources-round-280x280/layouts.xml b/resources-round-280x280/layouts.xml
index 7968dee..be5a936 100755
--- a/resources-round-280x280/layouts.xml
+++ b/resources-round-280x280/layouts.xml
@@ -26,22 +26,22 @@
-
+
-
+
-
+
-
+
-
+
-
+
diff --git a/resources-round-280x280/repafield-icons-sm.fnt b/resources-round-280x280/repafield-icons-sm.fnt
new file mode 100644
index 0000000..83bd78b
--- /dev/null
+++ b/resources-round-280x280/repafield-icons-sm.fnt
@@ -0,0 +1,14 @@
+info face=repafield-icons size=12 unicode=1 bold=0 italic=0 stretchH=100 aa=100 padding=0,0,0,0 spacing=0,0
+common lineHeight=24 base=24 scaleW=168 scaleH=168 pages=1
+page id=0 file=repafield-icons-sm.png
+chars count=10
+char id=48 x=0 y=0 width=24 height=24 xoffset=0 yoffset=0 xadvance=30 page=0 chnl=15
+char id=49 x=24 y=0 width=24 height=24 xoffset=0 yoffset=0 xadvance=30 page=0 chnl=15
+char id=50 x=48 y=0 width=24 height=24 xoffset=0 yoffset=0 xadvance=30 page=0 chnl=15
+char id=51 x=72 y=0 width=24 height=24 xoffset=0 yoffset=0 xadvance=30 page=0 chnl=15
+char id=52 x=96 y=0 width=24 height=24 xoffset=0 yoffset=0 xadvance=30 page=0 chnl=15
+char id=53 x=0 y=24 width=24 height=24 xoffset=0 yoffset=0 xadvance=30 page=0 chnl=15
+char id=54 x=24 y=24 width=24 height=24 xoffset=0 yoffset=0 xadvance=30 page=0 chnl=15
+char id=55 x=48 y=24 width=24 height=24 xoffset=0 yoffset=0 xadvance=30 page=0 chnl=15
+char id=56 x=72 y=24 width=24 height=24 xoffset=0 yoffset=0 xadvance=30 page=0 chnl=15
+char id=57 x=96 y=24 width=24 height=24 xoffset=0 yoffset=0 xadvance=30 page=0 chnl=15
diff --git a/resources-round-280x280/repafield-icons-sm.png b/resources-round-280x280/repafield-icons-sm.png
new file mode 100644
index 0000000..699d46e
Binary files /dev/null and b/resources-round-280x280/repafield-icons-sm.png differ
diff --git a/resources-round-390x390/layouts.xml b/resources-round-390x390/layouts.xml
index 2edec0a..dc192de 100755
--- a/resources-round-390x390/layouts.xml
+++ b/resources-round-390x390/layouts.xml
@@ -26,22 +26,22 @@
-
+
-
+
-
+
-
+
-
+
-
+
diff --git a/resources-round-454x454/layouts.xml b/resources-round-454x454/layouts.xml
index 697c5d8..9944291 100755
--- a/resources-round-454x454/layouts.xml
+++ b/resources-round-454x454/layouts.xml
@@ -26,22 +26,22 @@
-
+
-
+
-
+
-
+
-
+
-
+
diff --git a/resources/drawables/drawables.xml b/resources/drawables/drawables.xml
index b240346..a22c33c 100755
--- a/resources/drawables/drawables.xml
+++ b/resources/drawables/drawables.xml
@@ -1,4 +1,3 @@
-
diff --git a/resources/fonts.xml b/resources/fonts.xml
new file mode 100644
index 0000000..84b69f0
--- /dev/null
+++ b/resources/fonts.xml
@@ -0,0 +1,3 @@
+
+
+
diff --git a/resources/layouts/layouts.xml b/resources/layouts/layouts.xml
index cd5a0ad..971e90e 100755
--- a/resources/layouts/layouts.xml
+++ b/resources/layouts/layouts.xml
@@ -21,27 +21,27 @@
-
+
-
+
-
+
-
+
-
+
-
+
-
+
diff --git a/resources/repafield-icons-sm.fnt b/resources/repafield-icons-sm.fnt
new file mode 100644
index 0000000..c93119b
--- /dev/null
+++ b/resources/repafield-icons-sm.fnt
@@ -0,0 +1,14 @@
+info face=repafield-icons size=12 unicode=1 bold=0 italic=0 stretchH=100 aa=100 padding=0,0,0,0 spacing=0,0
+common lineHeight=24 base=24 scaleW=168 scaleH=168 pages=1
+page id=0 file=repafield-icons.png
+chars count=10
+char id=48 x=0 y=0 width=24 height=24 xoffset=0 yoffset=0 xadvance=30 page=0 chnl=15
+char id=49 x=24 y=0 width=24 height=24 xoffset=0 yoffset=0 xadvance=30 page=0 chnl=15
+char id=50 x=48 y=0 width=24 height=24 xoffset=0 yoffset=0 xadvance=30 page=0 chnl=15
+char id=51 x=72 y=0 width=24 height=24 xoffset=0 yoffset=0 xadvance=30 page=0 chnl=15
+char id=52 x=96 y=0 width=24 height=24 xoffset=0 yoffset=0 xadvance=30 page=0 chnl=15
+char id=53 x=0 y=24 width=24 height=24 xoffset=0 yoffset=0 xadvance=30 page=0 chnl=15
+char id=54 x=24 y=24 width=24 height=24 xoffset=0 yoffset=0 xadvance=30 page=0 chnl=15
+char id=55 x=48 y=24 width=24 height=24 xoffset=0 yoffset=0 xadvance=30 page=0 chnl=15
+char id=56 x=72 y=24 width=24 height=24 xoffset=0 yoffset=0 xadvance=30 page=0 chnl=15
+char id=57 x=96 y=24 width=24 height=24 xoffset=0 yoffset=0 xadvance=30 page=0 chnl=15
diff --git a/resources/repafield-icons-sm.png b/resources/repafield-icons-sm.png
new file mode 100644
index 0000000..699d46e
Binary files /dev/null and b/resources/repafield-icons-sm.png differ
diff --git a/resources/repafield-icons.fnt b/resources/repafield-icons.fnt
new file mode 100644
index 0000000..8e8ac8b
--- /dev/null
+++ b/resources/repafield-icons.fnt
@@ -0,0 +1,14 @@
+info face=repafield-icons size=12 unicode=1 bold=0 italic=0 stretchH=100 aa=100 padding=0,0,0,0 spacing=0,0
+common lineHeight=32 base=32 scaleW=168 scaleH=168 pages=1
+page id=0 file=repafield-icons.png
+chars count=10
+char id=48 x=0 y=0 width=30 height=30 xoffset=0 yoffset=0 xadvance=30 page=0 chnl=15
+char id=49 x=30 y=0 width=30 height=30 xoffset=0 yoffset=0 xadvance=30 page=0 chnl=15
+char id=50 x=60 y=0 width=30 height=30 xoffset=0 yoffset=0 xadvance=30 page=0 chnl=15
+char id=51 x=90 y=0 width=30 height=30 xoffset=0 yoffset=0 xadvance=30 page=0 chnl=15
+char id=52 x=120 y=0 width=30 height=30 xoffset=0 yoffset=0 xadvance=30 page=0 chnl=15
+char id=53 x=0 y=30 width=30 height=30 xoffset=0 yoffset=0 xadvance=30 page=0 chnl=15
+char id=54 x=30 y=30 width=30 height=30 xoffset=0 yoffset=0 xadvance=30 page=0 chnl=15
+char id=55 x=60 y=30 width=30 height=30 xoffset=0 yoffset=0 xadvance=30 page=0 chnl=15
+char id=56 x=90 y=30 width=30 height=30 xoffset=0 yoffset=0 xadvance=30 page=0 chnl=15
+char id=57 x=120 y=30 width=30 height=30 xoffset=0 yoffset=0 xadvance=30 page=0 chnl=15
diff --git a/resources/repafield-icons.png b/resources/repafield-icons.png
new file mode 100644
index 0000000..b28ce93
Binary files /dev/null and b/resources/repafield-icons.png differ
diff --git a/resources/settings/properties.xml b/resources/settings/properties.xml
index 2e96bc0..1296c56 100644
--- a/resources/settings/properties.xml
+++ b/resources/settings/properties.xml
@@ -2,7 +2,7 @@
2.0.0
0
0088FF
- FFFF00
+ 00AA55
0
false
true
diff --git a/source/RepaFieldBackground.mc b/source/RepaFieldBackground.mc
index 975bca5..5007272 100644
--- a/source/RepaFieldBackground.mc
+++ b/source/RepaFieldBackground.mc
@@ -21,7 +21,7 @@ class Background extends WatchUi.Drawable {
}
function draw(dc as Dc) as Void {
- dc.setColor(0x002244, mColor);
+ dc.setColor(Graphics.COLOR_TRANSPARENT, mColor);
dc.clear();
}
diff --git a/source/RepaFieldView.mc b/source/RepaFieldView.mc
index c1a0c87..d092980 100644
--- a/source/RepaFieldView.mc
+++ b/source/RepaFieldView.mc
@@ -84,7 +84,8 @@ class RepaFieldView extends WatchUi.DataField {
hidden var fElevation;
hidden var fElevationGain;
hidden var fElevationLoss;
- hidden var fCadence;
+ hidden var fTL;
+ hidden var fTLIcon;
hidden var fDistance;
hidden var fTime;
hidden var fTimer;
@@ -349,7 +350,8 @@ class RepaFieldView extends WatchUi.DataField {
fTime = View.findDrawableById("time") as Text;
fTimer = View.findDrawableById("timerHM") as Text;
fTimerSec = View.findDrawableById("timerS") as Text;
- fCadence = View.findDrawableById("cadence") as Text;
+ fTL = View.findDrawableById("cadence") as Text;
+ fTLIcon = View.findDrawableById("iconCadence") as Text;
fDistance = View.findDrawableById("distance") as Text;
fHr = View.findDrawableById("hr") as Text;
fAHr = View.findDrawableById("ahr") as Text;
@@ -557,6 +559,17 @@ class RepaFieldView extends WatchUi.DataField {
// Display the value you computed here. This will be called
// once a second when the data field is visible.
function onUpdate(dc as Dc) as Void {
+ // BG color
+ var bgColor = getBackgroundColor();
+ var fgColor = bgColor == Graphics.COLOR_WHITE ? Graphics.COLOR_BLACK : Graphics.COLOR_WHITE;
+ (View.findDrawableById("Background") as Background).setColor(bgColor);
+
+ // Left icons
+ fTLIcon.setColor(fgColor);
+ (View.findDrawableById("iconHills") as Text).setColor(fgColor);
+ (View.findDrawableById("iconEGain") as Text).setColor(fgColor);
+ (View.findDrawableById("iconELoss") as Text).setColor(fgColor);
+
// HR value
var hrColor = calculateZoneColor(hrValue, hrZones, hrZoneColors);
fHr.setColor(hrColor);
@@ -597,7 +610,7 @@ class RepaFieldView extends WatchUi.DataField {
var trs = timersec % 60;
var timerColor = Graphics.COLOR_RED;
if (timerState == Activity.TIMER_STATE_ON) {
- timerColor = Graphics.COLOR_WHITE;
+ timerColor = fgColor;
} else if (timerState == Activity.TIMER_STATE_PAUSED) {
timerColor = Graphics.COLOR_YELLOW;
}
@@ -665,48 +678,51 @@ class RepaFieldView extends WatchUi.DataField {
}
// TLF
- if (fCadence != null) {
+ if (fTLIcon != null) {
+ fTLIcon.setText((5 + tlFieldData).format("%d"));
+ }
+ if (fTL != null) {
if (tlFieldData == TLF_GRADE) {
if (cgrade != null) {
var gradeColor = calculateZoneColor(cgrade, gradeZones, gradeZoneColors);
- fCadence.setColor(gradeColor);
+ fTL.setColor(gradeColor);
if (cgrade >= 10 || cgrade <= -10) {
- fCadence.setText(cgrade.format("%.0f"));
+ fTL.setText(cgrade.format("%.0f"));
} else {
- fCadence.setText(cgrade.format("%.1f"));
+ fTL.setText(cgrade.format("%.1f"));
}
} else {
- fCadence.setText("-");
+ fTL.setText("-");
}
} else if (tlFieldData == TLF_GAP) {
- fCadence.setColor(themeColor2);
+ fTL.setColor(themeColor2);
if (pace != 0 && cgap != null) {
// TODO color
var gapmin = cgap.toNumber();
var gapsec = (cgap - gapmin) * 60;
- fCadence.setText(gapmin.format("%d") + ":" + gapsec.format("%02d"));
+ fTL.setText(gapmin.format("%d") + ":" + gapsec.format("%02d"));
} else {
- fCadence.setText("-");
+ fTL.setText("-");
}
} else if (tlFieldData == TLF_VSPEED) {
if (cvspeed != null) {
var vsColor = calculateZoneColor(cvspeed, vsZones, vsZoneColors);
- fCadence.setColor(vsColor);
+ fTL.setColor(vsColor);
if (cvspeed >= 10 || cvspeed <= -10) {
- fCadence.setText(cvspeed.format("%.0f"));
+ fTL.setText(cvspeed.format("%.0f"));
} else {
- fCadence.setText(cvspeed.format("%.1f"));
+ fTL.setText(cvspeed.format("%.1f"));
}
} else {
- fCadence.setText("-");
+ fTL.setText("-");
}
} else {
var cadenceColor = calculateZoneColor(cadence, cadenceZones, cadenceZoneColors);
- fCadence.setColor(cadenceColor);
+ fTL.setColor(cadenceColor);
if (cadence != 0) {
- fCadence.setText(cadence.format("%d"));
+ fTL.setText(cadence.format("%d"));
} else {
- fCadence.setText("-");
+ fTL.setText("-");
}
}
}