From 505a7a6b3a6ef9aee244089d2425981f730df991 Mon Sep 17 00:00:00 2001
From: Gyuri Horak <dyuri@horak.hu>
Date: Tue, 26 Sep 2023 17:53:44 +0200
Subject: [PATCH] other icons

---
 .gitignore                        |   5 +++++
 TODO.md                           |   4 ++++
 resources/drawables/drawables.xml |   1 +
 resources/drawables/e_gain.png    | Bin 0 -> 885 bytes
 resources/drawables/e_loss.png    | Bin 0 -> 869 bytes
 resources/drawables/hills.png     | Bin 0 -> 907 bytes
 resources/layouts/layouts.xml     |   6 +++---
 source/RepaFieldView.mc           |  12 ++++++++++++
 8 files changed, 25 insertions(+), 3 deletions(-)
 create mode 100644 resources/drawables/e_gain.png
 create mode 100644 resources/drawables/e_loss.png
 create mode 100644 resources/drawables/hills.png

diff --git a/.gitignore b/.gitignore
index 5e56e04..612d800 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,6 @@
 /bin
+/gen
+/mir
+/internal-mir
+RepaField.prg
+RepaField.prg.debug.xml
diff --git a/TODO.md b/TODO.md
index 155f1cc..82cf3b5 100644
--- a/TODO.md
+++ b/TODO.md
@@ -3,3 +3,7 @@
   - configurable theme color
   - pace/speed based on sport
   - imperial unit support
+
+- hr gauge => hr zone distribution
+- track color => color coded by elevation gain/loss (or even vertical speed)
+- https://github.com/loukad/vertlover 
diff --git a/resources/drawables/drawables.xml b/resources/drawables/drawables.xml
index a22c33c..b240346 100755
--- a/resources/drawables/drawables.xml
+++ b/resources/drawables/drawables.xml
@@ -1,3 +1,4 @@
 <drawables>
     <bitmap id="LauncherIcon" filename="launcher_icon.png" />
+    <bitmap id="iconHills" filename="hills.png" />
 </drawables>
diff --git a/resources/drawables/e_gain.png b/resources/drawables/e_gain.png
new file mode 100644
index 0000000000000000000000000000000000000000..e47d0977862b842786bd9b199cac78526cc2eab9
GIT binary patch
literal 885
zcmV-*1B(2KP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F80004mX+uL$Nkc;*
zaB^>EX>4Tx04R}tkv&MmKpe$iQ>A`X9qb^*AwzYti;6hbDionYs1;guFuC*#nlvOS
zE{=k0!NHHks)LKOt`4q(Aou~|>f)s6A|?JWDYS_7;J6>}?mh0_0YbgZG^;BHXu55t
z5^*t;T@?eb=tUU)7(`TNmN6$uNpu`v_we!cF3PhypZjwRs5y%PK9M-a4AUmwAfDN@
z4bJ<-Ay$-C;&b8&lP*a7$aTfzH_io@1)do))2Vsl5V2TjW2KE*(bR~ii6g3}Q@)V#
zSmnIMSu0mr^Pc>L!JNLb%ypWhNMI35kRU=q6(y8mBTB1IiiH&I$2<7Lu3sXTLaq`R
zITlcX2HEw4|H1EWt^CxamlTWx-7k*wF$M&7fkw@7zK<QJaRT_Cfh)b`uhfCrPtt2G
zEph}5Z37qAElt@2E_Z;DCqp)6SMt*o@_FF>jJ_!g4BrBMYhG{7eVjf3Y3eF@0~{Oz
z;|0oI@9^%P_TK(I)9mjDp_OvEATTzQ00006VoOIv000300RL*)U>^Vg010qNS#tmY
zE+YT{E+YYWr9XB6000McNliru=Ls4NC<LYp$HxEw02y>eSad^gZEa<4bO1wgWnpw>
zWFU8GbZ8()Nlj2!fese{00B)&L_t(o!|j)`N&`U<hQB!iVj)CRXj;Ks;X_35S@Z?O
zJ`dnKTq(BJ7M7xgTAnuPk|KH$6H@7K;V4JAlMu6}@P624cV@qt*`0-jO8;FJa&t*d
zAO`Bd889}pjl4}Q5HJRIfR>N=D`81ZGwUrRfD+&?&;(Y239yoLN%HVt1t9691lR*E
zfCu2v=ih-0IGx_7HYdCT92Ec`fz-z>um+5Q5ils)YpwvytRo4Br$Cx7t)xD%3A_La
zZ~$DpZCFX_>r+EX`;yKjjU*ix*+&b84|18efj3|qcm{5Q1|TT|8o(>iHnV$QY5-56
z%bt1JGjGlBPVxDq%(u3n%<I6=%+{ygh?aNCRhfSj0`7|a{0BeX{wNTfS<gQT2;T#?
zfIBn0407RSd@)%HJZP&`@CshRL&7J^gm)c2S=ui}Qn&i6{k1*-`M@OtTl7IU00000
LNkvXXu0mjfBk_45

literal 0
HcmV?d00001

diff --git a/resources/drawables/e_loss.png b/resources/drawables/e_loss.png
new file mode 100644
index 0000000000000000000000000000000000000000..246dc114b1953ecca39452cbe714becb3c79c5dd
GIT binary patch
literal 869
zcmV-r1DgDaP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F80004mX+uL$Nkc;*
zaB^>EX>4Tx04R}tkv&MmKpe$iQ>A`X9qb^*AwzYti;6hbDionYs1;guFuC*#nlvOS
zE{=k0!NHHks)LKOt`4q(Aou~|>f)s6A|?JWDYS_7;J6>}?mh0_0YbgZG^;BHXu55t
z5^*t;T@?eb=tUU)7(`TNmN6$uNpu`v_we!cF3PhypZjwRs5y%PK9M-a4AUmwAfDN@
z4bJ<-Ay$-C;&b8&lP*a7$aTfzH_io@1)do))2Vsl5V2TjW2KE*(bR~ii6g3}Q@)V#
zSmnIMSu0mr^Pc>L!JNLb%ypWhNMI35kRU=q6(y8mBTB1IiiH&I$2<7Lu3sXTLaq`R
zITlcX2HEw4|H1EWt^CxamlTWx-7k*wF$M&7fkw@7zK<QJaRT_Cfh)b`uhfCrPtt2G
zEph}5Z37qAElt@2E_Z;DCqp)6SMt*o@_FF>jJ_!g4BrBMYhG{7eVjf3Y3eF@0~{Oz
z;|0oI@9^%P_TK(I)9mjDp_OvEATTzQ00006VoOIv000300RL*)U>^Vg010qNS#tmY
zE+YT{E+YYWr9XB6000McNliru=Ls4NC>*tCUy%R+02y>eSad^gZEa<4bO1wgWnpw>
zWFU8GbZ8()Nlj2!fese{00BKoL_t(o!|m5GN&`U@#_|7K3$YMmOyO2mCWVESU?b!<
zxke6<6WCZ=*m#4Sz{W;l#V!hlNKm&B`7C^aDb`KMu5L50T4sisA8+P8ScnmXq{l`N
z*H7e4B63H}nncVZA|fIpBI-g&8a9TIH1stWjUXiTB~2vVNb3K#PqHq+%yxlSpjDEI
zDX>?zPf{fdOAvR!1JD6_e*!2%NJ@Qt0^9>z!0CTh$6V6!s_!7F3*ecU0^7iNfmrqq
zk~*_sW*y)e*a61ChQEV0a8fJ4>wMs8P6Nb#fVcuOpE?WIRlV;;llhR8NxGIa3PF;d
ze9fDG-<I`*br2&zICDr5Xzt@*l3t1cRuPeUjrV{<pbH!Ush3|4Yz9|-Zf1kp04svJ
vK_mJE4!lRy4=4e(fJ@-r%-Zo6Fh&^P1vrP<!60`G00000NkvXXu0mjfw2p9`

literal 0
HcmV?d00001

diff --git a/resources/drawables/hills.png b/resources/drawables/hills.png
new file mode 100644
index 0000000000000000000000000000000000000000..63a7a0d5a50b535fa4f8230b9130072ee147773a
GIT binary patch
literal 907
zcmV;619bd}P)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F80004mX+uL$Nkc;*
zaB^>EX>4Tx04R}tkv&MmKpe$iQ>A`X9qb^*AwzYti;6hbDionYs1;guFuC*#nlvOS
zE{=k0!NHHks)LKOt`4q(Aou~|>f)s6A|?JWDYS_7;J6>}?mh0_0YbgZG^;BHXu55t
z5^*t;T@?eb=tUU)7(`TNmN6$uNpu`v_we!cF3PhypZjwRs5y%PK9M-a4AUmwAfDN@
z4bJ<-Ay$-C;&b8&lP*a7$aTfzH_io@1)do))2Vsl5V2TjW2KE*(bR~ii6g3}Q@)V#
zSmnIMSu0mr^Pc>L!JNLb%ypWhNMI35kRU=q6(y8mBTB1IiiH&I$2<7Lu3sXTLaq`R
zITlcX2HEw4|H1EWt^CxamlTWx-7k*wF$M&7fkw@7zK<QJaRT_Cfh)b`uhfCrPtt2G
zEph}5Z37qAElt@2E_Z;DCqp)6SMt*o@_FF>jJ_!g4BrBMYhG{7eVjf3Y3eF@0~{Oz
z;|0oI@9^%P_TK(I)9mjDp_OvEATTzQ00006VoOIv0RI600RN!9r;`8x010qNS#tmY
zE+YT{E+YYWr9XB6000McNliru=Ls4MCNvu!%wPZj02y>eSad^gZEa<4bO1wgWnpw>
zWFU8GbZ8()Nlj2!fese{00Co3L_t(o!|l~QOI%S92H<tog$RBn!8BqeBp5961J+^-
zI|~aXA*Be~7=n<_#!e84jY6;#1d9}Q7F*~KNFjz8tU@4(Uxk95JW1gRkwbP}*~?vv
z`!@H?J9E!FoHH{gm&=eLLxwtl_C|_t;5U{UA^tjuUxaTdP4PB-$ID>9#U7f|N?;!A
z5m&}k8sdF8MQ_9p;upH2lN!OpBoo-gTm|1M-iLJ_JE1-f6X_Nd@eL0u_#fj0&oF^Y
zY~c(G^@`{531hd!y$SX314Du957*XTPXd$Jts$-jU$7SO@33_j!KNGQ4*bN68viZf
zNyHUGEezMP!5q#}4E7>EBv3;m_>7inLC<mJ8VA8XK~F+mw2hf+0p&1gI<Olmcs9W{
z9>6gk{m(gy{l6m>PlH`Zc$h6?B_><(HGWhQonrs??8XrW<2L!2;)6Dg@=f9uI#W!b
h3FB#MX2@`V@dxSIs`}@z<E;Py002ovPDHLkV1hNsg?In}

literal 0
HcmV?d00001

diff --git a/resources/layouts/layouts.xml b/resources/layouts/layouts.xml
index a034d4c..0a6fdf2 100755
--- a/resources/layouts/layouts.xml
+++ b/resources/layouts/layouts.xml
@@ -38,12 +38,12 @@
         <label id="cadenceLabel" x="12%" y="98" color="0x004488" justification="Graphics.TEXT_JUSTIFY_RIGHT" font="Graphics.FONT_SMALL" text="c"/>
 
         <!-- elevation, egain -->
+        <bitmap id="iconHills" filename="../drawables/hills.png" x="20" y="144" />
         <label id="elevation" x="13%" y="132" color="0x0088FF" justification="Graphics.TEXT_JUSTIFY_LEFT" font="Graphics.FONT_MEDIUM"/>
-        <label id="elevationLabel" x="12%" y="138" color="0x004488" justification="Graphics.TEXT_JUSTIFY_RIGHT" font="Graphics.FONT_SMALL" text="e"/>
+        <bitmap id="iconEGain" filename="../drawables/e_gain.png" x="20" y="184" />
         <label id="elevationGain" x="13%" y="172" color="0x0088FF" justification="Graphics.TEXT_JUSTIFY_LEFT" font="Graphics.FONT_MEDIUM"/>
-        <label id="elevationGainLabel" x="12%" y="178" color="0x004488" justification="Graphics.TEXT_JUSTIFY_RIGHT" font="Graphics.FONT_SMALL" text="+"/>
+        <bitmap id="iconELoss" filename="../drawables/e_loss.png" x="20" y="224" />
         <label id="elevationLoss" x="13%" y="212" color="0x0088FF" justification="Graphics.TEXT_JUSTIFY_LEFT" font="Graphics.FONT_MEDIUM"/>
-        <label id="elevationLossLabel" x="12%" y="218" color="0x004488" justification="Graphics.TEXT_JUSTIFY_RIGHT" font="Graphics.FONT_SMALL" text="-"/>
 
     </layout>
 
diff --git a/source/RepaFieldView.mc b/source/RepaFieldView.mc
index 61d7167..50219d8 100644
--- a/source/RepaFieldView.mc
+++ b/source/RepaFieldView.mc
@@ -264,6 +264,7 @@ class RepaFieldView extends WatchUi.DataField {
         // alt/egain/edrop
         var altField = View.findDrawableById("elevation") as Text;
         if (altField != null) {
+            // draw icon
             altField.setText(altitude.format("%.0f"));
         }
         var eGainField = View.findDrawableById("elevationGain") as Text;
@@ -300,6 +301,17 @@ class RepaFieldView extends WatchUi.DataField {
 
         // Call parent's onUpdate(dc) to redraw the layout
         View.onUpdate(dc);
+        // var bitmap = WatchUi.loadResource(Rez.Drawables.iconHills);
+        // dc.drawBitmap(132, 132, bitmap);
+        // TODO
+        /*
+        var bm = new WatchUi.Bitmap({
+            :rezId => Rez.Drawables.iconHills,
+            :locX => 132,
+            :locY => 132
+        });
+        bm.draw(dc);
+        */
     }
 
 }