diff --git a/astrid/common-src/com/commonsware/cwac/tlv/TouchListView.java b/astrid/common-src/com/commonsware/cwac/tlv/TouchListView.java index 61ae83a6e..45c2a1722 100644 --- a/astrid/common-src/com/commonsware/cwac/tlv/TouchListView.java +++ b/astrid/common-src/com/commonsware/cwac/tlv/TouchListView.java @@ -346,7 +346,7 @@ public class TouchListView extends ListView { v.setImageBitmap(bm); mDragBitmap = bm; - mWindowManager = (WindowManager)getContext().getSystemService("window"); + mWindowManager = (WindowManager)getContext().getSystemService("window"); //$NON-NLS-1$ mWindowManager.addView(v, mWindowParams); mDragView = v; } @@ -373,7 +373,7 @@ public class TouchListView extends ListView { private void stopDragging() { if (mDragView != null) { - WindowManager wm = (WindowManager)getContext().getSystemService("window"); + WindowManager wm = (WindowManager)getContext().getSystemService("window"); //$NON-NLS-1$ wm.removeView(mDragView); mDragView.setImageDrawable(null); mDragView = null; diff --git a/astrid/plugin-src/com/todoroo/astrid/gtasks/GtasksListActivity.java b/astrid/plugin-src/com/todoroo/astrid/gtasks/GtasksListActivity.java index 263429577..3572042c7 100644 --- a/astrid/plugin-src/com/todoroo/astrid/gtasks/GtasksListActivity.java +++ b/astrid/plugin-src/com/todoroo/astrid/gtasks/GtasksListActivity.java @@ -53,7 +53,9 @@ public class GtasksListActivity extends DraggableTaskListActivity { private final TouchListView.DropListener dropListener = new DropListener() { @Override public void drop(int from, int to) { - // meep + long targetTaskId = taskAdapter.getItemId(from); + gtasksTaskListUpdater.move(listId, targetTaskId, to - from); + loadTaskListContent(true); } }; diff --git a/astrid/plugin-src/com/todoroo/astrid/gtasks/GtasksTaskListUpdater.java b/astrid/plugin-src/com/todoroo/astrid/gtasks/GtasksTaskListUpdater.java index 56f00bf11..30a463343 100644 --- a/astrid/plugin-src/com/todoroo/astrid/gtasks/GtasksTaskListUpdater.java +++ b/astrid/plugin-src/com/todoroo/astrid/gtasks/GtasksTaskListUpdater.java @@ -6,11 +6,9 @@ import java.util.concurrent.atomic.AtomicInteger; import java.util.concurrent.atomic.AtomicLong; import android.text.TextUtils; -import android.widget.Toast; import com.todoroo.andlib.data.TodorooCursor; import com.todoroo.andlib.service.Autowired; -import com.todoroo.andlib.service.ContextManager; import com.todoroo.andlib.service.DependencyInjectionService; import com.todoroo.andlib.utility.DateUtilities; import com.todoroo.astrid.api.Filter; @@ -79,7 +77,6 @@ public class GtasksTaskListUpdater { // if indenting is warranted, indent me and my children if(indent + delta <= previousIndent.get() + 1 && indent + delta >= 0) { targetTaskIndent.set(indent); - Toast.makeText(ContextManager.getContext(), "indent: " + (indent + delta), Toast.LENGTH_SHORT).show(); metadata.setValue(GtasksMetadata.INDENT, indent + delta); if(delta > 0) metadata.setValue(GtasksMetadata.PARENT_TASK, previousTask.get()); @@ -115,7 +112,7 @@ public class GtasksTaskListUpdater { * if moving up and first task in list or moving down and last, * indents to same as task that we swapped with. * - * @param delta -1 or 1 + * @param delta # of positions to move * */ public void move(String listId, final long targetTaskId, final int delta) { diff --git a/astrid/res/drawable/grabber.png b/astrid/res/drawable/grabber.png index 9169ae57b..d31a62d2f 100644 Binary files a/astrid/res/drawable/grabber.png and b/astrid/res/drawable/grabber.png differ