|
|
@ -38,8 +38,8 @@ import com.todoroo.andlib.sql.Criterion;
|
|
|
|
import com.todoroo.andlib.sql.Field;
|
|
|
|
import com.todoroo.andlib.sql.Field;
|
|
|
|
import com.todoroo.andlib.sql.Query;
|
|
|
|
import com.todoroo.andlib.sql.Query;
|
|
|
|
import com.todoroo.andlib.sql.UnaryCriterion;
|
|
|
|
import com.todoroo.andlib.sql.UnaryCriterion;
|
|
|
|
import com.todoroo.astrid.activity.TaskListActivity;
|
|
|
|
import com.todoroo.andlib.utility.AndroidUtilities;
|
|
|
|
import com.todoroo.astrid.activity.TaskListWrapperActivity;
|
|
|
|
import com.todoroo.astrid.actfm.TagSettingsActivity;
|
|
|
|
import com.todoroo.astrid.api.AstridApiConstants;
|
|
|
|
import com.todoroo.astrid.api.AstridApiConstants;
|
|
|
|
import com.todoroo.astrid.api.CustomFilterCriterion;
|
|
|
|
import com.todoroo.astrid.api.CustomFilterCriterion;
|
|
|
|
import com.todoroo.astrid.api.Filter;
|
|
|
|
import com.todoroo.astrid.api.Filter;
|
|
|
@ -50,6 +50,7 @@ import com.todoroo.astrid.dao.Database;
|
|
|
|
import com.todoroo.astrid.data.Task;
|
|
|
|
import com.todoroo.astrid.data.Task;
|
|
|
|
import com.todoroo.astrid.data.TaskApiDao.TaskCriteria;
|
|
|
|
import com.todoroo.astrid.data.TaskApiDao.TaskCriteria;
|
|
|
|
import com.todoroo.astrid.service.StatisticsService;
|
|
|
|
import com.todoroo.astrid.service.StatisticsService;
|
|
|
|
|
|
|
|
import com.todoroo.astrid.service.ThemeService;
|
|
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
/**
|
|
|
|
* Activity that allows users to build custom filters
|
|
|
|
* Activity that allows users to build custom filters
|
|
|
@ -125,6 +126,8 @@ public class CustomFilterActivity extends ListActivity {
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
private TextView filterName;
|
|
|
|
private TextView filterName;
|
|
|
|
|
|
|
|
private boolean isDialog;
|
|
|
|
|
|
|
|
|
|
|
|
private CustomFilterAdapter adapter;
|
|
|
|
private CustomFilterAdapter adapter;
|
|
|
|
private final Map<String,CustomFilterCriterion> criteria = Collections.synchronizedMap(new LinkedHashMap<String,CustomFilterCriterion>());
|
|
|
|
private final Map<String,CustomFilterCriterion> criteria = Collections.synchronizedMap(new LinkedHashMap<String,CustomFilterCriterion>());
|
|
|
|
|
|
|
|
|
|
|
@ -137,6 +140,7 @@ public class CustomFilterActivity extends ListActivity {
|
|
|
|
|
|
|
|
|
|
|
|
@Override
|
|
|
|
@Override
|
|
|
|
protected void onCreate(Bundle savedInstanceState) {
|
|
|
|
protected void onCreate(Bundle savedInstanceState) {
|
|
|
|
|
|
|
|
setupForDialogOrFullscreen();
|
|
|
|
super.onCreate(savedInstanceState);
|
|
|
|
super.onCreate(savedInstanceState);
|
|
|
|
ContextManager.setContext(this);
|
|
|
|
ContextManager.setContext(this);
|
|
|
|
|
|
|
|
|
|
|
@ -157,6 +161,14 @@ public class CustomFilterActivity extends ListActivity {
|
|
|
|
setUpListeners();
|
|
|
|
setUpListeners();
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
private void setupForDialogOrFullscreen() {
|
|
|
|
|
|
|
|
isDialog = AndroidUtilities.isTabletSized(this);
|
|
|
|
|
|
|
|
if (isDialog)
|
|
|
|
|
|
|
|
setTheme(ThemeService.getDialogTheme());
|
|
|
|
|
|
|
|
else
|
|
|
|
|
|
|
|
ThemeService.applyTheme(this);
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
/**
|
|
|
|
* Populate criteria list with built in and plugin criteria. The request is sent to every application
|
|
|
|
* Populate criteria list with built in and plugin criteria. The request is sent to every application
|
|
|
|
* registered to listen for this broadcast. Each plugin can then add criteria to this activity.
|
|
|
|
* registered to listen for this broadcast. Each plugin can then add criteria to this activity.
|
|
|
@ -413,9 +425,8 @@ public class CustomFilterActivity extends ListActivity {
|
|
|
|
|
|
|
|
|
|
|
|
// view
|
|
|
|
// view
|
|
|
|
Filter filter = new Filter(title, title, sql.toString(), values);
|
|
|
|
Filter filter = new Filter(title, title, sql.toString(), values);
|
|
|
|
Intent taskListActivity = new Intent(this, TaskListWrapperActivity.class);
|
|
|
|
setResult(RESULT_OK, new Intent().putExtra(TagSettingsActivity.TOKEN_NEW_FILTER, filter));
|
|
|
|
taskListActivity.putExtra(TaskListActivity.TOKEN_FILTER, filter);
|
|
|
|
finish();
|
|
|
|
startActivity(taskListActivity);
|
|
|
|
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
/**
|
|
|
|