diff --git a/astrid/plugin-src/com/todoroo/astrid/actfm/TagViewActivity.java b/astrid/plugin-src/com/todoroo/astrid/actfm/TagViewActivity.java
index 26bb88a00..5eb7dcbb7 100644
--- a/astrid/plugin-src/com/todoroo/astrid/actfm/TagViewActivity.java
+++ b/astrid/plugin-src/com/todoroo/astrid/actfm/TagViewActivity.java
@@ -92,6 +92,8 @@ public class TagViewActivity extends TaskListActivity implements OnTabChangeList
@Autowired ActFmSyncService actFmSyncService;
+ @Autowired ActFmPreferenceService actFmPreferenceService;
+
@Autowired UpdateDao updateDao;
private TabHost tabHost;
@@ -140,7 +142,8 @@ public class TagViewActivity extends TaskListActivity implements OnTabChangeList
View taskList = super.getListBody(parent);
tabContent.addView(taskList);
addTab(tabWidget, taskList.getId(), "tasks", tabLabels[0]);
- addTab(tabWidget, R.id.tab_updates, "updates", tabLabels[1]);
+ if(actFmPreferenceService.isLoggedIn())
+ addTab(tabWidget, R.id.tab_updates, "updates", tabLabels[1]);
addTab(tabWidget, R.id.tab_settings, "members", tabLabels[2]);
tabHost.setOnTabChangedListener(this);
@@ -212,11 +215,14 @@ public class TagViewActivity extends TaskListActivity implements OnTabChangeList
return true;
}
- protected void setUpMemberPage() {
+ protected void setUpSettingsPage() {
tagMembers = (PeopleContainer) findViewById(R.id.members_container);
tagName = (EditText) findViewById(R.id.tag_name);
picture = (AsyncImageView) findViewById(R.id.picture);
+ if(actFmPreferenceService.isLoggedIn())
+ findViewById(R.id.listSettingsMore).setVisibility(View.VISIBLE);
+
picture.setOnClickListener(new OnClickListener() {
@Override
public void onClick(View arg0) {
@@ -338,7 +344,7 @@ public class TagViewActivity extends TaskListActivity implements OnTabChangeList
}
setUpUpdateList();
- setUpMemberPage();
+ setUpSettingsPage();
}
private void refreshUpdatesList() {
diff --git a/astrid/plugin-src/com/todoroo/astrid/tags/TagFilterExposer.java b/astrid/plugin-src/com/todoroo/astrid/tags/TagFilterExposer.java
index c360efcab..c30cd7b38 100644
--- a/astrid/plugin-src/com/todoroo/astrid/tags/TagFilterExposer.java
+++ b/astrid/plugin-src/com/todoroo/astrid/tags/TagFilterExposer.java
@@ -32,8 +32,6 @@ import com.todoroo.andlib.sql.QueryTemplate;
import com.todoroo.andlib.utility.DateUtilities;
import com.todoroo.andlib.utility.DialogUtilities;
import com.todoroo.astrid.actfm.TagViewActivity;
-import com.todoroo.astrid.actfm.sync.ActFmPreferenceService;
-import com.todoroo.astrid.activity.TaskListActivity;
import com.todoroo.astrid.api.AstridApiConstants;
import com.todoroo.astrid.api.Filter;
import com.todoroo.astrid.api.FilterCategory;
@@ -60,13 +58,11 @@ public class TagFilterExposer extends BroadcastReceiver {
@Autowired TagDataService tagDataService;
- @Autowired ActFmPreferenceService actFmPreferenceService;
-
private TagService tagService;
/** Create filter from new tag object */
@SuppressWarnings("nls")
- public static FilterWithCustomIntent filterFromTag(Context context, Tag tag, Criterion criterion, boolean useTagViewActivity) {
+ public static FilterWithCustomIntent filterFromTag(Context context, Tag tag, Criterion criterion) {
String listTitle = tag.tag + " (" + tag.count + ")";
String title = context.getString(R.string.tag_FEx_name, tag.tag);
QueryTemplate tagTemplate = tag.queryTemplate(criterion);
@@ -88,15 +84,11 @@ public class TagFilterExposer extends BroadcastReceiver {
newTagIntent(context, RenameTagActivity.class, tag),
newTagIntent(context, DeleteTagActivity.class, tag)
};
- if(useTagViewActivity) {
- filter.customTaskList = new ComponentName(ContextManager.getContext(), TagViewActivity.class);
- Bundle extras = new Bundle();
- extras.putString(TagViewActivity.EXTRA_TAG_NAME, tag.tag);
- extras.putLong(TagViewActivity.EXTRA_TAG_REMOTE_ID, tag.remoteId);
- filter.customExtras = extras;
- } else {
- filter.customTaskList = new ComponentName(ContextManager.getContext(), TaskListActivity.class);
- }
+ filter.customTaskList = new ComponentName(ContextManager.getContext(), TagViewActivity.class);
+ Bundle extras = new Bundle();
+ extras.putString(TagViewActivity.EXTRA_TAG_NAME, tag.tag);
+ extras.putLong(TagViewActivity.EXTRA_TAG_REMOTE_ID, tag.remoteId);
+ filter.customExtras = extras;
return filter;
}
@@ -106,7 +98,7 @@ public class TagFilterExposer extends BroadcastReceiver {
Tag tag = new Tag(tagData.getValue(TagData.NAME),
tagData.getValue(TagData.TASK_COUNT),
tagData.getValue(TagData.REMOTE_ID));
- return filterFromTag(context, tag, TaskCriteria.activeAndVisible(), true);
+ return filterFromTag(context, tag, TaskCriteria.activeAndVisible());
}
private static Intent newTagIntent(Context context, Class extends Activity> activity, Tag tag) {
@@ -199,8 +191,7 @@ public class TagFilterExposer extends BroadcastReceiver {
Filter[] filters = new Filter[tags.length];
Context context = ContextManager.getContext();
for(int i = 0; i < tags.length; i++)
- filters[i] = filterFromTag(context, tags[i], TaskCriteria.activeAndVisible(),
- actFmPreferenceService.isLoggedIn());
+ filters[i] = filterFromTag(context, tags[i], TaskCriteria.activeAndVisible());
return new FilterCategory(context.getString(name), filters);
}
diff --git a/astrid/plugin-src/com/todoroo/astrid/tags/TagsPlugin.java b/astrid/plugin-src/com/todoroo/astrid/tags/TagsPlugin.java
index 5d41a19da..869dcb2ed 100644
--- a/astrid/plugin-src/com/todoroo/astrid/tags/TagsPlugin.java
+++ b/astrid/plugin-src/com/todoroo/astrid/tags/TagsPlugin.java
@@ -52,6 +52,7 @@ public class TagsPlugin extends BroadcastReceiver {
frame.addView(editText);
frame.setPadding(10, 0, 10, 0);
+ // todo make me open directly
DialogUtilities.viewDialog(activity,
activity.getString(R.string.tag_new_list),
frame, new DialogInterface.OnClickListener() {
@@ -59,7 +60,7 @@ public class TagsPlugin extends BroadcastReceiver {
public void onClick(DialogInterface dialog, int which) {
Tag tag = new Tag(editText.getText().toString(), 0, 0);
FilterWithCustomIntent filter = TagFilterExposer.filterFromTag(activity,
- tag, TaskCriteria.isActive(), actFmPreferenceService.isLoggedIn());
+ tag, TaskCriteria.isActive());
filter.start(activity);
}
}, null);
diff --git a/astrid/res/layout/task_list_body_tag.xml b/astrid/res/layout/task_list_body_tag.xml
index b30c737d0..176cc77c3 100644
--- a/astrid/res/layout/task_list_body_tag.xml
+++ b/astrid/res/layout/task_list_body_tag.xml
@@ -81,19 +81,6 @@
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/astrid/res/values/strings-actfm.xml b/astrid/res/values/strings-actfm.xml
index 5b96c056c..7d79c9989 100644
--- a/astrid/res/values/strings-actfm.xml
+++ b/astrid/res/values/strings-actfm.xml
@@ -46,27 +46,30 @@
- Activity
- - Members
+ - List Settings
Refresh
-
+
List Name:
-
- List Owner:
+
+ List Creator:
-
+
none
-
- Team Members:
+
+ Collaborators:
-
+
List Picture
+
+ Silence Notifications
+