From 9258c4eda088e1077d2a2de93113466306442c99 Mon Sep 17 00:00:00 2001
From: Gyuri Horak <dyuri@horak.hu>
Date: Sat, 11 Nov 2023 20:39:34 +0100
Subject: [PATCH] #10 #12 icons => icon font, white background support

---
 resources-epix2pro42mm/layouts.xml            |  12 ++--
 resources-epix2pro51mm/layouts.xml            |  20 +++----
 resources-round-240x240-f6s-f7s/fonts.xml     |   3 +
 resources-round-240x240-f6s-f7s/layouts.xml   |  12 ++--
 .../repafield-icons-sm.fnt                    |  14 +++++
 .../repafield-icons-sm.png                    | Bin 0 -> 4819 bytes
 resources-round-240x240/fonts.xml             |   3 +
 resources-round-240x240/layouts.xml           |  12 ++--
 .../repafield-icons-sm.fnt                    |  14 +++++
 .../repafield-icons-sm.png                    | Bin 0 -> 4819 bytes
 resources-round-260x260/fonts.xml             |   3 +
 resources-round-260x260/layouts.xml           |  12 ++--
 .../repafield-icons-sm.fnt                    |  14 +++++
 .../repafield-icons-sm.png                    | Bin 0 -> 4819 bytes
 resources-round-280x280/fonts.xml             |   3 +
 resources-round-280x280/layouts.xml           |  12 ++--
 .../repafield-icons-sm.fnt                    |  14 +++++
 .../repafield-icons-sm.png                    | Bin 0 -> 4819 bytes
 resources-round-390x390/layouts.xml           |  12 ++--
 resources-round-454x454/layouts.xml           |  12 ++--
 resources/drawables/drawables.xml             |   1 -
 resources/fonts.xml                           |   3 +
 resources/layouts/layouts.xml                 |  14 ++---
 resources/repafield-icons-sm.fnt              |  14 +++++
 resources/repafield-icons-sm.png              | Bin 0 -> 4819 bytes
 resources/repafield-icons.fnt                 |  14 +++++
 resources/repafield-icons.png                 | Bin 0 -> 9821 bytes
 resources/settings/properties.xml             |   2 +-
 source/RepaFieldBackground.mc                 |   2 +-
 source/RepaFieldView.mc                       |  52 ++++++++++++------
 30 files changed, 194 insertions(+), 80 deletions(-)
 create mode 100644 resources-round-240x240-f6s-f7s/fonts.xml
 create mode 100644 resources-round-240x240-f6s-f7s/repafield-icons-sm.fnt
 create mode 100644 resources-round-240x240-f6s-f7s/repafield-icons-sm.png
 create mode 100644 resources-round-240x240/fonts.xml
 create mode 100644 resources-round-240x240/repafield-icons-sm.fnt
 create mode 100644 resources-round-240x240/repafield-icons-sm.png
 create mode 100644 resources-round-260x260/fonts.xml
 create mode 100644 resources-round-260x260/repafield-icons-sm.fnt
 create mode 100644 resources-round-260x260/repafield-icons-sm.png
 create mode 100644 resources-round-280x280/fonts.xml
 create mode 100644 resources-round-280x280/repafield-icons-sm.fnt
 create mode 100644 resources-round-280x280/repafield-icons-sm.png
 create mode 100644 resources/fonts.xml
 create mode 100644 resources/repafield-icons-sm.fnt
 create mode 100644 resources/repafield-icons-sm.png
 create mode 100644 resources/repafield-icons.fnt
 create mode 100644 resources/repafield-icons.png

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 @@
 
         <!-- 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>
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 @@
 
         <!-- 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="cadence" x="62" y="92" color="Graphics.COLOR_WHITE" justification="Graphics.TEXT_JUSTIFY_LEFT" font="Graphics.FONT_MEDIUM" />
+        <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="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="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="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="elevationLoss" x="62" y="242" color="0x0088FF" justification="Graphics.TEXT_JUSTIFY_LEFT" font="Graphics.FONT_MEDIUM"/>
+        <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="66" y="142" color="0x0088FF" justification="Graphics.TEXT_JUSTIFY_LEFT" font="Graphics.FONT_MEDIUM"/>
+        <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="66" y="192" color="0x0088FF" justification="Graphics.TEXT_JUSTIFY_LEFT" font="Graphics.FONT_MEDIUM"/>
+        <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="66" y="242" color="0x0088FF" justification="Graphics.TEXT_JUSTIFY_LEFT" font="Graphics.FONT_MEDIUM"/>
 
     </layout>
 
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 @@
+<fonts>
+  <font id="repafield_icons" filename="repafield-icons-sm.fnt" antialias="true" />
+</fonts>
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 @@
 
         <!-- 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>
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 0000000000000000000000000000000000000000..699d46e190ce9357f43322eaabbda4f7bee18501
GIT binary patch
literal 4819
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
X6?A5`veQumT0lA)hU#Uic47YlKXqo1

literal 0
HcmV?d00001

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 @@
+<fonts>
+  <font id="repafield_icons" filename="repafield-icons-sm.fnt" antialias="true" />
+</fonts>
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 @@
 
         <!-- 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>
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 0000000000000000000000000000000000000000..699d46e190ce9357f43322eaabbda4f7bee18501
GIT binary patch
literal 4819
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
X6?A5`veQumT0lA)hU#Uic47YlKXqo1

literal 0
HcmV?d00001

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 @@
+<fonts>
+  <font id="repafield_icons" filename="repafield-icons-sm.fnt" antialias="true" />
+</fonts>
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 @@
 
         <!-- 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>
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 0000000000000000000000000000000000000000..699d46e190ce9357f43322eaabbda4f7bee18501
GIT binary patch
literal 4819
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
X6?A5`veQumT0lA)hU#Uic47YlKXqo1

literal 0
HcmV?d00001

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 @@
+<fonts>
+  <font id="repafield_icons" filename="repafield-icons-sm.fnt" antialias="true" />
+</fonts>
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 @@
 
         <!-- 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>
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 0000000000000000000000000000000000000000..699d46e190ce9357f43322eaabbda4f7bee18501
GIT binary patch
literal 4819
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
X6?A5`veQumT0lA)hU#Uic47YlKXqo1

literal 0
HcmV?d00001

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 @@
 
         <!-- 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>
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 @@
 
         <!-- 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>
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 @@
 <drawables>
     <bitmap id="LauncherIcon" filename="launcher_icon.png" />
-    <bitmap id="iconHills" filename="hills.png" />
 </drawables>
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 @@
+<fonts>
+  <font id="repafield_icons" filename="repafield-icons.fnt" antialias="true" />
+</fonts>
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 @@
 
         <!-- 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>
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 0000000000000000000000000000000000000000..699d46e190ce9357f43322eaabbda4f7bee18501
GIT binary patch
literal 4819
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
X6?A5`veQumT0lA)hU#Uic47YlKXqo1

literal 0
HcmV?d00001

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 0000000000000000000000000000000000000000..b28ce93833b7f5cd6b35b492696b0896293f3a5d
GIT binary patch
literal 9821
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

literal 0
HcmV?d00001

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