From ec3b8dc39a4b4dde7a8ffbee9e3d30f11e57b5ed Mon Sep 17 00:00:00 2001
From: Pierre L <pn.lagarde@gmail.com>
Date: Fri, 5 May 2023 22:06:20 +0200
Subject: [PATCH] add the arrow in datafield

---
 iAPSGarminDataField/example.json              |   9 +-
 .../resources/drawables/DoubleDown.svg        |  10 ++
 .../resources/drawables/DoubleUp.svg          |  10 ++
 .../resources/drawables/Flat.svg              |   7 ++
 .../resources/drawables/FortyFiveDown.svg     |   7 ++
 .../resources/drawables/FortyFiveUp.svg       |   7 ++
 .../resources/drawables/SingleDown.svg        |   7 ++
 .../resources/drawables/SingleUp.svg          |   7 ++
 .../resources/drawables/Unknown.svg           |  10 ++
 .../resources/drawables/drawables.xml         | 102 +++++++++++++++++
 .../resources/drawables/heart.svg             |   1 +
 .../resources/drawables/right-arrow.svg       |   8 ++
 .../resources/drawables/steps.svg             |   8 ++
 .../resources/layouts/layouts.xml             |   5 +
 .../source/iAPSBGServiceDelegate.mc           |   2 -
 .../source/iAPSDataFieldView.mc               | 106 +++++++++++++++++-
 16 files changed, 298 insertions(+), 8 deletions(-)
 create mode 100644 iAPSGarminDataField/resources/drawables/DoubleDown.svg
 create mode 100644 iAPSGarminDataField/resources/drawables/DoubleUp.svg
 create mode 100644 iAPSGarminDataField/resources/drawables/Flat.svg
 create mode 100644 iAPSGarminDataField/resources/drawables/FortyFiveDown.svg
 create mode 100644 iAPSGarminDataField/resources/drawables/FortyFiveUp.svg
 create mode 100644 iAPSGarminDataField/resources/drawables/SingleDown.svg
 create mode 100644 iAPSGarminDataField/resources/drawables/SingleUp.svg
 create mode 100644 iAPSGarminDataField/resources/drawables/Unknown.svg
 create mode 100644 iAPSGarminDataField/resources/drawables/heart.svg
 create mode 100644 iAPSGarminDataField/resources/drawables/right-arrow.svg
 create mode 100644 iAPSGarminDataField/resources/drawables/steps.svg

diff --git a/iAPSGarminDataField/example.json b/iAPSGarminDataField/example.json
index 8ffc8eb..8730bec 100644
--- a/iAPSGarminDataField/example.json
+++ b/iAPSGarminDataField/example.json
@@ -1,8 +1,9 @@
 {
-  "glucose": "210",
-  "lastLoopDateInterval": 1683299799,
-  "delta": "-2",
+  "glucose": "60",
+  "lastLoopDateInterval": 1683316189,
+  "delta": "-20",
   "iob": "2.42",
   "cob": "70.2",
-  "eventualBGRaw": "100"
+  "eventualBGRaw": "100",
+  "trendRaw":"FortyFiveDown"
 }
diff --git a/iAPSGarminDataField/resources/drawables/DoubleDown.svg b/iAPSGarminDataField/resources/drawables/DoubleDown.svg
new file mode 100644
index 0000000..8bbf04d
--- /dev/null
+++ b/iAPSGarminDataField/resources/drawables/DoubleDown.svg
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg width="330" height="330" viewBox="0 0 330 330" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xml:space="preserve" xmlns:serif="http://www.serif.com/" style="fill-rule:evenodd;clip-rule:evenodd;stroke-linejoin:round;stroke-miterlimit:2;">
+    <g transform="matrix(4.30001e-15,35.1122,-31.9185,3.90889e-15,4719.31,-3450.75)">
+        <path d="M107.676,140.047L105.145,137.516L105.145,139.614L98.278,139.614L98.278,140.481L105.145,140.481L105.145,142.579L107.676,140.047Z" style="fill-rule:nonzero;"/>
+    </g>
+    <g transform="matrix(4.30001e-15,35.1122,-31.9185,3.90889e-15,4550.89,-3450.75)">
+        <path d="M107.676,140.047L105.145,137.516L105.145,139.614L98.278,139.614L98.278,140.481L105.145,140.481L105.145,142.579L107.676,140.047Z" style="fill-rule:nonzero;"/>
+    </g>
+</svg>
diff --git a/iAPSGarminDataField/resources/drawables/DoubleUp.svg b/iAPSGarminDataField/resources/drawables/DoubleUp.svg
new file mode 100644
index 0000000..f70cd25
--- /dev/null
+++ b/iAPSGarminDataField/resources/drawables/DoubleUp.svg
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg width="330" height="330" viewBox="0 0 330 330" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xml:space="preserve" xmlns:serif="http://www.serif.com/" style="fill-rule:evenodd;clip-rule:evenodd;stroke-linejoin:round;stroke-miterlimit:2;">
+    <g transform="matrix(0,-35.1122,31.9185,0,-4389.31,3780.75)">
+        <path d="M107.676,140.047L105.145,137.516L105.145,139.614L98.278,139.614L98.278,140.481L105.145,140.481L105.145,142.579L107.676,140.047Z" style="fill-rule:nonzero;"/>
+    </g>
+    <g transform="matrix(0,-35.1122,31.9185,0,-4220.89,3780.75)">
+        <path d="M107.676,140.047L105.145,137.516L105.145,139.614L98.278,139.614L98.278,140.481L105.145,140.481L105.145,142.579L107.676,140.047Z" style="fill-rule:nonzero;"/>
+    </g>
+</svg>
diff --git a/iAPSGarminDataField/resources/drawables/Flat.svg b/iAPSGarminDataField/resources/drawables/Flat.svg
new file mode 100644
index 0000000..67f99cf
--- /dev/null
+++ b/iAPSGarminDataField/resources/drawables/Flat.svg
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg width="330" height="330" viewBox="0 0 330 330" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xml:space="preserve" xmlns:serif="http://www.serif.com/" style="fill-rule:evenodd;clip-rule:evenodd;stroke-linejoin:round;stroke-miterlimit:2;">
+    <g transform="matrix(35.1122,0,0,31.9185,-3450.75,-4305.1)">
+        <path d="M107.676,140.047L105.145,137.516L105.145,139.614L98.278,139.614L98.278,140.481L105.145,140.481L105.145,142.579L107.676,140.047Z" style="fill-rule:nonzero;"/>
+    </g>
+</svg>
diff --git a/iAPSGarminDataField/resources/drawables/FortyFiveDown.svg b/iAPSGarminDataField/resources/drawables/FortyFiveDown.svg
new file mode 100644
index 0000000..d9d426e
--- /dev/null
+++ b/iAPSGarminDataField/resources/drawables/FortyFiveDown.svg
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg width="330" height="330" viewBox="0 0 330 330" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xml:space="preserve" xmlns:serif="http://www.serif.com/" style="fill-rule:evenodd;clip-rule:evenodd;stroke-linejoin:round;stroke-miterlimit:2;">
+    <g transform="matrix(24.8281,24.8281,-22.5698,22.5698,774.011,-5547.67)">
+        <path d="M107.676,140.047L105.145,137.516L105.145,139.614L98.278,139.614L98.278,140.481L105.145,140.481L105.145,142.579L107.676,140.047Z" style="fill-rule:nonzero;"/>
+    </g>
+</svg>
diff --git a/iAPSGarminDataField/resources/drawables/FortyFiveUp.svg b/iAPSGarminDataField/resources/drawables/FortyFiveUp.svg
new file mode 100644
index 0000000..1d83be3
--- /dev/null
+++ b/iAPSGarminDataField/resources/drawables/FortyFiveUp.svg
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg width="330" height="330" viewBox="0 0 330 330" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xml:space="preserve" xmlns:serif="http://www.serif.com/" style="fill-rule:evenodd;clip-rule:evenodd;stroke-linejoin:round;stroke-miterlimit:2;">
+    <g id="XMLID_27_" transform="matrix(0.707107,-0.707107,0.707107,0.707107,-68.3449,165)">
+        <path d="M15,180L278.787,180L229.393,229.394C223.535,235.251 223.535,244.749 229.393,250.607C232.322,253.535 236.161,255 240,255C243.839,255 247.678,253.535 250.606,250.606L325.606,175.606C331.464,169.749 331.464,160.251 325.606,154.393L250.606,79.393C244.749,73.536 235.251,73.536 229.393,79.393C223.535,85.25 223.535,94.748 229.393,100.606L278.787,150L15,150C6.716,150 0,156.716 0,165C0,173.284 6.716,180 15,180Z" style="fill-rule:nonzero;"/>
+    </g>
+</svg>
diff --git a/iAPSGarminDataField/resources/drawables/SingleDown.svg b/iAPSGarminDataField/resources/drawables/SingleDown.svg
new file mode 100644
index 0000000..0fa933e
--- /dev/null
+++ b/iAPSGarminDataField/resources/drawables/SingleDown.svg
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg width="330" height="330" viewBox="0 0 330 330" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xml:space="preserve" xmlns:serif="http://www.serif.com/" style="fill-rule:evenodd;clip-rule:evenodd;stroke-linejoin:round;stroke-miterlimit:2;">
+    <g transform="matrix(4.30001e-15,35.1122,-31.9185,3.90889e-15,4635.1,-3450.75)">
+        <path d="M107.676,140.047L105.145,137.516L105.145,139.614L98.278,139.614L98.278,140.481L105.145,140.481L105.145,142.579L107.676,140.047Z" style="fill-rule:nonzero;"/>
+    </g>
+</svg>
diff --git a/iAPSGarminDataField/resources/drawables/SingleUp.svg b/iAPSGarminDataField/resources/drawables/SingleUp.svg
new file mode 100644
index 0000000..9bae8cf
--- /dev/null
+++ b/iAPSGarminDataField/resources/drawables/SingleUp.svg
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg width="330" height="330" viewBox="0 0 330 330" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xml:space="preserve" xmlns:serif="http://www.serif.com/" style="fill-rule:evenodd;clip-rule:evenodd;stroke-linejoin:round;stroke-miterlimit:2;">
+    <g transform="matrix(0,-35.1122,31.9185,0,-4305.1,3780.75)">
+        <path d="M107.676,140.047L105.145,137.516L105.145,139.614L98.278,139.614L98.278,140.481L105.145,140.481L105.145,142.579L107.676,140.047Z" style="fill-rule:nonzero;"/>
+    </g>
+</svg>
diff --git a/iAPSGarminDataField/resources/drawables/Unknown.svg b/iAPSGarminDataField/resources/drawables/Unknown.svg
new file mode 100644
index 0000000..72f2c3c
--- /dev/null
+++ b/iAPSGarminDataField/resources/drawables/Unknown.svg
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg width="330" height="330" viewBox="0 0 330 330" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xml:space="preserve" xmlns:serif="http://www.serif.com/" style="fill-rule:evenodd;clip-rule:evenodd;stroke-linejoin:round;stroke-miterlimit:2;">
+    <g transform="matrix(35.1122,0,0,31.9185,-3450.75,-4305.1)">
+        <path d="M107.676,140.047L105.145,137.516L105.145,139.614L99.166,139.614L99.162,140.48L105.145,140.481L105.145,142.579L107.676,140.047Z" style="fill-rule:nonzero;"/>
+    </g>
+    <g transform="matrix(-35.1122,-4.30001e-15,3.90889e-15,-31.9185,3780.75,4635.1)">
+        <path d="M107.676,140.047L105.145,137.516L105.145,139.614L99.018,139.614L99.046,140.481L105.145,140.481L105.145,142.579L107.676,140.047Z" style="fill-rule:nonzero;"/>
+    </g>
+</svg>
diff --git a/iAPSGarminDataField/resources/drawables/drawables.xml b/iAPSGarminDataField/resources/drawables/drawables.xml
index 7760750..fb340ac 100644
--- a/iAPSGarminDataField/resources/drawables/drawables.xml
+++ b/iAPSGarminDataField/resources/drawables/drawables.xml
@@ -1,3 +1,105 @@
 <drawables>
     <bitmap id="LauncherIcon" filename="launcher_40_40.png" />
+
+    <!-- Arrows -->
+
+    <bitmap id="Flat" filename="Flat.svg" scaleX="7%" scaleY="7%" scaleRelativeTo="screen"> 
+        <palette>
+            <color>FFFFFF</color>
+        </palette> 
+    </bitmap>
+
+    <bitmap id="Unknown" filename="Unknown.svg" scaleX="7%" scaleY="7%" scaleRelativeTo="screen"> 
+        <palette>
+            <color>FFFFFF</color>
+        </palette> 
+    </bitmap>
+
+    <bitmap id="FortyFiveUp" filename="FortyFiveUp.svg" scaleX="7%" scaleY="7%" scaleRelativeTo="screen"> 
+        <palette>
+            <color>FFFFFF</color>
+        </palette> 
+    </bitmap>
+
+    <bitmap id="FortyFiveDown" filename="FortyFiveDown.svg" scaleX="7%" scaleY="7%" scaleRelativeTo="screen"> 
+        <palette>
+            <color>FFFFFF</color>
+        </palette> 
+    </bitmap>
+
+    <bitmap id="SingleUp" filename="SingleUp.svg" scaleX="7%" scaleY="7%" scaleRelativeTo="screen"> 
+        <palette>
+            <color>FFFFFF</color>
+        </palette> 
+    </bitmap>
+
+    <bitmap id="SingleDown" filename="SingleDown.svg" scaleX="7%" scaleY="7%" scaleRelativeTo="screen"> 
+        <palette>
+            <color>FFFFFF</color>
+        </palette> 
+    </bitmap>
+
+    <bitmap id="DoubleUp" filename="DoubleUp.svg" scaleX="7%" scaleY="7%" scaleRelativeTo="screen"> 
+        <palette>
+            <color>FFFFFF</color>
+        </palette> 
+    </bitmap>
+
+    <bitmap id="DoubleDown" filename="DoubleDown.svg" scaleX="7%" scaleY="7%" scaleRelativeTo="screen"> 
+        <palette>
+            <color>FFFFFF</color>
+        </palette> 
+    </bitmap>
+
+    <!-- Arrows black-->
+
+    <bitmap id="FlatB" filename="Flat.svg" scaleX="7%" scaleY="7%" scaleRelativeTo="screen"> 
+        <palette>
+            <color>000000</color>
+        </palette> 
+    </bitmap>
+
+    <bitmap id="UnknownB" filename="Unknown.svg" scaleX="7%" scaleY="7%" scaleRelativeTo="screen"> 
+        <palette>
+            <color>000000</color>
+        </palette> 
+    </bitmap>
+
+    <bitmap id="FortyFiveUpB" filename="FortyFiveUp.svg" scaleX="7%" scaleY="7%" scaleRelativeTo="screen"> 
+        <palette>
+            <color>000000</color>
+        </palette> 
+    </bitmap>
+
+    <bitmap id="FortyFiveDownB" filename="FortyFiveDown.svg" scaleX="7%" scaleY="7%" scaleRelativeTo="screen"> 
+        <palette>
+            <color>000000</color>
+        </palette> 
+    </bitmap>
+
+    <bitmap id="SingleUpB" filename="SingleUp.svg" scaleX="7%" scaleY="7%" scaleRelativeTo="screen"> 
+        <palette>
+            <color>000000</color>
+        </palette> 
+    </bitmap>
+
+    <bitmap id="SingleDownB" filename="SingleDown.svg" scaleX="7%" scaleY="7%" scaleRelativeTo="screen"> 
+        <palette>
+            <color>000000</color>
+        </palette> 
+    </bitmap>
+
+    <bitmap id="DoubleUpB" filename="DoubleUp.svg" scaleX="7%" scaleY="7%" scaleRelativeTo="screen"> 
+        <palette>
+            <color>000000</color>
+        </palette> 
+    </bitmap>
+
+    <bitmap id="DoubleDownB" filename="DoubleDown.svg" scaleX="7%" scaleY="7%" scaleRelativeTo="screen"> 
+        <palette>
+            <color>000000</color>
+        </palette> 
+    </bitmap>
+
+
 </drawables>
diff --git a/iAPSGarminDataField/resources/drawables/heart.svg b/iAPSGarminDataField/resources/drawables/heart.svg
new file mode 100644
index 0000000..d4d03fa
--- /dev/null
+++ b/iAPSGarminDataField/resources/drawables/heart.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24"><path d="M12 4.419c-2.826-5.695-11.999-4.064-11.999 3.27 0 7.27 9.903 10.938 11.999 15.311 2.096-4.373 12-8.041 12-15.311 0-7.327-9.17-8.972-12-3.27z"/></svg>
\ No newline at end of file
diff --git a/iAPSGarminDataField/resources/drawables/right-arrow.svg b/iAPSGarminDataField/resources/drawables/right-arrow.svg
new file mode 100644
index 0000000..73e560d
--- /dev/null
+++ b/iAPSGarminDataField/resources/drawables/right-arrow.svg
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="iso-8859-1"?>
+<!-- Generator: Adobe Illustrator 19.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 330 330" style="enable-background:new 0 0 330 330;" xml:space="preserve">
+<path id="XMLID_27_" d="M15,180h263.787l-49.394,49.394c-5.858,5.857-5.858,15.355,0,21.213C232.322,253.535,236.161,255,240,255
+	s7.678-1.465,10.606-4.394l75-75c5.858-5.857,5.858-15.355,0-21.213l-75-75c-5.857-5.857-15.355-5.857-21.213,0
+	c-5.858,5.857-5.858,15.355,0,21.213L278.787,150H15c-8.284,0-15,6.716-15,15S6.716,180,15,180z"/>
+</svg>
diff --git a/iAPSGarminDataField/resources/drawables/steps.svg b/iAPSGarminDataField/resources/drawables/steps.svg
new file mode 100644
index 0000000..59e3a0a
--- /dev/null
+++ b/iAPSGarminDataField/resources/drawables/steps.svg
@@ -0,0 +1,8 @@
+<?xml version="1.0" ?><svg height="1024" width="640" xmlns="http://www.w3.org/2000/svg"><path d="M500.396,186.043h-32.847v-18.905c0-24.968-20.234-45.221-45.212-45.221H45.211C20.263,121.917,0,142.161,0,167.138
+		v188.726c0,24.967,20.263,45.221,45.211,45.221h377.135c24.968,0,45.212-20.244,45.212-45.221v-19.795h32.847
+		c12.47,0,22.597-10.107,22.597-22.578V208.658C522.992,196.198,512.865,186.043,500.396,186.043z M352.436,323.331
+		c0,4.648-2.056,8.521-5.633,10.605c-3.576,2.094-7.965,1.971-12.02-0.324l-76.807-43.596v33.305c0,7.135-4.58,9.945-5.986,10.645
+		c-1.463,0.678-6.493,2.523-12.087-1.941L108.448,227.343c-1.597-1.262-4.915-3.892-4.915-8.271v-0.516
+		c0-2.305,1.167-4.552,3.069-5.853c4.351-2.983,8.578-1.31,10.605-0.507l80.985,32.398l0.564-44.752
+		c0.096-4.552,2.123-8.367,5.594-10.528c3.442-2.152,7.793-2.267,11.886-0.287L341.85,249.5c6.13,2.945,10.566,10.012,10.566,16.821
+		v57.011H352.436z"/></svg>
\ No newline at end of file
diff --git a/iAPSGarminDataField/resources/layouts/layouts.xml b/iAPSGarminDataField/resources/layouts/layouts.xml
index fee7354..1566609 100644
--- a/iAPSGarminDataField/resources/layouts/layouts.xml
+++ b/iAPSGarminDataField/resources/layouts/layouts.xml
@@ -6,6 +6,11 @@
         <label id="value" x="center" y="center" color="Graphics.COLOR_WHITE" justification="Graphics.TEXT_JUSTIFY_CENTER" font="Graphics.FONT_SYSTEM_LARGE" />
         <label id="valueDelta" x="center" y="center" color="Graphics.COLOR_WHITE" justification="Graphics.TEXT_JUSTIFY_CENTER" font="Graphics.FONT_SYSTEM_SMALL" />
         <label id="valueTime" x="center" y="center" color="Graphics.COLOR_WHITE" justification="Graphics.TEXT_JUSTIFY_CENTER" font="Graphics.FONT_SYSTEM_XTINY" />
+        <bitmap id="arrow" x="center" y="center" filename="../drawables/Unknown.svg" scaleX="8%" scaleY="8%" scaleRelativeTo="screen"> 
+        <palette>
+            <color>FFFFFF</color>
+        </palette> 
+    </bitmap>
     </layout>
 
     <!-- Layouts used for the for the four quadrants. -->
diff --git a/iAPSGarminDataField/source/iAPSBGServiceDelegate.mc b/iAPSGarminDataField/source/iAPSBGServiceDelegate.mc
index b4dff69..4acc9d5 100644
--- a/iAPSGarminDataField/source/iAPSBGServiceDelegate.mc
+++ b/iAPSGarminDataField/source/iAPSBGServiceDelegate.mc
@@ -35,12 +35,10 @@ class iAPSBGServiceDelegate extends System.ServiceDelegate {
         Background.exit(msg.data);
     }
 
-
     function onTemporalEvent() {
         System.println("Temp event");
         Communications.transmit("status", null, new CommsRelay(method(:onTransmitComplete)));
         Background.exit(null);
-    
     }
 
     function onPhoneAppMessage(msg) {
diff --git a/iAPSGarminDataField/source/iAPSDataFieldView.mc b/iAPSGarminDataField/source/iAPSDataFieldView.mc
index 73f187b..6e1efe5 100644
--- a/iAPSGarminDataField/source/iAPSDataFieldView.mc
+++ b/iAPSGarminDataField/source/iAPSDataFieldView.mc
@@ -13,6 +13,7 @@ import Toybox.WatchUi;
 
 
 class iAPSDataFieldView extends WatchUi.DataField {
+
     function initialize() {
         DataField.initialize();   
     }
@@ -53,7 +54,9 @@ class iAPSDataFieldView extends WatchUi.DataField {
             var valueViewDelta = View.findDrawableById("valueDelta"); 
             valueViewDelta.locX = valueViewDelta.locX - 40;   
             valueViewDelta.locY = valueViewDelta.locY + 20;   
-
+            var valueViewArrow = View.findDrawableById("arrow"); 
+            valueViewArrow.locX = valueView.locX + 30 ;  
+            valueViewArrow.locY = valueViewArrow.locY - 10 ;   
         }
 
         (View.findDrawableById("label") as Text).setText(Rez.Strings.label);
@@ -99,19 +102,33 @@ class iAPSDataFieldView extends WatchUi.DataField {
         var value = View.findDrawableById("value") as Text;
         var valueTime = View.findDrawableById("valueTime") as Text;
         var valueDelta = View.findDrawableById("valueDelta") as Text;
+       
         if (getBackgroundColor() == Graphics.COLOR_BLACK) {
             value.setColor(Graphics.COLOR_WHITE);
             valueTime.setColor(Graphics.COLOR_WHITE);
-            valueDelta.setColor(Graphics.COLOR_WHITE);
+            valueDelta.setColor(Graphics.COLOR_WHITE);  
+           
         } else {
             value.setColor(Graphics.COLOR_BLACK);
             valueTime.setColor(Graphics.COLOR_BLACK);
             valueDelta.setColor(Graphics.COLOR_BLACK);
+            
         }
+
+
         value.setText(bgString);
         valueDelta.setText(deltaString);
         valueTime.setText(loopString);
 
+        var arrowView = View.findDrawableById("arrow") as Bitmap;   
+        if (getBackgroundColor() == Graphics.COLOR_BLACK) {
+             arrowView.setBitmap(getDirection(status));   
+        }  
+        else {
+            arrowView.setBitmap(getDirectionBlack(status));
+        }
+        
+
         // Call parent's onUpdate(dc) to redraw the layout
         View.onUpdate(dc);
     }
@@ -164,4 +181,89 @@ class iAPSDataFieldView extends WatchUi.DataField {
         return deltaString;
     }
 
+    function getDirectionBlack(status) as BitmapType {
+        var bitmap = WatchUi.loadResource(Rez.Drawables.UnknownB);
+        if (status instanceof Dictionary)  {
+            var trend = status["trendRaw"] as String;
+            if (trend == null) {
+                return bitmap;
+            }
+
+            switch (trend) {
+                case "Flat":
+                    bitmap = WatchUi.loadResource(Rez.Drawables.FlatB);
+                    break;
+                case "SingleUp":
+                    bitmap = WatchUi.loadResource(Rez.Drawables.SingleUpB);
+                    break;
+                case "SingleDown":
+                    bitmap = WatchUi.loadResource(Rez.Drawables.SingleDownB);
+                    break;
+                case "FortyFiveUp":
+                    bitmap = WatchUi.loadResource(Rez.Drawables.FortyFiveUpB);
+                    break;
+                case "FortyFiveDown":
+                    bitmap = WatchUi.loadResource(Rez.Drawables.FortyFiveDownB);
+                    break;
+                case "DoubleUp":
+                case "TripleUp":
+                    bitmap = WatchUi.loadResource(Rez.Drawables.DoubleUpB);
+                    break;
+                case "DoubleDown":
+                case "TripleDown":
+                    bitmap = WatchUi.loadResource(Rez.Drawables.DoubleDownB);
+                    break;
+                default: break;
+            }
+
+            return bitmap;
+        } else {
+            return bitmap;
+        }
+        
+    }
+
+    function getDirection(status) as BitmapType {
+        var bitmap = WatchUi.loadResource(Rez.Drawables.Unknown);
+        if (status instanceof Dictionary)  {
+            var trend = status["trendRaw"] as String;
+            if (trend == null) {
+                return bitmap;
+            }
+
+            switch (trend) {
+                case "Flat":
+                    bitmap = WatchUi.loadResource(Rez.Drawables.Flat);
+                    break;
+                case "SingleUp":
+                    bitmap = WatchUi.loadResource(Rez.Drawables.SingleUp);
+                    break;
+                case "SingleDown":
+                    bitmap = WatchUi.loadResource(Rez.Drawables.SingleDown);
+                    break;
+                case "FortyFiveUp":
+                    bitmap = WatchUi.loadResource(Rez.Drawables.FortyFiveUp);
+                    break;
+                case "FortyFiveDown":
+                    bitmap = WatchUi.loadResource(Rez.Drawables.FortyFiveDown);
+                    break;
+                case "DoubleUp":
+                case "TripleUp":
+                    bitmap = WatchUi.loadResource(Rez.Drawables.DoubleUp);
+                    break;
+                case "DoubleDown":
+                case "TripleDown":
+                    bitmap = WatchUi.loadResource(Rez.Drawables.DoubleDown);
+                    break;
+                default: break;
+            }
+
+            return bitmap;
+        } else {
+            return bitmap;
+        }
+        
+    }
+
+
 }