From 0029e881cb8a34e4426617a49c27202283579e29 Mon Sep 17 00:00:00 2001 From: Sam Bosley Date: Wed, 18 Jan 2012 16:06:34 -0800 Subject: [PATCH] Reorganized layout of repeat and calendar control in date dialog, updated some strings --- .../todoroo/astrid/gcal/GCalControlSet.java | 14 ++++---------- astrid/res/drawable/icn_edit_calendar.png | Bin 1213 -> 3228 bytes .../res/layout/control_set_gcal_display.xml | 13 +++---------- .../res/layout/control_set_repeat_display.xml | 15 ++++++--------- astrid/res/layout/date_time_picker.xml | 7 ++++++- astrid/res/values/strings-gcal.xml | 2 ++ astrid/res/values/strings-repeat.xml | 2 +- .../astrid/activity/TaskEditActivity.java | 4 ++-- .../todoroo/astrid/ui/DeadlineControlSet.java | 7 +++++-- 9 files changed, 29 insertions(+), 35 deletions(-) diff --git a/astrid/plugin-src/com/todoroo/astrid/gcal/GCalControlSet.java b/astrid/plugin-src/com/todoroo/astrid/gcal/GCalControlSet.java index 4314f6c0d..3cb6135c0 100644 --- a/astrid/plugin-src/com/todoroo/astrid/gcal/GCalControlSet.java +++ b/astrid/plugin-src/com/todoroo/astrid/gcal/GCalControlSet.java @@ -206,17 +206,11 @@ public class GCalControlSet extends PopupControlSet { @Override protected void refreshDisplayView() { - TextView t = (TextView) getDisplayView().findViewById(R.id.calendar_display_title); - if (hasEvent) { - t.setText(R.string.gcal_TEA_showCalendar_label); + TextView calendar = (TextView) getDisplayView().findViewById(R.id.calendar_display_which); + if (calendarSelector.getSelectedItemPosition() != 0) { + calendar.setText((String)calendarSelector.getSelectedItem()); } else { - t.setText(R.string.gcal_TEA_addToCalendar_label); - TextView calendar = (TextView) getDisplayView().findViewById(R.id.calendar_display_which); - if (calendarSelector.getSelectedItemPosition() != 0) { - calendar.setText((String)calendarSelector.getSelectedItem()); - } else { - calendar.setText(""); - } + calendar.setText(R.string.gcal_TEA_none_selected); } } diff --git a/astrid/res/drawable/icn_edit_calendar.png b/astrid/res/drawable/icn_edit_calendar.png index 90bb03c1071b956bdf62945bef099781fe52c680..7a92cc7613d33b5457a19baff30bad23e4f32137 100644 GIT binary patch delta 3225 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 LNkvXXu0mjfAcF+c delta 1174 zcmV;H1Zn%68NCURBYy)PX+uL$Nkc;*P;zf(X>4Tx0C)j~RNrgUP!#^!Wu36$i#lf! z2|j3%Ze&w*L!7p2SGvtw>Nd9_NSmf@T$;ut?S8Na*^6&F#dq-sKKTa>*@JI;k`2Zb zVfd_wB24xov!0tYO(#quxIj3VY2fn>*v^3zPn zk}iupt3^^T<$q*FvJCd{A9I89U$Cf@>6@+R5RGk`8BWoBirybNeQ=EC0M)@iUl_eX zxSeoVHshl;enQP8t`R1^=k9cAnC)enmsu$iB^)HYVpOg(Y-#2T1BsgE)9v(7lCYmN zzce#h^W*JMl?3ZC#r5_}M)bP9*V~bk2jew9rzzHdK!5(d_w{m$<$03u>$Dz?)%07E zI#%1;*nHIFV_d2 zyUbnT`nd?LE^;G|!WZ>Ld?E0@Grm4ww{M7Hr+?eN(`4(TFs=Kd|oW;726*? zo-Vh5kvrRCtvzjFx{E$mtJ`!gTOI+s53ALm&#Kkk=j4A2c%%FVsUr&3!l7R>ks%j< z0YynfK~!i3?U=z0!Y~X)_kdub&WfC*TD1(15;$P7%vF2NBpvV=rTVgg3y z5~p^4%!`9jA;uUapJ|!~09dA2Tyvf0`6OAFiz(IZa>C@Nq|=<+2@8 zt^J<36BiNyyw$rH;x-o#0ggNd*KGKIywony#Wjacl5}ZOpIVo4{{PE~O=m#_xlPYX zN3O-~oL-*`c=#c#@QChHcs#8)3U$qvN{oO~)oMT}L!psu)&Z$-d oLLsxI(&6jkz3@x^OjyeK21HA3^`$%cG5`Po07*qoM6N<$f*bxpcmMzZ diff --git a/astrid/res/layout/control_set_gcal_display.xml b/astrid/res/layout/control_set_gcal_display.xml index 2feb5ca90..c6054eef1 100644 --- a/astrid/res/layout/control_set_gcal_display.xml +++ b/astrid/res/layout/control_set_gcal_display.xml @@ -9,28 +9,21 @@ android:id="@+id/gcal_body" android:layout_width="fill_parent" android:layout_height="50dip" + android:paddingLeft="5dip" android:gravity="center_vertical"> - - - - + + Don\'t add + Add to cal... + diff --git a/astrid/res/values/strings-repeat.xml b/astrid/res/values/strings-repeat.xml index c3e7d19cb..8bc04ff36 100644 --- a/astrid/res/values/strings-repeat.xml +++ b/astrid/res/values/strings-repeat.xml @@ -19,7 +19,7 @@ Repeat Interval - Never + No Repeat Don\'t repeat diff --git a/astrid/src/com/todoroo/astrid/activity/TaskEditActivity.java b/astrid/src/com/todoroo/astrid/activity/TaskEditActivity.java index bb2f55afd..e2f4099c1 100755 --- a/astrid/src/com/todoroo/astrid/activity/TaskEditActivity.java +++ b/astrid/src/com/todoroo/astrid/activity/TaskEditActivity.java @@ -282,20 +282,20 @@ public final class TaskEditActivity extends Activity { RepeatControlSet repeatControls = new RepeatControlSet( TaskEditActivity.this, R.layout.control_set_repeat, R.layout.control_set_repeat_display, R.string.repeat_enabled); - controls.add(repeatControls); GCalControlSet gcalControl = new GCalControlSet(TaskEditActivity.this, R.layout.control_set_gcal, R.layout.control_set_gcal_display, R.string.gcal_TEA_addToCalendar_label); //The deadline control set contains the repeat controls and the calendar controls. - //NOTE: we add the gcalControl to the list AFTER the deadline control, because + //NOTE: we add the gcalControl and repeatControl to the list AFTER the deadline control, because //otherwise the correct date may not be written to the calendar event. Order matters! DeadlineControlSet deadlineControl = new DeadlineControlSet( TaskEditActivity.this, R.layout.control_set_deadline, R.layout.control_set_deadline_display, repeatControls.getDisplayView(), gcalControl.getDisplayView()); controls.add(deadlineControl); controlSetMap.put(getString(R.string.TEA_ctrl_when_pref), deadlineControl); + controls.add(repeatControls); controls.add(gcalControl); ImportanceControlSet importanceControl = new ImportanceControlSet( diff --git a/astrid/src/com/todoroo/astrid/ui/DeadlineControlSet.java b/astrid/src/com/todoroo/astrid/ui/DeadlineControlSet.java index c5f1bb89d..cba2caf6a 100644 --- a/astrid/src/com/todoroo/astrid/ui/DeadlineControlSet.java +++ b/astrid/src/com/todoroo/astrid/ui/DeadlineControlSet.java @@ -4,6 +4,7 @@ import android.app.Activity; import android.view.LayoutInflater; import android.view.View; import android.view.View.OnClickListener; +import android.view.ViewGroup.LayoutParams; import android.widget.Button; import android.widget.LinearLayout; import android.widget.TextView; @@ -20,9 +21,10 @@ public class DeadlineControlSet extends PopupControlSet { super(activity, viewLayout, displayViewLayout, 0); dateAndTimePicker = (DateAndTimePicker) getView().findViewById(R.id.date_and_time); - LinearLayout body = (LinearLayout) getView().findViewById(R.id.datetime_body); + LinearLayout extras = (LinearLayout) getView().findViewById(R.id.datetime_extras); for (View v : extraViews) { - body.addView(v); + LayoutParams lp = new LinearLayout.LayoutParams(LayoutParams.FILL_PARENT, LayoutParams.WRAP_CONTENT, 1.0f); + extras.addView(v, lp); } Button okButton = (Button) LayoutInflater.from(activity).inflate(R.layout.control_dialog_ok, null); @@ -33,6 +35,7 @@ public class DeadlineControlSet extends PopupControlSet { DialogUtilities.dismissDialog(DeadlineControlSet.this.activity, DeadlineControlSet.this.dialog); } }); + LinearLayout body = (LinearLayout) getView().findViewById(R.id.datetime_body); body.addView(okButton); }