From 12aa141b846153469c52e3a980cbd9fbc0ec5e69 Mon Sep 17 00:00:00 2001 From: Alex Baker Date: Sat, 14 Mar 2015 21:18:28 -0500 Subject: [PATCH] Move add to calendar to task edit screen --- .../astrid/activity/TaskEditFragment.java | 8 +- .../todoroo/astrid/gcal/GCalControlSet.java | 8 -- .../todoroo/astrid/ui/DeadlineControlSet.java | 11 +-- .../ic_action_calendar_month.png | Bin 0 -> 318 bytes .../ic_action_calendar_month_white.png | Bin 0 -> 305 bytes src/main/res/drawable-hdpi/tea_icn_addcal.png | Bin 1525 -> 0 bytes .../res/drawable-hdpi/tea_icn_addcal_gray.png | Bin 2090 -> 0 bytes .../ic_action_calendar_month.png | Bin 0 -> 392 bytes .../ic_action_calendar_month_white.png | Bin 0 -> 382 bytes .../res/drawable-xhdpi/tea_icn_addcal.png | Bin 1725 -> 0 bytes .../drawable-xhdpi/tea_icn_addcal_gray.png | Bin 1736 -> 0 bytes .../ic_action_calendar_month.png | Bin 0 -> 476 bytes .../ic_action_calendar_month_white.png | Bin 0 -> 468 bytes .../res/drawable/ic_action_calendar_month.png | Bin 0 -> 560 bytes .../ic_action_calendar_month_white.png | Bin 0 -> 461 bytes src/main/res/drawable/tea_icn_addcal.png | Bin 1266 -> 0 bytes src/main/res/drawable/tea_icn_addcal_gray.png | Bin 1263 -> 0 bytes .../date_time_picker_no_shortcuts.xml | 1 - .../res/layout/control_set_gcal_display.xml | 73 +++++++++--------- .../layout/date_time_picker_no_shortcuts.xml | 5 -- src/main/res/values/attrs.xml | 2 +- src/main/res/values/keys.xml | 24 +++--- src/main/res/values/strings-core.xml | 2 + src/main/res/values/styles.xml | 3 +- 24 files changed, 62 insertions(+), 75 deletions(-) create mode 100644 src/main/res/drawable-hdpi/ic_action_calendar_month.png create mode 100644 src/main/res/drawable-hdpi/ic_action_calendar_month_white.png delete mode 100644 src/main/res/drawable-hdpi/tea_icn_addcal.png delete mode 100644 src/main/res/drawable-hdpi/tea_icn_addcal_gray.png create mode 100644 src/main/res/drawable-xhdpi/ic_action_calendar_month.png create mode 100644 src/main/res/drawable-xhdpi/ic_action_calendar_month_white.png delete mode 100644 src/main/res/drawable-xhdpi/tea_icn_addcal.png delete mode 100644 src/main/res/drawable-xhdpi/tea_icn_addcal_gray.png create mode 100644 src/main/res/drawable-xxhdpi/ic_action_calendar_month.png create mode 100644 src/main/res/drawable-xxhdpi/ic_action_calendar_month_white.png create mode 100644 src/main/res/drawable/ic_action_calendar_month.png create mode 100644 src/main/res/drawable/ic_action_calendar_month_white.png delete mode 100644 src/main/res/drawable/tea_icn_addcal.png delete mode 100644 src/main/res/drawable/tea_icn_addcal_gray.png diff --git a/src/main/java/com/todoroo/astrid/activity/TaskEditFragment.java b/src/main/java/com/todoroo/astrid/activity/TaskEditFragment.java index 771dce085..01c4e1d9a 100755 --- a/src/main/java/com/todoroo/astrid/activity/TaskEditFragment.java +++ b/src/main/java/com/todoroo/astrid/activity/TaskEditFragment.java @@ -359,10 +359,10 @@ ViewPager.OnPageChangeListener, EditNoteActivity.UpdatesChangedListener { controlSetMap.put(getString(R.string.TEA_ctrl_lists_pref), tagsControlSet); RepeatControlSet repeatControls = new RepeatControlSet(preferences, getActivity()); + controlSetMap.put(getString(R.string.TEA_ctrl_repeat_pref), repeatControls); GCalControlSet gcalControl = new GCalControlSet(preferences, gcalHelper, getActivity()); - - controlSetMap.put(getString(R.string.TEA_ctrl_repeat_pref), repeatControls); + controlSetMap.put(getString(R.string.TEA_ctrl_gcal), gcalControl); // The deadline control set contains the repeat controls and the // calendar controls. @@ -370,10 +370,10 @@ ViewPager.OnPageChangeListener, EditNoteActivity.UpdatesChangedListener { // deadline control, because // otherwise the correct date may not be written to the calendar event. // Order matters! - DeadlineControlSet deadlineControl = new DeadlineControlSet( - preferences, getActivity(), R.layout.control_set_deadline, gcalControl.getDisplayView()); + DeadlineControlSet deadlineControl = new DeadlineControlSet(preferences, getActivity(), R.layout.control_set_deadline); controlSetMap.put(getString(R.string.TEA_ctrl_when_pref), deadlineControl); controls.add(repeatControls); + repeatControls.addListener(editTitle); controls.add(deadlineControl); controls.add(gcalControl); diff --git a/src/main/java/com/todoroo/astrid/gcal/GCalControlSet.java b/src/main/java/com/todoroo/astrid/gcal/GCalControlSet.java index dabbf83fa..0c238ae3c 100644 --- a/src/main/java/com/todoroo/astrid/gcal/GCalControlSet.java +++ b/src/main/java/com/todoroo/astrid/gcal/GCalControlSet.java @@ -17,7 +17,6 @@ import android.view.View.OnClickListener; import android.widget.AdapterView; import android.widget.AdapterView.OnItemSelectedListener; import android.widget.ArrayAdapter; -import android.widget.ImageView; import android.widget.LinearLayout; import android.widget.Spinner; import android.widget.TextView; @@ -34,8 +33,6 @@ import org.tasks.preferences.ActivityPreferences; import java.util.ArrayList; import java.util.Collections; -import static org.tasks.preferences.ResourceResolver.getResource; - /** * Control Set for managing repeats * @@ -56,14 +53,12 @@ public class GCalControlSet extends PopupControlSet { private final GCalHelper.CalendarResult calendars; private boolean hasEvent = false; private Spinner calendarSelector; - private final ImageView image; public GCalControlSet(ActivityPreferences preferences, GCalHelper gcal, final Activity activity) { super(preferences, activity, R.layout.control_set_gcal, R.layout.control_set_gcal_display, title); this.gcal = gcal; this.calendars = gcal.getCalendars(); getView(); // Hack to force initialized - image = (ImageView) getDisplayView().findViewById(R.id.display_row_icon); } @Override @@ -226,7 +221,6 @@ public class GCalControlSet extends PopupControlSet { protected void refreshDisplayView() { TextView calendar = (TextView) getDisplayView().findViewById(R.id.calendar_display_which); calendar.setTextColor(themeColor); - image.setImageResource(getResource(activity, R.attr.tea_icn_addcal)); if (initialized) { if (hasEvent) { calendar.setText(R.string.gcal_TEA_has_event); @@ -234,7 +228,6 @@ public class GCalControlSet extends PopupControlSet { calendar.setText((String)calendarSelector.getSelectedItem()); } else { calendar.setTextColor(unsetColor); - image.setImageResource(R.drawable.tea_icn_addcal_gray); calendar.setText(R.string.gcal_TEA_none_selected); } } else { @@ -245,7 +238,6 @@ public class GCalControlSet extends PopupControlSet { calendar.setText(calendars.calendars[index]); } else { calendar.setTextColor(unsetColor); - image.setImageResource(R.drawable.tea_icn_addcal_gray); calendar.setText(R.string.gcal_TEA_none_selected); } } diff --git a/src/main/java/com/todoroo/astrid/ui/DeadlineControlSet.java b/src/main/java/com/todoroo/astrid/ui/DeadlineControlSet.java index a09a48fce..6aebf9709 100644 --- a/src/main/java/com/todoroo/astrid/ui/DeadlineControlSet.java +++ b/src/main/java/com/todoroo/astrid/ui/DeadlineControlSet.java @@ -27,12 +27,9 @@ import org.tasks.preferences.ActivityPreferences; public class DeadlineControlSet extends PopupControlSet { private DateAndTimePicker dateAndTimePicker; - private final View extraView; - public DeadlineControlSet(ActivityPreferences preferences, Activity activity, int displayViewLayout, - View extraViews) { + public DeadlineControlSet(ActivityPreferences preferences, Activity activity, int displayViewLayout) { super(preferences, activity, R.layout.control_set_deadline_dialog, displayViewLayout, 0); - this.extraView = extraViews; } @Override @@ -64,12 +61,6 @@ public class DeadlineControlSet extends PopupControlSet { @Override protected void afterInflate() { dateAndTimePicker = (DateAndTimePicker) getView().findViewById(R.id.date_and_time); - LinearLayout extras = (LinearLayout) getView().findViewById(R.id.datetime_extras); - if (extraView != null) { - LayoutParams lp = new LinearLayout.LayoutParams(LayoutParams.FILL_PARENT, LayoutParams.WRAP_CONTENT, 1.0f); - extras.addView(extraView, lp); - } - LinearLayout body = (LinearLayout) getView().findViewById(R.id.datetime_body); body.setGravity(Gravity.CENTER_HORIZONTAL); Button okButton = (Button) LayoutInflater.from(activity).inflate(R.layout.control_dialog_ok, null); diff --git a/src/main/res/drawable-hdpi/ic_action_calendar_month.png b/src/main/res/drawable-hdpi/ic_action_calendar_month.png new file mode 100644 index 0000000000000000000000000000000000000000..f0e3557b076e94e374c87f9a9b251ff9e7aed02e GIT binary patch literal 318 zcmeAS@N?(olHy`uVBq!ia0vp^1|ZDA1|-9oezpTCmSQK*5Dp-y;YjHK@;M7UB8!3Q zuY)k7lg8`{prB-lYeY$Kep*R+Vo@qXd3m{BW?pu2a$-TMUVc&f>~}U&Kt;PfT^vI) z8sE-{=4wz7anZdsDLcz|?Mc_0`5lj5-!d_IuJ4#(bC>f@QcvGZ*}qJiH5jB=9TqcW z^vyhb@AvDUGENrZ?@l}BC#?S4dHHhH>{+r^%x8@!Sa(h}zL53Lo~@{7+i{=QOD;$U zFqi}zPYBAIe($T?3tpfpmnAi75AS_#`{!~)=Es)!?fIHG5-+}Rh zL-YxzDrT;RWtD6f%9p6V;0?)NzMpR|BiMcshO@jqJ98MV{zi5Jy}{t=>gTe~DWM4f D{0DT( literal 0 HcmV?d00001 diff --git a/src/main/res/drawable-hdpi/ic_action_calendar_month_white.png b/src/main/res/drawable-hdpi/ic_action_calendar_month_white.png new file mode 100644 index 0000000000000000000000000000000000000000..29c5d565986886828f5681e66465fd720a2ba1c5 GIT binary patch literal 305 zcmeAS@N?(olHy`uVBq!ia0vp^1|ZDA1|-9oezpTCmSQK*5Dp-y;YjHK@;M7UB8!3Q zuY)k7lg8`{prB-lYeY$Kep*R+Vo@qXd3m{BW?pu2a$-TMUVc&f>~}U&Kt=03T^vI) z8sE;ev1+!o`y0O0%-+Jb=T@8U5r&K{#t*KVu&{y%eP n9y+j*?W4jTMzFOK3}?A7t`e(H*iw}YbUA~ktDnm{r-UW|TNrGq literal 0 HcmV?d00001 diff --git a/src/main/res/drawable-hdpi/tea_icn_addcal.png b/src/main/res/drawable-hdpi/tea_icn_addcal.png deleted file mode 100644 index e4a0313788f44a70dcaec6947934f40280a808b0..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1525 zcmeAS@N?(olHy`uVBq!ia0vp^av;pX1|+Qw)-3{3k|nMYCBgY=CFO}lsSJ)O`AMk? zp1FzXsX?iUDV2pMQ*9U+m{l@EB1$5BeXNr6bM+EIYV;~{3xK*A7;Nk-3KEmEQ%e+* zQqwc@Y?a>c-mj#PnPRIHZt82`Ti~3Uk?B!Ylp0*+7m{3+ootz+WN)WnQ(*-(AUCxn zQK2F?C$HG5!d3}vt`(3C64qBz04piUwpD^SD#ABF!8yMuRl!uxKsVXI%uvD1M9IxIyg#@@$ndN=gc>^!3Zj z%k|2Q_413-^$jg8E%gnI^o@*kfhu&1EAvVcD|GXUm0>2hq!uR^WfqiV=I1GZOiWD5 zFD$Tv3bSNU;+l1ennz|zM-B0$V)JVzP|XC=H|jx7ncO3BHWAB;NpiyW)Z+ZoqGVvir744~DzI`cN=+=uFAB-e&w+(vKt_H^esM;Afr4|esh**NZ(?$0 z9!LbN!`Ii!Gq1QLF)umQ)5TT^Xog;9W{Q=efr*KcqqCc(iL05Rp{tRTv4xA1k)@@p zshg#%o1r00uSMv>2~2MaT(1i-nsDd^C5GGrpv^9+MVV!(DQ-pixe8!UTV>*Q ziwjQkpn6kqy2aTQr(S)aWAs5$ixkx`Az=CeG2sap$bl#Q)I4B%F9Ig)1$T^AF)%Qt zd%8G=RNQ(q{j_&Tpv>{~W0|Lp$b}_jp8q&=N=S%uWcMPmhfW=0f`2(31sq>E39O9S z(OVS!O=-iVNnV+uEV)gK7UhJ_2oSm1tXci?Yw-i?f^O@()#qJyeK^ow{cf)D_v*Uy z#=@mC>PCXfR;n@Ee@CS4V$(aoYw=@x`IQ5b5)FHAirsx}_vd!)o#fuiX$@Q}njB|v zFP6)$cM`gGh-U_W=8tFT8>bgo=d`%)y3cT3Mdqu3-qjk`FIkI!KX8wD$QC(UvUq`= z!;PM!nh~6pb=}Ew=RXylnH@2~HBKzPG4;b;waACw(`r75)-fIKnxCAQdn;@Qr&e*n zS9goI>hDDRC(0z-BuPK6`N7pb+y4!fH?J z;{YD+hb$r4dkY_P=RTS<>158UJ$Cm6RW?74jF}putQo>9e^o8(s>CYQG^;yRGdNv0 z_)3@Ov?N#kY>3&*HSgqKw>O$19uEws9LT9qnO@&!D4m#mwAy0nw#bDN*H18uKkT(B zjFgULvQIKc!L0#W%BIjRt?p<23GzwRboTU> ze&6)lO!{B{%r%n;oWHJIR%T(#<5zZnH)R>$ne_Yg!#{0)_Xb6e^TGM{z7dR+Vfd!Wkp|CXm* z)zW`8Mck2DWIOBGrAM18mcRO?Wpl+?c+qdimcu>QFTC2NKjA~<)Tq4nvW|)Cvme_3 u+?t>`=g0j+&a2)(Tv;zP*{vd`fsx^`e5dN6CDys1g4om5&t;ucLK6U!V?xRR diff --git a/src/main/res/drawable-hdpi/tea_icn_addcal_gray.png b/src/main/res/drawable-hdpi/tea_icn_addcal_gray.png deleted file mode 100644 index bc8033d584b76eecc3cfeee5d8c10cb1a73c2d45..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2090 zcmaJ?c~nzZ9uA^_fCU>$MHE6%wj5|VMm0L+UAMgRyO0VfLZ2ROWh zxORX9gXwSK2ZTT&Og|zQ6read3`#B#Y1uFsX_s8Y;l={41ys=3WF96axr16vmZ{amOOu@hB`FL%x2iEP+5kV{m93&Q*(Wl_Uruj@(r! zv0ql80TQm5FM{}>5TR4#M1WF=jMPT@R|*2rCt0E7W0|xCL(4fLG!})?rL+uWGXFnR zAozrqK>onr@%~R?NkD=KK>Gs{P%7qX8y9J>b0s2D#Q+Ba#Q`7~yIjS+(I5m$qCpXY zy59|jMKC#BzEEfRz+f_oK0*n^5pn?^8X2k8K=JuJA_0S=;_+T|0-lb;V(B=__8l|| zjzFNhF$i=97Q4))fn2Eo5JJmb-rrotid@|=2t-=XG(gOc2Y3uIC_sEjn#f-{7V3(6 zAGy4hW1+3cMQejW>stF?tzI^1=SR2wG`QNsr_l$5+Ibgi2fOHA+ix(~>T^CcuK@Yr zoqRC*V4y{d`lyd$A@uQJN^fUvVRrkNLs4qbIsMIPH`!EktJGfXAihLxG2wXEY`zuU zJBVKsni0=B&N{=Y#F;yE;c`;_ODTlb;-ptM zUo0v2$*Sg}S9B#kOYvj!1^X;Z4QGHepQ1jJv{-$;pAQ@y`tiicRNxI@+PM zKgItZ8Hskv?;r;_Sy(0}B}Fw_{A%yjtX5|}?WhSEzj9<<(`a~H;ptImzCg4i+2wrq z`9A652|ow!af)3SX2bPZ_NYW6>FDh2{C3BT>9lhWDI_ecx%c72f;yKiS!&Fmw#VoW`#*`4MjPYw+1WuEhP+Q~NtIKK$*&SocC3D=R`5$ua%A z%$GJp{r#8wuQ3PSgpW4m=6+Fm&(Qf)%i`g)WjQHpH?~@v!Hbjf^76)>g|}TWdN6Oe zlfS9zZL;USw&1UJcVC;!4@OT7JFoq=+(Prxkj-Z2M|j+*ua|Gsvoh_EaW<#G!_{F@ zsWjcZu|nE#>&}d0kRLYE_tNcP|1pOllwHjb&!*+&G0j-1KzXHZp(-+>O`fu$ndM%6 zGpX`lIkyf^vpB-mXQ`^DH9grWUPZwy)SmmM?ap}gs#`?`#jm6lUv6#Moq0`Bo>`+Y zDU}9I^U*H*=`|ymHr0kYjHhbOMw9mXaYlq=t6AxIWaUpql&4XllL$p%r*b35+T7iC zGSh6IVlp-CqAGivGOMRuPV#K?vh`YW_`&=1`pm4*cf`DtNAEq^j#ON(h{rFIsJ^&@ z@I=q_rbd&k2QGBzZ63BR@nzU@nrhB|?j*Zm$eDs+qf#(Sw;vd?DJerE1g(%U(J5gO3#;Z1_os9}eP=rN&)O;9OPgt%CCX>V`#?W89)l9VrCoCs!9JP+R1mq;26r>=)P4tHnIad+;ILh$nZ)q zUofb&88mI5^$!jn2z=o-3Q3(U)xEpBu<7H%nWFDI7U%U36`IS}un#%3o)t~}L#0wV zmi;zjHx~SvD+Bq%fql{tgVl$xlmo* zo#p%dlATQSyJh3U_{y2pibFrXUFt3y3KI8C%|6+E&h2x>j0z?1tGSiCv}JF&BUbo) z>!0?9@Ao~Jo^Af-m1XG9z>^~xcc1q77k}BTvHd2hR`>Vzp|faJ Il2?p zUk71ECym(^Ktah8*NBqf{Irtt#G+J&^73-M%)IR4h~eZfWsD~8@Z4aUD(HJ3hro^Sb_{qH)lPrMVv3%>l3UK9FB{H3KDh-+ZO z8fCh8*?|`yOPCkMOIR*noLoN$E83IS3oEhUr_ywTLO{Cv>}Js3Pgy7SR%>bf2M; x@vwWs^!KgnCgeBlX;^pu$v;7ejp(iy7uuSmD1L!y6EM^mJYD@<);T3K0RYMGjp6_R literal 0 HcmV?d00001 diff --git a/src/main/res/drawable-xhdpi/ic_action_calendar_month_white.png b/src/main/res/drawable-xhdpi/ic_action_calendar_month_white.png new file mode 100644 index 0000000000000000000000000000000000000000..ae705d517ad3db4d77fba04e4aaf77b9ac0e7efe GIT binary patch literal 382 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=EX7WqAsj$Z!;#Vf2?p zUk71ECym(^Ktah8*NBqf{Irtt#G+J&^73-M%)IR4Hya`R=z45bD>2Vuq%hFKg7 zm@l|6$Tl2{JK$dMEMt2fzeRROE$a>L9k-Y^`yW50{(RmdKI;Vst0Ot^kl>h($ literal 0 HcmV?d00001 diff --git a/src/main/res/drawable-xhdpi/tea_icn_addcal.png b/src/main/res/drawable-xhdpi/tea_icn_addcal.png deleted file mode 100644 index d7a7eb51fd3811577eee81fb3143889844ca8d55..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1725 zcmaJ?c~BEq7>@|Zpq6qeBDNunN))oYAqgZBFv%v8LMRPE@c^<(77`%Ym@FnB+Jc>; zgIY#RJ*q;H07_MaU}5k;sG?Tz8kvF}JW#ZF3tFgRy8*HN1KpY3_uluu-|xF;H^s#+ zneOWAN+OY_i=$vEu?E^-7iZ$T`E7%iSZ3kEL_8i##Z8C-CGk|40ws&JNE#|d5mol; z^JqAUG+C{YCE|&a7>*Lt(h$22&8*cEXc8$r(yT|687NLxplKQ%m-4jf6osr&aVg7~ z5>TQSplVH2jscC&iIpjHGL&o;B{G5>ZsrgKS`L#HHweZcM0c zlx6EtK#Cf%EQ6A$M{2-0n8@A74cQe5Z#Z8XG(=I5Oc+yUX;B?6hPf2thNjY}ID#;d zPz3Y&d=VXFg+UOX848E-c`O!_&tuaeXq;n0EX)WCWAX%S1}uUgA)Ox*2J`7`wvZ`e z3kk_MR;)APh)#))+tt|Zj$!#9#c~7&6u~ir48tB)k4CJiD>5T!&m5d$ONXk9igq@a`fpq+{L$4hYgv)kU};-zpn$r8 zGPTavu%Q0Q;P9DcKHpa09hL)qEd^^k_8L1zdTtJLKj}s5y5gXeI=*nd#qsTcL+h#8 zHT83sw?F1E`2D&il;`uOhCFroWj{FW#;(6|I1VRLgb+}5@0i~meb?C*?=a`y>`t50 z!cy;7`EFBgIhDJ2-@lMQQ_kHk-jmcM-=Exn&s}{u1ZdmR(QE=2vKl=aW|bB16Uxss z)};UR#F*qPo<}OV)Zpbab+P;+>QyPz1EeS zbc&kuxUROr=`v|#!1lQJSl9E-Z-s|;OuN(U+xbeRI^p{ATK8EO#qmAGvDWSc-`P|~ z``v-lrkv9O!?#?mg~^tmokx1AsTtm0Bek}d1vR&PI}cWl#PoWEFS<>4tGK(Ny=HQd z_IQDy#;2Rvvvml&?H2_4>ldAaljiyF&3*2(6ogiHC)MhUb8D82q;?k=`%F$r;>@RM zHc$< diff --git a/src/main/res/drawable-xhdpi/tea_icn_addcal_gray.png b/src/main/res/drawable-xhdpi/tea_icn_addcal_gray.png deleted file mode 100644 index 4574121e95dfa70e6beb60c17561ab70fc6d22f6..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1736 zcmeAS@N?(olHy`uVBq!ia0vp^8X(NU1|)m_?Z^dEk|nMYCBgY=CFO}lsSJ)O`AMk? zp1FzXsX?iUDV2pMQ*9U+m@_g%B1$5BeXNr6bM+EIYV;~{3xK*A7;Nk-3KEmEQ%e+* zQqwc@Y?a>c-mj#PnPRIHZt82`Ti~3Uk?B!Ylp0*+7m{3+ootz+WN)WnQ(*-(AUCxn zQK2F?C$HG5!d3}vt`(3C64qBz04piUwpD^SD#ABF!8yMuRl!uxKsVXI%uvD1M9IxIyg#@@$ndN=gc>^!3Zj z%k|2Q_413-^$jg8E%gnI^o@*kfhu&1EAvVcD|GXUm0>2hq!uR^WfqiV=I1GZOiWD5 zFD#PU%0_}#n6BP2AO_EVu8M)o`HUDF34YC)x{-2sR(CaRb3oXS&*t9 zlv} zT-{upoSfW@49qMH4V_HQT`Zg&&CE=l94(Cu4Pj1yg`=?WBq>GjMjE=kNwPKDW<39=WW*BGx}E9aur#FG4?ko^1{SPBTp$S=t+ z&d4uNa1J)rGgR zEM{O}`sV547*cWT%?$61U`LU*;@qg@yt8)FWyqR(c0DD+VNr)w_}0&j?>Gu z#bY}?CUS`KG!-u05$Nc#J9vY}4~Ei}8ApReL{?{9T@-jb>rwd=ai@&M%O(q*lKrv6 z`1`p#zn`C}-k2~)5xv_nJGhP~EIMKRw$-#ip7h+t`3Ye;<*Eh7E!^)~6Dm2ax4K;asn@I$%r^i04iO2><^vt4 zHT(|Q{G8IAX7~H-(gWE-GfHO^&*j>~QrfruM{(Q%pXh|JpJ!4}@8X%%rC)mWgB$1X zxl^?x_`}yI9f(tXyye;ZX8%ujSvSbfI}jVe#Xi-2ZsY})eJw0cU#eWUtKhlYQ?2qu z?(gHauW#qgE6vWEe@*Snx~%KbIV&Ho{&he14Eymm3(%}tpgKE5Q_g9v*HdkY5VISJUnM>YhTCOa`>P}`6}Hh_eiy6! z!M?=q2g{zBzxY>rxBp=9i*`|~l$KaF&w%Cqm;b!t5t|$E$nL1c=^IQ-CjN_zyu{Z;$70eJuI7yDEN>4EwbO+tig`U(K*tmCK`e?6mdEE34v{?_BtD*~}!nA93;( zD)KRFOAHrGy1M2$bJV3p3nZp2jh-^^nximJ=DfKl{6*^cy{FG%pZw_{-wnQLW_AY@ zBiL+b<-7mcUce{jePV8r+AA$i&(E)qZCugWdFlPs*4s~;|4Nl#cpq|KZ|~D}D%-vn z=W73autCYtXTPUiM%b$99~u@_xp~jE{2w(pOUENjt9HrL>_Aqh+0V?Mt(Bd0-}jo( zWS1{_OBeqa%HXWzUK8lI#pJW|BHuqd{M6UZvNu~Sc4U6p*=O})Nt-^&Csm%`#Wk-o wICuU3`#t&_gl0Ye&-#Y@3#(ZEeijLa_HS3uq!sOb1gcv+UHx3vIVCg!0I-vwf&c&j diff --git a/src/main/res/drawable-xxhdpi/ic_action_calendar_month.png b/src/main/res/drawable-xxhdpi/ic_action_calendar_month.png new file mode 100644 index 0000000000000000000000000000000000000000..cc4d52934cab74daae41ec7ce5b74cc79859ed30 GIT binary patch literal 476 zcmeAS@N?(olHy`uVBq!ia0vp^2_VeD1|%QND7OGoEX7WqAsj$Z!;#Vf2?p zUk71ECym(^Ktah8*NBqf{Irtt#G+J&^73-M%)IR4#a{hh zUJb1M#>3|gYp)+Ew`G^9J#WkiH0!3;qgRjXcjiSTL-c?wnr6$o_GZzIpT9$jzx_U+ zf{=i?V51^`(t5e3b9Mh``hcCZ(fb|aV%_UHk1K>w9T{6BAf3B2P4f6;kh8bP9P2&8 zg60^={!ilsS;57u1~1;zw}r>mdKI;Vst E0LmJyFaQ7m literal 0 HcmV?d00001 diff --git a/src/main/res/drawable-xxhdpi/ic_action_calendar_month_white.png b/src/main/res/drawable-xxhdpi/ic_action_calendar_month_white.png new file mode 100644 index 0000000000000000000000000000000000000000..0a404a27d164e1a9d3e76d34068a6c378bfb3215 GIT binary patch literal 468 zcmeAS@N?(olHy`uVBq!ia0vp^2_VeD1|%QND7OGoEX7WqAsj$Z!;#Vf2?p zUk71ECym(^Ktah8*NBqf{Irtt#G+J&^73-M%)IR4JzX3_ zD(1YsdyuQiLB!!=*T4VMb1yENDq%U#@O>mV+w|)elP}apPK%z?{*NI%oM8<^1mgy# z1l9vw4WbO%3}NU3-&(%M{nmWv=r)<&8q-Op=s zi?{a?2D_&0ij=|ahf(c?m1r)L-6}ZyZNb{ZJNAGaU3T^Gj!Y9qG>^Pl)n0fxg9+|A v>5n2;<_Fg;g!{tctzHQm$f@|kU@yb58)Em9opfdZV}QZa)z4*}Q$iB}I^?0} literal 0 HcmV?d00001 diff --git a/src/main/res/drawable/ic_action_calendar_month.png b/src/main/res/drawable/ic_action_calendar_month.png new file mode 100644 index 0000000000000000000000000000000000000000..808852aebc3f5b019d73a9ba23a229cca56acadc GIT binary patch literal 560 zcmV-00?+-4P)8$l3;zkd~iKwzgyXIBBe!09SiB87VwF7g8D z@&>8$2I=wuapA(f3%f9+kyen}U^f=n5HKNd$c<)P_v6lEKsL?#$25cXPAL z%H3I|g_UN10ayosSBr?!H2pT44~N5#O=)2bDxj)kSp146t*Rn(e}TJSx%)Xl2;u$A zZ)PWtC8^R%>Pp(K(mw`pJ{pY<0n#-6x9Q9`&#JUZlI+(8DB2>;w2XFPfTH#L{dSgR zZvo8g4?qZE1EACC{F+QAn`ZVJU@#b5H4czv**kat1mNz+`M8_MzM9#dq^(@O{>QL( z156=r0y~R+w&d~O(P literal 0 HcmV?d00001 diff --git a/src/main/res/drawable/ic_action_calendar_month_white.png b/src/main/res/drawable/ic_action_calendar_month_white.png new file mode 100644 index 0000000000000000000000000000000000000000..326e4554d05f7ab7eb2c53692603e53ff8e22e81 GIT binary patch literal 461 zcmV;;0W$uHP)8mE4An_cYAjrbT^yaTbsMKBcUTGfw}rO-u%OcMXPepfz!%t5vdv?A``b?o( zPU^mmEy9h()G{|(fRAI~MExJNeYKy!060=!rVwxjysCe%_Ezl$Fb0OoclR2G@C8iO zU#OjWu@`SXiGUB_%FNA7JQ}e_AUaB5aR$G=T{r8%7o zux-@xN6&vtA;2}1C4c?>N%^zdOSRXj1PndD=kbAw_nIsYJ5+?WrCNU1RzUV0C~E$g zxTZ6&3bufIkgWYUg#@HP^pmX7qvAivUITjp*#-Op*+ZucI1BAn00000NkvXXu0mjf Df_%W_ literal 0 HcmV?d00001 diff --git a/src/main/res/drawable/tea_icn_addcal.png b/src/main/res/drawable/tea_icn_addcal.png deleted file mode 100644 index 498830c113fc4ff43207d8f5fe4cba699ae0a5d1..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1266 zcmeAS@N?(olHy`uVBq!ia0vp^A|TAc1|)ksWqE;=WQl7;NpOBzNqJ&XDuZK6ep0G} zXKrG8YEWuoN@d~6R2v2cW|hp4h>{3jAFJg2T)jk)8oi3#0-$aN1{?c|g2d$P)DnfH z)bz|eTc!8A_bVx6rr0WloBA5~7C5J7WO`H;r3P2|g(O#HCtIc{+1n}DR9FEG$W1Lt zRH(?!$t$+1uvG$^YXxM3g!Ppaz)DK8ZIvL7itr6kaLzAERWQ{v&`mZlGgL4$(K9qL zur#sMQ7|$vG|)FR(l;>IH8ij?HMcS_RDc2{plwAdX;wilZcw{`JX@uVl9B=|ef{$C za=mh6z5JqdeM3u2OML?)eIp}XpbFjM%Dj@q3f;V7Wta&rsl~}fnFS@8`FRQ;6BCp2 zOG|8(fG&l2A-4c-Y+f-mn1BJMUy)d#Z>VPg@)As;uP=V3xw&xF#U(+h2=`(&xHzP; zAXPsowK%`DC>a=WY04n03ap%qQWHz^i$e1Ab6}wukda@KU!0L&px_*As%NO+o0y!L z2ND76@b$Iw%quQQ%u7!7bg@+enxU7OnPTN?VeV*R>ga4~YG7e#=xXF-Y~kW$WNGPY z>SpQcW@rf0>yn>bnwy$e0@Is<(CdOzFDNnO765H_NiE7OOHFYr%Fk5*d)g`!w_6-> zng`XJg4-=lIQ8lS9itD5TBN9k2?5g&hzU=)Kn^_Vr{)3Edl4{U8?q>tFfcHtc)B=- zRNOi#jfkd?kFY-*ex04_5l0ulzap{rgI5`{Si|LsZvlg(iAe=d&F%dZxBe zKJB5f%m$NHiLzW9UjEhFzgs}3y|bBZNOwmsx%W2*7X z&YE;)Vd*B$S57s$TVCAqRLV&Hv}EGXkNtA_v3r|U_x6i!5h`&o-g0`oqjt&5eD;P$M=cz?(^!6me2H@{T`|SI_3VQ!v(lyCwsNl1T$Ri@ zZ-wG@1CG`6wm$xJJFw|y$4%>Y+1we|&pi86@AFGsJvefT$k*<5|7+x;9`il0d$IKM ed;d52jBE_=<)e7cO7O1%l|r7belF{r5}E*Gpu@ia diff --git a/src/main/res/drawable/tea_icn_addcal_gray.png b/src/main/res/drawable/tea_icn_addcal_gray.png deleted file mode 100644 index ca4649da3551311110b2e187e3acbc65b7b8d3e3..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1263 zcmeAS@N?(olHy`uVBq!ia0vp^A|TAc1|)ksWqE;=WQl7;NpOBzNqJ&XDuZK6ep0G} zXKrG8YEWuoN@d~6R2v2cW|hp4h>{3jAFJg2T)jk)8oi3#0-$aN1{?c|g2d$P)DnfH z)bz|eTc!8A_bVx6rr0WloBA5~7C5J7WO`H;r3P2|g(O#HCtIc{+1n}DR9FEG$W1Lt zRH(?!$t$+1uvG$^YXxM3g!Ppaz)DK8ZIvL7itr6kaLzAERWQ{v&`mZlGgL4$(K9qL zur#sMQ7|$vG|)FR(l;>IH8ij?HMcS_RDc2{plwAdX;wilZcw{`JX@uVl9B=|ef{$C za=mh6z5JqdeM3u2OML?)eIp}XpbFjM%Dj@q3f;V7Wta&rsl~}fnFS@8`FRQ;6BCp2 zOG|8(fG&l2A-4c-Y+f-mn1BJMUy)d#Z>VPg@)As;uP=V3xw&xF#U(+h2=`(&xHzP; zAXPsowK%`DC>a=WY04n03ap%qQWHz^i$e1Ab6}wukda@KU!0L&px_*As%NO+o0y!L z2ND76@b$Iw%quQQ%u7!7bg@+enxU7OnPTN;Xkg@GW^Qb0YG7e#=xXF-Y~kW$WNGPY z>SpQcW@rf0>yn>bnwy$e0@Is<&})KIFDNnO765H_NiE7OOHFYr%Fk5*d)g`!i(6bR z%pFZkfwtpx3q)@UZnxmps}FRHJ}7FDq8cUyOg|tdJmCU4@T8xb2Tbopz=R#Zy|I~r zficn3#WAGf)|n~Z+AfI_$DbRBdFU-wQHpo?#Hvw!GxFxb#W^>$%=EO)W^LTEdCFX) zr7mG+U9*lxc$np#bvpL-hwaz!<(GG!)Uo;c+H(5$Klh)P#U1~=$H#Q7T5#&=U-_SY z?%C-n(GvNCg)ZEeNcB5hY4UUbb_c!nCSo14E za@!@2caFw2nwu6>uBw*2C!F1J_mFnYk09Qv-_IOpt8w{h98%fLA--UeN<@>YM5D6= z-$&N9E4_`|ubmXj==kvU!m@1j-UYoUC%Zj6ZvSgf=~q6nuXceKye_b=y`XuY@$H4h zzlAfJ?wR;*NnicUSf1iK8Ahn(U id!qi_`ue1LZUY9C838wMUbbfpUXO@geCwJnZc|8 diff --git a/src/main/res/layout-land/date_time_picker_no_shortcuts.xml b/src/main/res/layout-land/date_time_picker_no_shortcuts.xml index ec6a190e2..82a2dec6c 100644 --- a/src/main/res/layout-land/date_time_picker_no_shortcuts.xml +++ b/src/main/res/layout-land/date_time_picker_no_shortcuts.xml @@ -19,7 +19,6 @@ android:layout_width="fill_parent" android:layout_height="fill_parent"> diff --git a/src/main/res/layout/control_set_gcal_display.xml b/src/main/res/layout/control_set_gcal_display.xml index 06854f07d..b14e60f91 100644 --- a/src/main/res/layout/control_set_gcal_display.xml +++ b/src/main/res/layout/control_set_gcal_display.xml @@ -1,41 +1,44 @@ - - - - - - - - - - + + + + + + + + + + + + diff --git a/src/main/res/layout/date_time_picker_no_shortcuts.xml b/src/main/res/layout/date_time_picker_no_shortcuts.xml index 1c066bb07..41999d3e6 100644 --- a/src/main/res/layout/date_time_picker_no_shortcuts.xml +++ b/src/main/res/layout/date_time_picker_no_shortcuts.xml @@ -57,11 +57,6 @@ android:layout_height="1px" android:layout_marginTop="1dip" android:background="?android:attr/listDivider" /> - diff --git a/src/main/res/values/attrs.xml b/src/main/res/values/attrs.xml index 390702e5b..63fb250e6 100644 --- a/src/main/res/values/attrs.xml +++ b/src/main/res/values/attrs.xml @@ -47,9 +47,9 @@ + - diff --git a/src/main/res/values/keys.xml b/src/main/res/values/keys.xml index 0a453783b..d8a839870 100644 --- a/src/main/res/values/keys.xml +++ b/src/main/res/values/keys.xml @@ -227,15 +227,17 @@ default_calendar_id - @string/TEA_control_when - @string/TEA_control_importance - @string/TEA_control_lists - @string/TEA_control_notes - @string/TEA_control_files + @string/TEA_control_when + @string/TEA_control_repeat + @string/TEA_control_importance + @string/TEA_control_lists + @string/TEA_control_notes + @string/TEA_control_files @string/TEA_hideUntil_label - @string/TEA_control_reminders - @string/TEA_control_timer - @string/TEA_control_hidden_section + @string/TEA_control_reminders + @string/TEA_control_timer + @string/TEA_control_gcal + @string/TEA_control_hidden_section use_dark_theme @@ -255,16 +257,18 @@ TEA_ctrl_reminders_pref TEA_ctrl_timer_pref TEA_ctrl_share_pref + TEA_ctrl_gcal @string/TEA_ctrl_when_pref @string/TEA_ctrl_repeat_pref @string/TEA_ctrl_importance_pref @string/TEA_ctrl_lists_pref - @string/TEA_ctrl_notes_pref @string/TEA_ctrl_files_pref - @string/TEA_ctrl_hide_until_pref @string/TEA_ctrl_reminders_pref + @string/TEA_ctrl_notes_pref + @string/TEA_ctrl_hide_until_pref + @string/TEA_ctrl_gcal @string/TEA_ctrl_timer_pref @string/TEA_ctrl_hide_section_pref diff --git a/src/main/res/values/strings-core.xml b/src/main/res/values/strings-core.xml index 8695747a4..fd7163737 100644 --- a/src/main/res/values/strings-core.xml +++ b/src/main/res/values/strings-core.xml @@ -259,6 +259,8 @@ When + Repeat + Calendar Priority diff --git a/src/main/res/values/styles.xml b/src/main/res/values/styles.xml index 87b06a9f9..1338677ea 100644 --- a/src/main/res/values/styles.xml +++ b/src/main/res/values/styles.xml @@ -24,7 +24,6 @@ @drawable/ic_action_mic @drawable/ic_action_search @drawable/ic_action_gear - @drawable/tea_icn_addcal @drawable/ic_up @@ -66,6 +65,7 @@ @drawable/ic_action_bell @drawable/ic_action_alarm @drawable/ic_action_reload + @drawable/ic_action_calendar_month