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

Match animations to those on iphone

Browse Source
pull/14/head
Sam Bosley 13 years ago
parent f7465d78c2
commit b546dc86e8
9 changed files with 62 additions and 8 deletions
Show Stats Download Patch File Download Diff File

2
astrid/res/anim/slide_left_in.xml
Unescape Escape View File

@ -15,5 +15,5 @@
-->
<set xmlns:android="http://schemas.android.com/apk/res/android">
<translate android:fromXDelta="100%p" android:toXDelta="0" android:duration="100"/>
<translate android:fromXDelta="100%p" android:toXDelta="0" android:duration="250"/>
</set>

2
astrid/res/anim/slide_left_out.xml
Unescape Escape View File

@ -15,5 +15,5 @@
-->
<set xmlns:android="http://schemas.android.com/apk/res/android">
<translate android:fromXDelta="0" android:toXDelta="-100%p" android:duration="100"/>
<translate android:fromXDelta="0" android:toXDelta="-100%p" android:duration="250"/>
</set>

2
astrid/res/anim/slide_right_in.xml
Unescape Escape View File

@ -15,5 +15,5 @@
-->
<set xmlns:android="http://schemas.android.com/apk/res/android">
<translate android:fromXDelta="-100%p" android:toXDelta="0" android:duration="100"/>
<translate android:fromXDelta="-100%p" android:toXDelta="0" android:duration="250"/>
</set>

2
astrid/res/anim/slide_right_out.xml
Unescape Escape View File

@ -15,5 +15,5 @@
-->
<set xmlns:android="http://schemas.android.com/apk/res/android">
<translate android:fromXDelta="0" android:toXDelta="100%p" android:duration="100"/>
<translate android:fromXDelta="0" android:toXDelta="100%p" android:duration="250"/>
</set>

12
astrid/src/com/todoroo/astrid/activity/FilterListActivity.java
Unescape Escape View File

@ -150,15 +150,20 @@ public class FilterListActivity extends ExpandableListActivity {
@Override
public void onClick(View v) {
finish();
AndroidUtilities.callApiMethod(5, FilterListActivity.this, "overridePendingTransition", //$NON-NLS-1$
new Class<?>[] { Integer.TYPE, Integer.TYPE },
R.anim.slide_none, R.anim.slide_bottom_out);
}
});
onNewIntent(getIntent());
}
@Override
public void finish() {
super.finish();
AndroidUtilities.callApiMethod(5, FilterListActivity.this, "overridePendingTransition", //$NON-NLS-1$
new Class<?>[] { Integer.TYPE, Integer.TYPE },
R.anim.slide_left_in, R.anim.slide_left_out);
}
/**
* Called when receiving a new intent. Intents this class handles:
* <ul>
@ -285,6 +290,7 @@ public class FilterListActivity extends ExpandableListActivity {
} else {
Intent intent = new Intent(FilterListActivity.this, TaskListActivity.class);
intent.putExtra(TaskListActivity.TOKEN_FILTER, filter);
intent.putExtra(TaskListActivity.TOKEN_OVERRIDE_ANIM, true);
startActivityForResult(intent, REQUEST_VIEW_TASKS);
}
AndroidUtilities.callApiMethod(5, this, "overridePendingTransition", //$NON-NLS-1$

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

@ -152,6 +152,8 @@ public final class TaskEditActivity extends Activity {
public static final String TAB_MORE = "more"; //$NON-NLS-1$
public static final String OVERRIDE_FINISH_ANIM = "finishAnim";
// --- services
@Autowired
@ -206,6 +208,8 @@ public final class TaskEditActivity extends Activity {
private Dialog whenDialog;
private boolean overrideFinishAnim;
/* ======================================================================
* ======================================================= initialization
* ====================================================================== */
@ -225,6 +229,7 @@ public final class TaskEditActivity extends Activity {
// disable keyboard until user requests it
AndroidUtilities.suppressVirtualKeyboard(title);
overrideFinishAnim = getIntent().getBooleanExtra(OVERRIDE_FINISH_ANIM, true);
// if we were editing a task already, restore it
if(savedInstanceState != null && savedInstanceState.containsKey(TASK_IN_PROGRESS)) {
@ -641,6 +646,11 @@ public final class TaskEditActivity extends Activity {
// abandon editing and delete the newly created task if
// no title was entered
if (overrideFinishAnim) {
AndroidUtilities.callApiMethod(5, this, "overridePendingTransition",
new Class<?>[] { Integer.TYPE, Integer.TYPE },
R.anim.slide_right_in, R.anim.slide_right_out);
}
if(title.getText().length() == 0 && isNewTask && model.isSaved()) {
taskService.delete(model);

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

@ -156,6 +156,8 @@ public class TaskListActivity extends ListActivity implements OnScrollListener,
/** token for indicating source of TLA launch */
public static final String TOKEN_SOURCE = "source"; //$NON-NLS-1$
public static final String TOKEN_OVERRIDE_ANIM = "finishAnim"; //$NON-NLS-1$
private static final String LAST_AUTOSYNC_ATTEMPT = "last-autosync"; //$NON-NLS-1$
// --- instance variables
@ -187,6 +189,7 @@ public class TaskListActivity extends ListActivity implements OnScrollListener,
protected Filter filter;
protected int sortFlags;
protected int sortSort;
protected boolean overrideFinishAnim;
private ImageButton voiceAddButton;
private ImageButton quickAddButton;
@ -273,6 +276,11 @@ public class TaskListActivity extends ListActivity implements OnScrollListener,
super.onNewIntent(intent);
Bundle extras = intent.getExtras();
if (extras != null) {
overrideFinishAnim = extras.getBoolean(TOKEN_OVERRIDE_ANIM);
} else {
overrideFinishAnim = false;
}
String intentAction = intent.getAction();
if (Intent.ACTION_SEARCH.equals(intentAction)) {
String query = intent.getStringExtra(SearchManager.QUERY).trim();
@ -431,6 +439,7 @@ public class TaskListActivity extends ListActivity implements OnScrollListener,
if(task != null && task.getValue(Task.TITLE).length() == 0) {
Intent intent = getOnClickQuickAddIntent(task);
startActivityForResult(intent, ACTIVITY_EDIT_TASK);
transitionForTaskEdit();
}
}
});
@ -452,6 +461,7 @@ public class TaskListActivity extends ListActivity implements OnScrollListener,
return true;
Intent intent = getOnLongClickQuickAddIntent(task);
startActivityForResult(intent, ACTIVITY_EDIT_TASK);
transitionForTaskEdit();
return true;
}
});
@ -502,6 +512,12 @@ public class TaskListActivity extends ListActivity implements OnScrollListener,
return intent;
}
public void transitionForTaskEdit() {
AndroidUtilities.callApiMethod(5, this, "overridePendingTransition",
new Class<?>[] { Integer.TYPE, Integer.TYPE },
R.anim.slide_left_in, R.anim.slide_left_out);
}
private void setUpBackgroundJobs() {
backgroundTimer = new Timer();
@ -579,6 +595,16 @@ public class TaskListActivity extends ListActivity implements OnScrollListener,
backgroundTimer.cancel();
}
@Override
public void finish() {
super.finish();
if (overrideFinishAnim) {
AndroidUtilities.callApiMethod(5, this, "overridePendingTransition",
new Class<?>[] { Integer.TYPE, Integer.TYPE },
R.anim.slide_right_in, R.anim.slide_right_out);
}
}
/**
* Receiver which receives refresh intents
*
@ -1171,6 +1197,7 @@ public class TaskListActivity extends ListActivity implements OnScrollListener,
intent = new Intent(TaskListActivity.this, TaskEditActivity.class);
intent.putExtra(TaskEditActivity.TOKEN_ID, itemId);
startActivityForResult(intent, ACTIVITY_EDIT_TASK);
transitionForTaskEdit();
return true;
}
@ -1193,6 +1220,7 @@ public class TaskListActivity extends ListActivity implements OnScrollListener,
intent = new Intent(TaskListActivity.this, TaskEditActivity.class);
intent.putExtra(TaskEditActivity.TOKEN_ID, clone.getId());
startActivityForResult(intent, ACTIVITY_EDIT_TASK);
transitionForTaskEdit();
return true;
}
@ -1253,7 +1281,7 @@ public class TaskListActivity extends ListActivity implements OnScrollListener,
startActivity(intent);
AndroidUtilities.callApiMethod(5, this, "overridePendingTransition",
new Class<?>[] { Integer.TYPE, Integer.TYPE },
R.anim.slide_bottom_in, R.anim.slide_none);
R.anim.slide_right_in, R.anim.slide_right_out);
}
@Override

9
astrid/src/com/todoroo/astrid/adapter/TaskAdapter.java
Unescape Escape View File

@ -916,6 +916,9 @@ public class TaskAdapter extends CursorAdapter implements Filterable {
Intent intent = new Intent(activity, TaskEditActivity.class);
intent.putExtra(TaskEditActivity.TOKEN_ID, taskId);
activity.startActivityForResult(intent, TaskListActivity.ACTIVITY_EDIT_TASK);
AndroidUtilities.callApiMethod(5, activity, "overridePendingTransition",
new Class<?>[] { Integer.TYPE, Integer.TYPE },
R.anim.slide_left_in, R.anim.slide_left_out);
} else {
flushSpecific(taskId);
try {
@ -975,6 +978,9 @@ public class TaskAdapter extends CursorAdapter implements Filterable {
Intent intent = new Intent(activity, TaskEditActivity.class);
intent.putExtra(TaskEditActivity.TOKEN_ID, taskId);
activity.startActivityForResult(intent, TaskListActivity.ACTIVITY_EDIT_TASK);
AndroidUtilities.callApiMethod(5, activity, "overridePendingTransition",
new Class<?>[] { Integer.TYPE, Integer.TYPE },
R.anim.slide_left_in, R.anim.slide_left_out);
}
} else {
// Register a temporary receiver in case we clicked a task with no actions forthcoming and should start
@ -1001,6 +1007,9 @@ public class TaskAdapter extends CursorAdapter implements Filterable {
Intent editIntent = new Intent(activity, TaskEditActivity.class);
editIntent.putExtra(TaskEditActivity.TOKEN_ID, taskId);
activity.startActivityForResult(editIntent, TaskListActivity.ACTIVITY_EDIT_TASK);
AndroidUtilities.callApiMethod(5, activity, "overridePendingTransition",
new Class<?>[] { Integer.TYPE, Integer.TYPE },
R.anim.slide_left_in, R.anim.slide_left_out);
}
}
activity.unregisterReceiver(this);

1
astrid/src/com/todoroo/astrid/widget/TasksWidget.java
Unescape Escape View File

@ -230,6 +230,7 @@ public class TasksWidget extends AppWidgetProvider {
Intent editIntent = new Intent(context, TaskEditActivity.class);
editIntent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK | Intent.FLAG_ACTIVITY_MULTIPLE_TASK);
editIntent.putExtra(TaskEditActivity.OVERRIDE_FINISH_ANIM, false);
if(filter != null && filter.valuesForNewTasks != null) {
String values = AndroidUtilities.contentValuesToSerializedString(filter.valuesForNewTasks);
values = PermaSql.replacePlaceholders(values);

Write Preview
Loading…
Cancel
Save