From d0b0f6739cdba1f79030a0b38112f5815318c024 Mon Sep 17 00:00:00 2001 From: Andrew Shaw Date: Mon, 30 Jan 2012 17:19:27 -0800 Subject: [PATCH] Added red repeat button --- .../todoroo/astrid/repeats/RepeatControlSet.java | 10 ++++++++++ astrid/res/drawable/icn_edit_repeats_red.png | Bin 0 -> 5222 bytes astrid/res/layout/control_set_repeat_display.xml | 1 + astrid/res/values/strings-repeat.xml | 11 +++++++++++ 4 files changed, 22 insertions(+) create mode 100644 astrid/res/drawable/icn_edit_repeats_red.png diff --git a/astrid/plugin-src/com/todoroo/astrid/repeats/RepeatControlSet.java b/astrid/plugin-src/com/todoroo/astrid/repeats/RepeatControlSet.java index f68ae4ce6..843290412 100644 --- a/astrid/plugin-src/com/todoroo/astrid/repeats/RepeatControlSet.java +++ b/astrid/plugin-src/com/todoroo/astrid/repeats/RepeatControlSet.java @@ -18,6 +18,7 @@ import android.widget.AdapterView.OnItemSelectedListener; import android.widget.Button; import android.widget.CheckBox; import android.widget.CompoundButton; +import android.widget.ImageView; import android.widget.LinearLayout; import android.widget.Spinner; import android.widget.TextView; @@ -325,10 +326,19 @@ public class RepeatControlSet extends PopupControlSet { @Override protected void refreshDisplayView() { TextView repeatDisplay = (TextView) getDisplayView().findViewById(R.id.display_row_edit); + + ImageView repeatImage = (ImageView) getView().findViewById(R.id.repeat_image_icon); if (doRepeat) { + +// String text = String.format(, args) +// value.setText(activity.getString(R.string.repeat_every, newValue)); + //repeatDisplay.setText(activity.getString(R.string.)) repeatDisplay.setText(R.string.repeat_enabled); + repeatImage.setImageResource(R.drawable.icn_edit_repeats_red); + } else { repeatDisplay.setText(R.string.repeat_never); + repeatImage.setImageResource(R.drawable.icn_edit_repeats); } } diff --git a/astrid/res/drawable/icn_edit_repeats_red.png b/astrid/res/drawable/icn_edit_repeats_red.png new file mode 100644 index 0000000000000000000000000000000000000000..80877cd69621de2e8cfa4648664fe147cf678c08 GIT binary patch literal 5222 zcmV-s6q)OZP)4Tx0C)kNmUmPX*B8g%%xo{TU6vwc>AklFq%OTkl_mFQv@x1^BM1TV}0C2duqR=S6Xn?LjUp6xrb&~O43j*Nv zEr418u3H3zGns$s|L;SQD-ufpfWpxLJ03rmi*g~#S@{x?OrJ!Vo{}kJ7$ajbnjp%m zGEV!%=70KpVow?KvV}a4moSaFCQKV= zXBIPnpP$8-NG!rR+)R#`$7JVZi#Wn10DSspSrkx`)s~4C+0n+?(b2-z5-tDd^^cpM zz5W?wz5V3zGUCskL5!X++LzcbT23thtSPiMTfS&1I{|204}j|3FPi>70OSh+Xzlyz zdl<5LNtZ}OE>>3g`T3RtKG#xK(9i3CI(+v0d-&=+OWAp!Ysd8Ar*foO5~i%E+?=c& zshF87;&Ay)i~kOm zCIB-Z!^JGdti+UJsxgN!t(Y#%b<8kk67vyD#cE*9urAm@Y#cTXn~yERR$}Y1E!Yd# zo7hq8Ya9;8z!~A3Z~?e@Tn26#t`xT$*Ni)h>&K1Yrto;Y8r}@=h7ZGY@Dh9xekcA2 z{tSKqKZ<`tAQQ9+wgf*y0zpVvOQ<9qCY&Y=5XJ~ILHOG0j2XwBQ%7jM`P2tv~{#P+6CGu9Y;5!2hua>CG_v;z4S?CC1rc%807-x z8s$^ULkxsr$OvR)G0GUn7`GVjR5Vq*RQM{JRGL%DRgX~5SKp(4L49HleU9rK?wsN|$L8GCfHh1tA~lw29MI^|n9|hJ z^w$(=?$kW5IibbS^3=-Es?a*EHLgw5cGnhYS7@Kne#%s4dNH$@Rm?8tq>hG8fR0pW zzfP~tjINRHeBHIW&AJctNO~;2RJ{tlPQ6KeZT(RF<@$~KcMXUJEQ54|9R}S7(}qTd zv4$HA+YFx=sTu_uEj4O1x^GN1_Ap*-Tx)#81ZToB$u!w*a?KPrbudjgtugI0gUuYx z1ZKO<`pvQC&gMe%TJu2*iiMX&o<*a@uqDGX#B!}=o8@yWeX9hktybMuAFUm%v#jf^ z@7XBX1lg>$>9G0T*3_13TVs2}j%w#;x5}>F?uEUXJ>Pzh{cQ)DL#V?BhfaqNj!uqZ z$0o;dCw-@6r(I5iEIKQkRm!^LjCJ;QUgdn!`K^nii^S!a%Wtk0u9>cfU7yS~n#-SC zH+RHM*Nx-0-)+d9>7MMq&wa>4$AjZh>+#4_&y(j_?>XjW;+5fb#Ot}YwYS*2#e16V z!d}5X>x20C`xN{1`YQR(_pSDQ=%?$K=GW*q>F?mb%>QfvHXt})YrtTjW*|4PA#gIt zDQHDdS1=_wD!4lMQHW`XIHV&K4h;(37J7f4!93x-wlEMD7`83!LAX));_x3Ma1r4V zH4%>^Z6cRPc1O{olA;bry^i*dE{nc5-*~=serJq)Okzw!%yg_zYWi`#ol25V;v^kU#wN!mA5MPH z3FFjqrcwe^cBM>m+1wr6XFN|{1#g`1#xLiOrMjh-r#?w@OWT$Wgg6&&5F%x&L(6hXP*!%2{VOVIa)adIsGCtQITk9vCHD^izmgw;`&@D zcVTY3gpU49^+=7S>!rha?s+wNZ}MaEj~6Hw2n%|am@e70WNfM5(r=exmT{MLF4tMU zX8G_6uNC`OLMu~NcCOM}Rk&(&wg2ivYe;J{*Zj2BdTsgISLt?eJQu}$~QLORDCnMIdyYynPb_W zEx0YhEw{FMY&}%2SiZD;WLxOA)(U1tamB0cN!u@1+E?z~LE0hRF;o>&)xJ}I=a!xC ztJAA*)_B)6@6y<{Y1i~_-tK`to_m`1YVIxB`);3L-|hYW`&(-bYby`n4&)tpTo+T< z{VnU;hI;k-lKKw^g$IWYMIP#EaB65ctZ}%k5pI+=jvq-pa_u{x@7kLzn)Wv{noEv? zqtc^Kzfb=D*0JDYoyS?nn|?6(VOI;SrMMMpUD7()mfkkh9^c-7BIrbChiga6kCs0k zJgIZC=9KcOveTr~g{NoFEIl)IR&;jaT-v#j&ZN$J=i|=b=!)p-y%2oi(nY_E=exbS z&s=i5bn>#xz3Ke>~2=f&N;yEFGz-^boBexUH6@}b7V+Mi8+ZXR+R zIyLMw-18{v(Y+Dw$g^K^e|bMz_?Y^*a!h-y;fd{&ljDBl*PbqTI{HlXY-Xb9SH)j< zJvV;-!*8Cy^-RW1j=m7TnEk!Q}N(f^E>#28J~XksEL3L*0vP%~LF)M>bsQlwKdrh|g5b|AFJ&-eMA^Y$&g^zGZ0 zKRoIAo!fKyKF@j1^E4&|fW7yUk$28o^*fv^c%tO|1U==)%b)i?X8=PO zQd>!x2(R>14mx_)C2IlysdM!woturT8?az1ZmywURps0uI=;oaZ%#Sa%lJsEbNxlU z+3qA+W3;?7&;lG4bbCJoL`?u(0+>a#3qa6<-dXgu3!YXnBjCMMY;&C~>}0N!wa;2Z z=wl9|VYxOg^Qa6o!nS)qWi~)j+>YYwXy-FMi#mk^BJU0dG=0_$HJ%pu0jdn>roIRN zmRgKx3gI~8F@vuNG~R7Q(J!gLLd8XRtzIC7hOl7TN_H~iAWm8Xy%#+Oh`68n3EdYl zc4JEjpBu{JMdwz>5IyONPQ@EA>%!;qApCd^;L&cINEG(8gti*WjXBDTJw7V5x^` zc2KuK`wue67bxvNFEfg1QU|oq*VnK+fV>>KcKBA%Z_qk22a#PzE2m6HegNY~l?^@(618^;4c|FHi zrzg@PHE=h-oQAQPv(Ep0xA+6UfG zg?Bjw_fT&Ky!2XV|p|36sx~(+a}Wk(?0~#UsWg*4IgRniqXJp0m*6gtooT zJx2X%A5drqyR-HX{ogZJYkE$Tk8!amOJt>*OtGxf`zsHUlWi)ksYOahI^l6_R!8Ph zn`miXR{(eyhR{X4KLXDyc=`kYbSML$&ZobY`6Z>~4THuS5ny2>TmL5(?&D3cRCCE1 z11F%Bf|Zb>Vn#DYjBf@w-KWs;p-5=iID0I^klQ}>er7?h7AP6$48%|m2L+~EnQy1w zOuds-*MNg`qBHE#TdYm2AZK0lN569)fOG@(Fo1F~zGtA|S`KcL6y=M2XWNvvmt=W4 z>vvL>OZju{2)S{a_tmFc%i4rXM+~#&Aq)WSbp-AJaFBO0Z(62Vyx#k&L@T9njT?;j zO$_d4?our%wrJ+__)TLBlVqIMC%cd~_ajsJz84(wwu)|!OD-YLXT$876OcosAPCn$ zunPB*js13YD zxxTm>UK}}r?gz}vBBVCbUx`;|ndw==|0nYwF|TXqf2qYru{6#SjlPUmc%O4W2k=~U zPDl53fV7ty8AW;f2Q+t)|Js;8$@pkBkH@8!xE`41+%+&=ihx-V$O>H<-$cSw2pnL~ za>Ny+TAZ8^L65vTANltRpqxT0uVxo-459lA=2z49&^}+?7J{yqR!Dn&Fbq=7?KIe6 z+i`3jxzvaz>w(cYTlbt}oU1obbUpPZKw0LX5ezGY!xZBE6zhLya)VwjsyNpU+z^)c z#n7;n1JUAR&i%-^p_3x(Pr^e0Rros48}V`Uc4jjppTdLE_W}JRSJwT?(?j`!V=d)$ zLu9zIM8@c=Bg@e^0na2|BPEY#Bw2C-Eg4`Nde+NnfTL@ht(2=<8l<6 z1{wk@7h@%zozx>*5Hlw0ZPZRcx6q!`!fz4!J>+SWbZUz!4Bh)Yo?Q@vyls|bpxK_h z4A2E8i>m|bh(p^$vx390QePbMjL|YVX{9Jk_C;IZmuAD|IqdO!c@y3?4 zrt8GNMu#=F|4)l{WG`^;xf zheYAC9`LW#Id`Bj1bzCCT6##ESlA5DE!5i~ZlMk#_ca{!fLhdRqc` zMcssg`(V<&L>WciK!^2p1<=XXYj``8hp2sDbFtC73dA+s#P$0j?!#B{WLpi$b1EGPwel5C;wJ)fh z+|2eOw2!_HtL~Ha%qa|r0J}vNe#?Vq2zk1+9j9L~l(8wGDOpN;I*}%eIWXPM{S>6X zqprb-IU=F2t(8SNc@3>PjRPnJr-9ZBs+zSrXsSeuk+Mf=ODq~IJ3Pze!;ARxOU}~T z*~;jk#g%~5<@daKZ0Bt#UyH_{F*Q?Lg<>HQCY6{@vO%1*1|GYaMfyG_Kg1a2$S`*0i+J+RVdblYBsGhLdpLG$hGW(ukSVb3_0RSK7Q1&+K%O|_zWMGYA z3@;`V6(7<)p1KZT02%)Ev;sNeHU0{CiZNF1>1b@B(biJ(Stt~yOLaQZVJ+IFQgr3! gCJwrshI6p~9lHDIP9Wd(wEzGB07*qoM6N<$f-wC3pa1{> literal 0 HcmV?d00001 diff --git a/astrid/res/layout/control_set_repeat_display.xml b/astrid/res/layout/control_set_repeat_display.xml index e9dd486c8..7e528aa07 100644 --- a/astrid/res/layout/control_set_repeat_display.xml +++ b/astrid/res/layout/control_set_repeat_display.xml @@ -13,6 +13,7 @@ android:gravity="center_vertical"> Don\'t repeat + + + d + wk + mo + hr + min + yr + + + Day(s)