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

Made slide animations quicker, started work on sync provider API

Browse Source
pull/14/head
Tim Su 14 years ago
parent 7432195f10
commit 8bd838be50
11 changed files with 53 additions and 8 deletions
Show Stats Download Patch File Download Diff File

4
astrid/AndroidManifest.xml
Unescape Escape View File

@ -330,7 +330,7 @@
android:icon="@drawable/ic_menu_producteev"
android:label="@string/producteev_PPr_header">
<intent-filter>
<action android:name="com.todoroo.astrid.TASK_LIST_MENU" />
<action android:name="com.todoroo.astrid.SETTINGS" />
<category android:name="android.intent.category.DEFAULT" />
</intent-filter>
<intent-filter>
@ -360,7 +360,7 @@
android:icon="@drawable/ic_menu_refresh"
android:label="@string/rmilk_MPr_header">
<intent-filter>
<action android:name="com.todoroo.astrid.TASK_LIST_MENU" />
<action android:name="com.todoroo.astrid.SETTINGS" />
<category android:name="android.intent.category.DEFAULT" />
</intent-filter>
<intent-filter>

21
astrid/api-src/com/todoroo/astrid/api/AstridApiConstants.java
Unescape Escape View File

@ -62,6 +62,11 @@ public class AstridApiConstants {
*/
public static final String EXTRAS_NEW_DUE_DATE = "newDueDate";
/**
* Extras name for sync provider name
*/
public static final String EXTRAS_NAME = "name";
// --- Add-ons API
/**
@ -124,6 +129,22 @@ public class AstridApiConstants {
*/
public static final String BROADCAST_SEND_DETAILS = PACKAGE + ".SEND_DETAILS";
// --- Sync Provider API
/**
* Action name for broadcast intent requesting a listing of active
* sync providers users can activate from the menu
*/
public static final String BROADCAST_REQUEST_SYNC_PROVDERS = PACKAGE + ".REQUEST_SYNC_PROVIDERS";
/**
* Action name for broadcast intent sending sync provider information back to Astrid
* @extra EXTRAS_ADDON your add-on identifier
* @extra EXTRAS_NAME label for your sync provider
* @extra EXTRAS_RESPONSE a PendingIntent to invoke synchronization
*/
public static final String BROADCAST_SEND_SYNC_PROVIDER = PACKAGE + ".SEND_SYNC_PROVIDER";
// --- Task Actions API
/**

7
astrid/plugin-src/com/todoroo/astrid/locale/LocaleEditAlerts.java
Unescape Escape View File

@ -17,6 +17,7 @@ import android.widget.Spinner;
import com.flurry.android.FlurryAgent;
import com.timsu.astrid.R;
import com.todoroo.andlib.service.ContextManager;
import com.todoroo.andlib.utility.AndroidUtilities;
import com.todoroo.astrid.activity.AddOnActivity;
import com.todoroo.astrid.adapter.FilterAdapter;
import com.todoroo.astrid.api.Filter;
@ -44,6 +45,10 @@ public final class LocaleEditAlerts extends ExpandableListActivity {
@SuppressWarnings("nls")
public static final String KEY_SQL = "sql";
/** key name for filter content-values in bundle */
@SuppressWarnings("nls")
public static final String KEY_VALUES = "val";
/** key name for interval (integer, # of seconds) */
@SuppressWarnings("nls")
public static final String KEY_INTERVAL = "interval";
@ -262,6 +267,8 @@ public final class LocaleEditAlerts extends ExpandableListActivity {
Filter filterItem = (Filter) selected;
storeAndForwardExtras.putString(KEY_FILTER_TITLE, filterItem.title);
storeAndForwardExtras.putString(KEY_SQL, filterItem.sqlQuery);
if(filterItem.valuesForNewTasks != null)
storeAndForwardExtras.putString(KEY_VALUES, AndroidUtilities.contentValuesToSerializedString(filterItem.valuesForNewTasks));
storeAndForwardExtras.putInt(KEY_INTERVAL, INTERVALS[intervalIndex]);
returnIntent.putExtra(com.twofortyfouram.Intent.EXTRA_BUNDLE, storeAndForwardExtras);

6
astrid/plugin-src/com/todoroo/astrid/locale/LocaleReceiver.java
Unescape Escape View File

@ -11,6 +11,7 @@ import com.timsu.astrid.R;
import com.todoroo.andlib.data.TodorooCursor;
import com.todoroo.andlib.service.ContextManager;
import com.todoroo.andlib.service.DependencyInjectionService;
import com.todoroo.andlib.utility.AndroidUtilities;
import com.todoroo.andlib.utility.DateUtilities;
import com.todoroo.astrid.activity.ShortcutActivity;
import com.todoroo.astrid.api.Filter;
@ -51,6 +52,7 @@ public class LocaleReceiver extends BroadcastReceiver {
final String title = intent.getStringExtra(LocaleEditAlerts.KEY_FILTER_TITLE);
final String sql = intent.getStringExtra(LocaleEditAlerts.KEY_SQL);
final String values = intent.getStringExtra(LocaleEditAlerts.KEY_VALUES);
final int interval = intent.getIntExtra(LocaleEditAlerts.KEY_INTERVAL, 24*3600);
if(TextUtils.isEmpty(title) || TextUtils.isEmpty(sql) ||
@ -74,6 +76,10 @@ public class LocaleReceiver extends BroadcastReceiver {
try {
if(cursor.getCount() == 0)
return;
if(values != null)
filter.valuesForNewTasks = AndroidUtilities.contentValuesFromSerializedString(values);
Resources r = context.getResources();
String reminder = r.getString(R.string.locale_notification).
replace("$NUM", r.getQuantityString(R.plurals.Ntasks,

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="400"/>
<translate android:fromXDelta="100%p" android:toXDelta="0" android:duration="200"/>
</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="400"/>
<translate android:fromXDelta="0" android:toXDelta="-100%p" android:duration="200"/>
</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="400"/>
<translate android:fromXDelta="-100%p" android:toXDelta="0" android:duration="200"/>
</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="400"/>
<translate android:fromXDelta="0" android:toXDelta="100%p" android:duration="200"/>
</set>

3
astrid/res/values/strings-core.xml
Unescape Escape View File

@ -519,6 +519,9 @@ to the plugin creator for fastest service.
<!-- Sync Notification: toast when sync activated from activity -->
<string name="SyP_progress_toast">Synchronizing...</string>
<!-- Sync Label: used in menu to denote synchronization -->
<string name="SyP_label">Synchronization</string>
<!-- ====================================================== TasksWidget == -->
<!-- Widget text when loading tasks -->

8
astrid/src/com/todoroo/astrid/activity/EditPreferences.java
Unescape Escape View File

@ -29,6 +29,8 @@ import com.todoroo.astrid.api.AstridApiConstants;
import com.todoroo.astrid.dao.Database;
import com.todoroo.astrid.dao.TaskDao;
import com.todoroo.astrid.model.Task;
import com.todoroo.astrid.producteev.ProducteevPreferences;
import com.todoroo.astrid.rmilk.MilkPreferences;
import com.todoroo.astrid.service.StartupService;
import com.todoroo.astrid.service.TaskService;
import com.todoroo.astrid.utility.Constants;
@ -92,6 +94,12 @@ public class EditPreferences extends TodorooPreferences {
preference.setIntent(intent);
String application = resolveInfo.activityInfo.applicationInfo.loadLabel(pm).toString();
// temporary overrides
if(ProducteevPreferences.class.getName().equals(resolveInfo.activityInfo.name) ||
MilkPreferences.class.getName().equals(resolveInfo.activityInfo.name))
application = getString(R.string.SyP_label);
if(!applicationPreferences.containsKey(application))
applicationPreferences.put(application, new ArrayList<Preference>());
ArrayList<Preference> arrayList = applicationPreferences.get(application);

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

@ -277,7 +277,7 @@ public class TaskListActivity extends ListActivity implements OnScrollListener,
FilterListActivity.class);
startActivity(intent);
if(AndroidUtilities.getSdkVersion() >= 5) {
overridePendingTransition(R.anim.slide_right_in, R.anim.slide_right_out);
//overridePendingTransition(R.anim.slide_right_in, R.anim.slide_right_out);
}
}
});
@ -889,7 +889,7 @@ public class TaskListActivity extends ListActivity implements OnScrollListener,
FilterListActivity.class);
startActivity(intent);
if(AndroidUtilities.getSdkVersion() >= 5) {
overridePendingTransition(R.anim.slide_right_in, R.anim.slide_right_out);
// overridePendingTransition(R.anim.slide_right_in, R.anim.slide_right_out);
}
}
}

Write Preview
Loading…
Cancel
Save