diff --git a/astrid/plugin-src/com/todoroo/astrid/subtasks/AstridOrderedListFragmentHelper.java b/astrid/plugin-src/com/todoroo/astrid/subtasks/AstridOrderedListFragmentHelper.java index a7ff9ef61..4d88a2614 100644 --- a/astrid/plugin-src/com/todoroo/astrid/subtasks/AstridOrderedListFragmentHelper.java +++ b/astrid/plugin-src/com/todoroo/astrid/subtasks/AstridOrderedListFragmentHelper.java @@ -182,6 +182,8 @@ public class AstridOrderedListFragmentHelper implements OrderedListFragmen taskAdapter = new DraggableTaskAdapter(fragment, resource, cursor, sqlQueryTemplate, false, null); + getTouchListView().setItemHightNormal(taskAdapter.computeFullRowHeight()); + taskAdapter.addOnCompletedTaskListener(new OnCompletedTaskListener() { @Override public void onCompletedTask(Task item, boolean newState) { @@ -203,6 +205,11 @@ public class AstridOrderedListFragmentHelper implements OrderedListFragmen applyListeners = APPLY_LISTENERS_NONE; } + @Override + protected int computeMinRowHeight() { + return (int) (metrics.density * 40); + } + @Override protected ViewHolder getTagFromCheckBox(View v) { return (ViewHolder)((View)v.getParent()).getTag(); diff --git a/astrid/res/layout/task_list_body_subtasks.xml b/astrid/res/layout/task_list_body_subtasks.xml index a1ec7e3b6..2ec526c1e 100644 --- a/astrid/res/layout/task_list_body_subtasks.xml +++ b/astrid/res/layout/task_list_body_subtasks.xml @@ -30,8 +30,6 @@ android:layout_height="fill_parent" android:drawSelectorOnTop="false" style="@style/ListView" - - tlv:normal_height="45dip" /> diff --git a/astrid/src/com/todoroo/astrid/adapter/TaskAdapter.java b/astrid/src/com/todoroo/astrid/adapter/TaskAdapter.java index 593c00d3f..f5feec45d 100644 --- a/astrid/src/com/todoroo/astrid/adapter/TaskAdapter.java +++ b/astrid/src/com/todoroo/astrid/adapter/TaskAdapter.java @@ -259,7 +259,7 @@ public class TaskAdapter extends CursorAdapter implements Filterable { } - private int computeMinRowHeight() { + protected int computeMinRowHeight() { DisplayMetrics metrics = resources.getDisplayMetrics(); if (simpleLayout) { return (int) (metrics.density * 40); @@ -268,6 +268,11 @@ public class TaskAdapter extends CursorAdapter implements Filterable { } } + public int computeFullRowHeight() { + DisplayMetrics metrics = resources.getDisplayMetrics(); + return minRowHeight + (int) (10 * metrics.density); + } + private void startDetailThread() { if (Preferences.getBoolean(R.string.p_showNotes, false) && !simpleLayout) { detailLoader = new DetailLoaderThread(); diff --git a/astrid/src/com/todoroo/astrid/ui/DraggableListView.java b/astrid/src/com/todoroo/astrid/ui/DraggableListView.java index 60de9a3ea..4cfcb99b1 100644 --- a/astrid/src/com/todoroo/astrid/ui/DraggableListView.java +++ b/astrid/src/com/todoroo/astrid/ui/DraggableListView.java @@ -107,6 +107,10 @@ public class DraggableListView extends ListView { setSelector(R.drawable.none); } + public void setItemHightNormal(int itemHeightNormal) { + this.mItemHeightNormal = itemHeightNormal; + } + protected boolean isDraggableRow(@SuppressWarnings("unused") View view) { return true; }