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

Fix swipe left, and now have UI feedback when swiping left and right

Browse Source
pull/14/head
Tim Su 14 years ago
parent 311ea3b8b1
commit 07d6a84f4a
4 changed files with 48 additions and 26 deletions
Show Stats Download Patch File Download Diff File

9
astrid/plugin-src/com/todoroo/astrid/subtasks/SubtasksListFragment.java
Unescape Escape View File

@ -73,7 +73,8 @@ public class SubtasksListFragment extends TaskListFragment {
unregisterForContextMenu(getListView()); unregisterForContextMenu(getListView());
} }
public Property<?>[] getProperties() { @Override
public Property<?>[] taskProperties() {
ArrayList<Property<?>> properties = new ArrayList<Property<?>>(Arrays.asList(TaskAdapter.PROPERTIES)); ArrayList<Property<?>> properties = new ArrayList<Property<?>>(Arrays.asList(TaskAdapter.PROPERTIES));
properties.add(SubtasksMetadata.INDENT); properties.add(SubtasksMetadata.INDENT);
return properties.toArray(new Property<?>[properties.size()]); return properties.toArray(new Property<?>[properties.size()]);
@ -125,13 +126,13 @@ public class SubtasksListFragment extends TaskListFragment {
private final GrabberClickListener rowClickListener = new GrabberClickListener() { private final GrabberClickListener rowClickListener = new GrabberClickListener() {
@Override @Override
public void onLongClick(final View v) { public void onLongClick(final View v) {
System.err.println(v); registerForContextMenu(getListView());
getListView().showContextMenuForChild(v); getListView().showContextMenuForChild(v);
unregisterForContextMenu(getListView());
} }
@Override @Override
public void onClick(View v) { public void onClick(View v) {
System.err.println(v);
((DraggableTaskAdapter) taskAdapter).getListener().onClick(v); ((DraggableTaskAdapter) taskAdapter).getListener().onClick(v);
} }
}; };
@ -167,7 +168,7 @@ public class SubtasksListFragment extends TaskListFragment {
view.getLayoutParams().height = Math.round(45 * metrics.density); view.getLayoutParams().height = Math.round(45 * metrics.density);
ViewHolder vh = (ViewHolder) view.getTag(); ViewHolder vh = (ViewHolder) view.getTag();
int indent = vh.task.getValue(SubtasksMetadata.INDENT); int indent = vh.task.getValue(SubtasksMetadata.INDENT);
vh.rowBody.setPadding(Math.round(indent * 10 * metrics.density), 0, 0, 0); vh.rowBody.setPadding(Math.round(indent * 20 * metrics.density), 0, 0, 0);
} }
@Override @Override

3
astrid/src/com/todoroo/astrid/activity/DraggableTaskListFragment.java
Unescape Escape View File

@ -66,7 +66,8 @@ public class DraggableTaskListFragment extends TaskListFragment {
// --- task adapter // --- task adapter
public Property<?>[] getProperties() { @Override
public Property<?>[] taskProperties() {
ArrayList<Property<?>> properties = new ArrayList<Property<?>>(Arrays.asList(TaskAdapter.PROPERTIES)); ArrayList<Property<?>> properties = new ArrayList<Property<?>>(Arrays.asList(TaskAdapter.PROPERTIES));
if(getIndentProperty() != null) if(getIndentProperty() != null)
properties.add(getIndentProperty()); properties.add(getIndentProperty());

9
astrid/src/com/todoroo/astrid/activity/TaskListFragment.java
Unescape Escape View File

@ -45,6 +45,7 @@ import android.widget.TextView;
import com.crittercism.NewFeedbackSpringboardActivity; import com.crittercism.NewFeedbackSpringboardActivity;
import com.timsu.astrid.R; import com.timsu.astrid.R;
import com.todoroo.andlib.data.Property;
import com.todoroo.andlib.data.TodorooCursor; import com.todoroo.andlib.data.TodorooCursor;
import com.todoroo.andlib.service.Autowired; import com.todoroo.andlib.service.Autowired;
import com.todoroo.andlib.service.ContextManager; import com.todoroo.andlib.service.ContextManager;
@ -791,7 +792,7 @@ public class TaskListFragment extends ListFragment implements OnScrollListener,
// perform query // perform query
TodorooCursor<Task> currentCursor = taskService.fetchFiltered( TodorooCursor<Task> currentCursor = taskService.fetchFiltered(
sqlQueryTemplate.get(), null, TaskAdapter.PROPERTIES); sqlQueryTemplate.get(), null, taskProperties());
// set up list adapters // set up list adapters
taskAdapter = createTaskAdapter(currentCursor); taskAdapter = createTaskAdapter(currentCursor);
@ -804,6 +805,10 @@ public class TaskListFragment extends ListFragment implements OnScrollListener,
loadTaskListContent(true); loadTaskListContent(true);
} }
protected Property<?>[] taskProperties() {
return TaskAdapter.PROPERTIES;
}
public Filter getFilter() { public Filter getFilter() {
return filter; return filter;
} }
@ -835,7 +840,7 @@ public class TaskListFragment extends ListFragment implements OnScrollListener,
"WHERE " + TaskCriteria.byId(withCustomId) + " OR ")); "WHERE " + TaskCriteria.byId(withCustomId) + " OR "));
currentCursor = taskService.fetchFiltered(sqlQueryTemplate.get(), null, currentCursor = taskService.fetchFiltered(sqlQueryTemplate.get(), null,
TaskAdapter.PROPERTIES); taskProperties());
getListView().setFilterText(""); getListView().setFilterText("");
taskAdapter.changeCursor(currentCursor); taskAdapter.changeCursor(currentCursor);

51
astrid/src/com/todoroo/astrid/ui/DraggableListView.java
Unescape Escape View File

@ -21,6 +21,7 @@ import android.content.Context;
import android.content.res.TypedArray; import android.content.res.TypedArray;
import android.graphics.Bitmap; import android.graphics.Bitmap;
import android.graphics.PixelFormat; import android.graphics.PixelFormat;
import android.graphics.Point;
import android.graphics.Rect; import android.graphics.Rect;
import android.os.Vibrator; import android.os.Vibrator;
import android.util.AttributeSet; import android.util.AttributeSet;
@ -43,9 +44,9 @@ import com.timsu.astrid.R;
public class DraggableListView extends ListView { public class DraggableListView extends ListView {
private static final int SWIPE_THRESHOLD = 20; private static final int SWIPE_THRESHOLD = 40;
private static final int MOVEMENT_THRESHOLD = 10; private static final int MOVEMENT_THRESHOLD = 30;
// --- drag status // --- drag status
private float mTouchStartX, mTouchCurrentX, mTouchStartY, mTouchCurrentY; private float mTouchStartX, mTouchCurrentX, mTouchStartY, mTouchCurrentY;
@ -53,8 +54,8 @@ public class DraggableListView extends ListView {
private int mDragPos; // which item is being dragged private int mDragPos; // which item is being dragged
private int mFirstDragPos; // where was the dragged item originally private int mFirstDragPos; // where was the dragged item originally
private int mDragPoint; // at what offset inside the item did the user grab it private Point mDragPoint; // at what offset inside the item did the user grab it
private int mCoordOffset; // the difference between screen coordinates and coordinates in this view private Point mCoordOffset; // the difference between screen coordinates and coordinates in this view
// --- drag drawing // --- drag drawing
private ImageView mDragView; private ImageView mDragView;
@ -102,7 +103,7 @@ public class DraggableListView extends ListView {
a.recycle(); a.recycle();
} }
setSelector(null); setSelector(R.drawable.none);
} }
protected boolean isDraggableRow(@SuppressWarnings("unused") View view) { protected boolean isDraggableRow(@SuppressWarnings("unused") View view) {
@ -127,7 +128,7 @@ public class DraggableListView extends ListView {
} }
private int getItemForPosition(int y) { private int getItemForPosition(int y) {
int adjustedy = y - mDragPoint - (mItemHeightNormal / 2); int adjustedy = y - mDragPoint.y - (mItemHeightNormal / 2);
int pos = myPointToPosition(0, adjustedy); int pos = myPointToPosition(0, adjustedy);
if (pos >= 0) { if (pos >= 0) {
if (pos <= mFirstDragPos) { if (pos <= mFirstDragPos) {
@ -250,9 +251,20 @@ public class DraggableListView extends ListView {
if(mDragging) if(mDragging)
stopDragging(); stopDragging();
else if (dragThread != null && mClickListener != null) else {
if (dragThread != null && mClickListener != null)
mClickListener.onClick(viewAtPosition()); mClickListener.onClick(viewAtPosition());
else if (mSwipeListener != null &&
Math.abs(mTouchCurrentY - mTouchStartY) < MOVEMENT_THRESHOLD) {
int dragPos = pointToPosition((int)mTouchCurrentX, (int)mTouchCurrentY);
if (mTouchCurrentX > mTouchStartX + SWIPE_THRESHOLD)
mSwipeListener.swipeRight(dragPos);
else if (mTouchCurrentX < mTouchStartX - SWIPE_THRESHOLD)
mSwipeListener.swipeLeft(dragPos);
}
}
if(dragThread != null) { if(dragThread != null) {
dragThread.interrupt(); dragThread.interrupt();
dragThread = null; dragThread = null;
@ -309,10 +321,8 @@ public class DraggableListView extends ListView {
public void run() { public void run() {
try { try {
System.err.println("<<< commence fire");
Thread.sleep(300L); Thread.sleep(300L);
System.err.println("<<< initiate drag!");
post(new Runnable() { post(new Runnable() {
@Override @Override
public void run() { public void run() {
@ -321,18 +331,17 @@ public class DraggableListView extends ListView {
}); });
Thread.sleep(1000L); Thread.sleep(1000L);
System.err.println("<<< me love you long time!");
post(new Runnable() { post(new Runnable() {
public void run() { public void run() {
stopDragging(); stopDragging();
dragThread = null;
mClickListener.onLongClick(viewAtPosition()); mClickListener.onLongClick(viewAtPosition());
} }
}); });
} catch (InterruptedException e) { } catch (InterruptedException e) {
// bye! // bye!
System.err.println("<<< drag interrupted");
} }
} }
}; };
@ -353,8 +362,8 @@ public class DraggableListView extends ListView {
if(!isDraggableRow(item)) if(!isDraggableRow(item))
return false; return false;
mDragPoint = y - item.getTop(); mDragPoint = new Point(x - item.getLeft(), y - item.getTop());
mCoordOffset = ((int) ev.getRawY()) - y; mCoordOffset = new Point((int)ev.getRawX() - x, (int)ev.getRawY() - y);
item.setDrawingCacheEnabled(true); item.setDrawingCacheEnabled(true);
@ -386,7 +395,7 @@ public class DraggableListView extends ListView {
mWindowParams = new WindowManager.LayoutParams(); mWindowParams = new WindowManager.LayoutParams();
mWindowParams.gravity = Gravity.TOP | Gravity.LEFT; mWindowParams.gravity = Gravity.TOP | Gravity.LEFT;
mWindowParams.x = x; mWindowParams.x = x;
mWindowParams.y = y - mDragPoint + mCoordOffset; mWindowParams.y = y - mDragPoint.y + mCoordOffset.y;
mWindowParams.height = WindowManager.LayoutParams.WRAP_CONTENT; mWindowParams.height = WindowManager.LayoutParams.WRAP_CONTENT;
mWindowParams.width = WindowManager.LayoutParams.WRAP_CONTENT; mWindowParams.width = WindowManager.LayoutParams.WRAP_CONTENT;
@ -413,7 +422,15 @@ public class DraggableListView extends ListView {
int x = (int) ev.getX(); int x = (int) ev.getX();
int y = (int) ev.getY(); int y = (int) ev.getY();
mWindowParams.y = y - mDragPoint + mCoordOffset; mWindowParams.y = y - mDragPoint.y + mCoordOffset.y;
if (x > mTouchStartX + SWIPE_THRESHOLD)
mDragView.setPadding(30, 1, 0, 1);
else if (x < mTouchStartX - SWIPE_THRESHOLD)
mDragView.setPadding(-30, 1, 0, 1);
else
mDragView.setPadding(0, 0, 0, 0);
mWindowManager.updateViewLayout(mDragView, mWindowParams); mWindowManager.updateViewLayout(mDragView, mWindowParams);
int itemnum = getItemForPosition(y); int itemnum = getItemForPosition(y);
@ -470,11 +487,9 @@ public class DraggableListView extends ListView {
if(mDragging) { if(mDragging) {
if (mSwipeListener != null && mDragPos == mFirstDragPos) { if (mSwipeListener != null && mDragPos == mFirstDragPos) {
System.err.format("in swipe consideration - %.2f vs %.2f\n",
mTouchCurrentX , mTouchStartX);
if (mTouchCurrentX > mTouchStartX + SWIPE_THRESHOLD) if (mTouchCurrentX > mTouchStartX + SWIPE_THRESHOLD)
mSwipeListener.swipeRight(mFirstDragPos); mSwipeListener.swipeRight(mFirstDragPos);
else if (mTouchStartX < mTouchStartX - SWIPE_THRESHOLD) else if (mTouchCurrentX < mTouchStartX - SWIPE_THRESHOLD)
mSwipeListener.swipeLeft(mFirstDragPos); mSwipeListener.swipeLeft(mFirstDragPos);
} else if(mDropListener != null && mDragPos != mFirstDragPos && } else if(mDropListener != null && mDragPos != mFirstDragPos &&
mDragPos >= 0 && mDragPos < getCount()) { mDragPos >= 0 && mDragPos < getCount()) {

Write Preview
Loading…
Cancel
Save