First pass at filling in members when creating a new event list

astrid/plugin-src/com/todoroo/astrid/actfm/TagSettingsActivity.java

@@ -69,6 +69,8 @@ public class TagSettingsActivity extends FragmentActivity {
 
     public static final int REQUEST_ACTFM_LOGIN = 3;
 
+    public static final String TOKEN_AUTOPOPULATE_MEMBERS = "autopopulateMembers"; //$NON-NLS-1$
+
     private static final String MEMBERS_IN_PROGRESS = "members"; //$NON-NLS-1$
 
     private TagData tagData;
@@ -222,6 +224,12 @@ public class TagSettingsActivity extends FragmentActivity {
         }
 
         refreshSettingsPage();
+
+        String autopopulateMembers = getIntent().getStringExtra(TOKEN_AUTOPOPULATE_MEMBERS);
+        if (!TextUtils.isEmpty(autopopulateMembers)) {
+            updateMembers(autopopulateMembers);
+            getIntent().removeExtra(TOKEN_AUTOPOPULATE_MEMBERS);
+        }
     }
 
     @SuppressWarnings("nls")

astrid/plugin-src/com/todoroo/astrid/actfm/TagViewFragment.java

@@ -83,6 +83,10 @@ public class TagViewFragment extends TaskListFragment {
 
     public static final String TOKEN_START_ACTIVITY = "startActivity"; //$NON-NLS-1$
 
+    public static final String TOKEN_START_SETTINGS = "startSettings"; //$NON-NLS-1$
+
+    public static final String TOKEN_MEMBERS = "members";  //$NON-NLS-1$
+
     protected TagData tagData;
 
     @Autowired TagDataService tagDataService;
@@ -136,6 +140,11 @@ public class TagViewFragment extends TaskListFragment {
             Class<?> settingsClass = AstridPreferences.useTabletLayout(activity) ? TagSettingsActivityTablet.class : TagSettingsActivity.class;
             Intent intent = new Intent(getActivity(), settingsClass);
             intent.putExtra(EXTRA_TAG_DATA, tagData);
+            if (extras.containsKey(TOKEN_MEMBERS)) {
+                intent.putExtra(TagSettingsActivity.TOKEN_AUTOPOPULATE_MEMBERS, extras.getStringArrayList(TOKEN_MEMBERS));
+                extras.remove(TOKEN_MEMBERS);
+            }
+
             startActivityForResult(intent, REQUEST_CODE_SETTINGS);
             if (!AstridPreferences.useTabletLayout(activity)) {
                 AndroidUtilities.callOverridePendingTransition(activity, R.anim.slide_left_in, R.anim.slide_left_out);
@@ -223,6 +232,9 @@ public class TagViewFragment extends TaskListFragment {
         if (extras.getBoolean(TOKEN_START_ACTIVITY, false)) {
             extras.remove(TOKEN_START_ACTIVITY);
             activity.showComments();
+        } else if (extras.getBoolean(TOKEN_START_SETTINGS, false)) {
+            extras.remove(TOKEN_START_SETTINGS);
+            settingsListener.onClick(null);
         }
     }
 

astrid/plugin-src/com/todoroo/astrid/gcal/CalendarAlarmListCreator.java

@@ -21,13 +21,17 @@ import com.todoroo.andlib.service.Autowired;
 import com.todoroo.andlib.service.DependencyInjectionService;
 import com.todoroo.andlib.sql.Query;
 import com.todoroo.andlib.utility.AndroidUtilities;
+import com.todoroo.astrid.actfm.TagViewFragment;
 import com.todoroo.astrid.actfm.sync.ActFmPreferenceService;
 import com.todoroo.astrid.activity.EditPreferences;
+import com.todoroo.astrid.activity.TaskListActivity;
+import com.todoroo.astrid.activity.TaskListFragment;
 import com.todoroo.astrid.dao.UserDao;
 import com.todoroo.astrid.data.TagData;
 import com.todoroo.astrid.data.User;
 import com.todoroo.astrid.service.TagDataService;
 import com.todoroo.astrid.service.ThemeService;
+import com.todoroo.astrid.tags.TagFilterExposer;
 
 public class CalendarAlarmListCreator extends Activity {
 
@@ -166,7 +170,12 @@ public class CalendarAlarmListCreator extends Activity {
         moreOptions.setOnClickListener(new OnClickListener() {
             @Override
             public void onClick(View v) {
-                //
+                Intent intent = new Intent(CalendarAlarmListCreator.this, TaskListActivity.class);
+                intent.putExtra(TaskListFragment.TOKEN_FILTER, TagFilterExposer.filterFromTagData(CalendarAlarmListCreator.this, tagData));
+                intent.putExtra(TagViewFragment.TOKEN_MEMBERS, buildMembersArray().toString());
+                intent.putExtra(TagViewFragment.TOKEN_START_SETTINGS, true);
+                startActivity(intent);
+                finish();
             }
         });
     }