archive
/
tasks
mirror of https://github.com/tasks/tasks
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fixed several issues with the title only mode

Browse Source
pull/14/head
Sam Bosley 12 years ago
parent 0e33c93a5d
commit 75da01e646
1 changed files with 46 additions and 47 deletions
Show Stats Download Patch File Download Diff File

93
astrid/src/com/todoroo/astrid/adapter/TaskAdapter.java
Unescape Escape View File

@ -375,8 +375,7 @@ public class TaskAdapter extends CursorAdapter implements Filterable {
viewHolder.details1.setTag(viewHolder); viewHolder.details1.setTag(viewHolder);
// add UI component listeners // add UI component listeners
if (!titleOnlyLayout) addListeners(view);
addListeners(view);
return view; return view;
} }
@ -397,8 +396,7 @@ public class TaskAdapter extends CursorAdapter implements Filterable {
task.readFromCursor(cursor); task.readFromCursor(cursor);
setFieldContentsAndVisibility(view); setFieldContentsAndVisibility(view);
if (!titleOnlyLayout) setTaskAppearance(viewHolder, task);
setTaskAppearance(viewHolder, task);
} }
/** /**
@ -457,7 +455,6 @@ public class TaskAdapter extends CursorAdapter implements Filterable {
} }
if (titleOnlyLayout) { if (titleOnlyLayout) {
setupCompleteBox(viewHolder);
return; return;
} }
@ -1099,9 +1096,6 @@ public class TaskAdapter extends CursorAdapter implements Filterable {
} }
boolean state = task.isCompleted(); boolean state = task.isCompleted();
setupDueDateAndTags(viewHolder, task);
TextView name = viewHolder.nameView; TextView name = viewHolder.nameView;
if(state) { if(state) {
name.setPaintFlags(name.getPaintFlags() | Paint.STRIKE_THRU_TEXT_FLAG); name.setPaintFlags(name.getPaintFlags() | Paint.STRIKE_THRU_TEXT_FLAG);
@ -1111,46 +1105,51 @@ public class TaskAdapter extends CursorAdapter implements Filterable {
name.setTextAppearance(activity, R.style.TextAppearance_TAd_ItemTitle); name.setTextAppearance(activity, R.style.TextAppearance_TAd_ItemTitle);
} }
name.setTextSize(fontSize); name.setTextSize(fontSize);
float detailTextSize = Math.max(10, fontSize * 14 / 20);
if(viewHolder.details1 != null)
viewHolder.details1.setTextSize(detailTextSize);
if(viewHolder.details2 != null)
viewHolder.details2.setTextSize(detailTextSize);
if(viewHolder.dueDate != null) {
viewHolder.dueDate.setTextSize(detailTextSize);
if (simpleLayout)
viewHolder.dueDate.setTypeface(null, 0);
}
if (viewHolder.tagsView != null) {
viewHolder.tagsView.setTextSize(detailTextSize);
if (simpleLayout)
viewHolder.tagsView.setTypeface(null, 0);
}
paint.setTextSize(detailTextSize);
// image view if (!titleOnlyLayout) {
final AsyncImageView pictureView = viewHolder.picture; { setupDueDateAndTags(viewHolder, task);
if (pictureView != null) {
if(task.getValue(Task.USER_ID) == Task.USER_ID_SELF && !viewHolder.isTaskRabbit) { float detailTextSize = Math.max(10, fontSize * 14 / 20);
pictureView.setVisibility(View.GONE); if(viewHolder.details1 != null)
if (viewHolder.pictureBorder != null) viewHolder.details1.setTextSize(detailTextSize);
viewHolder.pictureBorder.setVisibility(View.GONE); if(viewHolder.details2 != null)
} else { viewHolder.details2.setTextSize(detailTextSize);
pictureView.setVisibility(View.VISIBLE); if(viewHolder.dueDate != null) {
if (viewHolder.pictureBorder != null) viewHolder.dueDate.setTextSize(detailTextSize);
viewHolder.pictureBorder.setVisibility(View.VISIBLE); if (simpleLayout)
pictureView.setUrl(null); viewHolder.dueDate.setTypeface(null, 0);
if (viewHolder.isTaskRabbit) { }
pictureView.setDefaultImageResource(R.drawable.task_rabbit_image); if (viewHolder.tagsView != null) {
} else if(task.getValue(Task.USER_ID) == Task.USER_ID_UNASSIGNED) viewHolder.tagsView.setTextSize(detailTextSize);
pictureView.setDefaultImageResource(R.drawable.icn_anyone_transparent); if (simpleLayout)
else { viewHolder.tagsView.setTypeface(null, 0);
pictureView.setDefaultImageResource(R.drawable.icn_default_person_image); }
try { paint.setTextSize(detailTextSize);
JSONObject user = new JSONObject(task.getValue(Task.USER));
pictureView.setUrl(user.optString("picture")); //$NON-NLS-1$ // image view
} catch (JSONException e) { final AsyncImageView pictureView = viewHolder.picture; {
Log.w("astrid", "task-adapter-image", e); //$NON-NLS-1$ //$NON-NLS-2$ if (pictureView != null) {
if(task.getValue(Task.USER_ID) == Task.USER_ID_SELF && !viewHolder.isTaskRabbit) {
pictureView.setVisibility(View.GONE);
if (viewHolder.pictureBorder != null)
viewHolder.pictureBorder.setVisibility(View.GONE);
} else {
pictureView.setVisibility(View.VISIBLE);
if (viewHolder.pictureBorder != null)
viewHolder.pictureBorder.setVisibility(View.VISIBLE);
pictureView.setUrl(null);
if (viewHolder.isTaskRabbit) {
pictureView.setDefaultImageResource(R.drawable.task_rabbit_image);
} else if(task.getValue(Task.USER_ID) == Task.USER_ID_UNASSIGNED)
pictureView.setDefaultImageResource(R.drawable.icn_anyone_transparent);
else {
pictureView.setDefaultImageResource(R.drawable.icn_default_person_image);
try {
JSONObject user = new JSONObject(task.getValue(Task.USER));
pictureView.setUrl(user.optString("picture")); //$NON-NLS-1$
} catch (JSONException e) {
Log.w("astrid", "task-adapter-image", e); //$NON-NLS-1$ //$NON-NLS-2$
}
} }
} }
} }

Write Preview
Loading…
Cancel
Save