Sort google task list picker

pull/437/head
Alex Baker 9 years ago
parent b43ccb2414
commit 7871fdda6c

@ -10,7 +10,6 @@ import com.todoroo.astrid.api.GtasksFilter;
import org.tasks.gtasks.SyncAdapterHelper; import org.tasks.gtasks.SyncAdapterHelper;
import java.util.Collections;
import java.util.List; import java.util.List;
import javax.inject.Inject; import javax.inject.Inject;
@ -42,10 +41,9 @@ public class GtasksFilterExposer {
} }
List<Filter> listFilters = newArrayList(); List<Filter> listFilters = newArrayList();
for (GtasksList list : gtasksListService.getLists()) { for (GtasksList list : gtasksListService.getSortedGtasksList()) {
listFilters.add(filterFromList(list)); listFilters.add(filterFromList(list));
} }
Collections.sort(listFilters, (filter, t1) -> filter.listingTitle.compareTo(t1.listingTitle));
return listFilters; return listFilters;
} }

@ -8,6 +8,7 @@ package com.todoroo.astrid.gtasks;
import com.google.api.services.tasks.model.TaskList; import com.google.api.services.tasks.model.TaskList;
import com.todoroo.astrid.dao.StoreObjectDao; import com.todoroo.astrid.dao.StoreObjectDao;
import java.util.Collections;
import java.util.HashSet; import java.util.HashSet;
import java.util.List; import java.util.List;
import java.util.Set; import java.util.Set;
@ -32,6 +33,12 @@ public class GtasksListService {
return storeObjectDao.getGtasksLists(); return storeObjectDao.getGtasksLists();
} }
public List<GtasksList> getSortedGtasksList() {
List<GtasksList> lists = getLists();
Collections.sort(lists, (left, right) -> left.getName().compareTo(right.getName()));
return lists;
}
public GtasksList getList(long id) { public GtasksList getList(long id) {
return storeObjectDao.getGtasksList(id); return storeObjectDao.getGtasksList(id);
} }

@ -39,7 +39,7 @@ public class SupportGoogleTaskListPicker extends InjectingDialogFragment {
} }
public static AlertDialog createDialog(DialogBuilder dialogBuilder, GtasksListService gtasksListService, final GoogleTaskListSelectionHandler handler) { public static AlertDialog createDialog(DialogBuilder dialogBuilder, GtasksListService gtasksListService, final GoogleTaskListSelectionHandler handler) {
final List<GtasksList> lists = gtasksListService.getLists(); final List<GtasksList> lists = gtasksListService.getSortedGtasksList();
List<String> listNames = transform(lists, GtasksList::getName); List<String> listNames = transform(lists, GtasksList::getName);
return dialogBuilder.newDialog() return dialogBuilder.newDialog()
.setItems(listNames, (dialog, which) -> { .setItems(listNames, (dialog, which) -> {

@ -179,7 +179,7 @@ public class FilterCriteriaProvider {
} }
private CustomFilterCriterion getGtasksFilterCriteria() { private CustomFilterCriterion getGtasksFilterCriteria() {
List<GtasksList> lists = gtasksListService.getLists(); List<GtasksList> lists = gtasksListService.getSortedGtasksList();
String[] listNames = new String[lists.size()]; String[] listNames = new String[lists.size()];
String[] listIds = new String[lists.size()]; String[] listIds = new String[lists.size()];

Loading…
Cancel
Save