code cleanup, cosmetic fixes

pull/14/head
Tim Su 14 years ago
parent 329f371020
commit 218f437025

@ -4,10 +4,10 @@
android:orientation="horizontal" android:orientation="horizontal"
android:background="@android:drawable/list_selector_background" android:background="@android:drawable/list_selector_background"
android:focusable="true" android:focusable="true"
android:paddingTop="8px" android:paddingTop="6px"
android:paddingLeft="4dip" android:paddingLeft="4dip"
android:paddingRight="6dip" android:paddingRight="6dip"
android:paddingBottom="2px" android:paddingBottom="6px"
android:minHeight="56px" android:minHeight="56px"
android:layout_width="fill_parent" android:layout_width="fill_parent"
android:layout_height="wrap_content"> android:layout_height="wrap_content">
@ -32,6 +32,7 @@
<TextView android:id="@+id/title" <TextView android:id="@+id/title"
android:layout_width="fill_parent" android:layout_width="fill_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:textSize="22sp"
style="@style/TextAppearance.TAd_ItemTitle" style="@style/TextAppearance.TAd_ItemTitle"
android:gravity="center_vertical"/> android:gravity="center_vertical"/>

@ -31,7 +31,6 @@
<!-- =========================== TaskAdapter =========================== --> <!-- =========================== TaskAdapter =========================== -->
<style name="TextAppearance.TAd_ItemTitle"> <style name="TextAppearance.TAd_ItemTitle">
<item name="android:textSize">22sp</item>
</style> </style>
<style name="TextAppearance.TAd_ItemTitle_Completed" parent="TextAppearance.TAd_ItemTitle"> <style name="TextAppearance.TAd_ItemTitle_Completed" parent="TextAppearance.TAd_ItemTitle">

@ -49,6 +49,12 @@ import com.todoroo.astrid.utility.Preferences;
*/ */
public class EditPreferences extends PreferenceActivity { public class EditPreferences extends PreferenceActivity {
// --- constants
// --- instance variables
@Autowired @Autowired
TaskService taskService; // for debugging TaskService taskService; // for debugging
@ -198,13 +204,16 @@ public class EditPreferences extends PreferenceActivity {
Resources r = getResources(); Resources r = getResources();
// defaults options // defaults options
/*if(r.getString(R.string.EPr_default_urgency_key).equals(preference.getKey())) { if(r.getString(R.string.p_default_urgency_key).equals(preference.getKey())) {
updateTaskListPreference(preference, value, r, R.array.EPr_default_urgency, updateTaskListPreference(preference, value, r, R.array.EPr_default_urgency,
R.array.EPr_default_urgency_values, R.string.EPr_default_urgency_desc); R.array.EPr_default_urgency_values, R.string.EPr_default_urgency_desc);
} else if(r.getString(R.string.EPr_default_importance_key).equals(preference.getKey())) { } else if(r.getString(R.string.p_default_importance_key).equals(preference.getKey())) {
updateTaskListPreference(preference, value, r, R.array.EPr_default_importance, updateTaskListPreference(preference, value, r, R.array.EPr_default_importance,
R.array.EPr_default_importance_values, R.string.EPr_default_importance_desc); R.array.EPr_default_importance_values, R.string.EPr_default_importance_desc);
}*/ } else if(r.getString(R.string.p_default_hideUntil_key).equals(preference.getKey())) {
updateTaskListPreference(preference, value, r, R.array.EPr_default_hideUntil,
R.array.EPr_default_hideUntil_values, R.string.EPr_default_hideUntil_desc);
}
return true; return true;
} }

@ -351,6 +351,8 @@ public class TaskListActivity extends ListActivity implements OnScrollListener {
taskService.cleanup(); taskService.cleanup();
if(requestCode == ACTIVITY_EDIT_TASK && resultCode != TaskEditActivity.RESULT_CODE_DISCARDED) if(requestCode == ACTIVITY_EDIT_TASK && resultCode != TaskEditActivity.RESULT_CODE_DISCARDED)
loadTaskListContent(true); loadTaskListContent(true);
else if(requestCode == ACTIVITY_SETTINGS)
loadTaskListContent(true);
} }
public void onScroll(AbsListView view, int firstVisibleItem, int visibleItemCount, public void onScroll(AbsListView view, int firstVisibleItem, int visibleItemCount,

@ -134,7 +134,6 @@ public class TaskAdapter extends CursorAdapter {
ViewHolder viewHolder = new ViewHolder(); ViewHolder viewHolder = new ViewHolder();
viewHolder.task = new Task(); viewHolder.task = new Task();
viewHolder.nameView = (TextView)view.findViewById(R.id.title); viewHolder.nameView = (TextView)view.findViewById(R.id.title);
viewHolder.nameView.setTextSize(fontSize);
viewHolder.completeBox = (CheckBox)view.findViewById(R.id.completeBox); viewHolder.completeBox = (CheckBox)view.findViewById(R.id.completeBox);
viewHolder.dueDate = (TextView)view.findViewById(R.id.dueDate); viewHolder.dueDate = (TextView)view.findViewById(R.id.dueDate);
viewHolder.details = (LinearLayout)view.findViewById(R.id.details); viewHolder.details = (LinearLayout)view.findViewById(R.id.details);
@ -190,16 +189,6 @@ public class TaskAdapter extends CursorAdapter {
Resources r = activity.getResources(); Resources r = activity.getResources();
ViewHolder viewHolder = (ViewHolder)view.getTag(); ViewHolder viewHolder = (ViewHolder)view.getTag();
// don't bother instantiating views if we're busy
/*if(isFling) {
viewHolder.details.removeViews(2, viewHolder.details.getChildCount() - 2);
viewHolder.dueDate.setVisibility(View.INVISIBLE);
viewHolder.nameView.setText(R.string.TAd_flingText);
viewHolder.importance.setVisibility(View.INVISIBLE);
viewHolder.completeBox.setVisibility(View.INVISIBLE);
return;
}*/
// name // name
final TextView nameView = viewHolder.nameView; { final TextView nameView = viewHolder.nameView; {
String nameValue = task.getValue(Task.TITLE); String nameValue = task.getValue(Task.TITLE);
@ -410,6 +399,7 @@ public class TaskAdapter extends CursorAdapter {
name.setPaintFlags(name.getPaintFlags() & ~Paint.STRIKE_THRU_TEXT_FLAG); name.setPaintFlags(name.getPaintFlags() & ~Paint.STRIKE_THRU_TEXT_FLAG);
name.setTextAppearance(activity, R.style.TextAppearance_TAd_ItemTitle); name.setTextAppearance(activity, R.style.TextAppearance_TAd_ItemTitle);
} }
name.setTextSize(fontSize);
} }
/** /**

Loading…
Cancel
Save