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

Killed the NotificationWrapperActivity and other custom wrappers for custom intents--just use the normal tasklistactivity with a custom fragment

Browse Source
pull/14/head
Sam Bosley 13 years ago
parent e415557d24
commit 695c78fd18
9 changed files with 16 additions and 41 deletions
Show Stats Download Patch File Download Diff File

5
api/src/com/todoroo/astrid/api/FilterWithCustomIntent.java
Unescape Escape View File

@ -17,7 +17,6 @@ public class FilterWithCustomIntent extends Filter {
* Custom activity name
*/
public ComponentName customTaskList = null;
public ComponentName customWrapperActivity = null;
/**
* Bundle with extras set. Can be null
@ -41,7 +40,7 @@ public class FilterWithCustomIntent extends Filter {
public Intent getCustomIntent() {
Intent intent = new Intent();
intent.putExtra("filter", this); //$NON-NLS-1$
intent.setComponent(customWrapperActivity);
intent.setComponent(new ComponentName(AstridApiConstants.PACKAGE, "com.todoroo.astrid.activity.TaskListActivity"));
if(customExtras != null)
intent.putExtras(customExtras);
@ -69,7 +68,6 @@ public class FilterWithCustomIntent extends Filter {
public void writeToParcel(Parcel dest, int flags) {
super.writeToParcel(dest, flags);
dest.writeParcelable(customTaskList, 0);
dest.writeParcelable(customWrapperActivity, 0);
dest.writeParcelable(customExtras, 0);
}
@ -77,7 +75,6 @@ public class FilterWithCustomIntent extends Filter {
public void readFromParcel(Parcel source) {
super.readFromParcel(source);
customTaskList = source.readParcelable(ComponentName.class.getClassLoader());
customWrapperActivity = source.readParcelable(ComponentName.class.getClassLoader());
customExtras = source.readParcelable(Bundle.class.getClassLoader());
}

2
astrid/plugin-src/com/todoroo/astrid/gtasks/GtasksFilterExposer.java
Unescape Escape View File

@ -23,7 +23,6 @@ import com.todoroo.andlib.sql.Join;
import com.todoroo.andlib.sql.Order;
import com.todoroo.andlib.sql.QueryTemplate;
import com.todoroo.astrid.activity.TaskListFragment;
import com.todoroo.astrid.activity.TaskListActivity;
import com.todoroo.astrid.api.AstridApiConstants;
import com.todoroo.astrid.api.AstridFilterExposer;
import com.todoroo.astrid.api.Filter;
@ -72,7 +71,6 @@ public class GtasksFilterExposer extends BroadcastReceiver implements AstridFilt
values);
filter.listingIcon = ((BitmapDrawable)context.getResources().getDrawable(R.drawable.gtasks_icon)).getBitmap();
filter.customTaskList = new ComponentName(ContextManager.getContext(), GtasksListActivity.class);
filter.customWrapperActivity = new ComponentName(ContextManager.getContext(), TaskListActivity.class);
Bundle extras = new Bundle();
extras.putBoolean(TaskListFragment.TOKEN_OVERRIDE_ANIM, true);
extras.putLong(GtasksListActivity.TOKEN_STORE_ID, list.getId());

21
astrid/plugin-src/com/todoroo/astrid/reminders/NotificationWrapperActivity.java
Unescape Escape View File

@ -1,21 +0,0 @@
package com.todoroo.astrid.reminders;
import android.os.Bundle;
import com.timsu.astrid.R;
import com.todoroo.astrid.activity.AstridActivity;
import com.todoroo.astrid.service.ThemeService;
public class NotificationWrapperActivity extends AstridActivity {
/* (non-Javadoc)
* @see com.todoroo.astrid.activity.AstridWrapperActivity#onCreate(android.os.Bundle)
*/
@Override
protected void onCreate(Bundle savedInstanceState) {
ThemeService.applyTheme(this);
super.onCreate(savedInstanceState);
setContentView(R.layout.notification_wrapper_activity);
}
}

3
astrid/plugin-src/com/todoroo/astrid/reminders/Notifications.java
Unescape Escape View File

@ -24,6 +24,7 @@ import com.todoroo.andlib.service.NotificationManager.AndroidNotificationManager
import com.todoroo.andlib.utility.AndroidUtilities;
import com.todoroo.andlib.utility.DateUtilities;
import com.todoroo.andlib.utility.Preferences;
import com.todoroo.astrid.activity.TaskListActivity;
import com.todoroo.astrid.activity.TaskListFragment;
import com.todoroo.astrid.dao.TaskDao;
import com.todoroo.astrid.data.Task;
@ -162,7 +163,7 @@ public class Notifications extends BroadcastReceiver {
String title = context.getString(R.string.app_name);
String text = reminder + " " + taskTitle; //$NON-NLS-1$
Intent notifyIntent = new Intent(context, NotificationWrapperActivity.class);
Intent notifyIntent = new Intent(context, TaskListActivity.class);
notifyIntent.setAction("NOTIFY" + id); //$NON-NLS-1$
notifyIntent.putExtra(NotificationFragment.TOKEN_ID, id);
notifyIntent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK | Intent.FLAG_ACTIVITY_MULTIPLE_TASK);

2
astrid/plugin-src/com/todoroo/astrid/tags/TagFilterExposer.java
Unescape Escape View File

@ -29,7 +29,6 @@ import com.todoroo.andlib.utility.DateUtilities;
import com.todoroo.andlib.utility.DialogUtilities;
import com.todoroo.astrid.actfm.TagViewActivity;
import com.todoroo.astrid.activity.TaskListFragment;
import com.todoroo.astrid.activity.TaskListActivity;
import com.todoroo.astrid.api.AstridApiConstants;
import com.todoroo.astrid.api.AstridFilterExposer;
import com.todoroo.astrid.api.Filter;
@ -86,7 +85,6 @@ public class TagFilterExposer extends BroadcastReceiver implements AstridFilterE
newTagIntent(context, DeleteTagActivity.class, tag)
};
filter.customTaskList = new ComponentName(ContextManager.getContext(), TagViewActivity.class);
filter.customWrapperActivity = new ComponentName(ContextManager.getContext(), TaskListActivity.class);
if(tag.image != null)
filter.imageUrl = tag.image;
if(tag.updateText != null)

8
astrid/res/layout/notification_wrapper_activity.xml
Unescape Escape View File

@ -1,8 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<fragment
xmlns:android="http://schemas.android.com/apk/res/android"
android:name="com.todoroo.astrid.reminders.NotificationFragment"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:id="@+id/notification_fragment">
</fragment>

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

@ -124,8 +124,12 @@ public class AstridActivity extends FragmentActivity
}
}
protected void setupTasklistFragmentWithFilter(Filter filter) {
Class<?> component = TaskListFragment.class;
protected final void setupTasklistFragmentWithFilter(Filter filter) {
setupTasklistFragmentWithFilterAndCustomTaskList(filter, TaskListFragment.class);
}
protected final void setupTasklistFragmentWithFilterAndCustomTaskList(Filter filter, Class<?> customTaskList) {
Class<?> component = customTaskList;
if (filter instanceof FilterWithCustomIntent) {
try {
component = Class.forName(((FilterWithCustomIntent) filter).customTaskList.getClassName());

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

@ -23,10 +23,12 @@ import com.todoroo.astrid.actfm.ActFmLoginActivity;
import com.todoroo.astrid.actfm.TagSettingsActivity;
import com.todoroo.astrid.api.Filter;
import com.todoroo.astrid.api.FilterListItem;
import com.todoroo.astrid.reminders.NotificationFragment;
import com.todoroo.astrid.service.ThemeService;
import com.todoroo.astrid.ui.FragmentPopover;
import com.todoroo.astrid.ui.MainMenuPopover;
import com.todoroo.astrid.ui.MainMenuPopover.MainMenuListener;
import com.todoroo.astrid.utility.Constants;
import com.todoroo.astrid.utility.Flags;
import com.todoroo.astrid.welcome.tutorial.WelcomeWalkthrough;
@ -217,8 +219,11 @@ public class TaskListActivity extends AstridActivity implements MainMenuListener
super.onPostResume();
Filter savedFilter = getIntent().getParcelableExtra(TaskListFragment.TOKEN_FILTER);
if (!Flags.checkAndClear(Flags.TLA_RESUMED_FROM_VOICE_ADD))
if (getIntent().getIntExtra(TaskListFragment.TOKEN_SOURCE, Constants.SOURCE_DEFAULT) == Constants.SOURCE_NOTIFICATION)
setupTasklistFragmentWithFilterAndCustomTaskList(savedFilter, NotificationFragment.class);
else if (!Flags.checkAndClear(Flags.TLA_RESUMED_FROM_VOICE_ADD))
setupTasklistFragmentWithFilter(savedFilter);
if (savedFilter != null)
lists.setText(savedFilter.title);

1
astrid/src/com/todoroo/astrid/activity/TaskListFragment.java
Unescape Escape View File

@ -348,6 +348,7 @@ public class TaskListFragment extends ListFragment implements OnScrollListener,
StatisticsService.reportEvent(StatisticsConstants.LAUNCH_FROM_C2DM);
break;
}
getActivity().getIntent().putExtra(TOKEN_SOURCE, Constants.SOURCE_DEFAULT); // Only report source once
}
getActivity().runOnUiThread(new Runnable() {

Write Preview
Loading…
Cancel
Save