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

Popup to ask whether to show assigned task

Browse Source
pull/14/head
Sam Bosley 13 years ago
parent 281573f88f
commit 2e9a211c23
5 changed files with 43 additions and 30 deletions
Show Stats Download Patch File Download Diff File

4
astrid/plugin-src/com/todoroo/astrid/actfm/EditPeopleControlSet.java
Unescape Escape View File

@ -697,6 +697,10 @@ public class EditPeopleControlSet extends PopupControlSet {
return assignedToMe;
}
public String getAssignedToString() {
return assignedDisplay.getText().toString();
}
/** Resume save
* @param data */
public void onActivityResult(int requestCode, int resultCode, Intent data) {

16
astrid/plugin-src/com/todoroo/astrid/core/CustomFilterExposer.java
Unescape Escape View File

@ -29,6 +29,7 @@ import com.todoroo.astrid.activity.FilterListActivity;
import com.todoroo.astrid.api.AstridApiConstants;
import com.todoroo.astrid.api.AstridFilterExposer;
import com.todoroo.astrid.api.Filter;
import com.todoroo.astrid.api.FilterCategory;
import com.todoroo.astrid.api.FilterListItem;
import com.todoroo.astrid.api.PermaSql;
import com.todoroo.astrid.dao.StoreObjectDao;
@ -67,19 +68,12 @@ public final class CustomFilterExposer extends BroadcastReceiver implements Astr
DependencyInjectionService.getInstance().inject(this);
Resources r = context.getResources();
//PendingIntent customFilterIntent = PendingIntent.getActivity(context, 0,
// new Intent(context, CustomFilterActivity.class), 0);
Filter[] savedFilters = buildSavedFilters(context, r);
FilterCategory heading = new FilterCategory(r.getString(R.string.BFE_Saved), savedFilters);
//FilterCategoryWithNewButton heading = new FilterCategoryWithNewButton(r.getString(R.string.BFE_Saved), savedFilters);
//heading.label = r.getString(R.string.tag_FEx_add_new);
//heading.intent = customFilterIntent;
//FilterListItem[] list = new FilterListItem[1];
//list[0] = heading;
return savedFilters;
FilterListItem[] list = new FilterListItem[1];
list[0] = heading;
return list;
}
private Filter[] buildSavedFilters(Context context, Resources r) {

12
astrid/res/values/strings-actfm.xml
Unescape Escape View File

@ -33,6 +33,18 @@
<!-- filter list activity: refresh tags -->
<string name="actfm_FLA_menu_refresh">Refresh Lists</string>
<!-- Title for prompt after sharing a task -->
<string name="actfm_view_task_title">View Task?</string>
<!-- Text for prompt after sharing a task -->
<string name="actfm_view_task_text">Task was sent to %s. Would you like to view it?</string>
<!-- Ok button for task view prompt -->
<string name="actfm_view_task_ok">View</string>
<!-- Cancel button for task view prompt -->
<string name="actfm_view_task_cancel">Don\'t View</string>
<!-- ================================================== TagViewActivity == -->

7
astrid/src/com/todoroo/astrid/activity/TaskEditActivity.java
Unescape Escape View File

@ -154,7 +154,9 @@ public final class TaskEditActivity extends Activity {
public static final String OVERRIDE_FINISH_ANIM = "finishAnim"; //$NON-NLS-1$
public static final String TASK_WAS_ASSIGNED = "task_assigned"; //$NON-NLS-1$
public static final String TOKEN_TASK_WAS_ASSIGNED = "task_assigned"; //$NON-NLS-1$
public static final String TOKEN_ASSIGNED_TO = "task_assigned_to"; //$NON-NLS-1$
// --- services
@ -666,7 +668,8 @@ public final class TaskEditActivity extends Activity {
if (!onPause && !cancelFinish) {
if (!peopleControlSet.isAssignedToMe()) {
Intent data = new Intent();
data.putExtra(TASK_WAS_ASSIGNED, true);
data.putExtra(TOKEN_TASK_WAS_ASSIGNED, true);
data.putExtra(TOKEN_ASSIGNED_TO, peopleControlSet.getAssignedToString());
setResult(RESULT_OK, data);
}

34
astrid/src/com/todoroo/astrid/activity/TaskListActivity.java
Unescape Escape View File

@ -69,6 +69,7 @@ import com.todoroo.andlib.sql.Functions;
import com.todoroo.andlib.sql.QueryTemplate;
import com.todoroo.andlib.utility.AndroidUtilities;
import com.todoroo.andlib.utility.DateUtilities;
import com.todoroo.andlib.utility.DialogUtilities;
import com.todoroo.andlib.utility.Preferences;
import com.todoroo.andlib.widget.GestureService;
import com.todoroo.andlib.widget.GestureService.GestureInterface;
@ -745,8 +746,9 @@ public class TaskListActivity extends ListActivity implements OnScrollListener,
}
if(resultCode != RESULT_CANCELED) {
if (data.hasExtra(TaskEditActivity.TASK_WAS_ASSIGNED) && data.getBooleanExtra(TaskEditActivity.TASK_WAS_ASSIGNED, false) && !isFilter) {
switchToAssignedFilter();
if (data.hasExtra(TaskEditActivity.TOKEN_TASK_WAS_ASSIGNED) && data.getBooleanExtra(TaskEditActivity.TOKEN_TASK_WAS_ASSIGNED, false) && !isFilter) {
String assignedTo = data.getStringExtra(TaskEditActivity.TOKEN_ASSIGNED_TO);
switchToAssignedFilter(assignedTo);
} else {
taskAdapter.flushCaches();
loadTaskListContent(true);
@ -755,23 +757,21 @@ public class TaskListActivity extends ListActivity implements OnScrollListener,
}
}
private void switchToAssignedFilter() {
new Thread(new Runnable() {
private void switchToAssignedFilter(final String assignedEmail) {
DialogInterface.OnClickListener okListener = new DialogInterface.OnClickListener() {
@Override
public void run() {
AndroidUtilities.sleepDeep(250);
runOnUiThread(new Runnable() {
@Override
public void run() {
Intent intent = new Intent(TaskListActivity.this, TaskListActivity.class);
intent.putExtra(TaskListActivity.TOKEN_FILTER, CustomFilterExposer.getAssignedByMeFilter(getResources()));
intent.putExtra(TaskListActivity.TOKEN_OVERRIDE_ANIM, true);
startActivityForResult(intent, 0);
transitionForTaskEdit();
}
});
public void onClick(DialogInterface dialog, int which) {
Intent intent = new Intent(TaskListActivity.this, TaskListActivity.class);
intent.putExtra(TaskListActivity.TOKEN_FILTER, CustomFilterExposer.getAssignedByMeFilter(getResources()));
intent.putExtra(TaskListActivity.TOKEN_OVERRIDE_ANIM, true);
startActivityForResult(intent, 0);
transitionForTaskEdit();
}
}).start();
};
DialogUtilities.okCancelCustomDialog(this,
getString(R.string.actfm_view_task_title), getString(R.string.actfm_view_task_text, assignedEmail),
R.string.actfm_view_task_ok, R.string.actfm_view_task_cancel, 0,
okListener, null);
}
public void onScroll(AbsListView view, int firstVisibleItem, int visibleItemCount,

Write Preview
Loading…
Cancel
Save