|
|
|
@ -243,10 +243,10 @@ public class TagViewActivity extends TaskListActivity implements OnTabChangeList
|
|
|
|
|
|
|
|
|
|
|
|
@SuppressWarnings("nls")
|
|
|
|
@SuppressWarnings("nls")
|
|
|
|
private void showPopovers() {
|
|
|
|
private void showPopovers() {
|
|
|
|
if(tabHost.getCurrentTabTag().equals("tasks"))
|
|
|
|
if(tabHost.getCurrentTabTag().equals("settings"))
|
|
|
|
showListTabPopover();
|
|
|
|
|
|
|
|
else if(tabHost.getCurrentTabTag().equals("settings"))
|
|
|
|
|
|
|
|
showCollaboratorsPopover();
|
|
|
|
showCollaboratorsPopover();
|
|
|
|
|
|
|
|
else
|
|
|
|
|
|
|
|
showListTabPopover();
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
/**
|
|
|
|
@ -636,10 +636,12 @@ public class TagViewActivity extends TaskListActivity implements OnTabChangeList
|
|
|
|
String oldName = tagData.getValue(TagData.NAME);
|
|
|
|
String oldName = tagData.getValue(TagData.NAME);
|
|
|
|
String newName = tagName.getText().toString();
|
|
|
|
String newName = tagName.getText().toString();
|
|
|
|
|
|
|
|
|
|
|
|
if(!oldName.equals(newName)) {
|
|
|
|
boolean nameChanged = !oldName.equals(newName);
|
|
|
|
|
|
|
|
if (nameChanged) {
|
|
|
|
tagData.setValue(TagData.NAME, newName);
|
|
|
|
tagData.setValue(TagData.NAME, newName);
|
|
|
|
TagService.getInstance().rename(oldName, newName);
|
|
|
|
TagService.getInstance().rename(oldName, newName);
|
|
|
|
tagData.setFlag(TagData.FLAGS, TagData.FLAG_EMERGENT, false);
|
|
|
|
tagData.setFlag(TagData.FLAGS, TagData.FLAG_EMERGENT, false);
|
|
|
|
|
|
|
|
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
if(newName.length() > 0 && oldName.length() == 0) {
|
|
|
|
if(newName.length() > 0 && oldName.length() == 0) {
|
|
|
|
@ -665,6 +667,12 @@ public class TagViewActivity extends TaskListActivity implements OnTabChangeList
|
|
|
|
|
|
|
|
|
|
|
|
tagDataService.save(tagData);
|
|
|
|
tagDataService.save(tagData);
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
if (nameChanged) {
|
|
|
|
|
|
|
|
filter = TagFilterExposer.filterFromTagData(this, tagData);
|
|
|
|
|
|
|
|
taskAdapter = null;
|
|
|
|
|
|
|
|
loadTaskListContent(true);
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
refreshSettingsPage();
|
|
|
|
refreshSettingsPage();
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|