From 7d06f46fc4d40354efece11dda390a5241e2da88 Mon Sep 17 00:00:00 2001 From: Sam Bosley Date: Tue, 24 Jan 2012 14:34:35 -0800 Subject: [PATCH] Fixed some bugs with quickadd, adjusted landscape layout weights --- .../todoroo/astrid/actfm/TagViewActivity.java | 7 ------- .../astrid/actfm/TagViewWrapperActivity.java | 15 --------------- .../task_list_wrapper_activity.xml | 2 +- .../astrid/activity/TaskListActivity.java | 16 +++------------- 4 files changed, 4 insertions(+), 36 deletions(-) delete mode 100644 astrid/plugin-src/com/todoroo/astrid/actfm/TagViewWrapperActivity.java diff --git a/astrid/plugin-src/com/todoroo/astrid/actfm/TagViewActivity.java b/astrid/plugin-src/com/todoroo/astrid/actfm/TagViewActivity.java index e3cf56945..eee8f1555 100644 --- a/astrid/plugin-src/com/todoroo/astrid/actfm/TagViewActivity.java +++ b/astrid/plugin-src/com/todoroo/astrid/actfm/TagViewActivity.java @@ -358,13 +358,6 @@ public class TagViewActivity extends TaskListActivity { return intent; } - @Override - protected Intent getOnLongClickQuickAddIntent(Task t) { - Intent intent = super.getOnClickQuickAddIntent(t); - // Customize extras - return intent; - } - private void resetAssignedFilter() { currentId = -1; filter = originalFilter; diff --git a/astrid/plugin-src/com/todoroo/astrid/actfm/TagViewWrapperActivity.java b/astrid/plugin-src/com/todoroo/astrid/actfm/TagViewWrapperActivity.java deleted file mode 100644 index af3b24fcb..000000000 --- a/astrid/plugin-src/com/todoroo/astrid/actfm/TagViewWrapperActivity.java +++ /dev/null @@ -1,15 +0,0 @@ -package com.todoroo.astrid.actfm; - -import android.os.Bundle; - -import com.todoroo.astrid.activity.TaskListWrapperActivity; - -public class TagViewWrapperActivity extends TaskListWrapperActivity { - /** - * @see android.app.Activity#onCreate(Bundle) - */ - @Override - protected void onCreate(Bundle savedInstanceState) { - super.onCreate(savedInstanceState); - } -} diff --git a/astrid/res/layout-large-land/task_list_wrapper_activity.xml b/astrid/res/layout-large-land/task_list_wrapper_activity.xml index 78f34d5df..645d6165c 100644 --- a/astrid/res/layout-large-land/task_list_wrapper_activity.xml +++ b/astrid/res/layout-large-land/task_list_wrapper_activity.xml @@ -9,7 +9,7 @@ diff --git a/astrid/src/com/todoroo/astrid/activity/TaskListActivity.java b/astrid/src/com/todoroo/astrid/activity/TaskListActivity.java index 65f2ff774..2f9505532 100644 --- a/astrid/src/com/todoroo/astrid/activity/TaskListActivity.java +++ b/astrid/src/com/todoroo/astrid/activity/TaskListActivity.java @@ -495,9 +495,7 @@ public class TaskListActivity extends ListFragment implements OnScrollListener, public void onClick(View v) { Task task = quickAddTask(quickAddBox.getText().toString(), true); if(task != null && task.getValue(Task.TITLE).length() == 0) { - Intent intent = getOnClickQuickAddIntent(task); - startActivityForResult(intent, ACTIVITY_EDIT_TASK); - transitionForTaskEdit(); + mListener.onTaskListItemClicked(task.getId()); } } }); @@ -517,9 +515,8 @@ public class TaskListActivity extends ListFragment implements OnScrollListener, Task task = quickAddTask(quickAddBox.getText().toString(), false); if(task == null) return true; - Intent intent = getOnLongClickQuickAddIntent(task); - startActivityForResult(intent, ACTIVITY_EDIT_TASK); - transitionForTaskEdit(); + + mListener.onTaskListItemClicked(task.getId()); return true; } }); @@ -565,13 +562,6 @@ public class TaskListActivity extends ListFragment implements OnScrollListener, return intent; } - protected Intent getOnLongClickQuickAddIntent(Task t) { - Intent intent = new Intent(getActivity(), TaskEditWrapperActivity.class); - intent.putExtra(TaskEditActivity.TOKEN_ID, t.getId()); - intent.putExtra(TOKEN_FILTER, filter); - return intent; - } - public void transitionForTaskEdit() { AndroidUtilities.callOverridePendingTransition(getActivity(), R.anim.slide_left_in, R.anim.slide_left_out); }