From 24112eb43749b274c90bfb077a7ae5a8864b8745 Mon Sep 17 00:00:00 2001 From: Philoul Date: Thu, 7 May 2020 08:29:03 +0200 Subject: [PATCH 1/3] Temp Basal icon switched --- .../androidaps/plugins/general/overview/OverviewFragment.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/overview/OverviewFragment.kt b/app/src/main/java/info/nightscout/androidaps/plugins/general/overview/OverviewFragment.kt index 4a6455e41c..021c3729e2 100644 --- a/app/src/main/java/info/nightscout/androidaps/plugins/general/overview/OverviewFragment.kt +++ b/app/src/main/java/info/nightscout/androidaps/plugins/general/overview/OverviewFragment.kt @@ -667,7 +667,7 @@ class OverviewFragment : DaggerFragment(), View.OnClickListener, OnLongClickList } overview_basebasal?.setTextColor(activeTemp?.let { resourceHelper.gc(R.color.basal) } ?: resourceHelper.gc(R.color.defaulttextcolor)) - overview_basebasal_icon.setImageResource(if (activeTemp != null) R.drawable.icon_cp_basal_start else R.drawable.icon_cp_basal_end) + overview_basebasal_icon.setImageResource(if (activeTemp == null) R.drawable.icon_cp_basal_start else R.drawable.icon_cp_basal_end) // Extended bolus val extendedBolus = treatmentsPlugin.getExtendedBolusFromHistory(System.currentTimeMillis()) From 7708e5961a475252d3ef10af5a1ca0b3de3592a3 Mon Sep 17 00:00:00 2001 From: Philoul Date: Fri, 8 May 2020 17:56:02 +0200 Subject: [PATCH 2/3] Add new icons for basal on ovenview fragment I also add photoshop files (it's bitmap but it's easier to work with them) --- .../res/drawable-hdpi/icon_cp_basal_no_tbr.png | Bin 0 -> 17474 bytes .../drawable-hdpi/icon_cp_basal_tbr_high.png | Bin 0 -> 17644 bytes .../res/drawable-hdpi/icon_cp_basal_tbr_low.png | Bin 0 -> 17650 bytes .../res/drawable-mdpi/icon_cp_basal_no_tbr.png | Bin 0 -> 17622 bytes .../drawable-mdpi/icon_cp_basal_tbr_high.png | Bin 0 -> 17558 bytes .../res/drawable-mdpi/icon_cp_basal_tbr_low.png | Bin 0 -> 17558 bytes .../res/drawable-xhdpi/icon_cp_basal_no_tbr.png | Bin 0 -> 17522 bytes .../drawable-xhdpi/icon_cp_basal_tbr_high.png | Bin 0 -> 17703 bytes .../drawable-xhdpi/icon_cp_basal_tbr_low.png | Bin 0 -> 17692 bytes .../drawable-xxhdpi/icon_cp_basal_no_tbr.png | Bin 0 -> 17667 bytes .../drawable-xxhdpi/icon_cp_basal_tbr_high.png | Bin 0 -> 17926 bytes .../drawable-xxhdpi/icon_cp_basal_tbr_low.png | Bin 0 -> 17932 bytes .../drawable-xxxhdpi/icon_cp_basal_no_tbr.png | Bin 0 -> 15488 bytes .../drawable-xxxhdpi/icon_cp_basal_tbr_high.png | Bin 0 -> 15631 bytes .../drawable-xxxhdpi/icon_cp_basal_tbr_low.png | Bin 0 -> 15636 bytes .../main/res/drawable/icon_cp_basal_no_tbr.png | Bin 0 -> 17622 bytes .../res/drawable/icon_cp_basal_tbr_high.png | Bin 0 -> 17558 bytes .../main/res/drawable/icon_cp_basal_tbr_low.png | Bin 0 -> 17558 bytes icons/temp-basal/icon_cp_basal_100px.psd | Bin 0 -> 28136 bytes icons/temp-basal/icon_cp_basal_150px.psd | Bin 0 -> 33597 bytes icons/temp-basal/icon_cp_basal_200px.psd | Bin 0 -> 38873 bytes icons/temp-basal/icon_cp_basal_50px.psd | Bin 0 -> 23095 bytes icons/temp-basal/icon_cp_basal_75px.psd | Bin 0 -> 24072 bytes 23 files changed, 0 insertions(+), 0 deletions(-) create mode 100644 app/src/main/res/drawable-hdpi/icon_cp_basal_no_tbr.png create mode 100644 app/src/main/res/drawable-hdpi/icon_cp_basal_tbr_high.png create mode 100644 app/src/main/res/drawable-hdpi/icon_cp_basal_tbr_low.png create mode 100644 app/src/main/res/drawable-mdpi/icon_cp_basal_no_tbr.png create mode 100644 app/src/main/res/drawable-mdpi/icon_cp_basal_tbr_high.png create mode 100644 app/src/main/res/drawable-mdpi/icon_cp_basal_tbr_low.png create mode 100644 app/src/main/res/drawable-xhdpi/icon_cp_basal_no_tbr.png create mode 100644 app/src/main/res/drawable-xhdpi/icon_cp_basal_tbr_high.png create mode 100644 app/src/main/res/drawable-xhdpi/icon_cp_basal_tbr_low.png create mode 100644 app/src/main/res/drawable-xxhdpi/icon_cp_basal_no_tbr.png create mode 100644 app/src/main/res/drawable-xxhdpi/icon_cp_basal_tbr_high.png create mode 100644 app/src/main/res/drawable-xxhdpi/icon_cp_basal_tbr_low.png create mode 100644 app/src/main/res/drawable-xxxhdpi/icon_cp_basal_no_tbr.png create mode 100644 app/src/main/res/drawable-xxxhdpi/icon_cp_basal_tbr_high.png create mode 100644 app/src/main/res/drawable-xxxhdpi/icon_cp_basal_tbr_low.png create mode 100644 app/src/main/res/drawable/icon_cp_basal_no_tbr.png create mode 100644 app/src/main/res/drawable/icon_cp_basal_tbr_high.png create mode 100644 app/src/main/res/drawable/icon_cp_basal_tbr_low.png create mode 100644 icons/temp-basal/icon_cp_basal_100px.psd create mode 100644 icons/temp-basal/icon_cp_basal_150px.psd create mode 100644 icons/temp-basal/icon_cp_basal_200px.psd create mode 100644 icons/temp-basal/icon_cp_basal_50px.psd create mode 100644 icons/temp-basal/icon_cp_basal_75px.psd diff --git a/app/src/main/res/drawable-hdpi/icon_cp_basal_no_tbr.png b/app/src/main/res/drawable-hdpi/icon_cp_basal_no_tbr.png new file mode 100644 index 0000000000000000000000000000000000000000..b94fac29866402036735ff47b8b1ef3f159ca867 GIT binary patch literal 17474 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 Z+I%cwtkJ(%=Dm+(aN|&J--eyP{SS23YQq2k literal 0 HcmV?d00001 diff --git a/app/src/main/res/drawable-hdpi/icon_cp_basal_tbr_low.png b/app/src/main/res/drawable-hdpi/icon_cp_basal_tbr_low.png new file mode 100644 index 0000000000000000000000000000000000000000..23aeee14d43cc081272f4c5746839dfd1e85bbb9 GIT binary patch literal 17650 zcmeI4e{37&8OIOWu{MxY1F1m8q?=1uruKZle6f9UT(xmSGH{wDsp@Ki^?dg_xz)Zq z?k5Qu3*6G9b}D(I?B)x>BtjqSZ( zelLzqUua=sdM(+0{ND3?-+MpzKF_`H{o(yXgEx0}tm&XAs&k;fFbuzM@!l)0fS;Mc znKSTfrPaUFp{Ogb@!pqFkN)U7irR8cA1%41;;pi3){=^5mO-*!v!FLcILI^|BMYrW(G&qncZquOKi$_$R%k z$n~CtuPZ~_Yi1L)@8a(6No@8yq)Wviy4SP;EhQyJ<@gkx&L(+@Pi6Rxw7~Hq%ZV&6 zGQ1#jS(%sU@Ri7SKr3f!6?wSO7j_4K^(4k!*OFOwYHBJuB_>UKjODZ0EXxV3ATZE_ zai$GdsWXPNHV}z)3cyiq-Ewu)pgmosY)-g6iGe2H|yR42TQ z3#BzEt*MzzcZ%Z}MbdbtoJwV(1*KC^S1YH*3aF$b=~(y@>20CTo#CM~3RCL?7$t6R|0Qo5pu*{F*aGE2JZ*B#fir(;tVPF%kpj(|HBw?+r5 zx?k5U#dd&~wLOU_Z5xHKQRloEKl^1x^(tcCQ6_~2VO~Z##dEU2M>!Qp`Cjcs9JAt1DK^+V24}3JU9IJxSZUVQ6Hia)r!%$uOxEqS#frBrW_ddhW_~GWzogW?=KinLO zBDWj5n-{{~nwn!#-tIrxpN_yMULfBsNurcvo12>>hV(k9mI^xDNIKs3C>_N#A7~l4 zvt3~9Ko}S#O6=K`e_?`F_~Z*dbYmM&-D1}aEm$tOg+_GArI8@%1hK%d2rdjr$c5lS zEHEsB3j-2zA-E6=42$5xfP`EKF2n-EBDgRhAs2!RvB0nhE(}P>h2TOgFf4)#0}^r} zxDX2ri{Qe5gj@(N!~(-2xG*3g7lI41z_17|3`od@;6f}gEP@LI5^^E95DN^8;KG1} zTnH}20>dJ>Fd!ipf(x<0um~;;NXUiYLM$*Wf(ru@av``73k-|k!hnQa2rk3|!y>pa zAR!lm3$ehk2rdjr$c5lSEHEsB3j-2zA-E6=42$5xfP`EKF2n-E`cPaQ=zlDL0sp*W z3jRyQnN=S=1^?lKR{MvG6g9JsqW12isD=N)?{_I`f}^N2yC_P2grcrBANa=0eH3-s zw+0HEN9%t+`{wgseR1fzyU(q!-ShU_r|G$)nWHOa_r3bU3n#y3z4MMVmwaM&-`rdK zZa;9~(Aoa)Lj8S{&!Gb8GiM{j%c^u~_WN3J+a zJ@$nokIrvjdARe?>yID*vbFNuk=1+m&u#mlxHBeem<8HE%uiF1P1bzj(y$zyJ7)nPq1me82YZNmV?xthDf( z<0sVT?z*GnjSau;`*pH(Z2pGnk*~jYVDQAT&!_)7``+>!zWe?|t6%=+^20yeeC_wn qUvt&7UH+iU15Grx|7%Ytl|Lw)ef%d2tGs_D8Q3~lcw)=0+5ZA#DQju~ literal 0 HcmV?d00001 diff --git a/app/src/main/res/drawable-mdpi/icon_cp_basal_no_tbr.png b/app/src/main/res/drawable-mdpi/icon_cp_basal_no_tbr.png new file mode 100644 index 0000000000000000000000000000000000000000..a9d84303f68bc2af7358914def6e289932977b39 GIT binary patch literal 17622 zcmeI4Ux*t;7{FKRpWbO{wL(RxtSO38H~S~qY_cS&*GtbkXxj7cYOg5T&F<{o(qwnt z-Ai)kOVuJRf`|`ViimF_irV^Ai>L*qK8g6Ch=o3C5ft%76zc5X+2oRT%AG=C0!hBi ze&07Uzi+;8XZ9f{ruRLzY4qMvilR16P1a`Mx8T1w-U>hO+jaaj{2H+*54jX|`&R#b z6Lsp%dnjuB6Ju`Po3HPcRjZX%G^+u!-IfitDXP4yYb)vz;L#1RV3?K6Z|6SC(1upY z92DzZ-5v*v#^j0vW>@yjsVhg+l9t(39W8fd=%58Wh3>YRrYm>r)JEZ69)AYFI09wq7jLPwOS}J9EkL`@T zj;6~qwTY-Z_^Xmx^gLT;*-odE?c}nSv%vDDQizCRWcdBqvRFMt7Ru0nQp`mQe?Y|&GK1}9b}}biH*JFG=rgODhryR z1x(L{cKkp)d(rYNchMTsWpa6F$1o=KdeZm6@wQq6yLP=jZHOR3I?&RcTebl^16*s# zQNf-zoXUR=CJWzx0 zs=x^x!{r#RILC`JpO*!0C&$YiS7!S((Q*lV)Gf`>ms38(z(+wABv~l!nOlGg3>6U@hQ<}9mO4byKrUR(6|IQ`H;!_=&f`*3Pbk#@?FrpmhIv=pyu zw3G$F+U7!;MU5%VWM#_ZR?~9e{6IBVW(PG7w5nO^lAju5rV3ooa@oe4 zw#FBlMimAos~MWCsl{R;&vA?*YCO}(=Sxr$1tzcZlGc!NI?$yu>!&<4LL>1#1+Be( zq$hB-5&F@u*X1eG^%OXPsah}|!yivx2U1QbF$E5&OsSYxnTA>{FuDdfwZJJQT>wD{ zdd<^h9gUvuX4TLF<{wOnkk)_rUHk~DVoR>N{t*N33;9=ibY>42%02H zx{@o!qaWaARacXSAKT?V@P0IA!Lz-sD7Ha?wiU+(e)*|n;`)Pt<3hcp+WT<8LPvG2O#vHG9TVYXAziDfr*O)&&dKG7l+VQpf%iyYw2D`alqID z%$RFrcj&O!Vz_5@Q85>QR%K&oaYMh!;2eTPgG_B2YY3WZnQh>B*AY0lI25?$0I+K4 zj@6=*Vnurvt=M+cP!)eYux(R|Zs18_iYJ=#@juR01CDV$OEfjg1QUIO&3Vm9iC5!E zQYQ6n9g=d*L6eGtCN^}50VQ3Bcf)+1QF0B55kNyJN{xI$<>7u|Z9(hVW|2x-O-e)z zHo7hL7dXFchqzMpC8#RbD4u?OO^R*YNyp7!(Shr_ z4;10xQs#raTWdX2guM)KgL;d}*AU>;5u)rrA&}vr1a6Uo&0m!-v#Z)t-hylM{^6pz z6dWETfrBrW_dg@k^yPljLsvIVU+yYOR z%+Q8q-6b@mb$5*%l1>l{42j^vfP_>CF2n*uBDgRhAr*oPvA~cBE(}OWh2TOgFeHKt z0}@gpxDX2riQvM3gj5JF!~#PixG*3g6@m+~z>o+o3`j_Y;6f}gB!UYA5>g?!5DN^6 z;KG1}R0uA_0z)FWFd!inf(x<0kO(deNJxd?LM$*Of(ru@QX#ky3k-?i!hnQS2rk3| zLn62^AR!fk3$ehE2rdjrNQK}+EHEU33j-2TA-E6=42j^vfP_>CF2n*uBDgRhAr*oP zvA~cBE(}OWh2TOgFr=&E8byD|0ZjNW93A*~8@Dx{e-Qpv2dz%d)G2D^0g5{MB1Qdm z1%CfRQA->}T|P`v@=1!?X1(^zmlII;^{Lv}T=&Oce>gpIYMq zFS5<^h4;^A+uzl<{nMuZI8ZywZhzX=&y4UBZ@s#0^NB6@?>@Hi&P?riEL?c^>+fHh z-9Iw-=;d#I-hB6oPo>}Ad-AJ`Ti)Jq>g6}KzjE}B&u=@q^~1Z`e+rk*oxSwVq@pTR(bgLfs30Qd4{O)jrsL_=SG~Ga@kP literal 0 HcmV?d00001 diff --git a/app/src/main/res/drawable-mdpi/icon_cp_basal_tbr_high.png b/app/src/main/res/drawable-mdpi/icon_cp_basal_tbr_high.png new file mode 100644 index 0000000000000000000000000000000000000000..ece4bd4cc0eb5c7767400a7f8e7fc577b6cdb95b GIT binary patch literal 17558 zcmeI4Yitx%6vqbyff@{`0fVCB8Uv)x&SQ7>F>bfCUCLJ3+LS6K24!~UZaZOjW}KOJ zw@nPFi9w0rgG5DQ_}~{ztU+U9B*wRqM1y`(K@AX1)BpxQ5b;&-%s%dPyDL|V8qIC8 zyQg=~`QN#}x#!Hi^I;zB>s`CBWmyYFQ44$0sebq?xS#nK!|!X_w;zB%3(WLJo1!kc z-2Kd=_UyfqqB_rL1B1?BW}T!Mg`lh&Sr9B0Oz2HfiT08yD_ej=XTgxBw*|gG_JpS!2X$3k2MbYJZh+70g;kx?N!hDY7NmWceV+HVRUeT8uej<-Jo= z6&B<{0qBkm(;-%_u}rLE13V9vCwL z+YfAG#8SYTQ8<+A8;#y}`T@E+7*f!^p^&5Hn&`MknnD02tx1@Bq#WkWsq&>xKxk5z z1!M=L;3p|?0>^M6hKmjGqQr+KfotV>iQ^J%ohOLSjVDl}TnY{_ttiDMJ}?Gp-`7y3$H477244 zBa14}WW(V&v_ydkD|}SVMngG}i+WI?v@d*`^sSZ#tEHUx`M78Ab|FVY0w=2?1J5?Z zM1?TV#Kf3uMFce}Msso~UhSfR%(Sl3n(Y|Ym~YC$iR;zF_2BNQtlN4pasS(YUm0?*Q0&0@2LaR2^ha_0{Zj;yk zhKr^c`Y5oRKXKvU$mgBTz(6VXfHAQyk13Rj#mHS>TpQ{7)Y5ap@ zRe`1bnJMZ!%Ni#7KQ`tWCna9tBS~4SZ{-sE?^aSSD#I0WG|WVVY>tsbVTF--nPWgy zi2_c|iJUA{bMdcM(kZJGQc07w5>W+Pxh>WgICS6i)fca-oTqrY^|e-PtDX2X>O1-y z?;01blKywbJo8G5wK|ztfkt?oP^GdY5nU-R{D~T{FS-IL}HJ zE=S=$Qu0;7>TUwJh}MNqNyCb|`d2p;<&*P;H&Qodx~C}j(m)3FRweHP>|2c{+>Nya zHzjb1>@EJ1e1e_U=2P>I4Z53){D`-ChzcD1V|n+x66!x(AG-06L;Z*ALs8^yy5=O| zeb76Zx@KRLyZbNiPuIgIULY9}#gLd_>znH%`m_?r52iG@k+j|IkqF1-#nc~Y7`U-n zpzlB>u$(BqXH(vVDYwEWU+|$DTYKu}yJl#?a=|S$q6;pK1W6}|1%^d%VL(DI1Q%j~ zVG&#ykdO<(g;-!%1Q!M*d-Jc|{Sv zrQ*5cT@rl51+Ap}GZZy`14V7SpQ6r9!ryNxYJ{Vx?>1AE^dvG!OJ9{f z{WxkaK6(2?Pw#Q!!Rs;;XO_J6^-YU{Up-@<-gQf7?};B0D<1e}QP2FqcKSZ|i|=^# zw#Q#6zWLqWir4aZoA{yi_bs8UiHKqU2E>lK9V_VobCAVm;DbvbWG>rSqmJvnzHb?w=XeTODu z2hYwcO&q#sUT*c_kCt!#dQ*Dq$lS%LMICe8ud_>z&Z4$jtJa-rkG$-@IizPzZ)&1* H^L@Vql|()h literal 0 HcmV?d00001 diff --git a/app/src/main/res/drawable-mdpi/icon_cp_basal_tbr_low.png b/app/src/main/res/drawable-mdpi/icon_cp_basal_tbr_low.png new file mode 100644 index 0000000000000000000000000000000000000000..0479c1a3afeef3c6788613cf3731dcb5160a0faa GIT binary patch literal 17558 zcmeI4Ym5^`9Ke_4AbLJg3C0*%YD`qv?yK8&*R}{(;7;v9j#KVT3~YC&cMI)q-QBzP zNHnMzUx||Aiy=m%iC;8e5H%+FI5qf;kuPd6K8UD6V?@xzh(?^4Bb&Tr@cpPBuz_pI(;c~lDqZ#8urYf_S}Bh1wLASyHd6+D72gMKEHR+1TMdFUM#@ z&&JkD1+Gx-0i#CmCL65T)IX?g+NjBTY)P&=Q&*sa3UF1rUMZW7QqRVGzY3JSW;RCq zD(=Q?Y^fKJ9xAM+dn_B!Qe0v*j!)1jInGObBF!(R1&$Y4PGotJ;RS`06<(s7f3aLQ zlrpwnQU>xXn&IGo+1RM-Ruz`5)oSsY7`N;ZmX~FjOh=cRG z=_8`q>I0^ZuDU9gm#A)wAAdZSJ!o0wTqFHf2Xl+=>7g%QYnZxKbFPStsi_@tq-#pa zvMZ{aGb-u`V5{axhDD7L&2VNaJyzMW;rKvK%&_g6BUb)wRr*ZFRZR`_<#VthZWy|f z;N?=X1b9Z5^fV(T5@|**r6oqxxKv7(fd08xc`#W=M>z$xa@1|+AyVZ2~k4>Z9t)|HGded-oLNi)R zbHvI!{Ws31Yv21Y}@ z5+(9%%D*vCF2n*uBDgRhAr*oPvA~cBE(}OWh2TOgFeHKt0}@gpxDX2riQvM3gj5JF!~#Pi zxG*3g6@m+~z>o+o3`j_Y;6f}gB!UYA5>g?!5DN^6;KG1}R0uA_0z)FWFd!inf(x<0 zkO(deNJxd?LM$*Of(ru@QX#ky3k-?i!hnQS2rk3|L;6Ep-RM0Qz=SWasKK{Xy#4l( zF8GEETI(GsP}HW&C~ET^6!r6Q`1>_Qjd2w9&3cMb9;B%G*5taqD=2E#g1-FH!TLwv z?%#FIYgb?V#*xGCKX)KD7N7mu)ULgI->n_`eBWCy9zH<3hc2joC%TL0Jv4jeEA#jD z?bx>Co}SuY{dnDhxkK}w$<8)6pS|zdzFV()M0o1VSvzm*D{Oo2`>T&lRr)8G ztyirdKDvP_S2oZ6{-CjE_ph%U%g%Xe!|;t$_dWi^-2IbR+*^M7;quXoYP%m9zU27s zTUI@=ZfV!t{JG)R)~SUH9zOQrmD+{{)Ye;`Jm)t4>l;>m`ub~A_pjRC{c~4x>di^^ zgTkFJY%`DEM6LY7V&p}~=Y02$`}vP+*M?qn>qv@v@es4+(RmAh@!lNLx4b{UbJ_aa Fe+RtnL@fXS literal 0 HcmV?d00001 diff --git a/app/src/main/res/drawable-xhdpi/icon_cp_basal_no_tbr.png b/app/src/main/res/drawable-xhdpi/icon_cp_basal_no_tbr.png new file mode 100644 index 0000000000000000000000000000000000000000..c448cadbdb3d9907936c9b9514f27ce6e3872ed7 GIT binary patch literal 17522 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 uAesdc`gS+Ii>XCEc*2BpIXkIQ*!kH literal 0 HcmV?d00001 diff --git a/app/src/main/res/drawable-xxhdpi/icon_cp_basal_no_tbr.png b/app/src/main/res/drawable-xxhdpi/icon_cp_basal_no_tbr.png new file mode 100644 index 0000000000000000000000000000000000000000..0c7597c5ea29c8227772cb21995929afc61217a7 GIT binary patch literal 17667 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 literal 0 HcmV?d00001 diff --git a/app/src/main/res/drawable-xxhdpi/icon_cp_basal_tbr_low.png b/app/src/main/res/drawable-xxhdpi/icon_cp_basal_tbr_low.png new file mode 100644 index 0000000000000000000000000000000000000000..b7df0c266a22675e7fe71f85649846df7b7e0b95 GIT binary patch literal 17932 zcmeI4e{2)y8ON`!RhA`R;XcjqNkO zbL<2R<%ShJ9^_s;g4 zi{q4+g>LHfTC)B4eV^z1-urpq_qq4IKm26l@`vV>-Cage)SQO;U=#e_ZM7sX3+Nz8O>2Ro#u2EBfc2&3-iQ}EL$5+9-c&C>yr|lf?U^xfN zI~d+Ba6W-|(fOAxPzEi3N{$Lm!Mc2N@K>d+UDuNW%Vsi}ij1Q|O|`MS&*x(~J8QQy z(1X#s61tdW655iSNI@qEG%2Mdbwy3khOQV<(|V=NW;BFe`F_QdsG)?GX9p>=Sux4- z6&zbCNS07cGM$Qc)VoO znqJ!p5#*7UjMQ4Xl7MXjnwm~YptcisWl5>tYkCuy7#$2L=w4DtSEAGC7&X&E09j?4 zFry|HX3nYHQ2QY?p(X`H9R%S!VCU={!#Nnv+rqm9-YM9*2RL5fI6qtDIWb*KjgTrU z(JqUI%hYfi8V>IR9GusA4U1>723$I_sEb%CR^K8Wvp;I8MO9;g-12KI%q_a6hQ4o& zl91Jm_8m)~^4=C9SrVdZDlX~)B`&rBHkoMivlE3DPc$=y8a1Y-VE;hC;b%(~TcXU_ zDl{ZCT}()zAsB!K6^bGY4vzyw9TABUIZ~VRbqQh5^wuDcSUXfB@wiII) zALHt;w}}!mQ<|z*G+j+~S*9$UxMn_V1{)`r7Aj(jnb(qHN(08Kt+W-EElPwa&lxf1 z>K8=G$cO<=>;$r(om4h)Q7A4Sq)Z(?JjOYFOZfC{WZFR@zb?_5;siTiSW`JE(`$MW zO^xaqF$JpH;EcG&qR0tOj+kCqY8Ml2Kn}14XoZ5}5I<|&ZDPuoFldsR=maVKItC6- z4iVm|K}rimQ)-+>Yn;|qT1+NmiXt=w%$uV9z>SlaS7w@)vq7i2#GUGwB?oLQ14WJZJ0Gq!p7ALrg`=%wom|5i- z$hyWWnG|n#I>YVF|Ieb#P2b5|)xr*Y>ekjcNx@xx zFn5cuGd3p1o(V3GYwTpOHDp9w^S@or_7*;ZQ<81Q$YqV-Q?8l#ma>g;3xa z1Q!k^F6gURKg+mGX5L^fajzMtYP(nTg7eaw!5L`HvkPpFyP~aE@7Y-%lLvSG! zIK~&^Dx3Hx3y^?+Uy*_TQ}N8LyZYdNT+mW|Q;4Fvmr~T@KcuM9tML0nib``7HN1hM zguN6sU){O>jXH|Dc~?WQswMmG$7fDHx(?j)_+K*n_RgyPb>Ft?!;J%XuABSH2eu5| z+qY?U?<*tojyzTN)YE6S>WiN_SNDYHy`?=ravvIX{ON@4>AIb6htK!ew`ZNOwY|3E z;*n=Z-zv91`&RVz+Ogk#lP>S+?SC*lYqq$x|BiXbZWb4p_k8VGH7tPTcg%z3i_2ko zb-09MT^y`jab&#t<^2Og7lyVh`R>aNhgXlc#+mE^_JxZt3=My9&*=lJ*Pb0e_0r1T zRq>V`=f#EF|Gwk1JxhDizxd~&=T=`Boqu|8_`==m!|T_a{qdE#S1;fB_UAu;WXti6 zqj$Z(ZRA()-qjTz_+D7r^4{3m?(pgTE4ClnGra2$b1n`o8yXzlmfrk^da7!qH7(I& zUEd$y6xl8O^_Dl+OW*kD^ytZlmMr-5?fb`u&Odnh(x#COffEO>oc!dqWpDOZMCumo ze06K@4>q6sR5_|Co2$Az7v0v*4*qP>ZUaHdu3|I6aD02N*5Bj0+;{Hv7u(AHi7 z-!ED*|C1{R_aE#T`PVzY{LQ@2hqr_uD}Qn0roq+&t3KM(zvshKw;$h@?qtt+MCRC{ zp;sRr+xd@A`@26rkn~?Zf9a3W!;dUvyT%(1H&^n~_Ca;%?9fWr+Rp}#|Lw~23vV0$ x$-OVV^YHz94_)u@TD!9Ecn6%jSFhee>CabpmsS4ue)yAWs9hfHtKRU$zX9JR@sR)k literal 0 HcmV?d00001 diff --git a/app/src/main/res/drawable-xxxhdpi/icon_cp_basal_no_tbr.png b/app/src/main/res/drawable-xxxhdpi/icon_cp_basal_no_tbr.png new file mode 100644 index 0000000000000000000000000000000000000000..a6750042e8f217352795bba3d0800ad7c6f81167 GIT binary patch literal 15488 zcmeI3O^6#+9KheM#kMOeTYB&V4?~Jn+fHUC$z(TUlBP|zCe*CUHnm$p?0mf449(2M znMspf1h-cFI0<^Nh}47N!D68(UJ8n$(29t+ideizwWZX9mx|T(&18~HUXs@;J$QJ5 z$>jh2-tWEt%UtHQ`MJj@Cmx&t08EyOg#~m!?_HbjM&BPUo;ihXo9o5H4gmLT^{z4S z_B;0jAdTylMR&3Mgrr(VRMsp7Mq5T5c>|E%-Kxv#QRp%XT-MD@CN< zUO{HDJkR7U8!}>4WK~{BFw?21APR{YVHXqQg*eB@IU&vpF^Nw}g2)7)NOl7KO556! zv{2X=ltWS`Qgz+B#Bt4LGun(tEqj?0QmGWj$GBLGMINlPV!CpRHJxqkB%M43=%}_{ zcXi8Tyu7kvHQY=j;uY$Cf_WMBZXweN*ddBsORjT5l;?&8X=*p7-mq)_&@`2UHE2N7 zbx@ozG_GE?T+69iBT9D7BMYN7DVMvohmO}UhL(2R*<%PnfOKf2Q(37)ZUH)0!&c$! zF*KEJ!)EX5OTESE%j8)`jvco25n-OC9p-O^_6nuZT&27XWfvCEm5uQ+p5@~#KT{Dz zNk~XBekU(TJfG$;&)zEgIm(u%FRg@fh<=Ww#3!X#YA27jV~``{iRVB&UXxw*6z4(X<5HJwL8a|*mei8NJOvTQ?kv$`QKL#}Qvr@5Xo z;QbOU)wR% zbpJT2%eDi(X3Io6-PS$7y2q0j<2S7&tKLDDb>w4EOLKj?-k`d1L6APUe7DEAoj(*l zx<<1K&7d!b_EbBS?=?D!V=cK&*@k^GT^<_2`V?b7yN^qRKT@cpM_ zJo<2g_Z@_W&3Ncxa%k9$hxQ^5n!1~f1=TQhD9Za+ZJ+xG&;uaMCPgtWra4@VN6hOj zSX(UU=zw;-V+Tzz2*NExBM*;^3|WH6_F{z|*8B!+Ytf@1dJ5&bkD&v-**);?Vor!K@S)281k9Tx33&mEyvHkVT4%%m=elTo@3t zNO6(*U{;C?140%lE;1j?N^xO8$Rfo>=7U)&E({1+q`1g@Fe}A{0U?VN7nu)crMNI4 zWRc<`^TDhX7Y2kZQe0#{n3dwffRIIsi_8bJQd}4ivPf}}`CwLx3j;zHDK0V}%t~=# zK*%D+MdpK9DJ~2MS){ngd@w7;g#jUp6c?EfW~I0=AY_r^BJ;tl6c+}BEK*!#KA4r_ z!hn!PBCd(vi=EI!Z*w-$Ynwmj_nt$qd@^crp$x$4!vL(E0N{^xbiV>Xg9qU15%jj` zNdWG%-gx$_eE^KzC>8cpT0dO-{_NxzxvAODt^CV{?XP}ve#f4Y4oQ#rV{^4^xUT#jL;rZ#Qbuwi_B?D$#^pzBsD;CuFY4XT2CVXpyI zw`$L8P^E0>8(@z4?%l@ejX!Y@ym{^EQ^()maY23IoBho1_m<9FFJ1h$G?zVl*|_xj zb>kXyq_h#u=I>vPo0tCF_17A^u9QosN>5!cy|v?lapjeVKKT0d_+!1Pw+De0^TYvF xZ@66&1F8XxIcA7z-+u#l^Z79V*4OU>3qNoD<>bXLCGQ>K((GK}%-$m}{sVxAnacnG literal 0 HcmV?d00001 diff --git a/app/src/main/res/drawable-xxxhdpi/icon_cp_basal_tbr_high.png b/app/src/main/res/drawable-xxxhdpi/icon_cp_basal_tbr_high.png new file mode 100644 index 0000000000000000000000000000000000000000..1aaf00fd6100c2611d210e714337cd6973a4fb6b GIT binary patch literal 15631 zcmeI3Yiv_h9Ki49B6ENaMVa`4Yl#A3?Y*~;b-i{SbA@e*#kma`5+1j=r`=_3Z|%LK zT|s4{L4x?f#E6gh#YK}L2=e6kmq;-LuirYL89JR*qQK&8DPAcgA;=Z5whXvtS+ zSZedIo=79;lA04y(4JV_Att&-htE*&s&K}6m>>jHfsTiQVTF&^8IpN<_*+vm20H1Y zcGnpiv;pZ(Pb=LhM*(d!*^DB~S!uh&#MwA&EmuvOS4^rD zQ}c-o2!ap@s|t+c3dTjcWK~wWd*bnA$1XVEP^jS0in?$uM36>WFjDF0 zjR2+%C~{9!1Pj-~rOYn0dR6l0HfKU6%~EvkATAXN(=4g5WGSR}$O+fVH%5V=0yn%| zX4cFaS&Naa?ci)YXXVZ8e3s)`*2y5Axm`}?@W?*N->b`EOXjHI*;=0E=CiOI(>ZjW zXbxEMK0y_3DU040$&*}<9PNXJf205Fkoz{%v4I?rrD@r`m&j>7c;m&M5xQtP6UMaH*;6;%j}pvCQi3X>%HctJFK zZNO|X`n|OlW3AolGuB#cHlsrX4%Tb)iuPJ-a^@b7K0GhATNZn?MoFjk!PE|i*$%86 zFq#Fdk2AGJL4sjE3eSmxLwNWloQVsC7}=ziR5- zZ-)B!V(=^oaS4Vcox zM?v@$%48oy^LjIT;N8w2xh37stVk|02m%Bz5?pvbh?U?%fZ#=f3(p6!5?lxnyhw22 z`5;z;3ju-`2`)Sz#7b}>K=2~Lh3A7<2`&T(UL?5id=M+ag#f{e1Q(tUVkNi`Ab64B z!t+6_1Q!AXFA`jMK8TgzLV(~!f(y?Fu@YPe5WGlm;rSp|f(rqH7YQyrAH+&(Q#;C`RI(M>Z7NQy?Xi3Ymb$mxwx0#akt-k z>E!AD#N5gogF~aE4~~4^{?h~H!K%LDS@A8lS@OU=vk#sBH1TNV2fy!1*e_18+l`e? z)f48TEg)|Z1yr|hsRdS_Q~3kyeycsV)%oR-AK$ugc4+kd`(5=Nv$nVQRbT!rv3>LS z*FQVbf<*u82)4c~gZ8@@;+onHz6h+crF9zv*gkpncU}+;Q(8OOFp6 zynLf=&gkK?6JsCmTlxJ9H65GUS6$s9R0ZoJlQP?w0ixU4qN)k|pYqC6Y3h+Pc37|D b<9AR^>*usC2#p-n>bGU#V)xF+SHJi#zE|-u literal 0 HcmV?d00001 diff --git a/app/src/main/res/drawable-xxxhdpi/icon_cp_basal_tbr_low.png b/app/src/main/res/drawable-xxxhdpi/icon_cp_basal_tbr_low.png new file mode 100644 index 0000000000000000000000000000000000000000..67c74252c2a239a57737733b29f1ac178139a86c GIT binary patch literal 15636 zcmeI3Z)_7~7{HIZj8Pa8jY9mBoLw~PXz#9nw)N7M&2?-G6qapd9U8{T1L5I8a9f}@v}**h z@Im96N9@_Vj38Kx)Ed^qq17y}#2uWVL_|k2u7c47;aibZIlf!e$%xn~$$s1QV<&8+ zB=~J@o)8^UYsD_9p+6zE^si~<`@4CsU|SKe`jRXN5EpfhOvYof#wPu?R9qJPHq?}j zObyYy{k9q-AsG%ek+n)fBs~s~ou?T$S?P5!9>!h8EGL~bXeZ@#+QA6B)+g&+(k^Rd z=^)c_f}+MJBvqFbnKa^Z5v51>+iXUn>?c!KT+JquwG2BzkxFtZ#W-jxpOe66ebk;r zEHyQOr^J{T7iC=oeoS6JwM)?ztxGA8GHWiF7_3Psl+B%YzVUe8)S6zm86e0Y&FiVP z_NgM(ENV(mf*0#HgHp=!Rj*6YnZ=nE$*>fhyO@*;xEYqTTWTw$SI7ryWor{6r;9;w z1)Q{#w$m;2jK3Y1&6YBWG4Q6(ghwQnb$$!;^|p!P1pr7najtJ7!{- zM#3?`ju$wcn^P3?SSU`a9wpJLD6v4gYnrCF1X){4KHVnCg3_x!W2z}L+7w9O*{G6; zb9z9EbDbik%AG!HMrj(E-B4_;5>pbOJ~80(QTfy+uhb@E8)Z%BWL|6x27tmLNdoJQ z@=k9BQ(+gJ9;cnJbc=Rxg)3tBMk5|~)D`7jZYDMJP{{0_6FR8yJw~HsLJJ_Yi*{Dg zl~sa0!bdqfI5eX6stPx6cU1|_h?9$O9*&<5ZF0{Ey*43%Lyn7?#u&5zuPO3`$w}29 zX}Xf=Gi_P0aZ|@wi@0gFcG?h=Qpb_XB{b1!HotAU+p_0Z_INUUQccTpym62PG;Xsf z_^4UBnMq~+GEP$N^39ELI=;!haE{(CQO@*b-kwT_N{uQUL{p-AFP9K&I>C;(OH-r+ z&h{uAneXD{PEiO@)6k|Bu#1l}{v=}3|8ddg)^m8#GW$Qhl(QRf`rOEESfBBS#e!xB zTaQaM892XkbTiu}Jw9wSZLB9XzS2p955*YY8CSCzc5O$yn$585jORL8(gV&+Hb`yq zGX7Q5=Y9)#02Bii9*@i8qhK}c(Ih3sSU4zw16nhV9Z+D#3AW_*Y%l0(vSd8di)DIP zOEq9x3myf*Qz(^v49)4y?16VLf6SD0FQY=Sa1sazTEw`}d>|{v1pz^e7#ErkWW~53 zAZQWeLi2&F7#9QtEn-|~K9CjTf`Fh!j0?>NvSM5i5VVMKq4_{oj0*yS7BMa~AIOSv zK|s(V#)aksSurjM2wKFr(0m{(#svXEix?N04`ju-ARuTF<3jU+tQZ#r1TA7*Xg-h? zJ8aiRG@R*VY*f)+6@G#|){aX~=PBF2U016eUH2nbrlxX^qc zE5-!@L5mm{nh#{fxF8^C5#vJhfvgx81OzQ2aam_x>=b42HfJw*ZL?$d$Ctq?pCsSV z93qJRCkbNfHiDR(0{1Hf(L)o&_(t%y=(_~5RC%l8^h$!TyxAD6X-!_Z`aQF19rxJD z%kK>}b?++OwM*VoyrcLZ>&W7oj`xSU7X5AAvQ1T=?OL!&vMzn%%vti&;J{h@61 zvv&WnQ`cW=k9#8_YQ(#K-^oSaE&O8Y#~LH}m#+-GeE8P6i${m*B{ig0}+lpw_jT_^Ks&8Jp*jBlJhilK| zhMxTw9x7@3E%}r-cR?$qv? literal 0 HcmV?d00001 diff --git a/app/src/main/res/drawable/icon_cp_basal_no_tbr.png b/app/src/main/res/drawable/icon_cp_basal_no_tbr.png new file mode 100644 index 0000000000000000000000000000000000000000..a9d84303f68bc2af7358914def6e289932977b39 GIT binary patch literal 17622 zcmeI4Ux*t;7{FKRpWbO{wL(RxtSO38H~S~qY_cS&*GtbkXxj7cYOg5T&F<{o(qwnt z-Ai)kOVuJRf`|`ViimF_irV^Ai>L*qK8g6Ch=o3C5ft%76zc5X+2oRT%AG=C0!hBi ze&07Uzi+;8XZ9f{ruRLzY4qMvilR16P1a`Mx8T1w-U>hO+jaaj{2H+*54jX|`&R#b z6Lsp%dnjuB6Ju`Po3HPcRjZX%G^+u!-IfitDXP4yYb)vz;L#1RV3?K6Z|6SC(1upY z92DzZ-5v*v#^j0vW>@yjsVhg+l9t(39W8fd=%58Wh3>YRrYm>r)JEZ69)AYFI09wq7jLPwOS}J9EkL`@T zj;6~qwTY-Z_^Xmx^gLT;*-odE?c}nSv%vDDQizCRWcdBqvRFMt7Ru0nQp`mQe?Y|&GK1}9b}}biH*JFG=rgODhryR z1x(L{cKkp)d(rYNchMTsWpa6F$1o=KdeZm6@wQq6yLP=jZHOR3I?&RcTebl^16*s# zQNf-zoXUR=CJWzx0 zs=x^x!{r#RILC`JpO*!0C&$YiS7!S((Q*lV)Gf`>ms38(z(+wABv~l!nOlGg3>6U@hQ<}9mO4byKrUR(6|IQ`H;!_=&f`*3Pbk#@?FrpmhIv=pyu zw3G$F+U7!;MU5%VWM#_ZR?~9e{6IBVW(PG7w5nO^lAju5rV3ooa@oe4 zw#FBlMimAos~MWCsl{R;&vA?*YCO}(=Sxr$1tzcZlGc!NI?$yu>!&<4LL>1#1+Be( zq$hB-5&F@u*X1eG^%OXPsah}|!yivx2U1QbF$E5&OsSYxnTA>{FuDdfwZJJQT>wD{ zdd<^h9gUvuX4TLF<{wOnkk)_rUHk~DVoR>N{t*N33;9=ibY>42%02H zx{@o!qaWaARacXSAKT?V@P0IA!Lz-sD7Ha?wiU+(e)*|n;`)Pt<3hcp+WT<8LPvG2O#vHG9TVYXAziDfr*O)&&dKG7l+VQpf%iyYw2D`alqID z%$RFrcj&O!Vz_5@Q85>QR%K&oaYMh!;2eTPgG_B2YY3WZnQh>B*AY0lI25?$0I+K4 zj@6=*Vnurvt=M+cP!)eYux(R|Zs18_iYJ=#@juR01CDV$OEfjg1QUIO&3Vm9iC5!E zQYQ6n9g=d*L6eGtCN^}50VQ3Bcf)+1QF0B55kNyJN{xI$<>7u|Z9(hVW|2x-O-e)z zHo7hL7dXFchqzMpC8#RbD4u?OO^R*YNyp7!(Shr_ z4;10xQs#raTWdX2guM)KgL;d}*AU>;5u)rrA&}vr1a6Uo&0m!-v#Z)t-hylM{^6pz z6dWETfrBrW_dg@k^yPljLsvIVU+yYOR z%+Q8q-6b@mb$5*%l1>l{42j^vfP_>CF2n*uBDgRhAr*oPvA~cBE(}OWh2TOgFeHKt z0}@gpxDX2riQvM3gj5JF!~#PixG*3g6@m+~z>o+o3`j_Y;6f}gB!UYA5>g?!5DN^6 z;KG1}R0uA_0z)FWFd!inf(x<0kO(deNJxd?LM$*Of(ru@QX#ky3k-?i!hnQS2rk3| zLn62^AR!fk3$ehE2rdjrNQK}+EHEU33j-2TA-E6=42j^vfP_>CF2n*uBDgRhAr*oP zvA~cBE(}OWh2TOgFr=&E8byD|0ZjNW93A*~8@Dx{e-Qpv2dz%d)G2D^0g5{MB1Qdm z1%CfRQA->}T|P`v@=1!?X1(^zmlII;^{Lv}T=&Oce>gpIYMq zFS5<^h4;^A+uzl<{nMuZI8ZywZhzX=&y4UBZ@s#0^NB6@?>@Hi&P?riEL?c^>+fHh z-9Iw-=;d#I-hB6oPo>}Ad-AJ`Ti)Jq>g6}KzjE}B&u=@q^~1Z`e+rk*oxSwVq@pTR(bgLfs30Qd4{O)jrsL_=SG~Ga@kP literal 0 HcmV?d00001 diff --git a/app/src/main/res/drawable/icon_cp_basal_tbr_high.png b/app/src/main/res/drawable/icon_cp_basal_tbr_high.png new file mode 100644 index 0000000000000000000000000000000000000000..ece4bd4cc0eb5c7767400a7f8e7fc577b6cdb95b GIT binary patch literal 17558 zcmeI4Yitx%6vqbyff@{`0fVCB8Uv)x&SQ7>F>bfCUCLJ3+LS6K24!~UZaZOjW}KOJ zw@nPFi9w0rgG5DQ_}~{ztU+U9B*wRqM1y`(K@AX1)BpxQ5b;&-%s%dPyDL|V8qIC8 zyQg=~`QN#}x#!Hi^I;zB>s`CBWmyYFQ44$0sebq?xS#nK!|!X_w;zB%3(WLJo1!kc z-2Kd=_UyfqqB_rL1B1?BW}T!Mg`lh&Sr9B0Oz2HfiT08yD_ej=XTgxBw*|gG_JpS!2X$3k2MbYJZh+70g;kx?N!hDY7NmWceV+HVRUeT8uej<-Jo= z6&B<{0qBkm(;-%_u}rLE13V9vCwL z+YfAG#8SYTQ8<+A8;#y}`T@E+7*f!^p^&5Hn&`MknnD02tx1@Bq#WkWsq&>xKxk5z z1!M=L;3p|?0>^M6hKmjGqQr+KfotV>iQ^J%ohOLSjVDl}TnY{_ttiDMJ}?Gp-`7y3$H477244 zBa14}WW(V&v_ydkD|}SVMngG}i+WI?v@d*`^sSZ#tEHUx`M78Ab|FVY0w=2?1J5?Z zM1?TV#Kf3uMFce}Msso~UhSfR%(Sl3n(Y|Ym~YC$iR;zF_2BNQtlN4pasS(YUm0?*Q0&0@2LaR2^ha_0{Zj;yk zhKr^c`Y5oRKXKvU$mgBTz(6VXfHAQyk13Rj#mHS>TpQ{7)Y5ap@ zRe`1bnJMZ!%Ni#7KQ`tWCna9tBS~4SZ{-sE?^aSSD#I0WG|WVVY>tsbVTF--nPWgy zi2_c|iJUA{bMdcM(kZJGQc07w5>W+Pxh>WgICS6i)fca-oTqrY^|e-PtDX2X>O1-y z?;01blKywbJo8G5wK|ztfkt?oP^GdY5nU-R{D~T{FS-IL}HJ zE=S=$Qu0;7>TUwJh}MNqNyCb|`d2p;<&*P;H&Qodx~C}j(m)3FRweHP>|2c{+>Nya zHzjb1>@EJ1e1e_U=2P>I4Z53){D`-ChzcD1V|n+x66!x(AG-06L;Z*ALs8^yy5=O| zeb76Zx@KRLyZbNiPuIgIULY9}#gLd_>znH%`m_?r52iG@k+j|IkqF1-#nc~Y7`U-n zpzlB>u$(BqXH(vVDYwEWU+|$DTYKu}yJl#?a=|S$q6;pK1W6}|1%^d%VL(DI1Q%j~ zVG&#ykdO<(g;-!%1Q!M*d-Jc|{Sv zrQ*5cT@rl51+Ap}GZZy`14V7SpQ6r9!ryNxYJ{Vx?>1AE^dvG!OJ9{f z{WxkaK6(2?Pw#Q!!Rs;;XO_J6^-YU{Up-@<-gQf7?};B0D<1e}QP2FqcKSZ|i|=^# zw#Q#6zWLqWir4aZoA{yi_bs8UiHKqU2E>lK9V_VobCAVm;DbvbWG>rSqmJvnzHb?w=XeTODu z2hYwcO&q#sUT*c_kCt!#dQ*Dq$lS%LMICe8ud_>z&Z4$jtJa-rkG$-@IizPzZ)&1* H^L@Vql|()h literal 0 HcmV?d00001 diff --git a/app/src/main/res/drawable/icon_cp_basal_tbr_low.png b/app/src/main/res/drawable/icon_cp_basal_tbr_low.png new file mode 100644 index 0000000000000000000000000000000000000000..0479c1a3afeef3c6788613cf3731dcb5160a0faa GIT binary patch literal 17558 zcmeI4Ym5^`9Ke_4AbLJg3C0*%YD`qv?yK8&*R}{(;7;v9j#KVT3~YC&cMI)q-QBzP zNHnMzUx||Aiy=m%iC;8e5H%+FI5qf;kuPd6K8UD6V?@xzh(?^4Bb&Tr@cpPBuz_pI(;c~lDqZ#8urYf_S}Bh1wLASyHd6+D72gMKEHR+1TMdFUM#@ z&&JkD1+Gx-0i#CmCL65T)IX?g+NjBTY)P&=Q&*sa3UF1rUMZW7QqRVGzY3JSW;RCq zD(=Q?Y^fKJ9xAM+dn_B!Qe0v*j!)1jInGObBF!(R1&$Y4PGotJ;RS`06<(s7f3aLQ zlrpwnQU>xXn&IGo+1RM-Ruz`5)oSsY7`N;ZmX~FjOh=cRG z=_8`q>I0^ZuDU9gm#A)wAAdZSJ!o0wTqFHf2Xl+=>7g%QYnZxKbFPStsi_@tq-#pa zvMZ{aGb-u`V5{axhDD7L&2VNaJyzMW;rKvK%&_g6BUb)wRr*ZFRZR`_<#VthZWy|f z;N?=X1b9Z5^fV(T5@|**r6oqxxKv7(fd08xc`#W=M>z$xa@1|+AyVZ2~k4>Z9t)|HGded-oLNi)R zbHvI!{Ws31Yv21Y}@ z5+(9%%D*vCF2n*uBDgRhAr*oPvA~cBE(}OWh2TOgFeHKt0}@gpxDX2riQvM3gj5JF!~#Pi zxG*3g6@m+~z>o+o3`j_Y;6f}gB!UYA5>g?!5DN^6;KG1}R0uA_0z)FWFd!inf(x<0 zkO(deNJxd?LM$*Of(ru@QX#ky3k-?i!hnQS2rk3|L;6Ep-RM0Qz=SWasKK{Xy#4l( zF8GEETI(GsP}HW&C~ET^6!r6Q`1>_Qjd2w9&3cMb9;B%G*5taqD=2E#g1-FH!TLwv z?%#FIYgb?V#*xGCKX)KD7N7mu)ULgI->n_`eBWCy9zH<3hc2joC%TL0Jv4jeEA#jD z?bx>Co}SuY{dnDhxkK}w$<8)6pS|zdzFV()M0o1VSvzm*D{Oo2`>T&lRr)8G ztyirdKDvP_S2oZ6{-CjE_ph%U%g%Xe!|;t$_dWi^-2IbR+*^M7;quXoYP%m9zU27s zTUI@=ZfV!t{JG)R)~SUH9zOQrmD+{{)Ye;`Jm)t4>l;>m`ub~A_pjRC{c~4x>di^^ zgTkFJY%`DEM6LY7V&p}~=Y02$`}vP+*M?qn>qv@v@es4+(RmAh@!lNLx4b{UbJ_aa Fe+RtnL@fXS literal 0 HcmV?d00001 diff --git a/icons/temp-basal/icon_cp_basal_100px.psd b/icons/temp-basal/icon_cp_basal_100px.psd new file mode 100644 index 0000000000000000000000000000000000000000..9eee5dbcd2475c2e503bc7e2d1e99277a2eb609a GIT binary patch literal 28136 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 literal 0 HcmV?d00001 diff --git a/icons/temp-basal/icon_cp_basal_50px.psd b/icons/temp-basal/icon_cp_basal_50px.psd new file mode 100644 index 0000000000000000000000000000000000000000..9db88a0ffaef689030fbbf7a1b942f532aa5d5a9 GIT binary patch literal 23095 zcmeHP32YqI8Gf_t`-&YqghHWA!K;->1Jy%NAqVVDG@tRE|w<;Z;w9PiMrH zop1hnXQwB_t?b+siu$9uVSXaB{t}rVzvS$A@{%pdey($9uwh^-JeAF5d6o4{Wd%_Q zPp#}^IVr)1A&q2Tr-!nrTUK_i#sbfI(J{}kB=eq7SIC?62YNic{at}jpr0>zCgD(5DfeK!-0^;xH<v$tx+B1R(4LPYA)>aO-@dBO?G!la@rT@ z@9+2dgT7$U3mjf$T2$F7uc$22m6&=)cqJ)ka%x5rJ*byWNO^T-XD3!7s4yN=jMZ6r1w}y8OOMLR`|4$>n8%n#Lu4yufF9QB^=LP*E;7A*qrwAswMgtN4f& zL!U&WR^1it&1NfBt*C3Z0t5!66(yDUbdLAMcty&~Nq)^%Xv(5Wtyk0-U+A4Vr~>vv z2Lb*A(2Ve~%(E�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 literal 0 HcmV?d00001 diff --git a/icons/temp-basal/icon_cp_basal_75px.psd b/icons/temp-basal/icon_cp_basal_75px.psd new file mode 100644 index 0000000000000000000000000000000000000000..585554299b4e9727fffbc81785cecfb006af35d8 GIT binary patch literal 24072 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 literal 0 HcmV?d00001 From 84f032a7a2a6349cf559396d3a0d905bf751c124 Mon Sep 17 00:00:00 2001 From: Philoul Date: Fri, 8 May 2020 17:58:01 +0200 Subject: [PATCH 3/3] Revert "Temp Basal icon switched" I replace first proposal with a new one with 3 icons This reverts commit 24112eb4 --- .../androidaps/plugins/general/overview/OverviewFragment.kt | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/overview/OverviewFragment.kt b/app/src/main/java/info/nightscout/androidaps/plugins/general/overview/OverviewFragment.kt index 021c3729e2..7194d39d61 100644 --- a/app/src/main/java/info/nightscout/androidaps/plugins/general/overview/OverviewFragment.kt +++ b/app/src/main/java/info/nightscout/androidaps/plugins/general/overview/OverviewFragment.kt @@ -667,7 +667,11 @@ class OverviewFragment : DaggerFragment(), View.OnClickListener, OnLongClickList } overview_basebasal?.setTextColor(activeTemp?.let { resourceHelper.gc(R.color.basal) } ?: resourceHelper.gc(R.color.defaulttextcolor)) - overview_basebasal_icon.setImageResource(if (activeTemp == null) R.drawable.icon_cp_basal_start else R.drawable.icon_cp_basal_end) + + if (activeTemp != null) + overview_basebasal_icon.setImageResource(if (activeTemp.tempBasalConvertedToPercent(System.currentTimeMillis(), profile) > 100) R.drawable.icon_cp_basal_tbr_high else R.drawable.icon_cp_basal_tbr_low) + else + overview_basebasal_icon.setImageResource( R.drawable.icon_cp_basal_no_tbr ) // Extended bolus val extendedBolus = treatmentsPlugin.getExtendedBolusFromHistory(System.currentTimeMillis())