From d4c69ebca3a22b0d92d1cb6299d9f8b7872e3dfd Mon Sep 17 00:00:00 2001 From: Arjan Schrijver Date: Thu, 15 Jul 2021 14:15:09 +0200 Subject: [PATCH] Fossil Hybrid HR: Add steps and HR widgets --- app/src/main/assets/fossil_hr/icHeart.rle | 2 ++ app/src/main/assets/fossil_hr/icSteps.rle | 5 +++++ app/src/main/assets/fossil_hr/icTrophy.rle | 1 + app/src/main/assets/fossil_hr/widgetHR.bin | Bin 0 -> 556 bytes .../assets/fossil_hr/widgetHR_preview.png | Bin 0 -> 9366 bytes app/src/main/assets/fossil_hr/widgetSteps.bin | Bin 0 -> 678 bytes .../assets/fossil_hr/widgetSteps_preview.png | Bin 0 -> 10369 bytes .../HybridHRWatchfaceDesignerActivity.java | 7 +++++++ .../qhybrid/HybridHRWatchfaceFactory.java | 19 ++++++++++++++++++ .../qhybrid/HybridHRWatchfaceWidget.java | 2 ++ 10 files changed, 36 insertions(+) create mode 100644 app/src/main/assets/fossil_hr/icHeart.rle create mode 100644 app/src/main/assets/fossil_hr/icSteps.rle create mode 100644 app/src/main/assets/fossil_hr/icTrophy.rle create mode 100644 app/src/main/assets/fossil_hr/widgetHR.bin create mode 100644 app/src/main/assets/fossil_hr/widgetHR_preview.png create mode 100644 app/src/main/assets/fossil_hr/widgetSteps.bin create mode 100644 app/src/main/assets/fossil_hr/widgetSteps_preview.png diff --git a/app/src/main/assets/fossil_hr/icHeart.rle b/app/src/main/assets/fossil_hr/icHeart.rle new file mode 100644 index 000000000..ef8af6abd --- /dev/null +++ b/app/src/main/assets/fossil_hr/icHeart.rle @@ -0,0 +1,2 @@ +L                          +                ; ÿÿ \ No newline at end of file diff --git a/app/src/main/assets/fossil_hr/icSteps.rle b/app/src/main/assets/fossil_hr/icSteps.rle new file mode 100644 index 000000000..745e08224 --- /dev/null +++ b/app/src/main/assets/fossil_hr/icSteps.rle @@ -0,0 +1,5 @@ +5               +       +    +   +             6 ÿÿ \ No newline at end of file diff --git a/app/src/main/assets/fossil_hr/icTrophy.rle b/app/src/main/assets/fossil_hr/icTrophy.rle new file mode 100644 index 000000000..c53ab4278 --- /dev/null +++ b/app/src/main/assets/fossil_hr/icTrophy.rle @@ -0,0 +1 @@ +2                                                        8 ÿÿ \ No newline at end of file diff --git a/app/src/main/assets/fossil_hr/widgetHR.bin b/app/src/main/assets/fossil_hr/widgetHR.bin new file mode 100644 index 0000000000000000000000000000000000000000..2cf4965ac52761925779399206a1656e42222543 GIT binary patch literal 556 zcmX|6yKdA_6dYf__d#$l(w3|!Vv5kQD}dp{bLr6U5e%I{NIM!la}w+Lm-Wz4_dksd z^``C&eiZbQ6XwSITt^7|@bEO~bNmoECB73kgsIzG%}%buYC!FfcZ~RrxEKS8`0>Pk z{9$^Z%~L0Ff3Cb~Xoh|pM3Z^n=Fwsw;BVil+JpUg?F%#E?z<4 t&1(ytwlZ&OpYK%3PSc&2e*vhba1{Um literal 0 HcmV?d00001 diff --git a/app/src/main/assets/fossil_hr/widgetHR_preview.png b/app/src/main/assets/fossil_hr/widgetHR_preview.png new file mode 100644 index 0000000000000000000000000000000000000000..72728a4ffefbe24bf3b4054f14eac1d4e3d69b6e GIT binary patch literal 9366 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 literal 0 HcmV?d00001 diff --git a/app/src/main/assets/fossil_hr/widgetSteps_preview.png b/app/src/main/assets/fossil_hr/widgetSteps_preview.png new file mode 100644 index 0000000000000000000000000000000000000000..3b8e5d66dc2b70a55d48d2f1b00536897a6a6d91 GIT binary patch literal 10369 zcmeHsXH-+$);1mKRYhtDh_pa}&_ajMdjLT|AV7dnLo@V_6s1b;YtCoRwUWIOqo<=vLCQ#qgM&k%t_Fi+ zKc%mZYed*H^!%d-4$k!rKSL8QI06Ged$`%5oRI)8Uo;Yc^g-F-;P}jb%0hWCOQ9ov ztvkXYT6)7=5iE#u`cwhM>l>UJ40gx zWdBCjx&CxC$}vAb$TBzX`0z5~^lUURc)mUOvn0LO+JW0h?ZIMv+c9ol%V_xzM8O&3 zVBBt(!@g+H1tc+eL`!61{gAPugNXF4=172jThoz2WWh0GtCwOyRqTFu1S}uS_Uw9%_|AKnd%f|-%y;g-*DhnY zIEuvV-ie>6XN+|VA_C4uR#;*JNI=zk?rZ%Wp~aVh0y_&WpXRiUU+jD2d}Rrjtl3i$ z3|=`-$ImTJ#Eed3%!CAMORN~b=U7ORMYSH>Q2okyvVDAzaL%}A_0q0}ziw`yTqxQ9 zRoXJQxhk=aR=eDbwP8PskeF7CwXnbvZnipZdM;?;=6apYE4kcIUiB4X0W{C)EB-)E zCA7}rOYs?c%-G?OTvQJ~bCOzdn3L(o2``>=zivz_!zNEj27I`(B+GPD@=J!n=nLCW zOTohaWDSAR$q9|x!q-`jHKlhA%(h2ba3spo%ur2D(^BHwkLO>!^i_DjWfN_k!>7# za(zhT4d*)lorKRlt+~1b9Y1%n*Er5>2^@Kf_v&v3YR4)5ccG8A<1&GyjncGSv!-xFYs)ZXSZ0G@{@a7^i7h`^Uu^SsRCzf4IzoPC0o$Ayu zXaw__d}t#y-EImeXK72gfSms_ONjI?el?htouo0IF3Y+#-1PBieD`a-mh5D4L#u9U zpP1$B^t(P<5#`EEZMmk)xYbO#7JP$gQkKsRJqs=u9}ff?LV4Eu16A4|g?Pj_PUOw- z`UH8p@0`CU?i470p7%b!6asFe&K-_yW;B1zWIPl0JtX5JuKUzL!{@4gF z%@4C{zaLTB-x0ZH>*9U$K?C1Y4cH^-?rB2zD3qHWM*m|WN^@}1^^~U zhWI_oC)84-Z{hLH<7RLbKX4aGmAnT$mEoNX57Yei?};{ckbA#me*)A zsF>Q4><^kdjqa0EMe;dl?eb>jwG#AIx;Isnk>h6GHDx)?ebvLwr$V{B%Q;#AsMHWD zY{XC=RtQrIB1gW=a*Fb#QRF0raaGl%$HXa}6r);tx1ebR5eeI8KKE%a!xvW%2j6racFKfmpd4+_D>2I^qdb$ZYmUCCT7s z@UX5ruEfzpPes!-O?Uu@TqxD4WIMu7k*+PKA9sSf;_wJ2iFq3Ym%Sc<(bK?t?4v`Fnw>4MkAsgO!s{x&F7q3S*8E6-@ zs9Cf`g$s(d-xxBMKM4u)2%uYPN|A3N#HaG~0kDuFI2zK`Ykhc)KZq5au01K5J2ta% zqAzSyf20tDOkG*p>}WrVqH^e_jDHw7xVQnE;ZJ1`NBO7dxLPeNaM66ZkGT9?~5R6?N%vdT^e|`Nof#yYpII8nuNm=ClkH!jeOtZ^Om@Ug#aQdLxlbsJzZ~` z*ie`(JH_o6!~E|#tu7_0=7t;Z!WyB&)}1Syaha&WQbMh z<5Z_neJM`Sm&Ml=t+?b;YWg7Nnj8^4Qolh=kQLT&#^FqW*eROdGSrJQ&7gU_N$JJ4 zOVH4QbFH1c^@rfI1BQWf|8LT-g=V0H2wYA>HAGLTHt8+bSB$1~nqIQ8qu~(%xRUh= zWuKI+yzFt}O!%o3S>xz@WMG3R@>h7%(EaL;_or~jTc~H28X)cUff5Ei{3S6cJt3Ne zKt7GUKXe(aT7-t=BUtr}P1tgn{9x)5amyj6?Aw;Nx(D&Zw5B|l`0^Q)OO?VOu})Nb zs(m39FjFX+)*GG>FV<&x&>O70I$&q_Jh-qs=uUSUV?MYiD9)bQb+OVO^6U*sM_iXk zQ{H!lSCy!pxLJykM}>9m9kAf!AFu8{o0WIKQ`AoE?snMY!0|g-^-t`fK%7H1;S5M(|hV?iw}CCA)uL0_c6~htF>JWH-&LCP-O$p z?0&S8<8;4lw{0ckDj|5vqvW9t1E?$B(n>M>{v;ZvtHpuRttb`(zqB6c@?FUF>~+b2c1hrOO05}x!2&N1$84yXl~&XPjO?9yvJ{2L#PW#n}Vg^ ziG=1N&~(Lcs&W^WeR7Wqmo5`)6n?ed$_G1>)rkkRGm3pPJBGOzz^BH)GBCKDr}+Kq zI33}%qD^OHldk3|dIzIVY1o-xZD#wBr=(2B9eLq!9fye0M@UfNB~?|4BSe+%?_7gu zzP`_@LFT(?wHC|KyS4rh&17}$u~Vx0`V=Bb7Q)2+bJe5Eq>D2DctdD0YOGa};97)P z7r~^-;@9$mGyv@0t37>PPM~EL=9FHYZoaWoPtvgKwB#Mj;`P_YRB+m!ZBQ6WM2DKjb`J*EIU7MRRFDSS1>z^-UPYAI-NT`^d5N)Zy%S+S7vb1I#R-g>`S;aa8q;v zvIZwZdYS?8cW_~!fK2=xq0ya(=!|Xjc!rryhTtjGXY7h^@7^V#@3O=|f zNX`v&}}&XPi^i5K*OVGaO;D|%7WNj2DlYxEzTYm=OE zNNcBYpAZ?l%k8R;j!L$iKs*4VoLdi#ubYRZN#eK)C~8^9Ccj|i`kodZ{)?Pr20i1J z{jkkL<~psaw#p$}%-Rb|BRXs4XN(Rd`1v+dgJ@oqymcA=v!2lCLkeUA0daa51_TY0 z2?;%E{-7>h^i92RzHvoLn9Jyd_;wy{!OtP-Pv4KLU+cQv`!pr8k(aXE)tq$E#4?VL zhnKUSD8+c~!R|36(e|m+0_#J9UG*WlYvbkmroa!X0v3{A)H*r8bDtT_OI;MjR<^5# zP?+B_GTfKNSs{CQ^q!4n{hX1}l0un7`;w}AU)3Riz4(+o?y(^HToTe5qR;Y>m?83n zN;r$HFzG$31AXNw2_&uj#Tk*NpdQ|N6XqwG{27sIMCr5e>R$EYiUTDT$J!2o)RPJA z5k)1<%P9@?0QOs=tt=t$CNIiOA^Z$-8@^QG#OD(d#fu^yYAo=@EwKZb*~6y!UX|6( zCDSL`%Cv_`l`@(8tC4QxXePfvpuosx=qzI^7d7pPDX+T@EB1B6z$}N?}zY zkWu<_BPXf)m`*I2d((0Hq}8azwW=&s7QmxS=>d}A zXqK8dd{z;qHJ{2d4=zdFY4&2K28;aZrQbYt*Y9VeisaXl0_^)XOKjbzAT4E7Foloh zF#oVNv=~=#?NK#2)=bxbWA@bXnd=WW>c`XyhIo&4H7Km6b0m=i=g<@==lrS*pYrn2 zSMZ`rSw-%q0rSaZ)jGW)m8u|b^uz$sL)~-h8m;dJRD8Ej{D7|8WXLF?zLak#>VuItG)oGlufhdq*Gp^w>Q>%ZVX|l@yrZ-n6;$f&JSy;35w(2 za)Bxz8{aM)i;2}u3fEJPA=z60F&J&>i1}E*a7OVaQEl&#S=}*~j2oW0wC$Uko~V~k zxt+3877PN62a+mKFcdM*awV!D$9%$ay^c-r6q}LvYrtpZ~@E&8m zZuHuW54rB5$0RH2_`Mf(KOwobyrp9M((m}()ojb|IcI@~0h3N`IlV@J7|Gj4O?19d zTedDHed%Z=)nKFY>j7^{AJ(mwGCB%i4jj0f_C&F>AH4-Th@#E(7c}hOE zFnE3RXb-q}SYQemR%j+fD(2#at)8)G-A^~EbRuC9w5QhNy+Ka8S1K}|+0%zJL}gr@ zT1GKQ7PA$gV2g?p%j8$S&W;@Q)g)BJs4Vulms?@{bZX_})hNXabSFNi`|L&*%@mvV zEv#pg8$n2kKEu=fjw`q2$OMn?r!8{azu3=?E5NBz9(xjJu#NPl3E0vNt`$g{xxs!u zTejeM>e{K|pcGy4FoD}M!e(x6E9_p>-EnTKI!Avt``)JXuW)|XW0KEF-r2zEY8A^_ z-P&xwH*oQn!S|-A=rpM!w72VjaitBpkUSMuj!VwaeitOSI&qlA2ay)tp!fwJ5j{4n z_j|K<$;=;wX>&TJcpetoozLcokeOb1y_poP&O0wNJ#vqL&T#0{{kuB}p2CI6He=S( z5i=jY9ufTbqCMyL{dH~xRB>5!n~MDHI_pyZOGhdNC)}Lp6?%T(U9_vV{abozap{W> znk(gagJ8EwgruwMHt@gK0g-6q?Y8&9coogH+qOk3JUG&LRYLLxmEX{ z!o{f$2gi?_*TfQ<*vx9@RD<*5xNKy{RE&+N`RCID%*QIlKtF%XhA$f!2WX%Ugv$G( zHYNi%zxCuY73v0T?w4+{;z^841>9{D_7*wRdL;a8`u2i~LSg?0vpX?uW$UID%iQ`^ zEVwagxmlPcX2M8brX{?OB6_(Cbi6H}=yIR$8|r@l2D)oW^)@B8;l-_LBN5UK=}EHh zW^-+Er2^4{jnB!>a+bWb@*7?2S&<91IS`Q+ zpnYihQ@cK9{WU0XblqQ6 zA28Ha*!Lro0J~ybE<8x9&LVBbccR4~fbJTxW#0Lc;}1vg+V~bFCBtINYbyQYn{>&T z%8H@_H7sBlX-7NMIz8>1tmzqD<&2Yb)|yi}VQN`f4Y7m8`RG{DZNZ;=I5@ZwC?zF5 zbtR>L?fGJNdUFDkWYqfPnO|8Nloq8@KA_eg)XU|Mj+Jn{9;?SbN%{<$VSdIAL8-yb znF(jY!r2}f5#O}G&tgufu!rA2GNL}NtZ{A$cc5A6ahF^8A|wXg1FFWSP=Vi`K3z*!%ntTvex#w(`xFizqbl;_68^ZdPis@9+wbJ7=L z-Gf32q>#ZHwsWc=jMH_l*BvEjyo~_&oCE~mIT^$;{vdEmB90DlLT>&Q6kJNF6`XA0 zgsSHNG*FnEw?L3ot@F5N`Q#r{?(?V_aMOnzi=34)zr&Du)%taa9=o66*j7|cQlQb- z9@F#qkF0;Xzuj@+U-og4$~e{|2eY7s!0yd6qOg1LCfZt18#fmLgsq!3QozRrjoqWi z?$yirpb<7sNH2gj(jMh11Ke%v0s>IBGC*TdZLl_43F&}R^YcI&_~{th_&M1~+5+Wd zNu_TCmEoLwjMyq%>xO52tWkDAY~ua z17V;nDL~r8)(#4Xsr(6ny^{etczL0rf`S+fMgSus;O1d3C?qK*8j@=w=vdATN?^B>t=(ph5o)25)}j6LJ+nfq&UP5 z1QD?n14&9EML>2CQ861k8)2k`nBCu?)LlKj5Uw`JD<~|u01AsEEDW}jfJh2~Al5=6 zAc&ZR2uRWz3n2yuOA6UZ3Ww&^{CBpgdQC&gVVxdHBgeAZTVF*ZAOiUC6 z5f?{dqY)MbAw`8H#YC?(5@NrhY;B+_ZXPZOY&lUb2z#U;+SUHI;)-ynf}XkzP*?!` zZ;75W!pjcpAOqAwxqAEjTVaTDK^k}=uGkb36BZMJNJvUTB*ldw!b1Nxx{LJi#CGBp zrVv;_81h?lRTd~V87#4gt3Jg7{FY;Lfhu_*5ngT{hHh@oGQg{l09T&B+Z!PLM^V&J zo>&XttB(J(=M9kVf86~s1)Nd8RRF;6wuK^W{usm)@c?Q2dmyaeA1WIMgsVLgJHP*I zsDH^(|4XqDBGw2|QE@QH8VQDgAhx#RAOunp2|`%gfkj2^#Ds0c|0vd9=$>wNUKoT2 zQo$aZDK;By1O3hh!2O#_p8t#m27D`RQF|A!Ol-v)nM2C#mA$gs-`cC`}xYq|Q9vnv|^4_|-Q;{R|2Ec8Ev{8#+` zL)Sla{Z|b9SH}Nz*FSXqR}B1D#{YEJ|2Miw|NX#&bjAJ(!eAd~y!rW@u#ZAS)|#p? zoL^V(f{yYhSP2PQ?VcwNjsVBif$LK$_W&y-_EOhYCSE0`BI5+A^%Z;J;NaV;!xRi1 z7Pd3Bqm7UZ1Hoh9(o-XN-)$ws*oH9LWNLm#8&FoHx*A2<^B6_E7;f?LB6aiU+@RSn zWxbry_h3pe8VUs0XALkNjJ==RMPq=}GYAwACD7v8Ww$muuz%qqaGbLqxVRpicf2Aw z7OKVdWXM*yRB78F;c5BQ2=eC7MCfMld2x+EM-v~cqVVFfs;?6Uzr_6zCkT-U7&_c6{|sh&Pb7^9`RKAq^Kh%bVTOs zAft_8U@O1=?p?R47tJkJ;%r+bY~zTes!;E4{BF~w+UO1SV>||;8&eRb_~=)SqEFqX zVY{|d9juQ|{l#=wlsDyPQ#y@yt6qwC#V=hTM+a5N2;4f7;qOE?dv)SJ%8X>y65lP= z-d3>U29BnRzT}&#D)*buQ0eKyIS9Gvp6Onvaj$#(?HD$4_Q~kz>ENuFVXn67Op~o} z<`o0xG!@sqAH5VrDn0$l_+iXwrW`s&bExQd!2}mCPu9_IGur&N$$oe|xl=d0=y+6G zQ>CH*bAa#UXIT1yN?6OsjN@<8B`VAYZVt=q%!jInaK136>&v?MySTbIW~M$W!Fc#X zmk$JjP45wHsU3?~b~Ih$5r^1^wuKVPQ`O;~khBthSg@VH8M@k?HRTCYhxx7+tDwYucQ>poJPleRh*F&&@g4-t{9&$pC&2XBhM6EQCfbeEdA*can1Kd=`{ex; zqW=2Q6GM&7N6`;rxA;Q*zcJejdY+mccy6CfPASyObl>cTTiL(@W(H+}H#mcNQR$Zy zJ`_HsWs9lZ2i@_}5(_-*bF-xe6CNfV6|!QZLg}T77i?4dce}LKcXFV<^1o6@@4CT* z)$$d@bDAEKRRk+3F1DN^XZq4sfr-TRN8rCah$wv^0W2YdFy0Q+eM$szle*j^g B?i2t3 literal 0 HcmV?d00001 diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/qhybrid/HybridHRWatchfaceDesignerActivity.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/qhybrid/HybridHRWatchfaceDesignerActivity.java index 6dc1e1504..ab183d6cd 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/qhybrid/HybridHRWatchfaceDesignerActivity.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/qhybrid/HybridHRWatchfaceDesignerActivity.java @@ -237,6 +237,13 @@ public class HybridHRWatchfaceDesignerActivity extends AbstractGBActivity implem case "weatherSSE": widgetName = "widgetWeather"; break; + case "stepsSSE": + widgetName = "widgetSteps"; + break; + case "hrSSE": + widgetName = "widgetHR"; + break; + } widgets.add(new HybridHRWatchfaceWidget(widgetName, layoutItem.getJSONObject("pos").getInt("x"), diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/qhybrid/HybridHRWatchfaceFactory.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/qhybrid/HybridHRWatchfaceFactory.java index 41c385682..8ea9ad2c8 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/qhybrid/HybridHRWatchfaceFactory.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/qhybrid/HybridHRWatchfaceFactory.java @@ -71,6 +71,20 @@ public class HybridHRWatchfaceFactory { widget.put("color", "white"); widget.put("bg", "_01.rle"); break; + case "widgetSteps": + widget.put("type", "comp"); + widget.put("name", widgetDesc.getWidgetType()); + widget.put("goal_ring", false); + widget.put("color", "white"); + widget.put("bg", "_02.rle"); + break; + case "widgetHR": + widget.put("type", "comp"); + widget.put("name", widgetDesc.getWidgetType()); + widget.put("goal_ring", false); + widget.put("color", "white"); + widget.put("bg", "_03.rle"); + break; default: LOG.warn("Invalid widget name: " + widgetDesc.getWidgetType()); return; @@ -103,6 +117,8 @@ public class HybridHRWatchfaceFactory { code.put(watchfaceName, context.getAssets().open("fossil_hr/openSourceWatchface.bin")); code.put("widgetDate", context.getAssets().open("fossil_hr/widgetDate.bin")); code.put("widgetWeather", context.getAssets().open("fossil_hr/widgetWeather.bin")); + code.put("widgetSteps", context.getAssets().open("fossil_hr/widgetSteps.bin")); + code.put("widgetHR", context.getAssets().open("fossil_hr/widgetHR.bin")); } catch (IOException e) { LOG.warn("Unable to read asset file", e); } @@ -118,6 +134,9 @@ public class HybridHRWatchfaceFactory { icons.put("icWthSnowy", context.getAssets().open("fossil_hr/icWthSnowy.rle")); icons.put("icWthStormy", context.getAssets().open("fossil_hr/icWthStormy.rle")); icons.put("icWthWindy", context.getAssets().open("fossil_hr/icWthWindy.rle")); + icons.put("icSteps", context.getAssets().open("fossil_hr/icSteps.rle")); + icons.put("icTrophy", context.getAssets().open("fossil_hr/icTrophy.rle")); + icons.put("icHeart", context.getAssets().open("fossil_hr/icHeart.rle")); } catch (IOException e) { LOG.warn("Unable to read asset file", e); } diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/qhybrid/HybridHRWatchfaceWidget.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/qhybrid/HybridHRWatchfaceWidget.java index bf34bf35f..a71f9a6d6 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/qhybrid/HybridHRWatchfaceWidget.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/qhybrid/HybridHRWatchfaceWidget.java @@ -38,6 +38,8 @@ public class HybridHRWatchfaceWidget { LinkedHashMap widgetTypes = new LinkedHashMap<>(); widgetTypes.put("widgetDate", "Date"); widgetTypes.put("widgetWeather", "Weather"); + widgetTypes.put("widgetSteps", "Steps"); + widgetTypes.put("widgetHR", "Heart rate"); return widgetTypes; }