From 3fe7c7a0fa4d3ffb11f323d289fe9ef8b0c386f4 Mon Sep 17 00:00:00 2001 From: AdrianLxM Date: Sun, 13 Nov 2016 06:53:00 +0100 Subject: [PATCH] CPP shiftfix and base profile view --- app/src/main/ic_edit-web.png | Bin 0 -> 14401 bytes .../CircadianPercentageProfileFragment.java | 16 ++-- .../CircadianPercentageProfilePlugin.java | 1 + .../circadianpercentageprofile_fragment.xml | 90 +++++++++++++++++- app/src/main/res/mipmap-hdpi/ic_edit.png | Bin 0 -> 821 bytes app/src/main/res/mipmap-mdpi/ic_edit.png | Bin 0 -> 632 bytes app/src/main/res/mipmap-xhdpi/ic_edit.png | Bin 0 -> 1327 bytes app/src/main/res/mipmap-xxhdpi/ic_edit.png | Bin 0 -> 1910 bytes app/src/main/res/mipmap-xxxhdpi/ic_edit.png | Bin 0 -> 2879 bytes 9 files changed, 96 insertions(+), 11 deletions(-) create mode 100644 app/src/main/ic_edit-web.png create mode 100644 app/src/main/res/mipmap-hdpi/ic_edit.png create mode 100644 app/src/main/res/mipmap-mdpi/ic_edit.png create mode 100644 app/src/main/res/mipmap-xhdpi/ic_edit.png create mode 100644 app/src/main/res/mipmap-xxhdpi/ic_edit.png create mode 100644 app/src/main/res/mipmap-xxxhdpi/ic_edit.png diff --git a/app/src/main/ic_edit-web.png b/app/src/main/ic_edit-web.png new file mode 100644 index 0000000000000000000000000000000000000000..561079948d60a6beb9de47c627f1e2bea2547ba8 GIT binary patch literal 14401 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 literal 0 HcmV?d00001 diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/CircadianPercentageProfile/CircadianPercentageProfileFragment.java b/app/src/main/java/info/nightscout/androidaps/plugins/CircadianPercentageProfile/CircadianPercentageProfileFragment.java index 4af04d95e4..3174c0f82f 100644 --- a/app/src/main/java/info/nightscout/androidaps/plugins/CircadianPercentageProfile/CircadianPercentageProfileFragment.java +++ b/app/src/main/java/info/nightscout/androidaps/plugins/CircadianPercentageProfile/CircadianPercentageProfileFragment.java @@ -41,7 +41,9 @@ public class CircadianPercentageProfileFragment extends Fragment implements Frag EditText percentageView; EditText timeshiftView; TextView profileView; - TextView baseprofileView; + TextView baseprofileIC; + TextView baseprofileBasal; + TextView baseprofileISF; Button profileswitchButton; @@ -59,7 +61,10 @@ public class CircadianPercentageProfileFragment extends Fragment implements Frag percentageView = (EditText) layout.findViewById(R.id.circadianpercentageprofile_percentage); timeshiftView = (EditText) layout.findViewById(R.id.circadianpercentageprofile_timeshift); profileView = (TextView) layout.findViewById(R.id.circadianpercentageprofile_profileview); - baseprofileView = (TextView) layout.findViewById(R.id.circadianpercentageprofile_baseprofileview); + baseprofileBasal = (TextView) layout.findViewById(R.id.circadianpercentageprofile_baseprofilebasal); + baseprofileIC = (TextView) layout.findViewById(R.id.circadianpercentageprofile_baseprofileic); + baseprofileISF = (TextView) layout.findViewById(R.id.circadianpercentageprofile_baseprofileisf); + profileswitchButton = (Button) layout.findViewById(R.id.circadianpercentageprofile_profileswitch); mgdlView.setChecked(circadianPercentageProfilePlugin.mgdl); @@ -149,10 +154,9 @@ public class CircadianPercentageProfileFragment extends Fragment implements Frag sb.append("

ISF:

" + circadianPercentageProfilePlugin.isfString()); profileView.setText(Html.fromHtml(sb.toString())); - baseprofileView.setText("Base Profile:\n"); - baseprofileView.append("Basal: " + circadianPercentageProfilePlugin.baseBasalString() + "\n"); - baseprofileView.append("IC: " + circadianPercentageProfilePlugin.baseIcString() + "\n"); - baseprofileView.append("ISF: " + circadianPercentageProfilePlugin.baseIsfString() + "\n"); + baseprofileBasal.setText(Html.fromHtml("

Base Profile:

Basal:

" + circadianPercentageProfilePlugin.baseBasalString())); + baseprofileIC.setText(Html.fromHtml("

IC:

" + circadianPercentageProfilePlugin.baseIcString())); + baseprofileISF.setText(Html.fromHtml("

ISF:

" + circadianPercentageProfilePlugin.baseIsfString())); } } diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/CircadianPercentageProfile/CircadianPercentageProfilePlugin.java b/app/src/main/java/info/nightscout/androidaps/plugins/CircadianPercentageProfile/CircadianPercentageProfilePlugin.java index ec8f459f2c..9d48b9cc62 100644 --- a/app/src/main/java/info/nightscout/androidaps/plugins/CircadianPercentageProfile/CircadianPercentageProfilePlugin.java +++ b/app/src/main/java/info/nightscout/androidaps/plugins/CircadianPercentageProfile/CircadianPercentageProfilePlugin.java @@ -269,6 +269,7 @@ public class CircadianPercentageProfilePlugin implements PluginBase, ProfileInte } private static String profileString(double[] values, int timeshift, int percentage){ + timeshift = -(timeshift%24) + 24; StringBuilder sb = new StringBuilder(); sb.append(""); sb.append(0); sb.append("h: "); sb.append(""); sb.append(DecimalFormatter.to2Decimal(values[(timeshift+0)%24]*percentage/100d)); diff --git a/app/src/main/res/layout/circadianpercentageprofile_fragment.xml b/app/src/main/res/layout/circadianpercentageprofile_fragment.xml index f0e33d15b3..d6dc7a2179 100644 --- a/app/src/main/res/layout/circadianpercentageprofile_fragment.xml +++ b/app/src/main/res/layout/circadianpercentageprofile_fragment.xml @@ -95,21 +95,101 @@ android:layout_gravity="center_horizontal" android:textColor="@color/colorProfileSwitchButton" /> - + android:textAppearance="?android:attr/textAppearanceSmall"> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + android:layout_gravity="left|top" + android:layout_marginLeft="6dp"> 7DJfafEeH(aJ|XoG&WMbiC%m|vNqg@TtXPJT#DX2L9+ioufz`j5DV|=rwxwO zm}H927dAN546=H9xz@95K%D5?7y$Zco28`yarHjM0MHlFt27{<&oKb>)z+^xpcBl1 z%H=W}4u@ zHv1o>Znx_i5?=z41;odk@p#Pg`MhV7_&SLsAU<1J1M+M(+X$)C={UmSvt6Z9p$BNw zY&D%urA*>*TCEnnLE3K4dbXLgJ|=NE&1RF{H1B4ev&$qG=BNqC?IO_0B)(4K=IFXk z3y=&PCzDLmq<6CF1&)(RqyYJWV`Va#uv{)j4^R+rtl7%tn4=D$py0Tit<(a9z#P1Q zkeGuL5F&H%0dhKhh`=0NfDoF42M|(oZ~zK&Kn~cP=m8-&Ct5(<9H;-S5SSAkprFig zaj{E1Knj@?J|M-+2^Y||8wn7b6CR*lHxeK16A>IcxP7yx=LdQHm!;*Th%AP*qd8r_F_e?cCJUZr0&z&E-Fc`9~9&7j|qXQD?_ z^H_Hv4z3pi}iffmFqC00000NkvXXu0mjf;g)VG literal 0 HcmV?d00001 diff --git a/app/src/main/res/mipmap-mdpi/ic_edit.png b/app/src/main/res/mipmap-mdpi/ic_edit.png new file mode 100644 index 0000000000000000000000000000000000000000..ebb6931880b306247cdfa16cd8966435d2d70e27 GIT binary patch literal 632 zcmV-;0*C#HP)wXSzZArlyz;H^!5b!q%ZO`IPxsR z7jPEJ8Yxf*K4b~h>vdAA)p!NYc?G1Lfo``;7K;U$&*!Am>F@|#Xd{5(m&+ybJkQ5< zUD9s1|A#=Y*INtEz_Sq{p_f2DpC`lN@K^ZYnF!TM9|6m<{M%x&NJgVktOU+PV6gQN zz|K!56XH0If8R7sG9Hg31+Yr^>7X0fFJg3kVJ`RzO1d%mQl{cgy9nFA=8MY|6em z&2@42RO8F*mq`L_)8G(z({O_Wx0{ZW1lShSF7Tk?7Skh8;@KlJXxEZh8h|HC1iSzIn!Fy*S>Q-7w(;TkMznY1Y3TeJLjBx20TH4Kp+qZ z1OkCTWGXI@@=#qD&eC}OqKI?wrO@zokLBSANkL7;-rTgk5;V;|(rbC4L(&oH9aPtmc*5TNO!~;? zO3+X8SYF_7(tBL(|I>T%hQEGd3xIB~x=GLF$=|{3P-$;okUl)+VMkX#SNuQZ$&X=l zsI)g#sh1tE0{-Eg6qY>zhz#H_(wE|0#{hT<-2wn30PNMhhG{{^cXxLHz<34Rw{dsu zJb=N$LAA27qL!AHRDXXz0Gy@9$H&#)-kv%>KCWwPYfB9e4+B8b%H?uuW@bk1@9+O> zzShppjv5^u1%M8x@?-SbGtO0=Tb_NCp>W`>1kD~)ztj_eADmu_4UP0 zM?AIwfQa4B;o+g0o11I85;z^1t^^)i@azZx4Ep?og9Ej&u+S6&7v`uC80PHkEQ)ZP zKA-ERl=(5o3w{95eZJ{z z$K=Wn8%YCzrSXD=dA^?jlJ0ga_WAAsNV4E^&W}0O^aH?I^!fM;8Mpd;HvnX8yxhrS;AgOu&=?(XD-mOb7fTVMNg5!nk1IXZ1(+vPgryaeWn4;fPN*92nce2i* z&(8*cjBO*j2f*PzKm7naD!AzbFg7;k;&>rD09IF5UGMY#1CWC8g1-RHXd4j#GSuh$ z0U*VFzWV^qVH*(uGM;wa0FaSB-%S81A1}BKAY*;LTL4nBjpz=5p`oEVgs7@iD){8w zwEu++002PT5AU`L;4T0duYdEqz! zT(QqcWoc1;R$08bF5X-W5te+#vKau*L734-=hcE7|QA8|U^ zsYS7v{ikpBW}9Qj2^=y7CKNyh*yl1HU-CC@sMi*$3Z?`!k*R3T3T`*5d_Gd&bO$x( z#YyEm?PURY(l{q%c> z^{wdjP!YCE6GQ0CneYq!9JN^l-@-IRt9zVmW?U%`xJN28D0(h-28syw5o@&^qZaHR zUZR-xEXCipg%$J51fJPJEYGrKK~H;@6LbgHq7fx%cwMWC`rbqJKdTHSwgQIo+^|P~ z9WcR~F~h|`%L1Qlb{qv5a0)yhMjQoSO3CeSe!^>lcV^(ZD&7iBw+85aswyho553E7 z46(0$kKU%^-m=JiA!Dc9NA8KQt)Mdt_( zI^TFLJ&_72y&p5vzRTOg1E{48XE^AUGMPE6GtVTQYbWR0Vo?ZPU3uhI*}%Lj%=?l? zUS1wV?R>7Pj#d3(>f@N%4!%MbK;Ms!d|J?BkAkv^im{X2f(M$R3hKc8obVzq8=$Xp z#T@sIK$Z^*iY%Mq^RW?-7kanne_B@QQkhwz1w|QECss5T5qq*j(%pZ8@YB_)+4 zNKqz@qfUpmw`_1UKPthEtQHBXy0$@SjQ($3)`M;@A1o8d8e{D&Z7P{ewsKK^B*szK zknvq`?CI;4=cjo$y+Ym}y(oA+LfFOz)`R7anGx+ZrOld*n#QIn1`8M81;g9Mmzouz zYh))AmiFYwnw=85j%JVGzi_;K!-NpzoQ*fr^$ywQRGnt%5KU&B)X7SN@jkCRK0*ka zXf50Rs4*8;!RPZITdRVMcQnpt0*OTGXsAD7Gw5c48mCyR1GypEP6X~#$U0^sdt{m} z$KJhyqafWzvq4pcjkllFWE_Xzyk3GE6XO2;bs5IK`CfEpeUDwz7xbc|1Bm#@9c3q< z0`r21{zC3K)S&2(p0?|%a>zOBe15a?JD>&dPg7ctYsMo$^+Rzh?#$OFF(8`8l`bq$ zg6+a}=+)7PKDHEEV}+%p%w}?7c)bKfgWs{E*;$$HE z+T`WKax8iJCmfjHiJU7HHn33azR`B@Cyxd-cnd;o^08~%c(lNMvioDxG{4QXzzJ4Q zP_;ac7AP+R%}GLv29>G%R{_v#h<_1}5FaXksG1HT7N=vYD#cA|_&6zZ+SGdVx*0`C zv86BN`EY3<{Faoc7o_?J$3mK@_VbLUttUdPe#CHy#*}CG7h*@HZxTfhtd}YqUu!xk zC5*B0&V2=wrMqNHGuh%;fQX-D?0qHk5Cl;C6J`iOo5=u~WQkNU$dcArfmDcrnpEdB z?0;6&?qr*WaWVG3Pkzg6+4vPek$(-Hz4&Jv-4OI;y6uG>MAzUbkF7oQH2F{2-$(;Z zOHg*j3m#dd`~Q!ogj!4vyaXX0I(=kCJ$Tp&qvmp;X+t{2N&uayPHSlZc^q#H%+#&O7 z7}l_=`v+I!MMN#9VE?=~a)y*#o|3;t8|LLf#+69Uak@qL124ciR^=$++KY?=h79&+ zZ{1Cf>I?VcY>tFH;BSQA^C@=ZN58!}g+i$3-*c-x#%Wy*xn zj%bdtHpTCh*|UU+QPk0lrSh|d2+a9Wxfh|2fBsMsEgp($rudPVB;)*rMjgVFEK5oQ zLQQq*(bd?Eore7|=79dd;Y4b+o{6Pkd_mx0oa`y#rEHLw-hGwKJ`5=GI6ZcK{2SC; z=kSK^L~} W!!lahSuO3Sz}3l%Q0MS#+J6C!cWA5t literal 0 HcmV?d00001 diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_edit.png b/app/src/main/res/mipmap-xxxhdpi/ic_edit.png new file mode 100644 index 0000000000000000000000000000000000000000..b4f8f075b78aa5d1b35cab8e1b0f858d413bed34 GIT binary patch literal 2879 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 u>#