From 9a808fbb612bf4df61dafc80d58bfd363bc1ab8d Mon Sep 17 00:00:00 2001 From: Andrew Shaw Date: Fri, 27 Jan 2012 18:17:53 -0800 Subject: [PATCH] New checkboxes, timer looks better, and tasks can show full title --- .../astrid/notes/EditNoteActivity.java | 2 +- .../astrid/timers/TimerActionControlSet.java | 23 +++-- astrid/res/drawable/check_box_large_1.png | Bin 2908 -> 3068 bytes astrid/res/drawable/check_box_large_2.png | Bin 2941 -> 2957 bytes astrid/res/drawable/check_box_large_3.png | Bin 2912 -> 2957 bytes astrid/res/drawable/check_box_large_4.png | Bin 2906 -> 2955 bytes astrid/res/layout/control_set_title.xml | 82 +++++++----------- astrid/res/layout/task_adapter_row.xml | 31 ++++--- astrid/res/layout/task_edit_activity.xml | 41 ++++++--- astrid/res/values/keys.xml | 3 + .../todoroo/astrid/adapter/TaskAdapter.java | 11 ++- 11 files changed, 101 insertions(+), 92 deletions(-) diff --git a/astrid/plugin-src/com/todoroo/astrid/notes/EditNoteActivity.java b/astrid/plugin-src/com/todoroo/astrid/notes/EditNoteActivity.java index 872ea242c..b87e54784 100644 --- a/astrid/plugin-src/com/todoroo/astrid/notes/EditNoteActivity.java +++ b/astrid/plugin-src/com/todoroo/astrid/notes/EditNoteActivity.java @@ -141,7 +141,7 @@ public class EditNoteActivity extends LinearLayout implements TimerActionListene private void setUpInterface() { - timerView = commentsBar.findViewById(R.id.timer_button); + timerView = commentsBar.findViewById(R.id.timer_container); commentButton = commentsBar.findViewById(R.id.commentButton); commentField = (EditText) commentsBar.findViewById(R.id.commentField); commentField.setOnEditorActionListener(new OnEditorActionListener() { diff --git a/astrid/plugin-src/com/todoroo/astrid/timers/TimerActionControlSet.java b/astrid/plugin-src/com/todoroo/astrid/timers/TimerActionControlSet.java index 012e96651..adc7157ae 100644 --- a/astrid/plugin-src/com/todoroo/astrid/timers/TimerActionControlSet.java +++ b/astrid/plugin-src/com/todoroo/astrid/timers/TimerActionControlSet.java @@ -8,7 +8,8 @@ import android.os.SystemClock; import android.view.View; import android.view.View.OnClickListener; import android.widget.Chronometer; -import android.widget.ImageButton; +import android.widget.ImageView; +import android.widget.LinearLayout; import com.timsu.astrid.R; import com.todoroo.andlib.utility.DateUtilities; @@ -17,20 +18,19 @@ import com.todoroo.astrid.helper.TaskEditControlSet; public class TimerActionControlSet extends TaskEditControlSet { - private final ImageButton timerButton; + private final ImageView timerButton; private final Chronometer chronometer; + private final LinearLayout timerContainer; private boolean timerActive; - private final Activity activity; private Task task; private final List listeners = new LinkedList(); public TimerActionControlSet(Activity activity, View parent) { super(activity, -1); - this.activity = activity; - timerButton = (ImageButton) parent.findViewById(R.id.timer_button); - timerButton.setOnClickListener(timerListener); - - chronometer = new Chronometer(activity); + timerContainer = (LinearLayout) parent.findViewById(R.id.timer_container); + timerButton = (ImageView) parent.findViewById(R.id.timer_button); + timerContainer.setOnClickListener(timerListener); + chronometer = (Chronometer) parent.findViewById(R.id.timer); } @Override @@ -77,12 +77,9 @@ public class TimerActionControlSet extends TaskEditControlSet { if(timerActive) { drawable = R.drawable.icn_timer_stop; } else { - if (task.getValue(Task.ELAPSED_SECONDS) == 0) - drawable = R.drawable.icn_edit_timer; - else - drawable = R.drawable.icn_timer_start; + drawable = R.drawable.icn_edit_timer; } - timerButton.setBackgroundResource(drawable); + timerButton.setImageResource(drawable); long elapsed = task.getValue(Task.ELAPSED_SECONDS) * 1000L; diff --git a/astrid/res/drawable/check_box_large_1.png b/astrid/res/drawable/check_box_large_1.png index 908faa2c899ef51944aab98020c316b6c21d08d4..02f55098bd93651f2699627bd92e1726714ec059 100644 GIT binary patch delta 362 zcmca3_D5W?Gr-TCmrII^fq{Y7)59eQNE?7K2OE$KXZqQ`QE?tuJ)^p(i(^Q|tv9!< z^O_w*S|9$uC9HaT1GiaQIK$G{Q#LSdHVC#j?V)m8QoOCB{iL_b%+7ODH5{1d|owWeb?Cn|G)De{1=k za}zELy^m+mSbZ^N_sS3NSt{!PZPq*=RD8jiC;f+RO|F>FYMxDB{HhwP?&~;n|G(I> z>pUM1$Hth=vvL-`@M2(O5pcjx)a}3HZ)fwdZdZKXr=v*`LOD3l_YZ^|6fG^!56A_M5WwZ3|*={Cj6u{o|oi`Il&3v6Pjj u(&~%2{im5#D=InfNb;VW|BgYAnc>{I=;V14{u6=0$KdJe=d#Wzp$P!LHIt+O delta 201 zcmew(en(8PGr-TCmrII^fq{Y7)59eQNNWSJItLq&oHl>s?v0A`xat|&JzX3_DsH{G z;mCDBfyd?I%txM8|Bb(@w3a;GB(l_n*)+?^q8Q|y6%O%Cdz`(%k>ERLtqzyorgAGWAGyQDes5qaieut-vV@SoVH#ZM* z9WoGby*S%!(f=p@zst3j_DXBNRARiii23_luGW2*Pp+A??6jl;v+%}A3~kSyw|rtq zWfgg}?8&`~Rh(BX_kC=9>h1nC?EhD*ox%G;AN+b;yx);$?x*^_dvp&-yVTFfy@l2*4SBa8^Ki8Po6dcZ^CgRryxWj&Z*ZefHA%O6~bix(-u3_w)rQERLtq_u%qor4WXPMg1R_eRC}T=gqFT^vIyZoRpA zkhejBhxI~yicVQVSXqLO(mWrIDh4IdN%t2Ue(I9v4=p-(V=0f>sF*p~mi5#v4TkTpnNjeA!iJ;}IcmWFk7rbeZwp>>K*> z%eHN{y}XB0)lS)PLg>PLLjwjrhUYnnr#n7hylOk&_u$pJt5UYH>;7RhTB!$g?*ISH Y3_RA#N&M3ubpyE!p00i_>zopr05Ta|o&W#< diff --git a/astrid/res/drawable/check_box_large_3.png b/astrid/res/drawable/check_box_large_3.png index 5103d5c82a8aee55b8ceb7ba14c1a21eaae05e66..aab8907b1bbbb3b39c5cec551ac3464896fbd606 100644 GIT binary patch delta 249 zcmaDL)+?^q8Q|y6%O%Cdz`(%k>ERLtqzyorgAGWAGyQDes5qaieut-vV@SoVH#Z%* z4jG8JUYu>V==c5R=wfcIpvOl%tUMgHylDTO*6MWs<#~D4LL0`E2X1Rr8eaYsSZm|3 zvcc)j6dNgjQUkcp0rGBrk+?4mC7XN?TSub#T!Jl~je0~G>=qAkvkIr3W zxl0v kYXQNH%oRZA|Nqa-zh($ delta 204 zcmeAbe;}sV8Q|y6%O%Cdz`(%k>ERLtq_u%qor4WXPMg1R_eRC}T=m_aE{-7;x8B?^ zZ*_%m&BfzZci=I z^O^K&V|jU*TSKi1n{oWC@}m#lR)xKIah-YdiZ!1~8(F!A%dV+e<*2Z2(+ZiS*kfpWBjpA=1H=FS%nZ|NgnW{;coTsRWbkzLb6Mw<&;$U( C4^kWe diff --git a/astrid/res/drawable/check_box_large_4.png b/astrid/res/drawable/check_box_large_4.png index 14b203b97c4bce4865e2a47f9bf5f5632f2b2f7c..838fa734b676edd295af8f62b70772001dd1c2c8 100644 GIT binary patch delta 247 zcmca5)-A5s8Q|y6%O%Cdz`(%k>ERLtqzyorgAGWAGyQDes5qaiew(L@V@SoVH#ZM* z9WoGby*S%!(f|GD>Q{O6N^8GVV!XJB`TJY0)_s>xu9@Ve$soByP@6NM%FacbKOo#e zH7`r9clpeK*^i~=chtXJ5p!$*JvIJQ-?`@0*Ss_D$PDwH>?OMebwoFzUQ6=yk+5s$4W{64^GpLyq^9RUf@O1TaS?83{1OWb8TU!7C delta 198 zcmeAcza^&F8Q|y6%O%Cdz`(%k>ERLtq_u%qor4WXPMg1R_eRC}T=lJTT?d+2xy5uMHY6MbGj0^!=y`eOljPg;XN|01 w_wvFVdQ&MBb@0Op%b;Q#;t diff --git a/astrid/res/layout/control_set_title.xml b/astrid/res/layout/control_set_title.xml index 7736c9ad9..2f36a61c9 100644 --- a/astrid/res/layout/control_set_title.xml +++ b/astrid/res/layout/control_set_title.xml @@ -1,55 +1,33 @@ - + - - - - - - - - - - - - - - - + android:layout_height="fill_parent" + android:gravity="center_vertical" + android:button="@drawable/btn_check" /> + + + + \ No newline at end of file diff --git a/astrid/res/layout/task_adapter_row.xml b/astrid/res/layout/task_adapter_row.xml index ebe1f3efb..687f6b93f 100644 --- a/astrid/res/layout/task_adapter_row.xml +++ b/astrid/res/layout/task_adapter_row.xml @@ -6,30 +6,32 @@ android:id="@+id/rowBody" android:layout_width="fill_parent" android:layout_height="70dip" - android:paddingBottom="4dip" > + android:minHeight="70dip" + android:layout_marginTop="20dip" + android:paddingBottom="20dip" > @@ -38,18 +40,19 @@ + android:minHeight="40dip" + android:scaleType="center" + android:layout_centerVertical="true" /> @@ -60,7 +63,7 @@ android:id="@+id/title" style="@style/TextAppearance.TAd_ItemTitle" android:layout_width="fill_parent" - android:layout_height="fill_parent" + android:layout_height="wrap_content" android:layout_weight="100" android:gravity="center_vertical" android:maxLines="2" /> diff --git a/astrid/res/layout/task_edit_activity.xml b/astrid/res/layout/task_edit_activity.xml index f63f83538..ab59be39a 100644 --- a/astrid/res/layout/task_edit_activity.xml +++ b/astrid/res/layout/task_edit_activity.xml @@ -160,23 +160,42 @@ - + + + + + + - p_show_details + + p_show_full_title + p_show_decorations diff --git a/astrid/src/com/todoroo/astrid/adapter/TaskAdapter.java b/astrid/src/com/todoroo/astrid/adapter/TaskAdapter.java index 47a6f4248..c452c1b54 100644 --- a/astrid/src/com/todoroo/astrid/adapter/TaskAdapter.java +++ b/astrid/src/com/todoroo/astrid/adapter/TaskAdapter.java @@ -266,6 +266,14 @@ public class TaskAdapter extends CursorAdapter implements Filterable { viewHolder.details2 = (TextView)view.findViewById(R.id.details2); viewHolder.taskRow = (LinearLayout)view.findViewById(R.id.task_row); + + if (Preferences.getBoolean(R.string.p_default_showfulltitle_key, false)) { + viewHolder.nameView.setMaxLines(Integer.MAX_VALUE); + LayoutParams containerParams = view.getLayoutParams(); + containerParams.height = LayoutParams.WRAP_CONTENT; + view.setLayoutParams(containerParams); + } + view.setTag(viewHolder); for(int i = 0; i < view.getChildCount(); i++) view.getChildAt(i).setTag(viewHolder); @@ -330,6 +338,7 @@ public class TaskAdapter extends CursorAdapter implements Filterable { // name final TextView nameView = viewHolder.nameView; { String nameValue = task.getValue(Task.TITLE); + long hiddenUntil = task.getValue(Task.HIDE_UNTIL); if(task.getValue(Task.DELETION_DATE) > 0) nameValue = r.getString(R.string.TAd_deletedFormat, nameValue); @@ -404,7 +413,7 @@ public class TaskAdapter extends CursorAdapter implements Filterable { } if (pictureView.getVisibility() == View.VISIBLE) { checkBoxView.setVisibility(View.INVISIBLE); - viewHolder.pictureBorder.setBackgroundResource(IMPORTANCE_RESOURCES[value]); + viewHolder.pictureBorder.setBackgroundResource(IMPORTANCE_RESOURCES_LARGE[value]); } else { checkBoxView.setVisibility(View.VISIBLE); }