Sort downloadable books

This commit is contained in:
Bradlee Speice 2014-05-10 19:19:23 -04:00
parent 8b499b9215
commit 6cd3f712d8

View File

@ -23,9 +23,12 @@ import org.bspeice.minimalbible.activities.downloader.manager.DownloadManager;
import org.bspeice.minimalbible.activities.downloader.manager.EventBookList; import org.bspeice.minimalbible.activities.downloader.manager.EventBookList;
import org.crosswire.jsword.book.Book; import org.crosswire.jsword.book.Book;
import org.crosswire.jsword.book.BookCategory; import org.crosswire.jsword.book.BookCategory;
import org.crosswire.jsword.book.BookComparators;
import org.crosswire.jsword.book.BookFilter; import org.crosswire.jsword.book.BookFilter;
import org.crosswire.jsword.book.FilterUtil; import org.crosswire.jsword.book.FilterUtil;
import java.util.Collection;
import java.util.Collections;
import java.util.List; import java.util.List;
import javax.inject.Inject; import javax.inject.Inject;
@ -69,8 +72,6 @@ public class BookListFragment extends Fragment {
@Override @Override
public void onCreate(Bundle state) { public void onCreate(Bundle state) {
super.onCreate(state); super.onCreate(state);
//TODO: Figure out why this doesn't work. Best guess is because the context from
//getApplication(getActivity()) isn't actually MinimalBible.getAppContext()
MinimalBible.getApplication().inject(this); MinimalBible.getApplication().inject(this);
} }
@ -141,10 +142,15 @@ public class BookListFragment extends Fragment {
public void displayBooks(List<Book> bookList) { public void displayBooks(List<Book> bookList) {
try { try {
// TODO: Should the filter be applied earlier in the process? // TODO: Should the filter be applied earlier in the process?
// TODO: Sort books by name?
List<Book> displayList;
BookCategory c = BookCategory.fromString(getArguments().getString(ARG_BOOK_CATEGORY)); BookCategory c = BookCategory.fromString(getArguments().getString(ARG_BOOK_CATEGORY));
BookFilter f = FilterUtil.filterFromCategory(c); BookFilter f = FilterUtil.filterFromCategory(c);
List<Book> filteredBooks = FilterUtil.applyFilter(bookList, f); displayList = FilterUtil.applyFilter(bookList, f);
downloadsAvailable.setAdapter(new BookListAdapter(this.getActivity(), filteredBooks)); Collections.sort(displayList, BookComparators.getInitialComparator());
downloadsAvailable.setAdapter(new BookListAdapter(this.getActivity(), displayList));
setInsets(getActivity(), downloadsAvailable); setInsets(getActivity(), downloadsAvailable);
} catch (FilterUtil.InvalidFilterCategoryMappingException e) { } catch (FilterUtil.InvalidFilterCategoryMappingException e) {
// To be honest, there should be no reason you end up here. // To be honest, there should be no reason you end up here.