#10 #12 icons => icon font, white background support

resources-epix2pro42mm/layouts.xml

@@ -26,22 +26,22 @@
 
         <!-- distance/pace/avg pace -->
         <label id="pace" x="330" y="80" color="Graphics.COLOR_WHITE" justification="Graphics.TEXT_JUSTIFY_RIGHT" font="Graphics.FONT_NUMBER_MEDIUM"/>
-        <bitmap id="iconPace" filename="../resources/drawables/pace.png" x="332" y="132" />
+        <label id="iconPace" x="332" y="132" color="Graphics.COLOR_WHITE" justification="Graphics.TEXT_JUSTIFY_LEFT" font="@Fonts.repafield_icons" text="1" />
         <label id="apace" x="330" y="178" color="0x0088FF" justification="Graphics.TEXT_JUSTIFY_RIGHT" font="Graphics.FONT_LARGE"/>
-        <bitmap id="iconAPace" filename="../resources/drawables/apace.png" x="332" y="198" />
+        <label id="iconAPace" x="332" y="198" color="Graphics.COLOR_WHITE" justification="Graphics.TEXT_JUSTIFY_LEFT" font="@Fonts.repafield_icons" text="2" />
         <label id="distance" x="330" y="224" color="Graphics.COLOR_WHITE" justification="Graphics.TEXT_JUSTIFY_RIGHT" font="Graphics.FONT_NUMBER_MEDIUM" />
         <label id="distanceLabel" x="334" y="246" color="Graphics.COLOR_WHITE" justification="Graphics.TEXT_JUSTIFY_LEFT" font="Graphics.FONT_XTINY" text="km"/>
 
         <!-- cadence -->
-        <bitmap id="iconCadence" filename="../resources/drawables/cadence.png" x="36" y="116" />
+        <label id="iconCadence" x="30" y="106" color="Graphics.COLOR_WHITE" justification="Graphics.TEXT_JUSTIFY_LEFT" font="@Fonts.repafield_icons" text="5" />
         <label id="cadence" x="62" y="92" color="Graphics.COLOR_WHITE" justification="Graphics.TEXT_JUSTIFY_LEFT" font="Graphics.FONT_MEDIUM" />
 
         <!-- elevation, egain -->
-        <bitmap id="iconHills" filename="../resources/drawables/hills.png" x="22" y="144" />
+        <label id="iconHills" x="22" y="144" color="Graphics.COLOR_WHITE" justification="Graphics.TEXT_JUSTIFY_LEFT" font="@Fonts.repafield_icons" text="0" />
         <label id="elevation" x="62" y="132" color="0x0088FF" justification="Graphics.TEXT_JUSTIFY_LEFT" font="Graphics.FONT_MEDIUM"/>
-        <bitmap id="iconEGain" filename="../resources/drawables/e_gain.png" x="22" y="184" />
+        <label id="iconEGain" x="22" y="184" color="Graphics.COLOR_WHITE" justification="Graphics.TEXT_JUSTIFY_LEFT" font="@Fonts.repafield_icons" text="3" />
         <label id="elevationGain" x="62" y="172" color="0x0088FF" justification="Graphics.TEXT_JUSTIFY_LEFT" font="Graphics.FONT_MEDIUM"/>
-        <bitmap id="iconELoss" filename="../resources/drawables/e_loss.png" x="22" y="224" />
+        <label id="iconELoss" x="22" y="224" color="Graphics.COLOR_WHITE" justification="Graphics.TEXT_JUSTIFY_LEFT" font="@Fonts.repafield_icons" text="4" />
         <label id="elevationLoss" x="62" y="212" color="0x0088FF" justification="Graphics.TEXT_JUSTIFY_LEFT" font="Graphics.FONT_MEDIUM"/>
 
     </layout>

resources-epix2pro51mm/layouts.xml

@@ -26,23 +26,23 @@
 
         <!-- distance/pace/avg pace -->
         <label id="pace" x="390" y="82" color="Graphics.COLOR_WHITE" justification="Graphics.TEXT_JUSTIFY_RIGHT" font="Graphics.FONT_NUMBER_MEDIUM"/>
-        <bitmap id="iconPace" filename="../resources/drawables/pace.png" x="394" y="142" />
+        <label id="iconPace" x="394" y="142" color="Graphics.COLOR_WHITE" justification="Graphics.TEXT_JUSTIFY_LEFT" font="@Fonts.repafield_icons" text="1" />
         <label id="apace" x="390" y="198" color="0x0088FF" justification="Graphics.TEXT_JUSTIFY_RIGHT" font="Graphics.FONT_LARGE"/>
-        <bitmap id="iconAPace" filename="../resources/drawables/apace.png" x="394" y="228" />
+        <label id="iconAPace" x="394" y="228" color="Graphics.COLOR_WHITE" justification="Graphics.TEXT_JUSTIFY_LEFT" font="@Fonts.repafield_icons" text="2" />
         <label id="distance" x="390" y="250" color="Graphics.COLOR_WHITE" justification="Graphics.TEXT_JUSTIFY_RIGHT" font="Graphics.FONT_NUMBER_MEDIUM" />
         <label id="distanceLabel" x="392" y="276" color="Graphics.COLOR_WHITE" justification="Graphics.TEXT_JUSTIFY_LEFT" font="Graphics.FONT_XTINY" text="km"/>
 
         <!-- cadence -->
-        <bitmap id="iconCadence" filename="../resources/drawables/cadence.png" x="36" y="116" />
+        <label id="iconCadence" x="36" y="106" color="Graphics.COLOR_WHITE" justification="Graphics.TEXT_JUSTIFY_LEFT" font="@Fonts.repafield_icons" text="5" />
-        <label id="cadence" x="62" y="92" color="Graphics.COLOR_WHITE" justification="Graphics.TEXT_JUSTIFY_LEFT" font="Graphics.FONT_MEDIUM" />
+        <label id="cadence" x="66" y="92" color="Graphics.COLOR_WHITE" justification="Graphics.TEXT_JUSTIFY_LEFT" font="Graphics.FONT_MEDIUM" />
 
         <!-- elevation, egain -->
-        <bitmap id="iconHills" filename="../resources/drawables/hills.png" x="22" y="154" />
+        <label id="iconHills" x="22" y="154" color="Graphics.COLOR_WHITE" justification="Graphics.TEXT_JUSTIFY_LEFT" font="@Fonts.repafield_icons" text="0" />
-        <label id="elevation" x="62" y="142" color="0x0088FF" justification="Graphics.TEXT_JUSTIFY_LEFT" font="Graphics.FONT_MEDIUM"/>
+        <label id="elevation" x="66" y="142" color="0x0088FF" justification="Graphics.TEXT_JUSTIFY_LEFT" font="Graphics.FONT_MEDIUM"/>
-        <bitmap id="iconEGain" filename="../resources/drawables/e_gain.png" x="22" y="204" />
+        <label id="iconEGain" x="22" y="204" color="Graphics.COLOR_WHITE" justification="Graphics.TEXT_JUSTIFY_LEFT" font="@Fonts.repafield_icons" text="3" />
-        <label id="elevationGain" x="62" y="192" color="0x0088FF" justification="Graphics.TEXT_JUSTIFY_LEFT" font="Graphics.FONT_MEDIUM"/>
+        <label id="elevationGain" x="66" y="192" color="0x0088FF" justification="Graphics.TEXT_JUSTIFY_LEFT" font="Graphics.FONT_MEDIUM"/>
-        <bitmap id="iconELoss" filename="../resources/drawables/e_loss.png" x="22" y="254" />
+        <label id="iconELoss" x="22" y="254" color="Graphics.COLOR_WHITE" justification="Graphics.TEXT_JUSTIFY_LEFT" font="@Fonts.repafield_icons" text="4" />
-        <label id="elevationLoss" x="62" y="242" color="0x0088FF" justification="Graphics.TEXT_JUSTIFY_LEFT" font="Graphics.FONT_MEDIUM"/>
+        <label id="elevationLoss" x="66" y="242" color="0x0088FF" justification="Graphics.TEXT_JUSTIFY_LEFT" font="Graphics.FONT_MEDIUM"/>
 
     </layout>
 

resources-round-240x240-f6s-f7s/fonts.xml

@@ -0,0 +1,3 @@
+<fonts>
+  <font id="repafield_icons" filename="repafield-icons-sm.fnt" antialias="true" />
+</fonts>

resources-round-240x240-f6s-f7s/layouts.xml

@@ -26,22 +26,22 @@
 
         <!-- distance/pace/avg pace -->
         <label id="pace" x="200" y="48" color="Graphics.COLOR_WHITE" justification="Graphics.TEXT_JUSTIFY_RIGHT" font="Graphics.FONT_NUMBER_MILD"/>
-        <bitmap id="iconPace" filename="../resources/drawables/pace.png" x="198" y="66" />
+        <label id="iconPace" x="198" y="66" color="Graphics.COLOR_WHITE" justification="Graphics.TEXT_JUSTIFY_LEFT" font="@Fonts.repafield_icons" text="1" />
         <label id="apace" x="200" y="100" color="0x0088FF" justification="Graphics.TEXT_JUSTIFY_RIGHT" font="Graphics.FONT_LARGE"/>
-        <bitmap id="iconAPace" filename="../resources/drawables/apace.png" x="198" y="104" />
+        <label id="iconAPace" x="198" y="104" color="Graphics.COLOR_WHITE" justification="Graphics.TEXT_JUSTIFY_LEFT" font="@Fonts.repafield_icons" text="2" />
         <label id="distance" x="200" y="134" color="Graphics.COLOR_WHITE" justification="Graphics.TEXT_JUSTIFY_RIGHT" font="Graphics.FONT_NUMBER_MILD" />
         <label id="distanceLabel" x="202" y="140" color="Graphics.COLOR_WHITE" justification="Graphics.TEXT_JUSTIFY_LEFT" font="Graphics.FONT_XTINY" text="km"/>
 
         <!-- cadence -->
-        <bitmap id="iconCadence" filename="../resources/drawables/cadence.png" x="24" y="66" />
+        <label id="iconCadence" x="18" y="62" color="Graphics.COLOR_WHITE" justification="Graphics.TEXT_JUSTIFY_LEFT" font="@Fonts.repafield_icons" text="5" />
         <label id="cadence" x="42" y="54" color="Graphics.COLOR_WHITE" justification="Graphics.TEXT_JUSTIFY_LEFT" font="Graphics.FONT_MEDIUM" />
 
         <!-- elevation, egain -->
-        <bitmap id="iconHills" filename="../resources/drawables/hills_sm.png" x="12" y="88" />
+        <label id="iconHills" x="12" y="88" color="Graphics.COLOR_WHITE" justification="Graphics.TEXT_JUSTIFY_LEFT" font="@Fonts.repafield_icons" text="0" />
         <label id="elevation" x="42" y="82" color="0x0088FF" justification="Graphics.TEXT_JUSTIFY_LEFT" font="Graphics.FONT_MEDIUM"/>
-        <bitmap id="iconEGain" filename="../resources/drawables/e_gain_sm.png" x="12" y="116" />
+        <label id="iconEGain" x="12" y="116" color="Graphics.COLOR_WHITE" justification="Graphics.TEXT_JUSTIFY_LEFT" font="@Fonts.repafield_icons" text="3" />
         <label id="elevationGain" x="42" y="110" color="0x0088FF" justification="Graphics.TEXT_JUSTIFY_LEFT" font="Graphics.FONT_MEDIUM"/>
-        <bitmap id="iconELoss" filename="../resources/drawables/e_loss_sm.png" x="12" y="144" />
+        <label id="iconELoss" x="12" y="144" color="Graphics.COLOR_WHITE" justification="Graphics.TEXT_JUSTIFY_LEFT" font="@Fonts.repafield_icons" text="4" />
         <label id="elevationLoss" x="42" y="138" color="0x0088FF" justification="Graphics.TEXT_JUSTIFY_LEFT" font="Graphics.FONT_MEDIUM"/>
 
     </layout>

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

resources-round-240x240/fonts.xml

@@ -0,0 +1,3 @@
+<fonts>
+  <font id="repafield_icons" filename="repafield-icons-sm.fnt" antialias="true" />
+</fonts>

resources-round-240x240/layouts.xml

@@ -26,22 +26,22 @@
 
         <!-- distance/pace/avg pace -->
         <label id="pace" x="200" y="52" color="Graphics.COLOR_WHITE" justification="Graphics.TEXT_JUSTIFY_RIGHT" font="Graphics.FONT_NUMBER_MEDIUM"/>
-        <bitmap id="iconPace" filename="../resources/drawables/pace.png" x="198" y="68" />
+        <label id="iconPace" x="198" y="68" color="Graphics.COLOR_WHITE" justification="Graphics.TEXT_JUSTIFY_LEFT" font="@Fonts.repafield_icons" text="1" />
         <label id="apace" x="200" y="100" color="0x0088FF" justification="Graphics.TEXT_JUSTIFY_RIGHT" font="Graphics.FONT_LARGE"/>
-        <bitmap id="iconAPace" filename="../resources/drawables/apace.png" x="198" y="104" />
+        <label id="iconAPace" x="198" y="104" color="Graphics.COLOR_WHITE" justification="Graphics.TEXT_JUSTIFY_LEFT" font="@Fonts.repafield_icons" text="2" />
         <label id="distance" x="200" y="136" color="Graphics.COLOR_WHITE" justification="Graphics.TEXT_JUSTIFY_RIGHT" font="Graphics.FONT_NUMBER_MEDIUM" />
         <label id="distanceLabel" x="202" y="140" color="Graphics.COLOR_WHITE" justification="Graphics.TEXT_JUSTIFY_LEFT" font="Graphics.FONT_XTINY" text="km"/>
 
         <!-- cadence -->
-        <bitmap id="iconCadence" filename="../resources/drawables/cadence.png" x="24" y="66" />
+        <label id="iconCadence" x="18" y="62" color="Graphics.COLOR_WHITE" justification="Graphics.TEXT_JUSTIFY_LEFT" font="@Fonts.repafield_icons" text="5" />
         <label id="cadence" x="42" y="54" color="Graphics.COLOR_WHITE" justification="Graphics.TEXT_JUSTIFY_LEFT" font="Graphics.FONT_MEDIUM" />
 
         <!-- elevation, egain -->
-        <bitmap id="iconHills" filename="../resources/drawables/hills_sm.png" x="12" y="88" />
+        <label id="iconHills" x="12" y="88" color="Graphics.COLOR_WHITE" justification="Graphics.TEXT_JUSTIFY_LEFT" font="@Fonts.repafield_icons" text="0" />
         <label id="elevation" x="42" y="82" color="0x0088FF" justification="Graphics.TEXT_JUSTIFY_LEFT" font="Graphics.FONT_MEDIUM"/>
-        <bitmap id="iconEGain" filename="../resources/drawables/e_gain_sm.png" x="12" y="116" />
+        <label id="iconEGain" x="12" y="116" color="Graphics.COLOR_WHITE" justification="Graphics.TEXT_JUSTIFY_LEFT" font="@Fonts.repafield_icons" text="3" />
         <label id="elevationGain" x="42" y="110" color="0x0088FF" justification="Graphics.TEXT_JUSTIFY_LEFT" font="Graphics.FONT_MEDIUM"/>
-        <bitmap id="iconELoss" filename="../resources/drawables/e_loss_sm.png" x="12" y="144" />
+        <label id="iconELoss" x="12" y="144" color="Graphics.COLOR_WHITE" justification="Graphics.TEXT_JUSTIFY_LEFT" font="@Fonts.repafield_icons" text="4" />
         <label id="elevationLoss" x="42" y="138" color="0x0088FF" justification="Graphics.TEXT_JUSTIFY_LEFT" font="Graphics.FONT_MEDIUM"/>
 
     </layout>

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

resources-round-260x260/fonts.xml

@@ -0,0 +1,3 @@
+<fonts>
+  <font id="repafield_icons" filename="repafield-icons-sm.fnt" antialias="true" />
+</fonts>

resources-round-260x260/layouts.xml

@@ -26,22 +26,22 @@
 
         <!-- distance/pace/avg pace -->
         <label id="pace" x="220" y="40" color="Graphics.COLOR_WHITE" justification="Graphics.TEXT_JUSTIFY_RIGHT" font="Graphics.FONT_NUMBER_MEDIUM"/>
-        <bitmap id="iconPace" filename="../resources/drawables/pace.png" x="218" y="68" />
+        <label id="iconPace" x="218" y="68" color="Graphics.COLOR_WHITE" justification="Graphics.TEXT_JUSTIFY_LEFT" font="@Fonts.repafield_icons" text="1" />
         <label id="apace" x="220" y="106" color="0x0088FF" justification="Graphics.TEXT_JUSTIFY_RIGHT" font="Graphics.FONT_LARGE"/>
-        <bitmap id="iconAPace" filename="../resources/drawables/apace.png" x="218" y="114" />
+        <label id="iconAPace" x="218" y="114" color="Graphics.COLOR_WHITE" justification="Graphics.TEXT_JUSTIFY_LEFT" font="@Fonts.repafield_icons" text="2" />
         <label id="distance" x="220" y="140" color="Graphics.COLOR_WHITE" justification="Graphics.TEXT_JUSTIFY_RIGHT" font="Graphics.FONT_NUMBER_MEDIUM" />
         <label id="distanceLabel" x="222" y="156" color="Graphics.COLOR_WHITE" justification="Graphics.TEXT_JUSTIFY_LEFT" font="Graphics.FONT_XTINY" text="km"/>
 
         <!-- cadence -->
-        <bitmap id="iconCadence" filename="../resources/drawables/cadence.png" x="24" y="70" />
+        <label id="iconCadence" x="18" y="66" color="Graphics.COLOR_WHITE" justification="Graphics.TEXT_JUSTIFY_LEFT" font="@Fonts.repafield_icons" text="5" />
         <label id="cadence" x="42" y="58" color="Graphics.COLOR_WHITE" justification="Graphics.TEXT_JUSTIFY_LEFT" font="Graphics.FONT_MEDIUM" />
 
         <!-- elevation, egain -->
-        <bitmap id="iconHills" filename="../resources/drawables/hills_sm.png" x="12" y="92" />
+        <label id="iconHills" x="12" y="92" color="Graphics.COLOR_WHITE" justification="Graphics.TEXT_JUSTIFY_LEFT" font="@Fonts.repafield_icons" text="0" />
         <label id="elevation" x="42" y="86" color="0x0088FF" justification="Graphics.TEXT_JUSTIFY_LEFT" font="Graphics.FONT_MEDIUM"/>
-        <bitmap id="iconEGain" filename="../resources/drawables/e_gain_sm.png" x="12" y="120" />
+        <label id="iconEGain" x="12" y="120" color="Graphics.COLOR_WHITE" justification="Graphics.TEXT_JUSTIFY_LEFT" font="@Fonts.repafield_icons" text="3" />
         <label id="elevationGain" x="42" y="114" color="0x0088FF" justification="Graphics.TEXT_JUSTIFY_LEFT" font="Graphics.FONT_MEDIUM"/>
-        <bitmap id="iconELoss" filename="../resources/drawables/e_loss_sm.png" x="12" y="148" />
+        <label id="iconELoss" x="12" y="148" color="Graphics.COLOR_WHITE" justification="Graphics.TEXT_JUSTIFY_LEFT" font="@Fonts.repafield_icons" text="4" />
         <label id="elevationLoss" x="42" y="142" color="0x0088FF" justification="Graphics.TEXT_JUSTIFY_LEFT" font="Graphics.FONT_MEDIUM"/>
 
     </layout>

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

resources-round-280x280/fonts.xml

@@ -0,0 +1,3 @@
+<fonts>
+  <font id="repafield_icons" filename="repafield-icons-sm.fnt" antialias="true" />
+</fonts>

resources-round-280x280/layouts.xml

@@ -26,22 +26,22 @@
 
         <!-- distance/pace/avg pace -->
         <label id="pace" x="240" y="40" color="Graphics.COLOR_WHITE" justification="Graphics.TEXT_JUSTIFY_RIGHT" font="Graphics.FONT_NUMBER_MEDIUM"/>
-        <bitmap id="iconPace" filename="../resources/drawables/pace.png" x="238" y="68" />
+        <label id="iconPace" x="238" y="68" color="Graphics.COLOR_WHITE" justification="Graphics.TEXT_JUSTIFY_LEFT" font="@Fonts.repafield_icons" text="1" />
         <label id="apace" x="240" y="106" color="0x0088FF" justification="Graphics.TEXT_JUSTIFY_RIGHT" font="Graphics.FONT_LARGE"/>
-        <bitmap id="iconAPace" filename="../resources/drawables/apace.png" x="238" y="114" />
+        <label id="iconAPace" x="238" y="114" color="Graphics.COLOR_WHITE" justification="Graphics.TEXT_JUSTIFY_LEFT" font="@Fonts.repafield_icons" text="2" />
         <label id="distance" x="240" y="140" color="Graphics.COLOR_WHITE" justification="Graphics.TEXT_JUSTIFY_RIGHT" font="Graphics.FONT_NUMBER_MEDIUM" />
         <label id="distanceLabel" x="242" y="156" color="Graphics.COLOR_WHITE" justification="Graphics.TEXT_JUSTIFY_LEFT" font="Graphics.FONT_XTINY" text="km"/>
 
         <!-- cadence -->
-        <bitmap id="iconCadence" filename="../resources/drawables/cadence.png" x="24" y="70" />
+        <label id="iconCadence" x="20" y="66" color="Graphics.COLOR_WHITE" justification="Graphics.TEXT_JUSTIFY_LEFT" font="@Fonts.repafield_icons" text="5" />
         <label id="cadence" x="42" y="58" color="Graphics.COLOR_WHITE" justification="Graphics.TEXT_JUSTIFY_LEFT" font="Graphics.FONT_MEDIUM" />
 
         <!-- elevation, egain -->
-        <bitmap id="iconHills" filename="../resources/drawables/hills_sm.png" x="12" y="92" />
+        <label id="iconHills" x="12" y="92" color="Graphics.COLOR_WHITE" justification="Graphics.TEXT_JUSTIFY_LEFT" font="@Fonts.repafield_icons" text="0" />
         <label id="elevation" x="42" y="86" color="0x0088FF" justification="Graphics.TEXT_JUSTIFY_LEFT" font="Graphics.FONT_MEDIUM"/>
-        <bitmap id="iconEGain" filename="../resources/drawables/e_gain_sm.png" x="12" y="120" />
+        <label id="iconEGain" x="12" y="120" color="Graphics.COLOR_WHITE" justification="Graphics.TEXT_JUSTIFY_LEFT" font="@Fonts.repafield_icons" text="3" />
         <label id="elevationGain" x="42" y="114" color="0x0088FF" justification="Graphics.TEXT_JUSTIFY_LEFT" font="Graphics.FONT_MEDIUM"/>
-        <bitmap id="iconELoss" filename="../resources/drawables/e_loss_sm.png" x="12" y="148" />
+        <label id="iconELoss" x="12" y="148" color="Graphics.COLOR_WHITE" justification="Graphics.TEXT_JUSTIFY_LEFT" font="@Fonts.repafield_icons" text="4" />
         <label id="elevationLoss" x="42" y="142" color="0x0088FF" justification="Graphics.TEXT_JUSTIFY_LEFT" font="Graphics.FONT_MEDIUM"/>
 
     </layout>

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

resources-round-390x390/layouts.xml

@@ -26,22 +26,22 @@
 
         <!-- distance/pace/avg pace -->
         <label id="pace" x="330" y="80" color="Graphics.COLOR_WHITE" justification="Graphics.TEXT_JUSTIFY_RIGHT" font="Graphics.FONT_NUMBER_MEDIUM"/>
-        <bitmap id="iconPace" filename="../resources/drawables/pace.png" x="332" y="132" />
+        <label id="iconPace" x="332" y="132" color="Graphics.COLOR_WHITE" justification="Graphics.TEXT_JUSTIFY_LEFT" font="@Fonts.repafield_icons" text="1" />
         <label id="apace" x="330" y="178" color="0x0088FF" justification="Graphics.TEXT_JUSTIFY_RIGHT" font="Graphics.FONT_LARGE"/>
-        <bitmap id="iconAPace" filename="../resources/drawables/apace.png" x="332" y="198" />
+        <label id="iconAPace" x="332" y="198" color="Graphics.COLOR_WHITE" justification="Graphics.TEXT_JUSTIFY_LEFT" font="@Fonts.repafield_icons" text="2" />
         <label id="distance" x="330" y="224" color="Graphics.COLOR_WHITE" justification="Graphics.TEXT_JUSTIFY_RIGHT" font="Graphics.FONT_NUMBER_MEDIUM" />
         <label id="distanceLabel" x="334" y="246" color="Graphics.COLOR_WHITE" justification="Graphics.TEXT_JUSTIFY_LEFT" font="Graphics.FONT_XTINY" text="km"/>
 
         <!-- cadence -->
-        <bitmap id="iconCadence" filename="../resources/drawables/cadence.png" x="36" y="116" />
+        <label id="iconCadence" x="30" y="106" color="Graphics.COLOR_WHITE" justification="Graphics.TEXT_JUSTIFY_LEFT" font="@Fonts.repafield_icons" text="5" />
         <label id="cadence" x="62" y="92" color="Graphics.COLOR_WHITE" justification="Graphics.TEXT_JUSTIFY_LEFT" font="Graphics.FONT_MEDIUM" />
 
         <!-- elevation, egain -->
-        <bitmap id="iconHills" filename="../resources/drawables/hills.png" x="22" y="144" />
+        <label id="iconHills" x="22" y="144" color="Graphics.COLOR_WHITE" justification="Graphics.TEXT_JUSTIFY_LEFT" font="@Fonts.repafield_icons" text="0" />
         <label id="elevation" x="62" y="132" color="0x0088FF" justification="Graphics.TEXT_JUSTIFY_LEFT" font="Graphics.FONT_MEDIUM"/>
-        <bitmap id="iconEGain" filename="../resources/drawables/e_gain.png" x="22" y="184" />
+        <label id="iconEGain" x="22" y="184" color="Graphics.COLOR_WHITE" justification="Graphics.TEXT_JUSTIFY_LEFT" font="@Fonts.repafield_icons" text="3" />
         <label id="elevationGain" x="62" y="172" color="0x0088FF" justification="Graphics.TEXT_JUSTIFY_LEFT" font="Graphics.FONT_MEDIUM"/>
-        <bitmap id="iconELoss" filename="../resources/drawables/e_loss.png" x="22" y="224" />
+        <label id="iconELoss" x="22" y="224" color="Graphics.COLOR_WHITE" justification="Graphics.TEXT_JUSTIFY_LEFT" font="@Fonts.repafield_icons" text="4" />
         <label id="elevationLoss" x="62" y="212" color="0x0088FF" justification="Graphics.TEXT_JUSTIFY_LEFT" font="Graphics.FONT_MEDIUM"/>
 
     </layout>

resources-round-454x454/layouts.xml

@@ -26,22 +26,22 @@
 
         <!-- distance/pace/avg pace -->
         <label id="pace" x="390" y="90" color="Graphics.COLOR_WHITE" justification="Graphics.TEXT_JUSTIFY_RIGHT" font="Graphics.FONT_NUMBER_MILD"/>
-        <bitmap id="iconPace" filename="../resources/drawables/pace.png" x="394" y="142" />
+        <label id="iconPace" x="394" y="142" color="Graphics.COLOR_WHITE" justification="Graphics.TEXT_JUSTIFY_LEFT" font="@Fonts.repafield_icons" text="1" />
         <label id="apace" x="390" y="198" color="0x0088FF" justification="Graphics.TEXT_JUSTIFY_RIGHT" font="Graphics.FONT_LARGE"/>
-        <bitmap id="iconAPace" filename="../resources/drawables/apace.png" x="394" y="228" />
+        <label id="iconAPace" x="394" y="228" color="Graphics.COLOR_WHITE" justification="Graphics.TEXT_JUSTIFY_LEFT" font="@Fonts.repafield_icons" text="2" />
         <label id="distance" x="390" y="264" color="Graphics.COLOR_WHITE" justification="Graphics.TEXT_JUSTIFY_RIGHT" font="Graphics.FONT_NUMBER_MILD" />
         <label id="distanceLabel" x="392" y="276" color="Graphics.COLOR_WHITE" justification="Graphics.TEXT_JUSTIFY_LEFT" font="Graphics.FONT_XTINY" text="km"/>
 
         <!-- cadence -->
-        <bitmap id="iconCadence" filename="../resources/drawables/cadence.png" x="36" y="116" />
+        <label id="iconCadence" x="30" y="106" color="Graphics.COLOR_WHITE" justification="Graphics.TEXT_JUSTIFY_LEFT" font="@Fonts.repafield_icons" text="5" />
         <label id="cadence" x="62" y="92" color="Graphics.COLOR_WHITE" justification="Graphics.TEXT_JUSTIFY_LEFT" font="Graphics.FONT_MEDIUM" />
 
         <!-- elevation, egain -->
-        <bitmap id="iconHills" filename="../resources/drawables/hills.png" x="22" y="154" />
+        <label id="iconHills" x="22" y="154" color="Graphics.COLOR_WHITE" justification="Graphics.TEXT_JUSTIFY_LEFT" font="@Fonts.repafield_icons" text="0" />
         <label id="elevation" x="62" y="142" color="0x0088FF" justification="Graphics.TEXT_JUSTIFY_LEFT" font="Graphics.FONT_MEDIUM"/>
-        <bitmap id="iconEGain" filename="../resources/drawables/e_gain.png" x="22" y="204" />
+        <label id="iconEGain" x="22" y="204" color="Graphics.COLOR_WHITE" justification="Graphics.TEXT_JUSTIFY_LEFT" font="@Fonts.repafield_icons" text="3" />
         <label id="elevationGain" x="62" y="192" color="0x0088FF" justification="Graphics.TEXT_JUSTIFY_LEFT" font="Graphics.FONT_MEDIUM"/>
-        <bitmap id="iconELoss" filename="../resources/drawables/e_loss.png" x="22" y="254" />
+        <label id="iconELoss" x="22" y="254" color="Graphics.COLOR_WHITE" justification="Graphics.TEXT_JUSTIFY_LEFT" font="@Fonts.repafield_icons" text="4" />
         <label id="elevationLoss" x="62" y="242" color="0x0088FF" justification="Graphics.TEXT_JUSTIFY_LEFT" font="Graphics.FONT_MEDIUM"/>
 
     </layout>

resources/drawables/drawables.xml

@@ -1,4 +1,3 @@
 <drawables>
     <bitmap id="LauncherIcon" filename="launcher_icon.png" />
-    <bitmap id="iconHills" filename="hills.png" />
 </drawables>

resources/fonts.xml

@@ -0,0 +1,3 @@
+<fonts>
+  <font id="repafield_icons" filename="repafield-icons.fnt" antialias="true" />
+</fonts>

resources/layouts/layouts.xml

@@ -21,27 +21,27 @@
 
         <!-- time/timer -->
         <label id="timerHM" x="132" y="258" color="Graphics.COLOR_WHITE" justification="Graphics.TEXT_JUSTIFY_RIGHT" font="Graphics.FONT_MEDIUM" />
-        <label id="timerS" x="134" y="278" color="Graphics.COLOR_LT_GRAY" justification="Graphics.TEXT_JUSTIFY_LEFT" font="Graphics.FONT_XTINY" />
+        <label id="timerS" x="134" y="278" color="0x888888" justification="Graphics.TEXT_JUSTIFY_LEFT" font="Graphics.FONT_XTINY" />
         <label id="time" x="50%" y="330" color="Graphics.COLOR_WHITE" justification="Graphics.TEXT_JUSTIFY_CENTER" font="Graphics.FONT_LARGE" />
 
         <!-- distance/pace/avg pace -->
         <label id="pace" x="360" y="80" color="Graphics.COLOR_WHITE" justification="Graphics.TEXT_JUSTIFY_RIGHT" font="Graphics.FONT_NUMBER_MEDIUM"/>
-        <bitmap id="iconPace" filename="../drawables/pace.png" x="362" y="132" />
+        <label id="iconPace" x="362" y="132" color="Graphics.COLOR_WHITE" justification="Graphics.TEXT_JUSTIFY_LEFT" font="@Fonts.repafield_icons" text="1" />
         <label id="apace" x="360" y="178" color="0x0088FF" justification="Graphics.TEXT_JUSTIFY_RIGHT" font="Graphics.FONT_LARGE"/>
-        <bitmap id="iconAPace" filename="../drawables/apace.png" x="362" y="198" />
+        <label id="iconAPace" x="362" y="198" color="Graphics.COLOR_WHITE" justification="Graphics.TEXT_JUSTIFY_LEFT" font="@Fonts.repafield_icons" text="2" />
         <label id="distance" x="360" y="224" color="Graphics.COLOR_WHITE" justification="Graphics.TEXT_JUSTIFY_RIGHT" font="Graphics.FONT_NUMBER_MEDIUM" />
         <label id="distanceLabel" x="364" y="246" color="Graphics.COLOR_WHITE" justification="Graphics.TEXT_JUSTIFY_LEFT" font="Graphics.FONT_XTINY" text="km"/>
 
         <!-- cadence -->
-        <bitmap id="iconCadence" filename="../drawables/cadence.png" x="36" y="116" />
+        <label id="iconCadence" x="30" y="106" color="Graphics.COLOR_WHITE" justification="Graphics.TEXT_JUSTIFY_LEFT" font="@Fonts.repafield_icons" text="5" />
         <label id="cadence" x="62" y="92" color="Graphics.COLOR_WHITE" justification="Graphics.TEXT_JUSTIFY_LEFT" font="Graphics.FONT_MEDIUM" />
 
         <!-- elevation, egain -->
-        <bitmap id="iconHills" filename="../drawables/hills.png" x="22" y="144" />
+        <label id="iconHills" x="22" y="144" color="Graphics.COLOR_WHITE" justification="Graphics.TEXT_JUSTIFY_LEFT" font="@Fonts.repafield_icons" text="0" />
         <label id="elevation" x="62" y="132" color="0x0088FF" justification="Graphics.TEXT_JUSTIFY_LEFT" font="Graphics.FONT_MEDIUM"/>
-        <bitmap id="iconEGain" filename="../drawables/e_gain.png" x="22" y="184" />
+        <label id="iconEGain" x="22" y="184" color="Graphics.COLOR_WHITE" justification="Graphics.TEXT_JUSTIFY_LEFT" font="@Fonts.repafield_icons" text="3" />
         <label id="elevationGain" x="62" y="172" color="0x0088FF" justification="Graphics.TEXT_JUSTIFY_LEFT" font="Graphics.FONT_MEDIUM"/>
-        <bitmap id="iconELoss" filename="../drawables/e_loss.png" x="22" y="224" />
+        <label id="iconELoss" x="22" y="224" color="Graphics.COLOR_WHITE" justification="Graphics.TEXT_JUSTIFY_LEFT" font="@Fonts.repafield_icons" text="4" />
         <label id="elevationLoss" x="62" y="212" color="0x0088FF" justification="Graphics.TEXT_JUSTIFY_LEFT" font="Graphics.FONT_MEDIUM"/>
 
     </layout>

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

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

resources/settings/properties.xml

@@ -2,7 +2,7 @@
     <property id="appVersion" type="string">2.0.0</property>
     <property id="themeColor" type="string">0</property>
     <property id="themeColor2" type="string">0088FF</property>
-    <property id="themeColor3" type="string">FFFF00</property>
+    <property id="themeColor3" type="string">00AA55</property>
     <property id="hrDisplay" type="number">0</property>
     <property id="speedNotPace" type="boolean">false</property>
     <property id="showNextPoint" type="boolean">true</property>

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();
     }
 

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("-");
                 }
             }
         }