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

Put task content loading into a separate thread.

Browse Source
pull/14/head
Tim Su 17 years ago
parent 959741120b
commit 833afde0a1
8 changed files with 206 additions and 106 deletions
Show Stats Download Patch File Download Diff File

2
AndroidManifest.xml
Unescape Escape View File

@ -2,7 +2,7 @@
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="com.timsu.astrid"
android:versionCode="87"
android:versionName="2.4.0">
android:versionName="2.4.1">
<meta-data android:name="com.a0soft.gphone.aTrackDog.webURL"
android:value="http://www.weloveastrid.com" />

23
res/layout/main.xml
Unescape Escape View File

@ -30,6 +30,13 @@
android:layout_width="fill_parent"
android:layout_height="fill_parent">
<TextView android:id="@+id/loading"
android:layout_height="wrap_content"
android:layout_width="fill_parent"
android:text="@string/loading"
style="@style/TextAppearance.TaskList_Task"
android:gravity="center_vertical"/>
<ListView android:id="@+id/tasklist"
android:layout_weight="1"
android:layout_width="fill_parent"
@ -39,6 +46,7 @@
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:layout_gravity="bottom"
android:visibility="gone"
android:text="@string/addtask_label"/>
</LinearLayout>
@ -49,10 +57,18 @@
android:layout_width="fill_parent"
android:layout_height="fill_parent">
<TextView android:id="@+id/loading"
android:layout_height="wrap_content"
android:layout_width="fill_parent"
android:text="@string/loading"
style="@style/TextAppearance.TaskList_Task"
android:gravity="center_vertical"/>
<ListView android:id="@+id/taglist"
android:layout_weight="1"
android:layout_width="fill_parent"
android:layout_height="wrap_content"/>
</LinearLayout>
<!-- task list w/ tag-->
@ -61,6 +77,13 @@
android:layout_width="fill_parent"
android:layout_height="fill_parent">
<TextView android:id="@+id/loading"
android:layout_height="wrap_content"
android:layout_width="fill_parent"
android:text="@string/loading"
style="@style/TextAppearance.TaskList_Task"
android:gravity="center_vertical"/>
<ListView android:id="@+id/tasklist"
android:layout_weight="1"
android:layout_width="fill_parent"

3
res/values/strings.xml
Unescape Escape View File

@ -118,7 +118,7 @@
<string name="taskList_menu_more">More</string>
<string name="taskList_menu_sync">Synchronization</string>
<string name="taskList_menu_settings">Settings</string>
<string name="taskList_menu_help">Online Help</string>
<string name="taskList_menu_help">Help (opens in Browser)</string>
<string name="taskList_menu_survey">Take Astrid\'s Survey!</string>
<string name="taskList_menu_tips">Quick Tips</string>
@ -263,6 +263,7 @@ Wish me luck!\n
<!-- Dialog Boxes -->
<skip />
<string name="loading">Loading...</string>
<string name="information_title">Information</string>
<string name="question_title">Question</string>
<string name="notify_yes">View Task</string>

9
src/com/timsu/astrid/activities/SubActivity.java
Unescape Escape View File

@ -29,7 +29,6 @@ import android.view.Menu;
import android.view.MenuItem;
import android.view.View;
import com.timsu.astrid.activities.TaskList.ActivityCode;
import com.timsu.astrid.data.tag.TagController;
import com.timsu.astrid.data.task.TaskController;
@ -40,10 +39,10 @@ import com.timsu.astrid.data.task.TaskController;
*/
abstract public class SubActivity {
private TaskList parent;
ActivityCode code;
int code;
private View view;
public SubActivity(TaskList parent, ActivityCode code, View view) {
public SubActivity(TaskList parent, int code, View view) {
this.parent = parent;
this.code = code;
this.view = view;
@ -122,13 +121,13 @@ abstract public class SubActivity {
return parent.gestureListener;
}
public void switchToActivity(ActivityCode activity, Bundle state) {
public void switchToActivity(int activity, Bundle state) {
parent.switchToActivity(activity, state);
}
// --- internal methods
protected ActivityCode getActivityCode() {
protected int getActivityCode() {
return code;
}

70
src/com/timsu/astrid/activities/TagListSubActivity.java
Unescape Escape View File

@ -21,8 +21,8 @@ package com.timsu.astrid.activities;
import java.util.Collections;
import java.util.Comparator;
import java.util.HashMap;
import java.util.LinkedList;
import java.util.List;
import java.util.Map;
import android.app.AlertDialog;
import android.content.Context;
@ -31,6 +31,7 @@ import android.content.Intent;
import android.content.res.Resources;
import android.database.Cursor;
import android.os.Bundle;
import android.os.Handler;
import android.view.ContextMenu;
import android.view.KeyEvent;
import android.view.LayoutInflater;
@ -42,13 +43,13 @@ import android.view.ContextMenu.ContextMenuInfo;
import android.view.View.OnCreateContextMenuListener;
import android.widget.AdapterView;
import android.widget.ArrayAdapter;
import android.widget.ListAdapter;
import android.widget.ListView;
import android.widget.TextView;
import android.widget.AdapterView.AdapterContextMenuInfo;
import android.widget.AdapterView.OnItemClickListener;
import com.timsu.astrid.R;
import com.timsu.astrid.activities.TaskList.ActivityCode;
import com.timsu.astrid.data.tag.TagIdentifier;
import com.timsu.astrid.data.tag.TagModelForView;
import com.timsu.astrid.data.task.TaskIdentifier;
@ -71,22 +72,33 @@ public class TagListSubActivity extends SubActivity {
private static final int CONTEXT_SHOWHIDE_ID = Menu.FIRST + 12;
private ListView listView;
private List<TagModelForView> tagArray;
private Map<Long, TaskModelForList> taskMap;
Map<TagModelForView, Integer> tagToTaskCount;
private LinkedList<TagModelForView> tagArray;
private HashMap<Long, TaskModelForList> taskMap;
HashMap<TagModelForView, Integer> tagToTaskCount;
private Handler handler;
private TextView loadingText;
private static SortMode sortMode = SortMode.SIZE;
private static boolean sortReverse = false;
public TagListSubActivity(TaskList parent, ActivityCode code, View view) {
public TagListSubActivity(TaskList parent, int code, View view) {
super(parent, code, view);
}
@Override
public void onDisplay(Bundle variables) {
listView = (ListView)findViewById(R.id.taglist);
handler = new Handler();
loadingText = (TextView)findViewById(R.id.loading);
// time to go!
new Thread(new Runnable() {
@Override
public void run() {
fillData();
}
}).start();
}
// --- stuff for sorting
@ -148,24 +160,43 @@ public class TagListSubActivity extends SubActivity {
/** Fill in the Tag List with our tags */
private void fillData() {
Resources r = getResources();
tagArray = getTagController().getAllTags(getParent());
// perform sort
sortTagArray();
handler.post(new Runnable() {
@Override
public void run() {
// set up our adapter
final TagListAdapter tagAdapter = new TagListAdapter(getParent(),
android.R.layout.simple_list_item_1, tagArray,
tagToTaskCount);
// set up ui components
setUpListUI(tagAdapter);
loadingText.setVisibility(View.GONE);
}
});
}
/** Set up list handlers and adapter. run on the UI thread */
private void setUpListUI(ListAdapter adapter) {
// set up the title
Resources r = getResources();
StringBuilder title = new StringBuilder().
append(r.getString(R.string.tagList_titlePrefix)).
append(" ").append(r.getQuantityString(R.plurals.Ntags,
tagArray.size(), tagArray.size()));
setTitle(title);
final CharSequence finalTitle = title;
handler.post(new Runnable() {
@Override
public void run() {
setTitle(finalTitle);
}
});
// set up our adapter
TagListAdapter tagAdapter = new TagListAdapter(getParent(),
android.R.layout.simple_list_item_1, tagArray);
listView.setAdapter(tagAdapter);
listView.setAdapter(adapter);
// list view listener
listView.setOnItemClickListener(new OnItemClickListener() {
@ -176,7 +207,7 @@ public class TagListSubActivity extends SubActivity {
Bundle bundle = new Bundle();
bundle.putLong(TaskListSubActivity.TAG_TOKEN, tag.getTagIdentifier().getId());
switchToActivity(ActivityCode.TASK_LIST_W_TAG, bundle);
switchToActivity(TaskList.AC_TASK_LIST_W_TAG, bundle);
}
});
@ -242,7 +273,7 @@ public class TagListSubActivity extends SubActivity {
/** Handle back button by moving to task list */
protected boolean onKeyDown(int keyCode, KeyEvent event) {
if(keyCode == KeyEvent.KEYCODE_BACK) {
switchToActivity(ActivityCode.TASK_LIST, null);
switchToActivity(TaskList.AC_TASK_LIST, null);
return true;
}
@ -316,14 +347,17 @@ public class TagListSubActivity extends SubActivity {
private List<TagModelForView> objects;
private int resource;
private LayoutInflater inflater;
private HashMap<TagModelForView, Integer> tagCount;
public TagListAdapter(Context context, int resource,
List<TagModelForView> objects) {
List<TagModelForView> objects, HashMap<TagModelForView, Integer>
tagToTaskCount) {
super(context, resource, objects);
inflater = (LayoutInflater)context.getSystemService(Context.LAYOUT_INFLATER_SERVICE);
this.objects = objects;
this.resource = resource;
this.tagCount = tagToTaskCount;
}
@Override
@ -344,9 +378,9 @@ public class TagListSubActivity extends SubActivity {
final TextView name = ((TextView)view.findViewById(android.R.id.text1));
name.setText(new StringBuilder(tag.getName()).
append(" (").append(tagToTaskCount.get(tag)).append(")"));
append(" (").append(tagCount.get(tag)).append(")"));
if(tagToTaskCount.get(tag) == 0)
if(tagCount.get(tag) == 0)
name.setTextColor(r.getColor(R.color.task_list_done));
else
name.setTextColor(r.getColor(android.R.color.white));

64
src/com/timsu/astrid/activities/TaskList.java
Unescape Escape View File

@ -53,12 +53,10 @@ import com.timsu.astrid.utilities.StartupReceiver;
*/
public class TaskList extends Activity {
/** Enum for the different pages that we can display */
public enum ActivityCode {
TASK_LIST,
TAG_LIST,
TASK_LIST_W_TAG
};
// constants for the different pages that we can display
public static final int AC_TASK_LIST = 0;
public static final int AC_TAG_LIST = 1;
public static final int AC_TASK_LIST_W_TAG = 2;
/** Bundle Key: activity code id of current activity */
private static final String LAST_ACTIVITY_TAG = "l";
@ -142,7 +140,7 @@ public class TaskList extends Activity {
// if we have no filter tag, we're not on the last task
if(getCurrentSubActivity() == taskListWTag &&
((TaskListSubActivity)taskListWTag).getFilterTag() == null) {
switchToActivity(ActivityCode.TASK_LIST, null);
switchToActivity(AC_TASK_LIST, null);
}
}
@ -150,11 +148,11 @@ public class TaskList extends Activity {
private void setupUIComponents() {
gestureDetector = new GestureDetector(new AstridGestureDetector());
viewFlipper = (ViewFlipper)findViewById(R.id.main);
taskList = new TaskListSubActivity(this, ActivityCode.TASK_LIST,
taskList = new TaskListSubActivity(this, AC_TASK_LIST,
findViewById(R.id.tasklist_layout));
tagList = new TagListSubActivity(this, ActivityCode.TAG_LIST,
tagList = new TagListSubActivity(this, AC_TAG_LIST,
findViewById(R.id.taglist_layout));
taskListWTag = new TaskListSubActivity(this, ActivityCode.TASK_LIST_W_TAG,
taskListWTag = new TaskListSubActivity(this, AC_TASK_LIST_W_TAG,
findViewById(R.id.tasklistwtag_layout));
mInAnimationForward = AnimationUtils.loadAnimation(this, R.anim.slide_left_in);
@ -185,8 +183,8 @@ public class TaskList extends Activity {
Math.abs(velocityX) > FLING_VEL_THRESHOLD) {
switch(getCurrentSubActivity().getActivityCode()) {
case TASK_LIST:
switchToActivity(ActivityCode.TAG_LIST, null);
case AC_TASK_LIST:
switchToActivity(AC_TAG_LIST, null);
return true;
default:
return false;
@ -198,11 +196,11 @@ public class TaskList extends Activity {
Math.abs(velocityX) > FLING_VEL_THRESHOLD) {
switch(getCurrentSubActivity().getActivityCode()) {
case TASK_LIST_W_TAG:
switchToActivity(ActivityCode.TAG_LIST, null);
case AC_TASK_LIST_W_TAG:
switchToActivity(AC_TAG_LIST, null);
return true;
case TAG_LIST:
switchToActivity(ActivityCode.TASK_LIST, null);
case AC_TAG_LIST:
switchToActivity(AC_TASK_LIST, null);
return true;
default:
return false;
@ -221,31 +219,31 @@ public class TaskList extends Activity {
* ====================================================================== */
/** Switches to another activity, with appropriate animation */
void switchToActivity(ActivityCode activity, Bundle variables) {
void switchToActivity(int activity, Bundle variables) {
closeOptionsMenu();
// and flip to them
switch(getCurrentSubActivity().getActivityCode()) {
case TASK_LIST:
case AC_TASK_LIST:
viewFlipper.setInAnimation(mInAnimationForward);
viewFlipper.setOutAnimation(mOutAnimationForward);
switch(activity) {
case TAG_LIST:
case AC_TAG_LIST:
viewFlipper.showNext();
break;
case TASK_LIST_W_TAG:
viewFlipper.setDisplayedChild(taskListWTag.code.ordinal());
case AC_TASK_LIST_W_TAG:
viewFlipper.setDisplayedChild(taskListWTag.code);
}
break;
case TAG_LIST:
case AC_TAG_LIST:
switch(activity) {
case TASK_LIST:
case AC_TASK_LIST:
viewFlipper.setInAnimation(mInAnimationBackward);
viewFlipper.setOutAnimation(mOutAnimationBackward);
viewFlipper.showPrevious();
break;
case TASK_LIST_W_TAG:
case AC_TASK_LIST_W_TAG:
viewFlipper.setInAnimation(mInAnimationForward);
viewFlipper.setOutAnimation(mOutAnimationForward);
viewFlipper.showNext();
@ -253,28 +251,28 @@ public class TaskList extends Activity {
}
break;
case TASK_LIST_W_TAG:
case AC_TASK_LIST_W_TAG:
viewFlipper.setInAnimation(mInAnimationBackward);
viewFlipper.setOutAnimation(mOutAnimationBackward);
switch(activity) {
case TAG_LIST:
case AC_TAG_LIST:
viewFlipper.showPrevious();
break;
case TASK_LIST:
viewFlipper.setDisplayedChild(taskList.code.ordinal());
case AC_TASK_LIST:
viewFlipper.setDisplayedChild(taskList.code);
}
break;
}
// initialize the components
switch(activity) {
case TASK_LIST:
case AC_TASK_LIST:
taskList.onDisplay(variables);
break;
case TAG_LIST:
case AC_TAG_LIST:
tagList.onDisplay(variables);
break;
case TASK_LIST_W_TAG:
case AC_TASK_LIST_W_TAG:
taskListWTag.onDisplay(variables);
}
@ -293,7 +291,7 @@ public class TaskList extends Activity {
@Override
protected void onSaveInstanceState(Bundle outState) {
super.onSaveInstanceState(outState);
outState.putInt(LAST_ACTIVITY_TAG, getCurrentSubActivity().code.ordinal());
outState.putInt(LAST_ACTIVITY_TAG, getCurrentSubActivity().code);
outState.putBundle(LAST_BUNDLE_TAG, lastActivityBundle);
}
@ -316,7 +314,7 @@ public class TaskList extends Activity {
super.onActivityResult(requestCode, resultCode, data);
if(resultCode == Constants.RESULT_GO_HOME) {
switchToActivity(ActivityCode.TASK_LIST, null);
switchToActivity(AC_TASK_LIST, null);
} else
getCurrentSubActivity().onActivityResult(requestCode, resultCode, data);
}

4
src/com/timsu/astrid/activities/TaskListAdapter.java
Unescape Escape View File

@ -339,7 +339,7 @@ public class TaskListAdapter extends ArrayAdapter<TaskModelForList> {
if(timeLeft < FULL_DATE_THRESHOLD)
label.append(DateUtilities.getDurationString(r,
(int)Math.abs(timeLeft/1000), 1));
(int)Math.abs(timeLeft), 1));
else
label.append(DateUtilities.getFormattedDate(r,
task.getDefiniteDueDate()));
@ -362,7 +362,7 @@ public class TaskListAdapter extends ArrayAdapter<TaskModelForList> {
if(timeLeft < FULL_DATE_THRESHOLD)
label.append(DateUtilities.getDurationString(r,
(int)Math.abs(timeLeft/1000), 1));
(int)Math.abs(timeLeft), 1));
else
label.append(DateUtilities.getFormattedDate(r,
task.getPreferredDueDate()));

75
src/com/timsu/astrid/activities/TaskListSubActivity.java
Unescape Escape View File

@ -32,10 +32,12 @@ import java.util.Random;
import android.app.AlertDialog;
import android.content.DialogInterface;
import android.content.Intent;
import android.content.pm.ActivityInfo;
import android.content.res.Resources;
import android.database.Cursor;
import android.net.Uri;
import android.os.Bundle;
import android.os.Handler;
import android.util.Log;
import android.view.ContextMenu;
import android.view.KeyEvent;
@ -46,9 +48,9 @@ import android.view.ContextMenu.ContextMenuInfo;
import android.view.View.OnCreateContextMenuListener;
import android.widget.Button;
import android.widget.ListView;
import android.widget.TextView;
import com.timsu.astrid.R;
import com.timsu.astrid.activities.TaskList.ActivityCode;
import com.timsu.astrid.activities.TaskListAdapter.TaskListAdapterHooks;
import com.timsu.astrid.data.tag.TagController;
import com.timsu.astrid.data.tag.TagIdentifier;
@ -109,13 +111,17 @@ public class TaskListSubActivity extends SubActivity {
private static final int CONTEXT_SORT_REVERSE = Menu.FIRST + 26;
private static final int CONTEXT_SORT_GROUP = Menu.FIRST;
// other constants
private static final int SORTFLAG_FILTERDONE = (1 << 5);
private static final int SORTFLAG_FILTERHIDDEN = (1 << 6);
private static final int HIDE_ADD_BTN_PORTRAIT = 4;
private static final int HIDE_ADD_BTN_LANDSCPE = 2;
// UI components
private ListView listView;
private Button addButton;
private View layout;
private TextView loadingText;
// other instance variables
private Map<TagIdentifier, TagModelForView> tagMap;
@ -123,6 +129,7 @@ public class TaskListSubActivity extends SubActivity {
private HashMap<TaskModelForList, LinkedList<TagModelForView>> taskTags;
private Long selectedTaskId = null;
private TaskModelForList selectedTask = null;
private Handler handler;
// display filters
private static boolean filterShowHidden = false;
@ -135,7 +142,7 @@ public class TaskListSubActivity extends SubActivity {
* ======================================================= initialization
* ====================================================================== */
public TaskListSubActivity(TaskList parent, ActivityCode code, View view) {
public TaskListSubActivity(TaskList parent, int code, View view) {
super(parent, code, view);
}
@ -158,8 +165,15 @@ public class TaskListSubActivity extends SubActivity {
}
setupUIComponents();
// time to go!
new Thread(new Runnable() {
@Override
public void run() {
loadTaskListSort();
fillData();
}
}).start();
if(variables != null && variables.containsKey(NOTIF_FLAGS_TOKEN)) {
long repeatInterval = 0;
@ -177,7 +191,10 @@ public class TaskListSubActivity extends SubActivity {
/** Initialize UI components */
public void setupUIComponents() {
handler = new Handler();
listView = (ListView)findViewById(R.id.tasklist);
loadingText = (TextView)findViewById(R.id.loading);
addButton = (Button)findViewById(R.id.addtask);
addButton.setOnClickListener(new
View.OnClickListener() {
@ -381,8 +398,6 @@ public class TaskListSubActivity extends SubActivity {
/** Fill in the Task List with our tasks */
private void fillData() {
Resources r = getResources();
// get a cursor to the task list
Cursor tasksCursor;
if(filterTag != null) {
@ -443,7 +458,6 @@ public class TaskListSubActivity extends SubActivity {
int activeTasks = taskArray.size() - completedTasks;
// sort task list
// do sort
Collections.sort(taskArray, new Comparator<TaskModelForList>() {
@Override
public int compare(TaskModelForList arg0, TaskModelForList arg1) {
@ -453,13 +467,30 @@ public class TaskListSubActivity extends SubActivity {
if(sortReverse)
Collections.reverse(taskArray);
// hide "add" button if we have a few tasks
if(taskArray.size() > 4)
handler.post(new Runnable() {
@Override
public void run() {
// hide "add" button if we have too many tasks
int threshold = HIDE_ADD_BTN_PORTRAIT;
if(getParent().getWindowManager().getDefaultDisplay().getOrientation() ==
ActivityInfo.SCREEN_ORIENTATION_LANDSCAPE)
threshold = HIDE_ADD_BTN_LANDSCPE;
if(taskArray.size() > threshold)
addButton.setVisibility(View.GONE);
else
addButton.setVisibility(View.VISIBLE);
}
});
// set up the title
final int finalCompleted = completedTasks;
final int finalActive = activeTasks;
final int finalHidden = hiddenTasks;
handler.post(new Runnable() {
@Override
public void run() {
Resources r = getResources();
StringBuilder title = new StringBuilder().
append(r.getString(R.string.taskList_titlePrefix)).append(" ");
if(filterTag != null) {
@ -467,18 +498,22 @@ public class TaskListSubActivity extends SubActivity {
filterTag.getName())).append(" ");
}
if(completedTasks > 0)
if(finalCompleted > 0)
title.append(r.getQuantityString(R.plurals.NactiveTasks,
activeTasks, activeTasks, taskArray.size()));
finalActive, finalActive, taskArray.size()));
else
title.append(r.getQuantityString(R.plurals.Ntasks,
taskArray.size(), taskArray.size()));
if(hiddenTasks > 0)
title.append(" (+").append(hiddenTasks).append(" ").
if(finalHidden > 0)
title.append(" (+").append(finalHidden).append(" ").
append(r.getString(R.string.taskList_hiddenSuffix)).append(")");
setTitle(title);
setTitle(title);
setUpListUI();
loadingText.setVisibility(View.GONE);
}
});
}
/** Set up the adapter for our task list */
@ -628,19 +663,29 @@ public class TaskListSubActivity extends SubActivity {
if(numServicesSynced == 0)
DialogUtilities.okDialog(getParent(), getResources().getString(
R.string.sync_no_synchronizers), null);
new Thread(new Runnable() {
@Override
public void run() {
fillData();
}
});
}
});
} else if(requestCode == ACTIVITY_TAGS)
switchToActivity(ActivityCode.TAG_LIST, null);
switchToActivity(TaskList.AC_TAG_LIST, null);
}
@Override
public void onWindowFocusChanged(boolean hasFocus) {
// refresh, since stuff might have changed...
if(hasFocus) {
new Thread(new Runnable() {
@Override
public void run() {
fillData();
}
});
}
}
/** Call an activity to create the given task */
@ -692,7 +737,7 @@ public class TaskListSubActivity extends SubActivity {
/** Show the tags view */
public void showTagsView() {
switchToActivity(ActivityCode.TAG_LIST, null);
switchToActivity(TaskList.AC_TAG_LIST, null);
}
/** Save the sorting mode to the preferences */
@ -823,7 +868,7 @@ public class TaskListSubActivity extends SubActivity {
fillData();
return true;
case CONTEXT_FILTER_TAG:
switchToActivity(ActivityCode.TASK_LIST, null);
switchToActivity(TaskList.AC_TASK_LIST, null);
return true;
case CONTEXT_SORT_AUTO:
if(sortMode == SortMode.AUTO)

Write Preview
Loading…
Cancel
Save